Stable for HPPA (bug #207049).

Package-Manager: portage-2.1.4

4 files changed, 29 insertions, 25 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 0d40d8c01864..bd94623ffdf3 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.132 2008/01/22 20:02:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.133 2008/01/24 05:38:54 jer Exp $
+
+  24 Jan 2008; Jeroen Roovers <jer@gentoo.org> usermin-1.320.ebuild:
+  Stable for HPPA (bug #207049).
 
   22 Jan 2008; Brent Baude <ranger@gentoo.org> usermin-1.320.ebuild:
   Marking usermin-1.320 ppc64 for bug 207049
diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest
index b42e51c3539e..3edeb9ad3392 100644
--- a/app-admin/usermin/Manifest
+++ b/app-admin/usermin/Manifest
@@ -29,21 +29,21 @@ EBUILD usermin-1.300.ebuild 2213 RMD160 27575dad691b092b3f6cbcb7c8dd471916ad8a0d
 MD5 d5a8ea6a4a0f135e92fb770dcbd5db6d usermin-1.300.ebuild 2213
 RMD160 27575dad691b092b3f6cbcb7c8dd471916ad8a0d usermin-1.300.ebuild 2213
 SHA256 7aff034364a37537a83964563fecea8b214ecbc010559e2815a74408b62e2b5d usermin-1.300.ebuild 2213
-EBUILD usermin-1.320.ebuild 2214 RMD160 35ab5285ffc2c646cb73702c4fff824ec73be838 SHA1 89edad70600e16bd5a7c3306c0a0fed97b943f2d SHA256 69f9e1016d33fd7fa1fd041b8eb28403a86c03235bdf537dd36191de92362598
-MD5 ffbba7b03612ae38a5770152aa916465 usermin-1.320.ebuild 2214
-RMD160 35ab5285ffc2c646cb73702c4fff824ec73be838 usermin-1.320.ebuild 2214
-SHA256 69f9e1016d33fd7fa1fd041b8eb28403a86c03235bdf537dd36191de92362598 usermin-1.320.ebuild 2214
-MISC ChangeLog 17322 RMD160 35bbe1e8c1dd4c1fa98d389299edf5cb3ae74d7f SHA1 15fea2866363da4b377028b4476375f0aeb162e8 SHA256 01439174b6a5da6f51b17ba7765b849f7aaa81029bb5074ff6af432479d8c43e
-MD5 1b9c4238be9a8e835c52069f81703642 ChangeLog 17322
-RMD160 35bbe1e8c1dd4c1fa98d389299edf5cb3ae74d7f ChangeLog 17322
-SHA256 01439174b6a5da6f51b17ba7765b849f7aaa81029bb5074ff6af432479d8c43e ChangeLog 17322
+EBUILD usermin-1.320.ebuild 2234 RMD160 35e3721a14410b27c026e4f1b82f029f21aa0627 SHA1 05ce5af5f72e99403f9fc8ada9e6a07af0773d1b SHA256 d1de2fefe8cb3e8f73e285cd96d4da327070be9f362015a9e7441107505938f9
+MD5 704f66666986fe547bff6f954cf77435 usermin-1.320.ebuild 2234
+RMD160 35e3721a14410b27c026e4f1b82f029f21aa0627 usermin-1.320.ebuild 2234
+SHA256 d1de2fefe8cb3e8f73e285cd96d4da327070be9f362015a9e7441107505938f9 usermin-1.320.ebuild 2234
+MISC ChangeLog 17422 RMD160 b0a2c765a05919b5c9311fcf0bd87d309b1b8036 SHA1 3018b67471230c8da28c3c9bb2d51971c3c28591 SHA256 28ffc70fbf48743ab9af65a52f32344f8690b14eff9900a1fdcab2a93683c2ec
+MD5 9cccbcd9b7f0687538da20214b2c4aeb ChangeLog 17422
+RMD160 b0a2c765a05919b5c9311fcf0bd87d309b1b8036 ChangeLog 17422
+SHA256 28ffc70fbf48743ab9af65a52f32344f8690b14eff9900a1fdcab2a93683c2ec ChangeLog 17422
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 metadata.xml 236
-MD5 5543affe34d62f1a060944d1604a62b0 files/digest-usermin-1.280-r1 178
-RMD160 668b8c49927fa93674d94be4dd4d9986c4c405b2 files/digest-usermin-1.280-r1 178
-SHA256 6b4ede8404b52b75c2a190bb5444cc82e2828cc978d854ec3afd831897779e36 files/digest-usermin-1.280-r1 178
+MD5 9fec44f803517695f818339ae698c160 files/digest-usermin-1.280-r1 244
+RMD160 4c8832d11416c154d89575693ebba949a1da3751 files/digest-usermin-1.280-r1 244
+SHA256 034d12d95e6e89b62c1a5d37056ea5a0bc55a0badcafc4fb4f418a86a2fa1d05 files/digest-usermin-1.280-r1 244
 MD5 105c1fe23fa4660217421c387246dd26 files/digest-usermin-1.300 244
 RMD160 ba68685cb7e27f53186c0c31ecc6b477150724f4 files/digest-usermin-1.300 244
 SHA256 1d5a53481c518b37412f5047f8b61998a68e34acebaa377588d06bf110fe5f8c files/digest-usermin-1.300 244
diff --git a/app-admin/usermin/files/digest-usermin-1.280-r1 b/app-admin/usermin/files/digest-usermin-1.280-r1
index 1d3ccc3dfe0f..d0680628d96e 100644
--- a/app-admin/usermin/files/digest-usermin-1.280-r1
+++ b/app-admin/usermin/files/digest-usermin-1.280-r1
@@ -1,2 +1,3 @@
+MD5 6f9a44e60f64626428269d754510828c usermin-1.280.tar.gz 5171054
 RMD160 39ea7f642d7c5a17dba266767c0aaa1bbec7c8d2 usermin-1.280.tar.gz 5171054
 SHA256 9d1a849f40ed8192074961e438282994533f6c31cac91f50fbb4f964229d320b usermin-1.280.tar.gz 5171054
diff --git a/app-admin/usermin/usermin-1.320.ebuild b/app-admin/usermin/usermin-1.320.ebuild
index ece2bed33a2b..4eb2b08d57fc 100644
--- a/app-admin/usermin/usermin-1.320.ebuild
+++ b/app-admin/usermin/usermin-1.320.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.320.ebuild,v 1.3 2008/01/22 20:02:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.320.ebuild,v 1.4 2008/01/24 05:38:54 jer Exp $
 
 IUSE="ssl"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha ~amd64 hppa ~ia64 ~ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/perl"
 
@@ -25,13 +25,13 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	# Point to the correct mysql location
 	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
 
-	epatch ${FILESDIR}/${PN}-1.080-safestop.patch
-	epatch ${FILESDIR}/${PN}-1.150-setup-nocheck.patch
+	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
+	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
 }
 
 src_install() {
@@ -39,14 +39,14 @@ src_install() {
 	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
 
 	dodir /usr/libexec/usermin
-	cp -pR * ${D}/usr/libexec/usermin
+	cp -pR * "${D}"/usr/libexec/usermin
 
-	newinitd ${FILESDIR}/init.d.usermin usermin
+	newinitd "${FILESDIR}"/init.d.usermin usermin
 
-	newpamd ${FILESDIR}/${PN}.pam-include.1 ${PN}
+	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
 
 	# Fix ownership
-	chown -R root:0 ${D}
+	chown -R root:0 "${D}"
 
 	dodir /etc/usermin
 	dodir /var/log/usermin
@@ -68,14 +68,14 @@ src_install() {
 	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."
+	"${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=/var/run/usermin.pid:" ${D}/etc/usermin/miniserv.conf
-	find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
+	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
+	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
 
 	# Cleanup from the config script
-	rm -rf ${D}/var/log/usermin
+	rm -rf "${D}"/var/log/usermin
 	keepdir /var/log/usermin/
 }