summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-20 17:11:24 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-06-20 17:11:24 +0000
commit2eef0305c00e81a2dc1f609685bbe172fff9bf4c (patch)
treec32effec230ef0bc69c7cbe5b284d159d29ac2b8 /dev-lang/ruby
parentRemove old ebuilds (diff)
downloadhistorical-2eef0305c00e81a2dc1f609685bbe172fff9bf4c.tar.gz
historical-2eef0305c00e81a2dc1f609685bbe172fff9bf4c.tar.bz2
historical-2eef0305c00e81a2dc1f609685bbe172fff9bf4c.zip
Prepend our library path instead of overwriting it during src_install. Thanks to the reporter of bug #274824.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r--dev-lang/ruby/ChangeLog7
-rw-r--r--dev-lang/ruby/Manifest10
-rw-r--r--dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild4
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 29b2cc30026c..e0745dc9444d 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/ruby
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.415 2009/06/18 13:12:32 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.416 2009/06/20 17:11:24 flameeyes Exp $
+
+ 20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ ruby-1.9.1_p129-r1.ebuild:
+ Prepend our library path instead of overwriting it during src_install.
+ Thanks to the reporter of bug #274824.
*ruby-1.8.7_p174 (18 Jun 2009)
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4028109d57b6..2a48aa02bdb0 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -20,14 +20,14 @@ DIST ruby-patches-1.8.7_p174.tar.bz2 1255 RMD160 2070ae0a6650331b91bf0f2a3b694a4
EBUILD ruby-1.8.6_p368.ebuild 5331 RMD160 2b54339e972132c9927867a9f40aa727ea8a3652 SHA1 bdf903dec1d9d00329be434cd821e473e5f61477 SHA256 14e652675b7a911217f7c03880e687c1a1c4b6382a5b441d7511ee396cf734c3
EBUILD ruby-1.8.6_p369.ebuild 5425 RMD160 ab53dd35a0096cb29b0e9ab1f82c43292e8ffb90 SHA1 8a5521e4182f47db532b651f9a58683d198d49b1 SHA256 c0fc48615e885e9ab69573994278eebc23e388303717e9131b612a48cb077786
EBUILD ruby-1.8.7_p174.ebuild 5364 RMD160 789658363e9acb34e628e941fbf0ad1f87f169aa SHA1 6dd334c8dd8191f0e7fe49692f960e8f9d62dce7 SHA256 f742994bd3a3b7f02ef9947d8a03ea74fe831c648cdd4ddea827d352258b85b9
-EBUILD ruby-1.9.1_p129-r1.ebuild 5678 RMD160 6e9abf937c66f8be2f483415288daf00c657bf39 SHA1 ad522a26a719f60705af4083edde740ebed458cb SHA256 29f368130ee67073419f74ddeeb4af348575905a2f54c521ab33e0d96d303b7c
+EBUILD ruby-1.9.1_p129-r1.ebuild 5716 RMD160 e25a19776d9d4b94cb5d858312d9d120b8633d04 SHA1 902582e09ca9c80f24568ccdd50058bd3a11a6b3 SHA256 f2eb0bd4bbf09ce8800fc34a38a560c1ff330796301c0e96c21114a8bae085d6
EBUILD ruby-1.9.1_p129.ebuild 5538 RMD160 b8608e8b5287de43ef6f1996270d1d2cccd95ac7 SHA1 77e713a450b68d10ddbebd1cf7d967da95068255 SHA256 8c1c213d9cb537b3428db51653ea50f3e42810359f53d0fd9fed7d378f368872
-MISC ChangeLog 63571 RMD160 70d9ac1d592fec805b6345d1fcb3201dee96e20a SHA1 5c23b24a3fa6434f578bb447d18d6c62d1444f50 SHA256 65ad8fe81aa8e322f830ec20031d7cd8bb5118b5530df459b418abd4f551df38
+MISC ChangeLog 63776 RMD160 087d747f8f3da601a79b125279d3cf17291471e3 SHA1 ce9d0954d98b968f960875ba27c22cb8154706a0 SHA256 f2b2ba03b14d8cb0915304a8b0eee8fcfd85ec984d1bb08bb86543dce426fb37
MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAko6PUkACgkQaGsKqSU7eCRptwCggiAjt57F0UdDi5i18oRE3gur
-w7YAn1BO0FWkWOckRvbWM2uLbkE6lb0W
-=YOSJ
+iEYEARECAAYFAko9GEIACgkQAiZjviIA2XiQMQCfXuDTXdXYNfX/c0v0SnEAPJlI
+Ov0AoKqW5m/fHYhzzrDuyYNBPXEniUaj
+=purf
-----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild b/dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild
index 7258a9ea477e..612e50313d41 100644
--- a/dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild,v 1.1 2009/05/27 16:40:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p129-r1.ebuild,v 1.2 2009/06/20 17:11:24 flameeyes Exp $
EAPI=2
@@ -146,7 +146,7 @@ src_install() {
export GEM_HOME="${D}/usr/$(get_libdir)/ruby${MY_SUFFIX}/gems/${RUBYVERSION}"
export GEM_PATH="${GEM_HOME}/"
- LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+ LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
for d in $(find "${S}/ext" -type d) ; do
RUBYLIB="${RUBYLIB}:$d"