From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- dev-ruby/pg/Manifest | 7 ++-- dev-ruby/pg/files/postgresql10-tests.patch | 49 ++++++++++++++++++++++++++ dev-ruby/pg/pg-0.18.4-r1.ebuild | 7 ++-- dev-ruby/pg/pg-0.21.0.ebuild | 6 ++-- dev-ruby/pg/pg-1.0.0.ebuild | 55 ++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 dev-ruby/pg/files/postgresql10-tests.patch create mode 100644 dev-ruby/pg/pg-1.0.0.ebuild (limited to 'dev-ruby/pg') diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest index dcee02fc6c96..16d7e401dd06 100644 --- a/dev-ruby/pg/Manifest +++ b/dev-ruby/pg/Manifest @@ -1,7 +1,10 @@ +AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295 DIST pg-0.17.1.gem 142848 BLAKE2B 26715943ffc56d5377613d3dd56bc994696a812ccedf6415233781d6685ac34ddf25321f2f194880dd9df6715d43efef7eaeb00ed8ac594302c6e2e292b07cc8 SHA512 fb637256d084af3b41ba4130f866924df957a63c29d029b99995bf553e545b3d4064e682b00d0604bf495a853a8800b9c8eba34718e96c651c9a697281ae4a62 DIST pg-0.18.4.gem 219648 BLAKE2B f6b957551b0b537dda5551bc8974f5bd2f8a4ee4ecf482a5d3dc3ede0ad610507029693fadbfe9d2e2940f63d82da61e535e802919a82f7e5ea23c1165b81847 SHA512 48e792756c7ee205164b59a9515ace6320150f0ce1907293f8c1a736300c62c0b38c1be49e8ad4f1a50f29abc7f72bb43e742a8e63d9606eff4c7d2191a4fb74 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b +DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398 EBUILD pg-0.17.1-r1.ebuild 1810 BLAKE2B b6ad39c3e9100ce6301499bc3f2d70bc10b1df16cbf6be7d9b76361a6b2d7d245822b77399bb0365c709b969fcd5b72cf8aa2e167474409f9a26c7887a6830e1 SHA512 b54df5663629584b1d19ab599a0d83ca5577d225aefe32f134f52c9869726934c8c606a25a4516f26ddc441488b79686e63c4484275b9c69135feb69fc2ed262 -EBUILD pg-0.18.4-r1.ebuild 1767 BLAKE2B 34f58f3ab0ca9dd98777bea30374ac21f31315fd520b61031ef8edc644e94374c5281b240d1ddc191c0d7cfb383c381bb745a1af196775890f388da455817be7 SHA512 b3011ccc13338485b19e0ad63362fc9d2b2aa99560acc8222ce1b7ac7ad857492d92e847cc32144bba70f7bd889af0b39824aef2178ede2043314bb434500d55 -EBUILD pg-0.21.0.ebuild 1655 BLAKE2B 48e971997a6fc47bdacbbdd4cfe46eb98cf814ba99e51510f7529403a3f8c1de476e3c62eeda7df75dc9b54f425c2122dc4a9fae69eec659bb86f6bc77eefc27 SHA512 3eef393aaccb27f26c481fa3f492e9621faff1868f2b54553f1d48910e78b22ed75e87116407aabf5d43f05b2a4b0f562d93c372ce9f15ab7d0453fb13f5b0cd +EBUILD pg-0.18.4-r1.ebuild 1800 BLAKE2B 1d50881190b8207970f44b0b39ffa75f3d3c58dd5869ca96fa81b380994d3a6f887c1f5ddec1c0a0209bee264ff4e150f458e4adb074840ef3e6a149d06f3ee6 SHA512 4f20a832fbdfbaa8ce75378a1efd316fa57ffb158d097efefdd1b68c02e24f58a7082e7cbe0e61a0dbb8df2749738c67b4f4d64ca0f1201c79b783f53c421589 +EBUILD pg-0.21.0.ebuild 1707 BLAKE2B bbf0de90919975e2a210db855aaf6a661dfdf7c281da982d7035bd4f3db806332e71be3d3e6529a4428613471939d133042dd41205df0d07ed68137a88fdfbd9 SHA512 916cd04d5dcc699968dda2da31e8f12c096b3f7726f12a4122d540fbe73bf06cde9a202d387dc445d780182f94b79bebd17a0d237c26cdac507771ff07295313 +EBUILD pg-1.0.0.ebuild 1655 BLAKE2B 6427e234010712acd305575b7f08db4740547349823a2661984bcd058e38f461dc0ba4f33f728354108925d31384f9bd503394ad3457acdb3039b64bfd8e8b77 SHA512 277f349b3da11836fca7ddcd2d3961b1c83dcc099bc5c06b3af4fea2352585aae9f25330c3e3507f781800ec3d989bacd9316913dbfa4b578371cc2c596fb10e MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598 diff --git a/dev-ruby/pg/files/postgresql10-tests.patch b/dev-ruby/pg/files/postgresql10-tests.patch new file mode 100644 index 000000000000..f9b7c1579a91 --- /dev/null +++ b/dev-ruby/pg/files/postgresql10-tests.patch @@ -0,0 +1,49 @@ +# HG changeset patch +# User Lars Kanis +# Date 1508756565 -7200 +# Node ID fe63160e8a9803e257231d879fab2841ba44c37a +# Parent d6d5533dfca85b618232fe3e9e56e59dbee99de6 +Adjust tests for PostgreSQL-10 + +diff --git a/spec/helpers.rb b/spec/helpers.rb +--- a/spec/helpers.rb ++++ b/spec/helpers.rb +@@ -251,7 +251,7 @@ + + def check_for_lingering_connections( conn ) + conn.exec( "SELECT * FROM pg_stat_activity" ) do |res| +- conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid } ++ conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) } + unless conns.empty? + puts "Lingering connections remain:" + conns.each do |row| +diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb +--- a/spec/pg/connection_spec.rb ++++ b/spec/pg/connection_spec.rb +@@ -232,7 +232,7 @@ + described_class.connect(@conninfo).finish + sleep 0.5 + res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity +- WHERE usename IS NOT NULL]) ++ WHERE usename IS NOT NULL AND application_name != '']) + # there's still the global @conn, but should be no more + expect( res[0]['n'] ).to eq( '1' ) + end +@@ -1537,9 +1537,14 @@ + end + + it "shouldn't type map params unless requested" do +- expect{ +- @conn.exec_params( "SELECT $1", [5] ) +- }.to raise_error(PG::IndeterminateDatatype) ++ if @conn.server_version < 100000 ++ expect{ ++ @conn.exec_params( "SELECT $1", [5] ) ++ }.to raise_error(PG::IndeterminateDatatype) ++ else ++ # PostgreSQL-10 maps to TEXT type (OID 25) ++ expect( @conn.exec_params( "SELECT $1", [5] ).ftype(0)).to eq(25) ++ end + end + + it "should raise an error on invalid encoder to put_copy_data" do diff --git a/dev-ruby/pg/pg-0.18.4-r1.ebuild b/dev-ruby/pg/pg-0.18.4-r1.ebuild index ed562255874d..76ca7c11e058 100644 --- a/dev-ruby/pg/pg-0.18.4-r1.ebuild +++ b/dev-ruby/pg/pg-0.18.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,8 +6,7 @@ USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_RECIPE_TEST="rspec3" -RUBY_FAKEGEM_TASK_DOC="docs" -RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc" inherit multilib ruby-fakegem @@ -24,6 +23,8 @@ RDEPEND+=" dev-db/postgresql:*" DEPEND+=" dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] )" +RUBY_PATCHES=( "${FILESDIR}/postgresql10-tests.patch" ) + ruby_add_bdepend " doc? ( dev-ruby/hoe diff --git a/dev-ruby/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild index 5309a54327c3..24430c4f4590 100644 --- a/dev-ruby/pg/pg-0.21.0.ebuild +++ b/dev-ruby/pg/pg-0.21.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_TEST="rspec3" @@ -23,6 +23,8 @@ RDEPEND+=" dev-db/postgresql:*" DEPEND+=" dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server,threads] )" +PATCHES=( "${FILESDIR}/postgresql10-tests.patch" ) + all_ruby_prepare() { # hack the Rakefile to make it sure that it doesn't load # rake-compiler (so that we don't have to depend on it and it diff --git a/dev-ruby/pg/pg-1.0.0.ebuild b/dev-ruby/pg/pg-1.0.0.ebuild new file mode 100644 index 000000000000..dbbd6e9e775f --- /dev/null +++ b/dev-ruby/pg/pg-1.0.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc" + +inherit multilib ruby-fakegem + +DESCRIPTION="Ruby extension library providing an API to PostgreSQL" +HOMEPAGE="https://bitbucket.org/ged/ruby-pg/" + +LICENSE="|| ( GPL-2 Ruby )" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND+=" dev-db/postgresql:*" +DEPEND+=" dev-db/postgresql + test? ( >=dev-db/postgresql-9.4[server,threads] )" + +all_ruby_prepare() { + # hack the Rakefile to make it sure that it doesn't load + # rake-compiler (so that we don't have to depend on it and it + # actually works when building with USE=doc). + sed -i \ + -e '/Rakefile.cross/s:^:#:' \ + -e '/ExtensionTask/,/^end$/ s:^:#:' \ + Rakefile || die +} + +each_ruby_configure() { + ${RUBY} -C ext extconf.rb || die "extconf.rb failed" +} + +each_ruby_compile() { + emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" + cp ext/*$(get_libname) lib || die +} + +each_ruby_test() { + if [[ "${EUID}" -ne "0" ]]; then + # Make the rspec call explicit, this way we don't have to depend + # on rake-compiler (nor rubygems) _and_ we don't have to rebuild + # the whole extension from scratch. + RSPEC_VERSION=3 ruby-ng_rspec + else + ewarn "The userpriv feature must be enabled to run tests." + eerror "Testsuite will not be run." + fi +} -- cgit v1.2.3