Removed bogus duplicate pkg_preinst() and moved enewuser/enewgroup calls to real pkg_preinst(). Bug #178594, by <sakkath at sakkath.com>.

(Portage version: 2.1.2.7)

9 files changed, 53 insertions, 49 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 069fd54f54dc..9b895e683d25 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.108 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.109 2007/05/23 22:51:10 ticho Exp $
+
+  23 May 2007; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
+  amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,
+  amavisd-new-2.4.2-r1.ebuild, amavisd-new-2.4.3.ebuild,
+  amavisd-new-2.4.4.ebuild, amavisd-new-2.4.5-r1.ebuild,
+  amavisd-new-2.5.0.ebuild:
+  Removed bogus duplicate pkg_preinst() and moved enewuser/enewgroup calls to
+  real pkg_preinst(). Bug #178594, by <sakkath at sakkath.com>.
 
 *amavisd-new-2.5.0 (24 Apr 2007)
 
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
index 78a1fad1ff98..c10ef002ed13 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.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/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.16 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.17 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -51,11 +51,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT=/var/amavis
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then
 		echo
@@ -162,6 +157,11 @@ src_install() {
 	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
index 5bc3311e587a..4edddb76d6ed 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.1.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/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.10 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.11 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -50,11 +50,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	if $(has_version "<mail-filter/spamassassin-3") ; then
 		echo
@@ -160,6 +155,11 @@ src_install() {
 	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
index 46b6de79207d..89d341b6a3d0 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2-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/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.4 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.5 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -50,11 +50,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	if $(has_version "<mail-filter/spamassassin-3") ; then
 		echo
@@ -162,6 +157,11 @@ src_install() {
 	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
index 6dab88e1d9be..eccebf5f30df 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2.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/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.4 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.5 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -50,11 +50,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	if $(has_version "<mail-filter/spamassassin-3") ; then
 		echo
@@ -160,6 +155,11 @@ src_install() {
 	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
index d6379b831e93..3baff9eedc50 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.3.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/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.4 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.5 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -50,11 +50,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	if $(has_version "<mail-filter/spamassassin-3") ; then
 		echo
@@ -162,6 +157,11 @@ src_install() {
 	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
index fde8016d0553..f794e6fe868b 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.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/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.6 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.7 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -50,11 +50,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	if $(has_version "<mail-filter/spamassassin-3") ; then
 		echo
@@ -160,6 +155,11 @@ src_install() {
 	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
+pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+}
+
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
index 8abd8132af39..3c090bbc110f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.5-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/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild,v 1.3 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5-r1.ebuild,v 1.4 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -50,11 +50,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -136,6 +131,9 @@ src_install() {
 }
 
 pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+
 	if [ -z "$(dnsdomainname)" ] ; then
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
 			/etc/amavisd.conf
diff --git a/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild
index 437cd7b450b9..f27955dfda12 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.5.0.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/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild,v 1.1 2007/04/24 16:38:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.0.ebuild,v 1.2 2007/05/23 22:51:10 ticho Exp $
 
 inherit eutils
 
@@ -49,11 +49,6 @@ RDEPEND="${DEPEND}
 
 AMAVIS_ROOT="/var/amavis"
 
-pkg_preinst() {
-	enewgroup amavis
-	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -143,6 +138,9 @@ src_install() {
 }
 
 pkg_preinst() {
+	enewgroup amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
+
 	if [ -z "$(dnsdomainname)" ] ; then
 		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
 			/etc/amavisd.conf