Version bump, some ebuild rework (amarok scripts)

svn path=/trunk/; revision=50

7 files changed, 71 insertions, 19 deletions

diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index 9d0829e..4ca0da7 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -1,10 +1,18 @@
-AUX g15composer-1.0.rc 751 RMD160 cbd0b03db8129852779030f52557543a0bc5dfe8 SHA1 dbc4b246b40880030bbd390443947ebb8390f1de SHA256 4e4046ae8d7ae1a34f43fd7e0c306ff207adda85212f356b94d44f05753c8af1
-MD5 9e19d5dd98b2bbc9020710a162fdfb13 files/g15composer-1.0.rc 751
-RMD160 cbd0b03db8129852779030f52557543a0bc5dfe8 files/g15composer-1.0.rc 751
-SHA256 4e4046ae8d7ae1a34f43fd7e0c306ff207adda85212f356b94d44f05753c8af1 files/g15composer-1.0.rc 751
+AUX g15composer-1.0.rc 752 RMD160 20590849401cf57f9bf8ffbb2b2c83e9049fa0d4 SHA1 bf0b6bc9f8bb246307a337ef71aca546a4dd0b40 SHA256 384fc0e9513feb9f11c7854f533d47463a88015e8c6f0a5746098e3b65dd2fc2
+MD5 d5e374b56f2e05365f3f9cbfbeec6b42 files/g15composer-1.0.rc 752
+RMD160 20590849401cf57f9bf8ffbb2b2c83e9049fa0d4 files/g15composer-1.0.rc 752
+SHA256 384fc0e9513feb9f11c7854f533d47463a88015e8c6f0a5746098e3b65dd2fc2 files/g15composer-1.0.rc 752
+AUX g15composer-2.1.confd 334 RMD160 201d38323e1425e2a42c9033d42ed7f93b5164d5 SHA1 a1a1c902681cc1ff24ee81598b824ce1b4af19db SHA256 88ce03f1427db99b2fbafcda352a1597a068491ae79b65af58815294c593ec76
+MD5 76c8067d89a245c98df65477eb1d7c13 files/g15composer-2.1.confd 334
+RMD160 201d38323e1425e2a42c9033d42ed7f93b5164d5 files/g15composer-2.1.confd 334
+SHA256 88ce03f1427db99b2fbafcda352a1597a068491ae79b65af58815294c593ec76 files/g15composer-2.1.confd 334
+AUX g15composer-2.1.rc 579 RMD160 f333a36306c2d490f053f97c1ce1d02b1d10e0e1 SHA1 215c7e262e23c4317e8ae6a959e1e6a7546add56 SHA256 45add6124ab4e5828842a27d8f0818bc691fccf9f8a87b66ce829e2effa41c1d
+MD5 d9f7f8b404ea0078b07bd02cb6975de5 files/g15composer-2.1.rc 579
+RMD160 f333a36306c2d490f053f97c1ce1d02b1d10e0e1 files/g15composer-2.1.rc 579
+SHA256 45add6124ab4e5828842a27d8f0818bc691fccf9f8a87b66ce829e2effa41c1d files/g15composer-2.1.rc 579
 DIST g15composer-1.0.tar.bz2 68465 RMD160 0a7f16ff1f2609096728f08e7dfb774a55018f2b SHA1 3482a2f9f5efc14429a10b2d9f2a7bcd35f29c0b SHA256 13fada88ccfac737d6429a55816543531e22835e0481ecbe8cc8db9212872150
 DIST g15composer-1.1.tar.bz2 70140 RMD160 51d431adfc4469f8195c077d49e82b98bea04b57 SHA1 6b30f1c521fb1c45f7ce628fc812a09feb6e827a SHA256 52220b0e3e1219ecf5504f8b70d7be23a4e12d640b9367e34a3db6bbfe2dc2ef
-DIST g15composer-2.0.tar.bz2 73208 RMD160 3a9f6dfcedfceee7c9a705f735fa21152f06d3fd SHA1 75754c5df0a71b3d4ecdb16e96f262e72d5c974c SHA256 7bd420a9b5ae1cc816a64ce64128eb8094df4be0277a0afa65e1292328a7ba33
+DIST g15composer-2.1.tar.bz2 73269 RMD160 ed16f6d85a4042c597df7e9d8a5909a52b893eca SHA1 7c9953c08320ae9feda8dcd398315cc6b2b1664b SHA256 bbde3ac09db37b9aeb8f67e89e4cadc6c92e1529b3b9b431d863ddcecb9aa58e
 EBUILD g15composer-1.0.ebuild 939 RMD160 de4230dd9bae1792e485f9eb0e2bdeb3d3e983ab SHA1 7b6c5e616b7f79b8f41703b167b82ffdaa66635d SHA256 91079494a02ff7d7c1f3ec171fb78dfa10a0a9a75e989b228be25ac46fe325b1
 MD5 182edbad47ab12db05739d1bfaf268f3 g15composer-1.0.ebuild 939
 RMD160 de4230dd9bae1792e485f9eb0e2bdeb3d3e983ab g15composer-1.0.ebuild 939
@@ -13,10 +21,10 @@ EBUILD g15composer-1.1.ebuild 946 RMD160 f386cd736d05a61e468a9b0219f6eaf4b44ab97
 MD5 cf4b195dae57cffb9d99722e21dff7c4 g15composer-1.1.ebuild 946
 RMD160 f386cd736d05a61e468a9b0219f6eaf4b44ab973 g15composer-1.1.ebuild 946
 SHA256 d01eb2b511a4641a101b28b2e34c2f9b468e1694633ba91c3effa11edce0958e g15composer-1.1.ebuild 946
-EBUILD g15composer-2.0.ebuild 1178 RMD160 40834f4350a0bb969d28cbb64ff85bbb5ec9519f SHA1 68cdb81edaf002cadcbeef89f83d9e7ae1f2a083 SHA256 bbf520cd92bb4e0ff455883ffbc6e3b265a649ab89047cf49094c54c7792397b
-MD5 f71cf913ac4d709d6ce92be2231560b5 g15composer-2.0.ebuild 1178
-RMD160 40834f4350a0bb969d28cbb64ff85bbb5ec9519f g15composer-2.0.ebuild 1178
-SHA256 bbf520cd92bb4e0ff455883ffbc6e3b265a649ab89047cf49094c54c7792397b g15composer-2.0.ebuild 1178
+EBUILD g15composer-2.1.ebuild 1515 RMD160 9342435c4b90222fc53851e46473b7ae7b43eb31 SHA1 3c9a3a8ce67df6960966957f129284783ee5abe1 SHA256 bf190f03d47f48d17e9853bd992d145e7484eca5f1237a0a4f5acbd67e9ca69d
+MD5 75f30657599faecb4da3c5409fcab64c g15composer-2.1.ebuild 1515
+RMD160 9342435c4b90222fc53851e46473b7ae7b43eb31 g15composer-2.1.ebuild 1515
+SHA256 bf190f03d47f48d17e9853bd992d145e7484eca5f1237a0a4f5acbd67e9ca69d g15composer-2.1.ebuild 1515
 MISC ChangeLog 664 RMD160 c227080a605d6296c73ee067ae0c28c6310c00ed SHA1 70ecd8a6618ca8a62c86c9dbb6000557b8b998f4 SHA256 e802316f9acfd2c30341d31caa15f1d468486d5720ae314d654c35630227883f
 MD5 40a515817a7cbbdd79f6ff33a5d768c2 ChangeLog 664
 RMD160 c227080a605d6296c73ee067ae0c28c6310c00ed ChangeLog 664
@@ -31,6 +39,6 @@ SHA256 a5d7c3967be096ed2be6ab7672749c2b0375f0b786c419359dbcd69bc6a2f484 files/di
 MD5 2e3449a29253129ea374a1d9bddfbf3b files/digest-g15composer-1.1 247
 RMD160 e5459c4b33b6fe418262b541f0e85577e7c14a33 files/digest-g15composer-1.1 247
 SHA256 b091cfe0c46fdb2c731d12fa43710413903dce760c5089ffd83b94caa3fbb0b7 files/digest-g15composer-1.1 247
-MD5 1c1116d35c173bc915dd5e49596f05df files/digest-g15composer-2.0 247
-RMD160 ff01b81eb55bae2d1f52984168ec0234c17654db files/digest-g15composer-2.0 247
-SHA256 b1921ba17592e8595a8ec271d08d0ed1fd27454384cfb18991f2cffec1ed2a37 files/digest-g15composer-2.0 247
+MD5 dec7a738f7e947b85546abf54af5d054 files/digest-g15composer-2.1 247
+RMD160 5b7de726f99dc027b975e7d881267adb61af373b files/digest-g15composer-2.1 247
+SHA256 ca142ac7a46ea37587b38a153c94432613d51e940c61b0f471fb94d328c59e5b files/digest-g15composer-2.1 247
diff --git a/app-misc/g15composer/files/digest-g15composer-2.0 b/app-misc/g15composer/files/digest-g15composer-2.0
deleted file mode 100644
index 5835142..0000000
--- a/app-misc/g15composer/files/digest-g15composer-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ac0be41e09fd71183faed8019c394a9d g15composer-2.0.tar.bz2 73208
-RMD160 3a9f6dfcedfceee7c9a705f735fa21152f06d3fd g15composer-2.0.tar.bz2 73208
-SHA256 7bd420a9b5ae1cc816a64ce64128eb8094df4be0277a0afa65e1292328a7ba33 g15composer-2.0.tar.bz2 73208
diff --git a/app-misc/g15composer/files/digest-g15composer-2.1 b/app-misc/g15composer/files/digest-g15composer-2.1
new file mode 100644
index 0000000..81b82d5
--- /dev/null
+++ b/app-misc/g15composer/files/digest-g15composer-2.1
@@ -0,0 +1,3 @@
+MD5 65f38249fe14afb482e763ae0abf6ce6 g15composer-2.1.tar.bz2 73269
+RMD160 ed16f6d85a4042c597df7e9d8a5909a52b893eca g15composer-2.1.tar.bz2 73269
+SHA256 bbde3ac09db37b9aeb8f67e89e4cadc6c92e1529b3b9b431d863ddcecb9aa58e g15composer-2.1.tar.bz2 73269
diff --git a/app-misc/g15composer/files/g15composer-1.0.rc b/app-misc/g15composer/files/g15composer-1.0.rc
index a97227d..a2f8493 100644
--- a/app-misc/g15composer/files/g15composer-1.0.rc
+++ b/app-misc/g15composer/files/g15composer-1.0.rc
@@ -25,4 +25,4 @@ stop() {
 	NODE="/dev/${SVCNAME}"
 	rm "${NODE}"
 	eend $?
-}
\ No newline at end of file
+}
diff --git a/app-misc/g15composer/files/g15composer-2.1.confd b/app-misc/g15composer/files/g15composer-2.1.confd
new file mode 100644
index 0000000..4007480
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-2.1.confd
@@ -0,0 +1,8 @@
+# /etc/conf.d/g15composer: Configuration for the g15composer
+
+# The CONTROL_FIFO is the name of the FIFO that g15composer listens to.
+# It does not create a screen on the display, but allows programs to
+# create their own non-virtual screens.
+# Please make sure the file specified does not exist.
+
+CONTROL_FIFO="/var/run/g15composer"
diff --git a/app-misc/g15composer/files/g15composer-2.1.rc b/app-misc/g15composer/files/g15composer-2.1.rc
new file mode 100644
index 0000000..8c1358a
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-2.1.rc
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+	need g15daemon
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec /usr/bin/g15composer -- -b "${CONTROL_FIFO}"
+	chmod 720 "${CONTROL_FIFO}"
+	chgrp users "${CONTROL_FIFO}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
+	rm "${CONTROL_FIFO}"
+	eend $?
+}
diff --git a/app-misc/g15composer/g15composer-2.0.ebuild b/app-misc/g15composer/g15composer-2.1.ebuild
index 836b27f..40152d6 100644
--- a/app-misc/g15composer/g15composer-2.0.ebuild
+++ b/app-misc/g15composer/g15composer-2.1.ebuild
@@ -43,12 +43,23 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	newinitd "${FILESDIR}/${PN}-1.0.rc" ${PN}
+	newinitd "${FILESDIR}/${P}.rc" ${PN}
+	newconfd "${FILESDIR}/${P}.confd" ${PN}
 
 	dodoc AUTHORS README ChangeLog
 
+	exeinto "${ROOT}usr/share/${PN}"
+	doexe examples/*
+
 	if use amarok ; then
-		exeinto "${ROOT}usr/share/${PN}"
-		doexe examples/*
+		exeinto "${ROOT}usr/share/apps/amarok/scripts"
+		newexe examples/amarok-g15-perl.pl g15-display.pl
+	fi
+}
+
+pkg_postinst() {
+	if use amarok; then
+		einfo "g15-display.pl was installed into your Amarok script directory."
+		einfo "To start it, have a look at Tools -> Script Manager in the Amarok menu."
 	fi
 }