Remove old.

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

4 files changed, 13 insertions, 132 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 0d58e8658cb2..a32889a27575 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kid3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.67 2012/07/10 20:03:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.68 2012/07/10 20:05:43 johu Exp $
+
+  10 Jul 2012; Johannes Huber <johu@gentoo.org>
+  -files/kid3-2.0.1-mp4v2-1.9.1_p479.patch, -kid3-2.0.1.ebuild:
+  Remove old.
 
   10 Jul 2012; Agostino Sarubbo <ago@gentoo.org> kid3-2.1.ebuild:
   Stable for amd64, wrt bug #425518
@@ -269,4 +273,3 @@
 
   26 Apr 2004; Dominik Stadler <centic@gentoo.org> :
   Add new ebuild for kid3, see Bug 23014.
-
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index c45bb13358b9..e67558fea344 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX kid3-2.0.1-mp4v2-1.9.1_p479.patch 2568 SHA256 85fa8d8ca2d1d99925237f5b8a4096434bf0e9cee4d8e6a6691d9716ab03db61 SHA512 a73e097d3e33ef5ca8eac8c22d1e2afc3ff605840b16d8995497d3001c934222f4e5a410131d218cb9c70910d10b462fbb4494ec8012680161ac81407413a119 WHIRLPOOL 94de84f48dda43f0e63c742a410ca19cb8db5862f3dde5406fb63ec14d17540933caf62f765dce2f9bd3f5ba4027cecba8c342bbc025147ae0087f2c51dbcd36
-DIST kid3-2.0.1.tar.gz 805506 SHA256 32c3bdf5a3f170076e46c5f3b9523f688e8ea6265d22d2264c1bcd318da9f32e SHA512 3118ae3134198d6295dd407210516c13052905647acded7c109327078b9a22a8cf8f68524e635882f9f34cc7314ae990fdf17c4854d29366eea8e578e86540dd WHIRLPOOL c1aa8e9eb04b2451012d3a690c499d92a4e3efadff968712b0812ea4fc77840dd5ec29a42f98441838b179dfaa2825ec89400537cb4e1068f3d27c3cb1304002
 DIST kid3-2.1.tar.gz 915298 SHA256 8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225 SHA512 8c3d6e7329f0a7bf921b17c9a8a793f6820e0d64deaabcdaf07f94988756b6645f64bc8aec90bd02a236ea0f763657e54315a983d09ad6e4ef2545e62dd8c839 WHIRLPOOL 400c4ee40b08e0dffb85b526df6ab0b038605fea43556cbb9d515b98a1a0664b8e26438a8d04a35a940660b255af9c8abfa24c7b1ab4fcd07be024fb03fbbb60
-EBUILD kid3-2.0.1.ebuild 1146 SHA256 931439de875a00fc989a8e65b07b39b048447b10fd1a4db8d0db7c65a95922a7 SHA512 cf58d94d9953266c5a26146c034d7a4fb0525aff2671fef3e4a1e95981414284904e2a49b155dd424c97953b8d3d61f029dff7158f91599465dc925b0fb0d6db WHIRLPOOL e80224dc515c8bc79a9be1c9dd5ce8338d863516d7fb5717191122b1625d7c0ff240ce6d95672d4c34983214769739d48f7efeb08833ca6feb1e9076018a844b
 EBUILD kid3-2.1.ebuild 1231 SHA256 50abad448552a97395930e1c5d37ee10e68e1e5913b3c79c4797edbc112350ef SHA512 2cce315f07839c1c33c4458521035a28e8521f1cf151bdff65def4ab0132e3d3ed0f61c2313a2702b7dfa6a1feb4e01ac5af6e2dec1826e16e36bbb1c1f16e2a WHIRLPOOL 25620c3d3ea64d9b1d6056515f2c106a8a6951b06a7dba74871bb4da60bdbcf77af730332d147ce3623a17c016429efd1a7a5b8c4a207bf9c95240dab671c0a8
-MISC ChangeLog 9071 SHA256 99528e4f6a54b61ae0f79e8871511b9e6cc46cc296294dbcb0fe441838a385a3 SHA512 15f2b57e40496959dff0968d60470b4011437db2614d48b054851091666b2175f56d6220a78995dd4db8e2534804de50b9ed7269677ebdcb067d5b8c16ad0522 WHIRLPOOL f4f5148a978b88a120b49b34c773a1e73953bf9754983f966761d578a7071a067cfd4ad8d22280307db03f0931e097d915cf332af13fe239a658787b80a00cf5
+MISC ChangeLog 9198 SHA256 9dc2c1e714271bbe9a9ff6a6ce220ddab8e2a40dd07e0600a8a722ae5529b713 SHA512 641dde86329d0fc1bf05c2bf19aff10f0da597e1158c43963b5ca045a36a6df6ffe56565b19e5e1c5ebc24415ef4e322bbfd72d516f61e1a46915805a0f69497 WHIRLPOOL 1b1880c7f36ec2626d74f45544c7c0c96e145d5b9b2d6ddcc6791749255e6a40cf4a7db875d2de67c09144ba267ecf2510dc35be31682d2220d111ccd7c69a75
 MISC metadata.xml 473 SHA256 5225ddd7bca30faeb7f75a98bcc485395707b272134997cfd7a85f254abecc4e SHA512 d9f6311178797c0293921c263a36e7d6c07e5a83ad86dcc568a78824e4e78add4c733cf2d9e38d79f4d559a04b56dabe11f545a2a2fe70b3fd53f4aaa151c486 WHIRLPOOL 1476f04ce8607903f0e7f4501b2e6b6992a5ed414502ea83e50d04d6be4274c370234044052fa54acc2ab1edbf1522754689d5b602b1f16ce7f7bcb9426040ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP/IqOAAoJEOTDgjZ80txdojMH+gK4NGLDIAsAFstxgXjo+GjP
-AQJdEZMnmwEFQiFrj3gI1szAQFogw0dNdXMW4GBikU///y6eX0Y1klrZp2S1sn7o
-Wjn0xHAydjCSvYeSYmEvSpTYw03s396omXjQ6dsChDhJmrlYFVgfkaPuVgvsMnC2
-WOUPueXQMCDGd8+VcFOvpobzJAZ4X5+iWB5ZiG6GUVBDuidAW29b4TpTki04jFPC
-/OWOq00Zd0B++it2nQ6GNHhjZv/7VIm2mm8XPIvDuRnAkix3lrh54klAVELcXyXt
-MdK0S3yjQTUz4owTY87xfEBbg6C1dVoaU7jbItihRQy17sz00HyUhqLSNnUjdUM=
-=/BoX
+iQEcBAEBCgAGBQJP/IscAAoJEO+t9ga+3I3ahMAH/jGlNsnaJ+WTZNq1vLDEtp8H
+UcFIgHUvR62Zjvl7G6ztTnPSyyndhy61CSsRGU18Ur+V3zZ1p+6GuUJpSgldRDwU
+Wk3HAktHpsD/eeHC3FrAcSpMcFiAFlzxpeJKI6wZyg/Z9T1s0F0uuuSXlD1QyEo4
+Gs1FPK4FPg+AATMQCQ7c7m1mtQYKxN7t4Yb++KNfosu/18SIV0yqZd1CV8mFUe7e
+DBgMvtjJlDn/TsFyShXv68Tr3lXuuwo3A3Wb6D8bv0Q7wEbSN99801Q0BfMSTiPw
+3FkvrbXvEYqH4RkK0Whzb/8PZjJgfpueNNAtJTwj/U+yJ1T/5/9HF2t+COc+YIA=
+=GTyT
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch b/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch
deleted file mode 100644
index 3f213eccb287..000000000000
--- a/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From e4ab371868f1a23d31f26234ffde6b4cc6594a0a Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Sun, 1 Apr 2012 18:04:56 +0200
-Subject: [PATCH 1/1] Support building with mp4v2-trunk-r479.
-
----
- src/core/formats/m4afile.cpp |   21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/src/core/formats/m4afile.cpp b/src/core/formats/m4afile.cpp
-index 0b79728..bf50beb 100644
---- a/src/core/formats/m4afile.cpp
-+++ b/src/core/formats/m4afile.cpp
-@@ -57,6 +57,13 @@
- #define MPEG4IP_MAJOR_MINOR_VERSION 0x0009
- #endif
- 
-+#if MPEG4IP_MAJOR_MINOR_VERSION < 0x0200
-+#define MP4TagsSetContentID MP4TagsSetCNID
-+#define MP4TagsSetArtistID MP4TagsSetATID
-+#define MP4TagsSetPlaylistID MP4TagsSetPLID
-+#define MP4TagsSetGenreID MP4TagsSetGEID
-+#endif
-+
- /**
-  * Constructor.
-  *
-@@ -240,7 +247,9 @@ static Frame::Type getTypeForName(const QString& name,
-   return Frame::FT_UnknownFrame;
- }
- 
--#ifndef HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
-+#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0109
-+#elif defined HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
-+#else
- /**
-  * Check if a name is a free form field.
-  *
-@@ -649,7 +658,7 @@ bool M4aFile::writeTags(bool force, bool* renamed, bool preserve)
-             MP4TagsSetCompilation(tags, &cpl);
-           } else if (name == "covr") {
-             MP4TagArtwork artwork;
--            artwork.data = value.data();
-+            artwork.data = (void *)value.data();
-             artwork.size = value.size();
-             artwork.type = MP4_ART_UNDEFINED;
-             MP4TagsAddArtwork(tags, &artwork);
-@@ -722,16 +731,16 @@ bool M4aFile::writeTags(bool force, bool* renamed, bool preserve)
-             MP4TagsSetITunesCountry(tags, &val);
-           } else if (name == "cnID") {
-             uint32_t val = str.toULong();
--            MP4TagsSetCNID(tags, &val);
-+            MP4TagsSetContentID(tags, &val);
-           } else if (name == "atID") {
-             uint32_t val = str.toULong();
--            MP4TagsSetATID(tags, &val);
-+            MP4TagsSetArtistID(tags, &val);
-           } else if (name == "plID") {
-             uint64_t val = str.toULongLong();
--            MP4TagsSetPLID(tags, &val);
-+            MP4TagsSetPlaylistID(tags, &val);
-           } else if (name == "geID") {
-             uint32_t val = str.toULong();
--            MP4TagsSetGEID(tags, &val);
-+            MP4TagsSetGenreID(tags, &val);
-           } else {
-             MP4ItmfItem* item = MP4ItmfItemAlloc("----", 1);
-             item->mean = strdup("com.apple.iTunes");
--- 
-1.7.4.1
diff --git a/media-sound/kid3/kid3-2.0.1.ebuild b/media-sound/kid3/kid3-2.0.1.ebuild
deleted file mode 100644
index 170280d726c2..000000000000
--- a/media-sound/kid3/kid3-2.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-2.0.1.ebuild,v 1.5 2012/06/11 11:13:49 ago Exp $
-
-EAPI=4
-KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
-KDE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A simple tag editor for KDE"
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="flac mp3 mp4 +taglib vorbis"
-
-RDEPEND="
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( media-libs/taglib )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-mp4v2-1.9.1_p479.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with flac)
-		$(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"
-		)
-
-	kde4-base_src_configure
-}