Bug #388383: USE=-cgi installed the cgi files anyway, in /no/ due to bug in upstream configure.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 33 insertions, 4 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 8e416d1f154e..a0190529bad8 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.64 2011/10/22 22:57:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.65 2011/10/24 21:38:44 robbat2 Exp $
+
+*dcc-1.3.140-r1 (24 Oct 2011)
+
+  24 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> -dcc-1.3.140.ebuild,
+  +dcc-1.3.140-r1.ebuild, +files/dcc-1.3.140-configure-fix.patch:
+  Bug #388383: USE=-cgi installed the cgi files anyway, in /no/ due to bug in
+  upstream configure.
 
 *dcc-1.3.140 (22 Oct 2011)
 
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 4200d9ad8bba..26e391e02692 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,3 +1,4 @@
+AUX dcc-1.3.140-configure-fix.patch 426 RMD160 4cccb07f0631bcccad4943e29429f4067830a529 SHA1 c4ca2242ae7bc9e2f5fee24d7ddba7b594687c3d SHA256 b3cebec1d0f22d3158f15613a227c924dc6e8edc1f14fd9e562306da3fc132ba
 AUX dcc-1.3.86.patch 1337 RMD160 266253bd960c5a81c7af50174818538b6fd734f6 SHA1 dead098768cad2add66d6ab57d973c6aa3e8a285 SHA256 0ff766a5c4254be8af20bfc7e3b350e8f9990faa6ebb87d1f5d8b982f8bb572b
 AUX dcc.confd 274 RMD160 da42330e9085960e6dae4fe26db74ae2742ef0a9 SHA1 36e1920c5cab693e123f6b324bd229903531d8f2 SHA256 c3c379c26d3c06a18ba87bd22bb299cbcacad262eff78ce75385c6d753373a0e
 AUX dcc.initd 3119 RMD160 dc9354fce2a473b4bc1e3f9869f8de566529d1fe SHA1 33d2850814f68dfc9c1484271becbaf5bafb8cd2 SHA256 3b953c64975953d657f67d7d4697626508696ef262e786616a951017445dd339
@@ -12,8 +13,8 @@ EBUILD dcc-1.3.102.ebuild 4235 RMD160 00b7c88924a5587eec50550ff4a07b9dd3ef9633 S
 EBUILD dcc-1.3.119-r1.ebuild 4316 RMD160 a96b559f914c363aea99844e63a9d0c0242c7cc0 SHA1 b2a154e58731659c4816bee90628378cb7835af9 SHA256 dd5febb6de63cc2fb531c61570f4863f49fb39c6fcb6ec4923cedb64398a7802
 EBUILD dcc-1.3.119.ebuild 4281 RMD160 28a2d0da63179a4004b18a3587509ff6716a1df6 SHA1 29a6813eabd963665da5a7459f473e2394108d3e SHA256 5e41bf38b798a92def77c40dabd34d7a243238565de8cdb945ad9990a7c8c9b1
 EBUILD dcc-1.3.135.ebuild 4312 RMD160 b411c1dabf20f8fbc6714838940eab33b30c2ff9 SHA1 19dd8f51d2a028fe066783c88246083d44b198b0 SHA256 9259c69aae7641f99b001638902bf6f7597938d3bfe237b15c3d9e0b4da1f4d5
-EBUILD dcc-1.3.140.ebuild 4488 RMD160 94558ec6c547fe392da2f69dec6250bc24af0168 SHA1 3c26c09198c76927ac751e451de7289b2435ca73 SHA256 6f6aeac5843fabdc619aa9bfa62c89d3f3795f6b1809c9f498cf06549b7f83fb
+EBUILD dcc-1.3.140-r1.ebuild 4564 RMD160 b68bc759143170593808306e01fcb194c453198c SHA1 c5886e3754d0fe840c322b04db357724f3a55f93 SHA256 8bf9bb618a9167d6b6600a0fb53e74fad92ec5cb7cbe5d0a992f9f140c498985
 EBUILD dcc-1.3.55.ebuild 3905 RMD160 2048de4a0ea38b451806261e00cd5492475f3cd5 SHA1 750529f7bf9aec06595ad8831afd5a6ff16a0720 SHA256 6e40f958e75847e4b515dc20677294808ee11af0474b094c6e3bff160379a036
 EBUILD dcc-1.3.97.ebuild 4234 RMD160 16a8c7f27bea2d3ff7fc647fa11706273177c973 SHA1 9e572f511e0e6f933c2d8f1ce7229e18e6ead319 SHA256 a6aaa86f28b023a7c3d019aeda19bf3de65094bd10460cf5b14a4a9d4f12bc46
-MISC ChangeLog 7921 RMD160 13e57d0c56e3adc7e2da73cbeeabf42ff8c7d26b SHA1 4e065f842ea56a54cfb72f895f772f00442c0545 SHA256 259a711d747c00af82dc9d3b04262ca334648a52fd363ac9b620787e2a9b730b
+MISC ChangeLog 8193 RMD160 5d8904e116ab27d3af3dde126aa46f600b21b79e SHA1 d954a313f4910b1c1df3a9f4a720f6c069cb080a SHA256 9e1a3ee6b4dc64fd3bb0f969fa83819bcb9009890bf8febf3de5954c9c50d761
 MISC metadata.xml 324 RMD160 76205802852d0b5b55cdfe30c25452661675f4ae SHA1 9c261fe7a0389a016a42475447505c6c816a6a42 SHA256 ceb55854f84ec88f0305b0138c48c22bd8fa0834127c78cc158447527dad7155
diff --git a/mail-filter/dcc/dcc-1.3.140.ebuild b/mail-filter/dcc/dcc-1.3.140-r1.ebuild
index 16df86c28ac9..3ca454e32d0f 100644
--- a/mail-filter/dcc/dcc-1.3.140.ebuild
+++ b/mail-filter/dcc/dcc-1.3.140-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.140.ebuild,v 1.1 2011/10/22 22:57:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.140-r1.ebuild,v 1.1 2011/10/24 21:38:44 robbat2 Exp $
 
 EAPI=2
 
@@ -29,6 +29,10 @@ dcc_libexec=/usr/sbin
 dcc_man=/usr/share/man
 dcc_rundir=/var/run/dcc
 
+src_prepare() {
+	epatch "${FILESDIR}"/dcc-1.3.140-configure-fix.patch
+}
+
 src_configure() {
 	local myconf
 	myconf="${myconf} --homedir=${dcc_homedir}"
diff --git a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch b/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
new file mode 100644
index 000000000000..41620929c61e
--- /dev/null
+++ b/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
@@ -0,0 +1,17 @@
+Avoid installing into /no/.
+
+Signed-off-by: Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>
+X-Gentoo-Bug: 388383
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/388383
+
+--- dcc-1.3.140/configure
++++ dcc-1.3.140/configure
+@@ -3256,7 +3256,7 @@
+   withval="$with_cgibin"
+   :
+ fi
+-if test -n "$with_cgibin" -a "$with_cgi_bin" != no; then
++if test -n "$with_cgibin" -a "$with_cgibin" != no; then
+     cgibin="$with_cgibin"
+ fi
+