Version bump.

9 files changed, 21 insertions, 211 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 1ebf40626590..1acc99e8e43f 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.63 2004/11/03 06:48:46 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.64 2004/11/17 23:17:10 eradicator Exp $
+
+*webmin-1.170 (17 Nov 2004)
+
+  17 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -webmin-1.150-r1.ebuild, -webmin-1.150-r2.ebuild, -webmin-1.150.ebuild,
+  +webmin-1.170.ebuild:
+  Version bump.
 
   03 Nov 2004; Bret Curtis <psi29a@gentoo.org> webmin-1.160.ebuild:
   added to ~mips for testing
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index eadf91e5fbd5..1bff2fa44685 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,16 +1,12 @@
 MD5 5b6bf720d2529a86a3af4370f761016a ChangeLog 9050
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 88429ab206c35a578872afe6abfe7cc4 webmin-1.150-r1.ebuild 2368
-MD5 7b3b67769e6852868948e4b380ede13e webmin-1.150-r2.ebuild 2689
-MD5 f19f7b11073df55b1c3db965dd6936ae webmin-1.150.ebuild 2265
+MD5 c805c57514036cbaf5c96cfb51bd0f02 webmin-1.170.ebuild 2727
 MD5 a21a0a8a415d1e5a1764199b0b4eeed2 webmin-1.160.ebuild 2685
-MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150 65
-MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150-r1 65
-MD5 a947adc3399bbf729d969eb087a8d63c files/digest-webmin-1.150-r2 137
-MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
+MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 7be7bafd8b2e3d886fef0a055078b226 files/init.d.webmin 860
+MD5 58f9530c780e652271313555858ad909 files/digest-webmin-1.170 138
+MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
-MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
-MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227
+MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
diff --git a/app-admin/webmin/files/digest-webmin-1.150 b/app-admin/webmin/files/digest-webmin-1.150
deleted file mode 100644
index c79b69d9cf6e..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.150
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5566f3b761b5e9498b3da7c7587f9f75 webmin-1.150.tar.gz 7153367
diff --git a/app-admin/webmin/files/digest-webmin-1.150-r1 b/app-admin/webmin/files/digest-webmin-1.150-r1
deleted file mode 100644
index c79b69d9cf6e..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.150-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5566f3b761b5e9498b3da7c7587f9f75 webmin-1.150.tar.gz 7153367
diff --git a/app-admin/webmin/files/digest-webmin-1.150-r2 b/app-admin/webmin/files/digest-webmin-1.150-r2
deleted file mode 100644
index af2c4065117a..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.150-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b44bcfc346cf9b93d0b0c8efedfcb96f webmin-1.150-minimal.tar.gz 955826
-MD5 5566f3b761b5e9498b3da7c7587f9f75 webmin-1.150.tar.gz 7153367
diff --git a/app-admin/webmin/files/digest-webmin-1.170 b/app-admin/webmin/files/digest-webmin-1.170
new file mode 100644
index 000000000000..13d6cfcd17c0
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.170
@@ -0,0 +1,2 @@
+MD5 a2bc5d04524c52af8955c703179e8af4 webmin-1.170-minimal.tar.gz 1011002
+MD5 418a62c76b8ba4e0c9532e654167c49c webmin-1.170.tar.gz 7833477
diff --git a/app-admin/webmin/webmin-1.150-r1.ebuild b/app-admin/webmin/webmin-1.150-r1.ebuild
deleted file mode 100644
index da6622104f98..000000000000
--- a/app-admin/webmin/webmin-1.150-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.150-r1.ebuild,v 1.5 2004/10/05 02:58:11 pvdabeel Exp $
-
-inherit eutils
-
-IUSE="ssl apache2"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.webmin.com/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc amd64 ~s390 hppa"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	ssl? ( dev-perl/Net-SSLeay )
-	dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	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
-}
-
-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
-	mv ${D}/usr/libexec/webmin/openslp/config \
-		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-
-	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
-
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
-}
-
-pkg_postinst() {
-	/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd /usr/libexec/webmin
-	config_dir=/etc/webmin
-	var_dir=/var/log/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl /usr/libexec/webmin/maketemp.pl
-	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
-
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		/etc/init.d/webmin start
-	fi
-
-	sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' /etc/webmin/miniserv.conf
-
-	einfo "Add webmin to your boot-time services with 'rc-update add webmin'."
-	einfo "Point your web browser to http://localhost:10000 to use webmin."
-}
-
-pkg_prerm() {
-	/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.150.ebuild b/app-admin/webmin/webmin-1.150.ebuild
deleted file mode 100644
index 439291ad26d4..000000000000
--- a/app-admin/webmin/webmin-1.150.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.150.ebuild,v 1.5 2004/06/24 21:42:52 agriffis Exp $
-
-inherit eutils
-
-IUSE="ssl apache2"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.webmin.com/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc amd64 ~s390 hppa"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	ssl? ( dev-perl/Net-SSLeay )
-	dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	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
-}
-
-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
-	mv ${D}/usr/libexec/webmin/openslp/config \
-		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-
-	exeinto /etc/init.d
-	newexe webmin-gentoo-init webmin
-
-	insinto /etc/pam.d/
-	newins webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
-}
-
-pkg_postinst() {
-	/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd /usr/libexec/webmin
-	config_dir=/etc/webmin
-	var_dir=/var/log/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl /usr/libexec/webmin/maketemp.pl
-	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
-
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		/etc/init.d/webmin start
-	fi
-
-	einfo "Add webmin to your boot-time services with 'rc-update add webmin'."
-	einfo "Point your web browser to http://localhost:10000 to use webmin."
-}
-
-pkg_prerm() {
-	/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.150-r2.ebuild b/app-admin/webmin/webmin-1.170.ebuild
index 819e1e240bb6..5d070193f43f 100644
--- a/app-admin/webmin/webmin-1.150-r2.ebuild
+++ b/app-admin/webmin/webmin-1.170.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.150-r2.ebuild,v 1.3 2004/08/28 22:05:33 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170.ebuild,v 1.1 2004/11/17 23:17:10 eradicator Exp $
 
 inherit eutils
 
-IUSE="ssl apache2 webmin-minimal"
-
 DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
 HOMEPAGE="http://www.webmin.com/"
+SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~s390 ~hppa ppc64"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 s390 sparc x86 ~mips"
+IUSE="ssl apache2 webmin-minimal"
 
 DEPEND="dev-lang/perl"
 RDEPEND="ssl? ( dev-perl/Net-SSLeay )