Move to kde4-base.eclass thanks to scarabeus.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 10 insertions, 78 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 31dcc1cbb835..466ff4b0c799 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kid3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.38 2009/05/20 20:49:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.39 2009/05/21 13:09:47 ssuominen Exp $
+
+  21 May 2009; Samuli Suominen <ssuominen@gentoo.org> -kid3-1.1.ebuild,
+  kid3-1.2.ebuild:
+  Move to kde4-base.eclass thanks to scarabeus.
 
 *kid3-1.2 (20 May 2009)
 
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index dd2d9aea4454..843b1d88239e 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,8 +1,6 @@
 DIST kid3-1.0.tar.gz 1132898 RMD160 8677ff27081ffbcdc07424244111acc67c605f28 SHA1 6a342cce0d7c71a454e0232aa9a2ee6e84b0246d SHA256 ff8cd366682d2a5e35e45de48f393f611439d5408b83ec2d782cbd79c2e00876
-DIST kid3-1.1.tar.gz 1160900 RMD160 abdd835ec7abc378b90bad33246bb738ff96bfc5 SHA1 01dc11223179feff147af97e30fedc5240707a7a SHA256 cb0dec977992c13ccf22115aac73cc71c817b9c59f842d9ed29cc0f7f19b7de5
 DIST kid3-1.2.tar.gz 1381577 RMD160 3df2b29de8204611f1621c3764487263442f0531 SHA1 267eaab450293a722d146c1511c0bbc24cd5e286 SHA256 55959970708c720574f25420215f6ff43ed468df7905ae45517d6b1dc07ffa6f
 EBUILD kid3-1.0.ebuild 1320 RMD160 1c57e369d6e6d5468736f3459fc000fdf612d0db SHA1 f34c24f8f7714735f19fdd1d468c8b1e502575eb SHA256 723b2aac7a769dc8e19ff738a869f08028cacd482b57ffba6901bc2caae90821
-EBUILD kid3-1.1.ebuild 1622 RMD160 92206fed66d640af4b5b641306a6fc61bb413214 SHA1 1a0ea876caeba36e3fd7314e8c2c99fffc3fbef1 SHA256 541c87117b701c93fdb853d35935fa00a629a13b8d8607ce97c3a8eb85ce4d21
-EBUILD kid3-1.2.ebuild 739 RMD160 5598a851a202d73f2271ba5091203c0fcc9158e2 SHA1 1be50bb9637c5a51f9cb6dcb4d2facfa04225fb3 SHA256 836f63c598f2a239e08434a87640882951ab769e556b51ae76bcdc3d54dc663a
-MISC ChangeLog 5376 RMD160 5d417bb62b9d0d28467ed16a7e4b6df81d885039 SHA1 1f99de7e5841306c86276cde20e12749de690399 SHA256 b971214769c96b90f0d889ae4a7445b7d58407bd470bd3f45132b61b3be41600
+EBUILD kid3-1.2.ebuild 626 RMD160 e92b1986dba7b28b9cbc91f964062aca7de83928 SHA1 c5523932dc9c461832820ae0a7acf5447811f5fb SHA256 f448ec9f551949a0f0d3c8ee8e62fbb370b0ac1c94988a00dbc8f5acf08bebdf
+MISC ChangeLog 5516 RMD160 6192e3b470d9d692682a7ca06f67504a34f00c22 SHA1 3a4da695e451e45fa340767c3753a6752dc6f6dd SHA256 1f0c30c66e86c73d2eba446829218c20c9ac9eb52ec48c45d8aa137009cc16fd
 MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729
diff --git a/media-sound/kid3/kid3-1.1.ebuild b/media-sound/kid3/kid3-1.1.ebuild
deleted file mode 100644
index 0da864cbaf32..000000000000
--- a/media-sound/kid3/kid3-1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.1.ebuild,v 1.3 2008/12/09 20:59:48 ranger Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils kde-functions
-
-DESCRIPTION="A simple ID3 tag editor for QT/KDE."
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+flac +musicbrainz"
-
-# Kde cannot be disabled configure violates
-# sandbox and i aint fixing it.
-# Currently we preffer kde4 over kde3.
-DEPEND=">=media-libs/id3lib-3.8.3
-	>=media-libs/taglib-1.4-r1
-	media-libs/libmp4v2
-	media-libs/libvorbis
-	flac? (	media-libs/flac[cxx] )
-	|| (
-		>=kde-base/kdelibs-3.9
-		kde-base/kdelibs:3.5
-	)
-	musicbrainz? (
-		media-libs/musicbrainz:3
-		media-libs/tunepimp
-	)"
-
-src_configure() {
-	if has_version ">=kde-base/kdelibs-3.9"; then
-		# we shall use kde4
-		# there is option WITH_KDE but kde is needed anyway
-		# so forcing
-		mycmakeargs="${mycmakeargs}
-		-DWITH_KDE=ON
-		-DWITH_TAGLIB=ON
-		-DWITH_VORBIS=ON
-		$(cmake-utils_use_with flac FLAC)
-		$(cmake-utils_use_with musicbrainz TUNEPIMP)
-		"
-		cmake-utils_src_configure
-	else
-		# we shall use kde3
-		# Compile fails without taglib, forced on.
-		# Ditto for vorbis, so there you go.
-		set-qtdir 3
-		set-kdedir 3
-		econf \
-			--with-kde \
-			--with-taglib \
-			--without-arts \
-			--with-vorbis \
-			$(use_with flac) \
-			$(use_with musicbrainz) \
-			--with-extra-includes=/usr/kde/3.5/include/
-		# there is noone having version older than 3.5 so this is no problem
-	fi
-}
diff --git a/media-sound/kid3/kid3-1.2.ebuild b/media-sound/kid3/kid3-1.2.ebuild
index 0cf1acdd0e74..092b0732bb7a 100644
--- a/media-sound/kid3/kid3-1.2.ebuild
+++ b/media-sound/kid3/kid3-1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.2.ebuild,v 1.1 2009/05/20 20:49:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.2.ebuild,v 1.2 2009/05/21 13:09:47 ssuominen Exp $
 
 EAPI=2
-inherit cmake-utils
+inherit kde4-base
 
 DESCRIPTION="A simple ID3 tag editor for QT/KDE."
 HOMEPAGE="http://kid3.sourceforge.net/"
@@ -14,17 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/id3lib-3.8.3
+RDEPEND="media-libs/id3lib
 	media-libs/taglib
 	media-libs/libmp4v2
 	media-libs/libvorbis
 	media-libs/flac[cxx]
-	>=kde-base/kdelibs-4
 	media-libs/musicbrainz:3
 	media-libs/tunepimp"
 DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog NEWS README
-}