Updated CVS snapshot

7 files changed, 44 insertions, 41 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 60f07846ab64..2cefa21e94eb 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.72 2004/06/09 21:04:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.73 2004/06/19 10:08:25 usata Exp $
+
+*ruby-1.8.1-r7 (19 Jun 2004)
+
+  19 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r10.ebuild,
+  ruby-1.8.1-r2.ebuild, ruby-1.8.1-r7.ebuild:
+  Updated CVS snapshot
 
   09 Jun 2004; Guy Martin <gmsoft@gentoo.org> ruby-1.8.1-r6.ebuild:
   Marked stable on hppa.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 5f3767e71a82..52c36636dfd3 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,16 +1,16 @@
-MD5 a2df6515f3c59c6de0890752eac6c2bd ChangeLog 11725
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 89c23c20301a982d181fa2ea93cf7c82 ruby-1.6.8-r10.ebuild 1822
-MD5 e7de1eee6fb5329855b30fbbdee34af5 ruby-1.6.8-r6.ebuild 1749
-MD5 40a1c29da481d7ad0a55674d24ecaed6 ruby-1.8.0-r6.ebuild 2596
-MD5 6552513ea67ca27f35da40359d7e8f7f ruby-1.8.1-r2.ebuild 2756
-MD5 52b2653d42a7bb20f544aca470519b91 ruby-1.8.1-r3.ebuild 2712
 MD5 5e3f62313b9b3f9506b2e9d0c2dc1b3b ruby-1.8.1-r6.ebuild 2763
-MD5 bf5de97a72e0af96871b09b258be70db files/digest-ruby-1.6.8-r10 197
+MD5 80ca1e4f1922224e184b52e3a4302b0e ruby-1.8.1-r7.ebuild 2755
+MD5 219d89b7c3bebba7aba2aebe49ddd24a ChangeLog 11896
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 137ba5dfcaf498bb63ea91147a10223c ruby-1.6.8-r6.ebuild 1750
+MD5 f11c1efe85f406f57d02716bb61c2577 ruby-1.8.0-r6.ebuild 2597
+MD5 ce00a44b25315369bd57381015c5f305 ruby-1.8.1-r3.ebuild 2713
+MD5 6513369f24c55d172910ecca36ddec42 ruby-1.6.8-r10.ebuild 1830
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 eb455e926861eef9381b885d1679711e files/digest-ruby-1.8.1-r6 199
+MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
+MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
+MD5 00d694f37ea1e1bb8af28217617df130 files/digest-ruby-1.6.8-r10 199
 MD5 512336d825e446e013bd383519b6559c files/digest-ruby-1.8.0-r6 128
-MD5 760dc7b65ddbc8e3069dcf95ec8b00ba files/digest-ruby-1.8.1-r2 200
 MD5 e74e6ef0cfcafd538fe1a52f30cae316 files/digest-ruby-1.8.1-r3 200
-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
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r10 b/dev-lang/ruby/files/digest-ruby-1.6.8-r10
index 98efef98530d..9ebb11191d1b 100644
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r10
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r10
@@ -1,3 +1,3 @@
 MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
-MD5 2fee6446572edb647f29b20bdb2046fd ruby-1.6.8-20040416.diff.gz 166166
+MD5 f4fda38bd95b7eab362a0a1824b09e2b ruby-1.6.8-2004.04.16.diff.bz2 76070
 MD5 cd9f62b31db87a0705adbb8d3f2cd23a onigd2_2_8.tar.gz 200706
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1-r2 b/dev-lang/ruby/files/digest-ruby-1.8.1-r2
deleted file mode 100644
index 94da78abe16c..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5d52c7d0e6a6eb6e3bc68d77e794898e ruby-1.8.1.tar.gz 2671875
-MD5 55e55e2ad237277f27ea0719a2dfebe4 ruby-1.8.1-20040206.diff.gz 184000
-MD5 e93c9691fe700a2dd4e6fc5c56ff85bf onigd20040202.tar.gz 187945
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1-r7 b/dev-lang/ruby/files/digest-ruby-1.8.1-r7
new file mode 100644
index 000000000000..dd1e67c53201
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.1-r7
@@ -0,0 +1,2 @@
+MD5 1247756b47a1540647d27813891e12a3 ruby-1.8.1-2004.05.02.tar.bz2 2395420
+MD5 cd9f62b31db87a0705adbb8d3f2cd23a onigd2_2_8.tar.gz 200706
diff --git a/dev-lang/ruby/ruby-1.6.8-r10.ebuild b/dev-lang/ruby/ruby-1.6.8-r10.ebuild
index bac4bc9687e5..f39253275017 100644
--- a/dev-lang/ruby/ruby-1.6.8-r10.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8-r10.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r10.ebuild,v 1.3 2004/06/03 15:40:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8-r10.ebuild,v 1.4 2004/06/19 10:08:25 usata Exp $
 
 IUSE="cjk"
 
 ONIGURUMA="onigd2_2_8"
-SNAP_DATE="20040416"
+SNAP_DATE="2004.04.16"
 
 inherit flag-o-matic alternatives eutils
 filter-flags -fomit-frame-pointer
@@ -13,7 +13,7 @@ filter-flags -fomit-frame-pointer
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
-	mirror://gentoo/${P}-${SNAP_DATE}.diff.gz
+	mirror://ruby/snapshots/${P}-${SNAP_DATE}.diff.bz2
 	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
 
 LICENSE="Ruby"
diff --git a/dev-lang/ruby/ruby-1.8.1-r2.ebuild b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
index ef5fb4f44c10..a39eb266b46d 100644
--- a/dev-lang/ruby/ruby-1.8.1-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r7.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r2.ebuild,v 1.11 2004/06/03 15:40:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r7.ebuild,v 1.1 2004/06/19 10:08:25 usata Exp $
 
-IUSE="socks5 tcltk cjk"
-
-ONIG_DATE="20040202"
-SNAP_DATE="20040206"
+ONIGURUMA="onigd2_2_8"
+SNAP_DATE="2004.05.02"
 
 inherit flag-o-matic alternatives eutils gnuconfig
-filter-flags -fomit-frame-pointer
 
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
-	mirror://gentoo/${P}-${SNAP_DATE}.diff.gz
-	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/onigd${ONIG_DATE}.tar.gz )"
+#SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz"
+SRC_URI="mirror://ruby/snapshots/${P}-${SNAP_DATE}.tar.bz2"
+SRC_URI="${SRC_URI}
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="alpha hppa -ia64 mips ppc sparc x86 s390"
+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 )
+	tcltk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.2"
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
@@ -37,27 +36,25 @@ S=${WORKDIR}/${P%_pre*}
 src_unpack() {
 	unpack ${A}
 
-	pushd ${S}
-	epatch ../${P}-${SNAP_DATE}.diff
-	popd
-
 	if use cjk ; then
-		pushd oniguruma
-		epatch ${FILESDIR}/oniguruma-${ONIG_DATE}.diff
+		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
+	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
+	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.
@@ -70,7 +67,9 @@ src_compile() {
 		export CFLAGS
 	fi
 
-	econf --program-suffix=${SLOT/./} --enable-shared \
+	econf \
+		--program-suffix=${SLOT/./} \
+		--enable-shared \
 		`use_enable socks5 socks` \
 		|| die "econf failed"
 	emake || die "emake failed"
@@ -101,7 +100,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-
 	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
 		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
 	fi