Version bump.

(Portage version: 2.0.51.22-r2)

5 files changed, 24 insertions, 22 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 125c924d1953..93c5df61864a 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.96 2005/08/17 21:07:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.97 2005/09/03 23:32:33 eradicator Exp $
+
+*webmin-1.220 (03 Sep 2005)
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -webmin-1.200-r1.ebuild, +webmin-1.220.ebuild:
+  Version bump.
 
 *webmin-1.210-r1 (17 Aug 2005)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index f317611df98a..2c3fd9f71f19 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bd4dd1f913e7facc6d9eda0a9fbd2d88 webmin-1.220.ebuild 4059
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 c6d3309b62a5ba19e3aa3893e0cca346 webmin-1.170-r3.ebuild 3681
 MD5 ab60cf6bc8e8138e63db93810f327cd1 webmin-1.200-r1.ebuild 3797
@@ -11,6 +9,7 @@ MD5 171e9e052878636913441103aac011b0 files/digest-webmin-1.210-r1 209
 MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
 MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209
 MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200-r1 209
+MD5 4606e734c7cf033a25cfd679fa68ef31 files/digest-webmin-1.220 210
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
@@ -24,10 +23,3 @@ MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868
 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
 MD5 6a55026b21c4da9284b31236deeceda7 files/webmin-gentoo-init 864
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDA6cBArHZZzCEUG0RAhqiAJ9eb39gF1FJBN/ckuJCtGAf0Bj0PwCfcQgx
-IHDEXEO1NcTacxF7o8eK3BI=
-=KneB
------END PGP SIGNATURE-----
diff --git a/app-admin/webmin/files/digest-webmin-1.200-r1 b/app-admin/webmin/files/digest-webmin-1.200-r1
deleted file mode 100644
index 889e1cb9dd6e..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.200-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4df07c16715458f9873f07ec92fbbbda webmin-1.200-minimal.tar.gz 1077249
-MD5 371711be0c2bf0ff30c1c01192425b3c webmin-1.200.tar.gz 7835665
-MD5 956142bcbe1d50896d9a22411c05e918 virtual-server-2.50.wbm.gz 247382
diff --git a/app-admin/webmin/files/digest-webmin-1.220 b/app-admin/webmin/files/digest-webmin-1.220
new file mode 100644
index 000000000000..ae982ae466a0
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.220
@@ -0,0 +1,3 @@
+MD5 fdf59d6570c1aaba526d8d2b71149237 webmin-1.220-minimal.tar.gz 1182630
+MD5 8f32efc42488639519dfc4ca1ec200f4 webmin-1.220.tar.gz 8579545
+MD5 a6e5127a67b0b5bfca58d33334aceb55 virtual-server-2.601.wbm.gz 275382
diff --git a/app-admin/webmin/webmin-1.200-r1.ebuild b/app-admin/webmin/webmin-1.220.ebuild
index dc25a4854683..a18f04ef0774 100644
--- a/app-admin/webmin/webmin-1.200-r1.ebuild
+++ b/app-admin/webmin/webmin-1.220.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.200-r1.ebuild,v 1.3 2005/07/13 20:56:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.220.ebuild,v 1.1 2005/09/03 23:32:33 eradicator Exp $
 
 IUSE="apache2 pam postgres ssl webmin-minimal"
 
 inherit eutils pam
 
-VM_V="2.50"
+VM_V="2.601"
 
 DESCRIPTION="Webmin, a web-based system administration interface"
 HOMEPAGE="http://www.webmin.com/"
@@ -32,11 +32,8 @@ src_unpack() {
 
 	cd ${S}
 
-	# in webmin-minimal webalizer and apache2 are not present
+	# in webmin-minimal apache2 are not present
 	if ! use webmin-minimal ; then
-		# Bug #47020
-		epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
-
 		# Bug #50810, #51943
 		if use apache2; then
 			epatch ${FILESDIR}/${PN}-1.140-apache2.patch
@@ -49,7 +46,7 @@ src_unpack() {
 		tar -xf ${T}/vs.tar
 
 		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch ${FILESDIR}/virtual-server-2.31-nocgibin.patch
+		epatch ${FILESDIR}/virtual-server-2.60-nocgibin.patch
 
 		# Check if a newly added IP is already active
 		epatch ${FILESDIR}/virtual-server-2.31-checkip.patch
@@ -65,6 +62,9 @@ src_unpack() {
 }
 
 src_install() {
+	# Bug #97212
+	addpredict /var/lib/rpm
+
 	rm -f mount/freebsd-mounts*
 	rm -f mount/openbsd-mounts*
 	rm -f mount/macos-mounts*
@@ -118,6 +118,9 @@ src_install() {
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/webmin
 	keepdir /var/log/webmin/
+
+	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
+	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
 }
 
 pkg_postinst() {
@@ -127,7 +130,8 @@ pkg_postinst() {
 	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
 
 	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	einfo "Point your web browser to http://localhost:10000 to use webmin."
+	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
+	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
 }
 
 pkg_prerm() {