merged from apache-herd svn tree

6 files changed, 105 insertions, 6 deletions

diff --git a/net-www/mod_xslt/ChangeLog b/net-www/mod_xslt/ChangeLog
index 8ce113c8b9f6..7d1aa448e693 100644
--- a/net-www/mod_xslt/ChangeLog
+++ b/net-www/mod_xslt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_xslt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/ChangeLog,v 1.10 2004/09/03 23:24:08 pvdabeel Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/ChangeLog,v 1.11 2005/01/10 23:08:18 trapni Exp $
+
+*mod_xslt-1.0.5a-r1 (11 Jan 2005)
+
+  11 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  +files/1.0.5a-r1/25_mod_xslt.conf, +mod_xslt-1.0.5a-r1.ebuild:
+  refresh from the Apache Herd
 
   04 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   mod_xslt-1.0.5a.ebuild:
diff --git a/net-www/mod_xslt/Manifest b/net-www/mod_xslt/Manifest
index 9b6c39729333..462943b42d20 100644
--- a/net-www/mod_xslt/Manifest
+++ b/net-www/mod_xslt/Manifest
@@ -1,9 +1,12 @@
-MD5 439622caa6950bbc319402c67c901dc2 ChangeLog 966
+MD5 276ef7b2b56ba03dafb126a4a4c01602 ChangeLog 1149
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 8275f8d98d3661cba3e38988f6450003 mod_xslt-1.0.5a.ebuild 1497
+MD5 ef8d20561fb1057fe15bfcfbd3488890 mod_xslt-1.0.5a.ebuild 1496
+MD5 0bac226e1a1f12945be787d703534845 mod_xslt-1.0.5a-r1.ebuild 1356
 MD5 2779031f2b6ac43f6763189009bad231 files/25_mod_xslt.conf 350
 MD5 426f6f25b09522583bdfce52e8b2b8b8 files/digest-mod_xslt-1.0.5a 66
 MD5 8bbeeba1592af204503283d22a692202 files/mod-xslt-1.0.5a-content.patch 3616
 MD5 54a75dbb10db178940c2a31f23f163af files/mod-xslt-1.0.5a-debug.patch 1978
 MD5 7e2fafd6b92cfb45e536cd508c0d2098 files/mod_xslt-1.0.5a-register.patch 671
 MD5 d7cbbfbcf4bd6baa202abdabbb1564a4 files/mod_xslt-1.05a.patch 700
+MD5 426f6f25b09522583bdfce52e8b2b8b8 files/digest-mod_xslt-1.0.5a-r1 66
+MD5 e3de159e58c2c948876fc05b3034f103 files/1.0.5a-r1/25_mod_xslt.conf 1001
diff --git a/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf b/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf
new file mode 100644
index 000000000000..45219f627341
--- /dev/null
+++ b/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf,v 1.1 2005/01/10 23:08:18 trapni Exp $
+
+<IfDefine XSLT>
+	<IfModule !mod_xslt.c>
+		LoadModule mod_xslt    modules/mod_xslt.so
+	</IfModule>
+</IfDefine>
+
+### EXAMPLE 1: transform all .xml files
+### 
+#	<IfModule mod_xslt.c>
+#		AddOutputFilter mod-xslt .xml
+#	</IfModule>
+
+### EXAMPLE 2: transform all files within a special location (_REPLACE_ME_)
+###
+#	<IfModule mod_xslt.c>
+#		<Location _REPLACE_ME_>
+#			SetOutputFilter mod-xslt
+#		</Location>
+#	</IfModule>
+
+### EXAMPLE 3: transform all files whose content type is either 
+###            text/xml or application/xml within a given directory
+###
+# 	<IfModule mod_xslt.c>
+#		<Directory "/var/www/localhost/htdocs">
+#			AddOutputFilterByType mod-xslt text/xml
+#			AddOutputFilterByType mod-xslt application/xml
+#		</Directory>
+#	</IfModule>
+
+# vim:syntax=apache
diff --git a/net-www/mod_xslt/files/digest-mod_xslt-1.0.5a-r1 b/net-www/mod_xslt/files/digest-mod_xslt-1.0.5a-r1
new file mode 100644
index 000000000000..13880fd177ec
--- /dev/null
+++ b/net-www/mod_xslt/files/digest-mod_xslt-1.0.5a-r1
@@ -0,0 +1 @@
+MD5 0e355acd2ebf3cc17100c63afc5d4500 mod-xslt-1.0.5a.tar.gz 79870
diff --git a/net-www/mod_xslt/mod_xslt-1.0.5a-r1.ebuild b/net-www/mod_xslt/mod_xslt-1.0.5a-r1.ebuild
new file mode 100644
index 000000000000..bbc274dea3a6
--- /dev/null
+++ b/net-www/mod_xslt/mod_xslt-1.0.5a-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/mod_xslt-1.0.5a-r1.ebuild,v 1.1 2005/01/10 23:08:18 trapni Exp $
+
+inherit eutils apache-module
+
+DESCRIPTION="An xslt filtering DSO module for Apache2"
+HOMEPAGE="http://www.mod-xslt.com/"
+SRC_URI="http://www.dunkel.org/mod-xslt/downloads/mod-xslt-${PV}.tar.gz"
+
+LICENSE="Apache-1.1"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="0"
+
+DEPEND="dev-lang/perl
+		dev-libs/libxslt
+		dev-libs/libxml2
+		dev-util/pkgconfig"
+
+S=${WORKDIR}/mod-xslt-${PV}
+
+APXS2_ARGS="-c ${PN}.c iotools.c logging.c urltools.c xsltools.c"
+APACHE2_MOD_CONF="${PVR}/25_mod_xslt"
+#APACHE2_MOD_FILE='.libs/mod_xslt.so'
+
+DOCFILES="AUTHORS ChangeLog LICENSE NEWS README*"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	epatch ${FILESDIR}/mod_xslt-1.0.5a-register.patch
+	epatch ${FILESDIR}/mod-xslt-1.0.5a-debug.patch
+	epatch ${FILESDIR}/mod-xslt-1.0.5a-content.patch
+	epatch ${FILESDIR}/mod_xslt-1.05a.patch
+
+	sed -i -e 's,libxml/,libxml2/libxml/,' configure.ac
+
+	find src -type f | xargs perl -pi -e "s,libxml/,libxml2/libxml/,g;"
+
+	autoconf || die
+	touch config.h && cd src
+	mv mod-xslt.c mod_xslt.c
+}
+
+src_compile() {
+	APXS2_ARGS="$(pkg-config --cflags --libs libxslt) ${APXS2_ARGS}"
+	apache2_src_compile
+}
+
+# vim:ts=4
diff --git a/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild b/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild
index 74fdfda41a37..e7b97fca0723 100644
--- a/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild
+++ b/net-www/mod_xslt/mod_xslt-1.0.5a.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/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild,v 1.9 2004/09/03 23:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild,v 1.10 2005/01/10 23:08:18 trapni Exp $
 
 inherit eutils