Removed header files installed by libpq package.

Package-Manager: portage-2.0.51.21-r1

6 files changed, 70 insertions, 16 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index eb79ec422d49..23c657229099 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.215 2005/05/09 02:18:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.216 2005/05/09 21:55:20 nakano Exp $
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  files/postgresql-8.0.1-gentoo-libpq.patch,
+  files/postgresql-8.0.2-gentoo-libpq.patch, postgresql-8.0.1-r4.ebuild,
+  postgresql-8.0.2-r2.ebuild:
+  Removed header files installed by libpq package.
 
   09 May 2005; Masatomo Nakano <nakano@gentoo.org>
   postgresql-8.0.1-r4.ebuild, postgresql-8.0.2-r2.ebuild:
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 00815f38b0b9..ea5410eb72cf 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,14 +1,14 @@
 MD5 7c4985fe29bbff02173bccc94a3fafcb postgresql-8.0.2.ebuild 7718
 MD5 0b70c546fd4986361ee6a065538c189a postgresql-8.0.1-r3.ebuild 7784
 MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750
-MD5 bfa894118d3446b9727023b1438a4213 postgresql-8.0.2-r2.ebuild 7783
+MD5 8c2e9ba5641bf05a449974f9884e2bfe postgresql-8.0.2-r2.ebuild 7686
 MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078
 MD5 461bda3ff314acce4f6a587a61864385 postgresql-8.0.1-r2.ebuild 7633
 MD5 337a42d98f8373978cca5e56cbd47ab3 postgresql-8.0.2-r1.ebuild 7854
-MD5 c6911151c69b65271f0eb51cd888ab91 postgresql-8.0.1-r4.ebuild 7967
+MD5 b8f11cab31615b77205d402db0be77bb postgresql-8.0.1-r4.ebuild 7870
 MD5 019be9f5f95384b8ba2f79fce882a3e1 postgresql-7.4.7-r2.ebuild 10901
 MD5 b97f1ff215bab634316e5cf9cee6598e postgresql-7.3.6-r2.ebuild 7869
-MD5 38d8518321d8453ce63a859dcd45e350 ChangeLog 40349
+MD5 548c125092238de12eb8d70c564652d7 ChangeLog 40600
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
@@ -46,6 +46,6 @@ MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
 MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
 MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
-MD5 ce87d1ddcbede115933804b0e0b93a50 files/postgresql-8.0.1-gentoo-libpq.patch 411
+MD5 8ec4fecf36cf856f2d3afc97419c2f93 files/postgresql-8.0.1-gentoo-libpq.patch 1200
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 4a1ecc271a25ae471af1159e702e258c files/postgresql-8.0.2-gentoo-libpq.patch 411
+MD5 34fc1b2cc0f22f15cc94b5d12e0ded48 files/postgresql-8.0.2-gentoo-libpq.patch 1200
diff --git a/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch b/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
index 238dfb04f4f5..726db48e3c44 100644
--- a/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
+++ b/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
@@ -1,6 +1,6 @@
 diff -Naru postgresql-8.0.1.org/src/interfaces/Makefile postgresql-8.0.1/src/interfaces/Makefile
 --- postgresql-8.0.1.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-8.0.1/src/interfaces/Makefile	2005-05-04 11:45:56.000000000 +0100
++++ postgresql-8.0.1/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
 @@ -12,7 +12,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -10,3 +10,30 @@ diff -Naru postgresql-8.0.1.org/src/interfaces/Makefile postgresql-8.0.1/src/int
  
  ALLDIRS := $(DIRS) 
  
+diff -Naru postgresql-8.0.1.org/src/Makefile postgresql-8.0.1/src/Makefile
+--- postgresql-8.0.1.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-8.0.1/src/Makefile	2005-05-09 21:59:54.000000000 +0100
+@@ -18,7 +18,6 @@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+ 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -47,7 +46,6 @@
+ 	$(MAKE) -C port $@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -61,7 +59,6 @@
+ 	-$(MAKE) -C port $@
+ 	-$(MAKE) -C timezone $@
+ 	-$(MAKE) -C backend $@
+-	-$(MAKE) -C include $@
+ 	-$(MAKE) -C interfaces $@
+ 	-$(MAKE) -C bin $@
+ 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch b/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch
index 88adf371e9df..ba4aa175cf69 100644
--- a/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch
+++ b/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch
@@ -1,6 +1,6 @@
 diff -Naru postgresql-8.0.2.org/src/interfaces/Makefile postgresql-8.0.2/src/interfaces/Makefile
 --- postgresql-8.0.2.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-8.0.2/src/interfaces/Makefile	2005-05-04 11:45:56.000000000 +0100
++++ postgresql-8.0.2/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
 @@ -12,7 +12,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -10,3 +10,30 @@ diff -Naru postgresql-8.0.2.org/src/interfaces/Makefile postgresql-8.0.2/src/int
  
  ALLDIRS := $(DIRS) 
  
+diff -Naru postgresql-8.0.2.org/src/Makefile postgresql-8.0.2/src/Makefile
+--- postgresql-8.0.2.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-8.0.2/src/Makefile	2005-05-09 21:59:54.000000000 +0100
+@@ -18,7 +18,6 @@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+ 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -47,7 +46,6 @@
+ 	$(MAKE) -C port $@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -61,7 +59,6 @@
+ 	-$(MAKE) -C port $@
+ 	-$(MAKE) -C timezone $@
+ 	-$(MAKE) -C backend $@
+-	-$(MAKE) -C include $@
+ 	-$(MAKE) -C interfaces $@
+ 	-$(MAKE) -C bin $@
+ 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
index 0a252369fa3c..4e8d16c0ff3f 100644
--- a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.3 2005/05/09 02:18:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.4 2005/05/09 21:55:20 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -141,9 +141,6 @@ src_install() {
 
 	exeinto /usr/bin
 
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
 	cd ${S}/doc
 	dodoc FAQ* README.* TODO bug.template
 	if use doc; then
diff --git a/dev-db/postgresql/postgresql-8.0.2-r2.ebuild b/dev-db/postgresql/postgresql-8.0.2-r2.ebuild
index e35319469f56..209735800e4f 100644
--- a/dev-db/postgresql/postgresql-8.0.2-r2.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.2-r2.ebuild,v 1.3 2005/05/09 02:18:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.2-r2.ebuild,v 1.4 2005/05/09 21:55:20 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -141,9 +141,6 @@ src_install() {
 
 	exeinto /usr/bin
 
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
 	cd ${S}/doc
 	dodoc FAQ* README.* TODO bug.template
 	if use doc; then