Moved enewgroup and enewuser calls from src_install to pkg_setup for bug #124680.

Package-Manager: portage-2.1_pre5-r4

3 files changed, 35 insertions, 21 deletions

diff --git a/dev-db/c-jdbc/ChangeLog b/dev-db/c-jdbc/ChangeLog
index ad5e40411125..f29e05927a80 100644
--- a/dev-db/c-jdbc/ChangeLog
+++ b/dev-db/c-jdbc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/c-jdbc
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.6 2005/12/18 18:06:40 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.7 2006/03/11 17:56:34 betelgeuse Exp $
+
+  11 Mar 2006; Petteri Räty <betelgeuse@gentoo.org> c-jdbc-1.0.4-r1.ebuild:
+  Moved enewgroup and enewuser calls from src_install to pkg_setup for bug
+  #124680.
 
   18 Dec 2005; Joshua Nichols <nichoj@gentoo.org> c-jdbc-1.0.4-r1.ebuild:
   Loosened jaxen and dom4j dependencies.
diff --git a/dev-db/c-jdbc/Manifest b/dev-db/c-jdbc/Manifest
index bcd567bf44b5..d98f608ff648 100644
--- a/dev-db/c-jdbc/Manifest
+++ b/dev-db/c-jdbc/Manifest
@@ -1,19 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1689032a7b2a6c5265a3caeedc234413 ChangeLog 1254
-MD5 0ddb16210255443d5e4d28a366fe52e4 c-jdbc-1.0.4-r1.ebuild 3720
+MD5 fe36b6d0a45ccb4781ae69eb87507930 ChangeLog 1422
+RMD160 975172a672ac0f92f12d8f87b55c73ac112e0f3b ChangeLog 1422
+SHA256 b4cc3da9950010a4396d97119f46730e1527051329782e2a70bbf2fcffeb38b1 ChangeLog 1422
+MD5 248f2e99d81251928963b18fe63f9070 c-jdbc-1.0.4-r1.ebuild 3740
+RMD160 ddd9f4eec7032544413f86879c49a40fb0bf0524 c-jdbc-1.0.4-r1.ebuild 3740
+SHA256 8bc38e62db8d7c42caef684bf8ae307495b149d5e86d8c128380904ac6a10431 c-jdbc-1.0.4-r1.ebuild 3740
 MD5 6f7e7b9ace7df13d6bab70f487a31189 files/c-jdbc-1.0.4-gentoo.patch 5047
+RMD160 fdb19ac9f02c7a7f72d6bb89ddf22c59c88e328c files/c-jdbc-1.0.4-gentoo.patch 5047
+SHA256 575f54c491eef4962f55b6cd36e2c4557b478c65f4a0b98d291656d1b68f12a0 files/c-jdbc-1.0.4-gentoo.patch 5047
 MD5 c366d1203f27f5438c29bc3a5724ab73 files/cjdbc-conf 313
+RMD160 f38d89fb3e5090cf18a5a544d6aa46cac5c73822 files/cjdbc-conf 313
+SHA256 b55516531e7bac03c002a29b73766bca2c7c232449c377030281e444cce10448 files/cjdbc-conf 313
 MD5 9c7589e63d5760dde9a3d56fdc58e6a7 files/cjdbc-init 926
+RMD160 163c6906fa22c6e49a8df62e3fbadd34c1121b8f files/cjdbc-init 926
+SHA256 eb11bd0f0bd66d0bffe2c5ed6daf5550676afcee9d9386e6d792bc32dbabbc8e files/cjdbc-init 926
 MD5 62ac24f25532a4183e3ed1e1480878e7 files/console.sh 606
+RMD160 5a5d1d144b02e6c7d5359c1b1f466a2abb7a930e files/console.sh 606
+SHA256 e90bce6b102d9ee3658b6ac261720f0b0468524e95b4773c503defe358d04cc9 files/console.sh 606
 MD5 d1171c36b6ee239f4db6aeaa9ad7519a files/controller.sh 1133
+RMD160 78ff8d62deabc03364fcf9ec04175da12cb2498f files/controller.sh 1133
+SHA256 562e5737d55a9a059cfd54855ac2a35e0c8481847164cdd53c88bced6327ded5 files/controller.sh 1133
 MD5 599e87927c86dfe53eaf0415b5bae480 files/digest-c-jdbc-1.0.4-r1 70
+RMD160 a84ab2fd25f13884238709ef16b30f40f229920a files/digest-c-jdbc-1.0.4-r1 70
+SHA256 121f64805345920e1f8494872805a454e307c6c7fca2ce487ba82638316513a0 files/digest-c-jdbc-1.0.4-r1 70
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDpaVXndWRXhKOboURAjQSAJ0YHcyCac0BcZcN3tWUhusEhWnKFACfQgDN
-JlqFDO4l20TutMPCY3pzrIE=
-=sFSm
------END PGP SIGNATURE-----
+RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
+SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
diff --git a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
index 3718c2ac0c39..a68ec2a41e5a 100644
--- a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
+++ b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.8 2005/12/18 18:06:40 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.9 2006/03/11 17:56:34 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -36,6 +36,13 @@ DEPEND=">=virtual/jdk-1.3
 
 S=${WORKDIR}/${P}-src
 
+pkg_setup() {
+	# add a user for cjdbc
+	if ! enewgroup cjdbc || ! enewuser cjdbc -1 /bin/sh /dev/null cjdbc; then
+		die "Unable to add cjdbc user and cjdbc group."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -112,11 +119,6 @@ src_install() {
 	dodir /etc/env.d/
 	echo "CJDBC_HOME=/usr/share/${PN}-${SLOT}" > ${D}etc/env.d/20cjdbc
 
-	# add a user for cjdbc
-	if ! enewgroup cjdbc || ! enewuser cjdbc -1 /bin/sh /dev/null cjdbc; then
-		die "Unable to add cjdbc user and cjdbc group."
-	fi
-
 	# we need a log directory
 	dodir /var/log/c-jdbc
 	touch ${D}/var/log/c-jdbc/cjdbc.log