Version bump and cleanup

Package-Manager: portage-2.1.2_pre3-r7

7 files changed, 136 insertions, 3 deletions

diff --git a/app-misc/g15composer/ChangeLog b/app-misc/g15composer/ChangeLog
index 123bc49780c2..85222eead561 100644
--- a/app-misc/g15composer/ChangeLog
+++ b/app-misc/g15composer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/g15composer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.5 2006/10/18 23:54:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.6 2006/10/24 07:41:11 jokey Exp $
+
+*g15composer-2.1 (24 Oct 2006)
+
+  24 Oct 2006; Markus Ullmann <jokey@gentoo.org> -files/g15composer-1.0.rc,
+  +files/g15composer-1.1.initd, +files/g15composer-2.1.confd,
+  +files/g15composer-2.1.initd, -g15composer-1.0.ebuild,
+  g15composer-1.1.ebuild, +g15composer-2.1.ebuild:
+  Version bump and cleanup
 
   18 Oct 2006; Markus Ullmann <jokey@gentoo.org> metadata.xml:
   Metadata update
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 000000000000..81b82d5c656d
--- /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.1.initd b/app-misc/g15composer/files/g15composer-1.1.initd
new file mode 100644
index 000000000000..3c1c4717307b
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-1.1.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-1.1.initd,v 1.1 2006/10/24 07:41:11 jokey Exp $
+
+depend() {
+	need g15daemon
+}
+
+start() {
+	NODE="/dev/${SVCNAME}"
+	ebegin "Starting ${SVCNAME}"
+	mknod -m720 "${NODE}" p
+	chgrp users "${NODE}"
+	PIDFILE=/var/run/${SVCNAME}.pid
+	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec /usr/bin/g15composer -- "${NODE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping ${SVCNAME}"
+	PIDFILE=/var/run/${SVCNAME}.pid
+	start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
+	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 000000000000..400748050c32
--- /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.initd b/app-misc/g15composer/files/g15composer-2.1.initd
new file mode 100644
index 000000000000..a15a78661674
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-2.1.initd
@@ -0,0 +1,25 @@
+#!/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}"
+	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-1.1.ebuild b/app-misc/g15composer/g15composer-1.1.ebuild
index c9a7ada5727e..e09b2d1f44d4 100644
--- a/app-misc/g15composer/g15composer-1.1.ebuild
+++ b/app-misc/g15composer/g15composer-1.1.ebuild
@@ -1,6 +1,6 @@
 # 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-1.1.ebuild,v 1.3 2006/10/14 10:05:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-1.1.ebuild,v 1.4 2006/10/24 07:41:11 jokey Exp $
 
 inherit eutils
 
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	newinitd "${FILESDIR}/${PN}-1.0.rc" ${PN}
+	newinitd "${FILESDIR}/${PN}-1.1.initd" g15composer
 
 	dodoc AUTHORS README ChangeLog
 }
diff --git a/app-misc/g15composer/g15composer-2.1.ebuild b/app-misc/g15composer/g15composer-2.1.ebuild
new file mode 100644
index 000000000000..17cf77419a97
--- /dev/null
+++ b/app-misc/g15composer/g15composer-2.1.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-2.1.ebuild,v 1.1 2006/10/24 07:41:11 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}.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/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
+}