old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 3 insertions, 150 deletions

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
-}