Version bump

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26 x86_64

4 files changed, 140 insertions, 5 deletions

diff --git a/x11-misc/keytouch/ChangeLog b/x11-misc/keytouch/ChangeLog
index 7c67c7412cbb..b8ab602e2816 100644
--- a/x11-misc/keytouch/ChangeLog
+++ b/x11-misc/keytouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/keytouch
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.15 2008/06/25 09:37:05 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.16 2008/07/21 19:54:22 nyhm Exp $
+
+*keytouch-2.4.1 (21 Jul 2008)
+
+  21 Jul 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/keytouch-2.4.1-glibc28.patch, +keytouch-2.4.1.ebuild:
+  Version bump
 
   25 Jun 2008; Tristan Heaven <nyhm@gentoo.org> keytouch-2.3.2.ebuild,
   keytouch-2.4.0.ebuild:
diff --git a/x11-misc/keytouch/Manifest b/x11-misc/keytouch/Manifest
index 4edfc77fa4df..8aa4e4d9211c 100644
--- a/x11-misc/keytouch/Manifest
+++ b/x11-misc/keytouch/Manifest
@@ -3,17 +3,20 @@ Hash: SHA1
 
 AUX keytouch 308 RMD160 385173862261870bfcae7d41649191b75bdc09d2 SHA1 9d70972cb23a232bb6089a8a6c1a987ff4960f8d SHA256 d90ca27fe293c463951000c24c366989cbaabadc3d476081848c9c31499626b3
 AUX keytouch-2.4.0-glibc28.patch 1350 RMD160 2a4102e3dd2f0fc0385bf5fe727f744ae1b9c3cc SHA1 ea66f7c2517d8c4d309c08bd8d036c591df708bc SHA256 94ae2397a99c1e86c2ac922eed454717b6f9e51945bc8ae6b4a646eda9e41bd3
+AUX keytouch-2.4.1-glibc28.patch 1023 RMD160 e8bcd25a6d61723c20d34b499d14bd4b2484522a SHA1 939c0d793e1578dd29e757a1b3ad5380a12c2d3a SHA256 ce6f228c237105ec8f022efcc4ff51ae35f08c397c0add548a0b2c096561fc21
 AUX keytouch-acpid 567 RMD160 e3e0b3d948671fc86c807c3e5082d5c934c7edde SHA1 e7f8541ce8f6d973c86976ef415ed244a408404e SHA256 080600fea04dab6a4fbedbdb1258960c69ae23d08016f7e01e51b4515d4650e6
 DIST keytouch-2.3.2.tar.gz 781047 RMD160 1d56f4124d575cf3afb9e23d6a94109e265b8cd5 SHA1 80a409e3835a201796a0a6db1d629dd2902dc8f7 SHA256 446817d2071150acb813b3124bfedd4c802aeb0da3a8cd55e9f5453219fdb042
 DIST keytouch-2.4.0.tar.gz 845646 RMD160 aec2668c440c3a6cdabb4191514b608ee47b8a0f SHA1 6b9aaa6cd60ff0ba42c39d325f2d80e51bc1e968 SHA256 95d71b1a9aea1f5b6052fd5e8e65367375034392a1599433b284c4f91adc87b0
+DIST keytouch-2.4.1.tar.gz 864995 RMD160 a135a654f349bef965bebc326f593bee70246a6b SHA1 f1f26dc95c21afd404aebe2b1066e75c8313ca80 SHA256 e9c1ff73c3912e161e7b556f22d659bb6adde4ae0cb0144449ffcd7fdcd97b5b
 EBUILD keytouch-2.3.2.ebuild 2234 RMD160 ca99a7d044cd9da3104cd9fa9710924e020e9f60 SHA1 4fd0020011a3b46a54b915404e1cac7d6787e9c9 SHA256 8b375d4181083f1ed6fe6e21a164790ccd7f8fa852f796ddcec56cf1d23843de
 EBUILD keytouch-2.4.0.ebuild 2319 RMD160 044efd4395886634b41e6483319d842726a0d2d1 SHA1 220feb4f0b18551e1edeb9bc1aeb89a77390c8b3 SHA256 b42030c52cb9ba5ca989e9fdf3d1e58e448f5245c9b39d0b484baeec15162439
-MISC ChangeLog 2062 RMD160 a17397ced4b95327c1447cd41316eea9775f26e5 SHA1 8dd355048756fa73a237d698916400e5dac3dcf7 SHA256 c50eccb818d48cf541599d29db2059f96944c373defe6d88d9d28d157162edf8
+EBUILD keytouch-2.4.1.ebuild 2299 RMD160 92ea656d5295e7f5780be9a900dfc165294c347d SHA1 ff9d29d314e0188e032b5da6f56015e90ba1edc6 SHA256 5a959a404dc60afd17382762420eece4e454b92670db163217a3221e11e0a3d9
+MISC ChangeLog 2220 RMD160 ac0e3f3f9b9ae9bc4dce6169219929b487bbff30 SHA1 6337ee11789c80280b0cd412a0547a6c87f92867 SHA256 07c8caefaee94f25edaaa497f04da120b33eff6452cd2a9d3869c6640eab91ae
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhiEccACgkQdz7hIScOURGAeACghl31Ta/tCpplhg7ZhHtRNCaP
-c/8AoMCg/b4dRU6S7CgGIdftjHqbASYi
-=6NDk
+iEYEARECAAYFAkiE6XMACgkQdz7hIScOURGwQgCeNyIrRcWokwtwUYOGAtahrcQ4
++8sAn3acTc0zhJ2q8ChpWlFgp36MKzBq
+=z6zf
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/keytouch/files/keytouch-2.4.1-glibc28.patch b/x11-misc/keytouch/files/keytouch-2.4.1-glibc28.patch
new file mode 100644
index 000000000000..52e1099e43cf
--- /dev/null
+++ b/x11-misc/keytouch/files/keytouch-2.4.1-glibc28.patch
@@ -0,0 +1,32 @@
+--- keytouch-keyboard/src/check_syntax.c
++++ keytouch-keyboard/src/check_syntax.c
+@@ -29,10 +29,10 @@
+     You can contact me at: marvinr(at)users(dot)sf(dot)net
+     (replace (at) by @ and (dot) by .)
+ -----------------------------------------------------------------------------------*/
++#define _XOPEN_SOURCE /* strptime */
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#define _XOPEN_SOURCE /* glibc2 needs this */
+ #include <time.h>
+ 
+ #include <mxml.h>
+--- keytouch-keyboard/src/config.c
++++ keytouch-keyboard/src/config.c
+@@ -37,6 +37,7 @@
+     You can contact me at: marvinr(at)users(dot)sf(dot)net
+     (replace (at) by @ and (dot) by .)
+ -----------------------------------------------------------------------------------*/
++#define _GNU_SOURCE /* strptime, scandir */
+ #include <stdlib.h>
+ #include <dirent.h>
+ #include <dlfcn.h>
+@@ -45,7 +46,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdio.h>
+-#define _GNU_SOURCE /* glibc2 needs this */
+ #include <time.h>
+ 
+ #include <mxml.h>
diff --git a/x11-misc/keytouch/keytouch-2.4.1.ebuild b/x11-misc/keytouch/keytouch-2.4.1.ebuild
new file mode 100644
index 000000000000..7d3bb0abfc60
--- /dev/null
+++ b/x11-misc/keytouch/keytouch-2.4.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild,v 1.1 2008/07/21 19:54:22 nyhm Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="Easily configure extra keyboard function keys"
+HOMEPAGE="http://keytouch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acpi kde"
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-libs/libXtst
+	gnome-base/gnome-menus
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto"
+RDEPEND="${RDEPEND}
+	acpi? ( sys-power/acpid )
+	kde? ( || (
+		kde-base/kdesu
+		kde-base/kdebase
+	) )
+	!kde? ( x11-libs/gksu )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc28.patch
+	sed -i \
+		's/install-data-local//1' \
+		keytouch{-acpid,d,-init}/Makefile.in \
+		|| die "sed failed"
+}
+
+src_compile() {
+	local d
+	for d in . keytouch-config keytouch-keyboard ; do
+		pushd ${d} > /dev/null
+		econf || die
+		emake || die "emake ${d} failed"
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	if use acpi ; then
+		newinitd "${FILESDIR}"/${PN}-acpid ${PN} || die "newinitd failed"
+	else
+		doinitd "${FILESDIR}"/${PN} || die "doinitd failed"
+	fi
+
+	newicon keytouch-keyboard/pixmaps/icon.png ${PN}.png
+	make_desktop_entry ${PN} keyTouch ${PN} System
+
+	dodoc AUTHORS ChangeLog
+
+	local d
+	for d in . keytouch-config keytouch-keyboard ; do
+		emake -C ${d} DESTDIR="${D}" install \
+			|| die "emake install ${d} failed"
+	done
+}
+
+pkg_postinst() {
+	echo
+	elog "To use keyTouch, add \"keytouchd\" to your"
+	elog "X startup programs and run"
+	elog "\"rc-update add keytouch default\""
+	elog
+	elog "If support for your keyboard is not included in"
+	elog "this release, check for new keyboard files at"
+	elog "${HOMEPAGE}dl-keyboards.html"
+	elog
+	elog "x11-misc/keytouch-editor can be used to create"
+	elog "your own keyboard files"
+	echo
+	if use acpi && ! linux_chkconfig_present INPUT_EVDEV ; then
+		ewarn "To enable support for ACPI hotkeys, CONFIG_INPUT_EVDEV"
+		ewarn "must be enabled in your kernel config."
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      <*>/<M> Event interface"
+		echo
+	fi
+}