9 files changed, 55 insertions, 199 deletions
diff --git a/www-proxy/middleman/ChangeLog b/www-proxy/middleman/ChangeLog
index 1e154a7f3514..5fb82d627887 100644
--- a/www-proxy/middleman/ChangeLog
+++ b/www-proxy/middleman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-proxy/middleman
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/middleman/ChangeLog,v 1.3 2004/09/05 09:20:40 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/middleman/ChangeLog,v 1.4 2005/04/06 18:27:29 mrness Exp $
+
+  06 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  -files/middleman-1.9.1-makefile.patch,
+  +files/middleman-2.0.1-gcc-34.patch, -middleman-1.9.1-r1.ebuild,
+  -middleman-2.0.1-r1.ebuild, middleman-2.0.1-r2.ebuild:
+  Fix compilation on gcc-3.4 and mark stable on x86. Remove obsolete versions.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/www-proxy/middleman/Manifest b/www-proxy/middleman/Manifest
index ac9ad497c620..92de149f8e8f 100644
--- a/www-proxy/middleman/Manifest
+++ b/www-proxy/middleman/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
-MD5 9b3af34d9b7c454210c9e6df5513cac7 middleman-1.9.1-r1.ebuild 1719
-MD5 2a9c6b654ccd19c148223dfd6cf9f2e8 middleman-2.0.1-r1.ebuild 2121
-MD5 e33561239adc7ac39190e90c79d208a3 middleman-2.0.1-r2.ebuild 2171
+MD5 09a107b85bc5676b9d532807cdff8647 middleman-2.0.1-r2.ebuild 2012
 MD5 ad1ddf92bd805bd469678209fce1a138 middleman-2.0.1.ebuild 1831
-MD5 c8ab96d4f7ac7243514e601e3eb4d97d ChangeLog 4002
-MD5 5e7fe1fa845ace7e8f4d753e7770c2f1 files/digest-middleman-1.9.1-r1 67
-MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1 67
-MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1-r1 67
+MD5 9e4b872710bb1ba2556cb5643c21bd03 ChangeLog 4292
+MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
 MD5 900b7f67e15e2549a495775afebed6b9 files/digest-middleman-2.0.1-r2 67
-MD5 d36ec4253bc7ad3bf51972238274d107 files/middleman-1.9.1-makefile.patch 861
 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 cca46008c83644944b263535a7d2ead1 files/conf.d/mman 138
 MD5 9505c222e2602ecc27c6e9ecdd1c08f5 files/init.d/mman 968
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBOtpvI1lqEGTUzyQRAss6AKCUdZ4fS5q9UQsYTF3ehOUfQCeBFwCgmuom
-l3WsB7c9patqYDkJbdPnLtw=
-=vR1c
+iD8DBQFCVCosjiC39V7gKu0RAgaMAKCoenYSceYCF6/948aAa6cXCkK23ACfd64r
+WXo7WOaE/YaDuaBK0ccv0Jk=
+=7gIn
 -----END PGP SIGNATURE-----
diff --git a/www-proxy/middleman/files/digest-middleman-1.9.1-r1 b/www-proxy/middleman/files/digest-middleman-1.9.1-r1
deleted file mode 100644
index 7bd129568f74..000000000000
--- a/www-proxy/middleman/files/digest-middleman-1.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7bd8b8be6c23400aac22eecd86e27e23 middleman-1.9.1.tar.gz 626022
diff --git a/www-proxy/middleman/files/digest-middleman-2.0.1-r1 b/www-proxy/middleman/files/digest-middleman-2.0.1-r1
deleted file mode 100644
index 05e783e77584..000000000000
--- a/www-proxy/middleman/files/digest-middleman-2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bf596a4810184c8f7534d63b1e94cf1 middleman-2.0.1.tar.gz 743404
diff --git a/www-proxy/middleman/files/middleman-1.9.1-makefile.patch b/www-proxy/middleman/files/middleman-1.9.1-makefile.patch
deleted file mode 100644
index 248dcfd34a71..000000000000
--- a/www-proxy/middleman/files/middleman-1.9.1-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: Makefile.in
-===================================================================
-RCS file: /cvsroot/middle-man/middleman/Makefile.in,v
-retrieving revision 1.51
-diff -u -b -B -w -p -r1.51 Makefile.in
---- Makefile.in	11 Sep 2003 14:13:42 -0000	1.51
-+++ Makefile.in	28 Nov 2003 21:31:12 -0000
-@@ -63,9 +63,9 @@ distclean: clean
- 
- install:
- 	$(STRIP) $(TARGET)
--	$(INSTALL) -d $(DESTDIR)/$(bindir)/ $(DESTDIR)/$(sysconfdir)/$(TARGET)
-+	$(INSTALL) -d $(DESTDIR)/$(bindir)/ $(DESTDIR)/$(sysconfdir)/
- 	$(INSTALL) -m0711 $(TARGET) $(DESTDIR)/$(bindir)/
--	$(INSTALL) -m0644 config.xml $(DESTDIR)/$(sysconfdir)/$(TARGET)/config.xml.sample
-+	$(INSTALL) -m0644 config.xml $(DESTDIR)/$(sysconfdir)/config.xml.sample
- 	$(INSTALL) -d $(DESTDIR)/$(mandir)/man8/
- 	$(INSTALL) -m0644 man/mman.8 $(DESTDIR)/$(mandir)/man8/mman.8
- 	$(INSTALL) -d $(DESTDIR)/var/cache/mman	
diff --git a/www-proxy/middleman/files/middleman-2.0.1-gcc-34.patch b/www-proxy/middleman/files/middleman-2.0.1-gcc-34.patch
new file mode 100644
index 000000000000..0e046b043413
--- /dev/null
+++ b/www-proxy/middleman/files/middleman-2.0.1-gcc-34.patch
@@ -0,0 +1,33 @@
+diff -Nru middleman-2.0.1.orig/src/main.c middleman-2.0.1/src/main.c
+--- middleman-2.0.1.orig/src/main.c	2004-03-12 00:28:57.000000000 +0200
++++ middleman-2.0.1/src/main.c	2005-04-06 21:12:10.580927424 +0300
+@@ -407,7 +407,7 @@
+ #else
+ 	pcre_free = xfree;
+ 	// grr... argument to malloc is int on some systems, and long on others
+-	(void *) pcre_malloc = (void *) xmalloc;
++	(void *&) pcre_malloc = (void *) xmalloc;
+ #endif
+ 
+ 	global->dns_cache = hash_create(DNS_HASH_SIZE);
+diff -Nru middleman-2.0.1.orig/src/stats.c middleman-2.0.1/src/stats.c
+--- middleman-2.0.1.orig/src/stats.c	2004-03-12 00:27:16.000000000 +0200
++++ middleman-2.0.1/src/stats.c	2005-04-06 21:11:29.636151976 +0300
+@@ -175,7 +175,7 @@
+ 
+ 	sc.name = stat;
+ 	sc.type = type | StatCounter::CALLBACK;
+-	(void *)sc.value.callback = (void *)cb;
++	(void *&)sc.value.callback = (void *)cb;
+ 
+ 	counter_list.push_back(sc);
+ 
+@@ -193,7 +193,7 @@
+ 
+ 	sc.name = stat;
+ 	sc.type = type | StatCounter::CALLBACK;
+-	(void *)sc.value.callback = (void *)cb;
++	(void *&)sc.value.callback = (void *)cb;
+ 
+ 	counter_list.push_back(sc);
+ 
diff --git a/www-proxy/middleman/middleman-1.9.1-r1.ebuild b/www-proxy/middleman/middleman-1.9.1-r1.ebuild
deleted file mode 100644
index 01fb85991c5c..000000000000
--- a/www-proxy/middleman/middleman-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/middleman/middleman-1.9.1-r1.ebuild,v 1.1 2004/08/15 18:52:50 stuart 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/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}
-	epatch ${FILESDIR}/${PN}-1.9.1-makefile.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/mman ${myconf} || die "econf failed: ${myconf}"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd ${S}
-	make DESTDIR="${D}" install || die "einstall failed"
-	mv ${D}/etc/mman/config.xml{.sample,}
-
-	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/www-proxy/middleman/middleman-2.0.1-r1.ebuild b/www-proxy/middleman/middleman-2.0.1-r1.ebuild
deleted file mode 100644
index fbd8e045f12d..000000000000
--- a/www-proxy/middleman/middleman-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/middleman/middleman-2.0.1-r1.ebuild,v 1.2 2004/09/03 16:06:50 pvdabeel 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 ppc"
-IUSE="${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
-}
-
-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"
-}
-
-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
-}
-
-#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/"
-
-	if [ -d /etc/mman/mman ]; then
-		ewarn "A previous version of this ebuild installed the config scripts into"
-		ewarn
-		ewarn "    /etc/mman/mman/"
-		ewarn
-		ewarn "by mistake.  Please move these files into /etc/mman instead, and remove"
-		ewarn "your /etc/mman/mman/ directory."
-	fi
-}
diff --git a/www-proxy/middleman/middleman-2.0.1-r2.ebuild b/www-proxy/middleman/middleman-2.0.1-r2.ebuild
index 017687cb02ba..abecfb4fb27c 100644
--- a/www-proxy/middleman/middleman-2.0.1-r2.ebuild
+++ b/www-proxy/middleman/middleman-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.2 2004/09/03 16:06:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/middleman/middleman-2.0.1-r2.ebuild,v 1.3 2005/04/06 18:27:29 mrness Exp $
 
 inherit eutils
 
@@ -10,11 +10,9 @@ HOMEPAGE="http://sourceforge.net/projects/middle-man"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc"
+KEYWORDS="x86 ppc"
 IUSE="${IUSE} pam zlib"
 
-#S=${WORKDIR}/
-
 DEPEND="virtual/libc
 	dev-libs/libpcre
 	 pam? (	sys-libs/pam )
@@ -25,12 +23,8 @@ src_unpack() {
 	unpack ${A}
 	[ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-${PV}-putlog-fix.patch
-
-	#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
+	epatch ${FILESDIR}/${P}-putlog-fix.patch
+	epatch ${FILESDIR}/${P}-gcc-34.patch
 }
 
 src_compile() {