Move to kde4-base.eclass thanks to scarabeus.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 8 insertions, 74 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/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
-}