dev-db/postgresql-base: Fixed the names of the env.d-files. Fixed postgresql-7.4-base by really using the -base.patch now instead of -libs.patch which made the tests for postgresql-7.4-server fail.

svn path=/experimental/; revision=330

10 files changed, 35 insertions, 128 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index ae09b26..b5e20f6 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-base-7.3.21.ebuild, files/postgresql-7.3-base.patch,
+  postgresql-base-7.4.19.ebuild, files/postgresql-7.4-base.patch,
+  -files/postgresql-7.4-libs.patch, postgresql-base-8.0.15.ebuild,
+  postgresql-base-8.1.11.ebuild, postgresql-base-8.3.0.ebuild:
+  Fixed the names of the env.d-files. Fixed postgresql-7.4-base by really
+  using the -base.patch now instead of -libs.patch which made the tests for
+  postgresql-7.4-server fail.
+
   10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-base-7.3.21.ebuild, files/postgresql-7.3-base.patch,
   postgresql-base-7.4.19.ebuild, files/postgresql-7.4-base.patch:
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index ae67c21..c2adfa4 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -1,9 +1,8 @@
-AUX postgresql-7.3-base.patch 3148 RMD160 30d710e093ae290a5a6eba396e55fc50f209f961 SHA1 621e798bb24d77e18a4da30dbe2d4c818a3c2bfe SHA256 19234809c23dfe42591d2156d55aa2be54bb9ece007b41dc3b545fba60cee391
+AUX postgresql-7.3-base.patch 3147 RMD160 9c2bbc8ca790783c6bdf5358b90351488aad7e6d SHA1 882781ea835884a64aa0dcd473d5b5fd50bbe210 SHA256 e2c42573d4bd509d9be9a040912ef6a6f4c828a441de3fe4e44169d2d216d55b
 AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8
-AUX postgresql-7.4-base.patch 3191 RMD160 12c14929807a0c8d3850dc319b4c371bff8dc543 SHA1 675cfc2d349d9f3fe47f58e07d63d51e6126b266 SHA256 8a0b79f97f4c7e8d2e1b48ec4223acd0ef4c01c0c0cf4491a9315ceb87d5e501
+AUX postgresql-7.4-base.patch 3175 RMD160 66e9e34f412e78e7357ba4a6a2b2dfd11d0f68b7 SHA1 71ef153c6dad561b76944a5bbb3ee1ae4fe64812 SHA256 f6f9fcfe818b8c68e5a91cc461738268a8c02a94f37a9be28c469477ea5f0340
 AUX postgresql-7.4-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-7.4-hppa.patch 1433 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f527 SHA1 2234eff32e0ae4bdecd4b21eb9f6c7be33023652 SHA256 4424694fecd4f16655cd5ff9603489fa644175ab344498040f2c88cb0962aa6b
-AUX postgresql-7.4-libs.patch 3068 RMD160 9fb11c3a7ec425df657870e24145d87a273240cc SHA1 93a2f026e08fe2e96bba844d2f2dc93bf2f39268 SHA256 a819dfef215ff14c4cfc949302e9625403e9d33eaf4e68c82e7fc7c6ed780cb1
 AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 SHA1 a42d03a9c4d7b5df7a69a3d23c9e527c6d901eba SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e
 AUX postgresql-8.0-base.patch 3482 RMD160 7101bcfa821e29120aa9ce8cc2405f4e9455a76e SHA1 6285f9c0deafa45eda43542c37621b2738f9be1b SHA256 ad3f4962db55cd23085ab1e8f6bb7b883811342f88351c4397ad87eac3e7fa18
 AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
@@ -19,11 +18,11 @@ DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043a
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 SHA1 8934dfbd4c1d8c4f2945cb80f02072611681f967 SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114
 DIST postgresql-8.3.0.tar.bz2 13923051 RMD160 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e SHA1 b221e9a82fdb10af1a2b527551a4e30b7ccb958d SHA256 85356d6ab577e21bb528eb5d672e4373b21fe98ac046e77a0eed975608066ea6
-EBUILD postgresql-base-7.3.21.ebuild 4256 RMD160 0bd9752e4cbcfdd5844d5a28fb7698275037e7f9 SHA1 0c172c1022ca0493061978a9d3c73f1e4bb59ea8 SHA256 c232386ea4af3ffe8d462fb8c3a05e3b62e6006dbc37af78e19ff4ffd59e04e8
-EBUILD postgresql-base-7.4.19.ebuild 4445 RMD160 152a410d7901235e462606f95ccb0980c39577f6 SHA1 2bb1c8fa0377b7255c743c31546d729d00417825 SHA256 a7b9bd521a2de6128ea602a51055dd915dca52d741f8e0f3e41e7c2653182f65
-EBUILD postgresql-base-8.0.15.ebuild 4429 RMD160 87f90e9630ac4f4e2f0003759fd23a171b2f72f4 SHA1 506e0e7930af8ae83f2bfcf968a9951611d9c587 SHA256 03984b221fc161124013c904f75815a9d07d55b5de4816112d68add1dfbb7212
-EBUILD postgresql-base-8.1.11.ebuild 4429 RMD160 87f90e9630ac4f4e2f0003759fd23a171b2f72f4 SHA1 506e0e7930af8ae83f2bfcf968a9951611d9c587 SHA256 03984b221fc161124013c904f75815a9d07d55b5de4816112d68add1dfbb7212
+EBUILD postgresql-base-7.3.21.ebuild 4256 RMD160 ff1b13d08313ac9011d8797bf4e4b29410c70a2b SHA1 421996b17cc03acec6b1653a93416e96fe32a5c5 SHA256 75de72ec7e44dc8a59d9c928c3ec9bfe01a3aa2c0c248f14691f3e5d398197a9
+EBUILD postgresql-base-7.4.19.ebuild 4445 RMD160 4aba463d6f2f03d3fc9a19a0ef115703f5f27463 SHA1 7f8832555b6fd74c944144fa621f0c0baea40482 SHA256 99fa0c80b1fe44cb88cc79fc5a57933122ca3daffbb48683c29124af66d061f0
+EBUILD postgresql-base-8.0.15.ebuild 4429 RMD160 acded9080ef296d9157838330dff7d56dd6a71c3 SHA1 905bcb5a92eece78033514637e686ad3acdced17 SHA256 89584d4e2deec839676b87c8bf197b22a60a1446be6d3a7c1813f26db20d84b0
+EBUILD postgresql-base-8.1.11.ebuild 4429 RMD160 74215f3db63cdf7e688eff0856572d1f955d0fe6 SHA1 ddd81975a95bd11c55ec198fcfc7c66e88b46407 SHA256 ce767c10d42f60f38f9e6332d473407eef2a4cb1ad7ccb6c67d4c053cd57d770
 EBUILD postgresql-base-8.2.6.ebuild 4416 RMD160 dc8666f6b780f6e56725396043bb182cbfb4480f SHA1 b3747ad0f7c6591ccd64cf05ac5516f98477dce7 SHA256 6cb94d2db5df95156fad4cca932aef7468b77ad3efee3493831f3106a9b76db8
-EBUILD postgresql-base-8.3.0.ebuild 4416 RMD160 dc8666f6b780f6e56725396043bb182cbfb4480f SHA1 b3747ad0f7c6591ccd64cf05ac5516f98477dce7 SHA256 6cb94d2db5df95156fad4cca932aef7468b77ad3efee3493831f3106a9b76db8
-MISC ChangeLog 2432 RMD160 eab3af7df018a9fdb5783ccf67af49b636b4897e SHA1 47b61ed904b606928de631b8d06dd7af9fb4dd21 SHA256 70aab567e0858f622b052bc47c64f42830938b1e71b964fd730dd043ffa4a6ed
+EBUILD postgresql-base-8.3.0.ebuild 4416 RMD160 b754125c1cca93d40ad34edea881bba895a1981e SHA1 416321e5b2b4fcdb5985f7371e9077658c7ca835 SHA256 aab10b19cbf7b5145a372ac78ed30124e356d865d335a698d04dc9f163d421fc
+MISC ChangeLog 2928 RMD160 0ab49575b1412b8ad03d01ab05a816cf4c179dcf SHA1 a74fdb1839603edb7d45966c9caaf429cc7806a7 SHA256 b06d8ed5051c8b5fc198b6edde34975c692e1adb784c71d2b095608f0f7ccc94
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-base/files/postgresql-7.3-base.patch b/dev-db/postgresql-base/files/postgresql-7.3-base.patch
index e67454f..1451b23 100644
--- a/dev-db/postgresql-base/files/postgresql-7.3-base.patch
+++ b/dev-db/postgresql-base/files/postgresql-7.3-base.patch
@@ -2,7 +2,7 @@
 ==================================================================
 --- contrib/Makefile	(revision 12)
 +++ contrib/Makefile	(local)
-@@ -5,40 +5,10 @@
+@@ -5,40 +5,9 @@
  include $(top_builddir)/src/Makefile.global
  
  WANTED_DIRS = \
@@ -26,7 +26,7 @@
 -		miscutil	\
 -		noupdate	\
  		oid2name	\
- 		pg_dumplo	\
+-		pg_dumplo	\
 -		pg_logger	\
  		pgbench		\
 -		pgcrypto	\
diff --git a/dev-db/postgresql-base/files/postgresql-7.4-base.patch b/dev-db/postgresql-base/files/postgresql-7.4-base.patch
index ea0f6b9..56fd2b7 100644
--- a/dev-db/postgresql-base/files/postgresql-7.4-base.patch
+++ b/dev-db/postgresql-base/files/postgresql-7.4-base.patch
@@ -2,7 +2,7 @@
 ==================================================================
 --- contrib/Makefile	(revision 10)
 +++ contrib/Makefile	(local)
-@@ -5,41 +5,8 @@
+@@ -5,41 +5,9 @@
  include $(top_builddir)/src/Makefile.global
  
  WANTED_DIRS = \
@@ -14,7 +14,7 @@
 -		dbmirror	\
 -		dbsize		\
 -		earthdistance	\
--		findoidjoins	\
+ 		findoidjoins	\
 -		fulltextindex	\
 -		fuzzystrmatch	\
 -		intagg		\
@@ -105,15 +105,14 @@
 ==================================================================
 --- src/bin/Makefile	(revision 10)
 +++ src/bin/Makefile	(local)
-@@ -13,9 +13,8 @@
+@@ -13,8 +13,8 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
 -DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
 -	psql scripts pg_config pg_controldata pg_resetxlog \
--	pg_encoding
 +DIRS := pg_dump \
-+	psql scripts pg_config
++	psql scripts pg_config \
+ 	pg_encoding
  
  ifeq ($(with_tcl), yes)
- 	DIRS += pgtclsh
diff --git a/dev-db/postgresql-base/files/postgresql-7.4-libs.patch b/dev-db/postgresql-base/files/postgresql-7.4-libs.patch
deleted file mode 100644
index a619303..0000000
--- a/dev-db/postgresql-base/files/postgresql-7.4-libs.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 563532a..d2bd525 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -9,17 +9,14 @@ top_builddir = .
- include $(top_builddir)/src/Makefile.global
- 
- all:
--	$(MAKE) -C doc all
- 	$(MAKE) -C src all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- install:
--	$(MAKE) -C doc install
- 	$(MAKE) -C src install
- 	@echo "PostgreSQL installation complete."
- 
- installdirs uninstall distprep:
--	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
- 
- install-all-headers:
-diff --git a/src/Makefile b/src/Makefile
-index cd6e5e6..bc535d5 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -16,11 +16,9 @@ include Makefile.global
- all install installdirs uninstall dep depend distprep:
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
--	$(MAKE) -C pl $@
- 
- install-all-headers:
- 	$(MAKE) -C include $@
-diff --git a/src/backend/Makefile b/src/backend/Makefile
-index 82cdd0f..88d302a 100644
---- a/src/backend/Makefile
-+++ b/src/backend/Makefile
-@@ -29,7 +29,7 @@ endif
- 
- ##########################################################################
- 
--all: submake-libpgport postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- 
-@@ -78,8 +78,7 @@ $(OBJS): $(DIRS:%=%-recursive) ;
- 
- .PHONY: $(DIRS:%=%-recursive)
- # Update the commonly used headers before building the subdirectories
--$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
--	$(MAKE) -C $(subst -recursive,,$@) all
-+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
- 
- 
- $(DLLINIT): $(DLLINIT:%.o=%.c)
-@@ -125,16 +124,7 @@ distprep:
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
-diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 3035f61..469c6e0 100644
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -13,14 +13,10 @@ subdir = src/bin
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
--	psql scripts pg_config pg_controldata pg_resetxlog \
-+DIRS := \
-+	pg_config \
- 	pg_encoding
- 
--ifeq ($(with_tcl), yes)
--	DIRS += pgtclsh
--endif
--
- all install installdirs uninstall depend distprep:
- 	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
- 
diff --git a/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild b/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild
index 2740945..9b8c06d 100644
--- a/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-7.3.21.ebuild
@@ -118,11 +118,11 @@ postgres_symlinks=(
 )
 __EOF__
 
-	cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__
+	cat >"${T}/50postgresql-99-${SLOT}" <<-__EOF__
 		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
 		MANPATH=/usr/share/postgresql-${SLOT}/man
 	__EOF__
-	doenvd "${T}/50postgresql-95-${SLOT}"
+	doenvd "${T}/50postgresql-99-${SLOT}"
 
 	keepdir /etc/postgresql-${SLOT}
 }
diff --git a/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild
index c23a61e..960855d 100644
--- a/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-7.4.19.ebuild
@@ -53,7 +53,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \
 		"${FILESDIR}/postgresql-${SLOT}-hppa.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-libs.patch"
+		"${FILESDIR}/postgresql-${SLOT}-base.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
@@ -122,11 +122,11 @@ postgres_symlinks=(
 )
 __EOF__
 
-	cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__
+	cat >"${T}/50postgresql-98-${SLOT}" <<-__EOF__
 		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
 		MANPATH=/usr/share/postgresql-${SLOT}/man
 	__EOF__
-	doenvd "${T}/50postgresql-95-${SLOT}"
+	doenvd "${T}/50postgresql-98-${SLOT}"
 
 	keepdir /etc/postgresql-${SLOT}
 }
diff --git a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
index 3e7fc41..db4521a 100644
--- a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
@@ -121,11 +121,11 @@ postgres_symlinks=(
 )
 __EOF__
 
-	cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__
+	cat >"${T}/50postgresql-97-${SLOT}" <<-__EOF__
 		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
 		MANPATH=/usr/share/postgresql-${SLOT}/man
 	__EOF__
-	doenvd "${T}/50postgresql-95-${SLOT}"
+	doenvd "${T}/50postgresql-97-${SLOT}"
 
 	keepdir /etc/postgresql-${SLOT}
 }
diff --git a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
index 3e7fc41..e16dfb1 100644
--- a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
@@ -121,11 +121,11 @@ postgres_symlinks=(
 )
 __EOF__
 
-	cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__
+	cat >"${T}/50postgresql-96-${SLOT}" <<-__EOF__
 		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
 		MANPATH=/usr/share/postgresql-${SLOT}/man
 	__EOF__
-	doenvd "${T}/50postgresql-95-${SLOT}"
+	doenvd "${T}/50postgresql-96-${SLOT}"
 
 	keepdir /etc/postgresql-${SLOT}
 }
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild
index b9c364c..bd3c849 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.0.ebuild
@@ -123,11 +123,11 @@ postgres_symlinks=(
 )
 __EOF__
 
-	cat >"${T}/50postgresql-95-${SLOT}" <<-__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-95-${SLOT}"
+	doenvd "${T}/50postgresql-94-${SLOT}"
 
 	keepdir /etc/postgresql-${SLOT}
 }