Readded libpng15 patch (bug #383491). Moved ebuild back to EAPI-4

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 37 insertions, 10 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/Manifest b/app-cdr/dvdisaster/Manifest
index d0ea98c19235..87c7302f549e 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX dvdisaster-0.72.1-libpng15.patch 194 RMD160 06305caa49c4db476c0b7a671fb14d6988dd205a SHA1 76b3d7b7039c5a3d900dd333c0aaca99bed41361 SHA256 8ddbd4288c1ddb1d6cec404e25795c334fd0405f02e215cdaacf9fe1460688d3
 DIST dvdisaster-0.70.4.tar.bz2 1148733 RMD160 917457581309db33aef5ceddc7dddbd2ef084497 SHA1 0ab5fe59d4c91e77c2f73b389485d0f5443d8873 SHA256 3ad9a17876223e802497d6b60a6a810aabb2fc08db579245ecebec6158496ddf
 DIST dvdisaster-0.72.1.tar.bz2 4132345 RMD160 0315b7a8d8529383361b7cd344e79e9f8138ee43 SHA1 54499a6c22d121f8b7ceb070b8517b3038bb68b4 SHA256 f3f5983d35517ce30f9ae47d5406ab1f1631ce3499dc982dd3da7132430d5a80
@@ -5,7 +8,24 @@ DIST dvdisaster-0.72.2.tar.bz2 4145193 RMD160 727586d5e9a7bc0c2b0137786b8cd62a3a
 DIST dvdisaster-0.72.rc1.tar.bz2 2872245 RMD160 b8a1bea433e6d1c6477315c2c4bdd6a436c3b686 SHA1 243f2059614695a8af29c95afd7e5f51accba7b5 SHA256 1e7c11db76f19de437a81d2f4e8841aa0d0ed1ce5edf5adae179c97f5ad53cd5
 EBUILD dvdisaster-0.70.4.ebuild 2133 RMD160 83092dede87dc8c686cd279335f2abd761e7a134 SHA1 db59f40380f1e8ffb99e67435c327e9f2b632d5f SHA256 5b5fee6ebd91d9cb07134e687902ac6c1505e26df113d8d042424607bd47efce
 EBUILD dvdisaster-0.72.1.ebuild 1980 RMD160 b3141e3f022ea8155581d50f3bea0b9629df5baa SHA1 f8ad893531899fa3dccf72a520c8b4ac235fb39e SHA256 61f1b42527c2fd7af99b146b27d82fbb063a7f9cbb7c99035d3e270a4bc52f77
-EBUILD dvdisaster-0.72.2.ebuild 1962 RMD160 219368eb9502b8f06d15332b9695572e4d786941 SHA1 deb1e3687a2564322008b7c86b425247ceac0d82 SHA256 28d3896414923a2345ce1f5b81d289143e5e84b57b07b43965d17dd30dfc76cc
+EBUILD dvdisaster-0.72.2.ebuild 1991 RMD160 2fe363653aa7cd13a38341036b88c2467038e029 SHA1 2f6a29153f33fccde242286a81452d9b407b5380 SHA256 e02b554af46aece22fedc300b208fbbe4d84f450b85eae3cf707ebf51589af5e
 EBUILD dvdisaster-0.72_rc1.ebuild 1942 RMD160 5ef62a302601b53485574e45e392af797b9264de SHA1 5fd905dabde3692a9e3af7e087b895e7ddf36220 SHA256 a85503622c210b5fa27a73834a528b39e00b04c56c38ddb434dcd0795f2e1b2c
-MISC ChangeLog 2586 RMD160 55e4421b30a45ca3d7bddfcffe905b2af0344680 SHA1 1df998a6218ff980fc37f4506372d938c85852d2 SHA256 610ab7772f62f162201e860ab2f2c48d2ad5c66560b966a2c44c3c0624e6b78c
+MISC ChangeLog 2810 RMD160 cdc2c982ee66498e89d8b48f8ade2ed6f1c45c8e SHA1 f4fcd889b21ffee7a8bb64f615537e7c4bcc564c SHA256 aafeb18d33812f332e31a60f95a88f1c277a2e402cbc8d7b4f433ffec064a2ac
 MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOfEd4AAoJEPiazRVxLXTFPf8QAIgpoJs7dI2FIxlYGFFEqPx2
+QSfbhn6UCTmNjOVuLkbHR6icuON2s1wb6BLrzwVjvHppC9yiysgKSPpDFKX6GojQ
+XqUSN8hyl4odadOa8ES+915qLhsaAJ8V6VwfFasECSPcF5nP6R5wvcQup2zu5lnZ
+EqDwgMjcHvzOw4s9HzG05lkHvzt85/xfLJKXDS4gvocJN/fn0ZZv6ENs/OO2BM89
+GU1nc+KyW0Q8g0RXVDblkwlHabzFBhqLVBxMejSuHxeToFnAZJDwuZWgMuS0lSXY
+kkWLuvCih0iwocSmUe2lGAom7FRbP7NoZdBwXc4s6G5woVXS97//d8hc2jEJ+BvS
+GBzYF3tlSoJBEhlSRQovHMTRz1fYpuAxRfsCRZrGnWlfr8TUH/huuydOnLxjN5L9
+urH7ZeXkHO+8pnZP+LXHBIzmAQoioIah1n0+HWrXt7csI4KvyoiPK67vjCPxcre3
+da0TTIQLsxix8Bl1qiWVtN1YC7RCjz3+QBmO4xk3k2TV0dYHCW1ZjtLSeQ7C5AEE
+4WQWV7WdKoe5Q+v+zUHHdNhWgkZgWD+eHpNMcsBG9ulWGhfNyWMYKDnRVKApJxb6
+KRRv0lo75UR96bsIfgHXb2xENBnie/ou9Pv7Y1xTNQgIlYC1n8JtLK7v4a0sxGhN
+c1HG4A/GwKEPYshqt16g
+=Ivtj
+-----END PGP SIGNATURE-----
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"