Added SLOT support and ruby18 IUSE flag

6 files changed, 184 insertions, 4 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index b5c6637f4766..591f46fe7a47 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.33 2003/08/16 09:39:24 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.34 2003/10/11 20:32:39 usata Exp $
+
+*ruby-1.8.0-r1 (12 Oct 2003)
+
+  12 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r2.ebuild,
+  ruby-1.8.0-r1.ebuild:
+  Added SLOT support and ruby18 local IUSE flag to ruby-1.6.8-r2.
 
   16 Aug 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0.ebuild :
   Added all ~ARCHs to KEYWORDS. Bug # 26570.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 813bf58dbf34..9c9fa5d8093c 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,9 +1,9 @@
-MD5 b8c014ae2ba3aa619dab672d71b37b68 ChangeLog 4381
+MD5 bce4e485e96e5ea6c966623442ba8e89 ChangeLog 4575
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 747c313a6aa5cd0b128efc5391193c3f ruby-1.6.8-r1.ebuild 878
 MD5 bff60050f38ea67025c965e1f04638eb ruby-1.6.8.ebuild 749
-MD5 01302cb6373bfcba9a8e60cd985ce30d ruby-1.6.8-r2.ebuild 1392
-MD5 733e18ae1caabe66e16d30892083a678 ruby-1.8.0-r1.ebuild 2052
+MD5 8ac3a6f8963605d645abc60eedab49ab ruby-1.6.8-r2.ebuild 2179
+MD5 45b7c26812fe5141280854c95f92e3a0 ruby-1.8.0-r1.ebuild 2427
 MD5 518ad06bdd3bd5fec8923d53765caee0 ruby-1.8.0.ebuild 1746
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8 63
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8-r1 63
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r2 b/dev-lang/ruby/files/digest-ruby-1.6.8-r2
new file mode 100644
index 000000000000..0b9291d168d1
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.6.8-r2
@@ -0,0 +1 @@
+MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.0-r1 b/dev-lang/ruby/files/digest-ruby-1.8.0-r1
new file mode 100644
index 000000000000..6bc2df5cd820
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.0-r1
@@ -0,0 +1 @@
+MD5 582a65e52598a4a1e9fce523e16e67d6 ruby-1.8.0.tar.gz 1979070
diff --git a/dev-lang/ruby/ruby-1.6.8-r2.ebuild b/dev-lang/ruby/ruby-1.6.8-r2.ebuild
new file mode 100644
index 000000000000..6a0b1e1c9242
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.6.8-r2.ebuild
@@ -0,0 +1,82 @@
+# 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-r2.ebuild,v 1.1 2003/10/11 20:32:39 usata Exp $
+
+IUSE="ruby18"
+
+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"
+
+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() {
+
+	ewarn
+	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
+	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
+	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
+	ewarn
+	einfo
+	einfo "Also if you want to use ruby-1.8 by default you need to set"
+	einfo "\tUSE=\"ruby18\""
+	einfo "otherwise ruby-1.6 will be used."
+	einfo
+	sleep 10
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use amd64 && epatch ${FILESDIR}/ruby-1.6.8-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}
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+ruby_alternatives() {
+	if [ -n "`use ruby18`" ] ; then
+		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
+	else
+		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
+	fi
+}
+
+pkg_postinst() {
+	ruby_alternatives
+}
+
+pkg_postrm() {
+	ruby_alternatives
+}
diff --git a/dev-lang/ruby/ruby-1.8.0-r1.ebuild b/dev-lang/ruby/ruby-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..df6822bece70
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.0-r1.ebuild
@@ -0,0 +1,90 @@
+# 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.8.0-r1.ebuild,v 1.1 2003/10/11 20:32:39 usata Exp $
+
+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"
+
+LICENSE="Ruby"
+SLOT="1.8"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
+IUSE="socks5 tcltk"
+
+DEPEND=">=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 )
+	sys-apps/findutils"
+
+pkg_setup() {
+
+	ewarn
+	ewarn "If you have installed <dev-lang/ruby-1.6.8-r2 (ruby-1.6 branch) or"
+	ewarn "<dev-lang/ruby-1.8.0-r1 (ruby-1.8 branch) please unmerge them first."
+	ewarn "SLOT supports >=ruby-1.6.8-r2 and >=ruby-1.8.0-r1 only."
+	ewarn
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}
+
+	# Enable build on alpha EV67
+	if use alpha; then
+		gnuconfig_update || die "gnuconfig_update failed"
+	fi
+}
+
+src_compile() {
+	# Socks support via dante
+	if [ ! -n "`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
+
+	econf --program-suffix=18 --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/libruby18.so.${PV} /usr/lib/libruby.so.${PV%.*}
+	dosym /usr/lib/libruby18.so.${PV} /usr/lib/libruby.so.${PV}
+
+	dodoc COPYING* ChangeLog MANIFEST README* ToDo
+}
+
+ruby_alternatives() {
+	alternatives_makesym /usr/bin/ruby /usr/bin/ruby{18,16}
+	alternatives_makesym /usr/bin/irb /usr/bin/irb{18,16}
+	alternatives_auto_makesym /usr/bin/erb /usr/bin/erb*
+	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
+}
+
+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
+}
+
+pkg_postrm() {
+	ruby-alternatives
+}