Cleanup: EAPI3, merge with live ebuild, use add_kdebase_dep

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

3 files changed, 44 insertions, 20 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 45611dfc829b..4fb2432b0bbe 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.253 2010/08/18 13:41:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.254 2010/10/06 16:14:54 tampakrap Exp $
+
+  06 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org> k3b-2.0.1.ebuild:
+  Cleanup: EAPI3, merge with live ebuild, use add_kdebase_dep
 
 *k3b-2.0.1 (18 Aug 2010)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 118aa1ebdcb0..bcea510cf547 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,6 +1,6 @@
 DIST k3b-2.0.0.tar.bz2 12441752 RMD160 203f73fe2c57181e7cac6578ff57e4039459eb9c SHA1 afe1b10a520849941c1489ccb1ed7c3b8f828e78 SHA256 df71fcb97ac29344c43a819d39ae9fb96e874c6dc40e905a1788d632d327344b
 DIST k3b-2.0.1.tar.bz2 12269204 RMD160 8f85510c65a0da305b3a7c06ac0dd88e0631e66f SHA1 44da8d11b36945aeb9495c9150d8227fa906d6c2 SHA256 8631460e617833a1f907145271ae4e3224c53e391339f273d2bd340c451ccdb7
 EBUILD k3b-2.0.0.ebuild 3016 RMD160 acaf05de74078979671068e912721a2c31cefafe SHA1 9cd95ee8887db74c0a3b46f07235ae8cfed05c2f SHA256 b7013baa7c046c1b7a89090a567088a5e3c7fa99e95d685268a17d3d0a042e31
-EBUILD k3b-2.0.1.ebuild 3019 RMD160 69c96005fb321bd2c6d7c29b52068838fb3e8b39 SHA1 0c8d080881a7d9c82566bc8eb59f7c9f9b61cc40 SHA256 5401823cb8e61d2d2ada82fceb3cd82ec3b28507d4381b20b4d702d60c720956
-MISC ChangeLog 36746 RMD160 c8c65b2feee619fc92c65459aef5008d96058063 SHA1 c5b7ac126030830f7a9986029f84af35a2cacfd8 SHA256 42b59aba004c8efed83e9fdad7bada3535c6e551eedb599353cf4218a433e13b
+EBUILD k3b-2.0.1.ebuild 3275 RMD160 15a0257b184ccd7cf7bf6f0233a0256e7d591de9 SHA1 860aedf89f1ac64a8531a52ef0e6410beabf7e79 SHA256 b901fbc57e9fb721012fac69f3f5da68b1c80517dec3f1290786ed38a32e9819
+MISC ChangeLog 36883 RMD160 540f1cb7d9f603cbd0b243c44b7350da72f491b5 SHA1 1805330d0f493560bfa3d50a541b0256515aef94 SHA256 f242deafa726d55dca7bf66cb0a0de3ad4dd7ce4766bb5326fc9971a37ed8fe5
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
diff --git a/app-cdr/k3b/k3b-2.0.1.ebuild b/app-cdr/k3b/k3b-2.0.1.ebuild
index 8b4a47b837d6..dc0580233cfa 100644
--- a/app-cdr/k3b/k3b-2.0.1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.1.ebuild
@@ -1,24 +1,41 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.1.ebuild,v 1.1 2010/08/18 13:41:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.1.ebuild,v 1.2 2010/10/06 16:14:54 tampakrap Exp $
 
-EAPI=2
+EAPI=3
+
+CMAKE_MIN_VERSION=2.8.0
+MULTIMEDIA_REQUIRED=always
 WEBKIT_REQUIRED=always
-KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
-gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
-se sk sl sv th tr uk zh_CN zh_TW"
+KMNAME="extragear/multimedia"
+
+# Translations are only in the tarballs, not in the svn repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
+	gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
+	se sk sl sv th tr uk zh_CN zh_TW"
+
+	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
+
+	DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO )
+
+	S=${WORKDIR}/${P/_*}
+else
+	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
+fi
+
 inherit kde4-base
 
 DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug dvd emovix encode ffmpeg flac mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
 
-DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}
+DEPEND="
+	$(add_kdebase_dep libkcddb)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? ( >=media-video/ffmpeg-0.5 )
@@ -29,21 +46,23 @@ DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}
 	musicbrainz? ( media-libs/musicbrainz:1 )
 	sndfile? ( media-libs/libsndfile )
 	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )
+"
 RDEPEND="${DEPEND}
-	sys-apps/hal
 	app-cdr/cdrdao
 	media-sound/cdparanoia
+	sys-apps/hal
 	virtual/cdrtools
-	dvd? ( >=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] ) )
+	dvd? (
+			>=app-cdr/dvd+rw-tools-7
+			encode? ( media-video/transcode[dvd] )
+	)
 	emovix? ( media-video/emovix )
 	encode? ( sox? ( media-sound/sox ) )
-	vcd? ( media-video/vcdimager )"
-
-DOCS="ChangeLog FAQ PERMISSIONS README RELEASE_HOWTO"
+	vcd? ( media-video/vcdimager )
+"
 
-S=${WORKDIR}/${P/_*}
+DOCS+=( ChangeLog )
 
 src_configure() {
 	mycmakeargs+=( "-DK3B_BUILD_K3BSETUP=OFF"
@@ -62,9 +81,11 @@ src_configure() {
 		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN) )
 
 	if use encode; then
-		mycmakeargs+=( $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+		mycmakeargs+=(
+			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 			$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
-			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) )
+			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+		)
 	fi
 
 	kde4-base_src_configure