Version bump. Optional switching of some features produces bogus make files. This needs to be properly patched before we can even consider stabling it.

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

3 files changed, 33 insertions, 20 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index dbdb50c927a9..adf4505947e1 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/kid3
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.53 2010/10/17 18:07:04 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.54 2011/04/19 20:42:07 scarabeus Exp $
+
+*kid3-1.6 (19 Apr 2011)
+
+  19 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -kid3-1.5.ebuild,
+  +kid3-1.6.ebuild:
+  Version bump. Optional switching of some features produces bogus make files.
+  This needs to be properly patched before we can even consider stabling it.
 
 *kid3-1.5 (17 Oct 2010)
 
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 7d14c98c2c30..fcf420259f42 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kid3-1.4.tar.gz 1539244 RMD160 c73090e90d7c785d33b4e10d6ff5f75d525aeb30 SHA1 4c53ac9f23449c6643bf3d9d7547978c41146922 SHA256 dc3f79617cfe2e3fcc3414542d65424ea22864b289d93f3552853c2ba14df418
-DIST kid3-1.5.tar.gz 1475981 RMD160 f6f3d9bd31d7b28d181d9bcc59fa8018c48852b7 SHA1 d218a311f4f1b60334e5d05d0300e1edd905944f SHA256 b0226bb8e170bab0bfd7bbc61f60c55d11302ab0989df97bf9d47d1924c655ca
+DIST kid3-1.6.tar.gz 1478393 RMD160 7ad7aaf58957be112cea2b2b4962b81fdbb6b6e9 SHA1 64701fa5ee575c6f66e4d0fb70fdaf6c16e54a82 SHA256 974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2
 EBUILD kid3-1.4.ebuild 1147 RMD160 f9ca57bfb5f9c1781a60853013fe658e5215a0d5 SHA1 b58a2dfc45ad2101f3ca60925598b59fa75c6245 SHA256 f47d1a1dc926b42926253fc386f93f245c0e3639db9d48114f3f778c0128c637
-EBUILD kid3-1.5.ebuild 1227 RMD160 acd1e1f0de227a3f61c5dae1e73d0cb6f6f73d38 SHA1 bd4301551515ef9ce665389764a7982408cb0ece SHA256 6035a761cc55894fc162d9ed15aede4001ae9c95ba97aa8ba078be2b5820e25e
-MISC ChangeLog 7128 RMD160 1d2e689d98eea889864484cd4ea5c92431bba9c8 SHA1 3d6a8ca2475c26f6bceb931972ee456fad121c51 SHA256 5ecda23e9e8e6f51b3f020dfdee43f6d06784d1a9e01f1f8acb63c3b84862092
+EBUILD kid3-1.6.ebuild 1123 RMD160 ac90fd5c406d1acfdcf18eb127f7fa63d2cb48f1 SHA1 6887b2748f9789bee376cd4b26425225bed27ec0 SHA256 35dfd1de3e653fe78a57930fea15c6830059523e8d967cae73e3807b42ee7beb
+MISC ChangeLog 7403 RMD160 924547cc023173847fa41b74bf571fc4ec4d47e9 SHA1 e3f98d5bb91fdddd31a5f885c79d876fbec0f64d SHA256 4610d296cbf69a9918bdd5496a90da95fa8d1edbbc93881e69e2b757381ef638
 MISC metadata.xml 179 RMD160 224e1883835fc791f44fdef156866625e02ef60d SHA1 607ee34e3564d7e6d8e0ada382cf18c0315ba5fb SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2t84UACgkQHB6c3gNBRYfG5ACfT+Y+8qj5vxf5U7DlyDtt+n1k
+O6wAoK5pnvgqS6Vl1KEWq6D95O5AcG5l
+=Azne
+-----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/kid3-1.5.ebuild b/media-sound/kid3/kid3-1.6.ebuild
index 8b024231e93b..3ec2aee6b085 100644
--- a/media-sound/kid3/kid3-1.5.ebuild
+++ b/media-sound/kid3/kid3-1.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.5.ebuild,v 1.1 2010/10/17 18:07:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.6.ebuild,v 1.1 2011/04/19 20:42:07 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
+KDE_REQUIRED="optional"
+KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="A simple tag editor for KDE"
@@ -13,7 +15,7 @@ SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac +handbook mp3 mp4 +taglib vorbis"
+IUSE="flac mp3 mp4 +taglib vorbis"
 
 RDEPEND="
 	flac? (
@@ -26,24 +28,18 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	# -DWITH_TUNEPIMP is using deprecated RDF WebService
-	# -DWITH_KDE=OFF doesn't compile, last checked 1.4
+REQUIRED_USE="flac? ( vorbis )"
 
-	mycmakeargs+=(
+src_configure() {
+	local mycmakeargs=(
 		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with kde)
 		$(cmake-utils_use_with mp3 ID3LIB)
 		$(cmake-utils_use_with mp4 MP4V2)
+		$(cmake-utils_use_with vorbis)
 		$(cmake-utils_use_with taglib)
 		"-DWITH_TUNEPIMP=OFF"
-		"-DWITH_KDE=ON"
 		)
 
-	if use flac; then
-		mycmakeargs+=( "-DWITH_VORBIS=ON" )
-	else
-		mycmakeargs+=( $(cmake-utils_use_with vorbis) )
-	fi
-
 	kde4-base_src_configure
 }