Remove media-sound/amarok:3.5 support.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

5 files changed, 16 insertions, 45 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/Manifest b/app-misc/g15composer/Manifest
index 4a49d814059e..2021465c4b3d 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -4,7 +4,7 @@ AUX g15composer-3.2.confd 695 RMD160 179650946e535b994d35c3913a7087d7f2154e68 SH
 AUX g15composer-3.2.initd 1373 RMD160 70d1ec4d4780345f9e67a1833d12b4b81948ad75 SHA1 83c47cc19025ce125a8d232b64187fc29e3f3cc0 SHA256 2cc04630b66e4c335f5c791bf213edd543af4d3424c5fbc2e72b3ccdc243d01e
 DIST g15composer-3.1.tar.bz2 104109 RMD160 ab31de24416452a8a363e0a0ae8856c21706b6fc SHA1 648117dde17d356878dd834de763004d6b6d8f0a SHA256 d8f34c1711e95f8ca3ddd9fd5f557a51bb23b79099fbf2fddb96bdcd03067988
 DIST g15composer-3.2.tar.bz2 105805 RMD160 0fb6a6b18dfda490847a226bdb4175d1102a35ae SHA1 db0085555a36720f6c0d57d32f4fe9549ec1e57a SHA256 0ae3fdac1dd5858bb7185ae5a50a6ff1c657a29d02b44c8a73f1c38cec17b035
-EBUILD g15composer-3.1.ebuild 1517 RMD160 7207ea67fe0c89723c7c6b0f55be7e0e07927df8 SHA1 c4acf27834e20907862a8676ec91d2995149d8eb SHA256 c80cebabfa370ce3ba6482180c849c6884ee29aaebac9d464bb863dbd52e4dce
-EBUILD g15composer-3.2.ebuild 1519 RMD160 7a67d4e639ea60d7c4c131bdc6d2f3fbcc5147aa SHA1 ceff178d24b927b699c313f763c2f74ab26e18c6 SHA256 14e3e7e5f573254b0d285ff9f44e1dd0daa1a013bf2062f7e2ee531821b986fa
-MISC ChangeLog 3433 RMD160 29b411dc4054c4865ec3f8f00fa4ced8cabd2eab SHA1 6ca45f6c48b4c8764ae6a7a3ae36e0d18b6ee470 SHA256 e4fb67def1c11a72b7609f28adbeca5b34078d80af53169aa462ce4f5d159623
-MISC metadata.xml 330 RMD160 34744015c5854172f35f7b473d53b00fc9b4fd89 SHA1 4ca4b886742a389891563f4abaa1e7bfd88be38a SHA256 af26b09b482046ec1d7f5a6a429b56918ffd7f84ad7fe30a4d32fe4e263682df
+EBUILD g15composer-3.1.ebuild 1084 RMD160 365fc4d0e7a19b418c610518e01342d6ff8cdfb2 SHA1 76785a9fde6f56310e4c2678b9184de840564068 SHA256 4a1e36e9471b6c011d13eef61180d65b0694273147678827f4a524f26c953a73
+EBUILD g15composer-3.2.ebuild 1086 RMD160 47400ca6a592d9501ccdcb8b28b706d543d80fae SHA1 a824da656475da8a04b60faefcb6c68c3df97c69 SHA256 118ce75be4c694a7c14dc0f76d4794bd65ebf31917e0bb1da518046687bc11d9
+MISC ChangeLog 3599 RMD160 2572d8a4a5072a6d5f1f201f7daabb8cc4e0a42b SHA1 7bb8b01576f6a3ae955738b311a20da48abfca43 SHA256 427b28dc7378dbf14e43cddcc8fe1f7b6fc931e68e3fd6eb817713885b8a97f2
+MISC metadata.xml 246 RMD160 0ac7ecd181fe47599f66c2f2578a38e676032dcb SHA1 70a99487ee0cbdb8b70cb74d0b3de3c239408996 SHA256 c71908575bcbd9a3f10c7a0d46a74e9267013a91cc0aea8e2ea6b5a6a1d55e46
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>