Fix local libtool handling #218483 by Ewgenij Starostin.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+

4 files changed, 30 insertions, 17 deletions

diff --git a/media-libs/libgii/ChangeLog b/media-libs/libgii/ChangeLog
index a3e3799a0939..6508f8557a16 100644
--- a/media-libs/libgii/ChangeLog
+++ b/media-libs/libgii/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgii
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.39 2007/07/27 11:20:54 uberlord Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/ChangeLog,v 1.40 2008/06/09 09:11:26 vapier Exp $
+
+  09 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  files/libgii-1.0.2-configure-cpuid-pic.patch, libgii-1.0.2.ebuild:
+  Fix local libtool handling #218483 by Ewgenij Starostin.
 
   27 Jul 2007; Roy Marples <uberlord@gentoo.org> libgii-1.0.2.ebuild:
   Keyworded ~x86-fbsd
diff --git a/media-libs/libgii/Manifest b/media-libs/libgii/Manifest
index 01497cf4d721..f66e66678fcb 100644
--- a/media-libs/libgii/Manifest
+++ b/media-libs/libgii/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgii-0.9.0-linux26-headers.patch 419 RMD160 24b4ea5258f3b10bc47447f57c24ed3bc433212e SHA1 dd3572db7b0e599073d9ca1375821ccaea769318 SHA256 3b8219be83b51ec8d676cea2a677bc07f20b6aee788b3c7948d9dd9000829a7c
-AUX libgii-1.0.2-configure-cpuid-pic.patch 519 RMD160 9d17076b5c7577d17921e4163f878c2abdfab29d SHA1 e31bf6b7134ceb344c4c44d4968b413eb8ff7dae SHA256 c1931db83de878d406233584aba7b688dd7c11e18f986fd4377128d267d5d7f1
+AUX libgii-1.0.2-configure-cpuid-pic.patch 451 RMD160 f8d16c6419efa1d7a4f392a78a97c76d99047f03 SHA1 6a7ec3ddd07a79e01d3886c2012574692bd44cbd SHA256 69f61d69ad22325f855728ddaa8fd9fce45c3002d6c1e044c207a308e6c1158d
 DIST libgii-1.0.2.src.tar.bz2 701099 RMD160 8109f5e9bdd061c3d90120b439c471f5c4369971 SHA1 5ee0cd4a5652df85d68303ace41b88df825a6ea0 SHA256 f72201143281ba972fd9e249afbe342c54e73c29ec996adb0d6e85322c6ee49d
-EBUILD libgii-1.0.2.ebuild 1388 RMD160 f11b0e44c89c7f1ce2314790099aba4c714a00f2 SHA1 eda4a5671d3e973e3307e459c623f4ded2a48fb2 SHA256 7c488b559b3e4ab2b9377b92d5d3bc3b2573c1ac1e56ad20078b8f50ce21a1bd
-MISC ChangeLog 4782 RMD160 da3c750dcb890e092641077e95216b863d0a4335 SHA1 0c2655c284a855e158d4cae1c8b104d1a3a04d7c SHA256 4e2d31e95f7083b3fc69ccec2988217bbf6d775c29496266b7ff2eb68ed09c6e
+EBUILD libgii-1.0.2.ebuild 1268 RMD160 53f3539933a80de36d7321bfda42e63470219600 SHA1 4be35f281e20dc66887c5abe86c941ab2afaa8b9 SHA256 618959876b28004dcde503f1d99082116ac24639534eb283abcec8ea32a69ce6
+MISC ChangeLog 4959 RMD160 362ef078d8ef8fd932bfd547ff858d0ff5441651 SHA1 56967eee59cb783aa7863993b9660a9beba0c3c7 SHA256 f1a2ad546e2fda603cb5bd490f367e69535f228ee10e8a9a63711ca4b34c6e50
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFITPPDj9hvisErhMIRAg+YAKCzBuDZCU2Ho2HxI5nCRjHqpXToigCggZ6/
+D/RVMoubKbbwqBgwOab7+cg=
+=8pcE
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgii/files/libgii-1.0.2-configure-cpuid-pic.patch b/media-libs/libgii/files/libgii-1.0.2-configure-cpuid-pic.patch
index f4cb50cc2593..5c014a479745 100644
--- a/media-libs/libgii/files/libgii-1.0.2-configure-cpuid-pic.patch
+++ b/media-libs/libgii/files/libgii-1.0.2-configure-cpuid-pic.patch
@@ -1,6 +1,7 @@
-diff -ur libgii-1.0.2.orig/acinclude.m4 libgii-1.0.2/acinclude.m4
---- libgii-1.0.2.orig/acinclude.m4	2007-01-26 22:06:57.000000000 +0200
-+++ libgii-1.0.2/acinclude.m4	2007-03-30 22:06:16.000000000 +0300
+dont clobber ebx as that is the pic register and it doesnt work in many cases
+
+--- libgii-1.0.2/m4/swar.m4
++++ libgii-1.0.2/m4/swar.m4
 @@ -8069,7 +8069,7 @@
  	#ifdef _MSC_VER
  	__asm cpuid
diff --git a/media-libs/libgii/libgii-1.0.2.ebuild b/media-libs/libgii/libgii-1.0.2.ebuild
index a9d70a08caf7..c467fea84685 100644
--- a/media-libs/libgii/libgii-1.0.2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-1.0.2.ebuild,v 1.12 2007/07/27 11:20:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgii/libgii-1.0.2.ebuild,v 1.13 2008/06/09 09:11:26 vapier Exp $
 
 inherit autotools eutils
 
@@ -13,23 +13,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="X"
 
-RDEPEND="X? ( x11-libs/libX11 x11-libs/libXxf86dga )
+RDEPEND="X? ( x11-libs/libX11 x11-libs/libXxf86dga )"
+DEPEND="${RDEPEND}
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.11 )"
-DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.9.0-linux26-headers.patch
-	# Modify configure check that tries to compile the cpuid instruction
-	# to work on hardened compiler. Modified acinclude.m4.
 	epatch "${FILESDIR}"/${P}-configure-cpuid-pic.patch
-	# Since acinclude.m4 is modified, need to autoreconf.
-	eautoreconf
+	rm -f acinclude.m4 m4/libtool.m4 m4/lt*.m4
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_compile() {
-	econf $(use_with X x) $(use_enable X x)
+	econf $(use_with X x) $(use_enable X x) || die
 	emake || die "emake failed."
 }