Bumped to EAPI2, changed netpbm dependency to include [jpeg], fixed wxGTK dependency

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 36 insertions, 23 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index a516f20a4e35..29335f5a90bc 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvdstyler
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.30 2008/04/01 15:17:39 dragonheart Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.31 2009/01/03 15:15:28 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org> dvdstyler-1.5.1.ebuild,
+  dvdstyler-1.5.1_p2.ebuild:
+  Bumped to EAPI2, changed netpbm dependency to include [jpeg], fixed wxGTK
+  dependency
 
   01 Apr 2008; Daniel Black <dragonheart@gentoo.org>
   dvdstyler-1.5-r1.ebuild, dvdstyler-1.5.1.ebuild,
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 1966e7f7e9f7..5a6be9b6a746 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST DVDStyler-1.5.1.tar.gz 824171 RMD160 9fe9821f4fdd44464148397968d042c2d54cb1e0 SHA1 c466dca9a5ff318dd43eb73d1acd0a360a68efd4 SHA256 14347cc366f32452f7d345d7593ab3393dbdad599193c8177a96f630b2cf8817
 DIST DVDStyler-1.5.1_2.tar.gz 834479 RMD160 d6e16af0743d29867428f55409dd30dbd6b152dd SHA1 ef3de9debdd55a051b185e89381e12a14bbab14d SHA256 e3d2c60834b611d26fd8ae9d8bd20785a65878014a42e10669668a844403f740
 DIST DVDStyler-1.5.tar.gz 813069 RMD160 1dc77a2aafdee884b20d1be0b259091c8b3028a0 SHA1 4c090fd5308014b0f0fae0bea88fe7eec0f03354 SHA256 76271ed542951a06c69e10ca7d9567608949f8d166fe5c82a59d59dbf4d741f3
 EBUILD dvdstyler-1.5-r1.ebuild 1227 RMD160 47ecf9a2d89b82fd64dcf96ce4158b59e1f217ef SHA1 09f587e43e7fa695d49475ee2dafca7b737342d2 SHA256 5ba47897e666ea616db56c7a36e51578ca506779601e8be15a8b7d026107b8d3
-EBUILD dvdstyler-1.5.1.ebuild 1282 RMD160 9f20b01f5d025ffb28b60e329ecb8d904baeb010 SHA1 6a061d8f0ddcb3edd9a4007a59f328c123d1c0ab SHA256 5c1e1bbdfd8d07a82d0071e44343edf5c539f8ee22ce7e66662a5b3c686fd6ce
-EBUILD dvdstyler-1.5.1_p2.ebuild 1235 RMD160 7050caa64fce9004e67edf3a9c003eb0199b65af SHA1 74cd690df693e4db8f6021ffde405e8873d051e2 SHA256 68e919216f42e0124b1502ab1bc14dee63c3870d70fb822b06ad76144587dfd7
-MISC ChangeLog 5456 RMD160 7b347c7eb31fbe728c8ead7502007247bf96fe96 SHA1 61f2553ed7db1242f76bf9bbf7e8699d6be5c20d SHA256 38cbe78b561a0ce87926f6f82a812a83ae0f386354023cb4f3357ef9cb4ccb69
+EBUILD dvdstyler-1.5.1.ebuild 1227 RMD160 3544369eeeca66262fec249174af9ee9ff123868 SHA1 1397d653a83fd1c58b4ca52fed6905cb63aa8c6d SHA256 25e066ac760863b476983c033b3f5784a82f81eda17e3f6bf61faf48aa27caba
+EBUILD dvdstyler-1.5.1_p2.ebuild 1180 RMD160 b64644a24d4e8dbaaf8e19cee5c67b7dd1272898 SHA1 425d6036b7e442fe1360c8dcc20e07fb44fb6725 SHA256 4996779807d58d69f4af0466f6db55a39dadcb4efcd3b4fab779d66466e4ddce
+MISC ChangeLog 5647 RMD160 c46de2f075994b65b28cda5a55413fef525605a8 SHA1 cd9c61a487133878b0ec20da1b7fc5189b2b2905 SHA256 c9700fca6087abe9653438b1c19d6dc7ec7bd5bec0f8a52d4310ec69683e1760
 MISC metadata.xml 253 RMD160 4017dbee50ab0fca6eee1ae8103bdcba5e3ec08c SHA1 eba5ea7101cd9bb7d2e8acbd28507cd49268d8b2 SHA256 4d56e96fb54c7825dbf341dbac673b7bbae83b48ee32352091126c632ac09239
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklfgRkACgkQKhnDs22gwa8MsQCgnKS7YDkbodhvFg3xkXWo8DiO
+ClwAoJOb6cETva/++KiXi631/67KT/fF
+=kOYc
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-1.5.1.ebuild b/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
index 9e7f04835120..57ef686b9a21 100644
--- a/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1.ebuild,v 1.2 2008/04/01 15:17:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1.ebuild,v 1.3 2009/01/03 15:15:28 angelos Exp $
 
+EAPI=2
 inherit wxwidgets
 
 MY_P=DVDStyler-${PV}
@@ -19,11 +20,10 @@ RDEPEND="app-cdr/dvd+rw-tools
 	>=media-video/dvdauthor-0.6.10
 	media-video/mpgtx
 	>=media-video/mjpegtools-1.8.0
-	=x11-libs/wxGTK-2.6*
-	media-libs/netpbm
+	x11-libs/wxGTK:2.6
+	media-libs/netpbm[jpeg]
 	>=media-libs/wxsvg-1.0_beta7
 	virtual/cdrtools
-	virtual/libc
 	gnome? ( >=gnome-base/libgnomeui-2.0 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -31,17 +31,16 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-src_compile() {
+src_configure() {
 	export WX_GTK_VER="2.6"
 	need-wxwidgets gtk2
 	echo -e "all:\n\ninstall:"> install.win32/Makefile.in
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	rm  "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
 	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
 }
diff --git a/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild b/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
index 3963ccb5b565..a5a7745b38ce 100644
--- a/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild,v 1.2 2008/04/01 15:17:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild,v 1.3 2009/01/03 15:15:28 angelos Exp $
 
+EAPI=2
 inherit wxwidgets
 
 MY_P=DVDStyler-${PV/_p/_}
@@ -19,11 +20,10 @@ RDEPEND="app-cdr/dvd+rw-tools
 	>=media-video/dvdauthor-0.6.10
 	media-video/mpgtx
 	>=media-video/mjpegtools-1.8.0
-	=x11-libs/wxGTK-2.6*
-	media-libs/netpbm
+	x11-libs/wxGTK:2.6
+	media-libs/netpbm[jpeg]
 	>=media-libs/wxsvg-1.0_beta7
 	virtual/cdrtools
-	virtual/libc
 	gnome? ( >=gnome-base/libgnomeui-2.0 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -31,16 +31,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-src_compile() {
+src_configure() {
 	export WX_GTK_VER="2.6"
 	need-wxwidgets gtk2
 	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	rm  "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
 	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
 }