4 files changed, 42 insertions, 74 deletions
diff --git a/net-proxy/middleman/ChangeLog b/net-proxy/middleman/ChangeLog
index a44c01160765..3bcb5d1e3c79 100644
--- a/net-proxy/middleman/ChangeLog
+++ b/net-proxy/middleman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/middleman
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/ChangeLog,v 1.2 2005/04/23 13:07:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/ChangeLog,v 1.3 2005/07/15 00:02:47 swegener Exp $
+
+  15 Jul 2005; Sven Wegener <swegener@gentoo.org> middleman-2.0.1.ebuild,
+  middleman-2.0.1-r2.ebuild:
+  QA: Do not loop over IUSE for configuring. IUSE includes flags from eclasses
+  and that might result in unpredictable behaviour.
 
   22 Apr 2005; Alin Nastac <mrness@gentoo.org> :
   Rename category & herd www-proxy to net-proxy
diff --git a/net-proxy/middleman/Manifest b/net-proxy/middleman/Manifest
index 6f690dd5f87c..059bd6af9a30 100644
--- a/net-proxy/middleman/Manifest
+++ b/net-proxy/middleman/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1ab2cc2fda03912c31309ec2003f16fe middleman-2.0.1-r2.ebuild 2006
-MD5 c0ab1e148aa5d2e4df78c5320550a4dd middleman-2.0.1.ebuild 1825
-MD5 ddee95264bb933828105ca88c0ccc9dd ChangeLog 4392
-MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
-MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1-r2 67
-MD5 22c116e20fcb12dbd46cbb38125f2e68 files/middleman-2.0.1-putlog-fix.patch 3671
-MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1 67
-MD5 bb883e451ed1555f5171f3b196874712 files/middleman-2.0.1-gcc-34.patch 1091
+MD5 59f6169b6dfcceae4340826c1e19f757 ChangeLog 4627
 MD5 cca46008c83644944b263535a7d2ead1 files/conf.d/mman 138
+MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1 67
+MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1-r2 67
 MD5 de3be299916f4858bbad3e953757ddf4 files/init.d/mman 968
+MD5 bb883e451ed1555f5171f3b196874712 files/middleman-2.0.1-gcc-34.patch 1091
+MD5 22c116e20fcb12dbd46cbb38125f2e68 files/middleman-2.0.1-putlog-fix.patch 3671
+MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
+MD5 343a5762002d6e8cb1c54aaefc77c1d5 middleman-2.0.1-r2.ebuild 1701
+MD5 d70291ff0f6ef3538b0e9c937fbcb565 middleman-2.0.1.ebuild 1293
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC1vWIBXaUFmZvwyMRAi1/AJ9ebzOTplM2Z1En1mW8UEKjJY+8WACg1YWK
-35wv80pQm5s3KvIksuK6vZU=
-=R9Wq
+iD8DBQFC1v02I1lqEGTUzyQRAmqPAJ4ozkqSX5UfNP9MZMQbRy/bao5BGgCgtM6q
+PIofsO/L4N44jKjWMpXioWI=
+=7kkU
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/middleman/middleman-2.0.1-r2.ebuild b/net-proxy/middleman/middleman-2.0.1-r2.ebuild
index 0cd06e795e56..0f5175349dc0 100644
--- a/net-proxy/middleman/middleman-2.0.1-r2.ebuild
+++ b/net-proxy/middleman/middleman-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.2 2005/07/14 23:30:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.3 2005/07/15 00:02:47 swegener Exp $
 
 inherit eutils
 
@@ -15,45 +15,33 @@ IUSE="pam zlib"
 
 DEPEND="virtual/libc
 	dev-libs/libpcre
-	 pam? (	sys-libs/pam )
-	zlib? (	sys-libs/zlib )
-"
+	pam? ( sys-libs/pam )
+	zlib? (	sys-libs/zlib )"
 
 src_unpack() {
 	unpack ${A}
-	[ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff
-	cd ${S}
-	epatch ${FILESDIR}/${P}-putlog-fix.patch
-	epatch ${FILESDIR}/${P}-gcc-34.patch
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-putlog-fix.patch
+	epatch "${FILESDIR}"/${P}-gcc-34.patch
 }
 
 src_compile() {
-	local myconf=""
-	MAKEOPTS="-j1"
-
-	cd ${S}
-	for opt in ${IUSE}; do
-		use ${opt} &&
-			myconf="${myconf} --enable-${opt}" ||
-			myconf="$myconf --disable-${opt}"
-	done
-
-	econf --sysconfdir=/etc ${myconf} || die "econf failed: ${myconf}"
-	emake || die "emake failed"
+	econf \
+		$(use_enable pam) \
+		$(use_enable zlib) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	cd ${S}
-	# mkdir -p ${D}/usr/share/man/man8/
 	make DESTDIR="${D}" install || die "einstall failed"
 
 	dodoc CHANGELOG COPYING
 	dohtml README.html
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d/mman mman
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d/mman mman
+	newconfd "${FILESDIR}"/conf.d/mman mman
+	newinitd "${FILESDIR}"/init.d/mman mman
 }
 
 #pkg_preinst() {
diff --git a/net-proxy/middleman/middleman-2.0.1.ebuild b/net-proxy/middleman/middleman-2.0.1.ebuild
index 8924b276de57..b92756193ae1 100644
--- a/net-proxy/middleman/middleman-2.0.1.ebuild
+++ b/net-proxy/middleman/middleman-2.0.1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1.ebuild,v 1.2 2005/07/14 23:30:06 agriffis Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/middleman-2.0.1.ebuild,v 1.3 2005/07/15 00:02:47 swegener Exp $
 
 DESCRIPTION="Advanced HTTP/1.1 proxy server with features designed to increase privacy and remove unwanted content"
 SRC_URI="mirror://sourceforge/middle-man/${P}.tar.gz"
@@ -13,51 +11,28 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="pam zlib"
 
-#S=${WORKDIR}/
-
 DEPEND="virtual/libc
 	dev-libs/libpcre
-	 pam? (	sys-libs/pam )
-	zlib? (	sys-libs/zlib )
-"
-
-src_unpack() {
-	unpack ${A}
-	[ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff
-	cd ${S}
-	#if [ "$PV" = "1.9" ]; then
-	#	einfo "Patching Makefile.in to avoid sandbox problems"
-	#	sed -i -e s:"INSTALL) -d /var":"INSTALL) -d \$(DESTDIR)/var":g Makefile.in
-	#fi
-}
+	pam? ( sys-libs/pam )
+	zlib? (	sys-libs/zlib )"
 
 src_compile() {
-	local myconf=""
-	MAKEOPTS="-j1"
-
-	cd ${S}
-	for opt in ${IUSE}; do
-		use ${opt} &&
-			myconf="${myconf} --enable-${opt}" ||
-			myconf="$myconf --disable-${opt}"
-	done
-
-	econf --sysconfdir=/etc/mman ${myconf} || die "econf failed: ${myconf}"
-	emake || die "emake failed"
+	econf \
+		--sysconfdir=/etc/mman \
+		$(use_enable pam) \
+		$(use_enable zlib) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	cd ${S}
-	# mkdir -p ${D}/usr/share/man/man8/
 	make DESTDIR="${D}" install || die "einstall failed"
 
 	dodoc CHANGELOG COPYING
 	dohtml README.html
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.d/mman mman
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d/mman mman
+	newconfd "${FILESDIR}"/conf.d/mman mman
+	newinitd "${FILESDIR}"/init.d/mman mman
 }
 
 #pkg_preinst() {