Remove media-sound/amarok:3.5 support.

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

4 files changed, 12 insertions, 41 deletions

diff --git a/app-misc/g15composer/ChangeLog b/app-misc/g15composer/ChangeLog
index 621391166ad1..a8890493ebfe 100644
--- a/app-misc/g15composer/ChangeLog
+++ b/app-misc/g15composer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/g15composer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.19 2008/07/31 16:10:42 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.20 2009/11/12 18:33:06 ssuominen Exp $
+
+  12 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  g15composer-3.1.ebuild, g15composer-3.2.ebuild, metadata.xml:
+  Remove media-sound/amarok:3.5 support.
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-misc/g15composer/g15composer-3.1.ebuild b/app-misc/g15composer/g15composer-3.1.ebuild
index 97c7735159f2..ee8cf6702dae 100644
--- a/app-misc/g15composer/g15composer-3.1.ebuild
+++ b/app-misc/g15composer/g15composer-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.1.ebuild,v 1.10 2009/08/15 12:44:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.1.ebuild,v 1.11 2009/11/12 18:33:06 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -12,15 +12,11 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="amarok truetype examples"
+IUSE="truetype examples"
 
 DEPEND="app-misc/g15daemon
 	>=dev-libs/libg15render-1.2[truetype?]
-	truetype? ( media-libs/freetype )
-	amarok? ( kde-base/kdelibs
-		dev-lang/perl[ithreads] )"
-RDEPEND="${DEPEND}
-	amarok? ( dev-perl/DCOP-Amarok-Player )"
+	truetype? ( media-libs/freetype )"
 
 src_configure() {
 	econf \
@@ -39,19 +35,8 @@ src_install() {
 		exeinto "/usr/share/${PN}"
 		doexe examples/*
 	fi
-
-	if use amarok ; then
-		exeinto "/usr/share/apps/amarok/scripts"
-		newexe examples/amarok-g15-perl.pl g15-display.pl
-	fi
 }
 
 pkg_postinst() {
 	elog "Set the user to run g15composer in /etc/conf.d/g15composer before starting the service."
-
-	if use amarok; then
-		echo
-		elog "g15-display.pl was installed into your Amarok script directory."
-		elog "To start it, have a look at Tools -> Script Manager in the Amarok menu."
-	fi
 }
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild
index f41de3de137c..a6c977d04f04 100644
--- a/app-misc/g15composer/g15composer-3.2.ebuild
+++ b/app-misc/g15composer/g15composer-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.2.ebuild,v 1.4 2009/08/15 12:44:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.2.ebuild,v 1.5 2009/11/12 18:33:06 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -12,15 +12,11 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="amarok truetype examples"
+IUSE="truetype examples"
 
 DEPEND="app-misc/g15daemon
 	>=dev-libs/libg15render-1.2[truetype?]
-	truetype? ( media-libs/freetype )
-	amarok? ( kde-base/kdelibs
-		dev-lang/perl[ithreads] )"
-RDEPEND="${DEPEND}
-	amarok? ( dev-perl/DCOP-Amarok-Player )"
+	truetype? ( media-libs/freetype )"
 
 src_configure() {
 	econf \
@@ -39,19 +35,8 @@ src_install() {
 		exeinto "/usr/share/${PN}"
 		doexe examples/*
 	fi
-
-	if use amarok ; then
-		exeinto "/usr/share/apps/amarok/scripts"
-		newexe examples/amarok-g15-perl.pl g15-display.pl
-	fi
 }
 
 pkg_postinst() {
 	elog "Set the user to run g15composer in /etc/conf.d/g15composer before starting the service."
-
-	if use amarok; then
-		echo
-		elog "g15-display.pl was installed into your Amarok script directory."
-		elog "To start it, have a look at Tools -> Script Manager in the Amarok menu."
-	fi
 }
diff --git a/app-misc/g15composer/metadata.xml b/app-misc/g15composer/metadata.xml
index e2b251b390e3..40c3205e9017 100644
--- a/app-misc/g15composer/metadata.xml
+++ b/app-misc/g15composer/metadata.xml
@@ -6,7 +6,4 @@
   <email>chainsaw@gentoo.org</email>
   <name>Tony Vroon</name>
 </maintainer>
-<use>
-  <flag name='amarok'>Enable display of titles played in Amarok</flag>
-</use>
 </pkgmetadata>