New snapshot and oniguruma patch. Removed previous prerelease ebuild.

6 files changed, 96 insertions, 120 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 40e5790b271d..bc14fad4659b 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.79 2004/08/09 03:10:06 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.80 2004/08/18 17:08:21 usata Exp $
+
+*ruby-1.6.8-r11 (19 Aug 2004)
+
+  19 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +ruby-1.6.8-r11.ebuild,
+  -ruby-1.8.2_pre1.ebuild:
+  New snapshot and oniguruma patch. Removed previous prerelease ebuild.
 
   08 Aug 2004; Tom Gall <tgall@gentoo.org> ruby-1.8.1-r7.ebuild:
   stable on ppc64, bug #57676
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1f1d253fdb01..ce79272320ff 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,20 +1,20 @@
 MD5 321b81e5a4c47af64164f3c395300697 ChangeLog 12644
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 1a30065f9208a5370becf95e0e829edf ruby-1.6.8-r10.ebuild 1825
+MD5 d17e87a1b640bb29da4a014bda4be805 ruby-1.8.1-r7.ebuild 2782
+MD5 6eca81d9bf6a841858edcccf9d8e11b5 ruby-1.8.1-r6.ebuild 2780
 MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
+MD5 999c44f63e13ae4d7caeaa75139bad92 ruby-1.6.8-r11.ebuild 1837
+MD5 6b1833b9adfb7afa621d637ad2169968 ruby-1.8.2_pre2.ebuild 2980
 MD5 d4c03bbdb7088b3463ec88e0ab435455 ruby-1.8.0-r6.ebuild 2611
 MD5 2a1eaeffe23ec950b79dc2f50ce6d16c ruby-1.8.1-r3.ebuild 2728
-MD5 6eca81d9bf6a841858edcccf9d8e11b5 ruby-1.8.1-r6.ebuild 2780
-MD5 d17e87a1b640bb29da4a014bda4be805 ruby-1.8.1-r7.ebuild 2782
-MD5 1d37af330514e1fffbee2a7d0de7d035 ruby-1.8.2_pre1.ebuild 2710
-MD5 6b1833b9adfb7afa621d637ad2169968 ruby-1.8.2_pre2.ebuild 2980
-MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
+MD5 1a30065f9208a5370becf95e0e829edf ruby-1.6.8-r10.ebuild 1825
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
-MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
-MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
-MD5 eb455e926861eef9381b885d1679711e files/digest-ruby-1.8.1-r6 199
 MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
-MD5 0987456776a134ced22f5ee4e39ab9cf files/digest-ruby-1.8.2_pre1 134
+MD5 eb455e926861eef9381b885d1679711e files/digest-ruby-1.8.1-r6 199
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 cc29fb12a2f12f94d88ed90706907e9c files/digest-ruby-1.6.8-r11 136
 MD5 cb7da9e01481e07b2cc8514dd60af9ba files/digest-ruby-1.8.2_pre2 134
+MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
+MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
+MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r11 b/dev-lang/ruby/files/digest-ruby-1.6.8-r11
new file mode 100644
index 000000000000..b8c59e0911cf
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r11
@@ -0,0 +1,2 @@
+MD5 19eae3f81026270a201004d0decd3bc8 ruby-1.6.8-2004.07.28.tar.gz 1056477
+MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.2_pre1 b/dev-lang/ruby/files/digest-ruby-1.8.2_pre1
deleted file mode 100644
index 553d03559e4d..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.2_pre1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6cc070a768996f784fc7480d1c61bc85 ruby-1.8.2-preview1.tar.gz 3433145
-MD5 3154a12abdbc3ece51b86b8b16c0d2c6 onigd2_3_1.tar.gz 203510
diff --git a/dev-lang/ruby/ruby-1.6.8-r11.ebuild b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
new file mode 100644
index 000000000000..f867488d3486
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.6.8-r11.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r11.ebuild,v 1.1 2004/08/18 17:08:21 usata Exp $
+
+IUSE="cjk"
+
+ONIGURUMA="onigd2_3_1"
+SNAP_DATE="2004.07.28"
+MY_P="${P}-${SNAP_DATE}"
+S="${WORKDIR}/${MY_P}"
+
+inherit flag-o-matic alternatives eutils
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+#SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
+SRC_URI="mirror://ruby/snapshots/${MY_P}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.6"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64 -ia64 ~mips"
+
+DEPEND="virtual/libc
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=dev-ruby/ruby-config-0.3"
+PROVIDE="virtual/ruby"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	#epatch ../${P}-${SNAP_DATE}.diff
+	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		cd ${WORKDIR}/oniguruma
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${SLOT/./}
+	fi
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+	econf --program-suffix=${SLOT/./} --enable-shared || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
+	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV}
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+pkg_postinst() {
+
+	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
+}
+
+pkg_postrm() {
+
+	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
+		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.2_pre1.ebuild b/dev-lang/ruby/ruby-1.8.2_pre1.ebuild
deleted file mode 100644
index e5ea059ce02b..000000000000
--- a/dev-lang/ruby/ruby-1.8.2_pre1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre1.ebuild,v 1.1 2004/07/17 09:54:45 usata Exp $
-
-ONIGURUMA="onigd2_3_1"
-MY_P=${P/_pre/-preview}
-
-inherit flag-o-matic alternatives eutils gnuconfig
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${PV%.*}/${MY_P}.tar.gz"
-SRC_URI="${SRC_URI}
-	cjk? ( http://www.geocities.jp/kosako1/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.8"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 -ia64 ~s390"
-IUSE="socks5 tcltk cjk"
-
-RDEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2
-	socks5? ( >=net-misc/dante-1.1.13 )
-	tcltk? ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.2
-	!=dev-lang/ruby-cvs-1.8*"
-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
-		econf --with-rubydir=${S} || die "econf failed"
-		make ${SLOT/./}
-		popd
-	fi
-
-	# Enable build on alpha EV67
-	if use alpha ; then
-		gnuconfig_update || die "gnuconfig_update failed"
-	fi
-}
-
-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
-		CFLAGS="${CFLAGS} -DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-		export CFLAGS
-	fi
-
-	econf \
-		--program-suffix=${SLOT/./} \
-		--enable-shared \
-		`use_enable socks5 socks` \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
-	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV}
-
-	dodoc COPYING* ChangeLog MANIFEST README* ToDo
-}
-
-pkg_postinst() {
-	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
-}
-
-pkg_postrm() {
-	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
-		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
-	fi
-}