first and foremost, fixes for bug 77778; ebuild uses depend.apache.eclass, and not apache-module.eclass, as it is a complex apache module; depends on apache2; GSWeb must load right after SSL (for now), as mod_php is screwing up its alias handler, but not vice versa (and I dont use ldap or dav, atm)

(Portage version: 2.0.51.19)

13 files changed, 75 insertions, 169 deletions

diff --git a/gnustep-libs/gsweb/ChangeLog b/gnustep-libs/gsweb/ChangeLog
index 4708e1f3688d..8db255affb70 100644
--- a/gnustep-libs/gsweb/ChangeLog
+++ b/gnustep-libs/gsweb/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for gnustep-libs/gsweb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gsweb/ChangeLog,v 1.3 2005/01/10 16:24:19 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gsweb/ChangeLog,v 1.4 2005/03/24 05:38:11 fafhrd Exp $
+
+*gsweb-1.1.1_pre20050312 (24 Mar 2005)
+
+  24 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -files/1.1.1_pre-build-fixes.patch,
+  -files/1.1.1_pre20041119-build-fixes.patch,
+  +files/1.1.1_pre20050312-build-fixes.patch, -files/apache1-make.patch,
+  -files/apache2-make.patch, -files/1/90_mod_gsweb.conf,
+  +files/2/42_mod_gsweb.conf, -files/2/90_mod_gsweb.conf,
+  -gsweb-1.1.1_pre20041203.ebuild, -gsweb-1.1.1_pre20050106.ebuild,
+  +gsweb-1.1.1_pre20050312.ebuild:
+  first and foremost, fixes for bug 77778; ebuild uses depend.apache.eclass,
+  and not apache-module.eclass, as it is a complex apache module; depends on
+  apache2; GSWeb must load right after SSL (for now), as mod_php is screwing
+  up its alias handler, but not vice versa (and I dont use ldap or dav, atm)
 
 *gsweb-1.1.1_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-libs/gsweb/Manifest b/gnustep-libs/gsweb/Manifest
index f9c12bb09b15..491082318b85 100644
--- a/gnustep-libs/gsweb/Manifest
+++ b/gnustep-libs/gsweb/Manifest
@@ -1,13 +1,7 @@
-MD5 c9f4ec404a76492548f176cd7d40dd56 gsweb-1.1.1_pre20050106.ebuild 2218
-MD5 c6b157c56ad144da76c4cd097f5db64f gsweb-1.1.1_pre20041203.ebuild 2216
 MD5 883008ef071287be37d85cda24f6974c ChangeLog 1058
 MD5 793863b2ae98803d7c254bed889178b3 metadata.xml 429
-MD5 078dd66c0d30dc9af62ed1cad6519a0e files/apache1-make.patch 333
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gsweb-1.1.1_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gsweb-1.1.1_pre20050106 0
-MD5 41b18945839f51f5ab48c20ab9a60b2c files/apache2-make.patch 334
-MD5 9f675b264d05d148a25d5cbf4e28001e files/1.1.1_pre20041119-build-fixes.patch 374
-MD5 9f675b264d05d148a25d5cbf4e28001e files/1.1.1_pre-build-fixes.patch 374
+MD5 1c54ccb53131dbf1bdeca13e809d6639 gsweb-1.1.1_pre20050312.ebuild 1948
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gsweb-1.1.1_pre20050312 0
 MD5 b2bed5fd63f7b0ac88c29357e81e52d3 files/gsweb.conf 2267
-MD5 e9be862ba0ae4a1d47a54daf5f386ff3 files/1/90_mod_gsweb.conf 256
-MD5 bfb17f39dbc561ab65918f5bedebbf4c files/2/90_mod_gsweb.conf 255
+MD5 284c5f08861b623f3fb54a1bf4cce45e files/1.1.1_pre20050312-build-fixes.patch 1358
+MD5 2cc96fdbe05419ac90eadf8cc470c36d files/2/42_mod_gsweb.conf 264
diff --git a/gnustep-libs/gsweb/files/1.1.1_pre-build-fixes.patch b/gnustep-libs/gsweb/files/1.1.1_pre-build-fixes.patch
deleted file mode 100644
index 5f3adef3eab6..000000000000
--- a/gnustep-libs/gsweb/files/1.1.1_pre-build-fixes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GSWAction.h.orig	2004-11-19 01:00:10.682762424 -0500
-+++ GSWAction.h	2004-11-19 01:00:14.788138312 -0500
-@@ -56,7 +56,6 @@
- /** Returns YES if self reponds to actionName **/
- -(BOOL)isActionNamed:(NSString*)actionName;
- 
---(id)existingSession;
- -(NSString*)sessionIDForRequest:(GSWRequest*)aRequest;
- -(void)_initializeRequestSessionIDInContext:(GSWContext*)aContext;
- 
diff --git a/gnustep-libs/gsweb/files/1.1.1_pre20041119-build-fixes.patch b/gnustep-libs/gsweb/files/1.1.1_pre20041119-build-fixes.patch
deleted file mode 100644
index 5f3adef3eab6..000000000000
--- a/gnustep-libs/gsweb/files/1.1.1_pre20041119-build-fixes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GSWAction.h.orig	2004-11-19 01:00:10.682762424 -0500
-+++ GSWAction.h	2004-11-19 01:00:14.788138312 -0500
-@@ -56,7 +56,6 @@
- /** Returns YES if self reponds to actionName **/
- -(BOOL)isActionNamed:(NSString*)actionName;
- 
---(id)existingSession;
- -(NSString*)sessionIDForRequest:(GSWRequest*)aRequest;
- -(void)_initializeRequestSessionIDInContext:(GSWContext*)aContext;
- 
diff --git a/gnustep-libs/gsweb/files/1.1.1_pre20050312-build-fixes.patch b/gnustep-libs/gsweb/files/1.1.1_pre20050312-build-fixes.patch
new file mode 100644
index 000000000000..d8a2d5192e74
--- /dev/null
+++ b/gnustep-libs/gsweb/files/1.1.1_pre20050312-build-fixes.patch
@@ -0,0 +1,33 @@
+diff -ur gsweb/GSWAdaptors/Apache/GNUmakefile-Apache2x gsweb-test/GSWAdaptors/Apache/GNUmakefile-Apache2x
+--- gsweb/GSWAdaptors/Apache/GNUmakefile-Apache2x	2003-04-04 13:24:19.000000000 -0500
++++ gsweb-test/GSWAdaptors/Apache/GNUmakefile-Apache2x	2005-03-23 23:18:33.552474840 -0500
+@@ -39,7 +39,7 @@
+ 	ifeq ("FreeBSD",$(strip $(OSNAME)))
+ 		APXS = /usr/local/sbin/apxs
+ 	else
+-		APXS = /usr/apache/sbin/apxs
++		APXS = /usr/sbin/apxs2
+ 	endif
+ else
+ 	ifneq (,$(findstring no apxs,$(APXS)))
+@@ -65,9 +65,9 @@
+ LOADBALANCING = roundrobin
+ COMMON = $(SRCROOT)/common
+ 
+-INCLUDE = -I. -I$(COMMON) $(APACHEHEADERS) -I/usr/X11R6/include
++INCLUDE = -I. -I$(COMMON) $(APACHEHEADERS) -I/usr/X11R6/include $(shell apr-config --includes) $(shell apu-config --includes)
+ 
+-CFLAGS = $(APACHE_CFLAGS) -fpic $(RC_CFLAGS) $(INCLUDE) -D$(SERVERAPI) -DREENTRANT -DEAPI
++CFLAGS = $(APACHE_CFLAGS) -fpic $(RC_CFLAGS) $(INCLUDE) -D$(SERVERAPI) -DREENTRANT -DEAPI $(shell apr-config --cflags --cppflags)
+ 
+ include $(COMMON)/common.make
+ OFILES = $(COMMONOBJS) $(OBJROOT)/mod_gsweb.o
+@@ -78,7 +78,7 @@
+ RANLIB = ranlib
+ 
+ LDFLAGS = -rdynamic
+-LIBS = -ldl -lcrypt -lm -lPropList
++LIBS = -ldl -lcrypt -lm -lPropList $(apr-config --link-ld --libs) $(shell apu-config --link-ld --libs)
+ LDSHARED = $(LD) -shared  $(CFLAGS)
+ INSTALL = /usr/bin/install -c
+ INSTALL_PROGRAM = $(INSTALL)
diff --git a/gnustep-libs/gsweb/files/1/90_mod_gsweb.conf b/gnustep-libs/gsweb/files/1/90_mod_gsweb.conf
deleted file mode 100644
index ad89ceec4dbf..000000000000
--- a/gnustep-libs/gsweb/files/1/90_mod_gsweb.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine GSWeb>
-
-	# Load the module first
-#	<IfModule !sapi_apache2.c>
-		LoadModule GSWeb_Module	extramodules/mod_gsweb.so
-		GSWeb_ConfigFilePath /etc/apache/conf/gsweb.conf
-#	</IfModule>
-
-	<Location /GSWeb*>
-		SetHandler GSWeb
-	</Location>
-
-</IfDefine>
-
diff --git a/gnustep-libs/gsweb/files/2/90_mod_gsweb.conf b/gnustep-libs/gsweb/files/2/42_mod_gsweb.conf
index 67e0520cca42..5d95a639ea3d 100644
--- a/gnustep-libs/gsweb/files/2/90_mod_gsweb.conf
+++ b/gnustep-libs/gsweb/files/2/42_mod_gsweb.conf
@@ -2,8 +2,9 @@
 
 	# Load the module first
 	<IfModule !sapi_apache2.c>
-		LoadModule GSWeb_Module	extramodules/mod_gsweb.so
-		GSWeb_ConfigFilePath /etc/apache2/conf/gsweb.conf
+		LoadModule GSWeb_Module	modules/mod_gsweb.so
+		GSWeb_ConfigFilePath /etc/gsweb/gsweb.conf
+		GSWeb_Alias /GSWeb
 	</IfModule>
 
 	<Location /GSWeb*>
diff --git a/gnustep-libs/gsweb/files/apache1-make.patch b/gnustep-libs/gsweb/files/apache1-make.patch
deleted file mode 100644
index 6d47707594f8..000000000000
--- a/gnustep-libs/gsweb/files/apache1-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile-Apache1x.orig	2004-11-20 13:02:56.907271024 -0500
-+++ GNUmakefile-Apache1x	2004-11-20 13:04:01.134507000 -0500
-@@ -34,7 +34,7 @@
- 	ifeq ("FreeBSD",$(strip $(OSNAME)))
- 		APXS = /usr/local/sbin/apxs
- 	else
--		APXS = /usr/apache/sbin/apxs
-+		APXS = /usr/sbin/apxs
- 	endif
- else
- 	ifneq (,$(findstring no apxs,$(APXS)))
diff --git a/gnustep-libs/gsweb/files/apache2-make.patch b/gnustep-libs/gsweb/files/apache2-make.patch
deleted file mode 100644
index 407608df6640..000000000000
--- a/gnustep-libs/gsweb/files/apache2-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile-Apache2x.orig	2004-11-19 01:21:16.000000000 -0500
-+++ GNUmakefile-Apache2x	2004-11-19 01:22:19.000000000 -0500
-@@ -39,7 +39,7 @@
- 	ifeq ("FreeBSD",$(strip $(OSNAME)))
- 		APXS = /usr/local/sbin/apxs
- 	else
--		APXS = /usr/apache/sbin/apxs
-+		APXS = /usr/sbin/apxs2
- 	endif
- else
- 	ifneq (,$(findstring no apxs,$(APXS)))
diff --git a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050106 b/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050106
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050106
+++ /dev/null
diff --git a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20041203 b/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20041203
+++ b/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050312
diff --git a/gnustep-libs/gsweb/gsweb-1.1.1_pre20050106.ebuild b/gnustep-libs/gsweb/gsweb-1.1.1_pre20050106.ebuild
deleted file mode 100644
index 6e3f620b6cd3..000000000000
--- a/gnustep-libs/gsweb/gsweb-1.1.1_pre20050106.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gsweb/gsweb-1.1.1_pre20050106.ebuild,v 1.1 2005/01/10 16:24:19 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/dev-libs/${PN}"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs eutils depend.apache
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="GNUstepWeb is a library which was designed to be compatible with WebObjects 4.x (developed by NeXT (now Apple) Inc.)."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~ppc"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-DEPEND="${GS_DEPEND}
-	gnustep-libs/gdl2
-	x11-libs/libPropList"
-RDEPEND="${GS_RDEPEND}
-	gnustep-libs/gdl2
-	x11-libs/libPropList
-	net-www/apache"
-need_apache2
-IUSE="${IUSE}"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	cvs_src_unpack
-	( cd ${S}/GSWeb.framework ; epatch ${FILESDIR}/${PV}-build-fixes.patch )
-	( cd ${S}/GSWAdaptors/Apache ; epatch ${FILESDIR}/apache1-make.patch )
-	( cd ${S}/GSWAdaptors/Apache ; epatch ${FILESDIR}/apache2-make.patch )
-}
-
-src_compile() {
-	cd ${S}
-	egnustep_env
-	econf "--prefix=$(egnustep_prefix)" || die "./configure failed"
-	egnustep_make || die
-	cd ${S}/GSWAdaptors/Apache
-	pwd
-	einfo "emake -f GNUmakefile-Apache${APACHE_VERSION}x all"
-	emake -f GNUmakefile-Apache${APACHE_VERSION}x all
-	ls -la
-	cd ${S}
-	pwd
-}
-
-src_install() {
-	gnustep_src_install
-	cd ${S}/GSWAdaptors/Apache
-	insinto /usr/lib/apache${APACHE_VERSION#1}-extramodules
-	insopts -m0755
-	doins mod_gsweb.so
-	cd ${S}
-
-	insinto /etc/apache${APACHE_VERSION#1}/conf/modules.d
-	doins ${FILESDIR}/${APACHE_VERSION}/90_mod_gsweb.conf
-
-	insinto /etc/apache${APACHE_VERSION#1}/conf
-	doins ${FILESDIR}/gsweb.conf
-
-	dodir $(egnustep_system_domain)/Library/Documentation/GSWeb
-	insinto $(egnustep_system_domain)/Library/Documentation/GSWeb
-	doins GSWAdaptors/Doc/ConfigurationFile.html
-}
-
-pkg_postinst() {
-	gnustep_pkg_postinst
-	einfo "Edit /etc/conf.d/apache${APACHE_VERSION#1} and add \"-D GSWeb\" to APACHE${APACHE_VERSION#1}_OPTS"
-}
-
diff --git a/gnustep-libs/gsweb/gsweb-1.1.1_pre20041203.ebuild b/gnustep-libs/gsweb/gsweb-1.1.1_pre20050312.ebuild
index 284a497bee8c..578f5f55bc27 100644
--- a/gnustep-libs/gsweb/gsweb-1.1.1_pre20041203.ebuild
+++ b/gnustep-libs/gsweb/gsweb-1.1.1_pre20050312.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/gnustep-libs/gsweb/gsweb-1.1.1_pre20041203.ebuild,v 1.2 2005/01/10 16:24:19 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/gsweb/gsweb-1.1.1_pre20050312.ebuild,v 1.1 2005/03/24 05:38:11 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -26,21 +26,16 @@ DEPEND="${GS_DEPEND}
 	x11-libs/libPropList"
 RDEPEND="${GS_RDEPEND}
 	gnustep-libs/gdl2
-	x11-libs/libPropList
-	net-www/apache"
+	x11-libs/libPropList"
 need_apache2
+
 IUSE="${IUSE}"
 
 egnustep_install_domain "System"
 
 src_unpack() {
-	cvs_src_unpack
-	cd ${S}/GSWeb.framework
-	epatch ${FILESDIR}/1.1.1_pre-build-fixes.patch
-	cd ${S}/GSWAdaptors/Apache
-	epatch ${FILESDIR}/apache1-make.patch
-	cd ${S}/GSWAdaptors/Apache
-	epatch ${FILESDIR}/apache2-make.patch
+	cvs_src_unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PV}-build-fixes.patch
 	cd ${S}
 }
 
@@ -50,30 +45,34 @@ src_compile() {
 	econf "--prefix=$(egnustep_prefix)" || die "./configure failed"
 	egnustep_make || die
 	cd ${S}/GSWAdaptors/Apache
-	pwd
-	einfo "emake -f GNUmakefile-Apache${APACHE_VERSION}x all"
+	#pwd
+	#einfo "emake -f GNUmakefile-Apache${APACHE_VERSION}x all"
 	emake -f GNUmakefile-Apache${APACHE_VERSION}x all
-	ls -la
+	#ls -la
 	cd ${S}
-	pwd
+	#pwd
 }
 
 src_install() {
+	egnustep_env
 	gnustep_src_install
 	cd ${S}/GSWAdaptors/Apache
-	insinto /usr/lib/apache${APACHE_VERSION#1}-extramodules
+	insinto ${APACHE2_MODULESDIR}
 	insopts -m0755
 	doins mod_gsweb.so
 	cd ${S}
 
-	insinto /etc/apache${APACHE_VERSION#1}/conf/modules.d
-	doins ${FILESDIR}/${APACHE_VERSION}/90_mod_gsweb.conf
+	insinto ${APACHE2_MODULES_CONFDIR}
+	insopts -m0664
+	doins ${FILESDIR}/${APACHE_VERSION}/42_mod_gsweb.conf
 
-	insinto /etc/apache${APACHE_VERSION#1}/conf
+	dodir /etc/gsweb
+	insinto /etc/gsweb
+	insopts -m0664
 	doins ${FILESDIR}/gsweb.conf
 
-	dodir $(egnustep_system_domain)/Library/Documentation/GSWeb
-	insinto $(egnustep_system_domain)/Library/Documentation/GSWeb
+	dodir $(egnustep_system_root)/Library/Documentation/GSWeb
+	insinto $(egnustep_system_root)/Library/Documentation/GSWeb
 	doins GSWAdaptors/Doc/ConfigurationFile.html
 }