summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-04-23 18:42:05 +0000
committerFabian Groffen <grobian@gentoo.org>2011-04-23 18:42:05 +0000
commit72b0cfc50cd4bfe1728e79032b4cd8f25c1b3b0f (patch)
treef9b1e4961ddc7ecdd5ca9553d8b996a605677c24 /dev-db
parentFix changelog (diff)
downloadgentoo-2-72b0cfc50cd4bfe1728e79032b4cd8f25c1b3b0f.tar.gz
gentoo-2-72b0cfc50cd4bfe1728e79032b4cd8f25c1b3b0f.tar.bz2
gentoo-2-72b0cfc50cd4bfe1728e79032b4cd8f25c1b3b0f.zip
Fixed for and marked ~ppc-macos
(Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/postgresql-base/ChangeLog7
-rw-r--r--dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch14
-rw-r--r--dev-db/postgresql-base/postgresql-base-9.0.4.ebuild5
-rw-r--r--dev-db/postgresql-base/postgresql-base-9.1_alpha5.ebuild5
4 files changed, 26 insertions, 5 deletions
diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 5dd6429e4b9d..1a8708db87ee 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-db/postgresql-base
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.115 2011/04/23 17:50:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.116 2011/04/23 18:42:04 grobian Exp $
+
+ 23 Apr 2011; Fabian Groffen <grobian@gentoo.org>
+ postgresql-base-9.0.4.ebuild, +files/postgresql-base-9.0.4-stdbool.patch,
+ postgresql-base-9.1_alpha5.ebuild:
+ Fixed for and marked ~ppc-macos
23 Apr 2011; Fabian Groffen <grobian@gentoo.org>
postgresql-base-9.0.3.ebuild, postgresql-base-9.0.3-r1.ebuild,
diff --git a/dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch b/dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch
new file mode 100644
index 000000000000..989cf92ba5a3
--- /dev/null
+++ b/dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch
@@ -0,0 +1,14 @@
+Darwin defines bool to something on G5 with AltiVec
+
+--- src/include/c.h
++++ src/include/c.h
+@@ -76,6 +76,9 @@
+ #include <stdint.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __APPLE_CC__
++#undef bool
++#endif
+
+ #include <errno.h>
+ #if defined(WIN32) || defined(__CYGWIN__)
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.4.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.4.ebuild
index 10ef88749103..e6c220f7e78d 100644
--- a/dev-db/postgresql-base/postgresql-base-9.0.4.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-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-base/postgresql-base-9.0.4.ebuild,v 1.2 2011/04/23 17:50:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.4.ebuild,v 1.3 2011/04/23 18:42:04 grobian Exp $
EAPI="4"
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic multilib prefix versionator
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
DESCRIPTION="PostgreSQL libraries and clients"
HOMEPAGE="http://www.postgresql.org/"
@@ -63,6 +63,7 @@ PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
src_prepare() {
epatch "${WORKDIR}/autoconf.patch" \
"${WORKDIR}/base.patch"
+ epatch "${FILESDIR}"/${P}-stdbool.patch
eprefixify src/include/pg_config_manual.h
diff --git a/dev-db/postgresql-base/postgresql-base-9.1_alpha5.ebuild b/dev-db/postgresql-base/postgresql-base-9.1_alpha5.ebuild
index 05b85afeebca..d7604b8f75fe 100644
--- a/dev-db/postgresql-base/postgresql-base-9.1_alpha5.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9.1_alpha5.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-base/postgresql-base-9.1_alpha5.ebuild,v 1.2 2011/04/23 17:50:54 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.1_alpha5.ebuild,v 1.3 2011/04/23 18:42:04 grobian Exp $
EAPI="4"
@@ -8,7 +8,7 @@ WANT_AUTOMAKE="none"
inherit autotools eutils flag-o-matic multilib prefix versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
# Upstream doesn't have an underscore in the file name
MY_PV=${PV/_/}
@@ -63,6 +63,7 @@ PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
src_prepare() {
epatch "${WORKDIR}/autoconf.patch" \
"${WORKDIR}/base.patch"
+ epatch "${FILESDIR}"/${PN}-9.0.4-stdbool.patch
eprefixify src/include/pg_config_manual.h