Version bump. Remove old versions. Bug #504782 by PhobosK <phobosk@fastmail.fm>

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

5 files changed, 37 insertions, 552 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 54913b7f0890..581eda395771 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webmin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.205 2013/11/21 07:24:43 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.206 2014/05/01 16:30:09 hwoarang Exp $
+
+*webmin-1.680 (01 May 2014)
+
+  01 May 2014; Markos Chandras <hwoarang@gentoo.org> +webmin-1.680.ebuild,
+  -webmin-1.620.ebuild, -webmin-1.630.ebuild, -webmin-1.660.ebuild:
+  Version bump. Remove old versions. Bug #504782 by PhobosK
+  <phobosk@fastmail.fm>
 
 *webmin-1.660 (21 Nov 2013)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index d153fcd7ed79..5d76c7eac8ac 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,13 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gentoo-setup 11549 SHA256 1468c8641cd292006e2dc70bb656db8cf0bb858f79c50a39f605072c520cf7a4 SHA512 3ae80ff0dd7a4fd10c0fcc26521d7dcf3b2ca26e87d6282b5272dca855563992fa97ff3c2d1bc721e69449e45ba779f81eff5bd0ccb6e80f6d5a8d64a3d8e74e WHIRLPOOL b60a1f317dbfbf297097d3bc5598867c127e62ac410819c5d60062650326b57fe407c6181eaee0a8c1c7d4c45cb6f08b3546f87d9524d0ef2f384f868a546a9e
 AUX init.d.webmin 2254 SHA256 c596712f1dffd69a618055372a39245ecf732a3bbcfadf6c26c9d03640af3547 SHA512 13b28390220a2b653cfdea347b0164e307f8ee6fbe3fff70b12c771829d31b32617f876faab1942f35ca9c46dceb7fcb26d199beccabd683ebe774b69c375d25 WHIRLPOOL 1c5067dc113a692ef68e15a890e325c61ab9e356cc7d43a586afa778eb0708c9cafac219e5766301a284da8998a48e31e600c4cc23d8c7b4ae524888def4db36
-DIST webmin-1.620-minimal.tar.gz 2440850 SHA256 51d75ce76a9038357dec4fbf74069aca1b003bb1e64c7339626cb28ce42fd834 SHA512 099c5197eba2ad205c4aad785fe21c4bc4994be1e70c75157dc0f59fb3292b912b16a0a81ef6e147eb9dd7506a445ab5e677935e1c13449599744d90b8d0d52f WHIRLPOOL d88fa9ccdefdf9d7f9d981225da4f47ef50f0cc976c9691ebae362f974942f26ffca6a43c5b0da50a18937c44a4c23b60228e2155611274aca78f6724db61614
-DIST webmin-1.620.tar.gz 21646366 SHA256 3d36153406d8e5d3dcaeadba34dfb5cdbc4060b75c38339174ac97b2277f284b SHA512 18fcf5dcee161b71b927a7fb5acffe5c655376982989d4f92a08c296186b40b1c185bde83df2cc670eaf6efa8070d73fb39755f94309347e040e8e5edde12312 WHIRLPOOL 6cdcc8855998d1f1f2482d43765894584445bc1f75f2606e39ed7569522891af6ec2c260dcfb0a2a0350cff8a4b21964b3a91edceb49278963f2b71df1211633
-DIST webmin-1.630-minimal.tar.gz 2444267 SHA256 3ba026301ba1cf03351ae93667d32efb20704a42f749c5107510b6fca0bb8e88 SHA512 34e61a1a90d6a446bc7cadf93fc0cab05bcc50d4deb92557e7b3322f10ccefd96299f23fbf7dff81c346c6dd24cba4ef6278d1077d4c247ef2ce8a3ab67ac243 WHIRLPOOL 06fe981b26eb960649fb87edf24dcbaf98a3937226cc1543ec2ed607b6ab86854a17a07d45ab0facc0cd5e78a569326a786011e61b46fb7103a5b4eacbe75f41
-DIST webmin-1.630.tar.gz 21744645 SHA256 2ba5616a252d8108aab0573f615f7cc5c8c15b7df8c11bbcecf7acc23964432f SHA512 e4c373e545f4f9b5acd233576b094ceafff74dbc75702ee2d0d5a4b15fd4afa827f62b8d23500684e0c0ee97509e32ba9619f039f271d2bc8ddf47ca2e67c733 WHIRLPOOL f8cc2fde5cc7d24e16a573a864508779c8939149c97283402659cc7c48a6768f9c92ca36149490553952bfdc0e73d9e562d80f9a8f4986b13856b14c81061291
-DIST webmin-1.660-minimal.tar.gz 2508867 SHA256 ec5dc4197e02b21f49a72e34bd64cc355a1e47d2f0e968d04eb756eba47d330a SHA512 6db99b4515365573ee15852a5b81002c8a3bc474f9ad991c10ccea1a8e2a16097519aaa97087ffce390414083e7903e67e3ec35c192a1de788f4018979885ed2 WHIRLPOOL 61df24953dda735a1e760a8d9997b741bdeb282832149a22cde03abde03ecc341e6c7e0f6f050ea66c68e0f732d7e2ab1db901f25186088713662c7ed515b1b4
-DIST webmin-1.660.tar.gz 22198207 SHA256 21f6fa65aa8198f564199480ba48999eb10c5ac49f3adec01084f97a5a8d0b5b SHA512 b8544d5602c9734e17406fea315384fe996a0ccf43da8e1a2df4ed16bc7624ac59422d152678cfa473e255ce5570c7a0e2a69c9ef22d3938d916abb2889ebabb WHIRLPOOL 24972d32d0242703ab4c7455dd207ea7441bc10007268d9634da864e2954e34cbe126deeaf2ad58137dc302352459d0b9f8a30b57335ed1e9c9ce62dc73b4922
-EBUILD webmin-1.620.ebuild 9150 SHA256 b8ce00cdf89feffc8c270313f1520ec5b28c2e69d15e01e4c2a652f82b50a132 SHA512 b21dec9cac334b8baffff45593b162e7e5c7a133b5b26aa676610f8e98b84673f4336e942150be0b7ce453de4a6a5a123210896a740835d4801b6d3d67053ae5 WHIRLPOOL 012712fd2a62f8f1604c032458140f8ecef22f726c8db274ed62e036bcb53c0263bef20a665bb9119bb39178e7d356b1c0b118562b053267404cc5e6bf858f97
-EBUILD webmin-1.630.ebuild 9150 SHA256 c15279983545c60d1cc7f73dc92275146e54e6474dff185c6ca65b264d86520f SHA512 a5574c9afff3b39b78f4f09d3c4a0c95d31d7a50bdb58c2c42b9a9a33d17283cad01516403e99bd69586f32a27c738ee1685d871333de93a09f91880fb8f9a86 WHIRLPOOL 7363e7f1d774fc4316527f08db573bb20793d9f6164df5b0bfaf77801589240f0e5145dc4b81f2aeffbabc7294aa61b9a0461c16646ec29d230b3f26ff46add7
-EBUILD webmin-1.660.ebuild 9149 SHA256 f596ae760f261cbb7e8b9f806f84ca00863daab021a2732730deeec2351517c8 SHA512 bf80f7ed3f77bea92f563f156285ee2593eb403393b9f0932538d200baf2278ec12d9f7049944efdfc6346e2452d53d70816736ce4ef0bc7dc6b341b7b820c3e WHIRLPOOL b7dd2afe89f98eff0219deb4dfb90b3ad7c4252caf07836f6ebe531fd75248593e58fd15a07abad9bc4f00d82115724ed723f0bc7a8f9c4f7a6bce63cfefde33
-MISC ChangeLog 3371 SHA256 bcf5004604d47ed93f456824c1a57f523bcc9bea17d9613d32d491dd3ce849b4 SHA512 f6ebc9fc1fd2667c3d5698e974066826a5d81f251971b9099a2e014385e4684d2a24747b5dc68eabc4480c0ad1589fc2fcf15bcfb45c4a55d275d2f085aa4c75 WHIRLPOOL 6aec4bbc0ac6153a152def11d87cfff507976af6ff4359ac963232676891153a8872e940fb3707d82ab0230a3bd7398eacc86ccb90a21a74750571dc7aabdc2c
+DIST webmin-1.680-minimal.tar.gz 2593231 SHA256 8152e56f9f880b1f719134a877b2bb2b022fccdd59a875aefbf6f24b0cb37230 SHA512 742238771bcff5342b2c651a015ba234d66035fdbab900963a9cf0832aa13ea299d565a6467a737e59b6b69b8a6a50fa8a5545f6cb615b0fcdcf0b2942eb5213 WHIRLPOOL 40d86669721e274cba6b80b70b1382c5c977abef23cfabb1005140910c8d982c6f00425cf9e9309452286ec74da40f16cefede8694930f24096449e4fea1e344
+DIST webmin-1.680.tar.gz 22418010 SHA256 c6205b6a9dfa1aa7179591bb9a82a9f321e775ed08710da8877d01c5bf9b8078 SHA512 591ac89192c020a443af318a30664310d36d0b9880cd91ff5179bdb17fc01773abf3ae67a016e922fd4d319d311d16f9c9f79a9d07bd94018a38b0127549bc69 WHIRLPOOL 21729591197f971244f99a281da4a3f8af7c17673c1fd124cb9de2de28fd3e0e6688e38f782e735038f5735cbeac551ebab5eb7a417d7adc899794944490a54b
+EBUILD webmin-1.680.ebuild 9150 SHA256 5f40420b02cbf1471cdee8f7ad59e5b4a2e870666df52c44194204066aa32764 SHA512 fe257e3146a10359b97d04bee414adf90121aa21b02109e653df1acf227f157fdb3d1ec0a5823691d7c33b7383fba56a7981d15f235b82b8645d6767c5a4ad8a WHIRLPOOL 39989bb857eab0ff33c68389cd42d3de5c4d2b375250e47e9f92d8d8b06890ffd27c7cd30ed689400417820333f4d5cc4680d5d542a60247b90f424bed9bfb4b
+MISC ChangeLog 3629 SHA256 947ad16e396b7d23631159ac760f44699827f6b6279d1afd8e7479efcdfa2b47 SHA512 f760ed9117902a95a8dc0b76378f87ff24a0c8d5f4f213be6c59bb99e0bdfe682952d4104d2447134238b4fc8f792d761cdd91f116e8df474754bc5ecb07ae1b WHIRLPOOL 2085758a7fac3e74d08f4882b84770c6fafdacd3c944c5f68ca328bd37f517b1e69332bf523e876553aac3fe4ae5339119a0636fa15c0daadc13bca22d0c42dc
 MISC metadata.xml 326 SHA256 44e634f8f6afe175e696bb53be1749163798e22862c6ab40d81a70146e28269f SHA512 7c400180abd54e464c3570f046ecbf2489de6f83738bdbda83285df1ebc5354a532ea7495b842e39219649d729488bc00ba39bc426faefa24bc88090a136f8b6 WHIRLPOOL 9124acba12823edb57b989ca40913e408e1ed2f894822beab847b0b49bea86a8f974e984b444cb05d7d0881b21c1bcdaf5676c863a21098b2ef2b4e772bd2d98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTYnY6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun887sAP/jdO/pszUPesSmC7j340pRGE
+F1bxyD9FDRgKzptFiK1oHZqgk5CdJcrlrEAFY+u+Ac2GTIkgFlzUWlU3vspRC+9N
+rS/9hU7JJpiVcXyIonCkCNF+bBwSDtqGcIKZsLPTTQbaMrZldBw+3HvOtNu5Hvct
+aJ5rLvXat3ufZoR3kty+37amWMuIR2TpqvOtYSn18eI2MLJm1VvKVFFA7/Mww0g7
+A9UYkFPTGMzg/TJZJIitPj2wknxGh02pFJYZH8SxvD+tTvRd9bzDQvWcxwdxuZHa
+COIKayTL1paozy1S5uUuzzCb6f8SrCTSy17rR5McRatlY19+zNqaoi8ronBrLijb
+bQ4AtBEW7CRtKHV1TNb9+ZQjG7BDqgQBn2q0SpIDb2aObO1uKtFTCkSWOprwoAWd
+ZfDNxIBNoUQZVHh6IwHWgVMrxrTe6Uo+oM7V5wygsdJrzeAy1z5MhvKFZm8oGSTa
+1b+JLsW4SGZJQWPfftx+UsTMCj0s4rCfaEVR5kp8hs70NsCBn+f9g0x3JmSoN9V5
+YiR8CqYfIogj8TtnX7TCljOvh6r7LA79/ClB6F3azYd9Pfc9sr4RLfx4FJBJgMMN
+gR0bK13FCt6GlqhXikCCxA6DHaIHr4Wd5vJwQyGNpQJuXMSKjZtWkifkT5rEAGvS
+2Vz5ZMREsBt0HhgjvsXH
+=olFo
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.630.ebuild b/app-admin/webmin/webmin-1.630.ebuild
deleted file mode 100644
index 8e8ddc2b1d47..000000000000
--- a/app-admin/webmin/webmin-1.630.ebuild
+++ /dev/null
@@ -1,269 +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/webmin/webmin-1.630.ebuild,v 1.1 2013/05/16 19:33:31 hwoarang Exp $
-
-EAPI="3"
-
-inherit eutils pam ssl-cert
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Set the installation type/mode to Gentoo
-	echo "gentoo" > install-type
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-}
-
-pkg_postinst() {
-	# Run pkg_config phase first - non interactively
-	export INTERACTIVE="no"
-	pkg_config
-	# Every next time pkg_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-}
-
-pkg_postrm() {
-	ewarn
-	ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-	ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-	ewarn "To fix this just disable them if you intend to use Webmin again,"
-	ewarn "OR delete them if not."
-	ewarn
-}
-
-pkg_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl', 'ssl_redirect' and 'no_sslcompression' for tightening security
-	export ssl=1
-	export ssl_redirect=1
-	export no_sslcompression=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.660.ebuild b/app-admin/webmin/webmin-1.660.ebuild
deleted file mode 100644
index 4bfeaf201097..000000000000
--- a/app-admin/webmin/webmin-1.660.ebuild
+++ /dev/null
@@ -1,269 +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/webmin/webmin-1.660.ebuild,v 1.1 2013/11/21 07:24:43 patrick Exp $
-
-EAPI="3"
-
-inherit eutils pam ssl-cert
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Set the installation type/mode to Gentoo
-	echo "gentoo" > install-type
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-}
-
-pkg_postinst() {
-	# Run pkg_config phase first - non interactively
-	export INTERACTIVE="no"
-	pkg_config
-	# Every next time pkg_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-}
-
-pkg_postrm() {
-	ewarn
-	ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-	ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-	ewarn "To fix this just disable them if you intend to use Webmin again,"
-	ewarn "OR delete them if not."
-	ewarn
-}
-
-pkg_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	rc-service --ifexists -- webmin --ifstarted stop
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl', 'ssl_redirect' and 'no_sslcompression' for tightening security
-	export ssl=1
-	export ssl_redirect=1
-	export no_sslcompression=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.620.ebuild b/app-admin/webmin/webmin-1.680.ebuild
index 5055a52a7d54..f6d68f6cfbf8 100644
--- a/app-admin/webmin/webmin-1.620.ebuild
+++ b/app-admin/webmin/webmin-1.680.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.620.ebuild,v 1.1 2013/02/06 20:13:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.680.ebuild,v 1.1 2014/05/01 16:30:09 hwoarang Exp $
 
 EAPI="3"