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

(Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)

5 files changed, 46 insertions, 8 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/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) \