break out --enable-apop into a USE flag. Closes bug #106367, thanks to Christian Heutger for reporting

Package-Manager: portage-2.1.4.4

3 files changed, 16 insertions, 22 deletions

diff --git a/net-mail/qpopper/ChangeLog b/net-mail/qpopper/ChangeLog
index 00f0a1c39aa9..04d5390e07d2 100644
--- a/net-mail/qpopper/ChangeLog
+++ b/net-mail/qpopper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/qpopper
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/ChangeLog,v 1.24 2008/05/14 23:05:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/ChangeLog,v 1.25 2008/06/04 04:46:21 darkside Exp $
+
+  04 Jun 2008; Jeremy Olexa <darkside@gentoo.org> qpopper-4.0.5-r3.ebuild:
+  break out --enable-apop into a USE flag. Closes bug #106367, thanks to
+  Christian Heutger for reporting
 
   14 May 2008; Diego Pettenò <flameeyes@gentoo.org>
   qpopper-4.0.5-r3.ebuild:
diff --git a/net-mail/qpopper/Manifest b/net-mail/qpopper/Manifest
index 71067d14f1b4..d5c995776be4 100644
--- a/net-mail/qpopper/Manifest
+++ b/net-mail/qpopper/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qpopper-CAN-2005-1151.patch 4628 RMD160 952a4dfc535d2b02fab10e8c760a764ce0e6b0ff SHA1 992b84fe1413638b5d01cf1e9d465a9a92e14a84 SHA256 0141a199029245e8e08277ae1ea53e6c7eb681cbb4e4aca2428b1b8e88b97451
 AUX qpopper-CAN-2005-1152.patch 429 RMD160 6d13c9453ef334f4eeadc3b0808d3a3de6b50551 SHA1 da120a5c7cb822b2a07d23a9510aedfcc045917c SHA256 c2ab4c613ea259550c6b52d1a40d2f6cdf3edb21ec4a46fdefa3c31f142224e5
 DIST qpopper-files.tar.bz2 269722 RMD160 38df1dfb02f10fca2759a93fe141faf39c176fa6 SHA1 2ee9b2c0a224e314a0c2c0bfabe1174ce193ac91 SHA256 48b66460285bacc1d497e466fe74650a0a956ece000eb9d05cec54b9296d38c2
 DIST qpopper4.0.5.tar.gz 2281284 RMD160 e05c1b0823c8942d791c7b48af82e278a51591d2 SHA1 726d40da2210bf4b82541a28971986e6a3d9e1a5 SHA256 03560b6c36695364b84313d213be2dab4462ddcf11be3b6314966131bd9ba183
-EBUILD qpopper-4.0.5-r3.ebuild 3818 RMD160 e538990ca423787cfe2faf725e977d842ab94575 SHA1 ff35283c6d16a53d888b37fb4b7c71ee3f96d097 SHA256 945110cd21506f17ed0226b302278ab23ae3c5530eac0f0e17f404db32a9b150
-MISC ChangeLog 3106 RMD160 4ea5ac935e9fd2a77e377338fd51d7aa24045d70 SHA1 5747dd8b14c3966c7216f1260092d6663b9a0d78 SHA256 f26d0b4ef180c43178d445a3b4b356f391790b86652bc09b5d7cff3879c1b57a
+EBUILD qpopper-4.0.5-r3.ebuild 3860 RMD160 d6273dd9832738569b24b923a8c654f8e6352258 SHA1 fb9405314e52e4150ae03b18174ab43eadaa5f7c SHA256 3178bf79fe806951269174c4ae60f149b5210a538a78f81a0647a49b96414bc3
+MISC ChangeLog 3288 RMD160 0d7ef52dabbdedd084290193be3136a14c4b443b SHA1 479a4cf496ce12cf890059f93f93bc22f298711a SHA256 b2df472772912e55ca80673536d2d929dc4f6049ce3cc628c67e58ede3329481
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgrcDQACgkQAiZjviIA2Xg+dwCgwEFqFG1LB34bhAjWZk886ooM
-1+QAnjBbp96sPCbzWwduCN8WVKfRPjD0
-=dGJg
------END PGP SIGNATURE-----
diff --git a/net-mail/qpopper/qpopper-4.0.5-r3.ebuild b/net-mail/qpopper/qpopper-4.0.5-r3.ebuild
index ea79bc40622f..4648dd5da6fb 100644
--- a/net-mail/qpopper/qpopper-4.0.5-r3.ebuild
+++ b/net-mail/qpopper/qpopper-4.0.5-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/qpopper-4.0.5-r3.ebuild,v 1.4 2008/05/14 23:05:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/qpopper-4.0.5-r3.ebuild,v 1.5 2008/06/04 04:46:21 darkside Exp $
 
 inherit eutils
 
-IUSE="debug gdbm mailbox pam ssl xinetd"
+IUSE="apop debug gdbm mailbox pam ssl xinetd"
 
 S=${WORKDIR}/${PN}${PV}
 DESCRIPTION="A POP3 Server"
@@ -28,7 +28,7 @@ KEYWORDS="~amd64 sparc x86"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}/${PN}-CAN-2005-1151.patch" || die "first patch failed"
 	epatch "${FILESDIR}/${PN}-CAN-2005-1152.patch" || die "second patch failed"
 }
@@ -40,11 +40,11 @@ src_compile() {
 	use mailbox && myconf="${myconf} --enable-home-dir-mail=Mailbox"
 	use xinetd && myconf="${myconf} --disable-standalone" || \
 		myconf="${myconf} --enable-standalone"
+	use apop && myconf="${myconf} --enable-apop=/etc/pop.auth"
 	myconf="${myconf} $(use_enable debug debugging)"
 	myconf="${myconf} $(use_with ssl openssl)"
 	myconf="${myconf} $(use_with gdbm)"
-	econf --enable-apop=/etc/pop.auth \
-		--enable-popuid=pop \
+	econf --enable-popuid=pop \
 		--enable-log-login \
 		--enable-specialauth \
 		--enable-log-facility=LOG_MAIL \
@@ -76,7 +76,7 @@ EOF
 	fi
 
 	if ! use gdbm; then
-		sed -i -e 's|#define HAVE_GDBM_H|//#define HAVE_GDBM_H|g' ${S}/config.h || \
+		sed -i -e 's|#define HAVE_GDBM_H|//#define HAVE_GDBM_H|g' "${S}"/config.h || \
 			die "sed failed"
 	fi
 
@@ -91,14 +91,14 @@ src_install() {
 		dodir /etc/mail/certs
 		fowners root:mail /etc/mail/certs
 		fperms 660 /etc/mail/certs
-		mv cert.pem ${D}/etc/mail/certs
+		mv cert.pem "${D}"/etc/mail/certs
 		fperms 600 /etc/mail/certs/cert.pem
 		fowners root:0 /etc/mail/certs/cert.pem
 	fi
 
 	doman man/popauth.8 man/popper.8
 
-	dodoc ${WORKDIR}/GUIDE.pdf
+	dodoc "${WORKDIR}"/GUIDE.pdf
 
 	docinto rfc
 	dodoc doc/rfc*.txt
@@ -110,7 +110,7 @@ src_install() {
 	# fi
 
 	insinto /etc/xinetd.d
-	newins ${WORKDIR}/pop3.xinetd  pop-3
+	newins "${WORKDIR}"/pop3.xinetd  pop-3
 }
 
 pkg_postinst () {