remove useless patches; fix configuration file; depend on apache 2.2 because apr-1 is needed

Package-Manager: portage-2.1.3_rc7

7 files changed, 16 insertions, 124 deletions

diff --git a/www-apache/mod_fcgid/ChangeLog b/www-apache/mod_fcgid/ChangeLog
index 7e6252a7f97f..3e7a9312b425 100644
--- a/www-apache/mod_fcgid/ChangeLog
+++ b/www-apache/mod_fcgid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_fcgid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.29 2007/05/24 20:14:16 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/ChangeLog,v 1.30 2007/07/29 15:58:50 hollow Exp $
+
+*mod_fcgid-2.1-r2 (29 Jul 2007)
+
+  29 Jul 2007; Benedikt Böhm <hollow@gentoo.org>
+  -files/mod_fcgid-2.1-apr_shm_remove.patch, -files/20_mod_fcgid-2.1.conf,
+  files/20_mod_fcgid.conf, -mod_fcgid-2.0.ebuild, +mod_fcgid-2.1-r2.ebuild:
+  remove useless patches; fix configuration file; depend on apache 2.2 because
+  apr-1 is needed
 
   24 May 2007; Christian Heim <phreak@gentoo.org> mod_fcgid-2.1-r1.ebuild:
   Fix the Makefile to use the proper location for our builddir
diff --git a/www-apache/mod_fcgid/files/20_mod_fcgid-2.1.conf b/www-apache/mod_fcgid/files/20_mod_fcgid-2.1.conf
deleted file mode 100644
index 9a31e5fdee08..000000000000
--- a/www-apache/mod_fcgid/files/20_mod_fcgid-2.1.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<IfDefine FCGID>
-	<IfModule !mod_fcgid.c>
-		LoadModule fcgid_module modules/mod_fcgid.so
-	</IfModule>
-	<IfModule mod_fcgid.c>
-		AddHandler fcgid-script .fcg
-		SocketPath /var/run/fcgid.sock
-		SharememPath /var/run/fcgid_shm
-	</IfModule>
-</IfDefine>
diff --git a/www-apache/mod_fcgid/files/20_mod_fcgid.conf b/www-apache/mod_fcgid/files/20_mod_fcgid.conf
index 75cb35a163d8..e67b20ec68e5 100644
--- a/www-apache/mod_fcgid/files/20_mod_fcgid.conf
+++ b/www-apache/mod_fcgid/files/20_mod_fcgid.conf
@@ -1,8 +1,3 @@
 <IfDefine FCGID>
-    <IfModule !mod_fcgid.c>
 	LoadModule fcgid_module modules/mod_fcgid.so
-    </IfModule>
-    <IfModule mod_fcgid.c>
-	AddHandler fcgid-script .fcg
-    </IfModule>
 </IfDefine>
diff --git a/www-apache/mod_fcgid/files/digest-mod_fcgid-2.0 b/www-apache/mod_fcgid/files/digest-mod_fcgid-2.0
deleted file mode 100644
index 91ba1a7b3170..000000000000
--- a/www-apache/mod_fcgid/files/digest-mod_fcgid-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3aa51f1e293e6d881028295a23021dae mod_fcgid.2.0.tar.gz 274974
-RMD160 6e62c6c1a828489d3faa5b074e21688a449f9ca3 mod_fcgid.2.0.tar.gz 274974
-SHA256 714e2eac93807e768a8a81c9d157e02fd674eab472302211a137657c9241cef1 mod_fcgid.2.0.tar.gz 274974
diff --git a/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1-r1 b/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1-r2
index c74843686e7b..c74843686e7b 100644
--- a/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1-r1
+++ b/www-apache/mod_fcgid/files/digest-mod_fcgid-2.1-r2
diff --git a/www-apache/mod_fcgid/files/mod_fcgid-2.1-apr_shm_remove.patch b/www-apache/mod_fcgid/files/mod_fcgid-2.1-apr_shm_remove.patch
deleted file mode 100644
index 45dba362b2f8..000000000000
--- a/www-apache/mod_fcgid/files/mod_fcgid-2.1-apr_shm_remove.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- arch/unix/fcgid_proctbl_unix.c.prev	2007-02-16 03:34:41.000000000 +0100
-+++ arch/unix/fcgid_proctbl_unix.c	2007-03-14 19:05:54.000000000 +0100
-@@ -1,4 +1,5 @@
- #include "fcgid_proctbl.h"
-+#include "apr_version.h"
- #include "apr_shm.h"
- #include "apr_global_mutex.h"
- #include "fcgid_global.h"
-@@ -18,6 +19,89 @@
- static fcgid_global_share *g_global_share = NULL;	/* global information */
- static size_t g_table_size = FCGID_PROC_TABLE_SIZE;
- 
-+/* apr version 0.x not support apr_shm_remove, I have to copy it from apr version 1.x */
-+#if (APR_MAJOR_VERSION < 1)
-+#ifdef HAVE_SYS_MMAN_H
-+#include <sys/mman.h>
-+#endif
-+#ifdef HAVE_SYS_IPC_H
-+#include <sys/ipc.h>
-+#endif
-+#ifdef HAVE_SYS_MUTEX_H
-+#include <sys/mutex.h>
-+#endif
-+#ifdef HAVE_SYS_SHM_H
-+#include <sys/shm.h>
-+#endif
-+#if !defined(SHM_R)
-+#define SHM_R 0400
-+#endif
-+#if !defined(SHM_W)
-+#define SHM_W 0200
-+#endif
-+#ifdef HAVE_SYS_FILE_H
-+#include <sys/file.h>
-+#endif
-+
-+static apr_status_t apr_shm_remove(const char *filename, apr_pool_t * pool)
-+{
-+#if APR_USE_SHMEM_SHMGET
-+	apr_status_t status;
-+	apr_file_t *file;
-+	key_t shmkey;
-+	int shmid;
-+#endif
-+
-+#if APR_USE_SHMEM_MMAP_TMP
-+	return apr_file_remove(filename, pool);
-+#endif
-+#if APR_USE_SHMEM_MMAP_SHM
-+	if (shm_unlink(filename) == -1) {
-+		return errno;
-+	}
-+	return APR_SUCCESS;
-+#endif
-+#if APR_USE_SHMEM_SHMGET
-+	/* Presume that the file already exists; just open for writing */
-+	status = apr_file_open(&file, filename, APR_WRITE,
-+						   APR_OS_DEFAULT, pool);
-+	if (status) {
-+		return status;
-+	}
-+
-+	/* ftok() (on solaris at least) requires that the file actually
-+	 * exist before calling ftok(). */
-+	shmkey = ftok(filename, 1);
-+	if (shmkey == (key_t) - 1) {
-+		goto shm_remove_failed;
-+	}
-+
-+	apr_file_close(file);
-+
-+	if ((shmid = shmget(shmkey, 0, SHM_R | SHM_W)) < 0) {
-+		goto shm_remove_failed;
-+	}
-+
-+	/* Indicate that the segment is to be destroyed as soon
-+	 * as all processes have detached. This also disallows any
-+	 * new attachments to the segment. */
-+	if (shmctl(shmid, IPC_RMID, NULL) == -1) {
-+		goto shm_remove_failed;
-+	}
-+	return apr_file_remove(filename, pool);
-+
-+  shm_remove_failed:
-+	status = errno;
-+	/* ensure the file has been removed anyway. */
-+	apr_file_remove(filename, pool);
-+	return status;
-+#endif
-+
-+	/* No support for anonymous shm */
-+	return APR_ENOTIMPL;
-+}
-+#endif							/* APR_MAJOR_VERSION<1 */
-+
- apr_status_t
- proctable_post_config(server_rec * main_server, apr_pool_t * configpool)
- {
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.0.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild
index 8f948e867335..44fd8294ca6d 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.0.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.0.ebuild,v 1.3 2007/02/13 20:35:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_fcgid/mod_fcgid-2.1-r2.ebuild,v 1.1 2007/07/29 15:58:50 hollow Exp $
 
-inherit apache-module
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+inherit apache-module eutils multilib
 
 DESCRIPTION="mod_fcgid is a binary-compatible alternative to mod_fastcgi with better process management."
 HOMEPAGE="http://fastcgi.coremail.cn/"
 SRC_URI="mirror://sourceforge/mod-fcgid/${PN}.${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+DEPEND="=dev-libs/apr-1*"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}.${PV}"
 
@@ -31,4 +31,4 @@ APXS2_ARGS="-I ${S} -c ${PN}.c fcgid_bridge.c \
 
 DOCFILES="AUTHOR ChangeLog"
 
-need_apache2
+need_apache2_2