summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-01-11 07:40:02 +0000
committerFabian Groffen <grobian@gentoo.org>2010-01-11 07:40:02 +0000
commitfac545f890d5c56c69f919f0fb4e9514c06395c0 (patch)
tree526935c919fd8a1c98f5c28e000d7fcefa4eec25 /dev-lang/ruby
parentmoved dev-util/cmake to gx86 (diff)
downloadprefix-fac545f890d5c56c69f919f0fb4e9514c06395c0.tar.gz
prefix-fac545f890d5c56c69f919f0fb4e9514c06395c0.tar.bz2
prefix-fac545f890d5c56c69f919f0fb4e9514c06395c0.zip
sync
(Portage version: 2.2.00.15187-prefix/svn/Darwin powerpc)
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r--dev-lang/ruby/ChangeLog16
-rw-r--r--dev-lang/ruby/Manifest14
-rw-r--r--dev-lang/ruby/ruby-1.8.6_p388.ebuild (renamed from dev-lang/ruby/ruby-1.8.6_p383.ebuild)19
-rw-r--r--dev-lang/ruby/ruby-1.8.7_p249.ebuild (renamed from dev-lang/ruby/ruby-1.8.7_p248.ebuild)4
4 files changed, 34 insertions, 19 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 9d6466f64c..a319fccf48 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,20 @@
# ChangeLog for dev-lang/ruby
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.433 2010/01/02 14:09:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.435 2010/01/10 22:04:16 a3li Exp $
+
+*ruby-1.8.6_p388 (10 Jan 2010)
+
+ 10 Jan 2010; Alex Legler <a3li@gentoo.org> -ruby-1.8.6_p383.ebuild,
+ +ruby-1.8.6_p388.ebuild:
+ Version bump (1.8.6), security bug 300468. Remove unneded vulnerable
+ version. The new ebuild also has the fix for bug 168939.
+
+*ruby-1.8.7_p249 (10 Jan 2010)
+
+ 10 Jan 2010; Alex Legler <a3li@gentoo.org> -ruby-1.8.7_p248.ebuild,
+ +ruby-1.8.7_p249.ebuild:
+ Version bump (1.8.7) for security bug 300468, removing unneeded vulnerable
+ version
02 Jan 2010; Brent Baude <ranger@gentoo.org> ruby-1.8.7_p174-r1.ebuild:
Marking ruby-1.8.7_p174-r1 ppc64 for bug 288699
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a230feab83..a330172b6d 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -9,18 +9,18 @@ AUX ruby-1.9.1-prefix.patch 495 RMD160 65895f35b6a26d0356e66655883ca094dbb2fbcc
AUX ruby-mkconfig.patch 407 RMD160 8fdec98672ce845a94c1b28a17747c1e9dd7ec72 SHA1 1e2b97282f4fa55d213dd0b4e7c75fc53367ce7f SHA256 b1ca3500ac50fa49fa1f478aa34f318cff8d92abcd75edfc80fd96338a59e2f4
AUX ruby18-mkmf-parallel-install.patch 527 RMD160 1cb49132c4b1e6d9d9870b69a2fde79749faa5fe SHA1 8783e18b41563055d7f14cc42b3e30ac65bd6790 SHA256 3d24d95eb33ccb44413859fc6f731f01f8b7b59d8d4d9d6d6cd59e09d046eb78
DIST ruby-1.8.6-p369.tar.bz2 3981771 RMD160 34d2763fd7b24c5883eaea457b871708d20c51e8 SHA1 d121f84b1b264f3a72878797222852b272a099fd SHA256 fb6974ab8a0de52511e846eacf113432b5227a867e3c9741d65775f162e13715
-DIST ruby-1.8.6-p383.tar.bz2 3981736 RMD160 d7240d4589d3c15c69ae03ffcfbfae1b650911d3 SHA1 225a28956406b3bd8c5839a391131936ddce4eb9 SHA256 c39dd7e211cb7245d08d9a7a3d4fe0c7b9f796a4bed9f92fed500ad58bb53d1a
+DIST ruby-1.8.6-p388.tar.bz2 3973412 RMD160 9f451182ef4fb485109d96953e6af388151cadc8 SHA1 175e7f1571761e522e88cc8a8ed123f000c99c59 SHA256 8536b18413f2475698fa275b356daff6ceab5232bc503496f4afbee64e8b4abc
DIST ruby-1.8.7-p174.tar.bz2 4144807 RMD160 f854d456003af1e31d50330c88c3cb152c434249 SHA1 9e84b49ad545ad54b8e7dc3c227eaaefeb1041aa SHA256 203978b6db1cc77a79ff03d141d162f6f17d86c3574f76de9eae9d0c8cb920bc
-DIST ruby-1.8.7-p248.tar.bz2 4153123 RMD160 70e905ff2552b72d0cd0b7c7968bf3a2f17ddf75 SHA1 0a68cdf6b234e1541b14703d71764b1a79806759 SHA256 3d238c4cf0988797d33169ab05829f1a483194e7cacae4232f3a0e2cc01b6bfc
+DIST ruby-1.8.7-p249.tar.bz2 4153461 RMD160 96b238bd7194652ec194a505c2e5911441c5c5ee SHA1 2947f21f22e9345a3e94d84e6f88e7d0fc98a871 SHA256 8b89448fc79df6862660e9f77e884f06c76da28f078d8edd2f17567a615f3af5
DIST ruby-1.9.1-p243.tar.bz2 7191348 RMD160 3af130d692f9813501ccc570d6492b8003b1e6f9 SHA1 f9ec27a17d4f2f5be000d1bd46170344be0b6dfb SHA256 39c9850841c0dd5d368f96b854f97c19b21eb28a02200f8b4e151f608092e687
-DIST ruby-patches-1.8.6_p383.tar.bz2 3334 RMD160 8f336d3791137615feb4e470b6b6e25ca69b2859 SHA1 e5d5e617a152630a3c29ac74ae26890d76624213 SHA256 50b8ee2f1da7179783c5d8074e5444c9c067740b2da472bf40366f94bf2cdf32
+DIST ruby-patches-1.8.6_p388.tar.bz2 3137 RMD160 6c9b3099687aef29bf9881f11c2915fbd0ba8196 SHA1 7222102440156b9fd0b461bd23828301aa62a5ad SHA256 93053c8fe2e9fcf9fba714780466678c78b42be59547f76055ffea53aef4c4e5
DIST ruby-patches-1.8.7_p174.tar.bz2 1255 RMD160 2070ae0a6650331b91bf0f2a3b694a4d1837391f SHA1 f9caa7237c79ab9644c8432665bffaabda407ed3 SHA256 63cb9753737658e7983b7a306be353635085d6966ce94afebfd7ed9b2a3b1fa7
-DIST ruby-patches-1.8.7_p248.tar.bz2 1257 RMD160 6ef954db0311e5c1ba69349919d30f2dfb6c7267 SHA1 d0aa4e4386c7cef75e2d07841011c8ab87912498 SHA256 818d465c08e65e88bee79d22d1b21f1357afcbc8bff4eb3e29b79848103bc7c3
+DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
DIST ruby-patches-1.9.1_p243.tar.bz2 2460 RMD160 06f23fc2c3483cb3f552eabaa4fe22624522c6cc SHA1 7d32d38f8bccd1e230231091cfd161768624ab78 SHA256 5d9e1b8a61c9f08230e05ec91802adbee437f91ac772f679200815c1ee1a3f30
EBUILD ruby-1.8.6_p369.ebuild 5874 RMD160 4262ba979c8a5dc49b2704cf97401950b8a4b9d7 SHA1 9187cc8d897cac11e81cdb59c77bd37866c779bd SHA256 e580c0ce4cf0b738456d88a3dd3b03dcd11b9b88efce52eee2afbd72bfb409f7
-EBUILD ruby-1.8.6_p383.ebuild 5731 RMD160 4ef3073dcc7f489b480ed47e3ca2f41b68b7c7e5 SHA1 f9b113d4f1a4d3c2dd100915067935cebc8e60f7 SHA256 73047f3e43b1999c3f9af52441733ea61701357090a5a5b18829b4ab0a1b8308
+EBUILD ruby-1.8.6_p388.ebuild 5761 RMD160 ba2ae6da8690854c6288a516b7c68e8df7a794aa SHA1 b3529006ae665bac0e5585633c2096d6ab1f9534 SHA256 571b9199a8cd235a3674011aa5fd28599961c9a30832feb09e1c1e9faf9b7046
EBUILD ruby-1.8.7_p174-r1.ebuild 5729 RMD160 422fb7495e2ba3b85f779170124e4ea599187b7e SHA1 feb93e8c5b0dcee4385a53388e9b0ef7d89b4379 SHA256 355236deab9375ab25410697b3ecdd1b6c9cb0a667ac89b5c11e14af5c137300
-EBUILD ruby-1.8.7_p248.ebuild 5722 RMD160 163338c1cee7878414448fbef449f56ed407091c SHA1 140263069cd4c1e706f517d2bb4867d93f6c7d69 SHA256 24e9113fcd02460887dbacff43a53dfecfd91279374e0a4046e256f8577e8bd2
+EBUILD ruby-1.8.7_p249.ebuild 5722 RMD160 f2c8ac441b78ebb0d5c4feca39dde02f7df8ff78 SHA1 f925b162c05da1317992aea91e8026ce9bfa56f5 SHA256 02ad64d3731e10c2b9b71c6286d9cfbcda0e3d5262a4e6e0f9bc34d376e70fe7
EBUILD ruby-1.9.1_p243.ebuild 5912 RMD160 6f401cf72c4edb8247cc501f6bd5a4313e5376a6 SHA1 8e4d58b945a6a366339bdb4e6cb0e4d715af3bd8 SHA256 5c6b6a4d5b66371c1743946e5fbff99cbbc9e79a78cf517153b814bc5e2c55fc
-MISC ChangeLog 66354 RMD160 e56001d0718fa329704170442e1ca4d886313aa2 SHA1 446603e1f2b6b7b5190333761503db722c12f8c5 SHA256 ad75cbea5ccba8aa16d68c5b2d10767f7f280523f4d1ac70c78667e9f5343710
+MISC ChangeLog 66829 RMD160 09d5544bb0705b93ac9fc5d470b2922cfb9bc3fa SHA1 3a02143bb0253127fe3974980c71b5d54b860db8 SHA256 bccc215dff5b17d5ebfdd61eaaae72654e79b8f4ec1d5b582fae92d6a2ab1439
MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
diff --git a/dev-lang/ruby/ruby-1.8.6_p383.ebuild b/dev-lang/ruby/ruby-1.8.6_p388.ebuild
index 57fc1a9b0a..26ef24e984 100644
--- a/dev-lang/ruby/ruby-1.8.6_p383.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p388.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p383.ebuild,v 1.1 2009/08/20 09:09:50 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p388.ebuild,v 1.1 2010/01/10 22:04:16 a3li Exp $
EAPI=1
inherit autotools eutils flag-o-matic multilib versionator
@@ -14,7 +14,7 @@ MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
DESCRIPTION="An object-oriented scripting language"
HOMEPAGE="http://www.ruby-lang.org/"
SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-http://dev.a3li.info/gentoo/distfiles/${PN}-patches-${PV}.tar.bz2"
+http://dev.a3li.li/gentoo/distfiles/${PN}-patches-${PV}.tar.bz2"
LICENSE="|| ( Ruby GPL-2 )"
KEYWORDS="~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -26,7 +26,7 @@ RDEPEND="
ssl? ( dev-libs/openssl )
socks5? ( >=net-proxy/dante-1.1.13 )
tk? ( dev-lang/tk )
- app-admin/eselect-ruby
+ >=app-admin/eselect-ruby-20091225
!=dev-lang/ruby-cvs-${SLOT}*
!<dev-ruby/rdoc-2
!dev-ruby/rexml"
@@ -59,7 +59,7 @@ src_unpack() {
cd "${S}"
EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches-${PV}"
+ epatch "${WORKDIR}/patches-${PV}"
epatch "${FILESDIR}/${PN}-1.8.6_p36-only-ncurses.patch"
epatch "${FILESDIR}/${PN}-1.8.6_p36-prefix.patch"
@@ -95,11 +95,14 @@ src_compile() {
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
fi
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="--with-lookup-order-hack=INET"
+
econf --program-suffix=$MY_SUFFIX --enable-shared \
$(use_enable socks5 socks) \
$(use_enable doc install-doc) \
$(use_enable threads pthread) \
- $(use_enable ipv6) \
+ --enable-ipv6 \
$(use_enable debug) \
$(use_with berkdb dbm) \
$(use_with gdbm) \
@@ -183,7 +186,5 @@ pkg_postinst() {
}
pkg_postrm() {
- if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
+ eselect ruby cleanup
}
diff --git a/dev-lang/ruby/ruby-1.8.7_p248.ebuild b/dev-lang/ruby/ruby-1.8.7_p249.ebuild
index b92d03890b..777f1b8bc8 100644
--- a/dev-lang/ruby/ruby-1.8.7_p248.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p249.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p248.ebuild,v 1.1 2009/12/25 15:15:36 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p249.ebuild,v 1.1 2010/01/10 17:48:30 a3li Exp $
EAPI=1
inherit autotools eutils flag-o-matic multilib versionator