summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-04-15 17:08:25 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-04-15 17:08:25 +0000
commit39837030f289ce0044bf641b1388b8eb7f638a9d (patch)
tree8da7e572883f27d616b228db74de92b7a332700c
parentVersion bump wrt bug #315475 (diff)
downloadgentoo-2-39837030f289ce0044bf641b1388b8eb7f638a9d.tar.gz
gentoo-2-39837030f289ce0044bf641b1388b8eb7f638a9d.tar.bz2
gentoo-2-39837030f289ce0044bf641b1388b8eb7f638a9d.zip
Fix tests wrt bug #310725
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--app-admin/chrpath/ChangeLog7
-rw-r--r--app-admin/chrpath/chrpath-0.13-r1.ebuild3
-rw-r--r--app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch19
3 files changed, 27 insertions, 2 deletions
diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index 5b39e188f3ad..eac844f4745b 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/chrpath
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.12 2010/03/03 17:19:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.13 2010/04/15 17:08:25 hwoarang Exp $
+
+ 15 Apr 2010; Markos Chandras <hwoarang@gentoo.org> chrpath-0.13-r1.ebuild,
+ +files/chrpath-0.13-testsuite-1.patch:
+ Fix tests wrt bug #310725. Thanks to Mario Fetka (geos_one)
+ <mario.fetka@gmail.com> for the patch
*chrpath-0.13-r1 (03 Mar 2010)
diff --git a/app-admin/chrpath/chrpath-0.13-r1.ebuild b/app-admin/chrpath/chrpath-0.13-r1.ebuild
index a708833a30b1..c3898ca100c6 100644
--- a/app-admin/chrpath/chrpath-0.13-r1.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r1.ebuild,v 1.1 2010/03/03 17:19:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r1.ebuild,v 1.2 2010/04/15 17:08:25 hwoarang Exp $
EAPI="2"
@@ -20,6 +20,7 @@ IUSE=""
src_prepare() {
epatch "${FILESDIR}"/${PN}-multilib.patch
epatch "${FILESDIR}"/${PN}-keepgoing.patch
+ epatch "${FILESDIR}"/${P}-testsuite-1.patch
eautoreconf
}
diff --git a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
new file mode 100644
index 000000000000..1a30ce1eb94a
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-04-04
+Initial Package Version: 0.13
+Origin: me
+Upstream Status: unknown
+Description: make the testsuite run with the new mltilib design
+
+diff -Naur chrpath-0.13.orig/testsuite/runtest.sh chrpath-0.13/testsuite/runtest.sh
+--- chrpath-0.13.orig/testsuite/runtest.sh 2010-04-04 09:02:21.859114159 +0000
++++ chrpath-0.13/testsuite/runtest.sh 2010-04-04 09:42:08.762112560 +0000
+@@ -2,6 +2,8 @@
+
+ set -x
+
++export LD_LIBRARY_PATH=$PWD/../.libs:$LD_LIBRARY_PATH
++
+ CHRPATH=../chrpath
+
+ retval=0