From: Fabian Groffen Date: Mon, 1 Jan 2007 16:31:20 +0000 (+0000) Subject: Dropped ppc-macos keyword, see you in prefix X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8eed5efd63c5f0ddd36c66be54721877654c1c85;p=gentoo.git Dropped ppc-macos keyword, see you in prefix Package-Manager: portage-2.1.1-r2 --- diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 94ae6af7db3d..637a6cfd10d4 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ruby -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.250 2006/12/29 16:25:46 pclouds Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.251 2007/01/01 16:31:20 grobian Exp $ + + 01 Jan 2007; Fabian Groffen ruby-1.8.4-r3.ebuild, + ruby-1.8.5_p2.ebuild, ruby-1.8.5_p12.ebuild: + Dropped ppc-macos keyword, see you in prefix 29 Dec 2006; Nguyễn Thái Ngọc Duy ruby-1.8.5_p12.ebuild: diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index e154bf828e0b..d818f9a646a1 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -8,25 +8,25 @@ RMD160 6bb5d1700c877d5dc4192da6eaae9bc6712f78b0 files/ruby-1.8.4-yaml.diff 457 SHA256 425847a21b2c794c4cf910bcd7d6603951bc20c55f39e768dd6befd99ea1a0bb files/ruby-1.8.4-yaml.diff 457 DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b DIST onigd2_5_7.tar.gz 215529 RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 SHA1 041cac9ce58f3002228a98db3c4c6934f5682593 SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549 -DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 +DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 DIST ruby-1.8.5-p12.tar.gz 4526961 RMD160 104e78ea4ce0d8fbd3ca1195ca064eda9c9721ea SHA1 15a34958c12e2fe5f41bec0ac935398b60d9c72e SHA256 c72ad433adee87c79ece02f506008afa9ea783a11d1acdaf4107306caede5d0a DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30 -EBUILD ruby-1.8.4-r3.ebuild 3962 RMD160 7668c092cfc7ed4030e9963067b7c2da50706ef8 SHA1 72cf5bdce5ad825963c0cda8894fc969990aabe7 SHA256 24965021b8bc14a8737aad89ff942d7f0aa5b3c8ea09913a32602373490f76c2 -MD5 2f55f601cce6d826c077b2d0275e49b1 ruby-1.8.4-r3.ebuild 3962 -RMD160 7668c092cfc7ed4030e9963067b7c2da50706ef8 ruby-1.8.4-r3.ebuild 3962 -SHA256 24965021b8bc14a8737aad89ff942d7f0aa5b3c8ea09913a32602373490f76c2 ruby-1.8.4-r3.ebuild 3962 -EBUILD ruby-1.8.5_p12.ebuild 4290 RMD160 772156616e391a2e21fa353cf816c6a8814e07ef SHA1 2bacaa2c067fc7d6106b87d6ff94cf861bc1f5d8 SHA256 39d72544743ceab4acb38c2f9a93fd635d10367d7d726c53a6f184e09f5719ea -MD5 1115b72659eb31d9b0c88d2ee7095027 ruby-1.8.5_p12.ebuild 4290 -RMD160 772156616e391a2e21fa353cf816c6a8814e07ef ruby-1.8.5_p12.ebuild 4290 -SHA256 39d72544743ceab4acb38c2f9a93fd635d10367d7d726c53a6f184e09f5719ea ruby-1.8.5_p12.ebuild 4290 -EBUILD ruby-1.8.5_p2.ebuild 3877 RMD160 9ef236ee4b2a198130dcf8536efc53c1c733dfe9 SHA1 c0e556d857cdcd0327e24067646bc93dc29a835e SHA256 d3fec2a44df02c17c209ad739da230ee05cf5f904f85407f737947bee6c5cf38 -MD5 c598ea156c561894e932a4ffacb388ba ruby-1.8.5_p2.ebuild 3877 -RMD160 9ef236ee4b2a198130dcf8536efc53c1c733dfe9 ruby-1.8.5_p2.ebuild 3877 -SHA256 d3fec2a44df02c17c209ad739da230ee05cf5f904f85407f737947bee6c5cf38 ruby-1.8.5_p2.ebuild 3877 -MISC ChangeLog 36086 RMD160 63e8f90a290955a4038241eca1311353126616da SHA1 cd6b494d03921e7fdec1f8149b4ab3a3b8b05b95 SHA256 6e001376df6971af82c2496c9fc3759b5e17b014762a3ed8306b701e75ac5833 -MD5 65769391b68d553c5f7766238af70727 ChangeLog 36086 -RMD160 63e8f90a290955a4038241eca1311353126616da ChangeLog 36086 -SHA256 6e001376df6971af82c2496c9fc3759b5e17b014762a3ed8306b701e75ac5833 ChangeLog 36086 +EBUILD ruby-1.8.4-r3.ebuild 3949 RMD160 f08c1ced7232ecc4fd191b7a155f1d5e652fbd8d SHA1 19b6429328a8c521506126c10bf53492fa341c49 SHA256 2c6e64dcbf56a03a82ba8c549073bddafa914ea5546c06b3eb017283828d4045 +MD5 e1a09f9681d80c0520739fafc756cbc2 ruby-1.8.4-r3.ebuild 3949 +RMD160 f08c1ced7232ecc4fd191b7a155f1d5e652fbd8d ruby-1.8.4-r3.ebuild 3949 +SHA256 2c6e64dcbf56a03a82ba8c549073bddafa914ea5546c06b3eb017283828d4045 ruby-1.8.4-r3.ebuild 3949 +EBUILD ruby-1.8.5_p12.ebuild 4046 RMD160 ba6d8ed0151dacc85ae013827289d141827ac416 SHA1 3183049f58f1de9bf913027c5c9794bd825a3919 SHA256 8764b74a1a9cd30de385fcd684d164b61fc69cb562e69b8ac4d32776ed18fb56 +MD5 60f8b848dd3d18985b6af3fa5e793f46 ruby-1.8.5_p12.ebuild 4046 +RMD160 ba6d8ed0151dacc85ae013827289d141827ac416 ruby-1.8.5_p12.ebuild 4046 +SHA256 8764b74a1a9cd30de385fcd684d164b61fc69cb562e69b8ac4d32776ed18fb56 ruby-1.8.5_p12.ebuild 4046 +EBUILD ruby-1.8.5_p2.ebuild 3866 RMD160 0fb564cc8518154d5dc8cf74a3c807fb735c47a8 SHA1 d05a962f413e63917724226b0fe6b788c7069b8b SHA256 29aaf0b0836ec45d081e70fb5761cdc4124a3ec077259aee56c56cf662d6450e +MD5 6a3c3751ef1ed3c9a81fcbb30f613350 ruby-1.8.5_p2.ebuild 3866 +RMD160 0fb564cc8518154d5dc8cf74a3c807fb735c47a8 ruby-1.8.5_p2.ebuild 3866 +SHA256 29aaf0b0836ec45d081e70fb5761cdc4124a3ec077259aee56c56cf662d6450e ruby-1.8.5_p2.ebuild 3866 +MISC ChangeLog 36254 RMD160 aea23be9e34929eb2a7761a07df41f85e677557a SHA1 1b2e2cb2b10ee4c756fa904dbaa46c6844d62928 SHA256 5162131e0789974dd6b4cedca20d7bdc4fcafb99178fc6f11baeaaf3c207bb62 +MD5 477cea5f84344b19f4c7d70ffc4e9040 ChangeLog 36254 +RMD160 aea23be9e34929eb2a7761a07df41f85e677557a ChangeLog 36254 +SHA256 5162131e0789974dd6b4cedca20d7bdc4fcafb99178fc6f11baeaaf3c207bb62 ChangeLog 36254 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 diff --git a/dev-lang/ruby/ruby-1.8.4-r3.ebuild b/dev-lang/ruby/ruby-1.8.4-r3.ebuild index 7f4cd0c28b19..4728b60cb53b 100644 --- a/dev-lang/ruby/ruby-1.8.4-r3.ebuild +++ b/dev-lang/ruby/ruby-1.8.4-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.4-r3.ebuild,v 1.12 2006/11/07 15:29:21 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4-r3.ebuild,v 1.13 2007/01/01 16:31:20 grobian Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -16,7 +16,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz LICENSE="Ruby" SLOT="1.8" -KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="socks5 tcltk cjk doc threads examples ipv6" RESTRICT="confcache" diff --git a/dev-lang/ruby/ruby-1.8.5_p12.ebuild b/dev-lang/ruby/ruby-1.8.5_p12.ebuild index afbd88e82664..415775bfeae6 100644 --- a/dev-lang/ruby/ruby-1.8.5_p12.ebuild +++ b/dev-lang/ruby/ruby-1.8.5_p12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.5_p12.ebuild,v 1.2 2006/12/29 16:25:46 pclouds Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p12.ebuild,v 1.3 2007/01/01 16:31:20 grobian Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${MY_P}.tar.gz LICENSE="Ruby" SLOT="1.8" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="debug socks5 tk cjk doc threads examples ipv6" RESTRICT="confcache" @@ -113,38 +113,29 @@ src_install() { cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF} fi - if 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 - dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*} - dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*} - 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%_*}) dodoc ChangeLog MANIFEST README* ToDo } pkg_postinst() { - if ! use ppc-macos ; 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." - ewarn "In that case, you will need to remerge vim." - ewarn - - 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 + 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." + ewarn "In that case, you will need to remerge vim." + ewarn + + 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 ! use ppc-macos ; then - if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then - ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} - fi + 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.5_p2.ebuild b/dev-lang/ruby/ruby-1.8.5_p2.ebuild index 8650d9a7ce2a..0f3e383bc80b 100644 --- a/dev-lang/ruby/ruby-1.8.5_p2.ebuild +++ b/dev-lang/ruby/ruby-1.8.5_p2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.5_p2.ebuild,v 1.10 2006/12/14 14:20:08 pclouds Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p2.ebuild,v 1.11 2007/01/01 16:31:20 grobian Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${MY_P}.tar.gz LICENSE="Ruby" SLOT="1.8" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="debug socks5 tk cjk doc threads examples ipv6" RESTRICT="confcache"