From f2fd1fa49782caf00335925193dc1dcfd1221e55 Mon Sep 17 00:00:00 2001 From: Aaron Swenson Date: Sat, 12 Nov 2011 16:58:38 +0000 Subject: [PATCH] Fixes bug 363227 Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- dev-libs/glib/Manifest | 22 ++--- dev-libs/libpqxx/ChangeLog | 8 +- dev-libs/libpqxx/Manifest | 12 ++- .../libpqxx/files/libpqxx-3.1-gcc46.patch | 24 +++++ dev-libs/libpqxx/libpqxx-3.1-r3.ebuild | 94 +++++++++++++++++++ 5 files changed, 140 insertions(+), 20 deletions(-) create mode 100644 dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch create mode 100644 dev-libs/libpqxx/libpqxx-3.1-r3.ebuild diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 5ea0b9a70c73..8c268570e008 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -18,28 +18,22 @@ AUX glib-2.30.1-external-gdbus-codegen.patch 2293 RMD160 9b2f6beda060c45d473edc4 AUX glib-2.30.1-homedir-env.patch 1849 RMD160 2bbe190e2d6ee96cb33dcfe37c1ff227ea4e8ca9 SHA1 42077f9373acce576b4eb811b6464f0332db7711 SHA256 4f0e149703a9aadc4fb568b9fa00419b9848b345b19d3cc9e1a2bd67985ea25b DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 RMD160 5b7a21da6dc10112409bd885501a6976a2eb894d SHA1 468a7947b7d1688c2e7d61da80d40ca59422fbec SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 DIST glib-1.2.10.tar.gz 421480 RMD160 f19efe8c87ebeea979a4d36902d8a8209640cd95 SHA1 e5a9361c594608d152d5d9650154c2e3260b87fa SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f -DIST glib-2.28.6.tar.bz2 6955725 RMD160 5858c29829352c0c59fe12dbd6dceba81aabe5f6 SHA1 51996339c823cf36ba28c774c4afad933d5f5744 SHA256 557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578 DIST glib-2.28.8.tar.xz 5223564 RMD160 9f665eee95990ace173676a4ad7aeeb0cc17fef9 SHA1 9b11968fedf4da45bcd10c4a8c50012d41b3af50 SHA256 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353 -DIST glib-2.30.0.tar.xz 5744640 RMD160 7e300ff549e3a4a156c037505e0ea49250fe511c SHA1 7f7033081cbaebccbf15a2b0fc1ea203d940b109 SHA256 d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1 DIST glib-2.30.1.tar.xz 5809220 RMD160 2bfd106eb56d1ad4af4be556f2398991e53e1825 SHA1 15d497106ccc389a26297725f8dc6de37f2c0371 SHA256 82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36 -EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e EBUILD glib-2.28.8.ebuild 7404 RMD160 df5a5f4ee06e7620b6b75a43ea6764e20626b022 SHA1 7a1418dbd1df2b8a6a511e781532a19ebdef6b63 SHA256 e21a8482d3ece513afb5620df8838f25e4b5adbd2c7e6d006e864e755d69d702 -EBUILD glib-2.30.0.ebuild 6784 RMD160 5f5107c9c6edfca27da651367ea9b2b80d400859 SHA1 c24ccc3504a798d613969ad09ac677c0429acbd2 SHA256 6f10287a368a61d99dfd9af9945bd152cad51124ce6f5a8cc94957114bb387de -EBUILD glib-2.30.1-r1.ebuild 8313 RMD160 314e5fdb8992ddc626e91da22502e43115feafbb SHA1 dadd9966ac41ee07684a4e2e870b3b9149e5720e SHA256 3a65be6a77a78dcf876ac7d0527abb85e8317c0e283515caac77eea8a0250564 EBUILD glib-2.30.1-r2.ebuild 8500 RMD160 cdd21e95f08c66519e465d1256a06598336ddce8 SHA1 6f5e61fe6db1bdee51ac41064a12595e97b7c863 SHA256 4f726a1fa65ba97ead4dad236729feaa78e14514de5c75d35cae0adc81af1e20 -EBUILD glib-2.30.1.ebuild 6827 RMD160 5b7cd8a5fedf380a92ca0fb70ff5c5281113a4f2 SHA1 f828c171be5e5161565ad22709b8b4a093808b27 SHA256 045bd5c3d152632dae7196d285b2b63bc0333bb976284fbcf34dc7590a495278 -MISC ChangeLog 65294 RMD160 418686616ee8e65dac691bcbcef4f264d90abff2 SHA1 fb2449851ce98a64ab5571531eff3e35b5e979a3 SHA256 bfa5236b20c893404bf80f3987923cd2bda1872e92a11157d0799f657f4d121a +MISC ChangeLog 65444 RMD160 3a0b2dc688fe1e931cd631636ecf1fda268a0f40 SHA1 f1688b818c66301abf1797544711c397b1dfd2d1 SHA256 db569f5f81864593d2325b857bb324303578d36d3a1fd993943bcf17318f1bff MISC metadata.xml 497 RMD160 447ae0d07ac529dbe1830e383d2ef4eae7359ea7 SHA1 4cb36fafa32d53a0dbeec978b0d75f4e7acb3fa0 SHA256 a1840f7e6af57edc9fe5b54deae9e2083858d27792fda3f4e1e8e04624b17d0d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOvVycAAoJEEdUh39IaPFN8OoH/3jF/7LmKktWOU66dzeXgzzP -Gjt0DGZYvfpHqn9me2RM0xhTPkyqQ2pGi+aIYCdOGyB+mlcJE5/VXASt42E634X+ -16NorF/yD/m2ollXwjqEm0yvikRPuu7gk7hcvfoOmGC1LasGl3Hvvaoax0hD9RDH -mIg6YEOYuxylaljYBYHeB/kUeS2cZC/T9rf1SZvmJY46HkR1WHJnkX+Ysu/FoMTN -Wx4qiEDptZfJXaaLGAHWw7WoXNtdMvk3r8X3C0oaA+d/M+0oM9wOyGaDBbSFV5ys -iERDEgxyb2KKr8wg7XNg0xH52x1lgQfkakziabDa9N3k+a5fIWH7B7OCLwlvHqI= -=1HdG +iQEcBAEBAgAGBQJOvqYaAAoJEEdUh39IaPFN1ZUH+gOYCi9vgBZfK4Uwz9GN2XK2 +6xiEB/BXIXZYb1YsookRsYKRg4DYbL1WmiIht8Pg7cFFjC+a9OPAzee1nbEyD91t +HbndS8mtlRbLOMFGqNf6XoiRNtBRHLUKsLeqTXOBIdL0niqZ48m41R1UN0exRXKi +APYxzPLY20rfk8pQa56NmPKoOnngRb3vqbuM1G2md4+5xv8R/19J/8qpTyG5NPHH +MLpnl/SYE4kJxzT5ijz9ogW6xjgaHs8e0CjPpHXTgdxA1HXJdRuw3OrR9CR+pV5d +dAyvidR/R0GJVACBUNX9YEstSwT7OU3uQiLGMSOcl6XbBmb1KOWQiluTDONG27c= +=0mbD -----END PGP SIGNATURE----- diff --git a/dev-libs/libpqxx/ChangeLog b/dev-libs/libpqxx/ChangeLog index dce1a06d9ae9..6788b2671733 100644 --- a/dev-libs/libpqxx/ChangeLog +++ b/dev-libs/libpqxx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libpqxx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.71 2011/10/19 00:20:18 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/ChangeLog,v 1.72 2011/11/12 16:58:37 titanofold Exp $ + +*libpqxx-3.1-r3 (12 Nov 2011) + + 12 Nov 2011; Aaron W. Swenson +libpqxx-3.1-r3.ebuild, + +files/libpqxx-3.1-gcc46.patch: + Fixes bug 363227 19 Oct 2011; Jeroen Roovers libpqxx-3.1-r2.ebuild: Stable for HPPA (bug #387081). diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest index 90b5098ade70..be4cfa7931de 100644 --- a/dev-libs/libpqxx/Manifest +++ b/dev-libs/libpqxx/Manifest @@ -1,9 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX libpqxx-2.5.1-gentoo.patch 2723 RMD160 56627d68aa79c0e98a0ba7189dab12646afee91b SHA1 5028c6dc926f07d4b3e85bc4954af6bcb0cb8f96 SHA256 0e6d7f13bf2117fe3884bf4296209baaf5a28311bb71dc79134a239846788046 AUX libpqxx-2.6.9-gcc43.patch 1907 RMD160 79149bd560599e5352234a5ba54f2fe4fd411b12 SHA1 3847b1c45bf3ec6f52d4b971531dcf16482b9c3e SHA256 72b489af0d4b7c2d2071abf02ce50af1d3db4da7b0bc3eab2220b291e378e1d7 AUX libpqxx-2.6.9-gcc44.patch 2384 RMD160 36984c849d7c46cee7d4cdf9454747f206d41531 SHA1 5212b19262ff99fa0d9044e78d12fa13ab76f360 SHA256 848cbad8889ce73301b8ae38d2f6dfc149f4cdcf7865c846779fec168b21ee76 +AUX libpqxx-3.1-gcc46.patch 1052 RMD160 00d554ea92e3963efebd93b2dcb4343a313e34ae SHA1 88a1ebebb9ca9d565a230e0f238956ab354061a9 SHA256 c3dee249eaa0f00cb7922e6e45c2cee78e3055be7d8fdbc8d9d7755ff571048b DIST libpqxx-2.6.8.tar.gz 1690973 RMD160 5a9a57774ac878d827af8940e87f5d92c2a1b86a SHA1 2f963c98b8a79675d537daadc3ba6c313c35f59d SHA256 b3b4a1de89936d36f61ba1da1ca2c0e0f412cdab004a402761f9433b1d0a3a8d DIST libpqxx-2.6.9.tar.gz 1639557 RMD160 c456b5a3ed3c96963aad334d3504ed0443a8f63e SHA1 8be9dcd0375337b170d5c94370fa896911d361f1 SHA256 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a DIST libpqxx-3.0.2.tar.gz 1565644 RMD160 0162ea135d56c203f45f9d5d328a29d2db72b102 SHA1 6af866e06668e9c8b7af4161dddb1ab5f4bf094c SHA256 de265ab5d397ace7596c3b6d19a0057ce2ba58477315acf9165b0a97facab6ca @@ -12,12 +13,13 @@ EBUILD libpqxx-2.6.8.ebuild 1722 RMD160 a3c6cea43966c44a93e5023f91cf863d856abfd9 EBUILD libpqxx-2.6.9.ebuild 1894 RMD160 7717392f069b80d975613ff0f5a7c6a07e3c4a88 SHA1 e843cd3917a91c87db1b873a4bb4e4e2ad312c11 SHA256 b5124abb2faa46669d4cac8cb80fd55f201f68e970eccd1bad313e2b0b269d00 EBUILD libpqxx-3.0.2.ebuild 1791 RMD160 026f17e48393c9f657b9d88ca8994fb316c40a9a SHA1 e8b3baeee658ad053e770826afe5e60f1b1f3997 SHA256 a60c499b29b07fa2b964b5c58170e82e950caa2d6519730b5259cab650f4b946 EBUILD libpqxx-3.1-r2.ebuild 2680 RMD160 197c393285025c0e19d99d1fa8d552e77121affb SHA1 42d4da6723b6dfdd1438b3a444625642f5cd8d5a SHA256 ed36ef7fa1679ba472406cbaf5fcff910927791826b642719d95365bee26184e -MISC ChangeLog 9034 RMD160 927cdc8f67395bfc96ed7277e7ba62c6a7910c56 SHA1 a1398bafd9731366b06d3cf431a6817da8059367 SHA256 afa9fb2855d73ef19738e08b225e10d81f12318c2026f49669715da96c24727d +EBUILD libpqxx-3.1-r3.ebuild 2881 RMD160 68eb0cf91fed4873a2eccb9c41e2f590c8089377 SHA1 b4d325e1f535d07246130a7a00e0d8321cfb91ac SHA256 25fe2647b113b7471d7ce4f00abeb925b13b5c13b1bfd55122d345e5e62504d2 +MISC ChangeLog 9206 RMD160 97d8e03150b3b9b72b2efc8ac3f9528d2986a025 SHA1 21be1990a144b8bddc803a0be6efc3f4d5e099ca SHA256 b054caab58138afa2c63334192be3e15a581c5eb1f4ef8e033b7aa9cd18fcdf9 MISC metadata.xml 479 RMD160 b10fa4653f307d21cc36cb24911aa1d6ced1248e SHA1 213e666f9cd523ebbc163ab7d78472caf289d4ef SHA256 42e814ea6ceb5a7133c3ddbe0afd13a1b97083893405fee6f7984d5c9cbbb938 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6eF8cACgkQVWmRsqeSphOy6wCfWgHiU/uakdhjQlQTxE6d6nzP -0AwAn1Yviuv+nXA3A2uH4PntkgIKlqyP -=Rqgm +iF4EAREIAAYFAk6+pcMACgkQVxOqA9G7/aCDLQD/dr90+KShdx0AGOGigB6MBQLK +bicRI0INla7PdbBAd8sA/RQEOd8AaokWSwbzVKcJpQND5vG9uqWHv2vLb9R6nVA5 +=B97M -----END PGP SIGNATURE----- diff --git a/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch new file mode 100644 index 000000000000..91cd5d24a5f1 --- /dev/null +++ b/dev-libs/libpqxx/files/libpqxx-3.1-gcc46.patch @@ -0,0 +1,24 @@ +--- a/include/pqxx/compiler-internal.hxx ++++ b/include/pqxx/compiler-internal.hxx +@@ -76,7 +76,7 @@ + namespace internal + { + /// Wrapper for std::distance; not all platforms have std::distance(). +-template inline ptrdiff_t distance(T first, T last) ++template inline PGSTD::ptrdiff_t distance(T first, T last) + { + #ifdef PQXX_HAVE_DISTANCE + return PGSTD::distance(first, last); +--- a/test/unit/test_escape.cxx ++++ b/test/unit/test_escape.cxx +@@ -54,8 +54,8 @@ + PQXX_CHECK_EQUAL(t.quote("x"), "'x'", "Basic quote() fails."); + PQXX_CHECK_EQUAL(t.quote(1), "'1'", "quote() not dealing with int properly."); + PQXX_CHECK_EQUAL(t.quote(0), "'0'", "Quoting zero is a problem."); +- const char *const nullptr = NULL; +- PQXX_CHECK_EQUAL(t.quote(nullptr), "NULL", "Not quoting NULL correctly."); ++ const char *const null_ptr = NULL; ++ PQXX_CHECK_EQUAL(t.quote(null_ptr), "NULL", "Not quoting NULL correctly."); + PQXX_CHECK_EQUAL(t.quote(string("'")), "''''", "Escaping quotes goes wrong."); + + PQXX_CHECK_EQUAL(t.quote("x"), diff --git a/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild new file mode 100644 index 000000000000..3b393138354f --- /dev/null +++ b/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-3.1-r3.ebuild,v 1.1 2011/11/12 16:58:37 titanofold Exp $ + +EAPI="4" + +inherit eutils + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL." +SRC_URI="http://pqxx.org/download/software/${PN}/${P}.tar.gz" +HOMEPAGE="http://pqxx.org/development/libpqxx/" +LICENSE="BSD" +SLOT="0" +IUSE="doc" + +DEPEND="dev-db/postgresql-base" +RDEPEND="${DEPEND}" + +# src_test is interactive unless PGDATABASE and PGUSER is set either as an +# environment variable or in /etc/libpqxx_test_env +PROPERTIES="interactive" + +src_prepare() { + epatch "${FILESDIR}/libpqxx-3.1-gcc46.patch" +} + +src_configure() { + econf --enable-shared +} + +src_install () { + emake DESTDIR="${D}" install + + dodoc AUTHORS ChangeLog NEWS README* + use doc && dohtml -r doc/html/* +} + +src_test() { + ewarn "The tests need a running PostgreSQL server version 8.4.x or older" + ewarn "and an existing database." + ewarn "Test requires PGDATABASE and PGUSER to be set at a minimum." + ewarn "Optionally, set PGPORT and PGHOST." + ewarn "Define them at the command line or in:" + ewarn " ${EROOT%/}/etc/libpqxx_test_env" + ewarn "Make sure 'standard_conforming_strings' is set to off in postgresql.conf." + + if [[ -z $PGDATABASE || -z $PGUSER ]] ; then + if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then + source "${EROOT%/}/etc/libpqxx_test_env" + [[ -n $PGDATABASE ]] && export PGDATABASE + [[ -n $PGHOST ]] && export PGHOST + [[ -n $PGPORT ]] && export PGPORT + [[ -n $PGUSER ]] && export PGUSER + fi + + # In case the file wasn't written properly or doesn't exist + if [[ -z $PGDATABASE || -z $PGUSER ]] ; then + echo -n "Database (Default: $(whoami)): " + read PGDATABASE + [[ -n $PGDATABASE ]] && export PGDATABASE + echo -n "Host (Default: Unix socket): " + read PGHOST + [[ -n $PGHOST ]] && export PGHOST + echo -n "Port (Default: 5432): " + read PGPORT + [[ -n $PGPORT ]] && export PGPORT + echo -n "User (Default: $(whoami)): " + read PGUSER + [[ -n $PGUSER ]] && export PGUSER + fi + fi + + local server_version + server_version=$(psql -Aqwtc 'SELECT version();' 2> /dev/null) + if [[ $? = 0 ]] ; then + server_version=$(echo ${server_version} | cut -d " " -f 2 | cut -d "." -f -2 | tr -d .) + if [[ $server_version < 90 ]] ; then + cd "${S}/test" + emake check + else + eerror "Server version must be 8.4.x or below." + die "Server version isn't 8.4.x or below" + fi + else + eerror "Is the server running?" + eerror "Check that the role and database exist, and authentication method is set to" + eerror "trust for:" + eerror " Role: ${PGUSER}" + eerror " Database: ${PGDATABASE}" + die "Couldn't connect to server." + fi +} -- 2.26.2