old

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

4 files changed, 4 insertions, 164 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 0199e5f91d3c..4d3daa4d196d 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kid3-1.3-compile-without-vorbis.patch 2448 RMD160 5b2ee199346079cef0aeba70fef6c0c393e2b3cf SHA1 8a644745ce416afb57461b1e546d99149d3b1bef SHA256 ae311b6ba8f103c1d4d8120c550963769f15427549bdc795562a2a04bbec0583
 DIST kid3-1.2-libmp4v2.patch.bz2 8675 RMD160 8b25ad54e4c3718004686731a0b638c84226f4a1 SHA1 737f4567a82c0ff3d06dde88dcd56211fe8dc213 SHA256 ce277cd64c476966bfa760a94885ea1b75a0d5f3229069cd0e4f3cd1f5c7eaf6
 DIST kid3-1.2.tar.gz 1381577 RMD160 3df2b29de8204611f1621c3764487263442f0531 SHA1 267eaab450293a722d146c1511c0bbc24cd5e286 SHA256 55959970708c720574f25420215f6ff43ed468df7905ae45517d6b1dc07ffa6f
-DIST kid3-1.3.tar.gz 1497859 RMD160 d46fd7c929231c464bee5fb722fd3003df45fc46 SHA1 0c0535fe254bf0e2f6d09db41d116bf1f2ef810b SHA256 1984668da45cd40bcfdf4ecfe04487bb0fa366912603077ca6a6614a483905e6
 DIST kid3-1.4.tar.gz 1539244 RMD160 c73090e90d7c785d33b4e10d6ff5f75d525aeb30 SHA1 4c53ac9f23449c6643bf3d9d7547978c41146922 SHA256 dc3f79617cfe2e3fcc3414542d65424ea22864b289d93f3552853c2ba14df418
-EBUILD kid3-1.2-r3.ebuild 1120 RMD160 d98c0c2b039dfb947acda9cf183714d4b900ec3f SHA1 86a738e3d05a23e0fd55e8224550524be891c35e SHA256 872f5824e8c0507a730d098140f32392a746a7bb0670c1d5b664b51a2cf05681
-EBUILD kid3-1.3.ebuild 1129 RMD160 f7c2be8d3148f49305d76e58d14ebe7783ba86ec SHA1 d7513c2b9030a3a0eb58bfe3b42289708399e5ac SHA256 0d7874251cf3d83d07536629366a61a2fe3233e6c34ba41425479e5548289c51
+EBUILD kid3-1.2-r3.ebuild 1111 RMD160 a91a032b2946e953ffd8b28ce122c65d32a4a928 SHA1 e0cde7984056899ef015c2d0d7f73eed01037b41 SHA256 43de5e8e394ae6cda8182edb4fa1bb0d2f52780a7e532e1d3dc570c5a53c7367
 EBUILD kid3-1.4.ebuild 1037 RMD160 75ba4d998978f4459d7127e545a1cde76355e825 SHA1 95663eeeb8e9374cc68622f233a524a9212539f4 SHA256 48dde966ab73e98d4ac3636afc9f4ee53a8e402982c66cd96551dd6f42c420e7
 MISC ChangeLog 6670 RMD160 b2a89794dfc104f0186c7e60b8843dd3053ef52d SHA1 3d10ae23b30554f25e836925dd64363776390cdf SHA256 90a07676e86c465c010c73fb92d2bb091e60a46e4c50d66da8d28a836e029664
 MISC metadata.xml 179 RMD160 224e1883835fc791f44fdef156866625e02ef60d SHA1 607ee34e3564d7e6d8e0ada382cf18c0315ba5fb SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkveUBIACgkQvFcC4BYPU0qqkwCfT4jtP5RGMVbAG0gWO7I6dNxS
-QmwAoLnBL+dOMXAj9gVpJDzyXQwakGmq
-=9746
------END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch b/media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch
deleted file mode 100644
index fcc3416caaaa..000000000000
--- a/media-sound/kid3/files/kid3-1.3-compile-without-vorbis.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ur kid3-1.3-orig/kid3/oggfile.cpp kid3-1.3/kid3/oggfile.cpp
---- kid3-1.3-orig/kid3/oggfile.cpp	2009-09-20 12:22:55.000000000 +0300
-+++ kid3-1.3/kid3/oggfile.cpp	2009-11-23 15:23:24.992619259 +0200
-@@ -636,6 +636,49 @@
- }
- 
- /**
-+ * Read information about an Ogg/Vorbis file.
-+ * @param fn file name
-+ * @return true if ok.
-+ */
-+bool OggFile::FileInfo::read(const char* fn)
-+{
-+	valid = false;
-+	FILE* fp = ::fopen(fn, "rb");
-+	if (fp) {
-+		OggVorbis_File vf;
-+		if (::ov_open(fp, &vf, NULL, 0) == 0) {
-+			vorbis_info* vi = ::ov_info(&vf, -1);
-+			if (vi) {
-+				valid = true;
-+				version = vi->version;
-+				channels = vi->channels;
-+				sampleRate = vi->rate;
-+				bitrate = vi->bitrate_nominal;
-+				if (bitrate <= 0) {
-+					bitrate = vi->bitrate_upper;
-+				}
-+				if (bitrate <= 0) {
-+					bitrate = vi->bitrate_lower;
-+				}
-+			}
-+#ifdef WIN32
-+			duration = (long)::ov_time_total(&vf, -1);
-+#else
-+			duration = ::lrint(::ov_time_total(&vf, -1));
-+#endif
-+			::ov_clear(&vf); // closes file, do not use ::fclose()
-+		} else {
-+			::fclose(fp);
-+		}
-+	}
-+	return valid;
-+}
-+#else // HAVE_VORBIS
-+void OggFile::getDetailInfo(DetailInfo& info) const { info.valid = false; }
-+unsigned OggFile::getDuration() const { return 0; }
-+#endif // HAVE_VORBIS
-+
-+/**
-  * Get the format of tag 2.
-  *
-  * @return "Vorbis".
-@@ -809,51 +852,6 @@
- 	return lst;
- }
- 
--
--
--/**
-- * Read information about an Ogg/Vorbis file.
-- * @param fn file name
-- * @return true if ok.
-- */
--bool OggFile::FileInfo::read(const char* fn)
--{
--	valid = false;
--	FILE* fp = ::fopen(fn, "rb");
--	if (fp) {
--		OggVorbis_File vf;
--		if (::ov_open(fp, &vf, NULL, 0) == 0) {
--			vorbis_info* vi = ::ov_info(&vf, -1);
--			if (vi) {
--				valid = true;
--				version = vi->version;
--				channels = vi->channels;
--				sampleRate = vi->rate;
--				bitrate = vi->bitrate_nominal;
--				if (bitrate <= 0) {
--					bitrate = vi->bitrate_upper;
--				}
--				if (bitrate <= 0) {
--					bitrate = vi->bitrate_lower;
--				}
--			}
--#ifdef WIN32
--			duration = (long)::ov_time_total(&vf, -1);
--#else
--			duration = ::lrint(::ov_time_total(&vf, -1));
--#endif
--			::ov_clear(&vf); // closes file, do not use ::fclose()
--		} else {
--			::fclose(fp);
--		}
--	}
--	return valid;
--}
--#else // HAVE_VORBIS
--void OggFile::getDetailInfo(DetailInfo& info) const { info.valid = false; }
--unsigned OggFile::getDuration() const { return 0; }
--#endif // HAVE_VORBIS
--
- /**
-  * Get value.
-  * @param name name
diff --git a/media-sound/kid3/kid3-1.2-r3.ebuild b/media-sound/kid3/kid3-1.2-r3.ebuild
index fe81da5fc3b1..9db5898157fb 100644
--- a/media-sound/kid3/kid3-1.2-r3.ebuild
+++ b/media-sound/kid3/kid3-1.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.2-r3.ebuild,v 1.5 2009/10/18 18:27:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.2-r3.ebuild,v 1.6 2010/06/28 06:58:51 ssuominen Exp $
 
 EAPI=2
 inherit kde4-base
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
 IUSE="flac mp3 mp4 +musicbrainz +taglib vorbis"
 
 RDEPEND="mp3? ( media-libs/id3lib )
diff --git a/media-sound/kid3/kid3-1.3.ebuild b/media-sound/kid3/kid3-1.3.ebuild
deleted file mode 100644
index 3b3f8542a9dc..000000000000
--- a/media-sound/kid3/kid3-1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.3.ebuild,v 1.2 2009/11/23 13:30:49 spatz Exp $
-
-EAPI=2
-inherit kde4-base
-
-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="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="flac mp3 mp4 musicbrainz +taglib vorbis"
-
-RDEPEND="mp3? ( media-libs/id3lib )
-	taglib? ( media-libs/taglib )
-	mp4? ( media-libs/libmp4v2 )
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac[cxx] )
-	musicbrainz? ( media-libs/musicbrainz:3
-		media-libs/tunepimp )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-compile-without-vorbis.patch"
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with taglib)
-		$(cmake-utils_use_with mp4 MP4V2)
-		$(cmake-utils_use_with mp3 ID3LIB)
-		$(cmake-utils_use_with musicbrainz TUNEPIMP)
-		$(cmake-utils_use_with vorbis)
-		$(cmake-utils_use_with flac)"
-
-	kde4-base_src_configure
-}