Add ipv6 support per bug #128026

(Portage version: 2.1_pre7-r2)

6 files changed, 186 insertions, 17 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index a91e479ee957..9a97f2a8987a 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.190 2006/03/31 14:42:03 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.191 2006/03/31 18:48:18 caleb Exp $
+
+*ruby-1.8.4-r3 (31 Mar 2006)
+
+  31 Mar 2006; Caleb Tennis <caleb@gentoo.org> +ruby-1.8.4-r3.ebuild,
+  ruby-1.8.4.20060226.ebuild:
+  Add ipv6 support per bug #128026
 
   31 Mar 2006; Caleb Tennis <caleb@gentoo.org> ruby-1.8.4-r2.ebuild:
   Fix Ruby 1.8.4's oniguruma per bug #127860
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 2f20702b64bc..f2e4e34eb0a8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,6 @@
-MD5 509a27030d50974438434c988272fb3c ChangeLog 27813
-RMD160 57d6aecd1b483dbb83a58eabc3dd0146b2355c18 ChangeLog 27813
-SHA256 9446b198839eb0b8b10e5bbd30509c5d0f6a517cbd69e225f5602a611ac51df7 ChangeLog 27813
+MD5 b04d9f3658579fee94b02862345bf44a ChangeLog 27979
+RMD160 13b6180ae986c16f06fb06b72a5f276979538a05 ChangeLog 27979
+SHA256 850f1630c7ae634ab969d6e23e21e7fd39783ebf5c306f70ca165fc82b4c1c1a ChangeLog 27979
 MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
 RMD160 d08b97b5ff912943f8b1e24a2b59605358f95151 files/digest-ruby-1.8.2-r2 125
 SHA256 38843a08d2481f4d395f8b3184f88e6c2ece0a51746cc017a5249c6645d6cc3b files/digest-ruby-1.8.2-r2 125
@@ -16,9 +16,12 @@ SHA256 69cae7d6d6f7512668861867fc1111f21e7998be5247a6d7bf1d3f5e27fca42d files/di
 MD5 38ebdc02f8e5fe10b4c7bde101a57fa0 files/digest-ruby-1.8.4-r2 467
 RMD160 d80d4411e88a9afbdd9d5c7a9e3b118f64ac2af6 files/digest-ruby-1.8.4-r2 467
 SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/digest-ruby-1.8.4-r2 467
-MD5 16c628d57fa38e629d61513a047e8d00 files/digest-ruby-1.8.4.20060226 494
-RMD160 db28b122ba200ec9ed8d3f74845c1eea0984c269 files/digest-ruby-1.8.4.20060226 494
-SHA256 f9a6752fcf1b41547deb13bd7c99d5c6f2b5879dcae64965f20c5a9f5cbe7492 files/digest-ruby-1.8.4.20060226 494
+MD5 38ebdc02f8e5fe10b4c7bde101a57fa0 files/digest-ruby-1.8.4-r3 467
+RMD160 d80d4411e88a9afbdd9d5c7a9e3b118f64ac2af6 files/digest-ruby-1.8.4-r3 467
+SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/digest-ruby-1.8.4-r3 467
+MD5 fd4ee62a9d8185cc9ce901b6efe82921 files/digest-ruby-1.8.4.20060226 494
+RMD160 1d366d5810386625d39c5a9172fe9e3d8707882b files/digest-ruby-1.8.4.20060226 494
+SHA256 65225d6ced2a5d9b7994adb02588775d6df150a547c5905e53783c5ff47205ed files/digest-ruby-1.8.4.20060226 494
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
 SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3 files/oniguruma-2.3.1-gentoo.patch 593
@@ -58,9 +61,12 @@ SHA256 48aa73ecf2a7de187b6c21277a805934d8fba70c028774b3bfcd1cba31eca652 ruby-1.8
 MD5 9952f2a1d56534619b4860844d7000ec ruby-1.8.4-r2.ebuild 4002
 RMD160 7d08032961988fa7e4fb6f6018e5b563a2bd46e6 ruby-1.8.4-r2.ebuild 4002
 SHA256 1101e90e65c403576a7a78e8675d18fee394bc91fd81dc7d2d79ca33cb45c950 ruby-1.8.4-r2.ebuild 4002
-MD5 f1c5de92b15fa6a9db0beac3ba1e05fd ruby-1.8.4.20060226.ebuild 3888
-RMD160 e302c4933f0dc697851f963f4da904cab9ab4c38 ruby-1.8.4.20060226.ebuild 3888
-SHA256 58e4200f525e7dcb8fce6c5f03d9ad8c4be7e5a362c68264ef96b70e380510bb ruby-1.8.4.20060226.ebuild 3888
+MD5 cb4d07a7abc741614e340b99884b4618 ruby-1.8.4-r3.ebuild 4035
+RMD160 4ed28f7cdcd07baec20e3d52ff49fad8fc493b20 ruby-1.8.4-r3.ebuild 4035
+SHA256 7470532646f0a0b29f3af905db9db511921c2497bd4b080ead0d3b4a69318b6d ruby-1.8.4-r3.ebuild 4035
+MD5 02f29eed3b0bc92b23dde626880e5567 ruby-1.8.4.20060226.ebuild 3922
+RMD160 3de42adf21d933e6e9fb1657d522c64fbb7ec721 ruby-1.8.4.20060226.ebuild 3922
+SHA256 7723e733c1bbcf41d013874d73b837732d6af094d833377800f135bef56dae80 ruby-1.8.4.20060226.ebuild 3922
 MD5 f6ff8646fa6f1678684b64bd596b9ceb ruby-1.8.4.ebuild 3783
 RMD160 bd84b3c647cd3c06e3a94b1dfac34db8af883dca ruby-1.8.4.ebuild 3783
 SHA256 35b4211adb89ca75585669ea60f377a8bd04825bce0aa414e1059ee612a65169 ruby-1.8.4.ebuild 3783
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4-r3 b/dev-lang/ruby/files/digest-ruby-1.8.4-r3
new file mode 100644
index 000000000000..7ed61deab901
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4-r3
@@ -0,0 +1,6 @@
+MD5 b3b6b2d2f77f1f485d055d74f6eb6f2a onigd2_5_4.tar.gz 212280
+RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 onigd2_5_4.tar.gz 212280
+SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b onigd2_5_4.tar.gz 212280
+MD5 bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz 4312965
+RMD160 1c0572a4ee369af57a3db68027b2566052eac944 ruby-1.8.4.tar.gz 4312965
+SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 ruby-1.8.4.tar.gz 4312965
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.4.20060226 b/dev-lang/ruby/files/digest-ruby-1.8.4.20060226
index 478a6dbfb5f7..2434e5ce9f12 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.4.20060226
+++ b/dev-lang/ruby/files/digest-ruby-1.8.4.20060226
@@ -1,6 +1,6 @@
-MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448
-RMD160 2b3638e6300f8b994f334a064381b8013b286db0 onigd2_5_0.tar.gz 210448
-SHA256 83d379f48a9ddb469883e5d78cb06de1ae7b9102e7cebd88a132aad6996163df onigd2_5_0.tar.gz 210448
+MD5 b3b6b2d2f77f1f485d055d74f6eb6f2a onigd2_5_4.tar.gz 212280
+RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 onigd2_5_4.tar.gz 212280
+SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b onigd2_5_4.tar.gz 212280
 MD5 7597b5205e03fe05bb6fc14c27d62f1e ruby-1.8.4.20060226.tar.gz 4359171
 RMD160 b018754466b859929cb4e0fd9cf27586a089a902 ruby-1.8.4.20060226.tar.gz 4359171
 SHA256 a9fe1f96ab87844ef11bb55e4de978610a98dbb3c10c7dabbbea288df4446736 ruby-1.8.4.20060226.tar.gz 4359171
diff --git a/dev-lang/ruby/ruby-1.8.4-r3.ebuild b/dev-lang/ruby/ruby-1.8.4-r3.ebuild
new file mode 100644
index 000000000000..269a364ef167
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.4-r3.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4-r3.ebuild,v 1.1 2006/03/31 18:48:18 caleb Exp $
+
+ONIGURUMA="onigd2_5_4"
+
+inherit flag-o-matic alternatives eutils gnuconfig multilib autotools
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="socks5 tcltk cjk doc threads examples ipv6"
+RESTRICT="confcache"
+
+RDEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tcltk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+
+DEPEND="sys-devel/autoconf
+	sys-apps/findutils
+	${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+S=${WORKDIR}/${P%_*}
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+#		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${PV/./}
+		popd
+	fi
+
+	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
+	gnuconfig_update || die "gnuconfig_update failed"
+
+	cd ${S}
+
+	epatch ${FILESDIR}/ruby-1.8.4-glibc24-eaccess.diff
+	epatch ${FILESDIR}/ruby-1.8.4-yaml.diff
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+
+	# Socks support via dante
+	if use socks5; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# On ia64 we need to build without optimization #48824
+	if use ia64; then
+		replace-flags '-O*' -O0
+	fi
+
+	econf --program-suffix=${SLOT/./} --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_enable ipv6 ipv6) \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
+	for d in $(find ${S}/ext -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	if use doc; then
+		make DESTDIR=${D} install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		dodir ${ROOT}usr/share/doc/${PF}
+		cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF}
+	fi
+
+	if use ppc-macos ; then
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
+		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
+	else
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
+	fi
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+	if ! use ppc-macos ; then
+		ewarn
+		ewarn "Warning: Vim won't work if you've just updated ruby from"
+		ewarn "1.6.x to 1.8.x due to the library version change."
+		ewarn "In that case, you will need to remerge vim."
+		ewarn
+
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+		einfo
+		einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	if ! use ppc-macos ; then
+		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+		fi
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.4.20060226.ebuild b/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
index 3ebd67fcda3d..bd2409276d4b 100644
--- a/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
+++ b/dev-lang/ruby/ruby-1.8.4.20060226.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4.20060226.ebuild,v 1.1 2006/02/27 14:34:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4.20060226.ebuild,v 1.2 2006/03/31 18:48:18 caleb Exp $
 
-ONIGURUMA="onigd2_5_0"
+ONIGURUMA="onigd2_5_4"
 
 inherit flag-o-matic alternatives eutils gnuconfig multilib
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="socks5 tcltk cjk doc threads examples"
+IUSE="socks5 tcltk cjk doc threads examples ipv6"
 RESTRICT="confcache"
 
 RDEPEND="virtual/libc
@@ -41,7 +41,7 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
-		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+#		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
 		econf --with-rubydir=${S} || die "econf failed"
 		make ${SLOT/./}
 		popd
@@ -82,6 +82,7 @@ src_compile() {
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
+		$(use_enable ipv6 ipv6) \
 		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
 		|| die "econf failed"