version bump (fixes #197605); cleanup

(Portage version: 2.1.3.19)

8 files changed, 65 insertions, 55 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/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
 }