Fix for bug #175948

Package-Manager: portage-2.1.2.2

4 files changed, 50 insertions, 18 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index f7ab0fc64beb..3a55f1453539 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.73 2007/04/23 20:46:08 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.74 2007/04/26 19:29:24 ferdy Exp $
+
+  26 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/maildrop-2.0.4-makedat.patch, maildrop-2.0.4.ebuild:
+  Fix for bug #175948
 
 *maildrop-2.0.4 (23 Apr 2007)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 5131f5979fb8..d5a4dae146a2 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -9,6 +9,10 @@ AUX maildrop-1.8.1-disable-fam.patch 2511 RMD160 3fc7bf21d425c6e676475458c99a5ed
 MD5 e7efb3052fe6605244b78179990197f0 files/maildrop-1.8.1-disable-fam.patch 2511
 RMD160 3fc7bf21d425c6e676475458c99a5ed2d4e93469 files/maildrop-1.8.1-disable-fam.patch 2511
 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3 files/maildrop-1.8.1-disable-fam.patch 2511
+AUX maildrop-2.0.4-makedat.patch 1119 RMD160 e6f8a0b677b3ab3a03c87e7cddc2506b45539579 SHA1 78bb74fde5fab0156e1a26951a7847d3541fd86e SHA256 5636617c387769f295812b9aceb63ad90c8117f52f29071f09351331165983e6
+MD5 d7ca7a9632d6d0f7e7e41f8db53a3e61 files/maildrop-2.0.4-makedat.patch 1119
+RMD160 e6f8a0b677b3ab3a03c87e7cddc2506b45539579 files/maildrop-2.0.4-makedat.patch 1119
+SHA256 5636617c387769f295812b9aceb63ad90c8117f52f29071f09351331165983e6 files/maildrop-2.0.4-makedat.patch 1119
 AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd605991606a3bf89296f2d3f3a5f7a7327aba SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 files/maildroprc 58
@@ -24,14 +28,14 @@ EBUILD maildrop-2.0.3.ebuild 3135 RMD160 8be4506a9edc67d88e44ec8490fa4540c83b6c8
 MD5 ce2b185fb81cf59e53dcae143a99dff9 maildrop-2.0.3.ebuild 3135
 RMD160 8be4506a9edc67d88e44ec8490fa4540c83b6c8a maildrop-2.0.3.ebuild 3135
 SHA256 f4b359faf06120e98d19f7518dc2402d1b84bf12d01c7ba2f50937cc2f372377 maildrop-2.0.3.ebuild 3135
-EBUILD maildrop-2.0.4.ebuild 3134 RMD160 3a2a5bba87e2aea1cd3e122c60ab5f40c4bb591e SHA1 9ed0f40a43100b6dac682117f51566f6f7c315c7 SHA256 922d495713b844f363422e83e90c90f71d32e5cd593ab99ae3c5f5399347f9db
-MD5 916efc49b06c4e813e205ed20cd4a69e maildrop-2.0.4.ebuild 3134
-RMD160 3a2a5bba87e2aea1cd3e122c60ab5f40c4bb591e maildrop-2.0.4.ebuild 3134
-SHA256 922d495713b844f363422e83e90c90f71d32e5cd593ab99ae3c5f5399347f9db maildrop-2.0.4.ebuild 3134
-MISC ChangeLog 16977 RMD160 e5a1071510ea21f09ab02141c9b5fe3aabec8936 SHA1 bf06eda13fdd513084f88aae367946aea1955bc0 SHA256 da179b4125cc9b2f024171ca5fab14eaae836d5cd1216f059a448fdeeaa6a90e
-MD5 1ccc33b7e64bf5d152815708e44b714c ChangeLog 16977
-RMD160 e5a1071510ea21f09ab02141c9b5fe3aabec8936 ChangeLog 16977
-SHA256 da179b4125cc9b2f024171ca5fab14eaae836d5cd1216f059a448fdeeaa6a90e ChangeLog 16977
+EBUILD maildrop-2.0.4.ebuild 3079 RMD160 2286751761d08300bd7bfba95e5b58cda3ccb03e SHA1 d75918b0f2254e0e9f10bd2dc8c77374510f9e12 SHA256 f2f860d1d5b2f0cd02f981276b19606fbe6d089bb16b80b3af1ecb6cfc89fefa
+MD5 503bcecbc494c4234b9f36483aadad99 maildrop-2.0.4.ebuild 3079
+RMD160 2286751761d08300bd7bfba95e5b58cda3ccb03e maildrop-2.0.4.ebuild 3079
+SHA256 f2f860d1d5b2f0cd02f981276b19606fbe6d089bb16b80b3af1ecb6cfc89fefa maildrop-2.0.4.ebuild 3079
+MISC ChangeLog 17115 RMD160 261e67e448dcde7e3e378bbc798feadde5ad6e02 SHA1 b565da2ec0df46be19ecff9639944e03ef37af34 SHA256 1a4c5f2f7ad3feece086e446a8e44248836de0f95659e41a8209efb3c1aec687
+MD5 9d8ded276ab48c12ba48fffb34b76b16 ChangeLog 17115
+RMD160 261e67e448dcde7e3e378bbc798feadde5ad6e02 ChangeLog 17115
+SHA256 1a4c5f2f7ad3feece086e446a8e44248836de0f95659e41a8209efb3c1aec687 ChangeLog 17115
 MISC metadata.xml 259 RMD160 ce66370016fba0ddf047802d9dc8463041b4a585 SHA1 9f7a04d0cab1654d39498db3f124fc755202adb7 SHA256 d0e8725b6ece5de6014dd4b18064854b993b1e3ab04d838370d7744756656ae5
 MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
 RMD160 ce66370016fba0ddf047802d9dc8463041b4a585 metadata.xml 259
@@ -48,7 +52,7 @@ SHA256 9b0b2c79f758315978db7627a85415130e8d80e211975efaafa68cd0d6cc6d7a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGLRsdViELBEf1JB0RAveKAJ436ptleSZGftBSe0qdYPUbDsAYUgCghI/Y
-Fby99m/kf0whxNZKr/hYrE0=
-=/LDv
+iD8DBQFGMP+oViELBEf1JB0RAqS2AJ9smp05wvi9a9GVCcfT9UekyajDDACfYGH1
+TmPRJIZ9A9BDMsmU4thMl+E=
+=pcqv
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/maildrop-2.0.4-makedat.patch b/mail-filter/maildrop/files/maildrop-2.0.4-makedat.patch
new file mode 100644
index 000000000000..2b3953926a20
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-2.0.4-makedat.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile.am b/Makefile.am
+index 988867e..8b39d6b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -127,7 +127,6 @@ install-maildrop:
+ 	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
+ 	$(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
+ 	$(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
+-	$(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+ 	$(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(bindir)/makedat
+ 	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
+ 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
+diff --git a/makedat/Makefile.am b/makedat/Makefile.am
+index 360d1fa..626e5bd 100644
+--- a/makedat/Makefile.am
++++ b/makedat/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/../automake.fix @AUTOMAKE@
+ 
+-noinst_PROGRAMS=@makedatprog_target@
++bin_PROGRAMS=@makedatprog_target@
+ 
+ EXTRA_PROGRAMS=makedatprog
+ 
diff --git a/mail-filter/maildrop/maildrop-2.0.4.ebuild b/mail-filter/maildrop/maildrop-2.0.4.ebuild
index 2c5256dcbfd2..ad7821e976e1 100644
--- a/mail-filter/maildrop/maildrop-2.0.4.ebuild
+++ b/mail-filter/maildrop/maildrop-2.0.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/maildrop/maildrop-2.0.4.ebuild,v 1.1 2007/04/23 20:46:08 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.0.4.ebuild,v 1.2 2007/04/26 19:29:24 ferdy Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -42,8 +42,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-makedat.patch
+
 	# Do not use lazy bindings on /usr/bin/maildrop
-	sed -i -e "s~^maildrop_LDFLAGS =~& $(bindnow-flags)~g" maildrop/Makefile.in
+	sed -i -e "s~^maildrop_LDFLAGS =~& $(bindnow-flags)~g" maildrop/Makefile.am
 
 	# Prefer gdbm over berkdb
 	if use gdbm ; then
@@ -56,10 +58,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch
 	fi
 
-	# Only recreate configure if needed
-	if ! use fam || { ! use gdbm && use berkdb ; } ; then
-		eautoreconf
-	fi
+	eautoreconf
 }
 
 src_compile() {