From 168221885bfe711c9ea2644a4b30d4b3f60583b0 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Mon, 21 Jul 2008 19:54:22 +0000 Subject: Version bump (Portage version: 2.2_rc1/cvs/Linux 2.6.26 x86_64) --- x11-misc/keytouch/ChangeLog | 8 +- .../keytouch/files/keytouch-2.4.1-glibc28.patch | 32 ++++++++ x11-misc/keytouch/keytouch-2.4.1.ebuild | 94 ++++++++++++++++++++++ 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 x11-misc/keytouch/files/keytouch-2.4.1-glibc28.patch create mode 100644 x11-misc/keytouch/keytouch-2.4.1.ebuild (limited to 'x11-misc') 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 + +files/keytouch-2.4.1-glibc28.patch, +keytouch-2.4.1.ebuild: + Version bump 25 Jun 2008; Tristan Heaven keytouch-2.3.2.ebuild, keytouch-2.4.0.ebuild: 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 + #include + #include +-#define _XOPEN_SOURCE /* glibc2 needs this */ + #include + + #include +--- 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 + #include + #include +@@ -45,7 +46,6 @@ + #include + #include + #include +-#define _GNU_SOURCE /* glibc2 needs this */ + #include + + #include 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 " <*>/ Event interface" + echo + fi +} -- cgit v1.2.3-65-gdbad