More GRP friendly

3 files changed, 17 insertions, 10 deletions

diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index d6bba4383f82..13168151beb8 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,14 +1,16 @@
 MD5 cd6093c047375d1997352c9f7d62d16d usermin-1.060-r1.ebuild 1382
 MD5 07d9e3a8c690feb92fe3687d8f296e09 usermin-1.030.ebuild 1237
+MD5 67bf39ffe6fe141837f89bee3d42fa5c usermin-1.070-r1.ebuild 2159
 MD5 375b32497764243ad43abd481ee61ea3 usermin-1.070.ebuild 1394
 MD5 d78c715ba86f536a2d9425828d1f7a0d usermin-1.000.ebuild 1264
-MD5 d2ce249d1c801fbec6618b61d1bc7440 ChangeLog 3423
+MD5 2767d4600068879d0c29d5b9769e79d2 ChangeLog 3609
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 7a879dcebf3fef686df3b84253eef748 files/usermin-1.070-gentoo.patch 708
 MD5 9b49ce0b06e30694e52d3a84155c9506 files/digest-usermin-1.000 66
 MD5 990bf7fe2948e8a6ee94f64d234ab0fb files/digest-usermin-1.030 66
 MD5 b534264bfd7919ee69fcb6ed08a7009c files/digest-usermin-1.070 66
 MD5 29bc2b77db966f5dcda6194daa7d9f2b files/digest-usermin-1.060-r1 66
+MD5 b534264bfd7919ee69fcb6ed08a7009c files/digest-usermin-1.070-r1 66
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
 MD5 0fcbd9e8ddca335a087f7ead3deb1efb files/init.d.usermin 878
 MD5 3a7d31f2e22610f8807888f7daa5f1a9 files/patch/usermin 478
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 8cd2b2fc659a..1fb2b3531e6b 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -2,7 +2,7 @@ MD5 0f65bf15f4b028483180906cd8f47edc webmin-1.140.ebuild 2021
 MD5 e1448effc29a46897c48b774ec52a127 webmin-1.080.ebuild 1760
 MD5 f5f16f198582b89165595878bb861c64 webmin-1.130-r1.ebuild 1980
 MD5 871a442fb0428ebaeb78601de262b8b5 webmin-1.110.ebuild 1869
-MD5 62428a102745fe15935d41e76835611d webmin-1.140-r1.ebuild 2079
+MD5 80a4ba7b52db56822ecd6f31a478bce7 webmin-1.140-r1.ebuild 2197
 MD5 9e6c039895649548be74be466c5ce993 ChangeLog 6397
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 805b49679c94953e708f9322cbb11865 files/webmin-gentoo-init 870
diff --git a/app-admin/webmin/webmin-1.140-r1.ebuild b/app-admin/webmin/webmin-1.140-r1.ebuild
index 54d918c28c04..fbb8c8b118ff 100644
--- a/app-admin/webmin/webmin-1.140-r1.ebuild
+++ b/app-admin/webmin/webmin-1.140-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.1 2004/04/23 00:56:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.2 2004/04/23 01:26:34 eradicator Exp $
 
 inherit eutils
 
@@ -20,6 +20,14 @@ RDEPEND="dev-lang/perl
 	ssl? ( dev-perl/Net-SSLeay )
 	dev-perl/XML-Generator"
 
+src_unpack() {
+	unpack ${A}
+
+	# Bug #47020
+	cd ${S}/webalizer
+	epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
+}
+
 src_install() {
 	rm -f mount/freebsd-mounts*
 	rm -f mount/openbsd-mounts*
@@ -33,11 +41,6 @@ src_install() {
 	mv ${D}/usr/libexec/webmin/openslp/config \
 		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
 
-	# Bug #47020
-	pushd ${D}/usr/libexec/webmin/webalizer
-	epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
-	popd
-
 	exeinto /etc/init.d
 	newexe webmin-gentoo-init webmin
 
@@ -47,7 +50,6 @@ src_install() {
 
 	exeinto /etc/webmin
 	doexe ${FILESDIR}/uninstall.sh
-	use ssl && sed -i 's:ssl=$ssl:ssl=1:' setup.sh
 }
 
 pkg_postinst() {
@@ -77,8 +79,11 @@ pkg_postinst() {
 		# 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/usermin stop >& /dev/null
+	/etc/init.d/webmin stop >& /dev/null
 }