Fix test failure with ruby enabled.

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 53519e32c503c9c0bfd941a3055b73ec11e01ed6..ec21a2a231d461d50a6ffb06010dde2274c6cd29 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.38 2007/01/14 09:56:43 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.39 2007/01/14 23:12:29 kugelfang Exp $
+
+  14 Jan 2007; Danny van Dyk <kugelfang@gentoo.org>
+  +files/paludis-0.14.3-ruby-so.patch, paludis-0.14.3.ebuild:
+  Fix test failure with ruby enabled.
 
   14 Jan 2007; David Shakaryan <omp@gentoo.org> +paludis-0.14.3.ebuild:
   Version bump.

diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index bf3debc8a939363a6ac80244fa17fc8e2ea8bb47..d3b183406d4a7ed5c78f28f7c21bf01b2eebe390 100644 (file)
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -9,8 +9,12 @@ AUX paludis-0.14.2-ruby-so.patch 670 RMD160 291e238e4b122de21f64f2d8fc5ee6c54a2d
 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
+AUX paludis-0.14.3-ruby-so.patch 2928 RMD160 44bd41903c00dc0b4f0de72c8013ef741cfffed6 SHA1 2ed6ec390895f2b3989e9524530161cf8cc20a6d SHA256 cd32065d3188910759e6dcd211c5ba0e6edbd9e6b7cfa4de82d09449b8a84b78
+MD5 6e833fdf8bb2c4776daed146a6cee01a files/paludis-0.14.3-ruby-so.patch 2928
+RMD160 44bd41903c00dc0b4f0de72c8013ef741cfffed6 files/paludis-0.14.3-ruby-so.patch 2928
+SHA256 cd32065d3188910759e6dcd211c5ba0e6edbd9e6b7cfa4de82d09449b8a84b78 files/paludis-0.14.3-ruby-so.patch 2928
+DIST paludis-0.12.0.tar.bz2 1117637 RMD160 a65dd2320660ea30266271cbb375897bd3a4afa5 SHA1 c98a67ba1ee667613dffdf66dd0445c26cbcdeeb SHA256 600e80191943d898e1cdab324cdb82701b786c1153eb3610f76acf176e692d13
+DIST paludis-0.14.0.tar.bz2 1199884 RMD160 ac5642d4601809159c09143dded652983b061aef SHA1 794af0ba1c18ea71d42b719d364df7217430d665 SHA256 2afe61b85734c5d4654efec049d9ca098c4db57831ff1aca2ae011896e36151f
 DIST paludis-0.14.1.tar.bz2 1250579 RMD160 176d8efbe04a260f8ea1c9ae1dde5a5a95478023 SHA1 f80ae0cdcb18e7cc22c3d616863fcbbb5f43adb1 SHA256 8c61e0db8a30acf33ed4ab2746cc0007e51a30e2bc07ab7be2a5c15827d958c5
 DIST paludis-0.14.2.tar.bz2 1253906 RMD160 c7683818aa7436b2e07f62c2d9f347217129a4c2 SHA1 860f64f254d8586bffd7b1ff3a75e405f50b7e8d SHA256 b8b26c8d9f49eec22e326d8562a103b6022732de24bf848858af4aae7ffe9c54
 DIST paludis-0.14.3.tar.bz2 1254602 RMD160 e5a33425072ef2d71236dd78708146195ebb3008 SHA1 6c93bfcdb3ed4a5886057c97fb3b2c5bee245087 SHA256 343e6dfd382a84ca80d70f6bdb226fcf94e9a26c3aa9c7e5c3b1edb48ff078d2
@@ -30,24 +34,24 @@ EBUILD paludis-0.14.2.ebuild 3150 RMD160 84eb52792e0dea96bcef75d54ae3064540fbbbf
 MD5 51affd253eb4cb7be549e3188ba22827 paludis-0.14.2.ebuild 3150
 RMD160 84eb52792e0dea96bcef75d54ae3064540fbbbfc paludis-0.14.2.ebuild 3150
 SHA256 c1ca4f3b689b28613de9d1830de80e04e4156e024ac560920b467df476a92599 paludis-0.14.2.ebuild 3150
-EBUILD paludis-0.14.3.ebuild 3096 RMD160 1c43ce0d806d55dc8d685b3e8c6f23b0ca5b18ba SHA1 35a3f0cdd8885fe7390a35d8b412b05ec5571317 SHA256 059995f9f18c449c081803e173c73c467a7f30101219d32db7b332716d5d7f9b
-MD5 37f0314fbb885663ad10cd5cd17ab81a paludis-0.14.3.ebuild 3096
-RMD160 1c43ce0d806d55dc8d685b3e8c6f23b0ca5b18ba paludis-0.14.3.ebuild 3096
-SHA256 059995f9f18c449c081803e173c73c467a7f30101219d32db7b332716d5d7f9b paludis-0.14.3.ebuild 3096
-MISC ChangeLog 5183 RMD160 1fcb52c039eaa377271ffb3dae5c6e76913fab5e SHA1 106e02ac0b3f0a3080951ff4492193ba34dbb449 SHA256 c8d56e4f8d5f0e5a7990f154d638e48635b5ff073d88c707c62eab6ff8d75f00
-MD5 45e1ce0a01a933bc3f1f185a889a8495 ChangeLog 5183
-RMD160 1fcb52c039eaa377271ffb3dae5c6e76913fab5e ChangeLog 5183
-SHA256 c8d56e4f8d5f0e5a7990f154d638e48635b5ff073d88c707c62eab6ff8d75f00 ChangeLog 5183
+EBUILD paludis-0.14.3.ebuild 3183 RMD160 ebb6a1af610968f5f0320e3cf5ed9ad948e4ccd2 SHA1 45717dd03d3782ce798d76f24dc7c2d42f93ae3d SHA256 1ffe8b1099370c8c26f2c7151be0bf9fad0139ea7f5eb9ddf2b446392925c3a3
+MD5 4a2d4a6cc2815b3b9f3e3699634373b1 paludis-0.14.3.ebuild 3183
+RMD160 ebb6a1af610968f5f0320e3cf5ed9ad948e4ccd2 paludis-0.14.3.ebuild 3183
+SHA256 1ffe8b1099370c8c26f2c7151be0bf9fad0139ea7f5eb9ddf2b446392925c3a3 paludis-0.14.3.ebuild 3183
+MISC ChangeLog 5342 RMD160 d191b916dcee343ba61521a1d992e90d787371ec SHA1 0211210834535ba69898e0333b03f3f8460995ff SHA256 f3f2ffc0c60a03eda91279dc8b5d26402b5eb11d58e4f0636ea6ce64c5b07bd7
+MD5 15c7a8d445aae675d6f6821779b1766d ChangeLog 5342
+RMD160 d191b916dcee343ba61521a1d992e90d787371ec ChangeLog 5342
+SHA256 f3f2ffc0c60a03eda91279dc8b5d26402b5eb11d58e4f0636ea6ce64c5b07bd7 ChangeLog 5342
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215
 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215
 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1 metadata.xml 215
-MD5 fab076b4a9aee28a44fc4d83a74e36e8 files/digest-paludis-0.12.0 250
-RMD160 72a48588a66832250b5abc68369e496e5cf879d3 files/digest-paludis-0.12.0 250
-SHA256 40bd137f46fa64dd6c938d572c1c7d232fe9e6c0d52f02181cafc3e511b10b5a files/digest-paludis-0.12.0 250
-MD5 a32da6bd2ca809745809b76b7c0c18aa files/digest-paludis-0.14.0 250
-RMD160 a2726f6834308174337396f70b07b648b9ebdf7c files/digest-paludis-0.14.0 250
-SHA256 6ad13607788651c05366081951d91cea793728e5fcaa85a84250dd8d6b0f1981 files/digest-paludis-0.14.0 250
+MD5 6bc670f0a164dec9f05456a564f2815f files/digest-paludis-0.12.0 250
+RMD160 081643892ab9de17f5074b77615c5fc71836e62c files/digest-paludis-0.12.0 250
+SHA256 43f4ac5d27ea5b3989a65322c79074e425f5a1787548dd67f692419c79cf5f0a files/digest-paludis-0.12.0 250
+MD5 ab9eba5a23bfd62729f0b6dd75a5894e files/digest-paludis-0.14.0 250
+RMD160 b9e67f9e8a739b8373796ae5c7920c9aabc31184 files/digest-paludis-0.14.0 250
+SHA256 0c6a578978f59a944b6d8b84622bc3c7fc8c6798e14f4fb5969ee5f3d60aa8c2 files/digest-paludis-0.14.0 250
 MD5 89cf491a51d3f7f8f6168ad6b6ea0c6b files/digest-paludis-0.14.1 250
 RMD160 05ccb3ceec3143867460a66a08318a4071430dce files/digest-paludis-0.14.1 250
 SHA256 ce089b72a59bc9d1e2ba69257181dc7c34d160f94f9c40cb48fcc10ee3b451ef files/digest-paludis-0.14.1 250
@@ -60,7 +64,7 @@ SHA256 783bcf24487da267064058eff6e690c5aaf0b552dd3c8c33191572ad275dc303 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFqf5rvSApE0uP4UsRAozVAKCLi/dQg3fZRdWJnSblajqIsUuvgACfRL59
-h/069W4tzC4Zo9bRa9B7+os=
-=NlnQ
+iD8DBQFFqrj35mJXAu5GbtIRAibHAJ4hsHmhWhhTXW9tD/c0Vljdazj/5QCZAYUu
++sf5rA2xtpJQhmTHpXxnja4=
+=dKko
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/paludis/files/digest-paludis-0.12.0 b/sys-apps/paludis/files/digest-paludis-0.12.0
index 75724d3d4a10eff95f615964cd86f1bf49d6d3ed..e80562e236d8acab3e95c0a269d585dcf1559173 100644 (file)
--- a/sys-apps/paludis/files/digest-paludis-0.12.0
+++ b/sys-apps/paludis/files/digest-paludis-0.12.0
@@ -1,3 +1,3 @@
-MD5 4e28736cbdca12619765937fe159108c paludis-0.12.0.tar.bz2 1144668
-RMD160 a75b08a1387354a4e629539ad0884bf2fd585611 paludis-0.12.0.tar.bz2 1144668
-SHA256 b108439321b17c315b567dc7d5a01eaaa58cff0c79723c10f2489fd09381f639 paludis-0.12.0.tar.bz2 1144668
+MD5 f5a2c71bae880aa56b977ed42ae71bae paludis-0.12.0.tar.bz2 1117637
+RMD160 a65dd2320660ea30266271cbb375897bd3a4afa5 paludis-0.12.0.tar.bz2 1117637
+SHA256 600e80191943d898e1cdab324cdb82701b786c1153eb3610f76acf176e692d13 paludis-0.12.0.tar.bz2 1117637

diff --git a/sys-apps/paludis/files/digest-paludis-0.14.0 b/sys-apps/paludis/files/digest-paludis-0.14.0
index 3d56dda637eca7ba4a03a901745922a258a65c75..79d8df16b94f9e2521b1e7da00ba4d5a8ecf3a47 100644 (file)
--- a/sys-apps/paludis/files/digest-paludis-0.14.0
+++ b/sys-apps/paludis/files/digest-paludis-0.14.0
@@ -1,3 +1,3 @@
-MD5 e2e2c78f233e08e14cd106829e7269da paludis-0.14.0.tar.bz2 1239890
-RMD160 bcf5ec3d03a8b3072ea73abb309128d63204f6fd paludis-0.14.0.tar.bz2 1239890
-SHA256 fc09720cf03badb2097932a6dde760b8335bdfb7c161c1e71578e66c5c7fc7e2 paludis-0.14.0.tar.bz2 1239890
+MD5 83c6aaf176ea24f23424136524dc1906 paludis-0.14.0.tar.bz2 1199884
+RMD160 ac5642d4601809159c09143dded652983b061aef paludis-0.14.0.tar.bz2 1199884
+SHA256 2afe61b85734c5d4654efec049d9ca098c4db57831ff1aca2ae011896e36151f paludis-0.14.0.tar.bz2 1199884

diff --git a/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch b/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch
new file mode 100644 (file)
index 0000000..81595a0
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch
@@ -0,0 +1,50 @@
+Index: ruby/Makefile.am
+===================================================================
+--- ruby/Makefile.am   (revision 2133)
++++ ruby/Makefile.am   (revision 2165)
+@@ -84,6 +84,7 @@
+                       \`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/default/.libs\`: \
+                       \`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/no_config/.libs\`: \
+                       \`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
++                      \`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
+                       \`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
+                       \`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/libxml/.libs\`" \
+                       | tr -d ' '` \
+@@ -207,6 +208,7 @@
+           $(top_builddir)/paludis/environment/default/.libs/libpaludisdefaultenvironment.so \
+           $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
+           $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so \
++          $(top_builddir)/paludis/repositories/.libs/libpaludisrepositories.so \
+           $(top_builddir)/paludis/qa/.libs/libpaludisqa.so \
+           $(top_builddir)/paludis/libxml/.libs/libpaludislibxml.so \
+           $(PCREPLUSPLUS_LIBS)
+@@ -223,6 +225,7 @@
+           -L$(top_builddir)/paludis/environment/default/.libs/ -lpaludisdefaultenvironment \
+           -L$(top_builddir)/paludis/environment/no_config/.libs/ -lpaludisnoconfigenvironment \
+           -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist \
++          -L$(top_builddir)/paludis/repositories/.libs -lpaludisrepositories \
+           -L$(top_builddir)/paludis/qa/.libs/ -lpaludisqa \
+           -L$(top_builddir)/paludis/libxml/.libs/ -lpaludislibxml \
+           $(PCREPLUSPLUS_LIBS)
+@@ -240,8 +243,9 @@
+           $(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/dep_list/.libs/libpaludisdeplist.so
++          $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
++          $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so \
++          $(top_builddir)/paludis/repositories/.libs/libpaludisrepositories.so
+ 
+ Paludis.so : $(OUR_OBJECTS)
+       $(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@@ -254,7 +258,8 @@
+           -L$(top_builddir)/paludis/.libs/ -lpaludis \
+           -L$(top_builddir)/paludis/environment/default/.libs/ -lpaludisdefaultenvironment \
+           -L$(top_builddir)/paludis/environment/no_config/.libs/ -lpaludisnoconfigenvironment \
+-          -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist
++          -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist \
++          -L$(top_builddir)/paludis/repositories/.libs -lpaludisrepositories
+ 
+ endif
+ 

diff --git a/sys-apps/paludis/paludis-0.14.3.ebuild b/sys-apps/paludis/paludis-0.14.3.ebuild
index c74991f995231d239c99ef191bf07f84ae4d8c3a..360a41e5086368ad2bdda74cf9c20162d16158e6 100644 (file)
--- a/sys-apps/paludis/paludis-0.14.3.ebuild
+++ b/sys-apps/paludis/paludis-0.14.3.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.3.ebuild,v 1.1 2007/01/14 09:56:43 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.3.ebuild,v 1.2 2007/01/14 23:12:29 kugelfang Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -48,6 +48,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 \  ,`