Fix test failure with ruby enabled

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 0bb4b0d81b066825ed23617e08d549400c5e799f..8d4c0ee8465d4208ff8cfb577176ae8b264d8b47 100644 (file)
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.36 2007/01/08 00:00:46 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.37 2007/01/08 00:52:09 spb Exp $
+
+  08 Jan 2007; Stephen Bennett <spb@gentoo.org>
+  +files/paludis-0.14.2-ruby-so.patch, paludis-0.14.2.ebuild:
+  Fix test failure with ruby enabled
 
 *paludis-0.14.2 (08 Jan 2007)
 

diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 425096954dc89668cb2a1d2c682219bd3560a227..9abde1ba64e74e741ac82d8bf173046a32646088 100644 (file)
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -2,6 +2,10 @@ AUX paludis-0.14.1-vdb-path.patch 567 RMD160 0b646d99ae23050d65b4106ddf6f491a92b
 MD5 f6568678175c1022c50f462722c4631e files/paludis-0.14.1-vdb-path.patch 567
 RMD160 0b646d99ae23050d65b4106ddf6f491a92b51187 files/paludis-0.14.1-vdb-path.patch 567
 SHA256 49e0f100e1c7ce66b3012060fc52c99e68106ce6f1a421d3880c7711d14a2b03 files/paludis-0.14.1-vdb-path.patch 567
+AUX paludis-0.14.2-ruby-so.patch 670 RMD160 291e238e4b122de21f64f2d8fc5ee6c54a2d29a4 SHA1 a23af7165403a546f277df9838b6b44d742f0885 SHA256 480bd4c236d61acb9cd86f0199edece453e4ac51b6beba7f5fb3388cd41d9425
+MD5 5909c7c49cd6ecee792c0aeb7501b4fd files/paludis-0.14.2-ruby-so.patch 670
+RMD160 291e238e4b122de21f64f2d8fc5ee6c54a2d29a4 files/paludis-0.14.2-ruby-so.patch 670
+SHA256 480bd4c236d61acb9cd86f0199edece453e4ac51b6beba7f5fb3388cd41d9425 files/paludis-0.14.2-ruby-so.patch 670
 DIST paludis-0.12.0.tar.bz2 1144668 RMD160 a75b08a1387354a4e629539ad0884bf2fd585611 SHA1 5f84a6a022518946f00986df32619e381b3c3f13 SHA256 b108439321b17c315b567dc7d5a01eaaa58cff0c79723c10f2489fd09381f639
 DIST paludis-0.14.0.tar.bz2 1239890 RMD160 bcf5ec3d03a8b3072ea73abb309128d63204f6fd SHA1 3b49487ff98bf6e699ab6196cb09984a9d478c50 SHA256 fc09720cf03badb2097932a6dde760b8335bdfb7c161c1e71578e66c5c7fc7e2
 DIST paludis-0.14.1.tar.bz2 1250579 RMD160 176d8efbe04a260f8ea1c9ae1dde5a5a95478023 SHA1 f80ae0cdcb18e7cc22c3d616863fcbbb5f43adb1 SHA256 8c61e0db8a30acf33ed4ab2746cc0007e51a30e2bc07ab7be2a5c15827d958c5
@@ -18,14 +22,14 @@ EBUILD paludis-0.14.1.ebuild 3153 RMD160 0929a1dbdee271eafad4c1d5d184bce578abcb5
 MD5 e4eb394210c1ea6c3674e55854be484e paludis-0.14.1.ebuild 3153
 RMD160 0929a1dbdee271eafad4c1d5d184bce578abcb50 paludis-0.14.1.ebuild 3153
 SHA256 8c5fe1192a6e4e8e32cf715e33da9b66743bfaa2214aaecdfd14035dce58acab paludis-0.14.1.ebuild 3153
-EBUILD paludis-0.14.2.ebuild 3067 RMD160 a95eee08f40f0539b24fbdec4c4dea244d382754 SHA1 86f7fc599e6dc1109efd103028d46bc3274da8c1 SHA256 a2dc97192979115e8555b2304de4779e6829deeb8d13a84c17bc8dea64e6b47b
-MD5 5810a8474d132355ce207b0c71363505 paludis-0.14.2.ebuild 3067
-RMD160 a95eee08f40f0539b24fbdec4c4dea244d382754 paludis-0.14.2.ebuild 3067
-SHA256 a2dc97192979115e8555b2304de4779e6829deeb8d13a84c17bc8dea64e6b47b paludis-0.14.2.ebuild 3067
-MISC ChangeLog 4946 RMD160 1b799ec853e3454807855632a4a3211857527f58 SHA1 428feac5f80383fe43652ea3c0273ef20d3d32f8 SHA256 ba81d433ab7abe75cb71d67edf4a5265551d2b73c53741641886b1996e48615f
-MD5 ac1ff9c8a3ad33815036b1408a696d18 ChangeLog 4946
-RMD160 1b799ec853e3454807855632a4a3211857527f58 ChangeLog 4946
-SHA256 ba81d433ab7abe75cb71d67edf4a5265551d2b73c53741641886b1996e48615f ChangeLog 4946
+EBUILD paludis-0.14.2.ebuild 3150 RMD160 84eb52792e0dea96bcef75d54ae3064540fbbbfc SHA1 b80fae88db72e71c17d4ce78f25bdeaf62b077f2 SHA256 c1ca4f3b689b28613de9d1830de80e04e4156e024ac560920b467df476a92599
+MD5 51affd253eb4cb7be549e3188ba22827 paludis-0.14.2.ebuild 3150
+RMD160 84eb52792e0dea96bcef75d54ae3064540fbbbfc paludis-0.14.2.ebuild 3150
+SHA256 c1ca4f3b689b28613de9d1830de80e04e4156e024ac560920b467df476a92599 paludis-0.14.2.ebuild 3150
+MISC ChangeLog 5094 RMD160 39c94680078f083a3ea65a4140aa5b56dc730938 SHA1 360c2c061b93bb813edd583b6209b3cb23463547 SHA256 8e419483af17b7a9284474fa887ce9d12bd031f269a86ed6118c55df894a54c7
+MD5 ba71c516800cdca1ceeeaef27101dd19 ChangeLog 5094
+RMD160 39c94680078f083a3ea65a4140aa5b56dc730938 ChangeLog 5094
+SHA256 8e419483af17b7a9284474fa887ce9d12bd031f269a86ed6118c55df894a54c7 ChangeLog 5094
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215
 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215

diff --git a/sys-apps/paludis/files/paludis-0.14.2-ruby-so.patch b/sys-apps/paludis/files/paludis-0.14.2-ruby-so.patch
new file mode 100644 (file)
index 0000000..c4ae6c0
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.14.2-ruby-so.patch
@@ -0,0 +1,13 @@
+Index: ruby/Makefile.am
+===================================================================
+--- ruby/Makefile.am   (revision 2150)
++++ ruby/Makefile.am   (working copy)
+@@ -240,7 +240,7 @@
+           $(top_builddir)/paludis/util/.libs/libpaludisutil.so \
+           $(top_builddir)/paludis/.libs/libpaludis.so \
+           $(top_builddir)/paludis/environment/default/.libs/libpaludisdefaultenvironment.so \
+-          $(top_builddir)/paludis/environment/no_config/.libs/libpaldisnoconfigenvironment.so \
++          $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
+           $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so
+ 
+ Paludis.so : $(OUR_OBJECTS)

diff --git a/sys-apps/paludis/paludis-0.14.2.ebuild b/sys-apps/paludis/paludis-0.14.2.ebuild
index 3eb163f413bbff3ac808a5eebe51e9e4c86af1a9..377bdfa018d10f6edd17b492e4904c869f82bbe3 100644 (file)
--- a/sys-apps/paludis/paludis-0.14.2.ebuild
+++ b/sys-apps/paludis/paludis-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.2.ebuild,v 1.1 2007/01/08 00:00:46 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.2.ebuild,v 1.2 2007/01/08 00:52:09 spb Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -47,6 +47,12 @@ pkg_setup() {
        filter-ldflags -Wl,--as-needed --as-needed
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-ruby-so.patch
+}
+
 src_compile() {
        local repositories=`echo default $(usev cran) | tr -s \  ,`
        local clients=`echo default $(usev contrarius) | tr -s \  ,`