Removing old version, minor ebuild cleanup

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 9 insertions, 199 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 92064ebf7657..d096cfd6b48a 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.411 2009/06/14 10:43:16 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.412 2009/06/16 16:55:20 a3li Exp $
+
+  16 Jun 2009; Alex Legler <a3li@gentoo.org> ruby-1.8.6_p368.ebuild,
+  ruby-1.8.6_p369.ebuild, -ruby-1.8.7_p160.ebuild:
+  Removing old version, minor cleanup
 
   14 Jun 2009; Alex Legler <a3li@gentoo.org> -ruby-1.8.6_p114.ebuild,
   -files/ruby-1.8.6-openssl.patch,
diff --git a/dev-lang/ruby/ruby-1.8.6_p368.ebuild b/dev-lang/ruby/ruby-1.8.6_p368.ebuild
index 65e82d4caf24..e6da2401e3d9 100644
--- a/dev-lang/ruby/ruby-1.8.6_p368.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p368.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 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_p368.ebuild,v 1.8 2009/05/10 18:52:51 a3li Exp $
-
-ONIGURUMA="onigd2_5_9"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p368.ebuild,v 1.9 2009/06/16 16:55:20 a3li Exp $
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -28,7 +26,7 @@ RDEPEND="
 	tk? ( dev-lang/tk )
 	app-admin/eselect-ruby
 	!=dev-lang/ruby-cvs-${SLOT}*
-	!dev-ruby/rdoc
+	!<dev-ruby/rdoc-2
 	!dev-ruby/rexml"
 DEPEND="${RDEPEND}"
 PDEPEND="emacs? ( app-emacs/ruby-mode )
diff --git a/dev-lang/ruby/ruby-1.8.6_p369.ebuild b/dev-lang/ruby/ruby-1.8.6_p369.ebuild
index 9c8711866a5f..e15b54e51265 100644
--- a/dev-lang/ruby/ruby-1.8.6_p369.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p369.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2009 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_p369.ebuild,v 1.5 2009/06/11 14:47:47 klausman Exp $
-
-ONIGURUMA="onigd2_5_9"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p369.ebuild,v 1.6 2009/06/16 16:55:20 a3li Exp $
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -28,7 +26,7 @@ RDEPEND="
 	tk? ( dev-lang/tk )
 	app-admin/eselect-ruby
 	!=dev-lang/ruby-cvs-${SLOT}*
-	!dev-ruby/rdoc
+	!<dev-ruby/rdoc-2
 	!dev-ruby/rexml"
 DEPEND="${RDEPEND}"
 PDEPEND="emacs? ( app-emacs/ruby-mode )
diff --git a/dev-lang/ruby/ruby-1.8.7_p160.ebuild b/dev-lang/ruby/ruby-1.8.7_p160.ebuild
deleted file mode 100644
index e3b40ad03bb4..000000000000
--- a/dev-lang/ruby/ruby-1.8.7_p160.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p160.ebuild,v 1.4 2009/05/24 12:11:25 flameeyes Exp $
-
-#PATCHES APPLY, DOESN'T COMPILE THOUGH
-#ONIGURUMA="onigd2_5_9"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2"
-#	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs" #cjk
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
-	app-admin/eselect-ruby
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="emacs? ( app-emacs/ruby-mode )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-PROVIDE="virtual/ruby"
-
-pkg_setup() {
-	use tk || return
-
-	if (use threads && ! built_with_use dev-lang/tk threads) \
-		|| (! use threads && built_with_use dev-lang/tk threads) ; then
-		eerror
-		eerror "You have Tk support enabled."
-		eerror
-		eerror "Ruby and Tk need the same 'threads' USE flag settings."
-		eerror "Either change the USE flag on dev-lang/ruby or on dev-lang/tk"
-		eerror "and recompile tk."
-
-		die "threads USE flag mismatch"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-#	if use cjk ; then
-#		einfo "Applying ${ONIGURUMA}"
-#		pushd "${WORKDIR}/oniguruma"
-#		econf --with-rubydir="${S}" || die "oniguruma econf failed"
-#		emake $MY_SUFFIX || die "oniguruma emake failed"
-#		popd
-#	fi
-
-	cd "${S}/ext/dl"
-	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-mkconfig.patch"
-	epatch "${FILESDIR}/${PN}${MY_SUFFIX}-mkmf-parallel-install.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"
-
-	eautoreconf
-}
-
-src_compile() {
-	# -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
-
-	econf --program-suffix=$MY_SUFFIX --enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
-		--enable-option-checking=no \
-		|| die "econf failed"
-
-	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 -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
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-	RUBYLIB="${S}:${LD_LIBRARY_PATH}/ruby/${SLOT}"
-	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"
-
-	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR sample "${D}/usr/share/doc/${PF}"
-	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
-
-	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "This ebuild is compatible to eselect-ruby"
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-}