Version bump and init script change

svn path=/trunk/; revision=102

4 files changed, 120 insertions, 38 deletions

diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index b5f8c2e..4ce77db 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX g15composer-1.1.initd 737 RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 SHA1 01637e58637e0879a1b5e9cac926efa318dbee30 SHA256 fe12bcbe0d2a5a8cf7cab7e01bf50f73d37a03571b6b89b955106e5ff5591c69
-MD5 27352b82a03e114a05813dfb4401fc02 files/g15composer-1.1.initd 737
-RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 files/g15composer-1.1.initd 737
-SHA256 fe12bcbe0d2a5a8cf7cab7e01bf50f73d37a03571b6b89b955106e5ff5591c69 files/g15composer-1.1.initd 737
 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
@@ -13,26 +6,24 @@ AUX g15composer-2.1.initd 688 RMD160 f1ecf37edbd86238f8bf8b2d121f99e8523dc0e2 SH
 MD5 d16c0e6f16c4b11908db440b5be7cbc2 files/g15composer-2.1.initd 688
 RMD160 f1ecf37edbd86238f8bf8b2d121f99e8523dc0e2 files/g15composer-2.1.initd 688
 SHA256 f2a663bc3a76a9614272e6001c696407e9145964409fb292f48f76ff062b6a29 files/g15composer-2.1.initd 688
-DIST g15composer-1.1.tar.bz2 70140 RMD160 51d431adfc4469f8195c077d49e82b98bea04b57 SHA1 6b30f1c521fb1c45f7ce628fc812a09feb6e827a SHA256 52220b0e3e1219ecf5504f8b70d7be23a4e12d640b9367e34a3db6bbfe2dc2ef
-DIST g15composer-2.1.tar.bz2 73269 RMD160 ed16f6d85a4042c597df7e9d8a5909a52b893eca SHA1 7c9953c08320ae9feda8dcd398315cc6b2b1664b SHA256 bbde3ac09db37b9aeb8f67e89e4cadc6c92e1529b3b9b431d863ddcecb9aa58e
-DIST g15composer-3.0.1.tar.bz2 96910 RMD160 2883b4445eaa29edd200c3e676c153c8afacf81b SHA256 0800137d4607ebab0461586cc54f817c1ecdf538b41e1cbf4f1627c554afe75b
+AUX g15composer-3.0.3.confd 580 RMD160 1f26cdfcfc8a15fa008c69e9e16018a42feeadd4 SHA1 5dd3306f1b98f564fe290c90734a7a1917c6efc5 SHA256 5138c446c780d8b144149c686c37edb81bd2770c763ad3c3c0b142b6d36c566b
+MD5 913e1552403b2a75c65750d8c7fa8fbc files/g15composer-3.0.3.confd 580
+RMD160 1f26cdfcfc8a15fa008c69e9e16018a42feeadd4 files/g15composer-3.0.3.confd 580
+SHA256 5138c446c780d8b144149c686c37edb81bd2770c763ad3c3c0b142b6d36c566b files/g15composer-3.0.3.confd 580
+AUX g15composer-3.0.3.initd 760 RMD160 9755912503d27798e9ee3cc04b7e6b2e33aa607f SHA1 534077d0ca4a287e60d27a84cb9cd25471d94c54 SHA256 8d56aa0daa6f5d4f0af5cf81e6d7c2d74d2fc94b6b6e9f72c11f8237a0537815
+MD5 5b559dd89afc5a75086f37f7673cdc6b files/g15composer-3.0.3.initd 760
+RMD160 9755912503d27798e9ee3cc04b7e6b2e33aa607f files/g15composer-3.0.3.initd 760
+SHA256 8d56aa0daa6f5d4f0af5cf81e6d7c2d74d2fc94b6b6e9f72c11f8237a0537815 files/g15composer-3.0.3.initd 760
 DIST g15composer-3.0.2.tar.bz2 101556 RMD160 df548cbcffffa5f5e316b852a5f166ae48ab8fd4 SHA1 be3591adb388d47473dd8bea0a7ea191cfb355ca SHA256 615e2991a2de9b656be2550e90ac874c26dba650f4af1fd21feb3f0bda3150c0
-EBUILD g15composer-1.1.ebuild 955 RMD160 f2a56dffe7ebf551c2bfc826ebbda70e235e9905 SHA1 65e84a1c54e8b9d05a15f6a0ff7e3f8490ae793a SHA256 53f8d35723fce7bd9eb16403011c84e4a8db808c4dcc1a8aa56d995078dcc9e8
-MD5 4b2276368095b3df80ae57f29f7ee304 g15composer-1.1.ebuild 955
-RMD160 f2a56dffe7ebf551c2bfc826ebbda70e235e9905 g15composer-1.1.ebuild 955
-SHA256 53f8d35723fce7bd9eb16403011c84e4a8db808c4dcc1a8aa56d995078dcc9e8 g15composer-1.1.ebuild 955
-EBUILD g15composer-2.1-r1.ebuild 1583 RMD160 6e649efe0effb88e5fb1ad44a119755305b46ee0 SHA1 8e40bdda5448321aefe4850e9dfb54c73923532f SHA256 d345bede067d0130bb3c4aeb68d0cf336a4f68da310471b5c4396def22718014
-MD5 81b0b1c760af30a49cfe34f5b881231e g15composer-2.1-r1.ebuild 1583
-RMD160 6e649efe0effb88e5fb1ad44a119755305b46ee0 g15composer-2.1-r1.ebuild 1583
-SHA256 d345bede067d0130bb3c4aeb68d0cf336a4f68da310471b5c4396def22718014 g15composer-2.1-r1.ebuild 1583
-EBUILD g15composer-3.0.1.ebuild 1592 RMD160 0bf18c32211cbbc21a844c2faea5433fd4108345 SHA1 6b066de3cd0c517f147815d6f45a33dd45d35cb4 SHA256 845062bff2dc78aff62051c5198fdc994d53bae5a6b7a9638b3f311704783110
-MD5 d6b79ebecfa955cde9af0a0b3813c0ac g15composer-3.0.1.ebuild 1592
-RMD160 0bf18c32211cbbc21a844c2faea5433fd4108345 g15composer-3.0.1.ebuild 1592
-SHA256 845062bff2dc78aff62051c5198fdc994d53bae5a6b7a9638b3f311704783110 g15composer-3.0.1.ebuild 1592
+DIST g15composer-3.0.3.tar.bz2 101717 RMD160 6f40dc77b82dbc3f0ecbd802f328e36095197752 SHA1 99444caa0112752c530d7c8220a1d12720b4467a SHA256 fb4abc888f9befb752d90fad6c59b28360098e00ba2befca904f8545c60f64c1
 EBUILD g15composer-3.0.2.ebuild 1592 RMD160 a081a295c59709986bfa9b32e76b7b8fbe9d2ed5 SHA1 f8d16daf2a0511be52c368bab236effcfa44f019 SHA256 b50f0821ccff955da66c6f874f3e7218162d552249b93b7fa2d8f2910ce72ea7
 MD5 aa05941ec9c1b25f8ffcf326a48e4bef g15composer-3.0.2.ebuild 1592
 RMD160 a081a295c59709986bfa9b32e76b7b8fbe9d2ed5 g15composer-3.0.2.ebuild 1592
 SHA256 b50f0821ccff955da66c6f874f3e7218162d552249b93b7fa2d8f2910ce72ea7 g15composer-3.0.2.ebuild 1592
+EBUILD g15composer-3.0.3.ebuild 1582 RMD160 3ac3dc31d8a2507f862d469b670b354999056f8d SHA1 8fc39c347a803c3c5f58e352f84040b54959fb89 SHA256 e53a0a16fb6d409bc8b7fec6959f7c30e00db030d4d37e558628c049e1d3beba
+MD5 5930f537201230cf5ec55cbd408bd343 g15composer-3.0.3.ebuild 1582
+RMD160 3ac3dc31d8a2507f862d469b670b354999056f8d g15composer-3.0.3.ebuild 1582
+SHA256 e53a0a16fb6d409bc8b7fec6959f7c30e00db030d4d37e558628c049e1d3beba g15composer-3.0.3.ebuild 1582
 MISC ChangeLog 1616 RMD160 c0be606675cdbafbf2cb3cba2b1b114523607a37 SHA1 9c83a796ef7be4f750fa9b98c3558bb4adad7374 SHA256 e72d2a0072b9338193d0d1721c77a29d35150ea590bfede1178f3b556d6a2e3d
 MD5 8691cb4c90f2367987ebb68cd70499aa ChangeLog 1616
 RMD160 c0be606675cdbafbf2cb3cba2b1b114523607a37 ChangeLog 1616
@@ -41,22 +32,9 @@ MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
 SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata.xml 250
-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 dec7a738f7e947b85546abf54af5d054 files/digest-g15composer-2.1-r1 247
-RMD160 5b7de726f99dc027b975e7d881267adb61af373b files/digest-g15composer-2.1-r1 247
-SHA256 ca142ac7a46ea37587b38a153c94432613d51e940c61b0f471fb94d328c59e5b files/digest-g15composer-2.1-r1 247
-MD5 add1bf1dd7a9539d8eddeb2df885fb31 files/digest-g15composer-3.0.1 253
-RMD160 998637c3a5fbb651f38d30319df6329709544df0 files/digest-g15composer-3.0.1 253
-SHA256 0014671dcb960d21bc86e8e1066053a5b2f6949fdd74032fec03a567fa8155b7 files/digest-g15composer-3.0.1 253
 MD5 ad564ac6f85ae02f5be612d60857be5e files/digest-g15composer-3.0.2 256
 RMD160 217dba877df80827bd2cf625dc7c85fa79560c64 files/digest-g15composer-3.0.2 256
 SHA256 ea6157b0857fd484a28d253e10ce676238a4ad5df6b4067c59f4743fd15f8d87 files/digest-g15composer-3.0.2 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFdx+Tz974XjDVpbkRArCMAJ9ugZkSzGv8ySihnkUAMprw19HncACfQDg/
-SqUo4FRT273BwpfDAInKL2I=
-=4IIL
------END PGP SIGNATURE-----
+MD5 be954868eb1946281370d1ce43c005d3 files/digest-g15composer-3.0.3 256
+RMD160 ca005d678d354bc56fca8074f9f0c21ac7829a2c files/digest-g15composer-3.0.3 256
+SHA256 fe69d8d431c570f156804e6b7048baba63ec660dcfb310a8f42f18ae55da1326 files/digest-g15composer-3.0.3 256
diff --git a/app-misc/g15composer/files/g15composer-3.0.3.confd b/app-misc/g15composer/files/g15composer-3.0.3.confd
new file mode 100644
index 0000000..baa9ab5
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.0.3.confd
@@ -0,0 +1,15 @@
+# /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"
+
+# Set the user who owns the CONTROL_FIFO.
+# This is also the user as whom g15composer is run
+FIFO_USER=root
+
+# Set the grop which owns the CONTROL_FIFO.
+# The users who want to display screens on the LCD need to be in this group.
+FIFO_GROUP=users
\ No newline at end of file
diff --git a/app-misc/g15composer/files/g15composer-3.0.3.initd b/app-misc/g15composer/files/g15composer-3.0.3.initd
new file mode 100644
index 0000000..18de641
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.0.3.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/files/g15composer-2.1.initd,v 1.1 2006/10/24 07:41:11 jokey Exp $
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+	need g15daemon
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	mknod -m660 "${CONTROL_FIFO}" p
+	chown ${FIFO_USER} "${CONTROL_FIFO}"
+	chgrp ${FIFO_GROUP} "${CONTROL_FIFO}"
+	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec \
+		/usr/bin/g15composer -- -b -u "${FIFO_USER}" "${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-3.0.3.ebuild b/app-misc/g15composer/g15composer-3.0.3.ebuild
new file mode 100644
index 0000000..be9fbad
--- /dev/null
+++ b/app-misc/g15composer/g15composer-3.0.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.0.2.ebuild,v 1.1 2006/12/06 19:52:39 jokey Exp $
+
+inherit eutils
+
+DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15 keyboard"
+HOMEPAGE="http://g15tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amarok truetype"
+
+RDEPEND="app-misc/g15daemon
+	dev-libs/libg15render
+	truetype? ( media-libs/freetype )
+	amarok? ( kde-base/kdelibs  dev-perl/DCOP-Amarok-Player )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libg15"
+
+pkg_setup() {
+	if use amarok && ! built_with_use dev-lang/perl ithreads ; then
+		echo
+		eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
+		die
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_enable truetype ttf ) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}/${P}.initd" ${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/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
+}