Eapi4 and unify the live and release ebuild.

(Portage version: 2.2.0_alpha32/cvs/Linux x86_64)

3 files changed, 31 insertions, 17 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/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=(