Stable x86.

4 files changed, 10 insertions, 71 deletions

diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index a4312455b372..c2e985bc586b 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,18 +1,16 @@
-MD5 2767d4600068879d0c29d5b9769e79d2 ChangeLog 3609
-MD5 d78c715ba86f536a2d9425828d1f7a0d usermin-1.000.ebuild 1264
+MD5 cd6093c047375d1997352c9f7d62d16d usermin-1.060-r1.ebuild 1382
 MD5 07d9e3a8c690feb92fe3687d8f296e09 usermin-1.030.ebuild 1237
-MD5 ec252c5259fbe7aaa5f4ebeedea96151 usermin-1.070-r1.ebuild 1969
+MD5 644ab5f79e36cd1adc4c274a7a5612d3 usermin-1.070-r1.ebuild 1969
+MD5 d78c715ba86f536a2d9425828d1f7a0d usermin-1.000.ebuild 1264
+MD5 2767d4600068879d0c29d5b9769e79d2 ChangeLog 3609
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 375b32497764243ad43abd481ee61ea3 usermin-1.070.ebuild 1394
-MD5 cd6093c047375d1997352c9f7d62d16d usermin-1.060-r1.ebuild 1382
+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 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
-MD5 0fcbd9e8ddca335a087f7ead3deb1efb files/init.d.usermin 878
 MD5 29bc2b77db966f5dcda6194daa7d9f2b files/digest-usermin-1.060-r1 66
-MD5 b534264bfd7919ee69fcb6ed08a7009c files/digest-usermin-1.070 66
-MD5 7a879dcebf3fef686df3b84253eef748 files/usermin-1.070-gentoo.patch 708
 MD5 b534264bfd7919ee69fcb6ed08a7009c files/digest-usermin-1.070-r1 66
-MD5 132cc62364a676b308f4ad7da4ea889b files/patch/setup.sh 16690
+MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
+MD5 0fcbd9e8ddca335a087f7ead3deb1efb files/init.d.usermin 878
 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.070 b/app-admin/usermin/files/digest-usermin-1.070
deleted file mode 100644
index 762fae304065..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.070
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e557a9c62e721351d71eff3a32ad470 usermin-1.070.tar.gz 2009552
diff --git a/app-admin/usermin/usermin-1.070-r1.ebuild b/app-admin/usermin/usermin-1.070-r1.ebuild
index 0dc8a85d31f1..0d3dc6645066 100644
--- a/app-admin/usermin/usermin-1.070-r1.ebuild
+++ b/app-admin/usermin/usermin-1.070-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/usermin/usermin-1.070-r1.ebuild,v 1.2 2004/04/24 05:02:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.070-r1.ebuild,v 1.3 2004/05/31 06:07:10 eradicator Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ RESTRICT="nomirror"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 ~sparc ~alpha ~ppc"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/app-admin/usermin/usermin-1.070.ebuild b/app-admin/usermin/usermin-1.070.ebuild
deleted file mode 100644
index 86f675e95806..000000000000
--- a/app-admin/usermin/usermin-1.070.ebuild
+++ /dev/null
@@ -1,58 +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.070.ebuild,v 1.3 2004/04/23 00:25:51 eradicator Exp $
-
-inherit eutils
-
-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_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
-	mv * ${D}/usr/libexec/usermin
-
-	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
-}
-
-pkg_postinst() {
-	einfo "Configure usermin by running \"/usr/libexec/usermin/setup.sh\"."
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	test -f /var/lib/init.d/started/usermin && /etc/init.d/usermin stop
-}