multilib-strict fixes; bug 164447

Package-Manager: portage-2.1.2-r9

diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog
index 4b2cfbef40e3d33869c1f6a7c6c30a774f886098..a873ce439cfe418342159b2c778db8f3a95e5578 100644 (file)
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/clearsilver
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.27 2007/02/13 20:34:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.28 2007/02/14 12:25:48 blubb Exp $
+
+  14 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/clearsilver-0.10.4-libdir.patch, clearsilver-0.10.4.ebuild:
+  multilib-strict fixes; bug 164447
 
   13 Feb 2007; Markus Rothe <corsair@gentoo.org> clearsilver-0.10.4.ebuild:
   Added ~ppc64; bug #166675

diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest
index 761a9d36f72074fe646c77d8b446d910857b5781..35a76037b69600ef0f1132c28fb4aecc91c431f2 100644 (file)
--- a/dev-libs/clearsilver/Manifest
+++ b/dev-libs/clearsilver/Manifest
@@ -14,6 +14,10 @@ AUX clearsilver-0.10.1-fPIC.patch 2384 RMD160 a14cfce02d8bb89143b21f0b131cf99ac3
 MD5 67ba91b55c05fa5dc211dfb4dcd8ae0d files/clearsilver-0.10.1-fPIC.patch 2384
 RMD160 a14cfce02d8bb89143b21f0b131cf99ac3f10e0e files/clearsilver-0.10.1-fPIC.patch 2384
 SHA256 1beb9c2b5eb1c55b4b2eb2ed7b1cf8d3f0aea210b0b55e91a56914efede5bf78 files/clearsilver-0.10.1-fPIC.patch 2384
+AUX clearsilver-0.10.4-libdir.patch 693 RMD160 681c05d73d7679a0021e5231ae23fc2f7292330c SHA1 001ee8e3a4b7ebd64a05bd74f9ed8a9abb52965a SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2
+MD5 c1ff2d71c89ae56445b88728e81f1fa8 files/clearsilver-0.10.4-libdir.patch 693
+RMD160 681c05d73d7679a0021e5231ae23fc2f7292330c files/clearsilver-0.10.4-libdir.patch 693
+SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2 files/clearsilver-0.10.4-libdir.patch 693
 AUX configure-python24.patch 867 RMD160 38c9e427b6694971870847c74dd4c371cedcf500 SHA1 f6bb691a6a2e32c923ec43d07d16cd324674acb5 SHA256 f3f4f4c6c31a00476e41189ab252320600ac20d56d96a555a66703d6b4aab60b
 MD5 50cea20dc6a84df4ce015e7d821e97d2 files/configure-python24.patch 867
 RMD160 38c9e427b6694971870847c74dd4c371cedcf500 files/configure-python24.patch 867
@@ -29,14 +33,14 @@ EBUILD clearsilver-0.10.3.ebuild 1702 RMD160 2318486f22cf94b4ae9c8559f5a84c64479
 MD5 b98e6a84a86e780b03980ab0c33fd712 clearsilver-0.10.3.ebuild 1702
 RMD160 2318486f22cf94b4ae9c8559f5a84c6447935122 clearsilver-0.10.3.ebuild 1702
 SHA256 f236b93f19ddd4b5e8a5360dee66577f12a9a77f7905a7b52dbce2fbed7bfbd6 clearsilver-0.10.3.ebuild 1702
-EBUILD clearsilver-0.10.4.ebuild 1381 RMD160 831557340b372ac6ba5e5f9a568c2682d743ef68 SHA1 6e5f5fe243c374c5d9f76f5d45f4b4fc916aba74 SHA256 791d4e7665cf41f63c75478aab98bbfc668609b5825142c19dbc87b474e6d095
-MD5 9340592ad615da731dcd2eeaed26b8a0 clearsilver-0.10.4.ebuild 1381
-RMD160 831557340b372ac6ba5e5f9a568c2682d743ef68 clearsilver-0.10.4.ebuild 1381
-SHA256 791d4e7665cf41f63c75478aab98bbfc668609b5825142c19dbc87b474e6d095 clearsilver-0.10.4.ebuild 1381
-MISC ChangeLog 4548 RMD160 65cc92dc47b43240e041e6f9b2041ad0247f2223 SHA1 f171def4f2c879a55aa26da12f920be3c2200eb1 SHA256 c3c16ac52f8814c3b1817abd3bdad058929f695a16b04efb651a08f0422dc9f8
-MD5 cc658e93dc9c8baa360237ae6948cd31 ChangeLog 4548
-RMD160 65cc92dc47b43240e041e6f9b2041ad0247f2223 ChangeLog 4548
-SHA256 c3c16ac52f8814c3b1817abd3bdad058929f695a16b04efb651a08f0422dc9f8 ChangeLog 4548
+EBUILD clearsilver-0.10.4.ebuild 1550 RMD160 778f0d32b6a6456b635df8c6b63b8293179ff603 SHA1 4f2ad0de55cfa8462ae554494e9d7b4c015b56f8 SHA256 bbd0c2f213d79fb5d19b51fdf03de31a764f2e689d3ea7fce3a2f0c58fba3900
+MD5 1db72d1b97fdeff332b4504fa166fcce clearsilver-0.10.4.ebuild 1550
+RMD160 778f0d32b6a6456b635df8c6b63b8293179ff603 clearsilver-0.10.4.ebuild 1550
+SHA256 bbd0c2f213d79fb5d19b51fdf03de31a764f2e689d3ea7fce3a2f0c58fba3900 clearsilver-0.10.4.ebuild 1550
+MISC ChangeLog 4701 RMD160 c15ee8f2d00af67ba7104754568b28b4b9f8bab0 SHA1 80d606be9ba324a73d898345bbedb01c84fec093 SHA256 2581a517e20881c5485584cf44d3e6e988139e5460416f0d87db8ac118e8f9c6
+MD5 4ce79d005dafc3b84383301a32ca69fc ChangeLog 4701
+RMD160 c15ee8f2d00af67ba7104754568b28b4b9f8bab0 ChangeLog 4701
+SHA256 2581a517e20881c5485584cf44d3e6e988139e5460416f0d87db8ac118e8f9c6 ChangeLog 4701
 MISC metadata.xml 216 RMD160 93b58c3db5dcd051f3c903b712ecdfa48f59db0c SHA1 f8dfddd65f5a588eb55ed7be57a224bf8f52f488 SHA256 0fa5af41c4517f8bf2dbff136d9af93902f5890c45533c101d6c07ce0f430428
 MD5 908db14d15dc92bfbb6aa8ce5b426f46 metadata.xml 216
 RMD160 93b58c3db5dcd051f3c903b712ecdfa48f59db0c metadata.xml 216

diff --git a/dev-libs/clearsilver/clearsilver-0.10.4.ebuild b/dev-libs/clearsilver/clearsilver-0.10.4.ebuild
index b3b439046b3b706777d95f65a97c83627db19b6b..b0e2529e6b56ca384ec9f694fffe5b694ba5f804 100644 (file)
--- a/dev-libs/clearsilver/clearsilver-0.10.4.ebuild
+++ b/dev-libs/clearsilver/clearsilver-0.10.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.4.ebuild,v 1.2 2007/02/13 20:34:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.4.ebuild,v 1.3 2007/02/14 12:25:48 blubb Exp $
 
 # Please note: apache, java, mono and ruby support disabled for now.
 # Fill a bug if you need it.
 #
 # dju@gentoo.org, 4th July 2005
 
-inherit eutils perl-app
+inherit eutils perl-app multilib autotools
 
 DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system."
 HOMEPAGE="http://www.clearsilver.net/"
@@ -28,6 +28,15 @@ if use python ; then
        DOCS="${DOCS} README.python"
 fi
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       
+       epatch "${FILESDIR}"/${P}-libdir.patch
+       sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" configure.in
+       eautoreconf
+}
+
 src_compile() {
        econf \
                $(use_enable perl) \

diff --git a/dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch b/dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch
new file mode 100644 (file)
index 0000000..46f1c91
--- /dev/null
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.4-libdir.patch
@@ -0,0 +1,13 @@
+--- configure.in.orig   2007-02-14 13:13:10.000000000 +0100
++++ configure.in        2007-02-14 13:18:39.000000000 +0100
+@@ -253,8 +253,8 @@
+     vers=`$python_bin -c "import sys; print sys.version[[:3]]"`
+     py_inst_dir=`$python_bin -c "import sys; print sys.exec_prefix"`
+     python_inc=$py_inst_dir/include/python$vers
+-    python_lib="-L$py_inst_dir/lib/python$vers/config -lpython$vers"
+-    python_site=$py_inst_dir/lib/python$vers/site-packages
++    python_lib="-L$py_inst_dir/GENTOO_LIBDIR/python$vers/config -lpython$vers"
++    python_site=$py_inst_dir/GENTOO_LIBDIR/python$vers/site-packages
+   else
+     for vers in $python_versions; do
+       for path in $python_search_path; do