Version bump. Convert to ruby-ng. Fix build system to work with other ruby versions installed.

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

4 files changed, 133 insertions, 2 deletions

diff --git a/dev-ruby/plruby/ChangeLog b/dev-ruby/plruby/ChangeLog
index 3638766d1f5d..c1ffa42741ef 100644
--- a/dev-ruby/plruby/ChangeLog
+++ b/dev-ruby/plruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/plruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plruby/ChangeLog,v 1.13 2010/06/17 19:54:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plruby/ChangeLog,v 1.14 2010/06/27 07:38:03 graaff Exp $
+
+*plruby-0.5.4 (27 Jun 2010)
+
+  27 Jun 2010; Hans de Graaff <graaff@gentoo.org> +plruby-0.5.4.ebuild,
+  +files/plruby-0.5.4-fix-build-system.patch:
+  Version bump. Convert to ruby-ng. Fix build system to work with other ruby
+  versions installed.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> plruby-0.4.2.ebuild,
   plruby-0.5.3.ebuild:
diff --git a/dev-ruby/plruby/Manifest b/dev-ruby/plruby/Manifest
index 4e523e0f7dd2..a97b9d4460c8 100644
--- a/dev-ruby/plruby/Manifest
+++ b/dev-ruby/plruby/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX plruby-0.5.4-fix-build-system.patch 2464 RMD160 f84267ab3a4c43a05629c92ae99317affd8fa2b0 SHA1 076999941f8bf97bb978c74e483e3444443ddc8f SHA256 40adae4c0f30f9533c7b30a77364c94505bfe709399a1132c77dcadcfcbb4005
 DIST plruby-0.4.2.tar.gz 116418 RMD160 5d2b0688574376c1577e2752dde9b02e7cc6eed4 SHA1 cb73ac2730915f813e809adee01a19dae405cdd2 SHA256 63711d6461ac7d30666d9b9c252677fe9bbcacb8c5ebaa5c62294b9250618f05
 DIST plruby-0.5.3.tar.gz 131323 RMD160 51897c169ba783375730983a292a01cdecf8ee35 SHA1 5c89ea18dcc07c285faae44a1bc0212ec2692e9a SHA256 3af88626078d979373ee7b169169584732310e271a1cbbe22e0d35adf2dee267
+DIST plruby-0.5.4.tgz 122990 RMD160 7b1844d1f90b5a050f8d9ead8f01b6f8fa691b4e SHA1 ad4aee32166e5af61c042da07d6e98eb87d2d672 SHA256 70ac71636c694350fcde8a11b3031b7c440e1d8b6118240c91c2b9eb9dbd719e
 EBUILD plruby-0.4.2.ebuild 578 RMD160 7c4e47cf81e7221f7b27b29fe2dd749bd2209d1f SHA1 5b3373cc3dad6e4b7307cb307ff8982cd4d04bd6 SHA256 1cfabd6342efd2048e384552d7d20b1bffec8c1362ee9592d9f8b84a9aeddfc5
 EBUILD plruby-0.5.3.ebuild 581 RMD160 a1849a0270d237722b3e3b79ee9aabe6f5ae925c SHA1 39dc472bed877ab110820447f639e6124aa4af99 SHA256 340798f13bc38fda25e514bb5449f813d9debb4e5a48c656aaaa5c997a154212
-MISC ChangeLog 1903 RMD160 6fd8a5aebf5296fdeec802ff1c3f2ec0db45f173 SHA1 262e95b82ac61628601ad45b10342b9996f8c337 SHA256 25b289bbafae7dff17a5dbb542669408a85a64b5edf9a9b9a36838e607944708
+EBUILD plruby-0.5.4.ebuild 1244 RMD160 e96f1837cfb1ed8d79a03debc40f94bd3f785f04 SHA1 a91e7435642507163ab3275cc0f4ab5f52bc481c SHA256 14b8e5424a9d15449872a5a8cb788ffb8b9f3cee40a80774db3cbf982270ace4
+MISC ChangeLog 2149 RMD160 6ee9abe832ad4aedb530549c5df4c51d49ea6ae3 SHA1 ab058d2f7b934eb2b56f8d2f924882f0b53e4ec2 SHA256 2b6eefa58c91524b8371ae6d61ca30dc75bcaa8a2c7905f574de881bb5080517
 MISC metadata.xml 163 RMD160 70bbda1c1e8316a09d467334131898ae833a3205 SHA1 f43b9a4a2a82140936f9b04e4e63b3c9a495141f SHA256 f0699a4c3ad24cc38836c2d4a1ba03e4e403a9a5364b51df405db02014005891
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwm/+cACgkQZihJkut28SvgGgD8CDwdMnNPRt/llEUQjbmDClRs
+pFE0Lp9hrh0jkPffOWoA/ie0sQNx6SoLpRwcbYlKx87fQ+gwQEYxkrElf5NhtHQj
+=u0yb
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/plruby/files/plruby-0.5.4-fix-build-system.patch b/dev-ruby/plruby/files/plruby-0.5.4-fix-build-system.patch
new file mode 100644
index 000000000000..30d5c0463156
--- /dev/null
+++ b/dev-ruby/plruby/files/plruby-0.5.4-fix-build-system.patch
@@ -0,0 +1,63 @@
+diff --git a/extconf.rb b/extconf.rb
+index 06a6284..f8c04e9 100755
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -156,6 +156,8 @@ if macro_defined?("PG_TRY", %Q{#include "c.h"\n#include "utils/elog.h"})
+     $CFLAGS += " -DPG_PL_TRYCATCH"
+ end
+ 
++have_library('pq', 'PQconnectdb')
++
+ enable_conversion = false
+ if enable_conversion = enable_config("conversion", true)
+    $CFLAGS += " -DPLRUBY_ENABLE_CONVERSION"
+diff --git a/src/conversions/basic/extconf.rb b/src/conversions/basic/extconf.rb
+index d4833b8..f788d9c 100644
+--- a/src/conversions/basic/extconf.rb
++++ b/src/conversions/basic/extconf.rb
+@@ -4,4 +4,5 @@ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+       !enable_config("plruby-shared")
+    $LIBRUBYARG = ""
+ end
++have_library('ruby18', 'ruby_init')
+ create_makefile('plruby/plruby_basic')
+diff --git a/src/conversions/bitstring/extconf.rb b/src/conversions/bitstring/extconf.rb
+index e980c1e..b6f89d3 100644
+--- a/src/conversions/bitstring/extconf.rb
++++ b/src/conversions/bitstring/extconf.rb
+@@ -4,4 +4,5 @@ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+       !enable_config("plruby-shared")
+    $LIBRUBYARG = ""
+ end
++have_library('ruby18', 'ruby_init')
+ create_makefile('plruby/plruby_bitstring')
+diff --git a/src/conversions/datetime/extconf.rb b/src/conversions/datetime/extconf.rb
+index c5de23b..caeebea 100644
+--- a/src/conversions/datetime/extconf.rb
++++ b/src/conversions/datetime/extconf.rb
+@@ -4,4 +4,5 @@ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+       !enable_config("plruby-shared")
+    $LIBRUBYARG = ""
+ end
++have_library('ruby18', 'ruby_init')
+ create_makefile('plruby/plruby_datetime')
+diff --git a/src/conversions/geometry/extconf.rb b/src/conversions/geometry/extconf.rb
+index 9fcf48e..74655b3 100644
+--- a/src/conversions/geometry/extconf.rb
++++ b/src/conversions/geometry/extconf.rb
+@@ -4,4 +4,5 @@ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+       !enable_config("plruby-shared")
+    $LIBRUBYARG = ""
+ end
++have_library('ruby18', 'ruby_init')
+ create_makefile('plruby/plruby_geometry')
+diff --git a/src/conversions/network/extconf.rb b/src/conversions/network/extconf.rb
+index 29952ee..612e7fa 100644
+--- a/src/conversions/network/extconf.rb
++++ b/src/conversions/network/extconf.rb
+@@ -4,4 +4,5 @@ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+       !enable_config("plruby-shared")
+    $LIBRUBYARG = ""
+ end
++have_library('ruby18', 'ruby_init')
+ create_makefile('plruby/plruby_network')
diff --git a/dev-ruby/plruby/plruby-0.5.4.ebuild b/dev-ruby/plruby/plruby-0.5.4.ebuild
new file mode 100644
index 000000000000..4aa742962067
--- /dev/null
+++ b/dev-ruby/plruby/plruby-0.5.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/plruby/plruby-0.5.4.ebuild,v 1.1 2010/06/27 07:38:03 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit ruby-ng
+
+GITHUB_USER="knu"
+
+DESCRIPTION="plruby language for PostgreSQL"
+HOMEPAGE="http://github.com/knu/postgresql-plruby"
+SRC_URI="http://github.com/${GITHUB_USER}/postgresql-plruby/tarball/v${PV} -> ${P}.tgz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} dev-db/postgresql-server"
+RDEPEND="${RDEPEND} dev-db/postgresql-server"
+
+RUBY_PATCHES=( "${P}-fix-build-system.patch" )
+
+S="${WORKDIR}"/${GITHUB_USER}-postgresql-plruby-*
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die
+}
+
+each_ruby_compile() {
+	# We have injected --no-undefined in Ruby as a safety precaution
+	# against broken ebuilds, but these bindings unfortunately rely on
+	# the lazy load of other extensions; see bug #320545.
+	find . -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-Wl,--no-undefined::' || die "--no-undefined removal failed"
+
+	emake || die
+}
+
+each_ruby_install() {
+	emake install DESTDIR="${D}"
+}
+
+all_ruby_install() {
+	dodoc Changes plruby.html plruby.rd README.en
+}