fix mailman installdir for real

Package-Manager: portage-2.1.3.9

2 files changed, 34 insertions, 27 deletions

diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index cc8f42741afa..45cd792b6b41 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -22,10 +22,10 @@ MD5 ce6d06f51e3da34e92048369e9fe14d2 files/mailman.rc 597
 RMD160 be0a574298a1d8d547a4ca76f864dd5fee9b897d files/mailman.rc 597
 SHA256 ef4f5482cf68ba44a0fbb83acde29295bd8dcb6512d259d14387dfc29beeb625 files/mailman.rc 597
 DIST mailman-2.1.9.tgz 7829201 RMD160 135f94eeecca1f562f98dfe98c1a367bed229372 SHA1 e9f6f55e2551c3e576460749383da20599412d42 SHA256 1b7a2c853c21bfd22205167dc3678c634a3f981721d95d1cd923ca84967cc986
-EBUILD mailman-2.1.9-r1.ebuild 3400 RMD160 8b5d295f1df48b57a7b09a227c01adb67bf321ab SHA1 1ed9600cfb017c923d041facdc9aabdc787d774f SHA256 1df6a7b47370a95adbf755dbf9f57896694e2a2035cb2f403abdf67c874184b7
-MD5 91cf413cd2e78146f5b48d48d4743bd5 mailman-2.1.9-r1.ebuild 3400
-RMD160 8b5d295f1df48b57a7b09a227c01adb67bf321ab mailman-2.1.9-r1.ebuild 3400
-SHA256 1df6a7b47370a95adbf755dbf9f57896694e2a2035cb2f403abdf67c874184b7 mailman-2.1.9-r1.ebuild 3400
+EBUILD mailman-2.1.9-r1.ebuild 3738 RMD160 41714f9314c76a835dac89346df7abd97386cc32 SHA1 5ecbfae2b56cc792d5f6a25ef20e06c93d6e75f0 SHA256 69aeee9da6249902baeb99455c0785720c4ba06033613636e94f3065c32654e4
+MD5 4f88904c8c5df72ac643f10403777062 mailman-2.1.9-r1.ebuild 3738
+RMD160 41714f9314c76a835dac89346df7abd97386cc32 mailman-2.1.9-r1.ebuild 3738
+SHA256 69aeee9da6249902baeb99455c0785720c4ba06033613636e94f3065c32654e4 mailman-2.1.9-r1.ebuild 3738
 EBUILD mailman-2.1.9.ebuild 3394 RMD160 073eb36288063f065b68851676b5d21729b6999c SHA1 19f3df9938c8830e724c9ae8e8390519d80fb499 SHA256 aa2f6ef7aaf113f13e8ff71ca181997f062b3f8f2a40f629023f7d0611de12c6
 MD5 9f208d87a83c8bf2fb7652d9e86769c5 mailman-2.1.9.ebuild 3394
 RMD160 073eb36288063f065b68851676b5d21729b6999c mailman-2.1.9.ebuild 3394
@@ -47,7 +47,7 @@ SHA256 7fdbc00422a55956c8b091193599ffd51a1042885148a22a246fcab0d1aa74f7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG6bNGr2QksT29OyARAoq4AJ9knxBbbts3D8uL0BXspxp/kXRzLQCghHhd
-6qnh4wGmOeY9E8vL6EwTbkY=
-=XoTO
+iD8DBQFG6ev4r2QksT29OyARAhnpAJ9WbOY/2ggMWAM3flzZmax1NhTaDwCfV6DL
+QjVdJgZXSPEl0XowppZUITw=
+=Cnj2
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/mailman-2.1.9-r1.ebuild b/net-mail/mailman/mailman-2.1.9-r1.ebuild
index b88c95609392..f5f21144d900 100644
--- a/net-mail/mailman/mailman-2.1.9-r1.ebuild
+++ b/net-mail/mailman/mailman-2.1.9-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/net-mail/mailman/mailman-2.1.9-r1.ebuild,v 1.1 2007/09/13 21:59:22 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild,v 1.2 2007/09/14 02:02:44 hanno Exp $
 
 inherit eutils depend.apache
 IUSE="postfix sendmail qmail courier exim xmail"
@@ -11,16 +11,13 @@ HOMEPAGE="http://www.list.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND=">=dev-lang/python-2.3
 	virtual/mta
 	virtual/cron
 	|| ( www-servers/apache www-servers/lighttpd )"
 
-INSTALLDIR="/usr/local/mailman"
-APACHEGID="81"
-
 if use postfix; then
 	MAILGID="280"
 elif use sendmail; then
@@ -38,6 +35,10 @@ else
 fi
 
 pkg_setup() {
+	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/lib/mailman"}
+	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
+	APACHEGID=${MAILMAN_APACHEGID:-81}
+
 	# Bug #58526: switch to enew{group,user}.
 	# need to add mailman here for compile process.
 	# Duplicated at pkg_postinst() for binary install.
@@ -55,27 +56,27 @@ src_unpack() {
 }
 
 src_compile() {
-	econf \
+	econf --without-permcheck \
 		--prefix=${INSTALLDIR} \
 		--with-mail-gid=${MAILGID} \
 		--with-cgi-gid=${APACHEGID} \
+		--with-var-prefix=${VAR_PREFIX} \
 	|| die "configure failed"
 
 	make || die "make failed"
 }
 
 src_install () {
-	ID=${D}${INSTALLDIR}
+	make DESTDIR=${D} doinstall || die
 
-	make prefix=${ID} var_prefix=${ID} doinstall || die
+	keepdir ${VAR_PREFIX}/logs
+	keepdir ${VAR_PREFIX}/locks        
+	keepdir ${VAR_PREFIX}/spam
+	keepdir ${VAR_PREFIX}/archives/public
+	keepdir ${VAR_PREFIX}/archives/private
+	keepdir ${VAR_PREFIX}/lists
+	keepdir ${VAR_PREFIX}/qfiles
 
-	keepdir ${INSTALLDIR}/logs
-	keepdir ${INSTALLDIR}/locks
-	keepdir ${INSTALLDIR}/spam
-	keepdir ${INSTALLDIR}/archives/public
-	keepdir ${INSTALLDIR}/archives/private
-	keepdir ${INSTALLDIR}/lists
-	keepdir ${INSTALLDIR}/qfiles
 
 	insinto ${APACHE2_MODULES_CONFDIR}
 	doins ${FILESDIR}/50_mailman.conf
@@ -85,8 +86,9 @@ src_install () {
 	dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
 	dodoc contrib/virtusertable contrib/mailman.mc
 
-	cp build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* ${ID}/bin
+	exeinto ${INSTALLDIR}/bin
+	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+		contrib/mm-handler* || die
 
 	# Save the old config into the new package as CONFIG_PROTECT
 	# doesn't work for this package.
@@ -95,7 +97,7 @@ src_install () {
 	do
 		if [ -f ${i}/Mailman/mm_cfg.py ]; then
 			cp ${i}/Mailman/mm_cfg.py \
-				${ID}/Mailman/mm_cfg.py
+				${D}/${INSTALLDIR}/Mailman/mm_cfg.py
 			elog "Your old config has been saved as mm_cfg.py"
 			elog "A new config has been installed as mm_cfg.dist"
 		fi
@@ -103,8 +105,8 @@ src_install () {
 
 	newinitd ${FILESDIR}/mailman.rc mailman
 
-	chown -R mailman:mailman ${ID}
-	chmod 2775 ${ID}
+	chown -R mailman:mailman ${D}/${INSTALLDIR}
+	chmod 2775 ${D}/${INSTALLDIR}
 }
 
 pkg_postinst() {
@@ -126,4 +128,9 @@ pkg_postinst() {
 	elog "To enable, you will need to add \"-D MAILMAN\" to"
 	elog "/etc/conf.d/apache2."
 	elog
+
+	ewarn "Default-Paths have changed with 2.1.9-r1. You can change paths with the"
+	ewarn "MAILMAN_INSTALLDIR and MAILMAN_VAR_PREFIX variables."
+	ewarn
+	ebeep
 }