Fix bug #46273 and mark stable on x86.

4 files changed, 18 insertions, 9 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index a7388a2d3a6d..bd43cd3c6357 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2004/03/12 02:38:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.19 2004/04/07 08:33:49 eradicator Exp $
+
+*usermin-1.060-r1 (07 Apr 2004)
+
+  07 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  usermin-1.060-r1.ebuild, usermin-1.060.ebuild:
+  Fix bug #46273 and mark stable on x86.
 
   11 Mar 2004; Jason Wever <weeve@gentoo.org> usermin-1.051.ebuild:
   Marked stable on sparc.
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index 925a2fa2881c..bfb352d75bf9 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -1,16 +1,16 @@
-MD5 abba9b011eb86d24023746f7c5cf080a ChangeLog 2747
-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 a8b64a0aa0af0057ffc14739c273460e usermin-1.060-r1.ebuild 1385
+MD5 07d9e3a8c690feb92fe3687d8f296e09 usermin-1.030.ebuild 1237
+MD5 7c160029adc64125659b01a3878f6cc4 usermin-1.000.ebuild 1257
+MD5 ce9701695907bcfeeecfe1ff99c060f9 ChangeLog 2868
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 4100a90018bad7bf379554175d58df72 usermin-1.060.ebuild 1264
 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 29bc2b77db966f5dcda6194daa7d9f2b files/digest-usermin-1.060-r1 66
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/usermin.pam 431
-MD5 29bc2b77db966f5dcda6194daa7d9f2b files/digest-usermin-1.060 66
-MD5 132cc62364a676b308f4ad7da4ea889b files/patch/setup.sh 16690
 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.060 b/app-admin/usermin/files/digest-usermin-1.060-r1
index ae61db43e04f..ae61db43e04f 100644
--- a/app-admin/usermin/files/digest-usermin-1.060
+++ b/app-admin/usermin/files/digest-usermin-1.060-r1
diff --git a/app-admin/usermin/usermin-1.060.ebuild b/app-admin/usermin/usermin-1.060-r1.ebuild
index 179e07ad3f1b..9e3588e5c234 100644
--- a/app-admin/usermin/usermin-1.060.ebuild
+++ b/app-admin/usermin/usermin-1.060-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.060.ebuild,v 1.1 2004/03/11 04:27:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.060-r1.ebuild,v 1.1 2004/04/07 08:33:50 eradicator Exp $
 
 DESCRIPTION="a web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
@@ -9,7 +9,7 @@ RESTRICT="nomirror"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 ~sparc ~alpha ~ppc"
 IUSE="ssl"
 
 DEPEND="dev-lang/perl
@@ -31,6 +31,9 @@ src_install() {
 	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
+
 	insinto /etc/pam.d
 	newins ${FILESDIR}/${PN}.pam ${PN}