Semi auto-sync

(manually editted for 0m 30s) -- dev-lang/ruby (2011-01-27 19:55:02.404122000 +0100)

(Portage version: 2.2.01.17680-prefix/svn/SunOS i386)

4 files changed, 13 insertions, 218 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 92e602b6d0..fa41538c34 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.476 2010/09/07 17:01:33 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.478 2010/12/31 15:02:50 graaff Exp $
+
+  31 Dec 2010; Hans de Graaff <graaff@gentoo.org> ruby-1.9.2_rc2-r1.ebuild,
+  ruby-1.9.2.ebuild:
+  Remove PROVIDE for old-style virtual/ruby per bug 265054.
+
+  31 Dec 2010; Hans de Graaff <graaff@gentoo.org> -ruby-1.8.6_p399.ebuild:
+  Remove masked ruby 1.8.6 per bug 332597.
 
   07 Sep 2010; Alex Legler <a3li@gentoo.org> -ruby-1.8.7_p249.ebuild,
   -ruby-1.9.2_rc2.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 3eae513f36..e81229b1ee 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -10,14 +10,11 @@ AUX ruby-1.9.1-only-ncurses.patch 482 RMD160 ff2c50c5f21d8ea99e009d78a4f57a9b870
 AUX ruby-1.9.1-prefix.patch 495 RMD160 65895f35b6a26d0356e66655883ca094dbb2fbcc SHA1 1dbfcc675393df4b3522315e8460c80acbb3a613 SHA256 20ff9e74050caa25db82ac7ed148f2a2548ba201d474eff844f029ddd3a9552a
 AUX ruby-mkconfig.patch 407 RMD160 8fdec98672ce845a94c1b28a17747c1e9dd7ec72 SHA1 1e2b97282f4fa55d213dd0b4e7c75fc53367ce7f SHA256 b1ca3500ac50fa49fa1f478aa34f318cff8d92abcd75edfc80fd96338a59e2f4
 AUX ruby18-mkmf-parallel-install.patch 527 RMD160 1cb49132c4b1e6d9d9870b69a2fde79749faa5fe SHA1 8783e18b41563055d7f14cc42b3e30ac65bd6790 SHA256 3d24d95eb33ccb44413859fc6f731f01f8b7b59d8d4d9d6d6cd59e09d046eb78
-DIST ruby-1.8.6-p399.tar.bz2 3972399 RMD160 1c0bb41966c9f6011fa40b9de58ef95cb6610710 SHA1 4a7b5ec1ccbeb8c6c0c49c844471a5ee14cdaa98 SHA256 20ca08aeefa21ca2581a9791f8f9ace3addc92bd978cf36f2f95c109085a50a7
 DIST ruby-1.8.7-p302.tar.bz2 4184764 RMD160 763bc840316cb1080d46445cdc3ca7722d576591 SHA1 d93bd2f1099f3473b496cda2422b27a8da2beb00 SHA256 3537cc81cc2378a2bc319cd16c4237ddee14a2839cfd1515b27dce108d061a68
 DIST ruby-1.9.2-p0.tar.bz2 8495472 RMD160 dc15937c884b0f93863e9871304bae95e1233e15 SHA1 c0fc7e1047f1eac7e554e9818513593b0d398698 SHA256 e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
-DIST ruby-patches-1.8.6_p399.tar.bz2 3782 RMD160 d0faa549dc93ed1ff372ea8edac427e948c6c3bd SHA1 f1702eca97623a123ef49e38f21ac4cc0b0fe94e SHA256 d6b8218856ba4aaf0f0724035d13e165b82b17bc6a6f2b89800bf3628062f77b
 DIST ruby-patches-1.8.7_p302.tar.bz2 1768 RMD160 4db5e9d674555f863d71a5e807a39e08b3cfedeb SHA1 31fb976e35253b8e38b7851686fae715f9c197e8 SHA256 4d742cc7aedf6c56eba09e0f3e699ca24e38425944399db131aa49dc8f4f962a
 DIST ruby-patches-1.9.2.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
-EBUILD ruby-1.8.6_p399.ebuild 6047 RMD160 e0e853a553910136faa880e85706e53f31a5da5d SHA1 2e8acd4fb98d19ea74cbcb4f341da779b9515e1a SHA256 c2976aaa8b9690538931611bbb3bc28a190d9557cc48ad5d1113a4927ca885a1
 EBUILD ruby-1.8.7_p302.ebuild 6091 RMD160 73e39fe65f15e72ad249234a4c09514ce115f277 SHA1 320860e763729068c303c40f16fee11483f65e98 SHA256 9f836f0e1fc80bf507ebbc2628d5b7aae778ab49273ec60793ead0d81d25429c
-EBUILD ruby-1.9.2.ebuild 6519 RMD160 67a13cecf9c4eed0762bc75d492aa684d1168dd7 SHA1 787d65a1bbefbdcab82de04e173935c99b369b7b SHA256 e0f5ba7c51c32a484d31919a28e7cb394803b45b7bd13bf3fe5f1f3905e34439
-MISC ChangeLog 73918 RMD160 2f24e235c395993d4f68e957401ca8e4063541f6 SHA1 ffa17203f50b9b5a04bef1ae9b21600b9ce6a0dc SHA256 9a41d6bd388bf105956e2d9ab36f4602ef574e6fa74d2cf208d241795b610046
+EBUILD ruby-1.9.2.ebuild 6499 RMD160 7ef61f311a941dc4c24fdda02f9f6203ac231cbe SHA1 2b671d1e7e5e66f645a34439ef81b08fb503562b SHA256 307d21add7e3717c1baa4b946e2d3dd01239357c64fa81d15292484a86f3e0e1
+MISC ChangeLog 74197 RMD160 f94d28ad814c9a5f2ba5ad123c17fc416fb9e5a8 SHA1 094f218b86fcca6d9172ce5eee3c734c11589372 SHA256 0fa4b863eac1f0e0a074497d45e0924b7643db47b6f0bf83b47b5f0a05a47ff5
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
diff --git a/dev-lang/ruby/ruby-1.8.6_p399.ebuild b/dev-lang/ruby/ruby-1.8.6_p399.ebuild
deleted file mode 100644
index 656c8f12f3..0000000000
--- a/dev-lang/ruby/ruby-1.8.6_p399.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2010 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_p399.ebuild,v 1.1 2010/08/19 21:35:06 a3li Exp $
-
-EAPI=2
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-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})
-# 1.8 and 1.9 series disagree on this
-RUBYVERSION=$(get_version_component_range 1-2)
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~ppc-aix ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( >=dev-libs/openssl-0.9.8m <dev-libs/openssl-1.0 )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads=] <dev-lang/tk-8.5 )
-	ncurses? ( sys-libs/ncurses )
-	libedit? ( dev-libs/libedit )
-	!libedit? ( readline? ( sys-libs/readline ) )
-	sys-libs/zlib
-	>=app-admin/eselect-ruby-20100603
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-PROVIDE="virtual/ruby"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	epatch "${FILESDIR}/${PN}-1.8.6_p36-only-ncurses.patch"
-	epatch "${FILESDIR}/${PN}-1.8.6_p36-prefix.patch"
-	epatch "${FILESDIR}"/${PN}-1.8.7_p160-solaris.patch
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-	
-	# Fix hardcoded SHELL var in mkmf library
-	sed -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" -i lib/mkmf.rb
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	if use libedit; then
-		einfo "Using libedit to provide readline extension"
-		myconf="${myconf} --enable-libedit --with-readline"
-	elif use readline; then
-		einfo "Using readline to provide readline extension"
-		myconf="${myconf} --with-readline"
-	else
-		myconf="${myconf} --without-readline"
-	fi
-
-	econf \
-		--program-suffix="${MY_SUFFIX}" \
-		--enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		${myconf} \
-		--with-sitedir="${EPREFIX}"/usr/$(get_libdir)/ruby/site_ruby \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	d=$(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir ${d#${EPREFIX}}
-	d=$(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-	keepdir ${d#${EPREFIX}}
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	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 || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-1.9.2.ebuild b/dev-lang/ruby/ruby-1.9.2.ebuild
index f071e1c2d1..d871bafe2f 100644
--- a/dev-lang/ruby/ruby-1.9.2.ebuild
+++ b/dev-lang/ruby/ruby-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2.ebuild,v 1.1 2010/08/24 18:08:09 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2.ebuild,v 1.3 2011/01/06 10:10:38 ssuominen Exp $
 
 EAPI=2
 
@@ -49,7 +49,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
 	yaml? ( dev-libs/libyaml )
-	dev-libs/libffi
+	virtual/libffi
 	sys-libs/zlib
 	>=app-admin/eselect-ruby-20100402
 	!=dev-lang/ruby-cvs-${SLOT}*
@@ -64,8 +64,6 @@ PDEPEND="
 	rdoc? ( >=dev-ruby/rdoc-2.5.11[ruby_targets_ruby19] )
 	xemacs? ( app-xemacs/ruby-modes )"
 
-PROVIDE="virtual/ruby"
-
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.9.1-only-ncurses.patch"
 	epatch "${FILESDIR}/${PN}-1.9.1-prefix.patch"