summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Bennett <spb@gentoo.org>2007-01-08 00:52:09 +0000
committerStephen Bennett <spb@gentoo.org>2007-01-08 00:52:09 +0000
commit3253c0f08f970b8b649438a64e776032f56bd900 (patch)
tree759068ef8f3b0c84fe771aa25546f3e3375e29bc /sys-apps/paludis
parentQA: Removed unused versions. (diff)
downloadgentoo-2-3253c0f08f970b8b649438a64e776032f56bd900.tar.gz
gentoo-2-3253c0f08f970b8b649438a64e776032f56bd900.tar.bz2
gentoo-2-3253c0f08f970b8b649438a64e776032f56bd900.zip
Fix test failure with ruby enabled
(Portage version: 2.1.2_rc4-r5)
Diffstat (limited to 'sys-apps/paludis')
-rw-r--r--sys-apps/paludis/ChangeLog6
-rw-r--r--sys-apps/paludis/files/paludis-0.14.2-ruby-so.patch13
-rw-r--r--sys-apps/paludis/paludis-0.14.2.ebuild8
3 files changed, 25 insertions, 2 deletions
diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 0bb4b0d81b06..8d4c0ee8465d 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.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/files/paludis-0.14.2-ruby-so.patch b/sys-apps/paludis/files/paludis-0.14.2-ruby-so.patch
new file mode 100644
index 000000000000..c4ae6c0ce1a1
--- /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 3eb163f413bb..377bdfa018d1 100644
--- 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 \ ,`