dev-db/postgresql-server: Added uuid USE-flag, dependency and modified patch. Had to drop all keywords besides ~amd64 and ~x86.

svn path=/experimental/; revision=351

4 files changed, 25 insertions, 6 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index da569e9..a0069e9 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-server-8.3.1.ebuild, files/postgresql-8.3-server.patch:
+  Added uuid USE-flag, dependency and modified patch. Had to drop all keywords
+  besides ~amd64 and ~x86.
+
   27 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-server-8.3.1.ebuild:
   Will now use system's zoneinfo. Added $(use_with xml libxslt).
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 7ef1d9d..f82fb1c 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -13,7 +13,7 @@ AUX postgresql-8.1-server.patch 6471 RMD160 6670d072e6ec4b536b9a5aa9cea8f6c02f20
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-8.2-server.patch 4849 RMD160 a1f625e9d0d19acaae63e75084185e32623dbcf6 SHA1 a481e9500cc8484a1bc454820aae5b8603451ba2 SHA256 be4ccf88103e92c5adcb065d3aaf10b9e60fad1962993d255965a6260ea3f595
 AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
-AUX postgresql-8.3-server.patch 5798 RMD160 a91841ff9a3446d276839bb4bbac1716002c8c9a SHA1 8519967bbc3f3ae0dc8f12089e3580ee79015290 SHA256 91a8b73a4eb917af1e3ecf32baf8b26ec2b861d94b1319ce356132252a23de5b
+AUX postgresql-8.3-server.patch 6191 RMD160 d50a2fc599db9c9d8041e9366a9ffc75d5230490 SHA1 7f1c78854440fff2982dde51057055ba55772a2f SHA256 2af33956fc13949204f340aca6999a6adc999dcc1a9d3405b7c3503e2c95cf08
 AUX postgresql.conf-7.3 1515 RMD160 d2a5175d176bb1039a195c61762464769e86266a SHA1 7b33b242c5aa39bb56917b216aa7495c8cb3d100 SHA256 9e93fe9780bea82c9ef31f311cb556737aa940f749edf3d2a7f8dc36e12e93a4
 AUX postgresql.conf-7.4 1515 RMD160 6e5ffcdc845b13061a565021d09926f7fcf63c94 SHA1 ca6f8a32c6d91bc57336930b1f91feb5cd4c0fdb SHA256 9aeb9dae2e058804fd3e821b10cf620dc9cbd54cae94f8bc5eb34950badd4125
 AUX postgresql.conf-8.0 1515 RMD160 e866990bd42af8941f95bec7df1a325aff5f89b6 SHA1 ab7aee171705e3f74c93014d5519569fcc9a885e SHA256 68044a2a7e000691b2ed0995b3176c0b5507af1e9a395b24d104c16c66ad7d42
@@ -37,6 +37,6 @@ EBUILD postgresql-server-7.4.19.ebuild 7771 RMD160 b9d086687680e477256b39f148097
 EBUILD postgresql-server-8.0.15.ebuild 7967 RMD160 98623ab4e26874b90d2befec864f967387e821eb SHA1 d32df8948592b46345efde8d7285f4a3759160b9 SHA256 d941f29028c4f84ea8174bf05aa5b84fa72b46110d4d95f4d8c2c3231d4465c7
 EBUILD postgresql-server-8.1.11.ebuild 8088 RMD160 c81b49aba166f90faf87b5ae278763cd09fe30e6 SHA1 2f2b0d475775ee412cc72703f9c7841b443abc03 SHA256 83172e0cf272926ca9715511a0ca00301e738b643c4d50ea66d6d46c418146e0
 EBUILD postgresql-server-8.2.7.ebuild 8318 RMD160 e130264005bb0c8a0e17d8814e1de510b84908ad SHA1 a1519eebba917ca9b9e2b3e0ebfd2a2e3286f7a7 SHA256 fac930c548d777292622f6c0c663015eb15bcec9715bc31b62f37d9c540ffe5a
-EBUILD postgresql-server-8.3.1.ebuild 8420 RMD160 78d6525fbf4f3824d4923d43433a049e3fcf337d SHA1 d61afee75af28bfaa51d1101157d16b3dc59549e SHA256 0823278237489fafc8b378b322696003cab10f0533bc43e6308c8aa23b1a3eab
-MISC ChangeLog 3818 RMD160 6449695d84742ccd0f2eebdac5ea16e788c797d5 SHA1 6cb5708447bfce866dbdb2d4fa428f301698fd30 SHA256 0d646cbf80bce109b59a132f420ee14852f38d94562947968f4e7402470469b7
+EBUILD postgresql-server-8.3.1.ebuild 8405 RMD160 5464f4cef89fe6a3219b5ba32e814056d88283bc SHA1 a5d5047e6f1b44fd82a96d5a64e76c1f04f532ee SHA256 f82e485e5c095fcf9c12ad41eadad7d680260587b6e8f6cf7bd283fa2116febc
+MISC ChangeLog 4047 RMD160 197cebd2759cb7e1aad162c80ec8d4c0621dcdfd SHA1 a330052b7228e5cb034ac35b34c8bb8497d81039 SHA256 caaa0792e3ac044cacf80a4638e400e47a8954b2effdee196eba4b4c73ec677e
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
index c8e6f0b..061c81e 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -63,6 +63,18 @@
  DATA_built = adminpack.sql
  DATA = uninstall_adminpack.sql
  OBJS = adminpack.o
+=== contrib/uuid-ossp/Makefile
+==================================================================
+--- contrib/uuid-ossp/Makefile	(revision 12)
++++ contrib/uuid-ossp/Makefile	(local)
+@@ -1,5 +1,7 @@
+ # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
+ 
++PG_CPPFLAGS="-DHAVE_OSSP_UUID_H"
++
+ MODULE_big = uuid-ossp
+ OBJS = uuid-ossp.o
+ DATA_built = uuid-ossp.sql
 === src/Makefile
 ==================================================================
 --- src/Makefile	(revision 12)
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild
index 0f0b719..1d4a7f2 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils multilib toolchain-funcs versionator autotools
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="PostgreSQL server"
 HOMEPAGE="http://www.postgresql.org/"
@@ -20,7 +20,7 @@ IUSE_LINGUAS="
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
 	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
 	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}"
+IUSE="doc perl python selinux tcl uuid xml nls kernel_linux ${IUSE_LINGUAS}"
 
 wanted_languages() {
 	for u in ${IUSE_LINGUAS} ; do
@@ -33,6 +33,7 @@ RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
 		tcl? ( >=dev-lang/tcl-8 )
+		uuid? ( dev-libs/ossp-uuid )
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )"
@@ -87,12 +88,13 @@ src_compile() {
 		$(use_with tcl) \
 		$(use_with xml libxml) \
 		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
 		--with-system-tzdata="/usr/share/zoneinfo" \
 		--with-includes="/usr/include/postgresql-${SLOT}/" \
 		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		|| die "configure failed"
 
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+	for bd in . contrib $(use xml && echo contrib/xml2); do
 		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \