Added threads local USE flag (if you compile tk with threads, you will also need to compile ruby with threads). This will close bug #65858.

4 files changed, 14 insertions, 88 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index fa055a41731c..a71a933408ed 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # 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.91 2004/10/03 15:11:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.92 2004/10/06 03:41:08 usata Exp $
+
+  06 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.6.8-r6.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Added threads local USE flag (if you compile tk with threads, you will
+  also need to compile ruby with threads). This will close bug #65858.
 
   03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.8.1-r3.ebuild,
   -ruby-1.8.1-r6.ebuild, -ruby-1.8.0-r6.ebuild, ruby-1.6.8-r11.ebuild,
diff --git a/dev-lang/ruby/files/digest-ruby-1.6.8-r6 b/dev-lang/ruby/files/digest-ruby-1.6.8-r6
deleted file mode 100644
index 9808595b6b70..000000000000
--- a/dev-lang/ruby/files/digest-ruby-1.6.8-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bf48d49dbd94b5c0eda5f75b3bfbac16 ruby-1.6.8.tar.gz 1023403
-MD5 8e0dd61b25ce83be9bca657fbda5a172 onigd20031224.tar.gz 178287
diff --git a/dev-lang/ruby/ruby-1.6.8-r6.ebuild b/dev-lang/ruby/ruby-1.6.8-r6.ebuild
deleted file mode 100644
index 3964f4586adc..000000000000
--- a/dev-lang/ruby/ruby-1.6.8-r6.ebuild
+++ /dev/null
@@ -1,71 +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.6.8-r6.ebuild,v 1.9 2004/06/24 22:55:21 agriffis 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 mips"
-
-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"
-PROVIDE="virtual/ruby"
-
-src_unpack() {
-	unpack ${A}
-	if use cjk ; then
-		pushd oniguruma
-		econf --with-rubydir=${S} || die "econf failed"
-		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 [ ! -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_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
index 515af5f8bce8..127d0f687865 100644
--- a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
@@ -1,6 +1,6 @@
 # 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_pre2.ebuild,v 1.13 2004/10/03 13:32:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.14 2004/10/06 03:41:08 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -17,7 +17,7 @@ LICENSE="Ruby"
 SLOT="1.8"
 # please keep sorted
 KEYWORDS="alpha amd64 arm hppa -ia64 mips macos ppc ppc-macos ~s390 sparc x86"
-IUSE="socks5 tcltk cjk doc"
+IUSE="socks5 tcltk cjk doc threads"
 
 RDEPEND="virtual/libc
 	>=sys-libs/gdbm-1.8.0
@@ -72,8 +72,9 @@ src_compile() {
 	fi
 
 	econf --program-suffix=${SLOT/./} --enable-shared \
-		`use_enable socks5 socks` \
-		`use_enable doc install-doc` \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
@@ -88,10 +89,7 @@ src_install() {
 
 	make DESTDIR=${D} install || die "make install failed"
 
-	if use 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
-	elif use ppc-macos ; then
+	if use macos || 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
@@ -103,8 +101,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use macos ; then
-	if ! use ppc-macos ; then
+	if ! ( use macos || use ppc-pacos ) ; 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."
@@ -118,15 +115,12 @@ pkg_postinst() {
 		einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
 		einfo
 	fi
-	fi
 }
 
 pkg_postrm() {
-	if ! use macos ; then
-	if ! use ppc-macos ; then
+	if ! ( use macos || use ppc-macos ) ; then
 		if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
 			${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
 		fi
 	fi
-	fi
 }