7 files changed, 19 insertions, 77 deletions
diff --git a/net-www/middleman/ChangeLog b/net-www/middleman/ChangeLog
index 7ea626049c98..0d1af763f4ed 100644
--- a/net-www/middleman/ChangeLog
+++ b/net-www/middleman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/middleman
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/ChangeLog,v 1.6 2003/11/10 02:05:08 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/ChangeLog,v 1.7 2003/11/11 09:38:37 solar Exp $
+
+*middleman-1.9.1 (11 Nov 2003)
+
+  11 Nov 2003; <solar@gentoo.org> middleman-1.8.1.ebuild,
+  middleman-1.8.2.ebuild, middleman-1.9.1.ebuild:
+  version bump
 
   09 Nov 2003; zhen <zhen@gentoo.org> middleman-1.9.ebuild:
   changed sanbox to sandbox in patch msg
diff --git a/net-www/middleman/Manifest b/net-www/middleman/Manifest
index 30f5598facef..460af37ac071 100644
--- a/net-www/middleman/Manifest
+++ b/net-www/middleman/Manifest
@@ -1,6 +1,6 @@
-MD5 bbe32e25ff0ff4d450c6d21a3af45a82 ChangeLog 1562
+MD5 aa09bab8713c0c45f3c07d3d25a4b65a ChangeLog 1719
 MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
-MD5 402fa0e7268211f60c31ae38f1bd867a middleman-1.9.1.ebuild 1873
+MD5 df5573ffac22a594cfcb9998b7ba7b16 middleman-1.9.1.ebuild 1876
 MD5 402fa0e7268211f60c31ae38f1bd867a middleman-1.9.ebuild 1873
 MD5 5e7fe1fa845ace7e8f4d753e7770c2f1 files/digest-middleman-1.9.1 67
 MD5 6603f0878f141095d688dd36c760a878 files/digest-middleman-1.9 65
diff --git a/net-www/middleman/files/digest-middleman-1.8.1 b/net-www/middleman/files/digest-middleman-1.8.1
deleted file mode 100644
index d599ce7295df..000000000000
--- a/net-www/middleman/files/digest-middleman-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca19b93426df463ecb4532c2ec717381 middleman-1.8.1.tar.gz 606529
diff --git a/net-www/middleman/files/digest-middleman-1.8.2 b/net-www/middleman/files/digest-middleman-1.8.2
deleted file mode 100644
index 784d0dbed312..000000000000
--- a/net-www/middleman/files/digest-middleman-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb85a9308a129ff190176a20dc652fe6 middleman-1.8.2.tar.gz 611153
diff --git a/net-www/middleman/files/digest-middleman-1.9.1 b/net-www/middleman/files/digest-middleman-1.9.1
new file mode 100644
index 000000000000..7bd129568f74
--- /dev/null
+++ b/net-www/middleman/files/digest-middleman-1.9.1
@@ -0,0 +1 @@
+MD5 7bd8b8be6c23400aac22eecd86e27e23 middleman-1.9.1.tar.gz 626022
diff --git a/net-www/middleman/middleman-1.8.2.ebuild b/net-www/middleman/middleman-1.8.2.ebuild
deleted file mode 100644
index 82c0f064ae87..000000000000
--- a/net-www/middleman/middleman-1.8.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.8.2.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
-
-inherit eutils
-
-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"
-HOMEPAGE="http://sourceforge.net/projects/middle-man"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="${IUSE} pam zlib"
-
-S=${WORKDIR}/${PN}
-
-DEPEND="virtual/glibc
-	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
-}
-
-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"
-}
-
-src_install() {
-	cd ${S}
-	mkdir -p ${D}/usr/share/man/man8/
-	einstall || 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
-}
-
-#pkg_preinst() {
-#	enewgroup mman 8080
-#	enewuser mman 8080
-#}
-
-pkg_postinst() {
-	#einfo "A mman user has been added to your system if one did not already exist"
-	einfo "-"
-	einfo "Note: init/conf scripts and a sample config has been provided for you."
-	einfo "They can be found at or in /etc/conf.d/mman /etc/init.d/mman /etc/mman/"
-}
diff --git a/net-www/middleman/middleman-1.8.1.ebuild b/net-www/middleman/middleman-1.9.1.ebuild
index 6fd520fab248..64f876b7c94e 100644
--- a/net-www/middleman/middleman-1.8.1.ebuild
+++ b/net-www/middleman/middleman-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.8.1.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.9.1.ebuild,v 1.1 2003/11/11 09:38:37 solar Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sourceforge.net/projects/middle-man"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="${IUSE} pam zlib"
 
 S=${WORKDIR}/${PN}
@@ -24,6 +24,11 @@ DEPEND="virtual/glibc
 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 -e s:"INSTALL) -d /var":"INSTALL) -d \$(DESTDIR)/var":g < Makefile.in > Makefile.out && mv Makefile.{out,in}
+	fi
 }
 
 src_compile() {
@@ -43,8 +48,8 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	mkdir -p ${D}/usr/share/man/man8/
-	einstall || die "einstall failed"
+	# mkdir -p ${D}/usr/share/man/man8/
+	make DESTDIR="${D}" install || die "einstall failed"
 
 	dodoc CHANGELOG COPYING
 	dohtml README.html