Fix broken configure.rb script. Remove old version.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 42 insertions, 34 deletions

diff --git a/dev-ruby/eruby/ChangeLog b/dev-ruby/eruby/ChangeLog
index 5f39d0094cc0..ed36ebf8529a 100644
--- a/dev-ruby/eruby/ChangeLog
+++ b/dev-ruby/eruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/eruby
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/ChangeLog,v 1.33 2007/10/14 04:19:54 tgall Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/ChangeLog,v 1.34 2009/06/13 13:32:56 graaff Exp $
+
+  13 Jun 2009; Hans de Graaff <graaff@gentoo.org> -eruby-1.0.5.ebuild,
+  eruby-1.0.5-r1.ebuild, +files/eruby-1.0.5-missing-xldflags.patch:
+  Add patch to take into account that XLDFLAGS in the ruby configuration can
+  be empty. Fixes problem with configure.rb not running at all. Remove
+  old version.
 
   13 Oct 2007; Tom Gall <tgall@gentoo.org> eruby-1.0.5-r1.ebuild:
   stable on ppc64
diff --git a/dev-ruby/eruby/Manifest b/dev-ruby/eruby/Manifest
index 6105b9f473a5..0fe6e54e1075 100644
--- a/dev-ruby/eruby/Manifest
+++ b/dev-ruby/eruby/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX eruby-1.0.5-missing-xldflags.patch 368 RMD160 0be974b3603360449d449d7a08f10b027ca367a4 SHA1 d4011a42b137c6a2395bd7820a5e4784fba928a3 SHA256 535fd3eae649da6fa08709e64a81eb6cfbae61526bb845051a6f9e47f4d8609a
 DIST eruby-1.0.5.tar.gz 61187 RMD160 4fb288dd768f98780dc705574968f090cd82d560 SHA1 d8900f8a7c30661351d2bf6f53753fa86df24996 SHA256 2f98a92ffd86a01209ed9c6c6333998023dbe1921c7abf6e2da02da180cbb173
-EBUILD eruby-1.0.5-r1.ebuild 770 RMD160 93915b948c7470fa9990d5dbb382a67354d7efa3 SHA1 1aacf5dca906706526a32ced7b41dbef1c927965 SHA256 afc8114cca671cbccd75e409f9ea72b52b241853350ff6ea9c93bdb703c8f684
-EBUILD eruby-1.0.5.ebuild 695 RMD160 97e72f1068d98e1e70de4044e835be61898496ac SHA1 74ba1e29feb98cf3b17a618bf5a94303c612aca1 SHA256 d7fbd2feca4ae5a198fb87a6fc008d71484ac55cb6b768bcbd3a3a182e04467c
-MISC ChangeLog 3722 RMD160 aef3412e03f9066b0e0b1b236b73e43916123d37 SHA1 d8772c031d7528b9b6625c3385959ffd3e88b16b SHA256 873367e3ba884d467e25e731242a5b1a0c4f372749cd0fbe682c1cb5e88b3d9d
+EBUILD eruby-1.0.5-r1.ebuild 867 RMD160 b675bbdfeebb61aa6788de4e1c6fe19cef22b4cf SHA1 70586ff071c64b181738a189f3c5cc72fb1cc563 SHA256 f2a7a91504e097bf8dd7befe02aea462eabbb6a603b46ffab93e52cb045baa5a
+MISC ChangeLog 4026 RMD160 a82cc5262d8b4f0d820cb0eb3142413b3ff09df6 SHA1 81d8b05f27aa5bb80a546cd8649e242e43fc4910 SHA256 5fcf15a1bf98d1983f27dfb1743a9da52e55155443bfa570c28deaa2516ad063
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkozqpQACgkQVYU2Ai8K93ci0gCfTgiowrLGrgCZYNbMSeO85I20
+DKEAoIgEqjGYAdXzlbFcErh96MG2rvbM
+=n84D
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/eruby/eruby-1.0.5-r1.ebuild b/dev-ruby/eruby/eruby-1.0.5-r1.ebuild
index 900590a1459c..8cdfcdb94683 100644
--- a/dev-ruby/eruby/eruby-1.0.5-r1.ebuild
+++ b/dev-ruby/eruby/eruby-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.5-r1.ebuild,v 1.9 2007/10/14 04:19:54 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.5-r1.ebuild,v 1.10 2009/06/13 13:32:56 graaff Exp $
 
 inherit ruby
 
@@ -16,12 +16,19 @@ DEPEND="virtual/ruby"
 PDEPEND="vim-syntax? ( app-vim/eruby-syntax )"
 USE_RUBY="ruby16 ruby18"	# doesn't build on ruby19
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-missing-xldflags.patch
+}
+
 src_compile() {
 	ruby configure.rb || die
 	make || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc ChangeLog README*
 }
diff --git a/dev-ruby/eruby/eruby-1.0.5.ebuild b/dev-ruby/eruby/eruby-1.0.5.ebuild
deleted file mode 100644
index 39653df7ba94..000000000000
--- a/dev-ruby/eruby/eruby-1.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.5.ebuild,v 1.15 2007/05/03 16:43:39 rbrown Exp $
-
-inherit ruby
-
-IUSE="examples"
-
-DESCRIPTION="eRuby interprets a Ruby code embedded text file"
-HOMEPAGE="http://www.modruby.net/"
-SRC_URI="http://www.modruby.net/archive/${P}.tar.gz"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 mips ppc sparc x86"
-DEPEND="virtual/ruby"
-USE_RUBY="ruby16 ruby18"	# doesn't build on ruby19
-
-src_compile() {
-	ruby configure.rb || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog README*
-}
diff --git a/dev-ruby/eruby/files/eruby-1.0.5-missing-xldflags.patch b/dev-ruby/eruby/files/eruby-1.0.5-missing-xldflags.patch
new file mode 100644
index 000000000000..57a0ff5d1ccd
--- /dev/null
+++ b/dev-ruby/eruby/files/eruby-1.0.5-missing-xldflags.patch
@@ -0,0 +1,11 @@
+--- configure.rb.~1~	2003-02-10 04:18:10.000000000 +0100
++++ configure.rb	2009-06-13 15:19:30.866827732 +0200
+@@ -306,7 +306,7 @@
+   $LDFLAGS = "-link -incremental:no -pdb:none"
+ end
+ $LIBS = CONFIG["LIBS"]
+-$XLDFLAGS = CONFIG["XLDFLAGS"]
++$XLDFLAGS = CONFIG["XLDFLAGS"] || ""
+ $XLDFLAGS.gsub!(/-L\./, "")
+ if /mswin32/ !~ RUBY_PLATFORM
+   $XLDFLAGS += " -L$(libdir)"