Cleanup.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 5 insertions, 165 deletions

diff --git a/dev-lang/rubinius/ChangeLog b/dev-lang/rubinius/ChangeLog
index 50529117626b..4a119d56c3a7 100644
--- a/dev-lang/rubinius/ChangeLog
+++ b/dev-lang/rubinius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/rubinius
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/ChangeLog,v 1.15 2014/06/12 06:17:02 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/ChangeLog,v 1.16 2014/09/08 17:41:52 graaff Exp $
+
+  08 Sep 2014; Hans de Graaff <graaff@gentoo.org> -rubinius-2.2.7.ebuild,
+  -rubinius-2.2.7-r1.ebuild:
+  Cleanup.
 
 *rubinius-2.2.9 (12 Jun 2014)
 
diff --git a/dev-lang/rubinius/rubinius-2.2.7-r1.ebuild b/dev-lang/rubinius/rubinius-2.2.7-r1.ebuild
deleted file mode 100644
index 7d4df7d0c8d6..000000000000
--- a/dev-lang/rubinius/rubinius-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/rubinius-2.2.7-r1.ebuild,v 1.1 2014/06/07 08:05:28 graaff Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="A re-implementation of the Ruby VM designed for speed"
-HOMEPAGE="http://rubini.us"
-SRC_URI="http://releases.rubini.us/${P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="+llvm"
-
-RDEPEND="
-	llvm? ( >=sys-devel/llvm-3.2 )
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/readline
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
-	=dev-ruby/rake-10*
-	dev-ruby/bundler
-"
-
-pkg_setup() {
-	unset RUBYOPT
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-emake-v.patch"
-
-	# src_test will wait until all processes are reaped, so tune down
-	# the long sleep process a bit.
-	sed -i -e 's/sleep 1000/sleep 300/' spec/ruby/core/io/popen_spec.rb || die
-
-	# Drop error CFLAGS per Gentoo policy.
-	sed -i -e '/Werror/ s:^:#:' rakelib/blueprint.rb || die
-
-	bundle --local || die
-}
-
-src_configure() {
-	#Rubinius uses a non-autoconf ./configure script which balks at econf
-	INSTALL="${EPREFIX}/usr/bin/install -c" ./configure --skip-prebuilt \
-		--prefix /usr/$(get_libdir) \
-		--mandir /usr/share/man \
-		--without-rpath \
-		--with-vendor-zlib \
-		$(use_enable llvm) \
-		|| die "Configure failed"
-}
-
-src_compile() {
-	rake build || die "Compilation failed"
-}
-
-src_test() {
-	rake spec || die "Tests failed"
-	einfo "Waiting for forked processes to die"
-}
-
-src_install() {
-	# The install phase tries to determine if there are relevant
-	addpredict /usr/local/lib64/ruby
-
-	local minor_version=$(get_version_component_range 1-2)
-	local librbx="usr/$(get_libdir)/rubinius"
-
-	DESTDIR="${D}" rake install || die "Installation failed"
-
-	dosym /${librbx}/${minor_version}/bin/rbx /usr/bin/rbx || die "Couldn't make rbx symlink"
-
-	insinto /${librbx}/${minor_version}/site
-	doins "${FILESDIR}/auto_gem.rb" || die "Couldn't install rbx auto_gem.rb"
-	RBX_RUNTIME="${S}/runtime" RBX_LIB="${S}/lib" bin/rbx compile "${D}/${librbx}/${minor_version}/site/auto_gem.rb" || die "Couldn't bytecompile auto_gem.rb"
-}
diff --git a/dev-lang/rubinius/rubinius-2.2.7.ebuild b/dev-lang/rubinius/rubinius-2.2.7.ebuild
deleted file mode 100644
index b2b1ec3a8802..000000000000
--- a/dev-lang/rubinius/rubinius-2.2.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rubinius/rubinius-2.2.7.ebuild,v 1.1 2014/06/01 21:20:44 graaff Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="A re-implementation of the Ruby VM designed for speed"
-HOMEPAGE="http://rubini.us"
-SRC_URI="http://releases.rubini.us/${P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="+llvm"
-
-RDEPEND="
-	llvm? ( >=sys-devel/llvm-3.2 )
-	dev-libs/openssl
-	sys-libs/ncurses
-	sys-libs/readline
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
-	=dev-ruby/rake-10*
-	dev-ruby/bundler
-"
-
-pkg_setup() {
-	unset RUBYOPT
-}
-
-src_prepare() {
-	# src_test will wait until all processes are reaped, so tune down
-	# the long sleep process a bit.
-	sed -i -e 's/sleep 1000/sleep 300/' spec/ruby/core/io/popen_spec.rb || die
-
-	# Drop error CFLAGS per Gentoo policy.
-	sed -i -e '/Werror/ s:^:#:' rakelib/blueprint.rb || die
-
-	bundle --local || die
-}
-
-src_configure() {
-	#Rubinius uses a non-autoconf ./configure script which balks at econf
-	INSTALL="${EPREFIX}/usr/bin/install -c" ./configure --skip-prebuilt \
-		--prefix /usr/$(get_libdir) \
-		--mandir /usr/share/man \
-		--without-rpath \
-		--with-vendor-zlib \
-		$(use_enable llvm) \
-		|| die "Configure failed"
-}
-
-src_compile() {
-	rake build || die "Compilation failed"
-}
-
-src_test() {
-	rake spec || die "Tests failed"
-	einfo "Waiting for forked processes to die"
-}
-
-src_install() {
-	# The install phase tries to determine if there are relevant
-	addpredict /usr/local/lib64/ruby
-
-	local minor_version=$(get_version_component_range 1-2)
-	local librbx="usr/$(get_libdir)/rubinius"
-
-	DESTDIR="${D}" rake install || die "Installation failed"
-
-	dosym /${librbx}/${minor_version}/bin/rbx /usr/bin/rbx || die "Couldn't make rbx symlink"
-
-	insinto /${librbx}/${minor_version}/site
-	doins "${FILESDIR}/auto_gem.rb" || die "Couldn't install rbx auto_gem.rb"
-	RBX_RUNTIME="${S}/runtime" RBX_LIB="${S}/lib" bin/rbx compile "${D}/${librbx}/${minor_version}/site/auto_gem.rb" || die "Couldn't bytecompile auto_gem.rb"
-}