media-video/mandvd: EAPI=2, fixed built_with_use, empty line

svn path=/sunrise/; revision=10010

diff --git a/media-video/mandvd/ChangeLog b/media-video/mandvd/ChangeLog
index ffebff6c588cfedacd34c42c1265ec9df8e3a030..625422462b259da6090731d9aa5bde2d05df257b 100644 (file)
--- a/media-video/mandvd/ChangeLog
+++ b/media-video/mandvd/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for media-video/mandvd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> mandvd-2.4.ebuild:
+  EAPI=2, fixed built_with_use, empty line
+
   04 Dec 2007; Jakub Moc <jakub@gentoo.org> mandvd-2.4.ebuild:
   Switch to EAPI-1 and slotted deps
 

diff --git a/media-video/mandvd/Manifest b/media-video/mandvd/Manifest
index 47abdc1308f8128566a0c14a2ee7618e0a657eb4..4e1355847fe5c292c85eb6bfbfc92653d1c66778 100644 (file)
--- a/media-video/mandvd/Manifest
+++ b/media-video/mandvd/Manifest
@@ -1,4 +1,4 @@
 DIST mandvd-2.4src.tar.gz 2474181 RMD160 b0b708779183f72db7198a59d5ad62fd1694f994 SHA1 58ef2d69c119f287955964b185c5bcb898ae2dc4 SHA256 36d627d5bb08309f87b31b9079733b9f28948049ecbf1df0f491fec55da70521
-EBUILD mandvd-2.4.ebuild 1245 RMD160 91bea730b2b4ce8149eb98cd96f0880a8e931a94 SHA1 2b0b13668fcd974601c7cb81182559b6a90f4251 SHA256 2f735e1874593b187d76e643e6df35e3ef1e23b020c369c129ad721fb35870e5
-MISC ChangeLog 1391 RMD160 f61e329da22cc91b7d74cc122554b81b0885d441 SHA1 8e036c594e148a7f4184bcba2f826d3e556676ba SHA256 7831f09bc253be2a3420ed57c0c46004cb97c229722c9743dd9777b8e60b6a2a
+EBUILD mandvd-2.4.ebuild 1065 RMD160 9612f2520444b51632862612534383985cba5ab2 SHA1 139bf9ee2199840c7dd5c1fda7d8b19fac3c3022 SHA256 fe597dfe1d20c54d95d760600df1a38ae5d779141fe35bf26f3b5c78afeefeeb
+MISC ChangeLog 1508 RMD160 ca07341f910f81d0954aad1fa2aeabb5d3dd694e SHA1 aeb7a00d111b1d4a02351bd651eb77d070626a01 SHA256 6c9b45820fe0e65c3eac4b5a3fc48443059fb51e3ba31ed884736f3b35438c2d
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-video/mandvd/mandvd-2.4.ebuild b/media-video/mandvd/mandvd-2.4.ebuild
index 7ac7bc0aa9b1d9b01d45e6e3e9b11103a13b5401..cc51c7b4d0e3108c6495bbedd44c18d554d97e1f 100644 (file)
--- a/media-video/mandvd/mandvd-2.4.ebuild
+++ b/media-video/mandvd/mandvd-2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
 inherit eutils qt3
 
 MY_P="ManDVD-${PV}"
@@ -31,24 +31,19 @@ RDEPEND="${DEPEND}
        >=media-video/dvdauthor-0.6.11
        >=media-video/dvd-slideshow-0.7.5
        >=media-video/mjpegtools-1.8.0
-       >=media-video/mplayer-1.0_pre8
+       >=media-video/mplayer-1.0_pre8[encode]
        >=media-video/transcode-1.0.2"
 
-pkg_setup() {
-       if ! built_with_use media-video/mplayer encode ; then
-               eerror "${PN} needs mencoder to work."
-               eerror "Re-emerge media-video/mplayer with USE=encode."
-               die "Re-emerge media-video/mplayer with USE=encode."
-       fi
+src_configure() {
+       eqmake3
 }
 
 src_compile() {
-       eqmake3
        emake || die "emake failed"
 }
 
 src_install() {
-       dobin ${PN}
-       newicon ${PN}ico.png ${PN}.png
-       make_desktop_entry ${PN} ${PN} ${PN}.png "AudioVideo;QT"
+       dobin ${PN} || die
+       newicon ${PN}ico.png ${PN}.png || die
+       make_desktop_entry ${PN} ${PN} ${PN}.png "AudioVideo;QT" || die
 }