mailman fix for 53054

Package-Manager: portage-2.1_pre10-r3

4 files changed, 33 insertions, 36 deletions

diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index 5f86ee7a76bd..305e553339d6 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mailman
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.76 2006/04/29 16:20:16 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.77 2006/05/08 12:28:49 hanno Exp $
+
+  08 May 2006; Hanno Boeck <hanno@gentoo.org> metadata.xml,
+  mailman-2.1.8_rc1.ebuild:
+  Make ebuild fully support INSTALLDIR (bug #84708) and add myself as maintainer.
 
   29 Apr 2006; Luis Medinas <metalgod@gentoo.org> mailman-2.1.8_rc1.ebuild:
   Stable on amd64. For security bug #129136.
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 44b8824139fe..ba06473fadb1 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -74,18 +74,18 @@ EBUILD mailman-2.1.7.ebuild 4344 RMD160 a5b5b247219a04740477233082aa41364a5f49fe
 MD5 e83c78d42876b9dcb68aaa7cbd0b5a7d mailman-2.1.7.ebuild 4344
 RMD160 a5b5b247219a04740477233082aa41364a5f49fe mailman-2.1.7.ebuild 4344
 SHA256 1df89f5b228ce6c302a023632a2cd20f05ee76c8389b6fd4df28657e883936ab mailman-2.1.7.ebuild 4344
-EBUILD mailman-2.1.8_rc1.ebuild 4177 RMD160 50c41cf32e354de71596178bb0af9aa1d0bff14b SHA1 eb36f951154c1dc09d171ce9bfbd59b59eec0a67 SHA256 e2e5fa05d1459ca86e9cd4cf577a87fda70bad3439cab3523d9ea7a602e3c37d size 4177
-MD5 511c52a2b89b9967e622db86aa8efba4 mailman-2.1.8_rc1.ebuild 4177
-RMD160 50c41cf32e354de71596178bb0af9aa1d0bff14b mailman-2.1.8_rc1.ebuild 4177
-SHA256 e2e5fa05d1459ca86e9cd4cf577a87fda70bad3439cab3523d9ea7a602e3c37d mailman-2.1.8_rc1.ebuild 4177
-MISC ChangeLog 10227 RMD160 2646bc2439dca452417c4c74aec889ca41e33993 SHA1 f13e7e7e45f18310cb5d7c1d47137297b8ebf70a SHA256 37a2eb86d3645e1cc4bbf8c4c64223adaf3aed70579793bf5aee36fe0324da07 size 10227
-MD5 20e054c13d5a5079ebc4e634d7aef4b2 ChangeLog 10227
-RMD160 2646bc2439dca452417c4c74aec889ca41e33993 ChangeLog 10227
-SHA256 37a2eb86d3645e1cc4bbf8c4c64223adaf3aed70579793bf5aee36fe0324da07 ChangeLog 10227
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 size 161
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
-SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
+EBUILD mailman-2.1.8_rc1.ebuild 3683 RMD160 eacf64054ca67f7385b06bb93a6dada1a3c16e29 SHA1 6c1f42d4f6cf2e213fe12b9aa63422b38b1724d8 SHA256 0200e4bdc46ce2c4cb9976ca96880bf8f423740ba7e1ab4516df0e01af08c4fd size 3683
+MD5 64a6fda181bc69d1dba537a76effe6f2 mailman-2.1.8_rc1.ebuild 3683
+RMD160 eacf64054ca67f7385b06bb93a6dada1a3c16e29 mailman-2.1.8_rc1.ebuild 3683
+SHA256 0200e4bdc46ce2c4cb9976ca96880bf8f423740ba7e1ab4516df0e01af08c4fd mailman-2.1.8_rc1.ebuild 3683
+MISC ChangeLog 10395 RMD160 6425c104f38a6dc96bd82931fe46c3a37097dd30 SHA1 27a0a03c4fb56353a28c09793f4e08cead4458ab SHA256 2cf6ca9e684bc6c7417516f97541986e47facbff26fbec27ecf322e76e39202f size 10395
+MD5 50b238f2aa1c9ef9535f76cc08f0749a ChangeLog 10395
+RMD160 6425c104f38a6dc96bd82931fe46c3a37097dd30 ChangeLog 10395
+SHA256 2cf6ca9e684bc6c7417516f97541986e47facbff26fbec27ecf322e76e39202f ChangeLog 10395
+MISC metadata.xml 218 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff SHA1 486b307ff1dae10aef7d18472460a21bc2decdfb SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 size 218
+MD5 45b42e062b70460f0304d1ebe48d82ab metadata.xml 218
+RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff metadata.xml 218
+SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 metadata.xml 218
 MD5 136d82be0bd84eff6961446171dbe288 files/digest-mailman-2.1.5-r4 63
 RMD160 689928adacbd8a9b9bf64c38e1341d4ac704b0c6 files/digest-mailman-2.1.5-r4 63
 SHA256 1f6a203e04ebb008eebf2316a333eb2e19f22490dc5556f47b3aa4dafcfb7a4d files/digest-mailman-2.1.5-r4 63
@@ -107,7 +107,7 @@ SHA256 622899b7584ff1d39e274d61a37cb0e9aa6d685324d8bbf6a42cc01d4fad5af7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEU5IxwUpWvClEHQoRAmhrAJwJcoZ9IJogPhUocP0eHEyLHdxwIACfSkti
-C+xLFrAPupePXMcVjSCq2n0=
-=2tj1
+iD8DBQFEXzm5r2QksT29OyARAndjAJ40VjgLGlRJxmQIHswjK4wGQKOe3QCfWlNd
+0pmOxGELmTiwFuMDzqbuzw8=
+=aj4/
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailman/mailman-2.1.8_rc1.ebuild b/net-mail/mailman/mailman-2.1.8_rc1.ebuild
index 69942c233e11..ece54c63a4d1 100644
--- a/net-mail/mailman/mailman-2.1.8_rc1.ebuild
+++ b/net-mail/mailman/mailman-2.1.8_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.8_rc1.ebuild,v 1.6 2006/04/29 16:20:16 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.8_rc1.ebuild,v 1.7 2006/05/08 12:28:49 hanno Exp $
 
 inherit eutils depend.apache
 IUSE="apache2 postfix sendmail qmail courier exim xmail"
@@ -92,28 +92,20 @@ src_install () {
 	dodoc contrib/virtusertable contrib/mailman.mc
 
 	cp build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler* ${D}/usr/local/mailman/bin
+		contrib/mm-handler* ${ID}/bin
 
 	# Save the old config into the new package as CONFIG_PROTECT
 	# doesn't work for this package.
-	if [ -f ${ROOT}/var/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/var/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.dist"
-	fi
-	if [ -f ${ROOT}/home/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/home/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
-	if [ -f ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py ]; then
-		cp ${ROOT}/usr/local/mailman/Mailman/mm_cfg.py \
-			${D}/usr/local/mailman/Mailman/mm_cfg.py
-		einfo "Your old config has been saved as mm_cfg.py"
-		einfo "A new config has been installed as mm_cfg.py.dist"
-	fi
+	for i in ${ROOT}/var/mailman ${ROOT}/home/mailman \
+		${ROOT}/usr/local/mailman ${INSTALLDIR}
+	do
+		if [ -f ${i}/Mailman/mm_cfg.py ]; then
+			cp ${i}/Mailman/mm_cfg.py \
+				${ID}/Mailman/mm_cfg.py
+			einfo "Your old config has been saved as mm_cfg.py"
+			einfo "A new config has been installed as mm_cfg.dist"
+		fi
+	done
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/mailman.rc mailman
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 51f94e3fbe0e..b507dbb0fd19 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-mail</herd>
+<maintainer><email>hanno@gentoo.org</email></maintainer>
 </pkgmetadata>