Add missing enewgroup, rework a little (move enewuser to pkg_setup)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 20 insertions, 27 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 82e75253d415..8bb46113cc0e 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.91 2010/07/02 07:21:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.92 2010/07/03 08:26:39 reavertm Exp $
+
+  03 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org> quassel-9999.ebuild:
+  Add missing enewgroup, rework a little
 
   02 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> quassel-9999.ebuild:
   Introduce QT_MINIMAL and KDE_MINIMAL.
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 453ff1cf1a83..b696c6565482 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.5.2-fix_x11_detection.patch 854 RMD160 88585681941f9ed915edb4ec2f6a07d645ceb22e SHA1 80b6e5a9c75fb69d91f8ec86770369b20f412311 SHA256 1daa5834b1836756f74829e9d0861d9cfda7998a3a477c980fbdf5b2769c2500
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore-2.conf 756 RMD160 5f7ec7d1e46da202fdc18e2bd25827d307ec15fc SHA1 688039bd9616177eab803b7a4b12945e009cc806 SHA256 48079bebba2e723d582751b63b5d696ba506b364d20268c38f565f2c85257baa
@@ -13,13 +10,6 @@ DIST quassel-0.6.1.tar.bz2 2531035 RMD160 39e08319488062e02545055c91554ee1ea0259
 EBUILD quassel-0.5.1.ebuild 3218 RMD160 39c25156b7ed5c938be60b9b189d7c52a18af088 SHA1 5b9b23f3c6a99ce9494ba4c6d0ceef131c0d7d2a SHA256 d7e361d29f8ab6caf2303600e1832caab14165eda7201557ec3cc0a2e3055cdf
 EBUILD quassel-0.5.2.ebuild 3282 RMD160 2c191d65f757c83445da768cd83966c912682bc6 SHA1 00129b070abdd35dfafc8e12bcd286897b29697f SHA256 e7c9433470ad9a1a0e2b2d74f2e90dc15008fc86a484cf066ceb38f185832fba
 EBUILD quassel-0.6.1.ebuild 2901 RMD160 bffc3302e8829a4e4d3ffbe3d449f95b06cbd6d7 SHA1 7c5f1c1bb8c0bf5d1d9b2da962f1319e3ff44ec7 SHA256 ce206222ccec46dfdd8602d87a1cdfc71db626d2546863f9b2de95590013ebcd
-EBUILD quassel-9999.ebuild 3886 RMD160 c24d2df4553931a06bed3cb32bbba62f1253ca28 SHA1 ff5659b567baf93c347046fa96d2ea39d2366a03 SHA256 be40256b79a4743b0c94b1a3d060d0fd5b8d13b3a89c26fa9ea094534f51a4d0
-MISC ChangeLog 16113 RMD160 a5a98c771628b61724cdd151bb372dbe352be5f2 SHA1 a309aa9e1225dcb1b387a1432a0e0e78bfb4c32e SHA256 7c18ba1b66c8ccb2eeb50496996ecc964475586c6d3ef3b68fb471dd3aec6a18
+EBUILD quassel-9999.ebuild 3982 RMD160 5c450f79de3e1b5583e05748c790af603293ecad SHA1 211e2fd6a9a289f54f81615a087b1a0a0ca09803 SHA256 fbca5674fb44f010b040d1654d9396d8553e42ac2978f290ac68bd4e28347e5f
+MISC ChangeLog 16229 RMD160 994ef1c8a217bcb1835ba6b202faebe62881b8ac SHA1 c7103d15ccd3ae4a6a8dadd83ce5d628c878cb1b SHA256 359f4ba53d15c862024508f61dd6a9ed1b536e97af732a6b716432797bcc85d4
 MISC metadata.xml 1903 RMD160 cc0c6f3ca1ade233d4640dfd913e83ee13cdbdc2 SHA1 ae3def4a7ce3f9bfc42e79d3ea851c65e0c00c21 SHA256 6188126527fca9af504832fb9a492111c35b78fa9ed422ae0fcf2bcb6478cd95
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwtk4IACgkQHB6c3gNBRYffdwCfWyBcuSOF4g/R/AoVsoIW17oU
-uCcAoJGg4Hlb3uRe4iYZLRQ1GJk9pQzf
-=tCPz
------END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index e4ee48836132..ae2b56a0032b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.38 2010/07/02 07:21:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.39 2010/07/03 08:26:39 reavertm Exp $
 
 EAPI="2"
 
@@ -70,6 +70,14 @@ pkg_setup() {
 		ewarn "Enabling monolithic by default."
 		FORCED_MONO="yes"
 	fi
+
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
 }
 
 src_configure() {
@@ -97,9 +105,8 @@ src_install() {
 
 	if use server ; then
 		# prepare folders in /var/
-		dodir /var/lib/${PN}/
-		keepdir /var/lib/${PN}/
-		fowners ${PN}:${PN} /var/lib/${PN}/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
 		# init scripts
 		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
@@ -111,23 +118,16 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	if use server; then
-		# create quassel user
-		enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
-	fi
-}
-
 pkg_postinst() {
 	if use server && use ssl; then
 		# inform about genreating ssl certificate
 		elog "If you want to use ssl connection to your core, please generate ssl key, with folowing command:"
-		elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /var/lib/${PN}/quasselCert.pem -ou"
+		elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout ${QUASSEL_DIR}/quasselCert.pem -ou"
 		echo
 		elog "Also remember that with the above command the key is valid only for 1 year."
 	fi
 
-	if ( use monolithic || [[ ${FORCED_MONO} == "yes" ]] ) && use ssl ; then
+	if ( use monolithic || [[ "${FORCED_MONO}" == "yes" ]] ) && use ssl ; then
 		echo
 		elog "Information on how to enable SSL support for client/core connections"
 		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
@@ -137,7 +137,7 @@ pkg_postinst() {
 	if use server; then
 		ewarn "Please note that all configuration moved from"
 		ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/"
-		ewarn "to: /var/lib/${PN}/."
+		ewarn "to: ${QUASSEL_DIR}."
 		echo
 		ewarn "For migration. Stop the core, move the files to new location and then start server again."
 	fi