libtoolize -c -f in src_unpack. Fixes bug #80856.

Package-Manager: portage-2.0.51-r15

7 files changed, 19 insertions, 133 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 064d994ddf37..310ccfd30050 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/linuxwacom
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.20 2005/01/01 01:52:19 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.21 2005/02/09 03:06:11 battousai Exp $
+
+  08 Feb 2005; Bryan Stine <battousai@gentoo.org> -linuxwacom-0.6.2.ebuild,
+  linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild:
+  Relibtoolize to fix inconsistency with new libtool 1.5.10. Fixes bug #80856.
 
   31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild:
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 0d5fc5639392..102adc8c3fb0 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c2f927beefe923be43b483186af5c2d2 linuxwacom-0.6.2.ebuild 3241
-MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.3.ebuild 3239
+MD5 4d039c1efa5546eccca99450f3dcf5ed ChangeLog 3843
+MD5 a9e75705cd68f2ac78676624c583cb48 linuxwacom-0.6.3.ebuild 3240
 MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
-MD5 689b1399f2aa031b1175f62ced856b42 linuxwacom-0.6.4.ebuild 3883
-MD5 d90e558436e04034333b29384111e75d linuxwacom-0.6.6.ebuild 3708
-MD5 62cc2d598d55d05974278e911b68954d ChangeLog 3636
-MD5 270159aa127b9370f0e66f2ccaebd7c7 files/digest-linuxwacom-0.6.2 69
+MD5 97b48494a961baa4d4dacea03dbcc6b6 linuxwacom-0.6.4.ebuild 3901
+MD5 1193755d8eaaaa65efee3459a4532699 linuxwacom-0.6.6.ebuild 3726
 MD5 78a65c4833619b5ad2df32981808eb6a files/digest-linuxwacom-0.6.3 69
 MD5 845ee9f0e43d25914f1483ce14c7d692 files/digest-linuxwacom-0.6.4 69
-MD5 460388794b55a5e57d127858eea80bcc files/linuxwacom-0.6.4-nonx86.patch 1739
 MD5 fe1457589d41bcc4b2407351e6ae2faf files/digest-linuxwacom-0.6.6 69
+MD5 460388794b55a5e57d127858eea80bcc files/linuxwacom-0.6.4-nonx86.patch 1739
 MD5 97ebb9a35c19c6f15f8fb9ac4b847d09 files/linuxwacom-0.6.6-nonx86.patch 609
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB1gJeArHZZzCEUG0RAt1DAJ9C6cfwgaWPzo8mgwnJSl6EqvsHjQCeJpYf
-jf3bTopIaZxHS1ioX5xd1YM=
-=N4iV
------END PGP SIGNATURE-----
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.2 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.2
deleted file mode 100644
index 7981a35ec1eb..000000000000
--- a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c178bd5b2c634b3d04ae63034c3f8745 linuxwacom-0.6.2.tar.bz2 443100
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild
deleted file mode 100644
index 9946ce03034c..000000000000
--- a/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild,v 1.11 2004/10/04 06:13:29 spyderous Exp $
-
-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="~x86"
-IUSE="gtk gtk2 tcltk sdk"
-
-RDEPEND="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}
-	sys-devel/libtool
-	dev-util/pkgconfig
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if use sdk; then
-		if has_version ">=x11-base/xfree-4.3.0-r7"
-		then
-			if [ ! "`grep sdk /var/db/pkg/x11-base/xfree-[0-9]*/USE`" ]
-			then
-				eerror "This package builds against the XFree86 SDK, and therefore requires"
-				eerror "that you have emerged xfree with the sdk USE flag enabled."
-				die "Please remerge xfree with the sdk USE flag enabled."
-			fi
-		elif has_version "x11-base/xorg-x11"
-		then
-			if [ ! "`grep sdk /var/db/pkg/x11-base/xorg-x11-[0-9]*/USE`" ]
-			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
-		else die "This build requires x11-base/xorg-x11 or x11-base/xfree to be installed to build against the SDK when USE=sdk."
-		fi
-		einfo "Building against the X11 SDK. This will install updated X drivers and userland tools."
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if use sdk; then
-		# Simple fixes to configure to check the actual location of the XFree86 SDK
-		# No need to check if just building userland tools
-		cd ${S}
-		sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure
-		sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure
-	fi
-}
-
-src_compile() {
-	if use gtk;
-	then
-		if use gtk2;
-		then
-			withgtk="--with-gtk=2.0"
-		else
-			withgtk="--with-gtk=1.2"
-		fi
-	else
-		withgtk="--with-gtk=no"
-	fi
-	if use tcltk;
-	then
-		withtcltk="--with-tcl --with-tk"
-	else
-		withtcltk="--without-tcl --without-tk"
-	fi
-
-	if use sdk; then
-		myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk"
-		econf ${myconf} || die "configure failed."
-
-		# Makefile fix for build against SDK
-		cd ${S}/src
-		cp Makefile Makefile.orig
-		sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile
-		sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile
-		sed -i -e "s:/include/extensions:/include:g" Makefile
-	else
-		myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
-		econf ${myconf} || die "configure failed."
-	fi
-	cd ${S}
-	emake || die "build failed."
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "Install failed."
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild
index ffc7f9964cea..ad4b4a84815a 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild,v 1.9 2004/10/04 06:13:29 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild,v 1.10 2005/02/09 03:06:11 battousai Exp $
 
 DESCRIPTION="Input driver for Wacom tablets and drawing devices"
 HOMEPAGE="http://linuxwacom.sourceforge.net/"
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
index 6aa182668065..43029ce23990 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.6 2005/01/01 01:52:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.7 2005/02/09 03:06:11 battousai Exp $
 
 IUSE="gtk gtk2 tcltk sdk"
 
@@ -69,6 +69,7 @@ src_unpack() {
 		export WANT_AUTOMAKE=1.6
 		export WANT_AUTOCONF=2.5
 
+		libtoolize -c -f
 		aclocal
 		autoheader
 		automake -a -c -f
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
index 82920d020c4f..d5e205e7ea00 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.2 2005/01/01 01:52:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.3 2005/02/09 03:06:11 battousai Exp $
 
 IUSE="gtk gtk2 tcltk sdk"
 
@@ -69,6 +69,7 @@ src_unpack() {
 		export WANT_AUTOMAKE=1.6
 		export WANT_AUTOCONF=2.5
 
+		libtoolize -c -f
 		aclocal
 		autoheader
 		automake -a -c -f