| 1 |
rbrown 07/09/30 08:55:54 |
| 2 |
|
| 3 |
Modified: ruby-1.8.6_p110-r1.ebuild ruby-1.8.5_p113.ebuild |
| 4 |
Log: |
| 5 |
Commited wrong ebuilds |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: ruby-1.8.6_p110-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- ruby-1.8.6_p110-r1.ebuild 30 Sep 2007 08:44:50 -0000 1.1 |
| 22 |
+++ ruby-1.8.6_p110-r1.ebuild 30 Sep 2007 08:55:53 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild,v 1.1 2007/09/30 08:44:50 rbrown Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild,v 1.2 2007/09/30 08:55:53 rbrown Exp $ |
| 28 |
|
| 29 |
WANT_AUTOCONF="latest" |
| 30 |
WANT_AUTOMAKE="latest" |
| 31 |
@@ -22,7 +22,7 @@ |
| 32 |
|
| 33 |
LICENSE="Ruby" |
| 34 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 35 |
-IUSE="cjk debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk" |
| 36 |
+IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk" |
| 37 |
|
| 38 |
RDEPEND=">=sys-libs/gdbm-1.8.0 |
| 39 |
>=sys-libs/readline-4.1 |
| 40 |
@@ -80,22 +80,11 @@ |
| 41 |
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
| 42 |
fi |
| 43 |
|
| 44 |
- # Bug #168939 |
| 45 |
- # We need to always enable ipv6, use --with-lookup-order-hack=INET |
| 46 |
- # when we don't want ipv6 with glibc |
| 47 |
- if use elibc_glibc; then |
| 48 |
- myconf="--enable-ipv6" |
| 49 |
- if ! use ipv6; then |
| 50 |
- myconf="${myconf} --with-lookup-order-hack=INET" |
| 51 |
- fi |
| 52 |
- else |
| 53 |
- myconf=$(use_enable ipv6) |
| 54 |
- fi |
| 55 |
- |
| 56 |
econf --program-suffix=$MY_SUFFIX --enable-shared \ |
| 57 |
$(use_enable socks5 socks) \ |
| 58 |
$(use_enable doc install-doc) \ |
| 59 |
$(use_enable threads pthread) \ |
| 60 |
+ $(use_enable ipv6) \ |
| 61 |
$(use_enable debug) \ |
| 62 |
$(use_with tk) \ |
| 63 |
${myconf} \ |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.2 dev-lang/ruby/ruby-1.8.5_p113.ebuild |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild?rev=1.2&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild?rev=1.2&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild?r1=1.1&r2=1.2 |
| 72 |
|
| 73 |
Index: ruby-1.8.5_p113.ebuild |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild,v |
| 76 |
retrieving revision 1.1 |
| 77 |
retrieving revision 1.2 |
| 78 |
diff -u -r1.1 -r1.2 |
| 79 |
--- ruby-1.8.5_p113.ebuild 30 Sep 2007 08:44:50 -0000 1.1 |
| 80 |
+++ ruby-1.8.5_p113.ebuild 30 Sep 2007 08:55:53 -0000 1.2 |
| 81 |
@@ -1,6 +1,6 @@ |
| 82 |
# Copyright 1999-2007 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild,v 1.1 2007/09/30 08:44:50 rbrown Exp $ |
| 85 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild,v 1.2 2007/09/30 08:55:53 rbrown Exp $ |
| 86 |
|
| 87 |
WANT_AUTOCONF="latest" |
| 88 |
WANT_AUTOMAKE="latest" |
| 89 |
@@ -22,7 +22,7 @@ |
| 90 |
|
| 91 |
LICENSE="Ruby" |
| 92 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 93 |
-IUSE="cjk debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk" |
| 94 |
+IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk" |
| 95 |
|
| 96 |
RDEPEND=">=sys-libs/gdbm-1.8.0 |
| 97 |
>=sys-libs/readline-4.1 |
| 98 |
@@ -77,22 +77,12 @@ |
| 99 |
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
| 100 |
fi |
| 101 |
|
| 102 |
- # Bug #168939 |
| 103 |
- # We need to always enable ipv6, use --with-lookup-order-hack=INET |
| 104 |
- # when we don't want ipv6 with glibc |
| 105 |
- if use elibc_glibc; then |
| 106 |
- myconf="--enable-ipv6" |
| 107 |
- if ! use ipv6; then |
| 108 |
- myconf="${myconf} --with-lookup-order-hack=INET" |
| 109 |
- fi |
| 110 |
- else |
| 111 |
- myconf=$(use_enable ipv6) |
| 112 |
- fi |
| 113 |
|
| 114 |
econf --program-suffix=$MY_SUFFIX --enable-shared \ |
| 115 |
$(use_enable socks5 socks) \ |
| 116 |
$(use_enable doc install-doc) \ |
| 117 |
$(use_enable threads pthread) \ |
| 118 |
+ $(use_enable ipv6) \ |
| 119 |
$(use_enable debug) \ |
| 120 |
$(use_with tk) \ |
| 121 |
${myconf} \ |
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
-- |
| 126 |
gentoo-commits@g.o mailing list |
Archives