/tmp/tclxml-multilib-compile.patch

tclxml-multilib-compile.patch (text/plain), 5.22 KB, created by Nathan Phillip Brink (binki) (RETIRED) on 2009-10-13 04:00:15 UTC

diff -r 555c325c694c dev-tcltk/tclxml/Manifest
--- a/dev-tcltk/tclxml/Manifest	Mon Oct 12 23:30:16 2009 -0400
+++ b/dev-tcltk/tclxml/Manifest	Mon Oct 12 23:58:08 2009 -0400
@@ -6,9 +6,9 @@
 DIST tclxml-3.0.tar.gz 480461 RMD160 0147850065e29229e77d12c0589e4d3980cfaf6e SHA1 6dcb1aa0a77c8e79b7b09beebaef9d0bae0b3389 SHA256 0bc233e1e4de333c9235ea541da0f7c087f9989f446551c81a1d8c4eeef411bc
 DIST tclxml-3.1.tar.gz 489568 RMD160 91a5025bf555a5ade5cb13be5ce746e015b2463b SHA1 d850ab7cd0457d60acbbfc4ab6be7f68827cdb1b SHA256 9b017f29c7a06fa1a57d1658bd1d3867297c26013604bdcc4d7b0ca2333552c9
 DIST tclxml-3.2.tar.gz 757594 RMD160 618d19c83159e85b1f95e4e8a173280d9ecb647c SHA1 bb6a551785b12162ae977f66d7ad3d70e094e122 SHA256 f4116b6680b249ce74b856a121762361ca09e6256f0c8ad578d1c661b822cb39
-EBUILD tclxml-2.4.ebuild 793 RMD160 019634adc2aa238eac0732cc52c35bec627aa4bf SHA1 89abad33053bb620b225526c037866c2baa623bb SHA256 4e2e07265e07bc03f9974d9437631b180071bbd08a82a2da35b7970a2f0be14e
-EBUILD tclxml-3.0-r1.ebuild 1379 RMD160 769db9068835fe72ee49a7e927b2af4656f2f8e8 SHA1 e2a3e159ea6d31afee33eddd00200d1c59edb516 SHA256 338f88519187edc8cf9e426b027d162f0499ed4592d86952ee5c2fa94f2c3744
-EBUILD tclxml-3.1-r1.ebuild 1491 RMD160 730b36eacde10e17f673a9b4b35c546b4029cd83 SHA1 38e0a4d060ce3cc68176df79cf5e825f10d84cbd SHA256 e3d5281c75029fabc297ce8165f3ec5290cd384ae2c886e49903af0c9c1cd149
+EBUILD tclxml-2.4.ebuild 841 RMD160 bd58172d00fc09a5d7c0951449f9106e7e5390c6 SHA1 36935bb69da1e1b3c28ed8277bf9cc7566342c38 SHA256 8a131cc7a2f7777a2fe75f5f8526be3fe492f29d5e344d75cb0d73f4afe5b16c
+EBUILD tclxml-3.0-r1.ebuild 1511 RMD160 6d1d2a1fb1f042d5c7d69572c6c7adb031c8be88 SHA1 657c489dfba22fb1a467aaf5c034c86a1348ced2 SHA256 92b139c7345d55ae7e2a6854bcda68f6eb11796596fa2f327c55cc2c70c96f39
+EBUILD tclxml-3.1-r1.ebuild 1568 RMD160 debb913cc37c342678a407720323122068bba459 SHA1 fbdaee9e98f15aa45cb252c4483b7e0d2b29e2dc SHA256 05cfa8455923a23947685407ba71ea5d19bc5a802094fb1cd610101f5229eafc
 EBUILD tclxml-3.2.ebuild 1380 RMD160 8fb2473fded01fe4eee01abb3201e1b0d3c25445 SHA1 031880fcbbeab6661edbf370116e09c4fdd40f00 SHA256 52df61f253a99ac42f70da50f3b99c6007748252bbfba49ccf34498546dd6bfe
 MISC ChangeLog 3799 RMD160 a4c1074597defae4b988c5260e0f95d9a4f9e865 SHA1 8c89a579b13259c2e1216849590c470d11dcc879 SHA256 8dc69d89625175bcb37e961f6956c4cd7f9de005d6ff16eadf10243a38abcdd8
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff -r 555c325c694c dev-tcltk/tclxml/tclxml-2.4.ebuild
--- a/dev-tcltk/tclxml/tclxml-2.4.ebuild	Mon Oct 12 23:30:16 2009 -0400
+++ b/dev-tcltk/tclxml/tclxml-2.4.ebuild	Mon Oct 12 23:58:08 2009 -0400
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-2.4.ebuild,v 1.18 2007/12/28 17:22:03 mr_bones_ Exp $
 
+inherit multilib
+
 DESCRIPTION="Pure Tcl implementation of an XML parser."
 HOMEPAGE="http://tclxml.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
@@ -20,7 +22,7 @@
 }
 
 src_compile() {
-	econf || die
+	econf --with-tcl=/usr/$(get_libdir) || die
 	make || die
 
 	# Need to hack the config script.
diff -r 555c325c694c dev-tcltk/tclxml/tclxml-3.0-r1.ebuild
--- a/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild	Mon Oct 12 23:30:16 2009 -0400
+++ b/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild	Mon Oct 12 23:58:08 2009 -0400
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.0-r1.ebuild,v 1.6 2007/05/18 22:06:54 welp Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Pure Tcl implementation of an XML parser."
 HOMEPAGE="http://tclxml.sourceforge.net/"
@@ -18,6 +18,8 @@
 	xml? ( >=dev-libs/libxml2-2.6.9 )
 	expat? ( dev-libs/expat )
 	!dev-tcltk/tclxml-expat"
+#test scripts rely on tclsh8.4 existing
+RESTRICT="test"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -30,7 +32,7 @@
 }
 
 src_compile() {
-	local myconf=""
+	local myconf="--with-tcl=/usr/$(get_libdir)"
 
 	use threads && myconf="${myconf} --enable-threads"
 
@@ -39,7 +41,7 @@
 
 	if use xml ; then
 		cd ${S}/libxml2
-		econf ${myconf} --with-Tclxml=.. || die
+		econf ${myconf} --with-Tclxml=.. --with-libxml2-lib=/usr/$(get_libdir) || die
 		emake || die
 	fi
 	if use expat ; then
diff -r 555c325c694c dev-tcltk/tclxml/tclxml-3.1-r1.ebuild
--- a/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild	Mon Oct 12 23:30:16 2009 -0400
+++ b/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild	Mon Oct 12 23:58:08 2009 -0400
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclxml/tclxml-3.1-r1.ebuild,v 1.2 2007/12/24 11:50:38 mr_bones_ Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Pure Tcl implementation of an XML parser."
 HOMEPAGE="http://tclxml.sourceforge.net/"
@@ -33,7 +33,7 @@
 }
 
 src_compile() {
-	local myconf=""
+	local myconf="--with-tcl=/usr/$(get_libdir)"
 
 	use threads && myconf="${myconf} --enable-threads"
 
@@ -42,7 +42,7 @@
 
 	if use xml ; then
 		cd "${S}"/libxml2
-		econf ${myconf} --with-Tclxml=.. || die
+		econf ${myconf} --with-Tclxml=..  --with-libxml2-lib=/usr/$(get_libdir) || die
 		emake || die
 	fi
 	if use expat ; then