Fix tests wrt bug #310725

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 30 insertions, 4 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/Manifest b/app-admin/chrpath/Manifest
index 8287a6de809a..7b7411f131a6 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,7 +1,8 @@
+AUX chrpath-0.13-testsuite-1.patch 575 RMD160 0cf149b5798f3f0fd15ea98f89700feee2104cea SHA1 3683b4e6ef4219fd815367d2a638c4ab646a7188 SHA256 f780b05ce1bc8b77012bb81dabdbd9ef7487643e767c734275f5d8f915355dd4
 AUX chrpath-keepgoing.patch 1041 RMD160 9c454d96245d434b69db0b176a792f50eb882429 SHA1 a213403888ca21aa7730b4957b8f9f7e6c4b05b6 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a
 AUX chrpath-multilib.patch 3549 RMD160 1ebe77532319fd4877fbea019b519b4b78cb1427 SHA1 2a1189a4e7743b3707de929bacc162c73ac0549d SHA256 36241db7e559ed8cfa0d239d63d17e4c33d63d58a10981f18dfa6e7c2004aac7
 DIST chrpath-0.13.tar.gz 125129 RMD160 89b91919e3f629173388f10469dc94fadd46aa56 SHA1 11ff3e3dda2acaf1e529475f394f74f2ef7a8204 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b
-EBUILD chrpath-0.13-r1.ebuild 916 RMD160 e03d12170ef4ed5effeea4a6d3a927d8c2249c85 SHA1 3dfbcf554743c3a56d1b92f20d439fbfdf893165 SHA256 5893b94635600a60314fc9da4dd36c873e90cbe2429519f5736e4ca3b10884f6
+EBUILD chrpath-0.13-r1.ebuild 961 RMD160 8a44b40f0806f9b4b2732e2f0d3f9f083f5d31b2 SHA1 f1e8a40dc1011b64e0b0a6fdcd22f300a8ea9ef3 SHA256 ddc3552d463cb4459e1e74ab2072769f39af7b06de53e56563b08e255d596475
 EBUILD chrpath-0.13.ebuild 777 RMD160 c866c1dea58ce705a286aac74fdc2e74bbcd28da SHA1 932ac7854d6b67618c8a050d10f1d4b8cfb9cfe6 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53
-MISC ChangeLog 1901 RMD160 f7ef202ca6d643ffccef0b16078b23d45896600a SHA1 335c4a720dd98be0118a8163698a5c9f7d2764c3 SHA256 f2c00679cc981ea6cb456a1095a8a04e15eca9e18ca44565d7e9520c210ac3ed
+MISC ChangeLog 2122 RMD160 2c6a4defd9baf3640d9ac56f1c4f0cb609eb9caa SHA1 978d45f53de2b4127de2713e6d02b5ab6d85e051 SHA256 58772dd376972a3bf723eeb1afb06f473424a41af7c658695d4387bf1f29e6d2
 MISC metadata.xml 225 RMD160 64d906ab1e771348a42813c979ca57263c640dc4 SHA1 ab1badf0dc60ef92417bf6b220dd37dcb4239e1a SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99
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