version bump (fixes #197605); cleanup

Package-Manager: portage-2.1.3.19

9 files changed, 89 insertions, 87 deletions

diff --git a/www-apache/mod_proxy_html/ChangeLog b/www-apache/mod_proxy_html/ChangeLog
index 8a0be795e02f..bd1b107e7966 100644
--- a/www-apache/mod_proxy_html/ChangeLog
+++ b/www-apache/mod_proxy_html/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_proxy_html
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/ChangeLog,v 1.11 2007/09/22 13:22:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/ChangeLog,v 1.12 2007/11/25 13:30:42 hollow Exp $
+
+*mod_proxy_html-3.0.1_pre20071125 (25 Nov 2007)
+
+  25 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
+  files/27_mod_proxy_html.conf, -mod_proxy_html-2.4.3.ebuild,
+  -mod_proxy_html-2.5.1.ebuild, mod_proxy_html-3.0.0.ebuild,
+  +mod_proxy_html-3.0.1_pre20071125.ebuild:
+  version bump (fixes #197605); cleanup
 
   22 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   mod_proxy_html-3.0.0.ebuild:
diff --git a/www-apache/mod_proxy_html/Manifest b/www-apache/mod_proxy_html/Manifest
index eb77c1347d17..ec9584f9beec 100644
--- a/www-apache/mod_proxy_html/Manifest
+++ b/www-apache/mod_proxy_html/Manifest
@@ -1,46 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 27_mod_proxy_html.conf 174 RMD160 08454d58787a637d8a3f87411f3d9144c7f22c75 SHA1 98f32df451d0bc469f908520754ecc83429b42f5 SHA256 e6b883e7fc1207d7f63fd184afc21a6b2a786baa0724fa2a9ec7e4a8b17d1b85
-MD5 ad57dda0f336c4f07e37982af69d7999 files/27_mod_proxy_html.conf 174
-RMD160 08454d58787a637d8a3f87411f3d9144c7f22c75 files/27_mod_proxy_html.conf 174
-SHA256 e6b883e7fc1207d7f63fd184afc21a6b2a786baa0724fa2a9ec7e4a8b17d1b85 files/27_mod_proxy_html.conf 174
-DIST mod_proxy_html-2.4.3.c 31180 RMD160 60fa34b7e008920fdb3e538fd244612605627788 SHA1 f626fe6f938a0f6fc98bae31fe4a5f87bba619c5 SHA256 ae07830ba6b4c28faa06451bea9c3778515fdbd0a6a5cac31464d6682a5d3fe1
-DIST mod_proxy_html-2.5.1.c.bz2 8608 RMD160 471b37cc511dd34ac4c4727a5ee4924acd77d24b SHA1 cbe0949527de773a19a368e432e040d83dced931 SHA256 2681c38acb9e289f5ff4d4b7c8e7c9c970ab92b7934b42e6f3a69f4975e18a79
+AUX 27_mod_proxy_html.conf 1789 RMD160 5ba64cc192b4e0e6dd6304597f099cfe2338c4fd SHA1 f838613d2d93b430971b39bea5e5e7f7b1db3e31 SHA256 0b5ac3d62f26898df5b91ae5cd7f7a0387ad0560957edf49b24d1998a8e490e5
+MD5 4289d9dab6a88ac0666bf2d6996874bb files/27_mod_proxy_html.conf 1789
+RMD160 5ba64cc192b4e0e6dd6304597f099cfe2338c4fd files/27_mod_proxy_html.conf 1789
+SHA256 0b5ac3d62f26898df5b91ae5cd7f7a0387ad0560957edf49b24d1998a8e490e5 files/27_mod_proxy_html.conf 1789
 DIST mod_proxy_html-3.0.0.c.bz2 12061 RMD160 15215218e1da3051ca3642462d943f7ad680f9ce SHA1 dc36b4dd1a7985f43486e37a66b98587f2e1c532 SHA256 77aeb4bfbd34930859d4ed203f5a12083412362c36912f57a9d5271e9f1d17a2
-EBUILD mod_proxy_html-2.4.3.ebuild 822 RMD160 9eebe9b9ab62a4623af3078312255f8ed00d3a07 SHA1 fd82ba6a7822a7393dc23dac38a96cd28661a53a SHA256 7e378455429f68156816ffd1444f39c8a271b630e6dd34242ed537e8a1f2fbdc
-MD5 694b33d720fd3a8f5c9daa5468c1a156 mod_proxy_html-2.4.3.ebuild 822
-RMD160 9eebe9b9ab62a4623af3078312255f8ed00d3a07 mod_proxy_html-2.4.3.ebuild 822
-SHA256 7e378455429f68156816ffd1444f39c8a271b630e6dd34242ed537e8a1f2fbdc mod_proxy_html-2.4.3.ebuild 822
-EBUILD mod_proxy_html-2.5.1.ebuild 863 RMD160 41414c262e8f6581c8eba9f20e787699982abec0 SHA1 3432fab81b1ab4f41d8e009383406aa3eba44a36 SHA256 432ce286068cfbd2c8e39e285fa89f398ae422caaec394a2d440ac2b5e97374a
-MD5 8595ec4d325ca0c7595b64501f07b421 mod_proxy_html-2.5.1.ebuild 863
-RMD160 41414c262e8f6581c8eba9f20e787699982abec0 mod_proxy_html-2.5.1.ebuild 863
-SHA256 432ce286068cfbd2c8e39e285fa89f398ae422caaec394a2d440ac2b5e97374a mod_proxy_html-2.5.1.ebuild 863
-EBUILD mod_proxy_html-3.0.0.ebuild 884 RMD160 218ea6010402ef65d746c895fa90859342a9bfdd SHA1 dba94d4d22cf1e2ffc095804664973bebeb76ca6 SHA256 58e13ede6f2fcc2a1dcc5f0a69f82d013bb7cd795ffe38e1079e7827ad5d4b2e
-MD5 8043942ff5969271bf7054d974c76da8 mod_proxy_html-3.0.0.ebuild 884
-RMD160 218ea6010402ef65d746c895fa90859342a9bfdd mod_proxy_html-3.0.0.ebuild 884
-SHA256 58e13ede6f2fcc2a1dcc5f0a69f82d013bb7cd795ffe38e1079e7827ad5d4b2e mod_proxy_html-3.0.0.ebuild 884
-MISC ChangeLog 1785 RMD160 c4ccd947a96c9bbf42272a53919ce2d27d76b790 SHA1 e78526e5a316c618f7c49a3c825ec70f7b5c9e44 SHA256 53f645563ff90d3d931c0fc81881dc89071f8b0347d7deae9a82b50caef20ab4
-MD5 94501a15e2cb0f9a1198926f526918f2 ChangeLog 1785
-RMD160 c4ccd947a96c9bbf42272a53919ce2d27d76b790 ChangeLog 1785
-SHA256 53f645563ff90d3d931c0fc81881dc89071f8b0347d7deae9a82b50caef20ab4 ChangeLog 1785
+DIST mod_proxy_html-3.0.1_pre20071125.tar.bz2 12230 RMD160 723189afce70df58c7958f34dfe877ae9fbba5d6 SHA1 a5be7a8eb71ff19e919ab13d882f0125cad9f21e SHA256 20cbcf0db11bb6557cdca1993c6be0e9943520143d650bef7ae8f10ade624cc3
+EBUILD mod_proxy_html-3.0.0.ebuild 890 RMD160 c10492271759c35d9de4a0e493a12aa50c66854e SHA1 87fa891967e4ea5a480e69518ad2268d5d2d30e9 SHA256 2dff11e5e3aa3a64d59e56c5486da0e73db95281559003d6d4669aa51fd99fad
+MD5 cef16adb5184d465ba291e43488ee584 mod_proxy_html-3.0.0.ebuild 890
+RMD160 c10492271759c35d9de4a0e493a12aa50c66854e mod_proxy_html-3.0.0.ebuild 890
+SHA256 2dff11e5e3aa3a64d59e56c5486da0e73db95281559003d6d4669aa51fd99fad mod_proxy_html-3.0.0.ebuild 890
+EBUILD mod_proxy_html-3.0.1_pre20071125.ebuild 742 RMD160 cf9a4e7a3a8124eafaef75fb1bcdf9a9b5537c67 SHA1 298eeac4e5e8fb44e83b457948829ef7bea48c71 SHA256 f90816613b39b1c552d94d2d457a6c3aa706554fcf1757e13a95ab8b567db1b2
+MD5 495361d3031698b8878b3d302fe0f9d9 mod_proxy_html-3.0.1_pre20071125.ebuild 742
+RMD160 cf9a4e7a3a8124eafaef75fb1bcdf9a9b5537c67 mod_proxy_html-3.0.1_pre20071125.ebuild 742
+SHA256 f90816613b39b1c552d94d2d457a6c3aa706554fcf1757e13a95ab8b567db1b2 mod_proxy_html-3.0.1_pre20071125.ebuild 742
+MISC ChangeLog 2093 RMD160 288246011dcd29aaeccf9511b871e742576597ea SHA1 7eb6cf39066e7df5ccf0c874f81eeed36732e03e SHA256 7629de778a127ad8fae6852377c99788483f09334339b1a05c6e894b3471f19e
+MD5 b842079776fb4bdee653acf8cf229b89 ChangeLog 2093
+RMD160 288246011dcd29aaeccf9511b871e742576597ea ChangeLog 2093
+SHA256 7629de778a127ad8fae6852377c99788483f09334339b1a05c6e894b3471f19e ChangeLog 2093
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata.xml 229
-MD5 6dd20bd223ea556618870fcabe9e807b files/digest-mod_proxy_html-2.4.3 244
-RMD160 b1e77c7b782f48933ea9a0909bd461d6130f3ee7 files/digest-mod_proxy_html-2.4.3 244
-SHA256 4dcab14d7f5211c9b0e21479eb42aae51d87d6531d8bae72c87413633e89273a files/digest-mod_proxy_html-2.4.3 244
-MD5 9ecfb9a19743a5de6a27faa1e31de197 files/digest-mod_proxy_html-2.5.1 253
-RMD160 a9af0d1784016f7702ca2d735e50a20e58b72706 files/digest-mod_proxy_html-2.5.1 253
-SHA256 0b21960a71bdb892320be135d980e71a15c5b78fba85f2b485646cd7cf59b3bb files/digest-mod_proxy_html-2.5.1 253
 MD5 454c139905b43cca792c13dfacde086d files/digest-mod_proxy_html-3.0.0 256
 RMD160 486488860456d00e737dca97bedad236428e95dd files/digest-mod_proxy_html-3.0.0 256
 SHA256 226d7879c4cb9aac63cb18a2706dfaac62a67142f60992fa5e92b4f4b2f4664c files/digest-mod_proxy_html-3.0.0 256
+MD5 17ebdf5d0e7624839f93f5da8e45c0f9 files/digest-mod_proxy_html-3.0.1_pre20071125 298
+RMD160 673a062fd64ef8c2160be6b73441f9e5a52e5a62 files/digest-mod_proxy_html-3.0.1_pre20071125 298
+SHA256 fa6758dc41a0fcb381cb8afe704f4686956864973918c3a6ccfdaa0caa1d12ea files/digest-mod_proxy_html-3.0.1_pre20071125 298
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG9RcLNQqtfCuFneMRAtUQAKCHya5B7XZrKWY6x9RwKHm8YOBdBgCaAlqu
-aL4sQPw4y7HJ9vJZS05DpDk=
-=NHoj
+iD8DBQFHSXkLmPFBzbX68WERAq8iAJ9iEbQvGkdKTtGo29osb596OWcX9wCdE4sT
+a9hvJVYbFqrg8aYC6+79FjI=
+=saD9
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf b/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf
index f1530c623351..de374ed43994 100644
--- a/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf
+++ b/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf
@@ -1,6 +1,47 @@
 <IfDefine PROXY_HTML>
-  <IfModule !mod_proxy_html.c>
-    LoadFile /usr/lib/libxml2.so
-    LoadModule proxy_html_module    modules/mod_proxy_html.so
-  </IfModule>
+	LoadFile /usr/lib/libxml2.so
+	LoadModule proxy_html_module modules/mod_proxy_html.so
+
+	# All knowledge of HTML links has been removed from the mod_proxy_html
+	# code itself, and is instead read from httpd.conf (or included file)
+	# at server startup.  So you MUST declare it.  This will normally be
+	# at top level, but can also be used in a <Location>.
+	#
+	# Here's the declaration for W3C HTML 4.01 and XHTML 1.0
+
+	ProxyHTMLLinks  a           href
+	ProxyHTMLLinks  area        href
+	ProxyHTMLLinks  link        href
+	ProxyHTMLLinks  img         src longdesc usemap
+	ProxyHTMLLinks  object      classid codebase data usemap
+	ProxyHTMLLinks  q           cite
+	ProxyHTMLLinks  blockquote  cite
+	ProxyHTMLLinks  ins         cite
+	ProxyHTMLLinks  del         cite
+	ProxyHTMLLinks  form        action
+	ProxyHTMLLinks  input       src usemap
+	ProxyHTMLLinks  head        profile
+	ProxyHTMLLinks  base        href
+	ProxyHTMLLinks  script      src for
+
+	# To support scripting events (with ProxyHTMLExtended On),
+	# you'll need to declare them too.
+
+	ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
+	                onmouseover onmousemove onmouseout onkeypress \
+	                onkeydown onkeyup onfocus onblur onload \
+	                onunload onsubmit onreset onselect onchange
+
+	# If you need to support legacy (pre-1998, aka "transitional") HTML or XHTML,
+	# you'll need to uncomment the following deprecated link attributes.
+	#
+	# ProxyHTMLLinks  frame   src longdesc
+	# ProxyHTMLLinks  iframe  src longdesc
+	# ProxyHTMLLinks  body    background
+	# ProxyHTMLLinks  applet  codebase
+	#
+	# If you're dealing with proprietary HTML variants,
+	# declare your own URL attributes here as required.
+	#
+	# ProxyHTMLLinks  myelement  myattr otherattr
 </IfDefine>
diff --git a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3 b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3
deleted file mode 100644
index 02cb4e7847a3..000000000000
--- a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e391f303572b3deb9a3c603ce99894d0 mod_proxy_html-2.4.3.c 31180
-RMD160 60fa34b7e008920fdb3e538fd244612605627788 mod_proxy_html-2.4.3.c 31180
-SHA256 ae07830ba6b4c28faa06451bea9c3778515fdbd0a6a5cac31464d6682a5d3fe1 mod_proxy_html-2.4.3.c 31180
diff --git a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1 b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1
deleted file mode 100644
index 169e98bb4a8d..000000000000
--- a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-2.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 909e19f51c4b158abf6b4d6be165683e mod_proxy_html-2.5.1.c.bz2 8608
-RMD160 471b37cc511dd34ac4c4727a5ee4924acd77d24b mod_proxy_html-2.5.1.c.bz2 8608
-SHA256 2681c38acb9e289f5ff4d4b7c8e7c9c970ab92b7934b42e6f3a69f4975e18a79 mod_proxy_html-2.5.1.c.bz2 8608
diff --git a/www-apache/mod_proxy_html/files/digest-mod_proxy_html-3.0.1_pre20071125 b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-3.0.1_pre20071125
new file mode 100644
index 000000000000..541523a0df26
--- /dev/null
+++ b/www-apache/mod_proxy_html/files/digest-mod_proxy_html-3.0.1_pre20071125
@@ -0,0 +1,3 @@
+MD5 d4d5369b9b9b11e7aeac824519c507c2 mod_proxy_html-3.0.1_pre20071125.tar.bz2 12230
+RMD160 723189afce70df58c7958f34dfe877ae9fbba5d6 mod_proxy_html-3.0.1_pre20071125.tar.bz2 12230
+SHA256 20cbcf0db11bb6557cdca1993c6be0e9943520143d650bef7ae8f10ade624cc3 mod_proxy_html-3.0.1_pre20071125.tar.bz2 12230
diff --git a/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
deleted file mode 100644
index 9999aad141bf..000000000000
--- a/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.4.3.ebuild,v 1.6 2007/01/15 18:37:36 chtekk Exp $
-
-inherit apache-module
-
-KEYWORDS="x86"
-
-DESCRIPTION="An Apache2 module to rewrite links in html pages behind a reverse proxy."
-HOMEPAGE="http://apache.webthing.com/mod_proxy_html/"
-SRC_URI="mirror://gentoo/${P}.c"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/libxml2"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="27_${PN}"
-APACHE2_MOD_DEFINE="PROXY_HTML"
-
-need_apache2
-
-src_unpack() {
-	mkdir -p "${S}" || die "mkdir S failed"
-	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
-}
-
-src_compile() {
-	APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
-	apache2_src_compile
-}
diff --git a/www-apache/mod_proxy_html/mod_proxy_html-3.0.0.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-3.0.0.ebuild
index e41f6f9e9d83..b331c80f3ac2 100644
--- a/www-apache/mod_proxy_html/mod_proxy_html-3.0.0.ebuild
+++ b/www-apache/mod_proxy_html/mod_proxy_html-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-3.0.0.ebuild,v 1.2 2007/09/22 13:22:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-3.0.0.ebuild,v 1.3 2007/11/25 13:30:42 hollow Exp $
 
 inherit apache-module
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="app-arch/bzip2
-		dev-libs/libxml2"
+	dev-libs/libxml2"
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="27_${PN}"
@@ -32,5 +32,5 @@ src_unpack() {
 
 src_compile() {
 	APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
-	apache2_src_compile
+	apache-module_src_compile
 }
diff --git a/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-3.0.1_pre20071125.ebuild
index 1ad1df944ba5..e4c499531c22 100644
--- a/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild
+++ b/www-apache/mod_proxy_html/mod_proxy_html-3.0.1_pre20071125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-2.5.1.ebuild,v 1.4 2007/01/15 18:37:36 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_proxy_html/mod_proxy_html-3.0.1_pre20071125.ebuild,v 1.1 2007/11/25 13:30:42 hollow Exp $
 
 inherit apache-module
 
@@ -8,13 +8,14 @@ KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="An Apache2 module to rewrite links in html pages behind a reverse proxy."
 HOMEPAGE="http://apache.webthing.com/mod_proxy_html/"
-SRC_URI="mirror://gentoo/${P}.c.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
 DEPEND="app-arch/bzip2
-		dev-libs/libxml2"
+	dev-libs/libxml2"
 RDEPEND="${DEPEND}"
 
 APACHE2_MOD_CONF="27_${PN}"
@@ -22,12 +23,7 @@ APACHE2_MOD_DEFINE="PROXY_HTML"
 
 need_apache2
 
-src_unpack() {
-	mkdir -p "${S}" || die "mkdir S failed"
-	bzip2 -dc "${DISTDIR}/${P}.c.bz2" > "${S}/${PN}.c" || die "source unpack failed"
-}
-
 src_compile() {
 	APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
-	apache2_src_compile
+	apache-module_src_compile
 }