eapi2ify

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 36 insertions, 27 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index bd71bd124f26..49d9298d0813 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.471 2009/07/14 14:09:13 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.472 2009/07/21 09:24:59 aballier Exp $
+
+  21 Jul 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.0.ebuild,
+  vlc-1.0.9999.ebuild, vlc-9999.ebuild:
+  eapi2ify
 
   13 Jul 2009; Joseph Jezak <josejx@gentoo.org> vlc-0.9.9a-r1.ebuild,
   vlc-1.0.0.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 61fcb37fcae4..b89960d2f250 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,15 +12,15 @@ DIST vlc-patches-65.tar.bz2 6050 RMD160 f8dd11d16a87f506c2213e2fd64590c5938a8a22
 EBUILD vlc-0.9.8a.ebuild 11429 RMD160 9cfb2f9f04dba1ad617c57ca6b4062ce6f9d3f13 SHA1 c862d184795c7a9f7d9c94cfa4ef7e5ca2413259 SHA256 3cb51ad94287cea51cb46ff5630a1a9b14698b2099073884b87912ef0a95cf3d
 EBUILD vlc-0.9.9999.ebuild 11081 RMD160 6a9886b52505b5c0687485f1a8dac99e0154942e SHA1 5a46cec07d6eae09e174f8dd89207a4328b7543f SHA256 4e35a76e100c3e7ba40887131c676026ad5d429d6636367f7eede298f08103e0
 EBUILD vlc-0.9.9a-r1.ebuild 11170 RMD160 29b57d6972d9b570b5a7fef39ad87f2c6e5ea21b SHA1 c9588dec164650947963b6e6193ff2f09fef4e9f SHA256 dd3fe596b7df2d9735ef11d0fee117b73819cd4e48ebcd415eb87cd35d1de0dd
-EBUILD vlc-1.0.0.ebuild 11754 RMD160 aebe5a29572ac13388d50334046fe4e31541efad SHA1 e232c4e5ccc09da4497c263410f2967cb2e9c4e2 SHA256 49c4cd427d1d6cf176c1f0c3c7099092bc6d2030107ee7dba6c25e4809b0be91
-EBUILD vlc-1.0.9999.ebuild 11720 RMD160 4e29137c134ce51bce1817ef526a8635c5dd9814 SHA1 c169441363608bb3393191941c79201f41c25c5c SHA256 fcf03f3c4a56209739a85b046e5b0afc82029b329a7a6e9192c9c9c682dbf7ef
-EBUILD vlc-9999.ebuild 11804 RMD160 4186ed088bfe578b6dbad4d57f09add71fbca245 SHA1 bc0a55ef5cf0ffce92d90234eb0009e6eb99a6f5 SHA256 bd35acfe5de1ec2a86cc9f9660e6201a2cb9a98db9d8416343c7a582e85e596e
-MISC ChangeLog 75600 RMD160 92dc949c556775178216d2fd6b81a022bb5da32a SHA1 ee5aa7542911f667bedb56a523407ced445d03c1 SHA256 552eabe0a44a84a64a0573bd468a7867842e2a255e0ade6d2450e3cac090f97a
+EBUILD vlc-1.0.0.ebuild 11788 RMD160 3811bc079b610956577d6baed18f133ef0b0ec4f SHA1 9bbc92d52e65645ee587c0cf7437f77bbaa3eec1 SHA256 c9113a6e9098e97c44050a71acfa8533152428a82cf42285f67268d07969f322
+EBUILD vlc-1.0.9999.ebuild 11753 RMD160 4f3087216567aa3ea331da8a53e9b9a80bec3acd SHA1 39c0541be1bd7ad06315eef2db909bb8e2f8c9d9 SHA256 a526d5e0715f35b6a266c986196b494bb3ccf4b49eabe60b10d81ec3e3d0f5d8
+EBUILD vlc-9999.ebuild 11837 RMD160 8fdc3fe29528eec244c8072587c18dc328bf2b65 SHA1 98bf4228677b6274bde11497a87b41444a83adf4 SHA256 b36db9921ecc399f6e0e1e849fda3b9e648218afc5c3da18876dc2fec506fb6b
+MISC ChangeLog 75726 RMD160 f9544cf1b32a8d3afe2d17edb95804fca912f212 SHA1 9815f40e8a9a53fb3f35012aea13bedae02c2ec5 SHA256 ef0c3e10a994d14288dbcc416e5f2638afdb302f8f7df6bd2009967a49a739e6
 MISC metadata.xml 4048 RMD160 89663672ea27bcc95fef94b4b08921fc07d99df7 SHA1 eab3b091dc531c1bbd8a5546dc539ab3cf6653c2 SHA256 e1bf3249461b56cddae947ff5c63ec67ab2024878e75c73ef4415a434580b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpckY4ACgkQV3J2n04Eauz5AgCghu5aAhWpE4ZJm8dQ4Lj6uaNf
-pw0AoKl/9SKjqib740zzqIZQBhlqCLZC
-=FKXZ
+iEYEARECAAYFAkpliYMACgkQvFcC4BYPU0qz8QCfScRYIQoy/tCbKhmHt8xtZR18
+Jl0AoKovqjKKXRhZ8g5JiGVw9bxVpb+e
+=RHoo
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.0.ebuild b/media-video/vlc/vlc-1.0.0.ebuild
index e2cac1d3323c..425cb5451b83 100644
--- a/media-video/vlc/vlc-1.0.0.ebuild
+++ b/media-video/vlc/vlc-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0.ebuild,v 1.6 2009/07/13 18:17:05 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0.ebuild,v 1.7 2009/07/21 09:24:59 aballier Exp $
 
-EAPI="1"
+EAPI="2"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -220,8 +220,11 @@ src_unpack() {
 	if [ "${PV%9999}" != "${PV}" ] ; then
 		git_src_unpack
 	fi
-	cd "${S}"
-
+}
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_prepare
+	fi
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4
 
@@ -229,7 +232,7 @@ src_unpack() {
 	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
 }
 
-src_compile () {
+src_configure() {
 
 	# It would fail if -fforce-addr is used due to too few registers...
 	use x86 && filter-flags -fforce-addr
@@ -358,8 +361,6 @@ src_compile () {
 		$(vlc_use_enable_force vlm vlm sout) \
 		$(vlc_use_enable_force skins skins2 qt4) \
 		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
-
-	emake || die "make of VLC failed"
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index d259e3d02a48..61038cce9600 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.15 2009/07/08 08:41:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.16 2009/07/21 09:24:59 aballier Exp $
 
-EAPI="1"
+EAPI="2"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -220,8 +220,12 @@ src_unpack() {
 	if [ "${PV%9999}" != "${PV}" ] ; then
 		git_src_unpack
 	fi
-	cd "${S}"
+}
 
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_prepare
+	fi
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4
 
@@ -229,7 +233,7 @@ src_unpack() {
 	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
 }
 
-src_compile () {
+src_configure() {
 
 	# It would fail if -fforce-addr is used due to too few registers...
 	use x86 && filter-flags -fforce-addr
@@ -358,8 +362,6 @@ src_compile () {
 		$(vlc_use_enable_force vlm vlm sout) \
 		$(vlc_use_enable_force skins skins2 qt4) \
 		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
-
-	emake || die "make of VLC failed"
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index dd23a912f7bb..c5f53a9e7e8a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.21 2009/07/13 09:10:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.22 2009/07/21 09:24:59 aballier Exp $
 
-EAPI="1"
+EAPI="2"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -221,8 +221,12 @@ src_unpack() {
 	if [ "${PV%9999}" != "${PV}" ] ; then
 		git_src_unpack
 	fi
-	cd "${S}"
+}
 
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_prepare
+	fi
 	# Make it build with libtool 1.5
 	rm -f m4/lt* m4/libtool.m4
 
@@ -230,7 +234,7 @@ src_unpack() {
 	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
 }
 
-src_compile () {
+src_configure() {
 
 	# It would fail if -fforce-addr is used due to too few registers...
 	use x86 && filter-flags -fforce-addr
@@ -360,8 +364,6 @@ src_compile () {
 		$(vlc_use_enable_force vlm vlm sout) \
 		$(vlc_use_enable_force skins skins2 qt4) \
 		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
-
-	emake || die "make of VLC failed"
 }
 
 src_install() {