Version bump as requested by Efimov Vadim <evadim@evadim.ru>, closes bug #208775.

(Portage version: 2.1.4.4)

5 files changed, 153 insertions, 4 deletions

diff --git a/app-misc/g15composer/ChangeLog b/app-misc/g15composer/ChangeLog
index 5971b951e646..01ed073b3b82 100644
--- a/app-misc/g15composer/ChangeLog
+++ b/app-misc/g15composer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/g15composer
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.16 2007/05/01 10:14:03 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/ChangeLog,v 1.17 2008/02/21 17:14:13 chainsaw Exp $
+
+*g15composer-3.2 (21 Feb 2008)
+
+  21 Feb 2008; Tony Vroon <chainsaw@gentoo.org>
+  +files/g15composer-3.2.confd, +files/g15composer-3.2.initd, metadata.xml,
+  +g15composer-3.2.ebuild:
+  Version bump as requested by Efimov Vadim <evadim@evadim.ru>, closes bug
+  #208775.
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> g15composer-3.1.ebuild:
   Added ~ppc64; bug #175120
diff --git a/app-misc/g15composer/files/g15composer-3.2.confd b/app-misc/g15composer/files/g15composer-3.2.confd
new file mode 100644
index 000000000000..f42ab956e242
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2.confd
@@ -0,0 +1,17 @@
+# /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.
+# As this is also the user as whom g15composer is run,
+# it has to be someone who can create further message channels
+# This should be the user who runs the LCD clients
+FIFO_USER=
+
+# 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
diff --git a/app-misc/g15composer/files/g15composer-3.2.initd b/app-misc/g15composer/files/g15composer-3.2.initd
new file mode 100644
index 000000000000..15dd6c6765fc
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2.initd
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/files/g15composer-3.2.initd,v 1.1 2008/02/21 17:14:14 chainsaw Exp $
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+	need g15daemon
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -z "${FIFO_USER}" -o -z "${FIFO_GROUP}" ] ; then
+		eerror "Please set the FIFO_USER and FIFO_GROUP variables in /etc/conf.d/${SVCNAME}"
+		eend 1
+		return 1
+	fi
+	if [ -e "${CONTROL_FIFO}" -a ! -p "${CONTROL_FIFO}" ] ; then
+		eerror "${CONTROL_FIFO} exists and is not a FIFO. Please remove."
+		eend 1
+		return 1
+	fi
+	if [ ! -p "${CONTROL_FIFO}" ] ; then
+		einfo "Creating FIFO at ${CONTROL_FIFO}"
+		mkfifo -m660 "${CONTROL_FIFO}"
+	else
+		einfo "Reusing FIFO at ${CONTROL_FIFO}"
+	fi
+
+	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}" -g "${FIFO_GROUP}" "${CONTROL_FIFO}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
+	if [ -p "${CONTROL_FIFO}" ] ; then
+		einfo "Removing FIFO at ${CONTROL_FIFO}"
+		rm -f "${CONTROL_FIFO}"
+	else
+		ewarn "FIFO at ${CONTROL_FIFO} was lost"
+	fi
+	eend $?
+}
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild
new file mode 100644
index 000000000000..366d69b660c8
--- /dev/null
+++ b/app-misc/g15composer/g15composer-3.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 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.1 2008/02/21 17:14:13 chainsaw 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 ~ppc64 ~x86"
+IUSE="amarok truetype examples"
+
+DEPEND="app-misc/g15daemon
+	>=dev-libs/libg15render-1.2
+	truetype? ( media-libs/freetype )
+	amarok? ( kde-base/kdelibs )"
+
+RDEPEND="${DEPEND}
+	amarok? ( dev-perl/DCOP-Amarok-Player )"
+
+pkg_setup() {
+	local failure=false
+	echo
+	if use amarok && ! built_with_use dev-lang/perl ithreads ; then
+		eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
+		failure=true
+	fi
+	if use truetype && ! built_with_use dev-libs/libg15render truetype ; then
+		eerror "dev-libs/libg15render must be built with USE=\"truetype\" for truetype to work."
+		failure=true
+	fi
+	if ${failure}; then
+		die "Please rebuild the packages with corrected USE flags."
+	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
+
+	if use examples ; then
+		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 ad12036a061b..3ae74f316232 100644
--- a/app-misc/g15composer/metadata.xml
+++ b/app-misc/g15composer/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>lcd</herd>
 	<maintainer>
-		<email>rbu@gentoo.org</email>
-		<name>Robert Buchholz</name>
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
 	</maintainer>
 </pkgmetadata>