apache2 support added to close bug #50810. Stable x86.

5 files changed, 47 insertions, 16 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index ae3eb48b973a..5d424b6a74cb 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.42 2004/04/23 00:56:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.43 2004/05/15 08:11:03 eradicator Exp $
+
+  15 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  webmin-1.140-r1.ebuild, files/webmin-1.140-apache2.patch:
+  apache2 support added to close bug #50810.
+  stable x86.
 
 *webmin-1.140-r1 (22 Apr 2004)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index b67336b5a91c..be1f710c0d98 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,15 +1,16 @@
-MD5 9e6c039895649548be74be466c5ce993 ChangeLog 6397
+MD5 0f65bf15f4b028483180906cd8f47edc webmin-1.140.ebuild 2021
 MD5 e1448effc29a46897c48b774ec52a127 webmin-1.080.ebuild 1760
+MD5 f5f16f198582b89165595878bb861c64 webmin-1.130-r1.ebuild 1980
 MD5 871a442fb0428ebaeb78601de262b8b5 webmin-1.110.ebuild 1869
-MD5 af78ec444c33498f239b2397d1641e40 webmin-1.140-r1.ebuild 2182
+MD5 5904ce941f6efe3ed8149a680534e875 webmin-1.140-r1.ebuild 2268
+MD5 cf7455b4faa697ec494aac7c1c90cf0f ChangeLog 6574
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 f5f16f198582b89165595878bb861c64 webmin-1.130-r1.ebuild 1980
-MD5 0f65bf15f4b028483180906cd8f47edc webmin-1.140.ebuild 2021
+MD5 805b49679c94953e708f9322cbb11865 files/webmin-gentoo-init 870
+MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 c2e70e10958f50cd84c377b5963a8ced files/digest-webmin-1.080 65
-MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140-r1 65
 MD5 7f0f3de1fc4601b588dc143645df86b7 files/digest-webmin-1.110 65
-MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
-MD5 805b49679c94953e708f9322cbb11865 files/webmin-gentoo-init 870
-MD5 45eacf952391438a2db6170312783f32 files/digest-webmin-1.130-r1 65
 MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140 65
-MD5 cadb87585ab39215aea085411ba590af files/webmin-1.130-webalizer.patch 595
+MD5 fe3da12aebc8740d75b72c5beda5dfcf files/webmin-1.140-apache2.patch 667
+MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
+MD5 45eacf952391438a2db6170312783f32 files/digest-webmin-1.130-r1 65
+MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140-r1 65
diff --git a/app-admin/webmin/files/webmin-1.130-webalizer.patch b/app-admin/webmin/files/webmin-1.130-webalizer.patch
index 55d3e3627cb9..cea038e3d397 100644
--- a/app-admin/webmin/files/webmin-1.130-webalizer.patch
+++ b/app-admin/webmin/files/webmin-1.130-webalizer.patch
@@ -1,5 +1,5 @@
---- webalizer-lib.pl.orig	2004-04-07 01:08:50.000000000 -0700
-+++ webalizer-lib.pl	2004-04-07 01:08:15.000000000 -0700
+--- webalizer/webalizer-lib.pl.orig	2004-04-07 01:08:50.000000000 -0700
++++ webalizer/webalizer-lib.pl	2004-04-07 01:08:15.000000000 -0700
 @@ -176,10 +176,11 @@
  	local $cmd = "$config{'webalizer'} $conf -o '$lconf->{'dir'}' $type -p '$a'";
  	if ($user ne "root") {
diff --git a/app-admin/webmin/files/webmin-1.140-apache2.patch b/app-admin/webmin/files/webmin-1.140-apache2.patch
new file mode 100644
index 000000000000..2e96af826b10
--- /dev/null
+++ b/app-admin/webmin/files/webmin-1.140-apache2.patch
@@ -0,0 +1,20 @@
+--- apache/config-gentoo-linux.orig	2004-05-15 00:49:39.000000000 -0700
++++ apache/config-gentoo-linux	2004-05-15 00:50:21.000000000 -0700
+@@ -1,11 +1,11 @@
+ show_list=0
+-httpd_dir=/etc/apache
+-httpd_path=/usr/sbin/apache
+-apachectl_path=/usr/sbin/apachectl
+-start_cmd=/etc/init.d/apache start
++httpd_dir=/etc/apache2
++httpd_path=/usr/sbin/apache2
++apachectl_path=/usr/sbin/apache2ctl
++start_cmd=/etc/init.d/apache2 start
+ stop_cmd=/etc/init.d/apache stop
+-httpd_conf=/etc/apache/conf/apache.conf
+-mime_types=/etc/apache/conf/mime.types
++httpd_conf=/etc/apache2/conf/apache2.conf
++mime_types=/etc/apache2/conf/mime.types
+ show_order=0
+ max_servers=100
+ test_config=1
diff --git a/app-admin/webmin/webmin-1.140-r1.ebuild b/app-admin/webmin/webmin-1.140-r1.ebuild
index 135ee46e46f4..6f7ba97f78c6 100644
--- a/app-admin/webmin/webmin-1.140-r1.ebuild
+++ b/app-admin/webmin/webmin-1.140-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.3 2004/04/24 05:03:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.4 2004/05/15 08:11:03 eradicator Exp $
 
 inherit eutils
 
-IUSE="ssl"
+IUSE="ssl apache2"
 
 DESCRIPTION="Webmin, a web-based system administration interface"
 SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.webmin.com/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 s390"
+KEYWORDS="x86 ~ppc ~sparc ~amd64 s390"
 
 DEPEND=""
 RDEPEND="dev-lang/perl
@@ -23,9 +23,14 @@ RDEPEND="dev-lang/perl
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
 	# Bug #47020
-	cd ${S}/webalizer
 	epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
+
+	# Bug #50810
+	if use apache2; then
+		epatch ${FILESDIR}/${PN}-1.140-apache2.patch
+	fi
 }
 
 src_install() {