remove old

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

3 files changed, 5 insertions, 323 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 07109abfadc6..4187f4237942 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.411 2011/10/24 14:55:19 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.412 2011/10/28 23:51:33 abcd Exp $
+
+  28 Oct 2011; Jonathan Callen <abcd@gentoo.org> -amarok-2.4.1.ebuild,
+  -amarok-2.3.2-r1.ebuild:
+  remove old
 
   24 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   amarok-2.4.3.ebuild:
diff --git a/media-sound/amarok/amarok-2.3.2-r1.ebuild b/media-sound/amarok/amarok-2.3.2-r1.ebuild
deleted file mode 100644
index 7806f63bfaa9..000000000000
--- a/media-sound/amarok/amarok-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild,v 1.8 2011/04/20 12:35:50 jmbsvicetto Exp $
-
-EAPI="3"
-
-# Translations are only in the tarballs, not the git repo
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="af bg ca ca@valencia cs da de el en_GB es et fr it ja lt lv nb nds pa pl
-	pt pt_BR ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ~ppc ~ppc64 x86"
-else
-	KDE_SCM="git"
-	KEYWORDS=""
-fi
-
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# The QT regression patch was submitted by Jeff Mitchell at
-# http://gitweb.kde.org/amarok/amarok.git/commitdiff_plain/79d86829294ac54132c01153660e70e30c15c378?hp=fd2a40d970c57fa2102e95de1a60c59e37892638
-PATCHES=(
-	"${FILESDIR}/${P}-flac-fix.patch"
-	"${FILESDIR}/${P}-fix-qt-regression.patch"
-)
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7[dbus,qt4]
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		sys-libs/zlib
-		>=virtual/mysql-5.1
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-		embedded? (
-			|| (
-				>=dev-db/mysql-5.1.50-r3[embedded]
-				>=dev-db/mariadb-5.1.50[embedded]
-			)
-		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
-"
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	if use player; then
-		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)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	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 player; then
-
-		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://amaroklive.com/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
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.4.1.ebuild b/media-sound/amarok/amarok-2.4.1.ebuild
deleted file mode 100644
index dba067033b9c..000000000000
--- a/media-sound/amarok/amarok-2.4.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.1.ebuild,v 1.2 2011/08/23 21:55:04 dilfridge Exp $
-
-EAPI="3"
-
-# Translations are only in the tarballs, not the git repo
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr hu it ja km nb nds nl
-	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	KDE_SCM="git"
-	KEYWORDS=""
-fi
-
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded handbook ipod lastfm mp3tunes mtp opengl playdar +player semantic-desktop upnp +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="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7[dbus,qt4]
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=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.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
-		playdar? ( dev-libs/qjson )
-		upnp? ( kde-misc/kio-upnp-ms )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
-"
-
-# Upstream patch to fix the plugin detection on startup
-# https://projects.kde.org/projects/extragear/multimedia/amarok/repository/revisions/37eda947bd8181a73ad0fffc88e66c25ddd69f28
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-upnp-dep.patch"
-)
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	if use player; then
-		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)
-			$(cmake-utils_use_with playdar QJSON)
-			$(cmake-utils_use_with upnp HUpnp)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	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 player; then
-
-		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://amaroklive.com/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
-	fi
-}