Changing pg-intdatetime to pg_legacytimestamp useflag since upstream changed defaults and deprecated the old behaviour. See #285475 #290535

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 166 insertions, 5 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index c54298f1a268..ee6d44f83e72 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/postgresql-base
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.33 2009/12/14 18:56:21 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.34 2010/01/07 00:23:37 patrick Exp $
+
+*postgresql-base-8.4.2-r1 (07 Jan 2010)
+
+  07 Jan 2010; Patrick Lauer <patrick@gentoo.org>
+  +postgresql-base-8.4.2-r1.ebuild, metadata.xml:
+  Changing pg-intdatetime to pg_legacytimestamp useflag since upstream
+  changed defaults and deprecated the old behaviour. See #285475 #290535
 
 *postgresql-base-8.4.2 (14 Dec 2009)
 *postgresql-base-8.3.9 (14 Dec 2009)
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 30a33195b9ea..b0da9ef92ce7 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -44,6 +44,7 @@ EBUILD postgresql-base-8.2.15.ebuild 4610 RMD160 9bade0d9dbd3d4a249dbdbed85aa73f
 EBUILD postgresql-base-8.3.8.ebuild 4683 RMD160 0d5b751ff040d568fa79a4f254a22832cc9cdd22 SHA1 e8e8f76ad7d2fc206b3dc03e640194167e5c2a44 SHA256 70d0fc67b463da21a8bf6d84a5a3549d72e89485c5084fb0aabb0ec5d370213c
 EBUILD postgresql-base-8.3.9.ebuild 4689 RMD160 d0be1203f8a4246d45c39037b7d3b458cb95e92b SHA1 2b656d3a11703c4b70cf52e127637787291a6066 SHA256 977ef85c2b0c2a239fc5bd99be6559d1a7c05cde9edb081986107e2d45a03d19
 EBUILD postgresql-base-8.4.1.ebuild 4648 RMD160 7aef353bea9dc29e167e4158caea88c629f395db SHA1 65b22d08c1d9742094c58b23d691cebe0536b59c SHA256 60bf072bfabdf544787f525f1bd126584125df6b05667e176dc5598ec1983837
+EBUILD postgresql-base-8.4.2-r1.ebuild 4664 RMD160 bc0d46002af4fc85b89ab5e0a52a861b1d733a23 SHA1 0857f452d269b9ed31e459a0fe697b2675e00651 SHA256 ac5b97470f0114f82714b87fa2e601abc41c008ee78f3aa22a6bae5dec328efc
 EBUILD postgresql-base-8.4.2.ebuild 4653 RMD160 efbf00eb99ecad73f56bf36bc875dda0a8d5cd99 SHA1 1cbe22c4c4fcb3bbc76c2f6d206b4eaa47818feb SHA256 824d96dea794cb039b007c1bf440212b49922e13f08a1650dcd32aaa551af72f
-MISC ChangeLog 13521 RMD160 f7a9c02271d546dc9a8e3825a959ac194fca6333 SHA1 4cf047e7ff0615304a8c594f5414e5b284bf3b82 SHA256 dbdee0f7b3203579fa06809d0a9a5b1f70f8cc2ebb81f21ba3b1fe3d240f0a3e
-MISC metadata.xml 329 RMD160 3b8f9c5e1c05696380c649d2f4f6eb3f1d3b688b SHA1 d7d9e8fbd6a509c5016fc764ccc4239af8feb5b8 SHA256 d9eed0f3b1f204ace8472c343d526d6c949124b5fe5ab8174b2e555712b3e831
+MISC ChangeLog 13807 RMD160 4ac17d4099b53346a270c6be913a165c0368c1b8 SHA1 fbffe32732a1f440a7c270be9ba3ceda00dcb9cc SHA256 d5a44246f8ee214ac76ca51a839491477e8c5525fe9dbb534f38589ab657080f
+MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
diff --git a/dev-db/postgresql-base/metadata.xml b/dev-db/postgresql-base/metadata.xml
index 407f0f0f6a64..e54061ed45eb 100644
--- a/dev-db/postgresql-base/metadata.xml
+++ b/dev-db/postgresql-base/metadata.xml
@@ -5,5 +5,9 @@
 <use>
   <flag name='pg-intdatetime'>Enable --enable-integer-datetimes configure
   option, which changes PG to use 64-bit integers for timestamp storage</flag>
+  <flag name='pg_legacytimestamp'>Use double precision floating-point numbers
+    instead of 64-bit integers for timestamp storage.
+  </flag>
+
 </use>
 </pkgmetadata>
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.2-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.2-r1.ebuild
new file mode 100644
index 000000000000..77b018b3d328
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.2-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.2-r1.ebuild,v 1.1 2010/01/07 00:23:37 patrick Exp $
+
+EAPI="1"
+
+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 ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+SLOT="$(get_version_component_range 1-2)"
+IUSE_LINGUAS="
+	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
+	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 kerberos nls pam readline ssl threads zlib ldap pg_legacytimestamp ${IUSE_LINGUAS}"
+RESTRICT="test"
+
+wanted_languages() {
+	for u in ${IUSE_LINGUAS} ; do
+		use $u && echo -n "${u#linguas_} "
+	done
+}
+
+RDEPEND="kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )
+	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	>=app-admin/eselect-postgresql-0.3
+	virtual/libintl
+	!dev-db/postgresql-libs
+	!dev-db/postgresql-client
+	!dev-db/libpq
+	!dev-db/postgresql
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=sys-devel/bison-1.875
+	nls? ( sys-devel/gettext )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-base.patch"
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
+
+	eautoconf
+}
+
+src_compile() {
+	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=/usr/share/postgresql-${SLOT} \
+		--docdir=/usr/share/doc/postgresql-${SLOT} \
+		--sysconfdir=/etc/postgresql-${SLOT} \
+		--includedir=/usr/include/postgresql-${SLOT} \
+		--mandir=/usr/share/postgresql-${SLOT}/man \
+		--enable-depend \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with readline) \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable pg_legacytimestamp integer-datetimes ) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_enable threads thread-safety-force) \
+		$(use_with zlib) \
+		$(use_with ldap) \
+		${myconf} \
+		|| die "configure failed"
+
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed"
+
+	cd "${S}/contrib"
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+	dodir /usr/share/postgresql-${SLOT}/man/man1
+	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
+
+	rm -r "${D}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	IDIR="/usr/include/postgresql-${SLOT}"
+	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
+postgres_ebuilds="\${postgres_ebuilds} ${PF}"
+postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
+postgres_datadir=/usr/share/postgresql-${SLOT}
+postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
+postgres_symlinks=(
+	${IDIR} /usr/include/postgresql
+	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
+	${IDIR}/libpq /usr/include/libpq
+	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
+)
+__EOF__
+
+	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
+		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=/usr/share/postgresql-${SLOT}/man
+	__EOF__
+	doenvd "${T}/50postgresql-94-${SLOT}"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	eselect postgresql update
+	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
+	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'."
+}
+
+pkg_postrm() {
+	eselect postgresql update
+}
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index cee154a871cb..0cc29262d306 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -60,6 +60,7 @@ EBUILD postgresql-server-8.3.8.ebuild 9658 RMD160 6c0341165360cf96769fde60ef6032
 EBUILD postgresql-server-8.3.9.ebuild 9664 RMD160 b5a693c91368e55eb71d2414d49e21d1dbe3f53e SHA1 107351f8747311c276c4246a31901d55e4d32480 SHA256 56857d417e877493af4e4ecbef496d8db34b420b86d8a097a13139aa3b05bfde
 EBUILD postgresql-server-8.4.1-r1.ebuild 9289 RMD160 eb23bb907a795cbfd42e7403b044308c6fc4c7bb SHA1 5da0218a0e17bc5660c32cd9ae974a7a6bd52279 SHA256 129a39092a2102e408996960e97ad1bb4b580abade70e0a010a9e3d74af5b899
 EBUILD postgresql-server-8.4.1.ebuild 9209 RMD160 3c15e8ae3077b822873216a849c833f6519ca0e8 SHA1 0f81518e140d8bbad36cb8f49ef348ab387b0ec1 SHA256 a1c1fe8c6e8f2bbf3ed05c9ceca4a3f6c7afb1aaa5cb4e6b54deb5e7074ac153
+EBUILD postgresql-server-8.4.2-r1.ebuild 9344 RMD160 3503ea759dc50caeedf52b4b56af32256acc970f SHA1 3ba36b121153c9ab9f0b085781305c3dc53afa03 SHA256 f64307394fe9e3bd919b8129da2e37cfd4ce5f4ee94224c605b77ae66a17aa76
 EBUILD postgresql-server-8.4.2.ebuild 9291 RMD160 faf1c8424ee6d792a08d343eaf66d3c90b800bf6 SHA1 f196428b79367505865fe32c516fd018d4277451 SHA256 27705306379f12ce6ceb21f78e375d2ccda6d74dc9dfd3453cfbdc5b53a0d95d
-MISC ChangeLog 16955 RMD160 d7056ae4ee6cd777af65cb6ede188b585f101add SHA1 d4eac8e3dfecfeb6f7a23e28816b6b17ff36c192 SHA256 1375f867110f91b327b07c512afd8a9874585691a68c0c83e2a1177fccb97063
+MISC ChangeLog 17196 RMD160 edd4a157ffaab727a65e2120258e13a4ff1ff3c3 SHA1 9c1e00a604e557301506b8d6371a615d0fcbfb27 SHA256 2ffa77c93cc4b6a21cdd8aba0b088581dc94d93c97bb67ecd3db94229549f54c
 MISC metadata.xml 278 RMD160 70d8f6a6bc3d6619380cee3c0bc2179cf6a5bf28 SHA1 ca266604cf761d9ea76b5ec298ac553156c1c21e SHA256 0ec3e7bdc08e61c19df6ef7f5a1a5a2d2aeabb001c2efca4bdfe947e71a450b0