Removed static USE-flag as that doesn't work well (thanks David Morgan). Moved user/group creation code into pkg_config such that they are available in src_install when chmod is done (thanks Sander Knopper). Bug #133197

Package-Manager: portage-2.1_pre10-r5

3 files changed, 27 insertions, 31 deletions

diff --git a/dev-db/monetdb/ChangeLog b/dev-db/monetdb/ChangeLog
index a4e2f26de186..202cf7f1fe17 100644
--- a/dev-db/monetdb/ChangeLog
+++ b/dev-db/monetdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/monetdb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.7 2006/05/13 15:17:19 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.8 2006/05/15 18:22:28 grobian Exp $
+
+  15 May 2006; Fabian Groffen <grobian@gentoo.org> monetdb-4.10.2.ebuild:
+  Removed static USE-flag as that doesn't work well (thanks David Morgan).
+  Moved user/group creation code into pkg_config such that they are available
+  in src_install when chmod is done (thanks Sander Knopper). Bug #133197
 
   13 May 2006; <nixnut@gentoo.org> monetdb-4.10.2.ebuild:
   Stable on ppc. bug #133197
diff --git a/dev-db/monetdb/Manifest b/dev-db/monetdb/Manifest
index 1b05b8d6183c..9e9b4172e911 100644
--- a/dev-db/monetdb/Manifest
+++ b/dev-db/monetdb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX monetdb-4.10.0-darwin.patch 672 RMD160 02d649bba3753e0aad02eb18530dadd68f937e7b SHA1 7b00fd8ff2506970a1ffe64386f20d679afb7e54 SHA256 914e17bd519581ff045ae7732d94f3356d11e64690f8d75ed8edfe33beffda80 size 672
 MD5 53322611b7f167b64ce3f3d51c5eb3ec files/monetdb-4.10.0-darwin.patch 672
 RMD160 02d649bba3753e0aad02eb18530dadd68f937e7b files/monetdb-4.10.0-darwin.patch 672
@@ -71,10 +68,10 @@ EBUILD monetdb-4.10.0.ebuild 7511 RMD160 0805a1a1d887aeffc326d6beaf155e666e17417
 MD5 ea344d17968816fd9cfa298f5a29fe5e monetdb-4.10.0.ebuild 7511
 RMD160 0805a1a1d887aeffc326d6beaf155e666e174173 monetdb-4.10.0.ebuild 7511
 SHA256 9fe377a9076727d5a069e7a1aa7c6314269bb97ea2dcc82f1f62a27810d36b5b monetdb-4.10.0.ebuild 7511
-EBUILD monetdb-4.10.2.ebuild 7460 RMD160 352e6ee84fdc038ab8b242530c4adf46051a0ff6 SHA1 1f04816cead5f1537dc93e1771a8858d9de6a167 SHA256 aa97b533015886f62b03c9231895fad3873b8919b2c1a9ff88c1942da314e1c7 size 7460
-MD5 11cb92b0d894cc18b56ebc7029061099 monetdb-4.10.2.ebuild 7460
-RMD160 352e6ee84fdc038ab8b242530c4adf46051a0ff6 monetdb-4.10.2.ebuild 7460
-SHA256 aa97b533015886f62b03c9231895fad3873b8919b2c1a9ff88c1942da314e1c7 monetdb-4.10.2.ebuild 7460
+EBUILD monetdb-4.10.2.ebuild 7525 RMD160 349a3b5da07c8b896b8dbd19845a50357c77153b SHA1 faf95275aaa217615e241ee524be531aeb13c8d1 SHA256 9ab38ba42b3a2589e35df23797d3f79a613c3c8ce890ca8b36512c54ffc343ed size 7525
+MD5 16fc33a65d3864682910a843a01a3efe monetdb-4.10.2.ebuild 7525
+RMD160 349a3b5da07c8b896b8dbd19845a50357c77153b monetdb-4.10.2.ebuild 7525
+SHA256 9ab38ba42b3a2589e35df23797d3f79a613c3c8ce890ca8b36512c54ffc343ed monetdb-4.10.2.ebuild 7525
 EBUILD monetdb-4.8.2-r1.ebuild 6937 RMD160 b257f1e98278ca238c9a8fef32b9996edf6dce06 SHA1 16b3a9dd95d1b79fa96266a26d8552dc35464a53 SHA256 89666bcbe7c5ff505ea33c4bb0c5aca8051063a3f1aafe40438ad83db084692a size 6937
 MD5 5b401347bd869ace7230323503aa0662 monetdb-4.8.2-r1.ebuild 6937
 RMD160 b257f1e98278ca238c9a8fef32b9996edf6dce06 monetdb-4.8.2-r1.ebuild 6937
@@ -83,10 +80,10 @@ EBUILD monetdb-4.8.2.ebuild 6331 RMD160 df4be8b23f0d310162cd6ea85bdf3c4e2d158504
 MD5 74ff565ca22df33485befde441d66bd8 monetdb-4.8.2.ebuild 6331
 RMD160 df4be8b23f0d310162cd6ea85bdf3c4e2d158504 monetdb-4.8.2.ebuild 6331
 SHA256 e3bb5aa21e58cadadfda2b54ed580003e0e0d8d73fb6a16303497a3d1f037005 monetdb-4.8.2.ebuild 6331
-MISC ChangeLog 1864 RMD160 ad0815e4859d40559384a594bd075b378349eab8 SHA1 de01291b6bb04a6df484d8fb8231d0a05e1d45f0 SHA256 0533e9eb325c8108a8ecd69af41daf87a42d837a90506c71d0790d447bf603b3 size 1864
-MD5 b04f626adb914ed893b8b98ff06b0b3b ChangeLog 1864
-RMD160 ad0815e4859d40559384a594bd075b378349eab8 ChangeLog 1864
-SHA256 0533e9eb325c8108a8ecd69af41daf87a42d837a90506c71d0790d447bf603b3 ChangeLog 1864
+MISC ChangeLog 2166 RMD160 bcf4c5467f3fd090f3046bd0983f077f5f785729 SHA1 d40620168b46244d6a3c960d1d6b8c535785be94 SHA256 0ecc1d16c3faa7b259eba3d347694a0eced1b5b1d0916dba2d0fe7c8fe4102f5 size 2166
+MD5 300ff570d9ac7c13bd18516d99d772f5 ChangeLog 2166
+RMD160 bcf4c5467f3fd090f3046bd0983f077f5f785729 ChangeLog 2166
+SHA256 0ecc1d16c3faa7b259eba3d347694a0eced1b5b1d0916dba2d0fe7c8fe4102f5 ChangeLog 2166
 MISC metadata.xml 801 RMD160 1fa793c98a0c1bef77ea57c36e9f65814da8766d SHA1 0e97925f686a1f0d376a727b852fa4f273d4a72f SHA256 08df50f2635f4fd653ea0b292d4c7c53e12ea61e8f8e8b5684dedcdc812513ff size 801
 MD5 ca9ff61fbe7d29f666c1ffdc61bb168d metadata.xml 801
 RMD160 1fa793c98a0c1bef77ea57c36e9f65814da8766d metadata.xml 801
@@ -103,10 +100,3 @@ SHA256 1638f5f2febc7e6a6dc54d0fbafc34c10f36649ca7487b803be15698330bafe4 files/di
 MD5 27e3f06e126f852b139787cb1134d1df files/digest-monetdb-4.8.2-r1 1081
 RMD160 b7bab10ffb9308d33c3ba58cbfdcd9ffd0f4e3f0 files/digest-monetdb-4.8.2-r1 1081
 SHA256 1638f5f2febc7e6a6dc54d0fbafc34c10f36649ca7487b803be15698330bafe4 files/digest-monetdb-4.8.2-r1 1081
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEZfiaoFw4q70f3SsRAvv5AKDPdEGNNlZT7VG/h1aORTsMwIJy1ACgn2ye
-51GFWG36oyODF8dUYsqh5SI=
-=Tt8Y
------END PGP SIGNATURE-----
diff --git a/dev-db/monetdb/monetdb-4.10.2.ebuild b/dev-db/monetdb/monetdb-4.10.2.ebuild
index bfa87fe8b3e0..3fdc62d8f1b3 100644
--- a/dev-db/monetdb/monetdb-4.10.2.ebuild
+++ b/dev-db/monetdb/monetdb-4.10.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.2 2006/05/13 15:17:19 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.3 2006/05/15 18:22:28 grobian Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="A main-memory relational database for SQL, XQuery and MIL"
 HOMEPAGE="http://monetdb.cwi.nl/"
-IUSE="java readline debug static"
+IUSE="java readline debug"
 PV_SQL=2.10.2
 PV_XQ=0.10.2
 PV_M=${PV}
@@ -16,6 +16,7 @@ SRC_URI="mirror://sourceforge/monetdb/MonetDB-${PV_M}.tar.gz
 LICENSE="MonetDBPL-1.1 PathfinderPL-1.1"
 SLOT="0"
 KEYWORDS="ppc ~ppc-macos ~x86"
+RESTRICT="test"
 
 DEPEND="virtual/libc
 		>=sys-devel/gcc-3.3
@@ -51,6 +52,9 @@ EOF
 			die "Cannot upgrade automatically."
 		fi
 	fi
+
+	enewgroup monetdb
+	enewuser monetdb -1 /bin/bash "${DATA_DIR}" monetdb
 }
 
 src_unpack() {
@@ -79,7 +83,6 @@ src_compile() {
 
 	myconf="${myconf} $(use_with java)"
 	myconf="${myconf} $(use_with readline)"
-	myconf="${myconf} $(use_enable static)"
 
 	econf ${myconf} || die "econf monetdb failed"
 
@@ -165,18 +168,21 @@ src_install() {
 	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die "stop script"
 
 	insinto "${DATA_DIR}"
-	newins "${FILESDIR}/${PN}-4.8.2-startup.mil" "${PN}-startup.mil" || die "startup MIL script"
+	newins "${FILESDIR}/${PN}-4.8.2-startup.mil" "${PN}-startup.mil" \
+		|| die "startup MIL script"
 
 	if use java;
 	then
 		exeinto /usr/bin
 		newexe "${FILESDIR}/${PN}.JdbcClient-4.10.0" "JdbcClient" \
-		|| die "JdbcClient alias"
+			|| die "JdbcClient alias"
 	fi
 
 	# set right permissions
-	chown -R monetdb:monetdb "${D}/${DATA_DIR}"
-	fowners monetdb:monetdb "/var/log/${PN}"
+	chown -R monetdb:monetdb "${D}/${DATA_DIR}" \
+		|| die "setting ownership on ${DATA_DIR} failed"
+	fowners monetdb:monetdb "/var/log/${PN}" \
+		|| die "setting ownership on /var/log/${PN} failed"
 
 	# remove testing framework and compiled tests
 	rm -f \
@@ -219,11 +225,6 @@ src_test() {
 	true
 }
 
-pkg_preinst() {
-	enewgroup monetdb
-	enewuser monetdb -1 /bin/bash "${DATA_DIR}" monetdb
-}
-
 pkg_postinst() {
 	while read line; do einfo "${line}"; done <<EOF
 MonetDB has been installed on your system, using data directory