Drop the default number of allowed connections from 512 to 40

  so that we work on the default FreeBSD kernel as well, #189141 thanks to Jason.

  Add a patch that removes the check for a threaded python on *BSD as
  Gentoo/FreeBSD supplies a working threaded python, #189080.
Package-Manager: portage-2.1.3.6

5 files changed, 85 insertions, 20 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 606d2a53ca0d..d09becc24af7 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.351 2007/07/11 08:46:50 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.352 2007/08/17 15:09:02 uberlord Exp $
+
+  17 Aug 2007; Roy Marples <uberlord@gentoo.org> files/postgresql.conf-8.2,
+  +files/postgresql-8.2.4-python-threads.patch, postgresql-8.2.4-r1.ebuild:
+  Drop the default number of allowed connections from 512 to 40
+  so that we work on the default FreeBSD kernel as well, #189141 thanks to Jason.
+  
+  Add a patch that removes the check for a threaded python on *BSD as
+  Gentoo/FreeBSD supplies a working threaded python, #189080.
 
   11 Jul 2007; Tiziano Müller <dev-zero@gentoo.org>
   files/postgresql.conf-8.0, files/postgresql.init-8.0,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 05a3918b7800..ec06ba78ba33 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -42,6 +42,10 @@ AUX postgresql-8.2.4-no-test.patch 290 RMD160 230ac3d019715752a33c6f9cb40e59e6c5
 MD5 f5e16dbecc2693a8f7eaa807f736a73e files/postgresql-8.2.4-no-test.patch 290
 RMD160 230ac3d019715752a33c6f9cb40e59e6c53b2826 files/postgresql-8.2.4-no-test.patch 290
 SHA256 37d6e60b5ae4ba20e765448e484568c7cb2c597ad57cd68b05d224f0c9b8f27a files/postgresql-8.2.4-no-test.patch 290
+AUX postgresql-8.2.4-python-threads.patch 1634 RMD160 2b7b7656c96e5294b619acd68d1fd2e26793f5b9 SHA1 6e0ed3f28aa0fd53039fd1d1ed9414987d962741 SHA256 acbd2bbe5c7396ac10f9985fb9d313cea35d9604f82e0fb5fbf6315c63673f6a
+MD5 fb338b5123e9a3e6fb159a8c3a2dfc6f files/postgresql-8.2.4-python-threads.patch 1634
+RMD160 2b7b7656c96e5294b619acd68d1fd2e26793f5b9 files/postgresql-8.2.4-python-threads.patch 1634
+SHA256 acbd2bbe5c7396ac10f9985fb9d313cea35d9604f82e0fb5fbf6315c63673f6a files/postgresql-8.2.4-python-threads.patch 1634
 AUX postgresql-8.2.4-regress_fix.patch 1405 RMD160 268d2bd60d1abb12e7d42f1f8a98f064eda05f46 SHA1 7d7d826c14a3c6a00e29c2e4edb1e7d33812a978 SHA256 217a588720f9e20ab1db5f4eb4cda6189cb471477901a9e281d0cca0a1ed2862
 MD5 504d926a3d3279e93e73e8b02409aa49 files/postgresql-8.2.4-regress_fix.patch 1405
 RMD160 268d2bd60d1abb12e7d42f1f8a98f064eda05f46 files/postgresql-8.2.4-regress_fix.patch 1405
@@ -70,10 +74,10 @@ AUX postgresql.conf-8.1 1501 RMD160 000cf1b34d89eaa84abd24743f16e9cb97ab3c47 SHA
 MD5 f11a43882a4c0cf0cba7e375186e573f files/postgresql.conf-8.1 1501
 RMD160 000cf1b34d89eaa84abd24743f16e9cb97ab3c47 files/postgresql.conf-8.1 1501
 SHA256 d3d2c3f72fae8470274b754656f2fadba1937d5246c14c0e258c9d59eb6073fd files/postgresql.conf-8.1 1501
-AUX postgresql.conf-8.2 1501 RMD160 000cf1b34d89eaa84abd24743f16e9cb97ab3c47 SHA1 a4cbcd665213739fc95adb879dbb68d1dde2fa60 SHA256 d3d2c3f72fae8470274b754656f2fadba1937d5246c14c0e258c9d59eb6073fd
-MD5 f11a43882a4c0cf0cba7e375186e573f files/postgresql.conf-8.2 1501
-RMD160 000cf1b34d89eaa84abd24743f16e9cb97ab3c47 files/postgresql.conf-8.2 1501
-SHA256 d3d2c3f72fae8470274b754656f2fadba1937d5246c14c0e258c9d59eb6073fd files/postgresql.conf-8.2 1501
+AUX postgresql.conf-8.2 1498 RMD160 7e6777f5d794bf207f9e4838c5d06a61974c0f75 SHA1 d00c7e6c9ca415962eba95b8448d1b4ae878c33d SHA256 f0fe5599b4850f476fa23b9e663b83b1bcc46fb343fea2db1625375e4e7121f8
+MD5 1d57c3ef1af5ae660f4c4a7b0443311a files/postgresql.conf-8.2 1498
+RMD160 7e6777f5d794bf207f9e4838c5d06a61974c0f75 files/postgresql.conf-8.2 1498
+SHA256 f0fe5599b4850f476fa23b9e663b83b1bcc46fb343fea2db1625375e4e7121f8 files/postgresql.conf-8.2 1498
 AUX postgresql.init-7.3 1332 RMD160 deb0bbb69d96ec21ac9b9b636f62fb47f5d997ab SHA1 571fc01d85a37061baef8f7e291cae481f6cf87a SHA256 15296b663506b9840990a08d592adda16acbb1b59b57b81484808e5486b35ab4
 MD5 0f39215e02d3c179cb2a49334bf82fee files/postgresql.init-7.3 1332
 RMD160 deb0bbb69d96ec21ac9b9b636f62fb47f5d997ab files/postgresql.init-7.3 1332
@@ -130,14 +134,14 @@ EBUILD postgresql-8.1.9.ebuild 8698 RMD160 edff0195a5009be6d9ae87ceaaeded459e13a
 MD5 6b8ebafef93f578beaa2c77b45143519 postgresql-8.1.9.ebuild 8698
 RMD160 edff0195a5009be6d9ae87ceaaeded459e13a20d postgresql-8.1.9.ebuild 8698
 SHA256 47e2106282aef279f3caebae112422a78460f2841eb85d98410065c5c111512f postgresql-8.1.9.ebuild 8698
-EBUILD postgresql-8.2.4-r1.ebuild 8378 RMD160 3b85064651af77c027aafde014d22d624df222ee SHA1 d7eecd7ea0c8b5d2a73c8f7a7d93a523d1cf3b04 SHA256 30b8f49a2d4ea8f03478fc85c8db3732dc03adb9b01fe76b9df4495fa2163938
-MD5 d1e75740d203ed4a5f55aa5c2a363a30 postgresql-8.2.4-r1.ebuild 8378
-RMD160 3b85064651af77c027aafde014d22d624df222ee postgresql-8.2.4-r1.ebuild 8378
-SHA256 30b8f49a2d4ea8f03478fc85c8db3732dc03adb9b01fe76b9df4495fa2163938 postgresql-8.2.4-r1.ebuild 8378
-MISC ChangeLog 74756 RMD160 24169a012b4efa0428b0d76bd6e221e55f709821 SHA1 ec11bbd208f1d4f45286db2a8680fced577905c0 SHA256 afdb3a12fb6e361e45614653a86380263f7c29db5b35b9001f2cbd30a53167d7
-MD5 b3612039bba36a0b1f2d6a8322ac490a ChangeLog 74756
-RMD160 24169a012b4efa0428b0d76bd6e221e55f709821 ChangeLog 74756
-SHA256 afdb3a12fb6e361e45614653a86380263f7c29db5b35b9001f2cbd30a53167d7 ChangeLog 74756
+EBUILD postgresql-8.2.4-r1.ebuild 8476 RMD160 01aa345db5414bd1bcdda9a9c8c3c88148997a24 SHA1 4eadb504384c660161ad453e46fb7e2088d43605 SHA256 dd77a3f658d82b1c71a196d181cd1613122c726877690c7026a4e48cee4b0a11
+MD5 2045372f4bab3650a16eea81c38d0706 postgresql-8.2.4-r1.ebuild 8476
+RMD160 01aa345db5414bd1bcdda9a9c8c3c88148997a24 postgresql-8.2.4-r1.ebuild 8476
+SHA256 dd77a3f658d82b1c71a196d181cd1613122c726877690c7026a4e48cee4b0a11 postgresql-8.2.4-r1.ebuild 8476
+MISC ChangeLog 75190 RMD160 66223088dde21212bf1cbdf308368d6cd59cf3ef SHA1 18a2350e6d817bd5665f170110263f55ed2d2a26 SHA256 a3b2d70ddcb4a47617ad710e38fd624e1ce5993bac879bcdb455ec929e86f243
+MD5 8d29438cea31fce066d5ddd3c3a9362d ChangeLog 75190
+RMD160 66223088dde21212bf1cbdf308368d6cd59cf3ef ChangeLog 75190
+SHA256 a3b2d70ddcb4a47617ad710e38fd624e1ce5993bac879bcdb455ec929e86f243 ChangeLog 75190
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-python-threads.patch b/dev-db/postgresql/files/postgresql-8.2.4-python-threads.patch
new file mode 100644
index 000000000000..520ba13a6473
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.2.4-python-threads.patch
@@ -0,0 +1,50 @@
+diff -ur a/config/python.m4 b/config/python.m4
+--- a/config/python.m4	2006-10-16 18:24:54 +0100
++++ b/config/python.m4	2007-08-17 15:37:00 +0100
+@@ -78,18 +78,4 @@
+ AC_SUBST(python_libspec)[]dnl
+ AC_SUBST(python_additional_libs)[]dnl
+ 
+-# threaded python is not supported on bsd's
+-AC_MSG_CHECKING(whether Python is compiled with thread support)
+-pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
+-if test "$pythreads" = "1"; then
+-  AC_MSG_RESULT(yes)
+-  case $host_os in
+-  openbsd*|freebsd*)
+-    AC_MSG_ERROR([threaded Python not supported on this platform])
+-    ;;
+-  esac
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-
+ ])# PGAC_CHECK_PYTHON_EMBED_SETUP
+diff -ur a/configure b/configure
+--- a/configure	2007-04-20 04:20:41 +0100
++++ b/configure	2007-08-17 15:37:20 +0100
+@@ -5002,24 +5002,6 @@
+ echo "${ECHO_T}${python_libspec} ${python_additional_libs}" >&6
+ 
+ 
+-# threaded python is not supported on bsd's
+-echo "$as_me:$LINENO: checking whether Python is compiled with thread support" >&5
+-echo $ECHO_N "checking whether Python is compiled with thread support... $ECHO_C" >&6
+-pythreads=`${PYTHON} -c "import sys; print int('thread' in sys.builtin_module_names)"`
+-if test "$pythreads" = "1"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-  case $host_os in
+-  openbsd*|freebsd*)
+-    { { echo "$as_me:$LINENO: error: threaded Python not supported on this platform" >&5
+-echo "$as_me: error: threaded Python not supported on this platform" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
+-  esac
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ 
+ 
+ fi
diff --git a/dev-db/postgresql/files/postgresql.conf-8.2 b/dev-db/postgresql/files/postgresql.conf-8.2
index 6e439fc0f38b..af813ec3d8b3 100644
--- a/dev-db/postgresql/files/postgresql.conf-8.2
+++ b/dev-db/postgresql/files/postgresql.conf-8.2
@@ -12,7 +12,7 @@ PGGROUP="postgres"
 # -B is the number of shared buffers and has to be at least 2x the value for -N
 # Please read the man-page to postmaster for more options. Many of these options
 # can be set directly in the configuration-file.
-PGOPTS="-N 512 -B 1024"
+PGOPTS="-N 40 -B 80"
 
 
 # SERVER SHUTDOWN:
diff --git a/dev-db/postgresql/postgresql-8.2.4-r1.ebuild b/dev-db/postgresql/postgresql-8.2.4-r1.ebuild
index 72f258bb3686..264ae4c538a8 100644
--- a/dev-db/postgresql/postgresql-8.2.4-r1.ebuild
+++ b/dev-db/postgresql/postgresql-8.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.2.4-r1.ebuild,v 1.1 2007/05/02 08:50:01 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.2.4-r1.ebuild,v 1.2 2007/08/17 15:09:02 uberlord Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
 
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )"
 
 PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
+[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="40"
 
 pkg_setup() {
 	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
@@ -56,8 +56,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-sh.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-sh.patch"
+
+	# Gentoo/FreeBSD's python is works fine with threading - unlike FreeBSD's
+	epatch "${FILESDIR}/${P}-python-threads.patch"
 
 	# Prepare package for future tests
 	if use test ; then
@@ -65,7 +68,7 @@ src_unpack() {
 		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
 
 		# Fix broken tests
-		epatch "${FILESDIR}/${PN}-${PV}-regress_fix.patch"
+		epatch "${FILESDIR}/${P}-regress_fix.patch"
 
 		# We need to run the tests as a non-root user, portage seems the most fitting here,
 		# so if userpriv is enabled, we use it directly. If userpriv is disabled, we need to
@@ -76,7 +79,7 @@ src_unpack() {
 		if ! hasq userpriv ${FEATURES} ; then
 			mkdir -p "${S}/src/test/regress/results"
 			chown portage "${S}/src/test/regress/results"
-			epatch "${FILESDIR}/${PN}-${PV}-regress_su.patch"
+			epatch "${FILESDIR}/${P}-regress_su.patch"
 		fi
 	fi
 }