init file cleaned up. Ebuild cleaned up. Removed old packages.

10 files changed, 111 insertions, 127 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 25dea99ae8f4..885248b60977 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.21 2004/04/11 03:20:33 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.22 2004/04/23 00:23:15 eradicator Exp $
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> usermin-1.000.ebuild,
+  usermin-1.040.ebuild, usermin-1.051.ebuild, usermin-1.070.ebuild,
+  files/init.d.usermin, files/usermin-1.070-gentoo.patch:
+  init file cleaned up.  Ebuild cleaned up.  Removed old packages.
 
   10 Apr 2004; Jason Wever <weeve@gentoo.org> usermin-1.060-r1.ebuild:
   Stable on sparc.
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 6ed09958ca5d..98a4ce9aa3b3 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,18 +1,16 @@
-MD5 88ebf103f2c62c4402b698bc900cac22 ChangeLog 3145
-MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 7c160029adc64125659b01a3878f6cc4 usermin-1.000.ebuild 1257
-MD5 07d9e3a8c690feb92fe3687d8f296e09 usermin-1.030.ebuild 1237
-MD5 1db8a7dd0e00697e5aed7dd664c4a245 usermin-1.040.ebuild 1257
-MD5 58ff1b3534db46449c6c98d41f3d8131 usermin-1.051.ebuild 1257
-MD5 18d3d0e5283efd077065a4fd5d67d232 usermin-1.070.ebuild 1385
 MD5 cd6093c047375d1997352c9f7d62d16d usermin-1.060-r1.ebuild 1382
+MD5 07d9e3a8c690feb92fe3687d8f296e09 usermin-1.030.ebuild 1237
+MD5 38495f68f36d7cac939f409ea30b0099 usermin-1.070.ebuild 1469
+MD5 d78c715ba86f536a2d9425828d1f7a0d usermin-1.000.ebuild 1264
+MD5 d2ce249d1c801fbec6618b61d1bc7440 ChangeLog 3423
+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 863f11befbbe747a069019ca7af86fb5 files/digest-usermin-1.040 66
-MD5 fdb191842b299160e9df97cf2aca9dc1 files/digest-usermin-1.051 66
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
-MD5 29bc2b77db966f5dcda6194daa7d9f2b files/digest-usermin-1.060-r1 66
 MD5 b534264bfd7919ee69fcb6ed08a7009c files/digest-usermin-1.070 66
-MD5 132cc62364a676b308f4ad7da4ea889b files/patch/setup.sh 16690
+MD5 29bc2b77db966f5dcda6194daa7d9f2b files/digest-usermin-1.060-r1 66
+MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
+MD5 e2f5025cf9807f69f24c1e580038f7a8 files/init.d.usermin 871
 MD5 3a7d31f2e22610f8807888f7daa5f1a9 files/patch/usermin 478
+MD5 132cc62364a676b308f4ad7da4ea889b files/patch/setup.sh 16690
 MD5 3b136185745fbd0f394df41aabbc06d9 files/patch/usermin-init 1355
diff --git a/app-admin/usermin/files/digest-usermin-1.040 b/app-admin/usermin/files/digest-usermin-1.040
deleted file mode 100644
index e2569ec0d330..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.040
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f67dc03c2294df2c7ff1c9728d9df1cf usermin-1.040.tar.gz 2007591
diff --git a/app-admin/usermin/files/digest-usermin-1.051 b/app-admin/usermin/files/digest-usermin-1.051
deleted file mode 100644
index 6570d2447eb3..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.051
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c2671dafbf3eb04e96502ac8df43797 usermin-1.051.tar.gz 2026822
diff --git a/app-admin/usermin/files/init.d.usermin b/app-admin/usermin/files/init.d.usermin
new file mode 100644
index 000000000000..e74ba1c0af88
--- /dev/null
+++ b/app-admin/usermin/files/init.d.usermin
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/files/init.d.usermin,v 1.1 2004/04/23 00:23:15 eradicator Exp $
+
+depend() {
+	need net
+}
+
+
+checkconfig() {
+	if [ -f /etc/usermin/config ]; then
+		return 0;
+	else
+		eerror "Error starting usermin.  Have you run '/usr/libexec/usermin/setup.sh'?"
+		return 1;
+	fi
+}
+
+start() { # copied from /etc/usermin/start
+	checkconfig || return 1
+	ebegin "Starting Usermin"
+
+	LANG=
+	export LANG
+
+	unset PERLIO
+	export PERLIO
+	start-stop-daemon --start --pidfile /var/run/usermin.pid --make-pidfile --quiet \
+		--exec /usr/libexec/usermin/miniserv.pl /etc/usermin/miniserv.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Usermin"
+	start-stop-daemon --stop --pidfile /var/run/usermin.pid --quiet
+	eend $?
+}
diff --git a/app-admin/usermin/files/usermin-1.070-gentoo.patch b/app-admin/usermin/files/usermin-1.070-gentoo.patch
new file mode 100644
index 000000000000..355b05a394a5
--- /dev/null
+++ b/app-admin/usermin/files/usermin-1.070-gentoo.patch
@@ -0,0 +1,27 @@
+--- setup.sh.orig	2004-04-22 16:46:12.000000000 -0700
++++ setup.sh	2004-04-22 16:49:39.000000000 -0700
+@@ -194,12 +194,12 @@
+ 	fi
+ 
+ 	# Ask for log directory
+-	printf "Log file directory [/var/usermin]: "
++	printf "Log file directory [/var/log/usermin]: "
+ 	if [ "$var_dir" = "" ]; then
+ 		read var_dir
+ 	fi
+ 	if [ "$var_dir" = "" ]; then
+-		var_dir=/var/usermin
++		var_dir=/var/log/usermin
+ 	fi
+ 	abspath=`echo $var_dir | grep "^/"`
+ 	if [ "$abspath" = "" ]; then
+@@ -606,7 +606,8 @@
+ 	rm -f $config_dir/install-dir
+ fi
+ 
+-if [ "$nostart" = "" ]; then
++#if [ "$nostart" = "" ]; then
++if false; then
+ 	if [ "$inetd" != "1" ]; then
+ 		echo "Attempting to start Usermin mini web server.."
+ 		$config_dir/start
diff --git a/app-admin/usermin/usermin-1.000.ebuild b/app-admin/usermin/usermin-1.000.ebuild
index a701f4151dfb..209a1267282d 100644
--- a/app-admin/usermin/usermin-1.000.ebuild
+++ b/app-admin/usermin/usermin-1.000.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/usermin/usermin-1.000.ebuild,v 1.6 2004/01/05 12:55:44 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.000.ebuild,v 1.7 2004/04/23 00:23:15 eradicator Exp $
 
 DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
@@ -24,8 +24,8 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/patch/usermin usermin
 	exeinto /usr/libexec/usermin
-	newexe ${FILESDIR}/patch/setup.sh setup.sh
-	newexe ${FILESDIR}/patch/usermin-init usermin-init
+#	newexe ${FILESDIR}/patch/setup.sh setup.sh
+#	newexe ${FILESDIR}/patch/usermin-init usermin-init
 	dosym /usr/libexec/usermin /etc/usermin
 	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
 
diff --git a/app-admin/usermin/usermin-1.040.ebuild b/app-admin/usermin/usermin-1.040.ebuild
deleted file mode 100644
index 81cfe2fb1bd3..000000000000
--- a/app-admin/usermin/usermin-1.040.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.040.ebuild,v 1.4 2004/01/05 12:55:44 weeve Exp $
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ppc"
-IUSE="ssl"
-
-DEPEND="dev-lang/perl
-	sys-apps/lsof
-	>=sys-apps/sed-4
-	dev-perl/Authen-PAM
-	ssl? ( dev-perl/Net-SSLeay )"
-
-src_install() {
-	dodir /usr/libexec/usermin
-	dodir /usr/sbin
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
-	mv * ${D}/usr/libexec/usermin
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/patch/usermin usermin
-	exeinto /usr/libexec/usermin
-	newexe ${FILESDIR}/patch/setup.sh setup.sh
-	newexe ${FILESDIR}/patch/usermin-init usermin-init
-	dosym /usr/libexec/usermin /etc/usermin
-	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-}
-
-pkg_postinst() {
-	einfo "Configure usermin by running \"usermin setup\"."
-	echo
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	usermin stop
-}
diff --git a/app-admin/usermin/usermin-1.051.ebuild b/app-admin/usermin/usermin-1.051.ebuild
deleted file mode 100644
index 0f16940a148a..000000000000
--- a/app-admin/usermin/usermin-1.051.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.051.ebuild,v 1.4 2004/03/12 02:38:32 weeve Exp $
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ppc"
-IUSE="ssl"
-
-DEPEND="dev-lang/perl
-	sys-apps/lsof
-	>=sys-apps/sed-4
-	dev-perl/Authen-PAM
-	ssl? ( dev-perl/Net-SSLeay )"
-
-src_install() {
-	dodir /usr/libexec/usermin
-	dodir /usr/sbin
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
-	mv * ${D}/usr/libexec/usermin
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/patch/usermin usermin
-	exeinto /usr/libexec/usermin
-	newexe ${FILESDIR}/patch/setup.sh setup.sh
-	newexe ${FILESDIR}/patch/usermin-init usermin-init
-	dosym /usr/libexec/usermin /etc/usermin
-	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-}
-
-pkg_postinst() {
-	einfo "Configure usermin by running \"usermin setup\"."
-	echo
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	usermin stop
-}
diff --git a/app-admin/usermin/usermin-1.070.ebuild b/app-admin/usermin/usermin-1.070.ebuild
index 69033dd1f6ce..60b5a69d0c20 100644
--- a/app-admin/usermin/usermin-1.070.ebuild
+++ b/app-admin/usermin/usermin-1.070.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.070.ebuild,v 1.1 2004/04/07 08:49:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.070.ebuild,v 1.2 2004/04/23 00:23:15 eradicator Exp $
+
+inherit eutils
 
 DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
@@ -18,32 +20,42 @@ DEPEND="dev-lang/perl
 	dev-perl/Authen-PAM
 	ssl? ( dev-perl/Net-SSLeay )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Fix setup.sh for gentoo
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	# Point to the correct mysql location
+	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
+
+	# Bug #46273... missing config for gentoo
+	cp quota/generic-linux-lib.pl quota/gentoo-linux-lib.p
+}
+
 src_install() {
 	dodir /usr/libexec/usermin
-	dodir /usr/sbin
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
 	mv * ${D}/usr/libexec/usermin
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/patch/usermin usermin
-	exeinto /usr/libexec/usermin
-	newexe ${FILESDIR}/patch/setup.sh setup.sh
-	newexe ${FILESDIR}/patch/usermin-init usermin-init
-	dosym /usr/libexec/usermin /etc/usermin
-	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
 
-	# Bug #46273
-	cp ${D}/usr/libexec/usermin/quota/generic-linux-lib.pl ${D}/usr/libexec/usermin/quota/gentoo-linux-lib.pl
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/init.d.usermin usermin
 
 	insinto /etc/pam.d
 	newins ${FILESDIR}/${PN}.pam ${PN}
+
+	dosym ../usr/libexec/usermin /etc/usermin
+
+	dodir /usr/sbin
+	dosym ../libexec/usermin/usermin-init /usr/sbin/usermin
 }
 
 pkg_postinst() {
-	einfo "Configure usermin by running \"usermin setup\"."
-	echo
+	einfo "Configure usermin by running \"/usr/libexec/usermin/setup.sh\"."
 	einfo "Point your web browser to http://localhost:20000 to use usermin."
 }
 
 pkg_prerm() {
-	usermin stop
+	test -f /var/lib/init.d/started/usermin && /etc/init.d/usermin stop
 }