Version bump to 1.600, remove old; fixes security bug #511626.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

8 files changed, 20 insertions, 461 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 01f4dd7acd34..faeb023feba8 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/usermin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.160 2014/03/17 23:56:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.161 2014/05/28 00:35:35 tomwij Exp $
+
+*usermin-1.600 (28 May 2014)
+
+  28 May 2014; Tom Wijsman <TomWij@gentoo.org> +usermin-1.600.ebuild,
+  -usermin-1.430.ebuild, -usermin-1.530.ebuild, -usermin-1.540-r1.ebuild,
+  -usermin-1.540.ebuild, -usermin-1.570.ebuild, -usermin-1.590.ebuild:
+  Version bump to 1.600, remove old; fixes security bug #511626.
 
 *usermin-1.590 (17 Mar 2014)
 
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 9ac088654ec8..24b55fc7c316 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -6,27 +6,18 @@ AUX usermin-1.080-safestop.patch 620 SHA256 cd4ed0f18303bfd518791993f413a9b338a5
 AUX usermin-1.150-setup-nocheck.patch 998 SHA256 e7d550caed8dc773102ca1330fb51de7f82c3763c1a70a1df8cebad7da0afb27 SHA512 2006d6f53b95b9ef543f5dfbf96eeeb0016f1915fe4df5d28f71112fcfccfe489cf001bd9401f33a4d59ab39f26ed2a6f124236108385cf9cc86958f8c3640e5 WHIRLPOOL f20e59c35b66f7ea4dc4d72d53c7dd388175e223c0b430fb0ac0a42d33a8525610d02f1b29834848d0ced0a864e030061aa489697e6fb463f115d03b9e9ff743
 AUX usermin-1.540-r1.init 843 SHA256 260b44b59a19b0206da603718684c3d82de4320dd4e2534d1af0d6da55079879 SHA512 3aac81c500d1d5d98e4a5a17250224fdd87c222b70ee8dec077521e8a8095ea311d8fcbcbe60fb56199680d7bb76c18ec97192589a5384dba6590616f69d90d7 WHIRLPOOL aacb447f5ffa8f255722aecdaae633b25193d4b2ef68c6417ce26ebb39b33b53f2876717419fa4b10a23eb85365c1a983219958afe38ab79155f65b5c122c10f
 AUX usermin.pam-include.1 210 SHA256 facea91616049551f44655a7f8a270c61dd571e860284abc972fd3430a9b8d50 SHA512 75441a60244060603229f4d6e41501a1250e07845a6763c5d7702740cf657a0d755dfee524b0f5a71f4c5d48a5edb786ef9166648d928c866e158c9e960c958c WHIRLPOOL 92eab67307edb92e72f6ca4aa01ee9800c772f627b30f6ca9e30d59964c116c6de4869018cfccfae5d0073c162b8253e11ed699d8f3940c5da6846d6abf97c0d
-DIST usermin-1.430.tar.gz 6059219 SHA256 2886f30bf843632f386d97b28d77f393af1157bb13b69694553a4d5e509d67a9 SHA512 1b9c9e59072663f0e057a831622893fb1b214d6a51fa8b0eeb292acd9fc82b0903d2dbe0a2f50ff1daffb4d00be1709d3b31f71a5e20c6b26dc2882135edd008 WHIRLPOOL 7efd2b751f7ae14dfa2a2e64035eaff12cc30f2665f92a049d4c6efd86a1fee228361fc3340a949990950045b9d30c1ed856c538f6f0c13dbe6108c42d6bcf09
-DIST usermin-1.530.tar.gz 9117223 SHA256 d9196276c2dfe0615964d0e1df89d7a5991abc33c4d1eaa6180733797c466d33 SHA512 6cf5bc062ed09ceb2993a00e47d4bfadba4af4a2263b7cb0d9f37c61e987bdda925435d26ca9258f2c552126116bba0330bc1d63b307783ed6238abe60223f13 WHIRLPOOL 0433c308c481fc8b6ff36305ebca279f361b12d26df24b3ef35057319743de1855b69aac698e7df50377534e9cd34c672bdeb829073a976e5a96f629db27fc38
-DIST usermin-1.540.tar.gz 9135732 SHA256 e3025ebfb455a36599b7bb88afb99fa24b0e263fdea5684448eac6d1a2242028 SHA512 7940de94da5d96060e1feae9f7f47f5d746f4e146792fc8bb595fca2e569eac84925d1018c12ba8d8e9564b3dc005363a7523889b089c058214adb086b888db2 WHIRLPOOL 5a7682a6961da2ba74fb628795a5a6cb44022a35fd8a6280be1278a47b32e74068e6f8732afd689dea1eeefde1170928d38bc4b3116477a5ed260ff6d7f725e8
-DIST usermin-1.570.tar.gz 9238004 SHA256 2daf06232438a1ac9e458003776e381ee1c8b48dd20d9de91f30b8705d80a16c SHA512 86f858414ed1339f12e87883923ddaa2c02528845d8f51391b81e3c0bb8571fb7ea2d16192a09e552256d0be82a2d01471926187d811a21983495c50f866db73 WHIRLPOOL b1407c7fda9e9d695a7a364c5bdbac2c4587f581eb588452889a59655a5f9e45ecdeabddec7fb96db82c669f4c4e8e59e9faa4860f4a750f02e6a2a0f7dfbdf1
-DIST usermin-1.590.tar.gz 9294855 SHA256 37e149af57463c5d50512a94bb26df09fb6930f34f885896f8943f49010f22ef SHA512 82e8c71f45efa290f4372de00ec966384bcdf9a8f74b30039352c7609cca7cd61c8db41cbd37cc519952aec93d6023b8bfde82b84d604b8392e30c980d2645a8 WHIRLPOOL b00b079ae59f0039a26932b141498b5d0fd4803866b23748167ebd4c0e20dc7f7c1509e045ae8a2aa248d0e4bd65cd57edd85477ec68a01e5d08dcc84273d4ee
-EBUILD usermin-1.430.ebuild 2254 SHA256 1a3a830e8f43ddf6aca050047191a47b62d07c2819ca326adeefecd6fa73724e SHA512 32891dbfba066547257d9e4ac5f202a0939747128445a16005b3d70c0d1ff562109d8b39bf3533596d08ab857ad1594ec9aa1c81f739f4da051e2ad9cd9b2742 WHIRLPOOL 17273356b74cd4a33c1ae2c2894e3cd0d6708ab676fb30a194ec8560e438c22e1e30d8ed646326b99cbb119ad3a1e3fa0009bf7c465c05a7c0159ddf771d0b30
-EBUILD usermin-1.530.ebuild 2249 SHA256 f0e3464ead3bc3e1277bf04d92303dc8446da89e6fa3de460b1755571034f3e9 SHA512 83d60a7f1c0203bf3b5c82183124742f9089d16de8f26221500a718412bd6524068a6ad166344bb6f75be69bbd24bf9b2d6894d71be20177d7050ffe4697c644 WHIRLPOOL 44e887bb5388d03868e64767d117c5dd67c79996dd5c57aaec7ceae183f73950d1b48c1bcc1fa2fb368c4f43da0abfeed47f159a9afb85bacf97413adeeee353
-EBUILD usermin-1.540-r1.ebuild 2527 SHA256 debcf4bcf4f6bc3e60e462f61d1f8d692ae56b750c941a6e07d9251a8b83bbb6 SHA512 6a700ee0162e50bfbff4649f6ea3ed397a4874b12bbdabb3e1d1fbff91d69ed4efd8ad1dea6d1fda52ce9fe91cf41e4755604694e24e8f47152b452f6db1261c WHIRLPOOL a7fa768829b69266f333023e665cc8d1144a6aa53066ac20f56abf573a54321d127134c70c46106604fb907bc6380aec20e3508f1e3c8885934f2847c4c6b2ce
-EBUILD usermin-1.540.ebuild 2233 SHA256 85cfaeca5afd4885c686da4a86635f60538938697db0f408e6b51e7774b028af SHA512 06a37dd46e0cac33b06f6d26a4935a34469f8207d9234c0fd016c02b6488d6c30fd58bc8ffceb576045c91418b476fb0c3c5fb412a410e14eb5f0f14e32cbb89 WHIRLPOOL 9547b040394a52cc3e2abbdf836f2b43eed113738f11c77abde620b5bde377f0264747bba9639c040ed7e530815d29767f3f3f51abcea7c4759afa1f3b6511a8
-EBUILD usermin-1.570.ebuild 2533 SHA256 6a107f1a461ad4d2cad5b967b7879c106ec9210f59c2515f84f25947a9923837 SHA512 7776747d89f62179a2b9247f26eefd42d2561a3a2a13576bbcad3167bd036c3c481ee727940dd74643a8879cd48ca699b27c85b5894807591779f8237ce82c3d WHIRLPOOL 5c83585f8c187e723d5bf860143031c8b525d0540f18c4a3b7cc621f89f63a8b5e21138ebbf5f549227290508d0b536f10755cd11ce6e976c7cc5709af04238c
-EBUILD usermin-1.590.ebuild 2343 SHA256 2c314d3bc430d43ed4366fa2dd3ffa40986e3f49dc8341a03b0f1a23c86ffb5e SHA512 a9d8d60726d8f4b3c46eca1c95e081950a05fd1164ece5612958bc345dd1bf66140ed04d22c05ad8cdba1b555aa9cfd17fc2c7c7488ecdceb75da9ed3e2af7b7 WHIRLPOOL d68b2375ead8c8131c0ce7f23c57656eee55c5b30ccee1b124d7d9e2ce374dfa0e9b940a6b38056ee4a83afd7e3c6130e2ee8a7d0103149c0d9169f054e473e9
-MISC ChangeLog 21066 SHA256 7a7d4d175732b7bf710306bb9f42bc35e362375f959f7d1d9dca3b37ad2c6838 SHA512 31331901d9f718d5fee2db732604f78382b3c6c9e111ea32372d22a3f66f8e21d50bdb7a16d8a2989436d020c1c38e51a1eb5c260eff909520a883b3080eafff WHIRLPOOL b49658c24dd33f46cdeb109d3d52ef40e94c100a7dd7a3767bfd23520efa74b4e8f9c5bc0c54acd4860ee1590e2eb51c9f049b8381838c0d75e430afffbc557e
+DIST usermin-1.600.tar.gz 9295065 SHA256 4952689a2a7c77b111aeb0fdfac66d4c5edaa06735091b92aacab72e9ecd27ef SHA512 9c0670360179a6e79ac17ea8f87810f05e640b42cf946beeac8d4398b2b9ce441e10a178da242cb77f2163afd8eb508ccb6c89f54b540907eba8d97dac592895 WHIRLPOOL 7c92ab2bbb1378ca6288fae46a0c8590b4ea6bfbd8b9abc5697efb4d8d1b2ac85ece6d506e64e8e25b7661707fe8802521440a8ebcdb3b874670ab04645beaab
+EBUILD usermin-1.600.ebuild 2342 SHA256 c91d9994ddd5bc58a5ddd3c5053f791238f6293a27f4a4b99db4d73bc3e3e7b4 SHA512 f2becd2de022a113cd4dfe0958420a2c59f4cd7771d2e47876f240e44eb073a5fd73b16d023c1b561b350483f567b00e9fa58411865967a76cb54d7c2651be1b WHIRLPOOL 1f7f37810871d99b57675dd503a0ff265b47438f1f613021a30b15d27d6cdfd637c8f2ea36fc93d42008173fec1fc009c841d964ecb23a6c4ce1f02f11f185a5
+MISC ChangeLog 21377 SHA256 6d584fb589c9407a4f8978d8e4954f5a229b763a0dd7fc2dc8a97ea4877b9a18 SHA512 0d319152683d3390c1a1fc925574c01b39d534d8a56054ad1563178d1c38eddbd19957f1976b25fbda5dac160f1b378a1b59583d56b3a165d26bcb27323291fe WHIRLPOOL 93ff31568db78332900d5a0e02f2b25c1bf01feeacec3e93ec293a3ee9df64d3b5b5a2d39e162307795aac0c964dae026c98d6b0244e0659b539d0f6817d811f
 MISC metadata.xml 324 SHA256 e31117cfe632357ed8d45afe5e7607423681086146f7a773073ff615cca65e32 SHA512 9d31940f3fde16190b6979581eac4b47cec6609ffff654e0012d490f63af728e5cb99fb6fd5428e54739ee58188a2c44bdad64262b3b57ef69a7766d92cf7d06 WHIRLPOOL 606ec1d10e7b4e0d2c2e3625968b2554e36fc0d648cc0b82ef65c32ac2c349503d9a5940b42aa19696efb27127ebe5893734504e7c8aad05a606b0eddf907660
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTJ4u+AAoJEJWyH81tNOV90DkIAIadvQHAced3YTRp2Xm2HlKK
-WyZLaLUdx9CgAh8j+nFYk1YlpTNvd/I3+O567nVtbsqkQVSG7E47pepJB58NPyrF
-nZs3CWGG+UsKhMcf5vlWoma6Lz7jA3XDJcAgB+OJ0D0Y3rCTDuOAuanxI3isNYQD
-UBxoisSp8NuTU44Yv+B30RPoEsKja7O65Cpt1JqfBkxPFxlP5+7qRzrJ4bPUlXwT
-be1YmPz9uSXVZA+AgXUl3Hq2gibdVEbprbZYd3igr7sEtk2wL41BiHIzsM+NM4/E
-b2PqG3cUci3xN+BpgvUKlDDmRFKoF5t371wkeo4E8z9CwZjOHtreEaggkBBR21I=
-=tWOX
+iQEcBAEBCAAGBQJThS83AAoJEJWyH81tNOV9UuoH/0chUPr3ynX5Kg/x3LvEpfbt
+yo7j3NDD/3tQamIVa2sjOjgHsPDAZ48/X8NsaG63K6mjC0EK9egeM0XKvY5gdgk9
+T0VAK8qpvwLV2Vp2U+Nd+qkGHY/g9bzPj9yZEUM5dTyuEMvQOG0q8vDfggEXWWxw
+TIsYSKul11TCq8DZ0bPSuZDLJQzkieHn3ct65gq7Ycayl87MPOqU9/g1WkBYlVER
+3pwKLvNiPlSnFArUWSE7M5rPiFLNgx8hUCJqeJQFocDNm+c1CFyNksVzvgNhgfj0
+OpX+K9T+WLhlWvD2sEIDaYTN/5E3QRYJMfbOM4O76M0Zih/+LaFttCWOT7cFHDw=
+=Myvj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/usermin/usermin-1.430.ebuild b/app-admin/usermin/usermin-1.430.ebuild
deleted file mode 100644
index 4d26a8fe97bf..000000000000
--- a/app-admin/usermin/usermin-1.430.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.430.ebuild,v 1.3 2013/05/10 06:13:37 patrick Exp $
-
-IUSE="ssl"
-
-inherit eutils pam user
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	sys-process/lsof
-	ssl? ( dev-perl/Net-SSLeay )"
-
-#	 pam? ( dev-perl/Authen-PAM )
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -pR * "${D}"/usr/libexec/usermin
-
-	newinitd "${FILESDIR}"/init.d.usermin usermin
-
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	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 atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/usermin/setup.sh > "${T}"/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
-	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	elog "Point your web browser to https://localhost:20000 to use usermin."
-}
diff --git a/app-admin/usermin/usermin-1.530.ebuild b/app-admin/usermin/usermin-1.530.ebuild
deleted file mode 100644
index f4a0649e9607..000000000000
--- a/app-admin/usermin/usermin-1.530.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.530.ebuild,v 1.1 2013/01/30 04:13:29 patrick Exp $
-
-IUSE="ssl"
-
-inherit eutils pam
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	sys-process/lsof
-	ssl? ( dev-perl/Net-SSLeay )"
-
-#	 pam? ( dev-perl/Authen-PAM )
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -pR * "${D}"/usr/libexec/usermin
-
-	newinitd "${FILESDIR}"/init.d.usermin usermin
-
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	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 atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/usermin/setup.sh > "${T}"/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
-	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	elog "Point your web browser to https://localhost:20000 to use usermin."
-}
diff --git a/app-admin/usermin/usermin-1.540-r1.ebuild b/app-admin/usermin/usermin-1.540-r1.ebuild
deleted file mode 100644
index 1fb267ad08da..000000000000
--- a/app-admin/usermin/usermin-1.540-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540-r1.ebuild,v 1.2 2014/01/08 06:45:26 vapier Exp $
-
-EAPI="5"
-
-inherit eutils pam user
-
-DESCRIPTION="A web-based user administration interface."
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ldap pam ssl syslog zlib"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	|| ( virtual/perl-Digest-MD5 dev-perl/MD5 )
-	dev-perl/Digest-SHA1
-	dev-perl/Net-HTTP
-	sys-process/lsof
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	ipv6? ( dev-perl/Socket6 )
-	ldap? ( dev-perl/perl-ldap )
-	pam? ( dev-perl/Authen-PAM )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	zlib? ( virtual/perl-Compress-Raw-Zlib )"
-
-pkg_setup() {
-	enewuser ${PN} -1 /bin/bash
-}
-
-src_prepare() {
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/${PN}.pid:" etc/${PN}/miniserv.conf
-	find etc/${PN} -type f | xargs sed -i -e "s:${D}:/:g"
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	dodir /usr/libexec/${PN}
-	cp -pR * "${D}"/usr/libexec/${PN}
-
-	newinitd "${FILESDIR}"/${PF}.init ${PN}
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	dodir /etc/${PN}
-	dodir /var/log/${PN}
-
-	# Fix ownership
-	chown -R ${PN} "${ED}"
-
-	config_dir=${D}/etc/${PN}
-	var_dir=${D}/var/log/${PN}
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	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 atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/${PN}/setup.sh > "${T}"/${PN}-setup.out 2>&1 || die "Failed to create initial ${PN} configuration."
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/${PN}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	elog "To make ${PN} start at boot time, run: 'rc-update add ${PN} default'."
-	elog "Point your web browser to https://localhost:20000 to use ${PN}."
-}
diff --git a/app-admin/usermin/usermin-1.540.ebuild b/app-admin/usermin/usermin-1.540.ebuild
deleted file mode 100644
index 6da81a215922..000000000000
--- a/app-admin/usermin/usermin-1.540.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540.ebuild,v 1.2 2013/04/03 02:24:22 tomwij Exp $
-
-EAPI="5"
-
-IUSE="ssl"
-
-inherit eutils pam
-
-DESCRIPTION="A web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	sys-process/lsof
-	ssl? ( dev-perl/Net-SSLeay )"
-
-#	 pam? ( dev-perl/Authen-PAM )
-
-src_prepare() {
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -pR * "${D}"/usr/libexec/usermin
-
-	newinitd "${FILESDIR}"/init.d.usermin usermin
-
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	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 atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/usermin/setup.sh > "${T}"/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
-	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	elog "Point your web browser to https://localhost:20000 to use usermin."
-}
diff --git a/app-admin/usermin/usermin-1.570.ebuild b/app-admin/usermin/usermin-1.570.ebuild
deleted file mode 100644
index c2fbba58aea6..000000000000
--- a/app-admin/usermin/usermin-1.570.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.570.ebuild,v 1.2 2014/01/08 06:45:26 vapier Exp $
-
-EAPI="5"
-
-inherit eutils pam user
-
-DESCRIPTION="A web-based user administration interface."
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ldap pam ssl syslog zlib"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	|| ( virtual/perl-Digest-MD5 dev-perl/MD5 )
-	dev-perl/Digest-SHA1
-	dev-perl/Net-HTTP
-	sys-process/lsof
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	ipv6? ( dev-perl/Socket6 )
-	ldap? ( dev-perl/perl-ldap )
-	pam? ( dev-perl/Authen-PAM )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	zlib? ( virtual/perl-Compress-Raw-Zlib )"
-
-pkg_setup() {
-	enewuser ${PN} -1 /bin/bash
-}
-
-src_prepare() {
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/${PN}.pid:" etc/${PN}/miniserv.conf
-	find etc/${PN} -type f | xargs sed -i -e "s:${D}:/:g"
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	dodir /usr/libexec/${PN}
-	cp -pR * "${D}"/usr/libexec/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-1.540-r1.init ${PN}
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	dodir /etc/${PN}
-	dodir /var/log/${PN}
-
-	# Fix ownership
-	chown -R ${PN} "${ED}"
-
-	config_dir=${D}/etc/${PN}
-	var_dir=${D}/var/log/${PN}
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	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 atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/${PN}/setup.sh > "${T}"/${PN}-setup.out 2>&1 || die "Failed to create initial ${PN} configuration."
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/${PN}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	elog "To make ${PN} start at boot time, run: 'rc-update add ${PN} default'."
-	elog "Point your web browser to https://localhost:20000 to use ${PN}."
-}
diff --git a/app-admin/usermin/usermin-1.590.ebuild b/app-admin/usermin/usermin-1.600.ebuild
index 3d1f8229b4ca..053edeb49743 100644
--- a/app-admin/usermin/usermin-1.590.ebuild
+++ b/app-admin/usermin/usermin-1.600.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.590.ebuild,v 1.1 2014/03/17 23:56:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.600.ebuild,v 1.1 2014/05/28 00:35:35 tomwij Exp $
 
 EAPI="5"
 
 inherit eutils pam user
 
-DESCRIPTION="A web-based user administration interface."
+DESCRIPTION="A web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
 SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"