Implement suggestions from http://archives.gentoo.org/gentoo-dev/msg_147875.xml

Package-Manager: portage-2.1.3.9

3 files changed, 36 insertions, 28 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index ac4df8e22ab4..22197af9b51c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.295 2007/09/24 09:38:32 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.296 2007/09/24 11:56:11 rbrown Exp $
+
+  24 Sep 2007; Richard Brown <rbrown@gentoo.org> ruby-1.8.6_p110.ebuild:
+  Implement suggestions from http://archives.gentoo.org/gentoo-dev/msg_147875.xml
 
 *ruby-1.8.6_p110 (24 Sep 2007)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c8446f6ff47a..816c30b71ecc 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -43,10 +43,10 @@ EBUILD ruby-1.8.6-r1.ebuild 4974 RMD160 9c3b1b305cdb0845d90949f4208ddfeb65be22a9
 MD5 f8cecf90037eeea8cc16fab2d3ead58c ruby-1.8.6-r1.ebuild 4974
 RMD160 9c3b1b305cdb0845d90949f4208ddfeb65be22a9 ruby-1.8.6-r1.ebuild 4974
 SHA256 e501162db6479de297170292ed828c110f49f606f4e5d1efe9cea158a416636d ruby-1.8.6-r1.ebuild 4974
-EBUILD ruby-1.8.6_p110.ebuild 4914 RMD160 7dccf083abbcc33633d5be3e4d759595f9a7c61d SHA1 170fd8e2e1ca6cdd8c8e706c2f1542aff102717c SHA256 d212217ac656d9a6e14b53f16b973fbb47d0e7672d5ab3f6b6ffde930fa3f48c
-MD5 295f546dc3ebfa8674445d38b1431b3d ruby-1.8.6_p110.ebuild 4914
-RMD160 7dccf083abbcc33633d5be3e4d759595f9a7c61d ruby-1.8.6_p110.ebuild 4914
-SHA256 d212217ac656d9a6e14b53f16b973fbb47d0e7672d5ab3f6b6ffde930fa3f48c ruby-1.8.6_p110.ebuild 4914
+EBUILD ruby-1.8.6_p110.ebuild 5004 RMD160 04e2707435a3fa05daf78b4832fedcdc66c61ac8 SHA1 d4fe25a059ded0dfb37e5a28e948285da90741bb SHA256 450e81cc1a01b92f89b5e29f78c626c266a368b271d4a10fcda1505697324661
+MD5 3e4b8e220f1031b06d524b561625c9a0 ruby-1.8.6_p110.ebuild 5004
+RMD160 04e2707435a3fa05daf78b4832fedcdc66c61ac8 ruby-1.8.6_p110.ebuild 5004
+SHA256 450e81cc1a01b92f89b5e29f78c626c266a368b271d4a10fcda1505697324661 ruby-1.8.6_p110.ebuild 5004
 EBUILD ruby-1.8.6_p36-r3.ebuild 4964 RMD160 d3b9f2cd70d62b64738323a6bf560a692a5e7c9b SHA1 16fc49190fea45c0fb50a4abd181390d8bbbc536 SHA256 7f06aa179ada2b0637218a6ade9649344b5cc31bbca33f3bfd6f0c0b9abd96fe
 MD5 073af124ff26824537d057a02cd6e0d0 ruby-1.8.6_p36-r3.ebuild 4964
 RMD160 d3b9f2cd70d62b64738323a6bf560a692a5e7c9b ruby-1.8.6_p36-r3.ebuild 4964
@@ -55,14 +55,18 @@ EBUILD ruby-1.8.6_p36-r4.ebuild 4990 RMD160 0a9f843a567e7c3bfb67f1ba0eb5bc9f025f
 MD5 f10edd5b59cb7c30163814381c396454 ruby-1.8.6_p36-r4.ebuild 4990
 RMD160 0a9f843a567e7c3bfb67f1ba0eb5bc9f025f19c9 ruby-1.8.6_p36-r4.ebuild 4990
 SHA256 c17692d08fe66f168ff61e1072bd12967f02b0eacb6a9191164e54ca47d20e2c ruby-1.8.6_p36-r4.ebuild 4990
-MISC ChangeLog 43104 RMD160 92e4bd2202fa6b62a8cfa6631d5c74cd7b1641df SHA1 bebc04aaaa3b32066bfbe1f6e92857ef1574ad1f SHA256 d3c7f94e044dbb9b643fa623c15fbd9ad29e269190ba575c414ee25e68a7e5cb
-MD5 d22d6b0d3a77348e3487b876ec139432 ChangeLog 43104
-RMD160 92e4bd2202fa6b62a8cfa6631d5c74cd7b1641df ChangeLog 43104
-SHA256 d3c7f94e044dbb9b643fa623c15fbd9ad29e269190ba575c414ee25e68a7e5cb ChangeLog 43104
+MISC ChangeLog 43260 RMD160 0825890bced975589d73f79dbaa2b93f39715a27 SHA1 9da3bf0d57bdbb0c2d7fbde94be53e5e7c6bafad SHA256 e4c03c2d3db66f65316fc5a8d93d74c4302d966615cd7acbbd8ade1aff31e3e4
+MD5 f85cf406df4b741f30ee5d3443942451 ChangeLog 43260
+RMD160 0825890bced975589d73f79dbaa2b93f39715a27 ChangeLog 43260
+SHA256 e4c03c2d3db66f65316fc5a8d93d74c4302d966615cd7acbbd8ade1aff31e3e4 ChangeLog 43260
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
+MISC ruby-1.8.6_p110.ebuild.orig 4914 RMD160 7dccf083abbcc33633d5be3e4d759595f9a7c61d SHA1 170fd8e2e1ca6cdd8c8e706c2f1542aff102717c SHA256 d212217ac656d9a6e14b53f16b973fbb47d0e7672d5ab3f6b6ffde930fa3f48c
+MD5 295f546dc3ebfa8674445d38b1431b3d ruby-1.8.6_p110.ebuild.orig 4914
+RMD160 7dccf083abbcc33633d5be3e4d759595f9a7c61d ruby-1.8.6_p110.ebuild.orig 4914
+SHA256 d212217ac656d9a6e14b53f16b973fbb47d0e7672d5ab3f6b6ffde930fa3f48c ruby-1.8.6_p110.ebuild.orig 4914
 MD5 38ebdc02f8e5fe10b4c7bde101a57fa0 files/digest-ruby-1.8.4-r3 467
 RMD160 d80d4411e88a9afbdd9d5c7a9e3b118f64ac2af6 files/digest-ruby-1.8.4-r3 467
 SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/digest-ruby-1.8.4-r3 467
diff --git a/dev-lang/ruby/ruby-1.8.6_p110.ebuild b/dev-lang/ruby/ruby-1.8.6_p110.ebuild
index fbef77a7347d..dc15849cc56f 100644
--- a/dev-lang/ruby/ruby-1.8.6_p110.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p110.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -9,16 +9,18 @@ ONIGURUMA="onigd2_5_9"
 
 inherit flag-o-matic alternatives eutils multilib autotools versionator
 
-MY_P="${P/_p/-p}"
+MY_P="${PN}-$(replace_version_separator 3 '-')"
 S=${WORKDIR}/${MY_P}
 
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${MY_P}.tar.gz
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz
 	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
 
 LICENSE="Ruby"
-SLOT="1.8"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="cjk debug doc examples ipv6 rubytests socks5 threads tk"
 
@@ -28,7 +30,7 @@ RDEPEND=">=sys-libs/gdbm-1.8.0
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3.1
-	!=dev-lang/ruby-cvs-1.8*
+	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
 	!dev-ruby/rexml"
 DEPEND="${RDEPEND}"
@@ -40,9 +42,8 @@ src_unpack() {
 	if use cjk ; then
 		einfo "Applying ${ONIGURUMA}"
 		pushd ${WORKDIR}/oniguruma
-		econf --with-rubydir=${S} || die "econf failed"
-		MY_PV=$(get_version_component_range 1-2)
-		make ${MY_PV/./}
+		econf --with-rubydir="${S}" || die "econf failed"
+		make $MY_SUFFIX
 		popd
 	fi
 
@@ -77,7 +78,7 @@ src_compile() {
 		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
 	fi
 
-	econf --program-suffix=${SLOT/./} --enable-shared \
+	econf --program-suffix=$MY_SUFFIX --enable-shared \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		$(use_enable threads pthread) \
@@ -109,9 +110,9 @@ src_test() {
 }
 
 src_install() {
-	LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
 	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
-	for d in $(find ${S}/ext -type d) ; do
+	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
 	export LD_LIBRARY_PATH RUBYLIB
@@ -128,17 +129,17 @@ src_install() {
 
 	if use examples; then
 		dodir /usr/share/doc/${PF}
-		cp -pPR sample ${D}/usr/share/doc/${PF}
+		cp -pPR sample "${D}/usr/share/doc/${PF}"
 	fi
 
-	dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
-	dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
 
 	dodoc ChangeLog NEWS README* ToDo
 
 	if use rubytests; then
 		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test ${D}/usr/share/${PN}-${SLOT}
+		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
 	fi
 }
 
@@ -153,8 +154,8 @@ pkg_postinst() {
 	ewarn "you should re-emerge ruby again."
 	ewarn "See bug #159922 for details"
 	ewarn
-	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
-		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
 	fi
 	elog
 	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
@@ -162,7 +163,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
-		${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
 	fi
 }