Fixed for and marked ~ppc-macos and ~x86-solaris

Package-Manager: portage-2.2.01.18252-prefix/cvs/Darwin powerpc

6 files changed, 56 insertions, 17 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index f67899d8215f..6e64b0ec6525 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.121 2011/04/20 04:32:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.122 2011/04/24 09:36:30 grobian Exp $
+
+  24 Apr 2011; Fabian Groffen <grobian@gentoo.org>
+  postgresql-server-9.0.3-r4.ebuild, postgresql-server-9.0.4.ebuild,
+  +files/postgresql-server-9.0.4-bool.patch,
+  postgresql-server-9.1_alpha5-r1.ebuild:
+  Fixed for and marked ~ppc-macos and ~x86-solaris
 
 *postgresql-server-9.0.4 (20 Apr 2011)
 *postgresql-server-8.4.8 (20 Apr 2011)
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index be994bf9ac76..27a7733c7ed9 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-8.2-server.patch 5319 RMD160 9aae5832defd2e43879246e773fd1aada0680716 SHA1 ea726704fc85118c27f511bfd9324b136ced3eb1 SHA256 2687fa5159a34da59e36af4c894f43b2136e8e88c965a682607cb48acb61d8ee
@@ -14,6 +14,7 @@ AUX postgresql-9.0-makefile.patch 468 RMD160 0f6d1d393e224b1c566c167af439e6eb0b2
 AUX postgresql-9.0-server.2.patch 8189 RMD160 28b1997935c933abe49a60fd07f10bcf08399e02 SHA1 8718e972b94a61438b81d6f449074cf45d1be8c4 SHA256 a4cc1163c37187b97143d53d44997ad71c3766f41dff04baaad09f2f6cbdd773
 AUX postgresql-9.0-server.3.patch 8076 RMD160 03883f576e9307876fa47236b498f0dd9e833d8f SHA1 bc640b3bafff25d21bb1f274b3e1d05bc00bc474 SHA256 0e0c13d3cea708dc5d512a53ace1b77ff3c94f2cde98815e417cc2fba70481c7
 AUX postgresql-9.0-server.patch 8149 RMD160 c0d49200afe500f74ae1e9f205b236de2c1fcf82 SHA1 3bcc8a0f6745b7579ba3bb132e84095c2de96333 SHA256 bd7a8ec7c6b9b16813837b2609646103e9663c3dc77e9b089230718f30e4e6c4
+AUX postgresql-server-9.0.4-bool.patch 557 RMD160 d8bf0b91e8a48e3dac74fbc4a2e10606c9570b03 SHA1 5e3bc041f0a06498ba4675fea0f1d23018bcdade SHA256 863066ff81163c7dc91ab8bf51bf673eabbe59ea32330de6fc03fee300967dc5
 AUX postgresql.conf-8.2 1725 RMD160 9f52e0262bdbc42bef1847e986a303b4462d3b2e SHA1 7f3765371e38b6a3c14c7a89bdc7cb548b3b98bb SHA256 e0101dfd82cb3e4362a2563cc75b76cb822b0ccc1b5958b92bdc16b4e1af9aea
 AUX postgresql.conf-8.2-r1 1510 RMD160 7801c8e338975851e19b12d532d4f17366460fc6 SHA1 a301104fcdc7d80942c0f7d227b654c466302890 SHA256 fed7efa0142fc6b37b4648cf38cf0c2f385ec29b1d2a9ec57ba7183ecf0847a3
 AUX postgresql.conf-8.3 1725 RMD160 5bdd027b82013feddcba5d68c09e4122e219ecd2 SHA1 c1bc9ba72623efa12bfad55a0e12a57350955409 SHA256 15cb0f8052d0ecc1bced449777f76875c06ab088f67c1f7f3148b84e97082233
@@ -83,19 +84,19 @@ EBUILD postgresql-server-9.0.1.ebuild 10183 RMD160 ea6fd12a8f09c7699aa778d5c98bb
 EBUILD postgresql-server-9.0.2.ebuild 10183 RMD160 a689f44bb8d4e14a43605b6774775d86b8fcc254 SHA1 2006f9f68db8b39dd7e4969e7a021cc4713eb8dd SHA256 415f2ca5433850e7a8d9e0c35b5f8991ba78981cc7fc6699e4736e1a20681ecc
 EBUILD postgresql-server-9.0.3-r2.ebuild 10530 RMD160 8dc31becc37884734e56eb1e2e77f5b2a2207370 SHA1 1df9adfeb704eb5f55a2015238bdb0795cabb92a SHA256 ead8e90d77b2fe9721582de4f9f769a8d7109e10a7060ab559f8b697e3b08eb4
 EBUILD postgresql-server-9.0.3-r3.ebuild 10502 RMD160 1299bdd675ee30f5b4300fd36b539fa72febf616 SHA1 100f89b581710dc90da64d289799dce622643a82 SHA256 297990616ece1ceeb5a071a4c997fece7ea55ed36580fc4d105837d3e406f66e
-EBUILD postgresql-server-9.0.3-r4.ebuild 11179 RMD160 1e52d10cc6cda7d59fda1e85eadaca26b0762990 SHA1 0c0b56a1f1bdede2e0bba33f6bb2afbcaf753eff SHA256 f87b8d48690a0d3af4418a89b37735c04381abe05d83a9f5ff1a41b92cd8a27a
+EBUILD postgresql-server-9.0.3-r4.ebuild 11189 RMD160 a85a43afee2ff5855097defb4940f9d20d8a19e0 SHA1 17527bd6fab5c0b31afcd4b498fbc1d52a3a577d SHA256 f71d342db8cb97e9c9a61c927901ecb2c8f9da4d30ae1f0542a165673fd4b099
 EBUILD postgresql-server-9.0.3.ebuild 10178 RMD160 65da0866e062f1254e5e082aa3d6e5460035c972 SHA1 629aba6be85464b7e32548e05accc1cb86eeada9 SHA256 5f931b0c7a5ba5265cc1e3386243e18bba02fa1ff415b79d9f78ecbb5d3734de
-EBUILD postgresql-server-9.0.4.ebuild 10961 RMD160 43173acd51d298c83399d41e6193c8bb93b8990e SHA1 fff7bf4393309ba3a1c1afe36730b51536e3e6f0 SHA256 7f2f485498a5c7e244ddd5641a2b76cd408280c591002900b582077b9dec3180
+EBUILD postgresql-server-9.0.4.ebuild 11020 RMD160 4ed520c4c824e7fc6e55a781e49c090e2b0f7d57 SHA1 e3c8cfc898250252355361c8a4611575987012ec SHA256 b8a74faaf643f826ebd91c84863eeef7c95e9824017249d314c866b2b85efc17
 EBUILD postgresql-server-9.1_alpha4-r1.ebuild 10312 RMD160 8bd10acf58d0c370156d630be4d0b0d21fdfdf3e SHA1 798e8cec3f462db93c7427dccb561b31e1f4e298 SHA256 227d1db1609dfdf9ccf75ecd7648b1916bd18ef37fa08843568f3879706650c2
 EBUILD postgresql-server-9.1_alpha4.ebuild 10337 RMD160 bd2fdab0f859120ca077594ebbda4c3c428f9509 SHA1 f18528e8a27f21004f464b0139c05c71d9767cdb SHA256 230a1f29d8965a32e5557ef235ea2fd53c085ef383d935a50195f575f8d08f4a
-EBUILD postgresql-server-9.1_alpha5-r1.ebuild 10915 RMD160 5bb67909ab473f2cbe1126b4b1d27512135d1822 SHA1 2058cd4c8d61b816f1eb040457eaa0e7c814ceb0 SHA256 868bb35e8a2f8d21c6f6328bb93cf6beeb2096a2db64145a6494dff405122d0c
+EBUILD postgresql-server-9.1_alpha5-r1.ebuild 11078 RMD160 aedfa686737daeceafcf73fd207fe28aad48ddec SHA1 d9cc53536e6b602624cdf0a8b0f9d1fb446a697c SHA256 1be1c517606b9ade4008fe174e2681042e697983323ee4a1b3aab40ec597da0a
 EBUILD postgresql-server-9.1_alpha5.ebuild 10852 RMD160 0f8d03a524ea30389137fb1e31436484476e5058 SHA1 9ed72b70b8b26e51767ff3984e483ebd8c190b50 SHA256 06b24f6f64b950ac4811cbc42836ffe84d8ef7488319a76f7a421e4c0684d4cc
-MISC ChangeLog 38873 RMD160 a6225a3f0e5e59936b1d21d4cb30edc22bbee9d7 SHA1 3f5e62ba1b1d149f296527cde575c4025cd200eb SHA256 ccff17706b7c958b6ad28d3bcbed2f4b5db51c473eb51c2b58e8f0f4c26ff40e
+MISC ChangeLog 39129 RMD160 328359e27aa86056a7338eab29738945e1cbce6b SHA1 008c71503a4d2ca1e25bc88d61192c659d64fcd0 SHA256 651d458c46ceeef37a112f749c6a1cc286546758b311a5d50216d04cda6caf7c
 MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (Darwin)
 
-iF4EAREIAAYFAk2uYf0ACgkQCOhwUhu5AElbpAEAr5bz8IZNOaingxfF1Qt0NBc5
-KtD6vbgLPyPcsh7nTpkA/11zGOk9q4b6s8FvHDlYYbcCf2HGITHkK45nuvTk7jsq
-=y0uV
+iEYEARECAAYFAk2z7y0ACgkQX3X2B8XHTonZwwCfXTlo4e75nCdNwows3jELbU2S
+G7wAoJHfQ4ToMaWelMDjTWeNg3aIftIC
+=JFIg
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-server/files/postgresql-server-9.0.4-bool.patch b/dev-db/postgresql-server/files/postgresql-server-9.0.4-bool.patch
new file mode 100644
index 000000000000..5268ea1d0a16
--- /dev/null
+++ b/dev-db/postgresql-server/files/postgresql-server-9.0.4-bool.patch
@@ -0,0 +1,25 @@
+--- src/include/c.h
++++ src/include/c.h
+@@ -85,6 +85,10 @@
+ #include <SupportDefs.h>
+ #endif
+ 
++#ifdef __APPLE_CC__
++#undef bool
++#endif
++
+ #if defined(WIN32) || defined(__CYGWIN__)
+ /* We have to redefine some system functions after they are included above. */
+ #include "pg_config_os.h"
+--- src/test/thread/thread_test.c
++++ src/test/thread/thread_test.c
+@@ -23,6 +23,9 @@
+ #if !defined(IN_CONFIGURE) && !defined(WIN32)
+ #include "postgres.h"
+ #else
++#ifdef __APPLE_CC__
++#undef bool
++#endif
+ /* From src/include/c.h" */
+ #ifndef bool
+ typedef char bool;
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.3-r4.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.3-r4.ebuild
index e69eff347742..0f05a20b67bc 100644
--- a/dev-db/postgresql-server/postgresql-server-9.0.3-r4.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.0.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.3-r4.ebuild,v 1.1 2011/04/12 00:11:12 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.3-r4.ebuild,v 1.2 2011/04/24 09:36:30 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -10,7 +10,7 @@ inherit autotools eutils multilib pam prefix python versionator
 
 SLOT="$(get_version_component_range 1-2)"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 
 DESCRIPTION="PostgreSQL server"
 HOMEPAGE="http://www.postgresql.org/"
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.4.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.4.ebuild
index de6b0facfa2c..252aa67af332 100644
--- a/dev-db/postgresql-server/postgresql-server-9.0.4.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.4.ebuild,v 1.1 2011/04/20 04:32:44 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.4.ebuild,v 1.2 2011/04/24 09:36:30 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -10,7 +10,7 @@ inherit autotools eutils multilib pam prefix python versionator
 
 SLOT="$(get_version_component_range 1-2)"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 DESCRIPTION="PostgreSQL server"
 HOMEPAGE="http://www.postgresql.org/"
@@ -62,6 +62,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${WORKDIR}/autoconf.patch" \
 		"${WORKDIR}/server.patch"
+	epatch "${FILESDIR}"/${P}-bool.patch
 
 	eprefixify src/include/pg_config_manual.h
 
diff --git a/dev-db/postgresql-server/postgresql-server-9.1_alpha5-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.1_alpha5-r1.ebuild
index 682f6f146cff..fba170d59ded 100644
--- a/dev-db/postgresql-server/postgresql-server-9.1_alpha5-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.1_alpha5-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1_alpha5-r1.ebuild,v 1.1 2011/04/12 00:26:37 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1_alpha5-r1.ebuild,v 1.2 2011/04/24 09:36:30 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
 
 WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
+inherit autotools eutils flag-o-matic multilib pam prefix python versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 # Upstream doesn't have an underscore in the file name
 MY_PV=${PV/_/}
@@ -62,6 +62,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${WORKDIR}/autoconf.patch" \
 		"${WORKDIR}/server.patch"
+	epatch "${FILESDIR}"/${PN}-9.0.4-bool.patch
 
 	eprefixify src/include/pg_config_manual.h
 
@@ -77,6 +78,11 @@ src_prepare() {
 }
 
 src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+		;;
+	esac
 	# eval is needed to get along with pg_config quotation of space-rich entities.
 	eval econf "$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
 		$(use_with perl) \