From 98c763b2599c939a565b046975d238d926a47053 Mon Sep 17 00:00:00 2001 From: Danny van Dyk Date: Sun, 14 Jan 2007 23:12:29 +0000 Subject: Fix test failure with ruby enabled. (Portage version: 2.1.2_rc4-r8) --- sys-apps/paludis/ChangeLog | 6 ++- sys-apps/paludis/files/digest-paludis-0.12.0 | 6 +-- sys-apps/paludis/files/digest-paludis-0.14.0 | 6 +-- .../paludis/files/paludis-0.14.3-ruby-so.patch | 50 ++++++++++++++++++++++ sys-apps/paludis/paludis-0.14.3.ebuild | 8 +++- 5 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch (limited to 'sys-apps/paludis') diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog index 53519e32c503..ec21a2a231d4 100644 --- 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 + +files/paludis-0.14.3-ruby-so.patch, paludis-0.14.3.ebuild: + Fix test failure with ruby enabled. 14 Jan 2007; David Shakaryan +paludis-0.14.3.ebuild: Version bump. diff --git a/sys-apps/paludis/files/digest-paludis-0.12.0 b/sys-apps/paludis/files/digest-paludis-0.12.0 index 75724d3d4a10..e80562e236d8 100644 --- 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 3d56dda637ec..79d8df16b94f 100644 --- 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 index 000000000000..81595a0dc439 --- /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 c74991f99523..360a41e50863 100644 --- 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 \ ,` -- cgit v1.2.3-65-gdbad