summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-09-23 08:46:42 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-09-23 08:46:42 +0000
commitbaaaa6691a62459e5242931b398a6869bb5a1bf6 (patch)
treedaba348dffc90b3dca95c840afdad7b84fa8dba9 /app-cdr
parentRemove obsolete USE-flags as per Joost Ruis in bug #384171. (diff)
downloadgentoo-2-baaaa6691a62459e5242931b398a6869bb5a1bf6.tar.gz
gentoo-2-baaaa6691a62459e5242931b398a6869bb5a1bf6.tar.bz2
gentoo-2-baaaa6691a62459e5242931b398a6869bb5a1bf6.zip
Readded libpng15 patch (bug #383491). Moved ebuild back to EAPI-4
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/dvdisaster/ChangeLog6
-rw-r--r--app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild17
2 files changed, 15 insertions, 8 deletions
diff --git a/app-cdr/dvdisaster/ChangeLog b/app-cdr/dvdisaster/ChangeLog
index 64e486ce760c..b545202b3c9c 100644
--- a/app-cdr/dvdisaster/ChangeLog
+++ b/app-cdr/dvdisaster/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/dvdisaster
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/ChangeLog,v 1.17 2011/09/16 23:39:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/ChangeLog,v 1.18 2011/09/23 08:46:42 polynomial-c Exp $
+
+ 23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org> dvdisaster-0.72.2.ebuild:
+ non-maintainer commit: Readded libpng15 patch. Moved ebuild back to EAPI-4.
+ Should fix bug #383491 reported by Jean-Francois Ostiguy.
*dvdisaster-0.72.2 (16 Sep 2011)
diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
index 312ee712018d..9a77ee387f5a 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
@@ -1,15 +1,15 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild,v 1.1 2011/09/16 23:39:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild,v 1.2 2011/09/23 08:46:42 polynomial-c Exp $
-EAPI=2
+EAPI=4
inherit eutils gnome2-utils versionator
MY_P=${PN}-$(replace_version_separator 2 '.')
DESCRIPTION="Data-protection and recovery tool for DVDs"
-HOMEPAGE="http://dvdisaster.net/"
-SRC_URI="http://dvdisaster.net/downloads/${P}.tar.bz2"
+HOMEPAGE="http://dvdisaster.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~x86"
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.72.1-libpng15.patch
+}
+
# - There is no autotools, use_ functions won't work
# - NLS disabled because sys-devel/gettext fails, if you enable it
# you need also virtual/libintl because it links to it for FreeBSD
@@ -47,12 +51,11 @@ src_configure() {
--localedir=/usr/share/locale \
--buildroot="${D}" \
--with-nls=no \
- ${myconf} \
- || die "./configure failed"
+ ${myconf} || die
}
src_install() {
- emake install || die "emake install failed"
+ emake install
newicon contrib/${PN}48.png ${PN}.png
make_desktop_entry ${PN} ${PN} ${PN} "System;Utility"