Fixed 7.4.21 to install libpgport.a, don't install html-documentation since provided by postgresql-doc (bug #225629).

(Portage version: 2.1.5.4)

6 files changed, 26 insertions, 11 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index c0bc6632ccb7..74556e76aaea 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.7 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.8 2008/06/14 10:42:50 dev-zero Exp $
+
+*postgresql-base-7.4.21-r1 (14 Jun 2008)
+
+  14 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -postgresql-base-7.4.21.ebuild, +postgresql-base-7.4.21-r1.ebuild,
+  postgresql-base-8.0.17.ebuild, postgresql-base-8.1.13.ebuild,
+  postgresql-base-8.2.9.ebuild, postgresql-base-8.3.3.ebuild:
+  Fixed 7.4.21 to install libpgport.a, don't install html-documentation
+  since provided by postgresql-doc (bug #225629).
 
 *postgresql-base-8.3.3 (13 Jun 2008)
 *postgresql-base-8.2.9 (13 Jun 2008)
diff --git a/dev-db/postgresql-base/postgresql-base-7.4.21.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.21-r1.ebuild
index 2b752f38d4b4..6b50f5dc8f3f 100644
--- a/dev-db/postgresql-base/postgresql-base-7.4.21.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-7.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.21.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.21-r1.ebuild,v 1.1 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -72,7 +72,7 @@ src_compile() {
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
 		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
+		--docdir=/usr/share/doc/${PF} \
 		--without-tcl \
 		--without-perl \
 		--without-python \
@@ -96,9 +96,15 @@ src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	insinto /usr/include/postgresql-${SLOT}/postmaster
 	doins "${S}"/src/include/postmaster/*.h
+
+	# Install missing libpgport.a
+	insinto /usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+	doins "${S}/src/port/libpgport.a"
+
 	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 -rf "${D}/usr/share/doc/${PF}/html"
 	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,initlocation,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
diff --git a/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild
index 34033b2b2eaf..4677bb441cb6 100644
--- a/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.17.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.0.17.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -72,7 +72,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--without-tcl \
 		--without-perl \
 		--without-python \
diff --git a/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild
index ae4feb0c725c..835f35fa6e8b 100644
--- a/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1.13.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.1.13.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -72,7 +72,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--without-tcl \
 		--without-perl \
 		--without-python \
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild
index e9f3e3555e49..9763b921f36b 100644
--- a/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.2.9.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.9.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -73,7 +73,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--enable-depend \
 		--without-tcl \
 		--without-perl \
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild
index 961ab2d24792..969de0a2e97c 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.3.ebuild,v 1.1 2008/06/13 21:46:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.3.ebuild,v 1.2 2008/06/14 10:42:50 dev-zero Exp $
 
 EAPI="1"
 
@@ -73,7 +73,7 @@ src_compile() {
 		--includedir=/usr/include/postgresql-${SLOT} \
 		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--with-docdir=/usr/share/doc/${PF} \
+		--without-docdir \
 		--enable-depend \
 		--without-tcl \
 		--without-perl \