6 files changed, 18 insertions, 82 deletions

diff --git a/net-www/mod_bandwidth/ChangeLog b/net-www/mod_bandwidth/ChangeLog
index 57238c8a1c43..84478591dd1c 100644
--- a/net-www/mod_bandwidth/ChangeLog
+++ b/net-www/mod_bandwidth/ChangeLog
@@ -1,59 +1,6 @@
 # ChangeLog for net-www/mod_bandwidth
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/ChangeLog,v 1.13 2005/11/01 18:45:34 dertobi123 Exp $
-
-  01 Nov 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  mod_bandwidth-2.0.5-r1.ebuild:
-  Marked ppc stable, bug #106423
-
-  18 Sep 2005; Michael Stewart <vericgar@gentoo.org>
-  mod_bandwidth-2.0.5-r1.ebuild:
-  Stable on x86
-
-  25 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
-  mod_bandwidth-2.0.5-r1.ebuild:
-  removed register patch
-
-  14 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
-  -files/11_mod_bandwidth.conf, -files/mod_bandwidth-0.1-register.patch,
-  -mod_bandwidth-0.1.ebuild:
-  cleaning out 0.1 in favor of mod_bw
-
-*mod_bandwidth-2.0.5-r1 (08 Jan 2005)
-
-  08 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
-  +files/10_mod_bandwidth.conf, +files/11_mod_bandwidth.conf,
-  +files/mod_bandwidth-0.1-register.patch,
-  +files/mod_bandwidth-2.0.5-register.patch, +mod_bandwidth-0.1.ebuild,
-  +mod_bandwidth-2.0.5-r1.ebuild:
-  Apache herd package refresh
-
-  04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  mod_bandwidth-2.0.5.ebuild:
-  Masked mod_bandwidth-2.0.5.ebuild testing for ppc
-
-  20 Jun 2004; Chuck Short <zul@gentoo.org> mod_bandwidth-2.0.4.ebuild,
-  mod_bandwidth-2.0.5.ebuild:
-  Ebuild clean ups.
-
-  20 Jun 2004; Chuck Short <zul@gentoo.org> mod_bandwidth-2.0.4.ebuild,
-  mod_bandwidth-2.0.5.ebuild:
-  Replaces CATEGORY with net-www.
-
-*mod_bandwidth-2.0.5 (18 May 2004)
-
-  18 May 2004; Chuck Short <zul@gentoo.org> mod_bandwidth-2.0.5.ebuild:
-  Version bump, closes #51275.
-
-  16 Apr 2004; Jason Wever <weeve@gentoo.org> mod_bandwidth-2.0.4.ebuild:
-  Added ~sparc keyword.
-
-  04 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml,
-  mod_bandwidth-2.0.4.ebuild:
-  Added metadata.xml
-
-  04 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml:
-  Added metadata.xml
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/ChangeLog,v 1.1 2003/07/14 02:52:57 woodchip Exp $
 
 *mod_bandwidth-2.0.4 (13 Jul 2003)
 
diff --git a/net-www/mod_bandwidth/Manifest b/net-www/mod_bandwidth/Manifest
index 9ebbf5559dd4..186a6a38ca8a 100644
--- a/net-www/mod_bandwidth/Manifest
+++ b/net-www/mod_bandwidth/Manifest
@@ -1,12 +1,5 @@
-MD5 b7aa09ac92b4efceb4126ef72c7a0de8 ChangeLog 2256
-MD5 261701832cd085ac1d31fa948299c5d5 files/10_mod_bandwidth.conf 900
-MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.4 59
-MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.5 59
-MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.5-r1 59
-MD5 7fdb7dc609577ce39c00d5c998411c56 files/mod_bandwidth-2.0.4-register.patch 658
-MD5 7fdb7dc609577ce39c00d5c998411c56 files/mod_bandwidth-2.0.5-register.patch 658
+MD5 8338d16dccb23e4986b44c562ecbb2b0 mod_bandwidth-2.0.4.ebuild 1736
+MD5 e41427500bf8592c2a36bf011d96b707 ChangeLog 348
 MD5 cb75940c95ae90a42fc84bd3baac4f4f files/mod_bandwidth.conf 519
-MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
-MD5 853dc35eff084e13004e17e2c6dc6908 mod_bandwidth-2.0.4.ebuild 1718
-MD5 693b50d7b2be75ddb350446648059d1a mod_bandwidth-2.0.5-r1.ebuild 827
-MD5 98fabcbf50d867020d0673ed2c28740b mod_bandwidth-2.0.5.ebuild 1725
+MD5 7fdb7dc609577ce39c00d5c998411c56 files/mod_bandwidth-2.0.4-register.patch 658
+MD5 b1f6d1637699dda2b89daf03a5991078 files/digest-mod_bandwidth-2.0.4 59
diff --git a/net-www/mod_bandwidth/metadata.xml b/net-www/mod_bandwidth/metadata.xml
index ff5b6490402e..c054a8cd9b61 100644
--- a/net-www/mod_bandwidth/metadata.xml
+++ b/net-www/mod_bandwidth/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
-<maintainer>
-  <email>apache-bugs@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild b/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild
index 34fe4c588b5b..ab3c88a3ae2c 100644
--- a/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild
+++ b/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild,v 1.7 2005/01/08 21:06:39 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.4.ebuild,v 1.1 2003/07/14 02:52:57 woodchip Exp $
 
 DESCRIPTION="Bandwidth Management Module for Apache"
 HOMEPAGE="http://www.cohprog.com/v3/bandwidth/intro-en.html"
 SRC_URI="ftp://ftp.cohprog.com/pub/apache/module/1.3.0/mod_bandwidth.c"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="~x86"
 IUSE=""
 DEPEND="=net-www/apache-1*"
-RDEPEND=""
 
 src_unpack() {
 	mkdir -p ${S} && cp ${DISTDIR}/${A} ${S} || die
@@ -38,7 +37,7 @@ pkg_postinst() {
 		${ROOT}/var/cache/mod_bandwidth/{link,master}
 
 	einfo
-	einfo "Execute \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
 	einfo "to have your apache.conf auto-updated for use with this module."
 	einfo "You should then edit your /etc/conf.d/apache file to suit."
 	einfo
diff --git a/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild b/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild
index 2a8e832fab35..15850e332e3d 100644
--- a/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild
+++ b/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.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-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild,v 1.4 2005/11/01 18:45:34 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.5-r1.ebuild,v 1.1 2005/01/08 21:06:39 hollow Exp $
 
 inherit eutils apache-module
 
@@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Management Module for Apache"
 HOMEPAGE="http://www.cohprog.com/v3/bandwidth/intro-en.html"
 SRC_URI="ftp://ftp.cohprog.com/pub/apache/module/1.3.0/mod_bandwidth.c"
 
-KEYWORDS="ppc ~sparc x86"
+KEYWORDS="~x86 ~sparc ~ppc"
 DEPEND=""
 LICENSE="Apache-1.1"
 SLOT="0"
@@ -22,6 +22,8 @@ need_apache1
 src_unpack() {
 	mkdir -p ${S} && cp ${DISTDIR}/${A} ${S} || die
 	cd ${S} || die
+	epatch ${FILESDIR}/${P}-register.patch || die
+	sed -i -e "s:define MOD_BANDWIDTH_VERSION_S.*:define MOD_BANDWIDTH_VERSION_S \"${PV}\":" mod_bandwidth.c || die "version fix failed"
 }
 
 pkg_postinst() {
diff --git a/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild b/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild
index 97a96fcd038e..f4bf6c7015c9 100644
--- a/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild
+++ b/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild,v 1.6 2005/01/08 21:06:39 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_bandwidth/mod_bandwidth-2.0.5.ebuild,v 1.1 2004/05/17 13:51:36 zul Exp $
 
 DESCRIPTION="Bandwidth Management Module for Apache"
 HOMEPAGE="http://www.cohprog.com/v3/bandwidth/intro-en.html"
 SRC_URI="ftp://ftp.cohprog.com/pub/apache/module/1.3.0/mod_bandwidth.c"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc"
 IUSE=""
 DEPEND="=net-www/apache-1*"
-RDEPEND=""
-
 
 src_unpack() {
 	mkdir -p ${S} && cp ${DISTDIR}/${A} ${S} || die
@@ -39,7 +37,7 @@ pkg_postinst() {
 		${ROOT}/var/cache/mod_bandwidth/{link,master}
 
 	einfo
-	einfo "Execute \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
 	einfo "to have your apache.conf auto-updated for use with this module."
 	einfo "You should then edit your /etc/conf.d/apache file to suit."
 	einfo