7 files changed, 26 insertions, 125 deletions
diff --git a/x11-misc/keytouch/ChangeLog b/x11-misc/keytouch/ChangeLog
index 38ef4f39ee85..1d131de49176 100644
--- a/x11-misc/keytouch/ChangeLog
+++ b/x11-misc/keytouch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/keytouch
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.8 2007/07/19 19:49:33 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.9 2007/08/20 19:54:01 nyhm Exp $
+
+*keytouch-2.3.2 (20 Aug 2007)
+
+  20 Aug 2007; Tristan Heaven <nyhm@gentoo.org> +keytouch-2.3.2.ebuild:
+  Version bump
 
 *keytouch-2.3.1 (19 Jul 2007)
 
diff --git a/x11-misc/keytouch/Manifest b/x11-misc/keytouch/Manifest
index 95a367974991..a3909982527d 100644
--- a/x11-misc/keytouch/Manifest
+++ b/x11-misc/keytouch/Manifest
@@ -12,24 +12,19 @@ SHA256 080600fea04dab6a4fbedbdb1258960c69ae23d08016f7e01e51b4515d4650e6 files/ke
 DIST keytouch-2.2-user_manual.pdf 301051 RMD160 1a1b228012956be00727c6a11062976d79cac45d SHA1 c6e017badeb43aaeaec4f3aec119896daf5cc185 SHA256 d8913c84437bac66adb0464e673bf06ab390042f75603ddf99167758577ed60c
 DIST keytouch-2.2.4.tar.gz 786844 RMD160 edfe3a110d2e91f40029d5353aa0b0fb3c5cfd8c SHA1 53d6e7a4ac409ab69ccc8f2c796d592e65fb6ec7 SHA256 a39b90ec762c194643ec738f4f239ea320bc95820b946b689fe44d6645a512ca
 DIST keytouch-2.2_tech_manual.pdf 244176 RMD160 d35f36e83c4cf24c0cee3510d639f55a83580766 SHA1 987c8957476e395d10bfa3a7c28352ae1f8942e4 SHA256 921df5388c7aee8dcc9233784a81885fd77f948791f38cd3900a5875df6d3a6f
-DIST keytouch-2.3.0.tar.gz 801674 RMD160 66f5b8eb4e73ddad5534f0525785243e75b8b2d9 SHA1 6b1b379fe182bf3db2adf4deb998f580dc3b4534 SHA256 c88d0c6f5469104b005e79192c410a2295512e9debe8bbd9464fc7539c91fdf8
-DIST keytouch-2.3.1.tar.gz 806780 RMD160 8df52788269d298f3fa1beb7d9315cda0d6391e2 SHA1 49000272001391eac7e37a52466a988ca52570c6 SHA256 d3b9c6a203e7016e98821ca16d35723570e7125c609e8f033c39e5a5719e5721
+DIST keytouch-2.3.2.tar.gz 781047 RMD160 1d56f4124d575cf3afb9e23d6a94109e265b8cd5 SHA1 80a409e3835a201796a0a6db1d629dd2902dc8f7 SHA256 446817d2071150acb813b3124bfedd4c802aeb0da3a8cd55e9f5453219fdb042
 EBUILD keytouch-2.2.4.ebuild 2011 RMD160 fceeb2fa60afccc45746e3aea66d30a6689e7733 SHA1 abd08c822229095236132d72e58bf9f8315d67cc SHA256 3ac22d74fe3e15aa2804d1e52859e0945cec5753fd992d71b43c7aabe1c3928b
 MD5 20c5b14896934c901ef9db5a3e02b353 keytouch-2.2.4.ebuild 2011
 RMD160 fceeb2fa60afccc45746e3aea66d30a6689e7733 keytouch-2.2.4.ebuild 2011
 SHA256 3ac22d74fe3e15aa2804d1e52859e0945cec5753fd992d71b43c7aabe1c3928b keytouch-2.2.4.ebuild 2011
-EBUILD keytouch-2.3.0.ebuild 2238 RMD160 67caf92184a149dada84d1402c18dd4bf455f9b7 SHA1 bba9cad901384b54ccf33d854adf8b4f1f2450a5 SHA256 2028566f6bd7ceaf502aca7ce73a58e3c7f79ee0fc0b2851e78e479aba3e7c6f
-MD5 7936442ad892ba08eb9db1dc56a0b77c keytouch-2.3.0.ebuild 2238
-RMD160 67caf92184a149dada84d1402c18dd4bf455f9b7 keytouch-2.3.0.ebuild 2238
-SHA256 2028566f6bd7ceaf502aca7ce73a58e3c7f79ee0fc0b2851e78e479aba3e7c6f keytouch-2.3.0.ebuild 2238
-EBUILD keytouch-2.3.1.ebuild 2238 RMD160 74bc6ea2bf90abad6b78682e484a4f2d3cc56592 SHA1 606e344a00b3288edc5e19c443a85e90fde3ad0a SHA256 4c293228008d75423035d86b6f6d6eb969552890d14945f5525b1405223c2392
-MD5 5d274475ad7d43d70e46fb76503475ab keytouch-2.3.1.ebuild 2238
-RMD160 74bc6ea2bf90abad6b78682e484a4f2d3cc56592 keytouch-2.3.1.ebuild 2238
-SHA256 4c293228008d75423035d86b6f6d6eb969552890d14945f5525b1405223c2392 keytouch-2.3.1.ebuild 2238
-MISC ChangeLog 1159 RMD160 fd4903ec470208b0525d89ba539514d8d2195ad8 SHA1 c256cec11246b270dabec499dd96716b73f923c7 SHA256 19f4cf15dfb68882c608d8d5d5f8d9fb33a4d6539a39399c02292a6ffb1943a1
-MD5 1e707bec4be374438b5d2ab34d247b5e ChangeLog 1159
-RMD160 fd4903ec470208b0525d89ba539514d8d2195ad8 ChangeLog 1159
-SHA256 19f4cf15dfb68882c608d8d5d5f8d9fb33a4d6539a39399c02292a6ffb1943a1 ChangeLog 1159
+EBUILD keytouch-2.3.2.ebuild 2161 RMD160 cf81b33b92c9b8370b7134afca62a7d8d66764d5 SHA1 e5bfbe4e68030260817f513c6a6056327c4520bd SHA256 49ebd40064531e0b49c84c11136327f4ae9673260f1e510fca8241e8448e8d56
+MD5 7b3c07c5720763f105c245d4728764a4 keytouch-2.3.2.ebuild 2161
+RMD160 cf81b33b92c9b8370b7134afca62a7d8d66764d5 keytouch-2.3.2.ebuild 2161
+SHA256 49ebd40064531e0b49c84c11136327f4ae9673260f1e510fca8241e8448e8d56 keytouch-2.3.2.ebuild 2161
+MISC ChangeLog 1278 RMD160 255c7a7abe900c4b9f3ffc1019ef8ec586bf36d1 SHA1 872ad62e6ebf7e83929207800ee092c4653c626b SHA256 8e87428654f7a4ed7e51684ab6322f07340e0cea87e8540646300932eb1243d9
+MD5 8abda8c1f9b933cbd270fc062239ed3d ChangeLog 1278
+RMD160 255c7a7abe900c4b9f3ffc1019ef8ec586bf36d1 ChangeLog 1278
+SHA256 8e87428654f7a4ed7e51684ab6322f07340e0cea87e8540646300932eb1243d9 ChangeLog 1278
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
 MD5 aedd71008ed8531a9104a98f2f4e7dfb metadata.xml 253
 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 metadata.xml 253
@@ -37,16 +32,13 @@ SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3 metadata
 MD5 7df75250d5b11afdf3c177b726c6c46b files/digest-keytouch-2.2.4 774
 RMD160 b1806ee0903cc7c018f152f3b0d8d753684406cb files/digest-keytouch-2.2.4 774
 SHA256 3b79d57c0bd6d49a4aef2362ca750af48e679be4c767bc708b8812140135872b files/digest-keytouch-2.2.4 774
-MD5 29d12d9480a5e06261cd8ee265d7a191 files/digest-keytouch-2.3.0 244
-RMD160 4f5b40152e65d09874d66e67ee2b2bee7f89ddb1 files/digest-keytouch-2.3.0 244
-SHA256 45c0678a6dafb65bf19fdef2216c474d31d2149556ea72cd2e0e2c7894955350 files/digest-keytouch-2.3.0 244
-MD5 1d8cb04b2603a2e3194d2df899ce66b2 files/digest-keytouch-2.3.1 244
-RMD160 78101dced69243b2d6c09220c075cc6e5714c1c6 files/digest-keytouch-2.3.1 244
-SHA256 9edb3294950168a932c8fb092763c5cf11980c17875da5d861f9bddc25d0d0f6 files/digest-keytouch-2.3.1 244
+MD5 2683c784e05d343725cec5ae6f6a59d0 files/digest-keytouch-2.3.2 244
+RMD160 4ab551c383d8ca6cc53ff4164529956574af6632 files/digest-keytouch-2.3.2 244
+SHA256 2d82ec27216324cde6de03ceaa82f0fdcfb3543c5b12f162804757c1ee41cba2 files/digest-keytouch-2.3.2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGn8BOdz7hIScOURERAo3zAKDpmD0oekQvVy17nwqGUzXxwHwEmQCglWJK
-paZDtWSmXsisv1ninB+kj8s=
-=jL9V
+iD8DBQFGyfFfdz7hIScOURERAtlPAKDa9P+nchFSXwmvb23M7gCqhYP6VQCgyOhy
+kUhsajF1yebP6DbfPCp2ECA=
+=zIz7
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/keytouch/files/digest-keytouch-2.3.0 b/x11-misc/keytouch/files/digest-keytouch-2.3.0
deleted file mode 100644
index 557130994502..000000000000
--- a/x11-misc/keytouch/files/digest-keytouch-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dbd503d952168aeb0c4637359cfe5d21 keytouch-2.3.0.tar.gz 801674
-RMD160 66f5b8eb4e73ddad5534f0525785243e75b8b2d9 keytouch-2.3.0.tar.gz 801674
-SHA256 c88d0c6f5469104b005e79192c410a2295512e9debe8bbd9464fc7539c91fdf8 keytouch-2.3.0.tar.gz 801674
diff --git a/x11-misc/keytouch/files/digest-keytouch-2.3.1 b/x11-misc/keytouch/files/digest-keytouch-2.3.1
deleted file mode 100644
index fabaee004b16..000000000000
--- a/x11-misc/keytouch/files/digest-keytouch-2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 592748a1914bbcc30afe5c68293349b2 keytouch-2.3.1.tar.gz 806780
-RMD160 8df52788269d298f3fa1beb7d9315cda0d6391e2 keytouch-2.3.1.tar.gz 806780
-SHA256 d3b9c6a203e7016e98821ca16d35723570e7125c609e8f033c39e5a5719e5721 keytouch-2.3.1.tar.gz 806780
diff --git a/x11-misc/keytouch/files/digest-keytouch-2.3.2 b/x11-misc/keytouch/files/digest-keytouch-2.3.2
new file mode 100644
index 000000000000..e7c494447538
--- /dev/null
+++ b/x11-misc/keytouch/files/digest-keytouch-2.3.2
@@ -0,0 +1,3 @@
+MD5 19367b18abe23b3d86d5a505e0300553 keytouch-2.3.2.tar.gz 781047
+RMD160 1d56f4124d575cf3afb9e23d6a94109e265b8cd5 keytouch-2.3.2.tar.gz 781047
+SHA256 446817d2071150acb813b3124bfedd4c802aeb0da3a8cd55e9f5453219fdb042 keytouch-2.3.2.tar.gz 781047
diff --git a/x11-misc/keytouch/keytouch-2.3.1.ebuild b/x11-misc/keytouch/keytouch-2.3.1.ebuild
deleted file mode 100644
index de0cf2253151..000000000000
--- a/x11-misc/keytouch/keytouch-2.3.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.3.1.ebuild,v 1.1 2007/07/19 19:49:33 nyhm Exp $
-
-inherit eutils versionator 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
-	gnome-base/gnome-menus
-	media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	acpi? ( sys-power/acpid )
-	kde? ( || (
-		kde-base/kdesu
-		kde-base/kdebase ) )
-	!kde? ( x11-libs/gksu )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i 's/install-data-local//1' \
-		keytouch{-acpid,d,-init}/Makefile.in \
-		|| die "sed failed"
-
-	sed -i 's/gnome-calculator/gcalctool/' \
-		keyboards/* || die "sed failed"
-}
-
-src_compile() {
-	local d
-	for d in . keytouch-config keytouch-keyboard ; do
-		cd "${S}"/${d}
-		econf || die
-		emake || die "emake ${d} failed"
-	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}.png 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 add 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
-}
diff --git a/x11-misc/keytouch/keytouch-2.3.0.ebuild b/x11-misc/keytouch/keytouch-2.3.2.ebuild
index 48d23aa78cfa..8253628d168b 100644
--- a/x11-misc/keytouch/keytouch-2.3.0.ebuild
+++ b/x11-misc/keytouch/keytouch-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.3.0.ebuild,v 1.2 2007/03/31 06:34:24 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.3.2.ebuild,v 1.1 2007/08/20 19:54:01 nyhm Exp $
 
 inherit eutils versionator linux-info
 
@@ -32,9 +32,6 @@ src_unpack() {
 	sed -i 's/install-data-local//1' \
 		keytouch{-acpid,d,-init}/Makefile.in \
 		|| die "sed failed"
-
-	sed -i 's/gnome-calculator/gcalctool/' \
-		keyboards/* || die "sed failed"
 }
 
 src_compile() {