summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-04-26 14:45:04 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-04-26 14:45:04 +0000
commitf3a98ddb3355b6e7034b183089625e41a428cce6 (patch)
treecd6fa822098bcb4afde02152acf1e49e8fb302dd
parentVersion bump, add a patch so that tests pass on Ruby 1.9. (diff)
downloadgentoo-2-f3a98ddb3355b6e7034b183089625e41a428cce6.tar.gz
gentoo-2-f3a98ddb3355b6e7034b183089625e41a428cce6.tar.bz2
gentoo-2-f3a98ddb3355b6e7034b183089625e41a428cce6.zip
Bump to 0.9.0 final; testsuite only works with Ruby 1.8, but it builds fine with 1.9 as well.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--dev-ruby/pg/ChangeLog9
-rw-r--r--dev-ruby/pg/pg-0.9.0.ebuild45
-rw-r--r--dev-ruby/pg/pg-0.9.0_pre156.ebuild42
3 files changed, 53 insertions, 43 deletions
diff --git a/dev-ruby/pg/ChangeLog b/dev-ruby/pg/ChangeLog
index 1e35dd9d49ab..9fc3654d71a8 100644
--- a/dev-ruby/pg/ChangeLog
+++ b/dev-ruby/pg/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-ruby/pg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/ChangeLog,v 1.10 2010/02/19 09:30:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/ChangeLog,v 1.11 2010/04/26 14:45:03 flameeyes Exp $
+
+*pg-0.9.0 (26 Apr 2010)
+
+ 26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ -pg-0.9.0_pre156.ebuild, +pg-0.9.0.ebuild:
+ Bump to 0.9.0 final; testsuite only works with Ruby 1.8, but it builds
+ fine with 1.9 as well.
*pg-0.9.0_pre156 (19 Feb 2010)
diff --git a/dev-ruby/pg/pg-0.9.0.ebuild b/dev-ruby/pg/pg-0.9.0.ebuild
new file mode 100644
index 000000000000..4f752b93bebf
--- /dev/null
+++ b/dev-ruby/pg/pg-0.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.9.0.ebuild,v 1.1 2010/04/26 14:45:04 flameeyes Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TEST_TASK="spec"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="docs/api"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="http://bitbucket.org/ged/ruby-pg/"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-db/postgresql-base"
+DEPEND="${RDEPEND}
+ test? ( dev-db/postgresql-server )"
+
+# For the rakefile (and thus doc generation and testing) to work as
+# intended, you need both rake-compiler _and_ the real RubyGems
+# package; what is shipped with Ruby 1.9 is not good enough as it
+# lacks the packaging tasks for Rake.
+ruby_add_bdepend doc "dev-ruby/rake-compiler dev-ruby/rubygems"
+ruby_add_bdepend test "dev-ruby/rspec dev-ruby/rake-compiler dev-ruby/rubygems"
+
+each_ruby_configure() {
+ pushd ext
+ ${RUBY} extconf.rb || die "extconf.rb failed"
+ popd
+}
+
+each_ruby_compile() {
+ pushd ext
+ emake CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed"
+ popd
+}
diff --git a/dev-ruby/pg/pg-0.9.0_pre156.ebuild b/dev-ruby/pg/pg-0.9.0_pre156.ebuild
deleted file mode 100644
index 22b4db786398..000000000000
--- a/dev-ruby/pg/pg-0.9.0_pre156.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.9.0_pre156.ebuild,v 1.1 2010/02/19 09:30:14 flameeyes Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ruby19"
-
-# Tests will always fail because they need access to the pgsql server
-RUBY_FAKEGEM_TEST_TASK="spec"
-RESTRICT="test"
-
-# Disable documentation generation, until upstream problems with the
-# build system are fixed, see:
-# http://bitbucket.org/ged/ruby-pg/issue/15/080-gem-has-broken-rakefile
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc/rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="http://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-db/postgresql-base"
-DEPEND="${RDEPEND}"
-
-each_ruby_compile() {
- pushd "${S}"/ext
- ${RUBY} extconf.rb || die "extconf.rb failed"
- emake || die "emake failed"
- popd
-}
-
-each_ruby_install() {
- ruby_fakegem_newins ext/pg_ext.so lib/pg_ext.so
- each_fakegem_install
-}