dev-db/postgresql-base: Added --with-thread-safety-force when building with threading-support to skip the thread-safety-tests which randomly segfaults within the sandbox (guessing that the case that someone has a strange system which reports pthread-availability but in reality it isn't available is much less common than that someone hits the mentioned bug). Added the option to use libedit instead of readline for postgresql >=8.2.

svn path=/experimental/; revision=353

6 files changed, 61 insertions, 15 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index a27ab52..98ff548 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild,
+  postgresql-base-8.2.7.ebuild, postgresql-base-8.3.1.ebuild:
+  Added --with-thread-safety-force when building with threading-support to
+  skip the thread-safety-tests which randomly segfaults within the sandbox
+  (guessing that the case that someone has a strange system which reports
+  pthread-availability but in reality it isn't available is much less common
+  than that someone hits the mentioned bug). Added the option to use libedit
+  instead of readline for postgresql >=8.2.
+
   27 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-base-8.3.1.ebuild:
   Added $(use_with kerberos gssapi)
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index b93b271..e666cc7 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -20,9 +20,9 @@ DIST postgresql-8.2.7.tar.bz2 12576126 RMD160 96700e91c3b9e733c686b0fe377c7ba661
 DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfbe94c89 SHA1 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d SHA256 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992
 EBUILD postgresql-base-7.3.21.ebuild 4278 RMD160 019d9aeb258b289bbf3cf9a0169700477d1e53ed SHA1 2c58832e82835a251214b4315551e242901a92c7 SHA256 5fffc806d591139bdc782fdf933b5c3e23fffa79deb2d2101130f23cf2a475f7
 EBUILD postgresql-base-7.4.19.ebuild 4467 RMD160 44df11946e3cdd2e394cd68d5920ace2a3516388 SHA1 2fa2bc4efe209771e66bbec4224e86151e86144e SHA256 f354d671610ac79a929e27cc9c84b6fe1f59fc44641c1c073288a796155e482d
-EBUILD postgresql-base-8.0.15.ebuild 4451 RMD160 b6f99c3963d8deb63a5abaa175d95f7b26e27f99 SHA1 5d3e7a696e62f075dadcfcfe2de8c42a9c70b4ff SHA256 987f0c1b9b1707745e8520215a5adbb145bf2558894e2781df533c746d7f368c
-EBUILD postgresql-base-8.1.11.ebuild 4451 RMD160 36e639cd2a45371d92046cad2ce24802208fc216 SHA1 7f89a85c469547087872d1120a7f45b50a036078 SHA256 a79058253bd0ecc3db7cdb709d380adc3c5dab5b1fdf0b51450e7cca90eec104
-EBUILD postgresql-base-8.2.7.ebuild 4438 RMD160 817abcdae0ef3a8a313f7f8af274822d2102d426 SHA1 eb185750fd89248a0d9f46174d3938fc6f564961 SHA256 676e14adda136f44a82f9de84874ef3f33198ebb79eed757e3d8ffe8185521e0
-EBUILD postgresql-base-8.3.1.ebuild 4470 RMD160 143c6ee642d4bca46b462d129bbdafc234973f7b SHA1 42553ba8fbadefc237996f0fc6d70126dfa4fd00 SHA256 6d6b642dbbbde9db0e66906707cfda00393fdb69fee99b66229e28d3a815aa53
-MISC ChangeLog 3537 RMD160 adc8bab7d98bb390bfdf51ef646d7b97e708ee47 SHA1 4374207546682cc0d9e863e6d12816fd5faffc8a SHA256 8975547420c19cfaa5a430cb48ceb4294458ff97ec66d54728b26fc386ed3398
+EBUILD postgresql-base-8.0.15.ebuild 4496 RMD160 894ba173454171c423592a30c904adde50bf375b SHA1 aa10c7bc8463294c2f2793d648b2a08f473a9ffb SHA256 f51edf2599322a0045696452543a2ae5a2fd58803e4f50765638297fa35617d7
+EBUILD postgresql-base-8.1.11.ebuild 4496 RMD160 f4bdab3155dc3b9dff35d405e26fcfcff9fd7fc9 SHA1 e7fd8f21159f27a5fbe9b488f09d8266f29a55d3 SHA256 b1b1d7996098d35d6135705c339aec72b3dbec20833684f13eee3e9f78ba2817
+EBUILD postgresql-base-8.2.7.ebuild 4965 RMD160 445d71b33936783f121b994fe3a225a57a17a9a3 SHA1 647ea288fc870f2a2dcfc965db1d3daaa0e6cba9 SHA256 0a2f01ff2055950198f8dcf94636066e08be2cc3e813d400062348e3b6fc085b
+EBUILD postgresql-base-8.3.1.ebuild 4997 RMD160 6e15935b1a0f332943a0e8191fd2fb522303959e SHA1 8a2aa2dc1d0684a9a442edbe5fd55d6ef7c32c01 SHA256 c0d7093a5b041829524e75ed3b02d3682a88fa5c525d446ecf80f0058d5cbd01
+MISC ChangeLog 4139 RMD160 2a7912b04ce0035d09ab690349e267b0b02394b2 SHA1 7fd8774949a24264543ce6701630079d7a6d014b SHA256 c8b250ac20da1822d1233ede7bbffaf045c07f3a954a3f9cb159070057bcfa48
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
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 d1d6e98..1d38657 100644
--- a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
@@ -81,7 +81,8 @@ src_compile() {
 		$(use_enable pg-intdatetime integer-datetimes ) \
 		$(use_with readline) \
 		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety ) \
+		$(use_enable threads thread-safety) \
+		$(use_enable threads thread-safety-force) \
 		$(use_with zlib) \
 		|| die "configure failed"
 
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 88104b2..70bd5b7 100644
--- a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
@@ -81,7 +81,8 @@ src_compile() {
 		$(use_enable pg-intdatetime integer-datetimes ) \
 		$(use_with readline) \
 		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety ) \
+		$(use_enable threads thread-safety) \
+		$(use_enable threads thread-safety-force) \
 		$(use_with zlib) \
 		|| die "configure failed"
 
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild
index ec5f46a..f180f94 100644
--- a/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild
@@ -21,7 +21,7 @@ IUSE_LINGUAS="
 	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 pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
+IUSE="doc kerberos libedit nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
 RESTRICT="test"
 
 wanted_languages() {
@@ -32,7 +32,8 @@ wanted_languages() {
 
 RDEPEND="kerberos? ( virtual/krb5 )
 	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
+	readline? ( !libedit? ( >=sys-libs/readline-4.1 ) )
+	libedit? ( dev-libs/libedit )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	>=app-admin/eselect-postgresql-0.2
@@ -48,6 +49,14 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "PostgreSQL can use libedit OR readline but not both, libedit"
+		ewarn "will be used. If that is not what you want, please stop the"
+		ewarn "merge and unset the 'libedit' USE-flag for ${PN}."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -65,6 +74,13 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf
+	if use readline || use libedit ; then
+		myconf="${myconf} --with-readline $(use_with libedit libedit-preferred)"
+	else
+		myconf="${myconf} --without-readline"
+	fi
+
 	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
 		--datadir=/usr/share/postgresql-${SLOT} \
 		--sysconfdir=/etc/postgresql-${SLOT} \
@@ -80,11 +96,12 @@ src_compile() {
 		"$(use_enable nls nls "$(wanted_languages)")" \
 		$(use_with pam) \
 		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
 		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety ) \
+		$(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"
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild
index 38be490..cd07f20 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild
@@ -21,7 +21,7 @@ IUSE_LINGUAS="
 	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 pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
+IUSE="doc kerberos libedit nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
 RESTRICT="test"
 
 wanted_languages() {
@@ -32,7 +32,8 @@ wanted_languages() {
 
 RDEPEND="kerberos? ( virtual/krb5 )
 	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
+	readline? ( !libedit? ( >=sys-libs/readline-4.1 ) )
+	libedit? ( dev-libs/libedit )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	>=app-admin/eselect-postgresql-0.2
@@ -48,6 +49,14 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 S="${WORKDIR}/postgresql-${PV}"
 
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "PostgreSQL can use libedit OR readline but not both, libedit"
+		ewarn "will be used. If that is not what you want, please stop the"
+		ewarn "merge and unset the 'libedit' USE-flag for ${PN}."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -65,6 +74,13 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf
+	if use readline || use libedit ; then
+		myconf="${myconf} --with-readline $(use_with libedit libedit-preferred)"
+	else
+		myconf="${myconf} --without-readline"
+	fi
+
 	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
 		--datadir=/usr/share/postgresql-${SLOT} \
 		--sysconfdir=/etc/postgresql-${SLOT} \
@@ -81,11 +97,12 @@ src_compile() {
 		"$(use_enable nls nls "$(wanted_languages)")" \
 		$(use_with pam) \
 		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
 		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety ) \
+		$(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"