Remove old.

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

6 files changed, 8 insertions, 280 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 609b138d6c2d..2ec998fdd64f 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.435 2012/08/22 22:59:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.436 2012/08/22 23:17:45 johu Exp $
+
+  22 Aug 2012; Johannes Huber <johu@gentoo.org> -amarok-2.4.3-r1.ebuild,
+  -files/amarok-2.3.2-fix-qt-regression.patch,
+  -files/amarok-2.3.2-flac-fix.patch,
+  -files/amarok-2.4.0.90-fix-plugin-detection.patch,
+  -files/amarok-fix-upnp-dep.patch:
+  Remove old.
 
   22 Aug 2012; Michael Weber <xmw@gentoo.org> amarok-2.5.0-r4.ebuild:
   ppc stable (bug 418321).
diff --git a/media-sound/amarok/amarok-2.4.3-r1.ebuild b/media-sound/amarok/amarok-2.4.3-r1.ebuild
deleted file mode 100644
index ba7a7e1bb329..000000000000
--- a/media-sound/amarok/amarok-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,119 +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/amarok/amarok-2.4.3-r1.ebuild,v 1.7 2012/07/19 15:56:45 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-script:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep kdemultimedia-kioslaves)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( =media-libs/liblastfm-0.3* )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		x11-libs/qt-core:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep phonon-kde)
-	!media-sound/amarok-utils
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-			echo
-		fi
-	fi
-}
diff --git a/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch b/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
deleted file mode 100644
index 4e8faec3ad9a..000000000000
--- a/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 79d86829294ac54132c01153660e70e30c15c378 Mon Sep 17 00:00:00 2001
-From: Jeff Mitchell <mitchell@kde.org>
-Date: Wed, 22 Sep 2010 18:15:17 -0400
-Subject: [PATCH] Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes don't properly check for invalid chars when writing XML, even if you tell them to.
-
-Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class.
-
-BUG: 251762
----
- utilities/collectionscanner/CollectionScanner.cpp |   27 +++++++++++++-------
- 1 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index 0a23a53..28c554b 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -37,13 +37,13 @@
- #include <QByteArray>
- #include <QDBusReply>
- #include <QDir>
--#include <QDomDocument>
- #include <QFile>
- #include <QtDebug>
- #include <QTextCodec>
- #include <QTextStream>
- #include <QTimer>
- #include <QThread>
-+#include <QXmlStreamWriter>
- 
- //Taglib:
- #include <apetag.h>
-@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
- void
- CollectionScanner::writeElement( const QString &name, const AttributeHash &attributes )
- {
--    QDomDocument doc; // A dummy. We don't really use DOM, but SAX2
--    QDomElement element = doc.createElement( name );
-+    QString text;
-+    QXmlStreamWriter writer( &text );
-+
-+    writer.writeStartElement( name );
- 
-     QHashIterator<QString, QString> it( attributes );
-     while( it.hasNext() )
-@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
-         bool noCategory = false;
-         for( unsigned i = 0; i < len; i++ )
-         {
--            if( data[i].category() == QChar::NoCategory )
-+            if( data[i].category() == QChar::NoCategory ||
-+                data[i].category() == QChar::Other_Surrogate ||
-+                ( 
-+                    data[i].unicode() < 20 &&
-+                    data[i].unicode() != 9 &&
-+                    data[i].unicode() != 10 &&
-+                    data[i].unicode() != 13
-+                )
-+            )
-             {
-                 noCategory = true;
-                 break;
-@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
- 
-         if( noCategory )
-             continue;
--
--        element.setAttribute( it.key(), it.value() );
-+        writer.writeAttribute( it.key(), it.value() );
-     }
- 
--    QString text;
--    QTextStream stream( &text, QIODevice::WriteOnly );
--    element.save( stream, 0 );
-+    writer.writeEndElement();
- 
--    std::cout << text.toUtf8().data() << std::endl;
-+    std::cout << text.toUtf8().data() << std::endl << std::endl;
- }
- 
- // taken verbatim from Qt's sources, since it's stupidly in the QtGui module
--- 
-1.7.0.4
-
diff --git a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch b/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
deleted file mode 100644
index 341582658c46..000000000000
--- a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit ce57e4264d0395b15e7253e3cdef48e36a8b129c
-Author: Jeff Mitchell <mitchell@kde.org>
-Date:   Fri Sep 17 13:02:38 2010 -0400
-
-    FLAC BPM tags could be read in incorrectly.
-    
-    BUG: 234166
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index a9d6755..0a23a53 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -701,7 +701,7 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
-                     attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() )
--                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat();
-+                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
-                     disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed();
\ No newline at end of file
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
deleted file mode 100644
index d075ba048601..000000000000
--- a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
-Author: Rick W. Chen <stuffcorpse@archlinux.us>
-Date:   Thu Mar 17 18:38:19 2011 +1300
-
-    Fix plugin loading and bump_plugin_version.rb script
-
-diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
-index ff52646..1e34510 100644
---- a/src/PluginManager.cpp
-+++ b/src/PluginManager.cpp
-@@ -32,7 +32,7 @@
- #include <QFile>
- #include <QMetaEnum>
- 
--const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
-+const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
- Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
- 
- Plugins::PluginManager*
diff --git a/media-sound/amarok/files/amarok-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
deleted file mode 100644
index 878c013fa972..000000000000
--- a/media-sound/amarok/files/amarok-fix-upnp-dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
---- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
-+++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
-@@ -105,6 +105,10 @@
-     macro_optional_find_package(QJSON)
-     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
- 
-+    # HUpnp is required for the upnp plugin
-+    macro_optional_find_package(HUpnp)
-+    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
-+
-     # macro_optional_find_package(Strigi)
-     # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
- 
-diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
---- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
-+++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
-@@ -25,4 +25,6 @@
- if( QJSON_FOUND )
-     add_subdirectory( playdarcollection )
- endif( QJSON_FOUND )
--add_subdirectory( upnpcollection )
-+if( HUPNP_FOUND )
-+    add_subdirectory( upnpcollection )
-+endif( HUPNP_FOUND )
-diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
---- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
-+++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
-@@ -6,7 +6,7 @@
- # HUPNP_LIBRARIES
- # HUPNP_FOUND
- 
--find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
-+find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
- 
- find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
-