dropping old version for gtk2->gtk with permission from joshuabergman

(Portage version: 2.1.1_rc1-r4)
 (Unsigned Manifest commit)

4 files changed, 4 insertions, 241 deletions

diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
index 17941e0f7f9f..97d13071fd57 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -1,42 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX linuxwacom-0.7.2-modular-x.patch 3139 RMD160 8743a2ec5f9bb0a77c96b370b598325778c0ebb6 SHA1 17eed677f5e68ee97035732860cd0e800faa4daa SHA256 a5614ab425f9a3104f656e12c0e99abc8854ee55b7115369902add654d6dd862
-MD5 f2a560693573941df8d2d80f52121e36 files/linuxwacom-0.7.2-modular-x.patch 3139
-RMD160 8743a2ec5f9bb0a77c96b370b598325778c0ebb6 files/linuxwacom-0.7.2-modular-x.patch 3139
-SHA256 a5614ab425f9a3104f656e12c0e99abc8854ee55b7115369902add654d6dd862 files/linuxwacom-0.7.2-modular-x.patch 3139
 AUX linuxwacom-xorg71.diff 274 RMD160 8c319899ac3f1d9a93d411eb8916bc01da9053ef SHA1 4c3551801e15875efc5d683889fb2323a49b5ec6 SHA256 616deaca0510ffa181b8f6bdf2a8f2d9704a53d9a1c14c5807bcf71836dc4f1c
 MD5 988f942444db6861e8be8bec11ac30c8 files/linuxwacom-xorg71.diff 274
 RMD160 8c319899ac3f1d9a93d411eb8916bc01da9053ef files/linuxwacom-xorg71.diff 274
 SHA256 616deaca0510ffa181b8f6bdf2a8f2d9704a53d9a1c14c5807bcf71836dc4f1c files/linuxwacom-xorg71.diff 274
-DIST linuxwacom-0.7.2.tar.bz2 781756 RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c SHA1 e7b9f9a1345972753d851aac5fa8eb86a76a2800 SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a
 DIST linuxwacom-0.7.4-3.tar.bz2 866312 RMD160 789789803a31eb5b9ff1d35ef760d7d11b5c24dc SHA1 c346485cdaf2bde7ee9d965aca231a4dd55f303e SHA256 0f99153ba1669255e08dd7a730cf33d9766dde43f5b56ec97e6bc8ec63b60260
-EBUILD linuxwacom-0.7.2.ebuild 3862 RMD160 37b60b2b4665426ceb7bebe0afb141ccb294f276 SHA1 a9fcd0574e2ed3131be3dabb933b3f953ea3d620 SHA256 54aa0395d10311ce0b888ec8408bb6934d4d5bcf70aed3eaf1f7fcb3dadddeda
-MD5 71d69f15c7622626408d748442e48982 linuxwacom-0.7.2.ebuild 3862
-RMD160 37b60b2b4665426ceb7bebe0afb141ccb294f276 linuxwacom-0.7.2.ebuild 3862
-SHA256 54aa0395d10311ce0b888ec8408bb6934d4d5bcf70aed3eaf1f7fcb3dadddeda linuxwacom-0.7.2.ebuild 3862
 EBUILD linuxwacom-0.7.4_p3.ebuild 1428 RMD160 85dbb7f7d74a99a5314ac3af33fa669162d8d559 SHA1 91a8f29c1681a4d1fb883e335a35cd1153b5e8ed SHA256 a1582ef19694b763ed7b13ad9ad59fe47ed80fe8b2e6209e85b1ddd11a2d3ee9
 MD5 71d38a2bfca98b471377368c6589750e linuxwacom-0.7.4_p3.ebuild 1428
 RMD160 85dbb7f7d74a99a5314ac3af33fa669162d8d559 linuxwacom-0.7.4_p3.ebuild 1428
 SHA256 a1582ef19694b763ed7b13ad9ad59fe47ed80fe8b2e6209e85b1ddd11a2d3ee9 linuxwacom-0.7.4_p3.ebuild 1428
-MISC ChangeLog 8251 RMD160 a423761d866d68750d86849f1e0d7e91f796091e SHA1 b341302e65106b199142af8d6aca8f7c2e0800d1 SHA256 08d8c836f087a4598321c29850fb515feaa665171aa02c67895f15020d6f7578
-MD5 8fef9653e526784ad5546800dcb45413 ChangeLog 8251
-RMD160 a423761d866d68750d86849f1e0d7e91f796091e ChangeLog 8251
-SHA256 08d8c836f087a4598321c29850fb515feaa665171aa02c67895f15020d6f7578 ChangeLog 8251
+MISC ChangeLog 8445 RMD160 432391754b4065ae42e5909e25dbae6e40ad78a6 SHA1 79d9fffcc7471670a6827228172ab7702f92f171 SHA256 b248a5bb040e82909947101d11b9a0d7f85005c81f34a740c48a05351a34b5b9
+MD5 789821f2010d3a233b20c72ced353f1e ChangeLog 8445
+RMD160 432391754b4065ae42e5909e25dbae6e40ad78a6 ChangeLog 8445
+SHA256 b248a5bb040e82909947101d11b9a0d7f85005c81f34a740c48a05351a34b5b9 ChangeLog 8445
 MISC metadata.xml 268 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b SHA1 accbac976c7847c397f73b97e89582008d47b5f9 SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d
 MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b metadata.xml 268
 SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d metadata.xml 268
-MD5 dd86b4a2f3227fed8818eada1545b7b0 files/digest-linuxwacom-0.7.2 253
-RMD160 a5f9b66e4acfbc6e32477027d08bbd7d527bb8a8 files/digest-linuxwacom-0.7.2 253
-SHA256 a79017c36673a3f7d5db1200f5a4a4235ebee16fc29a0855f3f015c3a4eb2a86 files/digest-linuxwacom-0.7.2 253
 MD5 a4952b197118f856078db03c06f8b77b files/digest-linuxwacom-0.7.4_p3 259
 RMD160 72bf511b0c7c398d4c3a9743bc048da4c11c9ae7 files/digest-linuxwacom-0.7.4_p3 259
 SHA256 f0ba1bee14a249725abc3316adc7bc023b572afb76447d0cdfe239514974fd1e files/digest-linuxwacom-0.7.4_p3 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE/jqPwUpWvClEHQoRArd9AJsGm3xGVhkWssTjn7+FJwu/8izpaACePrBr
-4uZ1x5psDCRGl5Vi2xzxgH4=
-=RrVD
------END PGP SIGNATURE-----
diff --git a/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.2 b/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.2
deleted file mode 100644
index cc889f774754..000000000000
--- a/x11-drivers/linuxwacom/files/digest-linuxwacom-0.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3f6290101d5712a24097243ca9f092ed linuxwacom-0.7.2.tar.bz2 781756
-RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c linuxwacom-0.7.2.tar.bz2 781756
-SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a linuxwacom-0.7.2.tar.bz2 781756
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch
deleted file mode 100644
index 80a47c43e9e1..000000000000
--- a/x11-drivers/linuxwacom/files/linuxwacom-0.7.2-modular-x.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -urN linuxwacom-0.7.2-orig/acinclude.m4 linuxwacom-0.7.2/acinclude.m4
---- linuxwacom-0.7.2-orig/acinclude.m4	2005-12-27 03:45:09.000000000 -0500
-+++ linuxwacom-0.7.2/acinclude.m4	2005-12-27 03:53:28.000000000 -0500
-@@ -227,9 +227,12 @@
- 			WCM_ENV_XORGSDK=yes
- 			$WCM_XORGSDK=$WCM_XORGSDK/xc
- 			AC_MSG_RESULT(ok)
--		else
-+	elif test -f $WCM_XORGSDK/xf86Version.h; then
-+		WCM_ENV_XORGSDK=yes
-+		AC_MSG_RESULT(ok)
-+	else
- 			AC_MSG_RESULT("xf86Version.h missing")
--			AC_MSG_RESULT("Tried $WCM_XORGSDK/include and WCM_XORGSDK/xc/include")
-+			AC_MSG_RESULT("Tried $WCM_XORGSDK/include and WCM_XORGSDK/xc/include and WCM_XORGSDK")
- 		fi
- 		WCM_XORGSDK=`(cd $WCM_XORGSDK; pwd)`
- 	fi
-@@ -296,11 +299,15 @@
- dnl handle default case
- AC_MSG_CHECKING(for X lib directory)
- if test "$WCM_XLIBDIR" == "" || test "$WCM_XLIBDIR" == "yes"; then
-+	WCM_XLIBDIR=$(pkg-config --variable=libdir xorg-server)
- 	if test -d $WCM_XLIBDIR_DEFAULT/X11 ||
- 		test -d $WCM_XLIBDIR_DEFAULT; then
- 		WCM_ENV_XLIB=yes
- 		WCM_XLIBDIR=$WCM_XLIBDIR_DEFAULT
- 		AC_MSG_RESULT(found)
-+	elif test -d $WCM_XLIBDIR/X11; then
-+		WCM_ENV_XLIB=yes
-+		AC_MSG_RESULT(found)
- 	else
- 		AC_MSG_RESULT(not found, tried $WCM_XLIBDIR_DEFAULT/X11)
- 		WCM_ENV_XLIB=no
-diff -urN linuxwacom-0.7.2-orig/configure.in linuxwacom-0.7.2/configure.in
---- linuxwacom-0.7.2-orig/configure.in	2005-12-27 03:45:09.000000000 -0500
-+++ linuxwacom-0.7.2/configure.in	2005-12-27 03:45:38.000000000 -0500
-@@ -329,6 +329,13 @@
- AC_ARG_ENABLE(wacomdrv,
- AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.{o,so} [[default=yes]]]),
- 	, enable_wacomdrv=yes)
-+PKG_CHECK_MODULES(XORG, [xorg-server xproto], WCM_ENV_XORGSDK=yes, WCM_ENV_XORGSDK=no)
-+WCM_XORGSDK=$(pkg-config --variable=sdkdir xorg-server)
-+WCM_XORGINC=$(pkg-config --variable=includedir xorg-server)
-+WCM_MODULEDIR=$(pkg-config --variable=moduledir xorg-server)
-+if test "$WCM_ENV_XORGSDK" == "yes" && test "$enable_wacomdrv" == "yes"; then
-+	CFLAGS="${CFLAGS} -I${WCM_XORGSDK} -I${WCM_XORGINC}/X11"
-+fi
- if test "$enable_wacomdrv" != "no"; then
- 	if test "$WCM_ENV_XF86" != "yes" && test "$WCM_ENV_XORGSDK" != "yes"; then
- 		echo "***"; echo "*** WARNING:";
-@@ -517,6 +524,7 @@
- AC_SUBST(WCM_XORGSDK)
- AC_SUBST(WCM_XF86DIR)
- AC_SUBST(WCM_XLIBDIR)
-+AC_SUBST(WCM_MODULEDIR)
- AC_SUBST(WCM_XSERVER64)
- #AC_SUBST(WCM_OPTION_DLLOADER)
- AC_SUBST(WCM_NO_MERGE_CONSTANTS)
-@@ -565,6 +573,7 @@
- echo "            XFree86 - $WCM_ENV_XF86 $WCM_XF86DIR"
- else
- echo "           Xorg SDK - $WCM_ENV_XORGSDK $WCM_XORGSDK"
-+echo "    Xorg Module Dir - $WCM_MODULEDIR"
- fi
- echo "          XSERVER64 - $WCM_OPTION_XSERVER64"
- echo "           dlloader - $WCM_OPTION_DLLOADER"
-diff -urN linuxwacom-0.7.2-orig/src/Makefile.am linuxwacom-0.7.2/src/Makefile.am
---- linuxwacom-0.7.2-orig/src/Makefile.am	2005-12-27 03:45:09.000000000 -0500
-+++ linuxwacom-0.7.2/src/Makefile.am	2005-12-27 03:45:38.000000000 -0500
-@@ -7,7 +7,7 @@
- wacomcfgdir = $(includedir)/wacomcfg
- wacomcfg_HEADERS = wacomcfg.h
- 
--x86moduledir = @WCM_XLIBDIR@/modules/input
-+x86moduledir = @WCM_MODULEDIR@/input
- x86module_DATA = @WCM_XF86MODULES@
- 
- AM_CFLAGS = -Wall -pedantic
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild
deleted file mode 100644
index 1e11d939ddd4..000000000000
--- a/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.1 2006/08/26 02:48:41 hanno Exp $
-
-IUSE="dlloader gtk gtk2 tcltk sdk usb"
-
-inherit multilib eutils linux-info
-
-DESCRIPTION="Input driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="|| ( ( x11-proto/inputproto
-		x11-base/xorg-server )
-	      virtual/x11 )
-	gtk? (
-		gtk2? ( >=x11-libs/gtk+-2 )
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-	)
-	tcltk? ( dev-lang/tcl dev-lang/tk )
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use sdk || has_version ">=x11-base/xorg-server-0.1" ; then
-		if ! built_with_use x11-base/xorg-x11 sdk && ! has_version ">=x11-base/xorg-server-0.1"
-		then
-			eerror "This package builds against the X.Org SDK, and therefore requires"
-			eerror "that you have emerged xorg-x11 with the sdk USE flag enabled."
-			die "Please remerge xorg-x11 with the sdk USE flag enabled."
-		fi
-		einfo "Installing X Wacom driver and accompanying userland utilities."
-	else
-		ewarn "The 'sdk' use flag is not set. Only building userland tools. If you wish to install"
-		ewarn "the updated external driver for your X server, please remerge your X11 package with"
-		ewarn "the USE=sdk flag enabled."
-	fi
-
-	if use usb; then
-		if ! has_version ">=sys-kernel/linux-headers-2.6"; then
-			if kernel_is 2 6; then
-				local msg
-				msg="USB Wacom tablets require 2.6 linux-headers. Please upgrade."
-				eerror "$msg"
-				die "$msg"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix multilib-strict error for Tcl/Tk library install
-	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
-
-	if use sdk && ! has_version ">=x11-base/xorg-server-0.1" ; then
-		cd ${S}
-
-		# Simple fixes to configure to check the actual location of the XFree86 SDK
-		# No need to check if just building userland tools
-		sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:
-			   s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure
-	fi
-
-	if has_version ">=x11-base/xorg-server-0.1"; then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-modular-x.patch
-	# moved to end of src_unpack to fix multilib issue -Jon <squinky86@gentoo.org>
-	#	autoreconf -v --install
-	#	libtoolize --force --copy
-	fi
-	autoreconf -v --install
-	libtoolize --force --copy
-}
-
-src_compile() {
-	if use gtk; then
-		if use gtk2; then
-			myconf="${myconf} --with-gtk=2.0"
-		else
-			myconf="${myconf} --with-gtk=1.2"
-		fi
-	else
-		myconf="${myconf} --with-gtk=no"
-	fi
-
-	if use tcltk ; then
-		myconf="${myconf} --with-tcl --with-tk"
-	else
-		myconf="${myconf} --without-tcl --without-tk"
-	fi
-
-	if use amd64 ; then
-		myconf="${myconf} --enable-xserver64"
-	fi
-
-	if use sdk || has_version ">=x11-base/xorg-server-0.1" ; then
-		myconf="${myconf} --enable-wacomdrv --enable-wacdump --enable-xsetwacom"
-		has_version ">=x11-base/xorg-server-0.1" || \
-			myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server --with-xlib=/usr/$(get_libdir)"
-
-		if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.1" ; then
-			myconf="${myconf} --enable-dlloader"
-		fi
-
-		econf ${myconf} || die "configure failed."
-
-		# Makefile fix for build against SDK
-		cd ${S}/src
-		sed -i -e "s:/include/extensions:/include:g" Makefile
-	else
-		myconf="${myconf} --disable-wacomdrv --enable-wacdump --enable-xsetwacom --without-xf86-sdk"
-		econf ${myconf} || die "configure failed."
-	fi
-	cd ${S}
-	unset ARCH
-	emake || die "build failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-}