Eapi4 and unify the live and release ebuild.

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

4 files changed, 38 insertions, 24 deletions

diff --git a/media-libs/phonon-vlc/ChangeLog b/media-libs/phonon-vlc/ChangeLog
index a4e8bd5fdb11..0fea77e82f3c 100644
--- a/media-libs/phonon-vlc/ChangeLog
+++ b/media-libs/phonon-vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/phonon-vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.3 2011/05/09 08:21:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.4 2011/05/09 19:27:56 scarabeus Exp $
+
+  09 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> phonon-vlc-0.4.0.ebuild,
+  phonon-vlc-9999.ebuild:
+  Eapi4 and unify the live and release ebuild.
 
   09 May 2011; Thomas Kahle <tomka@gentoo.org> phonon-vlc-0.3.2.ebuild:
   x86 stable per bug 354033
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 07e6da1a1b46..bd9bb292b959 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST phonon-backend-vlc-0.3.2.tar.bz2 52391 RMD160 0b472772c96db6b63b59fdb41b1c0f49bc68b1ff SHA1 a0d4fcd589481c0729c7fe21f06f21fa968757e6 SHA256 0fb5c22a9131dcc78b83fc2d35217fe6a5d1f5d8f98113e464ce17c50c7b5f44
 DIST phonon-backend-vlc-0.4.0.tar.bz2 54665 RMD160 05efa578b971c7fc7ba240c7afd09539c2d38e26 SHA1 3cbe63d76f7a65649c209019ece20ea018c65add SHA256 a6595a5ac4ac87a5494723312b68e8345488dd2fe2e1401d67f9c2a8925110f2
 EBUILD phonon-vlc-0.3.2.ebuild 1183 RMD160 eb03a00032f561adc14e8ed3dfc9b51861f47eba SHA1 fbe5f71f178808ae4109d8b70adb0656c1fb9bf4 SHA256 0251d89e150d9c442d59dec4dbbc11bf995f1e18c8a9c4f8b85d55ad84e564f5
-EBUILD phonon-vlc-0.4.0.ebuild 1190 RMD160 21fc420ed28f251a0e7dbbb49c20dbc78eed0c21 SHA1 b4d3cb36ee11747cceb5ba59d27760e3ddcf4f6b SHA256 f50bf87ffa5108ccf8b4a66289ad8a013d520d9fc1da33d0894d5c386d33e312
-EBUILD phonon-vlc-9999.ebuild 1086 RMD160 f9ca08e31dc19ebe1d1ac6ccfa9c821e400c333a SHA1 c0ad78e8541b422c5270e35c6a77b5425a9dc583 SHA256 3e363f85d803e9e22a0c732217665d92afbf7502096fef0bc1e2b33e8841a623
-MISC ChangeLog 1902 RMD160 2f3d0038208f553070b9c54640f9cb2c2a8bbbc2 SHA1 e4dd2ad83f47ffa77397b749379381797aa3912a SHA256 8aa0ab1c33478bc3cab666a159ae48d6b71c5784063375f1c9fc132bc266d0ca
+EBUILD phonon-vlc-0.4.0.ebuild 1331 RMD160 5363f114ebbc688ace4021af0c93a14b16ba023d SHA1 c1bdd2dbf301e7cd78ab746975e01b6a57ceef2a SHA256 ecf0acf9d8fbde157446e4bd19d51aa57f596330dbc5af6a512861f2a4a22331
+EBUILD phonon-vlc-9999.ebuild 1353 RMD160 1c52db9dbaac3a3812c109ace08108a517871433 SHA1 0ff5ea0055c168c92dde1819f5f4f80cd2860bbb SHA256 08931bfd1eadb5e9a8e2bc347149247786ccf7fe6c8ab0fbfe887d4b0562d35a
+MISC ChangeLog 2060 RMD160 b53efb4c81a2505894df130e26220b2236b6732a SHA1 7b71b523c82f81804a069c170945e84a3dc38fb0 SHA256 ce10ec385e43536209d33a18ec11bf44cabd33618a4e2ed49db4daacbe3111ed
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3HpJIACgkQodBTJSDyo66fKAD+LOngA+76ONISk6td7NBVlG7V
-lb8UOaNFsnco7NrbHLAA/0KlFZwpevcJCwaVy6Q+74xGiDFG6ZBjaTJ6KPY5235i
-=fOKn
+iEYEARECAAYFAk3IQEIACgkQHB6c3gNBRYdk9wCeJ5dHr+9EQQeVbCvZu/5fJ4FX
+vnkAniSkVbpqI2hp4AaVBEbTFMPTHcd/
+=dFYX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild
index 455cf98f4089..006ea19af565 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild,v 1.1 2011/05/08 14:27:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild,v 1.2 2011/05/09 19:27:56 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
 MY_PN="phonon-backend-vlc"
-
-inherit cmake-utils
+MY_P="${MY_PN}-${PV}"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+[[ ${PV} == 9999 ]] && git_eclass=git-2
+inherit cmake-utils ${git_eclass}
+unset git_eclass
 
 DESCRIPTION="Phonon VLC backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
-SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.bz2"
+SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="debug v4l2"
 
 RDEPEND="
-	>=media-libs/phonon-4.4.4
+	>=media-libs/phonon-4.5.0
 	>=media-video/vlc-1.1.1[dbus]
 	>=x11-libs/qt-dbus-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4
@@ -29,9 +32,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
 
-DOCS=(AUTHORS)
+DOCS=( AUTHORS )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 9263bea665c4..4809313a5671 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -1,22 +1,27 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-9999.ebuild,v 1.1 2011/03/28 22:57:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-9999.ebuild,v 1.2 2011/05/09 19:27:56 scarabeus Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit cmake-utils git
+MY_PN="phonon-backend-vlc"
+MY_P="${MY_PN}-${PV}"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+[[ ${PV} == 9999 ]] && git_eclass=git-2
+inherit cmake-utils ${git_eclass}
+unset git_eclass
 
 DESCRIPTION="Phonon VLC backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS=""
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="debug v4l2"
 
 RDEPEND="
-	>=media-libs/phonon-4.4.4
+	>=media-libs/phonon-4.5.0
 	>=media-video/vlc-1.1.1[dbus]
 	>=x11-libs/qt-dbus-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4
@@ -27,7 +32,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
 
-DOCS=(AUTHORS)
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS )
 
 src_configure() {
 	local mycmakeargs=(