4 files changed, 16 insertions, 67 deletions

diff --git a/net-www/mod_contribs/ChangeLog b/net-www/mod_contribs/ChangeLog
index f5a581ba7c44..46c2e0d7c2d6 100644
--- a/net-www/mod_contribs/ChangeLog
+++ b/net-www/mod_contribs/ChangeLog
@@ -1,43 +1,6 @@
 # ChangeLog for net-www/mod_contribs
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_contribs/ChangeLog,v 1.15 2004/11/04 08:16:46 urilith Exp $
-
-  04 Nov 2004; Michael Tindal <urilith@gentoo.org> :
-  Fix digest entries.
-
-  07 Jul 2004; Chuck Short <zul@gentoo.org> mod_contribs-1.0.8-r1.ebuild:
-  Removed mod_layout and mod_random. Closes #55856.
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  mod_contribs-1.0.8-r1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  20 Jun 2004; Chuck Short <zul@gentoo.org> mod_contribs-1.0.8-r1.ebuild:
-  Ebuild cleanup.
-
-  20 Jun 2004; Chuck Short <zul@gentoo.org> mod_contribs-1.0.8-r1.ebuild:
-  Replaced CATEGORY with net-www.
-
-  20 May 2004; Chuck Short <zul@gentoo.org> mod_contribs-1.0.8-r1.ebuild:
-  Fix typo in SRC_URI.
-
-  13 May 2004; Chuck Short <zul@gentoo.org> mod_contribs-1.0.8-r1.ebuild:
-  Updated SRC_URI closes #50832.
-
-  04 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml,
-  mod_contribs-1.0.8-r1.ebuild:
-  Updated headers, added metadata.xml.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*mod_contribs-1.0.8-r1 (4 May 2002)
-
-  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> mod_contribs-1.0.8-r1.ebuild :
-  Added KEYWORDS.
-
-  4 May 2002; Donny Davies <woodchip@gentoo.org> :
-
-  Added LICENSE, SLOT, clarify the pkg_postinst message.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_contribs/ChangeLog,v 1.1 2002/04/09 23:57:52 woodchip Exp $
 
 *mod_contribs-1.0.8 (9 Apr 2002)
 
diff --git a/net-www/mod_contribs/Manifest b/net-www/mod_contribs/Manifest
index eff816e3bd21..e69de29bb2d1 100644
--- a/net-www/mod_contribs/Manifest
+++ b/net-www/mod_contribs/Manifest
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24c6acab25d0665b7dce3b3d4adde941 ChangeLog 1550
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 f30d68bee06ad882e0285dba55abc798 mod_contribs-1.0.8-r1.ebuild 2796
-MD5 6fcf3919bd49f0d1de7cac8fcf5aa93f files/digest-mod_contribs-1.0.8-r1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBirmNI1lqEGTUzyQRAumEAJ9H+xAWAzDYdR8le1arKNxIh1AnjQCfTMdf
-hKKfAdH2KS5BYdx6W+SjvIQ=
-=Kl98
------END PGP SIGNATURE-----
diff --git a/net-www/mod_contribs/files/digest-mod_contribs-1.0.8-r1 b/net-www/mod_contribs/files/digest-mod_contribs-1.0.8-r1
index 2e1b3dac9d90..ce4d24a60374 100644
--- a/net-www/mod_contribs/files/digest-mod_contribs-1.0.8-r1
+++ b/net-www/mod_contribs/files/digest-mod_contribs-1.0.8-r1
@@ -1 +1,3 @@
 MD5 a289d3596091ad8f7722f62aaa2d1465 apache-contrib-1.0.8.tar.gz 194413
+MD5 5986bbf65c420a4637e6a3c4229f028b mod_layout-3.0.3.tar.gz 31189
+MD5 8e78493f775c9cdebaf39401f1088885 mod_random-1.4.tar.gz 7483
diff --git a/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild b/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild
index 3df5a4226df0..04a67e691c48 100644
--- a/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild
+++ b/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild,v 1.18 2004/07/06 01:01:54 zul Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild,v 1.1 2002/05/04 23:23:01 woodchip Exp $
 
 # The mod_layout and mod_random that come in the archive are really old,
 # so I've replaced them with more current versions.
@@ -9,23 +9,21 @@ mod_random_ver=1.4
 
 DESCRIPTION="Collection of third-party contributed modules for Apache"
 HOMEPAGE="http://www.apache.org/dist/httpd/contrib/modules/1.3/"
+
 S=${WORKDIR}/apache-contrib-${PV}
-SRC_URI="http://archive.apache.org/dist/httpd/contrib/modules/1.3/apache-contrib-${PV}.tar.gz"
+SRC_URI="http://www.apache.org/dist/httpd/contrib/modules/1.3/apache-contrib-${PV}.tar.gz
+	http://software.tangent.org/download/mod_layout-${mod_layout_ver}.tar.gz
+	http://software.tangent.org/download/mod_random-${mod_random_ver}.tar.gz"
 
-KEYWORDS="x86 sparc"
+DEPEND="virtual/glibc >=net-www/apache-1.3.24"
 LICENSE="Apache-1.1"
 SLOT="0"
 
-DEPEND="virtual/libc
-	=net-www/apache-1*"
-RDEPEND=""
-IUSE=""
-
-MY_MODS="mod_allowdev mod_auth_system mod_disallow_id mod_lock
+MY_MODS="mod_allowdev mod_auth_system mod_disallow_id mod_lock mod_random
 	mod_auth_cookie mod_bandwidth mod_eaccess mod_macro mod_roaming
 	mod_auth_cookie_file mod_cache mod_fastcgi mod_peephole mod_session
 	mod_auth_external mod_cgisock mod_ip_forwarding mod_put mod_ticket
-	mod_auth_inst mod_cvs mod_qs2ssi mod_urlcount"
+	mod_auth_inst mod_cvs mod_layout mod_qs2ssi mod_urlcount"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
@@ -75,7 +73,7 @@ src_install() {
 		ls $i/*.html >/dev/null 2>&1
 		if [ $? -eq 0 ]
 		then
-			dodir /usr/share/doc/${PF}/${i}/html
+			mkdir -p ${D}/usr/share/doc/${PF}/${i}/html
 			cp $i/*.html ${D}/usr/share/doc/${PF}/${i}/html
 		fi
 	done
@@ -83,7 +81,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo
-	einfo "Execute \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
 	einfo "to have your apache.conf auto-updated for use with these modules."
 	einfo "You should then edit your /etc/conf.d/apache file to suit."
 	einfo