| 1 |
rbrown 07/09/24 11:56:11 |
| 2 |
|
| 3 |
Modified: ruby-1.8.6_p110.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Implement suggestions from http://archives.gentoo.org/gentoo-dev/msg_147875.xml |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-lang/ruby/ruby-1.8.6_p110.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110.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.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: ruby-1.8.6_p110.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110.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.ebuild 24 Sep 2007 09:38:32 -0000 1.1 |
| 22 |
+++ ruby-1.8.6_p110.ebuild 24 Sep 2007 11:56:11 -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.ebuild,v 1.1 2007/09/24 09:38:32 rbrown Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110.ebuild,v 1.2 2007/09/24 11:56:11 rbrown Exp $ |
| 28 |
|
| 29 |
WANT_AUTOCONF="latest" |
| 30 |
WANT_AUTOMAKE="latest" |
| 31 |
@@ -9,16 +9,18 @@ |
| 32 |
|
| 33 |
inherit flag-o-matic alternatives eutils multilib autotools versionator |
| 34 |
|
| 35 |
-MY_P="${P/_p/-p}" |
| 36 |
+MY_P="${PN}-$(replace_version_separator 3 '-')" |
| 37 |
S=${WORKDIR}/${MY_P} |
| 38 |
|
| 39 |
+SLOT=$(get_version_component_range 1-2) |
| 40 |
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) |
| 41 |
+ |
| 42 |
DESCRIPTION="An object-oriented scripting language" |
| 43 |
HOMEPAGE="http://www.ruby-lang.org/" |
| 44 |
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${MY_P}.tar.gz |
| 45 |
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz |
| 46 |
cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" |
| 47 |
|
| 48 |
LICENSE="Ruby" |
| 49 |
-SLOT="1.8" |
| 50 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 51 |
IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk" |
| 52 |
|
| 53 |
@@ -28,7 +30,7 @@ |
| 54 |
socks5? ( >=net-proxy/dante-1.1.13 ) |
| 55 |
tk? ( dev-lang/tk ) |
| 56 |
>=dev-ruby/ruby-config-0.3.1 |
| 57 |
- !=dev-lang/ruby-cvs-1.8* |
| 58 |
+ !=dev-lang/ruby-cvs-${SLOT}* |
| 59 |
!dev-ruby/rdoc |
| 60 |
!dev-ruby/rexml" |
| 61 |
DEPEND="${RDEPEND}" |
| 62 |
@@ -40,9 +42,8 @@ |
| 63 |
if use cjk ; then |
| 64 |
einfo "Applying ${ONIGURUMA}" |
| 65 |
pushd ${WORKDIR}/oniguruma |
| 66 |
- econf --with-rubydir=${S} || die "econf failed" |
| 67 |
- MY_PV=$(get_version_component_range 1-2) |
| 68 |
- make ${MY_PV/./} |
| 69 |
+ econf --with-rubydir="${S}" || die "econf failed" |
| 70 |
+ make $MY_SUFFIX |
| 71 |
popd |
| 72 |
fi |
| 73 |
|
| 74 |
@@ -77,7 +78,7 @@ |
| 75 |
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" |
| 76 |
fi |
| 77 |
|
| 78 |
- econf --program-suffix=${SLOT/./} --enable-shared \ |
| 79 |
+ econf --program-suffix=$MY_SUFFIX --enable-shared \ |
| 80 |
$(use_enable socks5 socks) \ |
| 81 |
$(use_enable doc install-doc) \ |
| 82 |
$(use_enable threads pthread) \ |
| 83 |
@@ -109,9 +110,9 @@ |
| 84 |
} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
- LD_LIBRARY_PATH=${D}/usr/$(get_libdir) |
| 88 |
+ LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" |
| 89 |
RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" |
| 90 |
- for d in $(find ${S}/ext -type d) ; do |
| 91 |
+ for d in $(find "${S}/ext" -type d) ; do |
| 92 |
RUBYLIB="${RUBYLIB}:$d" |
| 93 |
done |
| 94 |
export LD_LIBRARY_PATH RUBYLIB |
| 95 |
@@ -128,17 +129,17 @@ |
| 96 |
|
| 97 |
if use examples; then |
| 98 |
dodir /usr/share/doc/${PF} |
| 99 |
- cp -pPR sample ${D}/usr/share/doc/${PF} |
| 100 |
+ cp -pPR sample "${D}/usr/share/doc/${PF}" |
| 101 |
fi |
| 102 |
|
| 103 |
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) |
| 104 |
- dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) |
| 105 |
+ dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) |
| 106 |
+ dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) |
| 107 |
|
| 108 |
dodoc ChangeLog NEWS README* ToDo |
| 109 |
|
| 110 |
if use rubytests; then |
| 111 |
dodir /usr/share/${PN}-${SLOT} |
| 112 |
- cp -pPR test ${D}/usr/share/${PN}-${SLOT} |
| 113 |
+ cp -pPR test "${D}/usr/share/${PN}-${SLOT}" |
| 114 |
fi |
| 115 |
} |
| 116 |
|
| 117 |
@@ -153,8 +154,8 @@ |
| 118 |
ewarn "you should re-emerge ruby again." |
| 119 |
ewarn "See bug #159922 for details" |
| 120 |
ewarn |
| 121 |
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then |
| 122 |
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} |
| 123 |
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then |
| 124 |
+ "${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX |
| 125 |
fi |
| 126 |
elog |
| 127 |
elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" |
| 128 |
@@ -162,7 +163,7 @@ |
| 129 |
} |
| 130 |
|
| 131 |
pkg_postrm() { |
| 132 |
- if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then |
| 133 |
- ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} |
| 134 |
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then |
| 135 |
+ "${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX |
| 136 |
fi |
| 137 |
} |
| 138 |
|
| 139 |
|
| 140 |
|
| 141 |
1.296 dev-lang/ruby/ChangeLog |
| 142 |
|
| 143 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.296&view=markup |
| 144 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.296&content-type=text/plain |
| 145 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ruby/ChangeLog?r1=1.295&r2=1.296 |
| 146 |
|
| 147 |
Index: ChangeLog |
| 148 |
=================================================================== |
| 149 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v |
| 150 |
retrieving revision 1.295 |
| 151 |
retrieving revision 1.296 |
| 152 |
diff -u -r1.295 -r1.296 |
| 153 |
--- ChangeLog 24 Sep 2007 09:38:32 -0000 1.295 |
| 154 |
+++ ChangeLog 24 Sep 2007 11:56:11 -0000 1.296 |
| 155 |
@@ -1,6 +1,9 @@ |
| 156 |
# ChangeLog for dev-lang/ruby |
| 157 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 158 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.295 2007/09/24 09:38:32 rbrown Exp $ |
| 159 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.296 2007/09/24 11:56:11 rbrown Exp $ |
| 160 |
+ |
| 161 |
+ 24 Sep 2007; Richard Brown <rbrown@g.o> ruby-1.8.6_p110.ebuild: |
| 162 |
+ Implement suggestions from http://archives.gentoo.org/gentoo-dev/msg_147875.xml |
| 163 |
|
| 164 |
*ruby-1.8.6_p110 (24 Sep 2007) |
| 165 |
|
| 166 |
|
| 167 |
|
| 168 |
|
| 169 |
-- |
| 170 |
gentoo-commits@g.o mailing list |
Archives