4 files changed, 4 insertions, 180 deletions
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 8dd291ce5f4f..2523eb3522f6 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init.d.webmin 859 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 SHA1 e6b36175db577c3878fb1357b453f9fba396db8f SHA256 8a96c59989ba2a3ae116b9155f72c058dc56be24da355ee1fae43588096520e8
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 files/init.d.webmin 859
@@ -33,10 +30,6 @@ AUX virtual-server-2.610-checkip.patch 703 RMD160 21c32714ba93c489b545362e65d02c
 MD5 2e5e13d75a542015f01283316fdcf16d files/virtual-server-2.610-checkip.patch 703
 RMD160 21c32714ba93c489b545362e65d02c06cc28c92f files/virtual-server-2.610-checkip.patch 703
 SHA256 dbaebb30bc221aba099f2ea7f1a865edb82d9af8dcadbb4e616b04283257075d files/virtual-server-2.610-checkip.patch 703
-AUX webmin-1.130-webalizer.patch 615 RMD160 23a2182303240e0512b044d28dbfb44e8a3be40d SHA1 672b117a165b8bdffed3fbe6b2a49e03c18ba500 SHA256 3cd7587d93abd0113e3802672c67dffa98bb413c51fdfd7b5923b5d2b7276d0b
-MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
-RMD160 23a2182303240e0512b044d28dbfb44e8a3be40d files/webmin-1.130-webalizer.patch 615
-SHA256 3cd7587d93abd0113e3802672c67dffa98bb413c51fdfd7b5923b5d2b7276d0b files/webmin-1.130-webalizer.patch 615
 AUX webmin-1.140-apache2.patch 1250 RMD160 d6085f73b3631f28e4d8154288271fd911bce491 SHA1 f2c751f8e27cf8b250eed2934d054766e1d13363 SHA256 024291db8cd2606cdaeee3e6688c2abd75516f9ed8de6fceb337338e1601b6ac
 MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250
 RMD160 d6085f73b3631f28e4d8154288271fd911bce491 files/webmin-1.140-apache2.patch 1250
@@ -65,20 +58,13 @@ AUX webmin-pam 101 RMD160 f2e1f98eae4cfb1dc485675e60cd73aba6e6ca47 SHA1 107b2737
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 RMD160 f2e1f98eae4cfb1dc485675e60cd73aba6e6ca47 files/webmin-pam 101
 SHA256 93df67451eae9866fcbc23453c18c4fe23a7b5c8dd879de16c09b476d1db597f files/webmin-pam 101
-DIST virtual-server-2.31.wbm.gz 177487
 DIST virtual-server-2.609.wbm.gz 281789 RMD160 aa84090cc2f4c571ff1fca9654f4ec31d08472e1 SHA1 0963c09968b88c81ac5bff46a519b173051096d0 SHA256 f466bffb3d6c9cd102ddb0877d2cb283f6d67dbc9412f0b4b4dbb2319e316b1a
 DIST virtual-server-2.610.wbm.gz 281828 RMD160 03ceb41b68ca454138fd41fbce135c5f20f2473d SHA1 9562de39c944ecba606e4fe19f1a123a41ab65fc SHA256 7ed07d52fe6697217835aa97f63422aafc4ff166693482e93aa9a6adb55ce489
 DIST virtual-server-2.611.wbm.gz 283217 RMD160 bbcee33f9398a78d7e8a68168316f011d2cf391d SHA1 eb40437cb6774317bca20581644879bb95ef4558 SHA256 f7579da94a6b356ce4548a0ed8fcc366e1d8e7e7199e5337e8d703bf4f92090a
-DIST webmin-1.170-minimal.tar.gz 1011002
-DIST webmin-1.170.tar.gz 7833477
 DIST webmin-1.250-minimal.tar.gz 1269765
 DIST webmin-1.250.tar.gz 8928214 RMD160 5d1d50af6032bc261b47721fe53db945f0412504 SHA1 93540aaccaac8e2b9379b7709ff5d853cf36c734 SHA256 961b6b6873c8e8683134326eaec31a66a68a929caaed3f14a8ad92b387ed9af3
 DIST webmin-1.270-minimal.tar.gz 1301974 RMD160 94847d56eb9aebefc234178656dc53daa3af91c6 SHA1 31fa4cf18205a0dac74e38290a03950450abae26 SHA256 ee55df6476812289a42d75d5b7833bb666500d0321a80056fa4ba006032083dc
 DIST webmin-1.270.tar.gz 9418746 RMD160 9fd621f1a9e418940d3c8ebcad7e21ee28b8e0d1 SHA1 39d58fd3e9d1ac6bb8a9f3249a9ff9b0ff66ee67 SHA256 aa9bbf6589af5bb6b8e2203492c24b885b5ffed555ceab63a08bef07c6e3a311
-EBUILD webmin-1.170-r3.ebuild 3681 RMD160 ebf73f83cf4f2e1001ea0fa2646790f67f5633cc SHA1 07a03641b4d4dec79d4e1f99dd8c7d4acb4658a4 SHA256 f2750857cd1ed6304198a4551ce06ea08ff4caf69785c9f21f91842ca257f536
-MD5 c6d3309b62a5ba19e3aa3893e0cca346 webmin-1.170-r3.ebuild 3681
-RMD160 ebf73f83cf4f2e1001ea0fa2646790f67f5633cc webmin-1.170-r3.ebuild 3681
-SHA256 f2750857cd1ed6304198a4551ce06ea08ff4caf69785c9f21f91842ca257f536 webmin-1.170-r3.ebuild 3681
 EBUILD webmin-1.250.ebuild 4106 RMD160 50a3307e3c3f14e8d049304a4936d36465fb0d45 SHA1 7f4f14e02572631293e749a248744d2bc8e61728 SHA256 2a10a6f7f2bee1838d5fbef929c5cfc799a64f8fc40b7e3a8c55a1c0ee60686b
 MD5 feeac49d3448abf1d8e155f3a63d3b11 webmin-1.250.ebuild 4106
 RMD160 50a3307e3c3f14e8d049304a4936d36465fb0d45 webmin-1.250.ebuild 4106
@@ -91,17 +77,14 @@ EBUILD webmin-1.270.ebuild 4118 RMD160 50b25ace8c751009d35d2eeb7cd147ace7b32598
 MD5 f4b21a91e51e46ddb8d9a2e0a38283c4 webmin-1.270.ebuild 4118
 RMD160 50b25ace8c751009d35d2eeb7cd147ace7b32598 webmin-1.270.ebuild 4118
 SHA256 4af2f5f932b3e3818a8fe25a50dd4f08d0a453f0fbe34f0430bfacab155b015e webmin-1.270.ebuild 4118
-MISC ChangeLog 16195 RMD160 16bc9b32a7d5f64bc28eaa2ab3edb69fc6796fed SHA1 0b1b50919539acfa8e20c96d0b5b77618cb54fa5 SHA256 9ae37254cd4fa02215fa04d0ba38a3b5b0b830290a91790966bbcf2ee80db5ff
-MD5 ae5acd1f167797f58ba9fa902a181f10 ChangeLog 16195
-RMD160 16bc9b32a7d5f64bc28eaa2ab3edb69fc6796fed ChangeLog 16195
-SHA256 9ae37254cd4fa02215fa04d0ba38a3b5b0b830290a91790966bbcf2ee80db5ff ChangeLog 16195
+MISC ChangeLog 16374 RMD160 6997e7abe16348be47fbc3d4495f0a9b9ad63f84 SHA1 f676c0ec8bde83a5deb44a84a83678cc38764a84 SHA256 589c2f2069b6de3a55ff634fa0b98fa62679595aaed81f18acb589f7f9c5cdcb
+MD5 818b35f660dfc703aa263a3c8c587ab6 ChangeLog 16374
+RMD160 6997e7abe16348be47fbc3d4495f0a9b9ad63f84 ChangeLog 16374
+SHA256 589c2f2069b6de3a55ff634fa0b98fa62679595aaed81f18acb589f7f9c5cdcb ChangeLog 16374
 MISC metadata.xml 226 RMD160 5ae23077f29775d25714161f12bee0773317ea90 SHA1 e128d6143915f277d78c38141025f8b781354b0a SHA256 2dedab96a5432a22169e538ec05751e1631088c658b557056de4d6ab4b89013f
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 RMD160 5ae23077f29775d25714161f12bee0773317ea90 metadata.xml 226
 SHA256 2dedab96a5432a22169e538ec05751e1631088c658b557056de4d6ab4b89013f metadata.xml 226
-MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
-RMD160 8fabcf0652529ea4036153c96788b43abdce391f files/digest-webmin-1.170-r3 209
-SHA256 f230d544c2143d7449820d904ea2633eeeb23302f4cc6e4fc522451908e7bf19 files/digest-webmin-1.170-r3 209
 MD5 e4233a2003be3b63b25c2a91bdbedf00 files/digest-webmin-1.250 576
 RMD160 92d29de934f969733eec45fa6e6284508b21fa1d files/digest-webmin-1.250 576
 SHA256 1ab639d46dd4954350b9bfafaa8ae52b7f8b444677d840300f0bafb174449262 files/digest-webmin-1.250 576
@@ -111,10 +94,3 @@ SHA256 fceb1c6c2e5229f69399838b121acdd0873705946ea237aec90d6c64b6e5fbb4 files/di
 MD5 8003f2d3842728134742f1ec77c1aa32 files/digest-webmin-1.270-r1 768
 RMD160 a111a7d7bc89cd9235bf092adf94dc43abd36736 files/digest-webmin-1.270-r1 768
 SHA256 ebd8932a985df35ebfcfd7bd78dbb8c3fada746c00268b598df9a000d8fee5ca files/digest-webmin-1.270-r1 768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEiRlTOpjtAl+gMRURAnKeAKDhiIcJIn2tgm9cRDzHggjretqH6gCdGGHm
-UpK64CC2oyXh9ZwlvlnQnZc=
-=3FHp
------END PGP SIGNATURE-----
diff --git a/app-admin/webmin/files/digest-webmin-1.170-r3 b/app-admin/webmin/files/digest-webmin-1.170-r3
deleted file mode 100644
index c4fddb6774a1..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.170-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2bc5d04524c52af8955c703179e8af4 webmin-1.170-minimal.tar.gz 1011002
-MD5 418a62c76b8ba4e0c9532e654167c49c webmin-1.170.tar.gz 7833477
-MD5 ebb3798d202ed0dff66263c2b4809a72 virtual-server-2.31.wbm.gz 177487
diff --git a/app-admin/webmin/files/webmin-1.130-webalizer.patch b/app-admin/webmin/files/webmin-1.130-webalizer.patch
deleted file mode 100644
index cea038e3d397..000000000000
--- a/app-admin/webmin/files/webmin-1.130-webalizer.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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") {
- 		local $shell;
--		if ($config{'su_shell'}) {
--			$shell = " -s /bin/sh";
--			}
--		$cmd = "su ".quotemeta($user)." $shell -c ".quotemeta($cmd);
-+# Gentoo borkage
-+#		if ($config{'su_shell'}) {
-+#			$shell = " -s /bin/sh";
-+#			}
-+		$cmd = "/bin/su ".quotemeta($user)." $shell -c ".quotemeta($cmd);
- 		}
- 	open(OUT, "$cmd 2>&1 |");
- 	while(<OUT>) {
diff --git a/app-admin/webmin/webmin-1.170-r3.ebuild b/app-admin/webmin/webmin-1.170-r3.ebuild
deleted file mode 100644
index 31cb67779b93..000000000000
--- a/app-admin/webmin/webmin-1.170-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.170-r3.ebuild,v 1.6 2005/07/13 20:56:47 eradicator Exp $
-
-IUSE="ssl apache2 webmin-minimal"
-
-inherit eutils
-
-VM_V="2.31"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~mips"
-
-DEPEND="dev-lang/perl"
-RDEPEND="ssl? ( dev-perl/Net-SSLeay )
-	dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	# in webmin-minimal webalizer and apache2 are not present
-	if ! use webmin-minimal ; then
-		cd ${S}
-		# Bug #47020
-		epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
-
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch ${FILESDIR}/${PN}-1.140-apache2.patch
-		fi
-
-		# Postfix should modify the last entry of the maps file
-		epatch ${FILESDIR}/${PN}-1.170-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch ${FILESDIR}/virtual-server-2.31-nocgibin.patch
-
-		# Check if a newly added IP is already active
-		epatch ${FILESDIR}/virtual-server-2.31-checkip.patch
-
-		# Verify Postgres usernames
-		epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch
-
-		# Fix some all name virtual items
-		epatch ${FILESDIR}/virtual-server-2.31-namevirtual.patch
-	fi
-
-	epatch ${FILESDIR}/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /etc/init.d
-	dodir /var
-	dodir /etc/pam.d
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.webmin webmin
-
-	insinto /etc/pam.d/
-	newins ${FILESDIR}/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:root ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath tempdir
-	${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i "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."
-}
-
-pkg_prerm() {
-	${ROOT}/etc/init.d/webmin stop >& /dev/null
-}