Added threads local USE flag (if you compile tk with threads, you will also need...
authorMamoru Komachi <usata@gentoo.org>
Wed, 6 Oct 2004 03:41:08 +0000 (03:41 +0000)
committerMamoru Komachi <usata@gentoo.org>
Wed, 6 Oct 2004 03:41:08 +0000 (03:41 +0000)
dev-lang/ruby/ChangeLog
dev-lang/ruby/Manifest
dev-lang/ruby/files/digest-ruby-1.6.8-r6 [deleted file]
dev-lang/ruby/ruby-1.6.8-r6.ebuild [deleted file]
dev-lang/ruby/ruby-1.8.2_pre2.ebuild

index fa055a41731c3bc1473f3eb0f3c2558552969868..a71a933408ed0a6558bec6aacffe665ed883e6f1 100644 (file)
@@ -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,
index 7449f87cfadc90b74f3afdff7f5e7a971bc46fff..ed3623629d9372b9598e2dbcfe489b0f5cd9259d 100644 (file)
@@ -1,12 +1,10 @@
-MD5 9cdbe2af26ccd9d1f419c20702e8aa1c ChangeLog 14711
+MD5 b94f07beacab140cc89db950e6cb46fc ChangeLog 14954
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d05526a7c6693f88fd5339de15984f99 ruby-1.8.1-r7.ebuild 2778
-MD5 ff3e3aae8951139857c586aadaa24a39 ruby-1.6.8-r6.ebuild 1741
 MD5 778ebd2c3f082bd27aabd1ac5cc7bcb1 ruby-1.6.8-r11.ebuild 1934
-MD5 13500da59aa0ae027f33946d6168cec9 ruby-1.8.2_pre2.ebuild 3508
+MD5 694806003c8d33a008ec93eb2da6f339 ruby-1.8.2_pre2.ebuild 3358
 MD5 70f61fd1ce3bacdd874ebec32890acd1 ruby-1.8.0-r7.ebuild 2728
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
-MD5 b48dff624661317e05cd3ad1d6954096 files/digest-ruby-1.6.8-r6 128
 MD5 e1fe59c9583e8cff244a322c15cee217 files/digest-ruby-1.8.1-r7 137
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
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 (file)
index 9808595..0000000
+++ /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 (file)
index 3964f45..0000000
+++ /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
-}
index 515af5f8bce86da58f502b278f6b375848d8cea3..127d0f687865afcf23bca76aaafebef2dd3e2cf3 100644 (file)
@@ -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
 }