Moved ruby-config script out to dev-ruby/ruby-config. Removed ruby16 IUSE flag and let ruby-config take care of dead symlinks.

9 files changed, 126 insertions, 178 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d402d112cf5f..afc154945150 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,11 @@
-MD5 390fa8abc63f41876da7d0d8ec18c82a ruby-1.8.0-r5.ebuild 2556
-MD5 60c164fcdc3b97e9703565f92091d6d9 ruby-1.8.1-r1.ebuild 2539
+MD5 66d304e2278118ddf754c068822ac2dc ruby-1.8.0-r5.ebuild 2562
+MD5 23014333a03d72a3a69d08b98409abf3 ruby-1.8.1-r1.ebuild 2548
 MD5 67d0e7c62241786238b77b201422b9ed ruby-1.8.1.ebuild 3369
 MD5 6c669e6e45fb864d765b9989efb815f8 ruby-1.8.0-r1.ebuild 2700
-MD5 5236d43d8d1218c6a81fcf0ce24cae01 ChangeLog 7120
+MD5 61574258693a50773dc2908a4ca095f9 ChangeLog 7399
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d8f0f1e2eec3c4ec31107cc3dbc2dd85 ruby-1.6.8-r3.ebuild 2134
-MD5 8791c4e348625a9f29484ae8916eabc3 ruby-1.6.8-r6.ebuild 1684
+MD5 6105054da5320aff18d09e5c506ab5cf ruby-1.6.8-r6.ebuild 1684
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 88a20f230c5bd67d95a050bb781302e2 files/digest-ruby-1.8.1 128
 MD5 a1aff527ed4b468611a7e55ab17e6bc0 files/ruby-1.6.8-oniguruma-gentoo.diff 1125
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r5 b/dev-lang/ruby/files/digest-ruby-1.6.8-r6
index 9808595b6b70..9808595b6b70 100644
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r5
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r6
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r2 b/dev-lang/ruby/files/digest-ruby-1.8.0-r2
deleted file mode 100644
index 6bc2df5cd820..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r4 b/dev-lang/ruby/files/digest-ruby-1.8.0-r5
index 1bc80db6100c..1bc80db6100c 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.0-r4
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0-r5
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.1-r1 b/dev-lang/ruby/files/digest-ruby-1.8.1-r1
new file mode 100644
index 000000000000..2c50ca96f18d
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.1-r1
@@ -0,0 +1,2 @@
+MD5 5d52c7d0e6a6eb6e3bc68d77e794898e ruby-1.8.1.tar.gz 2671875
+MD5 8e0dd61b25ce83be9bca657fbda5a172 onigd20031224.tar.gz 178287
diff --git a/dev-lang/ruby/ruby-1.6.8-r5.ebuild b/dev-lang/ruby/ruby-1.6.8-r5.ebuild
deleted file mode 100644
index 59b9b2cd3a93..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 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-r5.ebuild,v 1.1 2003/12/25 01:29:25 usata Exp $
-
-IUSE="ruby16 cjk"
-
-ONIGURUMA="onigd20031224"
-
-inherit flag-o-matic alternatives eutils
-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
-	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-SLOT="1.6"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64 -ia64"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/readline-4.1
-	>=sys-libs/ncurses-5.2"
-
-pkg_setup() {
-
-	einfo
-	einfo "If you want to use ruby-1.6 by default you need to set"
-	einfo "\tUSE=\"ruby16\""
-	einfo "otherwise ruby-1.8 will be used."
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	if [ -n "`use cjk`" ] ; then
-		pushd oniguruma
-		econf --with-rubydir=${S}
-		make 16
-		cd ${S}/lib
-		epatch ${FILESDIR}/${P}-oniguruma-gentoo.diff
-		popd
-	fi
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
-}
-
-src_compile() {
-	econf --program-suffix=16 --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dosym /usr/lib/libruby16.so.${PV} /usr/lib/libruby.so.${PV%.*}
-	dosym /usr/lib/libruby16.so.${PV} /usr/lib/libruby.so.${PV}
-
-	if has_version '>=dev-lang/ruby-1.8.0-r1'; then
-		dobin ${FILESDIR}/ruby-config
-	fi
-
-	dodoc COPYING* ChangeLog MANIFEST README* ToDo
-}
-
-ruby_alternatives() {
-	if [ -n "`use ruby16`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{16,18}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{16,18}.1.gz
-	else
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	fi
-}
-
-pkg_postinst() {
-	ruby_alternatives
-
-	if [ -x "/usr/bin/ruby-config" ] ; then
-	einfo
-	einfo "You can switch default ruby by /usr/bin/ruby-config."
-	einfo
-	fi
-}
-
-pkg_postrm() {
-	ruby_alternatives
-}
diff --git a/dev-lang/ruby/ruby-1.6.8-r6.ebuild b/dev-lang/ruby/ruby-1.6.8-r6.ebuild
new file mode 100644
index 000000000000..d97002fbe49a
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.6.8-r6.ebuild
@@ -0,0 +1,70 @@
+# 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-r6.ebuild,v 1.1 2004/01/30 08:03:38 usata Exp $
+
+IUSE="cjk"
+
+ONIGURUMA="onigd20031224"
+
+inherit flag-o-matic alternatives eutils
+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
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+SLOT="1.6"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~hppa ~amd64 -ia64"
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	>=dev-ruby/ruby-config-0.2"
+
+src_unpack() {
+	unpack ${A}
+	if [ -n "`use cjk`" ] ; then
+		pushd oniguruma
+		econf --with-rubydir=${S}
+		make ${SLOT/./}
+		cd ${S}/lib
+		epatch ${FILESDIR}/${P}-oniguruma-gentoo.diff
+		popd
+	fi
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/${P}-fix-x86_64.patch
+}
+
+src_compile() {
+	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 [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+	einfo
+	einfo "You can change the default ruby interpreter by /usr/sbin/ruby-config"
+	einfo
+}
+
+pkg_postrm() {
+
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.0-r4.ebuild b/dev-lang/ruby/ruby-1.8.0-r5.ebuild
index 18cc9b45193a..77e3183bfbc1 100644
--- a/dev-lang/ruby/ruby-1.8.0-r4.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.0-r4.ebuild,v 1.1 2003/12/25 01:29:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0-r5.ebuild,v 1.1 2004/01/30 08:03:38 usata Exp $
 
-IUSE="socks5 tcltk ruby16 cjk"
+IUSE="socks5 tcltk cjk"
 
 ONIGURUMA="onigd20031224"
 
@@ -25,14 +25,17 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk?  ( dev-lang/tk )
-	sys-apps/findutils"
+	sys-apps/findutils
+	>=dev-ruby/ruby-config-0.2"
+RDEPEND="${DEPEND}
+	!=dev-lang/ruby-cvs-${SLOT}*"
 
 src_unpack() {
 	unpack ${A}
 	if [ -n "`use cjk`" ] ; then
 		pushd oniguruma
 		econf --with-rubydir=${S}
-		make 18
+		make ${SLOT/./}
 		popd
 	fi
 
@@ -57,7 +60,7 @@ src_compile() {
 		export CFLAGS
 	fi
 
-	econf --program-suffix=18 --enable-shared \
+	econf --program-suffix=${SLOT/./} --enable-shared \
 		`use_enable socks5 socks` \
 		|| die "econf failed"
 	emake || die "emake failed"
@@ -66,51 +69,30 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
-	dosym /usr/lib/libruby18.so.${PV} /usr/lib/libruby.so.${PV%.*}
-	dosym /usr/lib/libruby18.so.${PV} /usr/lib/libruby.so.${PV}
-
-	if has_version '=dev-lang/ruby-1.6.8*' ; then
-		dobin ${FILESDIR}/ruby-config
-	fi
+	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
 }
 
-ruby_alternatives() {
-	if [ -n "`use ruby16`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{16,18}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{16,18}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{16,18}.1.gz
-	else
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	fi
-}
-
 pkg_postinst() {
-	ruby_alternatives
 	ewarn
 	ewarn "Warning: Vim won't work if you've just updated ruby from"
 	ewarn "1.6.8 to 1.8.0 due to the library version change."
 	ewarn "In that case, you will need to remerge vim."
 	ewarn
 
-	if [ -x "/usr/bin/ruby-config" ] ; then
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
 	einfo
-	einfo "You can switch default ruby by /usr/bin/ruby-config."
+	einfo "You can change the default ruby interpreter by /usr/sbin/ruby-config"
 	einfo
-	fi
 }
 
 pkg_postrm() {
-	ruby_alternatives
+
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
 }
diff --git a/dev-lang/ruby/ruby-1.8.0-r2.ebuild b/dev-lang/ruby/ruby-1.8.1-r1.ebuild
index e6d973ceef59..c44d3743b7ca 100644
--- a/dev-lang/ruby/ruby-1.8.0-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.1-r1.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.0-r2.ebuild,v 1.3 2003/12/10 23:03:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.1-r1.ebuild,v 1.1 2004/01/30 08:03:38 usata Exp $
+
+IUSE="socks5 tcltk cjk"
+
+ONIGURUMA="onigd20031224"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 filter-flags -fomit-frame-pointer
 
-S=${WORKDIR}/${P%_pre*}
 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/${PV%.*}/${P/_pre/-preview}.tar.gz
+	cjk? ( ftp://ftp.ruby-lang.org/pub/ruby/contrib/${ONIGURUMA}.tar.gz )"
 
 LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="socks5 tcltk ruby16"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -21,11 +24,21 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-misc/dante-1.1.13 )
 	tcltk?  ( dev-lang/tk )
-	sys-apps/findutils"
+	sys-apps/findutils
+	>=dev-ruby/ruby-config-0.2"
+RDEPEND="${DEPEND}
+	!=dev-lang/ruby-cvs-${SLOT}*"
+
+S=${WORKDIR}/${P%_pre*}
 
 src_unpack() {
 	unpack ${A}
-	cd ${WORKDIR}
+	if [ -n "`use cjk`" ] ; then
+		pushd oniguruma
+		econf --with-rubydir=${S}
+		make ${SLOT/./}
+		popd
+	fi
 
 	# Enable build on alpha EV67
 	if use alpha; then
@@ -48,7 +61,7 @@ src_compile() {
 		export CFLAGS
 	fi
 
-	econf --program-suffix=18 --enable-shared \
+	econf --program-suffix=${SLOT/./} --enable-shared \
 		`use_enable socks5 socks` \
 		|| die "econf failed"
 	emake || die "emake failed"
@@ -57,51 +70,30 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
-	dosym /usr/lib/libruby18.so.${PV} /usr/lib/libruby.so.${PV%.*}
-	dosym /usr/lib/libruby18.so.${PV} /usr/lib/libruby.so.${PV}
-
-	if has_version '=dev-lang/ruby-1.6.8*' ; then
-		dobin ${FILESDIR}/ruby-config
-	fi
+	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
 }
 
-ruby_alternatives() {
-	if [ -n "`use ruby16`" ] ; then
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{16,18}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{16,18}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{16,18}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{16,18}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{16,18}.1.gz
-	else
-		alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
-		alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
-		alternatives_makesym /usr/bin/erb /usr/bin/erb{18,16}
-		alternatives_makesym /usr/lib/libruby.so \
-			/usr/lib/libruby{18,16}.so
-		alternatives_makesym /usr/share/man/man1/ruby.1.gz \
-			/usr/share/man/man1/ruby{18,16}.1.gz
-	fi
-}
-
 pkg_postinst() {
-	ruby_alternatives
 	ewarn
 	ewarn "Warning: Vim won't work if you've just updated ruby from"
 	ewarn "1.6.8 to 1.8.0 due to the library version change."
 	ewarn "In that case, you will need to remerge vim."
 	ewarn
 
-	if [ -x "/usr/bin/ruby-config" ] ; then
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
 	einfo
-	einfo "You can switch default ruby by /usr/bin/ruby-config."
+	einfo "You can change the default ruby interpreter by /usr/sbin/ruby-config"
 	einfo
-	fi
 }
 
 pkg_postrm() {
-	ruby_alternatives
+
+	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+		/usr/sbin/ruby-config ruby${SLOT/./}
+	fi
 }