Version bump for bug #106705.

(Portage version: 2.0.52-r1)

7 files changed, 21 insertions, 108 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index b6c62c7a3750..b9ea10f4431d 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.71 2005/09/09 14:09:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.72 2005/09/21 23:51:31 eradicator Exp $
+
+*usermin-1.160 (21 Sep 2005)
+
+  21 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -usermin-1.130.ebuild, -usermin-1.150.ebuild, +usermin-1.160.ebuild:
+  Version bump for bug #106705.
 
   09 Sep 2005; Aron Griffis <agriffis@gentoo.org> usermin-1.130-r1.ebuild:
   Mark 1.130-r1 stable on alpha
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 84633fcf7dc8..9efda7387872 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,14 +1,12 @@
-MD5 870f3e00e0e5fac14672b5b7592c2bb1 usermin-1.130-r1.ebuild 2297
-MD5 caaf0682be8a96c5cc4ec28fad42eaf1 usermin-1.130.ebuild 2317
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
+MD5 a23478068ae88d4ebc29a2c130aa7300 usermin-1.160.ebuild 2298
+MD5 870f3e00e0e5fac14672b5b7592c2bb1 usermin-1.130-r1.ebuild 2297
 MD5 0e13834b2d5ffa69e9f6109de5e0aac2 ChangeLog 9737
-MD5 115441b2c027fe0c5c1c7f0a8096d295 usermin-1.150.ebuild 2303
-MD5 609774f17b0470a793fb7791278e270d files/usermin.pam-include 210
 MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130-r1 66
-MD5 2e7603feaff187884dd9b1e66601f02b files/usermin.pam 382
-MD5 a590f1ac1efd4c07d7016e9e15c70b4e files/digest-usermin-1.150 66
-MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
-MD5 ba4e105ca9f8d294ba4e3d7774bf0760 files/usermin-1.150-setup-nocheck.patch 998
+MD5 0267babe04fc651a7357b983fe40ec98 files/digest-usermin-1.160 66
 MD5 2e7c19bb66f99c168fc2e86b4bb4862c files/init.d.usermin 825
+MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
 MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
-MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130 66
+MD5 2e7603feaff187884dd9b1e66601f02b files/usermin.pam 382
+MD5 609774f17b0470a793fb7791278e270d files/usermin.pam-include 210
+MD5 ba4e105ca9f8d294ba4e3d7774bf0760 files/usermin-1.150-setup-nocheck.patch 998
diff --git a/app-admin/usermin/files/digest-usermin-1.130 b/app-admin/usermin/files/digest-usermin-1.130
deleted file mode 100644
index 3cac66fa1070..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.130
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16166839af85b53272817f436c6cb310 usermin-1.130.tar.gz 2264410
diff --git a/app-admin/usermin/files/digest-usermin-1.150 b/app-admin/usermin/files/digest-usermin-1.150
deleted file mode 100644
index 6fdaf609f770..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.150
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de7c947de7305a8a352cc48480d65279 usermin-1.150.tar.gz 2565132
diff --git a/app-admin/usermin/files/digest-usermin-1.160 b/app-admin/usermin/files/digest-usermin-1.160
new file mode 100644
index 000000000000..28c1a50a00ca
--- /dev/null
+++ b/app-admin/usermin/files/digest-usermin-1.160
@@ -0,0 +1 @@
+MD5 14548bc6e397e3cfaac1143649c87390 usermin-1.160.tar.gz 2594596
diff --git a/app-admin/usermin/usermin-1.130.ebuild b/app-admin/usermin/usermin-1.130.ebuild
deleted file mode 100644
index 86732b9d44c2..000000000000
--- a/app-admin/usermin/usermin-1.130.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.130.ebuild,v 1.7 2005/04/23 23:10:34 gmsoft Exp $
-
-IUSE="ssl"
-
-inherit eutils
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	 sys-process/lsof
-	 >=sys-apps/sed-4
-	 dev-perl/Authen-PAM
-	 ssl? ( dev-perl/Net-SSLeay )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	# Point to the correct mysql location
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch ${FILESDIR}/${PN}-1.080-safestop.patch
-	epatch ${FILESDIR}/${PN}-1.100-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -a * ${D}/usr/libexec/usermin
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.usermin usermin
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-	# Fix ownership
-	chown -R root:root ${D}
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=${ROOT}/usr/bin/perl
-	autoos=1
-	port=20000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
-	find ${D}/etc/usermin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	einfo "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	${ROOT}/etc/init.d/usermin stop >& /dev/null
-}
diff --git a/app-admin/usermin/usermin-1.150.ebuild b/app-admin/usermin/usermin-1.160.ebuild
index c217bbe79e3f..a854dc7a01d5 100644
--- a/app-admin/usermin/usermin-1.150.ebuild
+++ b/app-admin/usermin/usermin-1.160.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.150.ebuild,v 1.1 2005/09/03 23:22:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.160.ebuild,v 1.1 2005/09/21 23:51:31 eradicator Exp $
 
 IUSE="ssl"
 
@@ -12,16 +12,17 @@ SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 
 DEPEND="dev-lang/perl"
 
 RDEPEND="${DEPEND}
 	 sys-process/lsof
-	 dev-perl/Authen-PAM
-	 virtual/pam
 	 ssl? ( dev-perl/Net-SSLeay )"
 
+#	 pam? ( dev-perl/Authen-PAM )
+
+
 src_unpack() {
 	unpack ${A}
 
@@ -71,7 +72,7 @@ src_install() {
 	${D}/usr/libexec/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
 
 	# Fixup the config files to use their real locations
-	sed -i -e 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
+	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
 	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
 
 	# Cleanup from the config script