Revert mistaken commit of new gemspec-related code, but keep new dependency on dev-ruby/rubygems instead of virtual.

1 files changed, 4 insertions, 25 deletions

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 8e4a75eddfca..5e92cbc022b5 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.25 2010/12/18 09:50:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.26 2010/12/18 09:57:24 graaff Exp $
 #
 # @ECLASS: ruby-fakegem.eclass
 # @MAINTAINER:
@@ -59,11 +59,6 @@ inherit ruby-ng
 # Extra require paths (beside lib) to add to the specification
 # RUBY_FAKEGEM_REQUIRE_PATHS=""
 
-# @ECLASS-VARIABLE: RUBY_FAKEGEM_GEMSPEC
-# @DESCRIPTION:
-# Filename of .gemspec file to install instead of generating a generic one.
-# RUBY_FAKEGEM_GEMSPEC=""
-
 RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN}}"
 RUBY_FAKEGEM_VERSION="${RUBY_FAKEGEM_VERSION:-${PV/_pre/.pre}}"
 RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}"
@@ -140,22 +135,6 @@ ruby_fakegem_newins() {
 	) || die "failed $0 $@"
 }
 
-# @FUNCTION: ruby_fakegem_gemspec
-# @DESCRIPTION:
-# Install a .gemspec file for this package. Either use the file indicated
-# by the RUBY_FAKEGEM_GEMSPEC variable, or generate one using
-# ruby_fakegem_genspec
-ruby_fakegem_gemspec() {
-	if [[ ${RUBY_FAKEGEM_GEMSPEC} != "" ]]; then
-		(
-			insinto $(ruby_fakegem_gemsdir)/specifications
-			newins "${RUBY_FAKEGEM_GEMSPEC}" ${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}.gemspec
-		) || die "Unable to install ${RUBY_FAKEGEM_GEMSPEC} gemspec"
-	else
-		ruby_fakegem_genspec
-	fi
-}
-
 # @FUNCTION: ruby_fakegem_genspec
 # @DESCRIPTION:
 # Generates a gemspec for the package and places it into the "specifications"
@@ -177,7 +156,7 @@ ruby_fakegem_genspec() {
 		# so better taking this into consideration.
 		local quoted_description=${DESCRIPTION//\"/\\\"}
 		cat - > "${T}"/${RUBY_FAKEGEM_NAME}-${_ruby_implementation} <<EOF
-# generated by ruby-fakegem.eclass $Revision: 1.25 $
+# generated by ruby-fakegem.eclass $Revision: 1.26 $
 Gem::Specification.new do |s|
   s.name = "${RUBY_FAKEGEM_NAME}"
   s.version = "${RUBY_FAKEGEM_VERSION}"
@@ -231,7 +210,7 @@ ruby_fakegem_binwrapper() {
 #!${rubycmd}
 # This is a simplified version of the RubyGems wrapper
 #
-# Generated by ruby-fakegem.eclass $Revision: 1.25 $
+# Generated by ruby-fakegem.eclass $Revision: 1.26 $
 
 require 'rubygems'
 
@@ -323,7 +302,7 @@ fi
 # @DESCRIPTION:
 # Install the package for each ruby target.
 each_fakegem_install() {
-	ruby_fakegem_gemspec
+	ruby_fakegem_genspec
 
 	local _gemlibdirs="${RUBY_FAKEGEM_EXTRAINSTALL}"
 	for directory in bin lib; do