From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 6 Aug 2006 16:20:59 +0000 (+0000)
Subject: arm/s390/sh stable
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37e05845b5861cb58453fb907a8e36b762ee1bd9;p=gentoo.git

arm/s390/sh stable
Package-Manager: portage-2.1.1_pre4
---

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index e66d07a97992..08a33d905673 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX init.d.webmin 859 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 SHA1 e6b36175db577c3878fb1357b453f9fba396db8f SHA256 8a96c59989ba2a3ae116b9155f72c058dc56be24da355ee1fae43588096520e8
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 files/init.d.webmin 859
@@ -85,10 +88,10 @@ EBUILD webmin-1.280.ebuild 4106 RMD160 31e35d72276e7cc6abf07d169a29d36c82a9d1c1
 MD5 3013842424fd6dfe89a1cb95d1503eff webmin-1.280.ebuild 4106
 RMD160 31e35d72276e7cc6abf07d169a29d36c82a9d1c1 webmin-1.280.ebuild 4106
 SHA256 6e6861db33b46fe773e6269dc3ef6dcc022c11e8d193304bb9aeb05ddd8bbcbd webmin-1.280.ebuild 4106
-EBUILD webmin-1.290.ebuild 4093 RMD160 450909e219f39bf97426a5e76152850803bc43eb SHA1 65de0bb399051d6565fe3acb1916459683000f0f SHA256 f651146f3593806a5692d4d45450437c2971a43962037d5e0b06455e66e7fc7e
-MD5 1fba81fb79c9a58524398f21cdc2995b webmin-1.290.ebuild 4093
-RMD160 450909e219f39bf97426a5e76152850803bc43eb webmin-1.290.ebuild 4093
-SHA256 f651146f3593806a5692d4d45450437c2971a43962037d5e0b06455e66e7fc7e webmin-1.290.ebuild 4093
+EBUILD webmin-1.290.ebuild 4114 RMD160 2ae200cbd7c96883c930575142e0af2aa1b019c5 SHA1 df55958641b884258a131c4b33b1a2ab19e9abc8 SHA256 e13b0d34026ff06c1928ae8f9d76123b15f3b14e3383f9a063255563c2f7c1b3
+MD5 c72372741ca9cfc5d9e6cdb55da1e916 webmin-1.290.ebuild 4114
+RMD160 2ae200cbd7c96883c930575142e0af2aa1b019c5 webmin-1.290.ebuild 4114
+SHA256 e13b0d34026ff06c1928ae8f9d76123b15f3b14e3383f9a063255563c2f7c1b3 webmin-1.290.ebuild 4114
 MISC ChangeLog 17523 RMD160 39406e193eb81847d44fb615867c7117d323867d SHA1 c7ee03888c8140807c968987784040afe57b1f0f SHA256 d0e95c7831ab69b2e88f575cdb1eb4b2199c1c5a491b15a0818eaffeb144686c
 MD5 03c8973b96da981edb177ccc5b564c81 ChangeLog 17523
 RMD160 39406e193eb81847d44fb615867c7117d323867d ChangeLog 17523
@@ -112,3 +115,10 @@ SHA256 4eb18f4f477be9fbe681b5108289d94d43e2615b949e186c07b6083a0437524e files/di
 MD5 4ae5c41e6e43ad3cee543b6188d747f4 files/digest-webmin-1.290 771
 RMD160 067a6ea1ff4f629bb40dbd3d84f3c50f638a6ca2 files/digest-webmin-1.290 771
 SHA256 729f06a31c4c42e2f0d7c39244df0b0bbba2117c2f5661ff562018535ddd4eb7 files/digest-webmin-1.290 771
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE1hb0amhnQswr0vIRAoBYAJwNOwSnaHSoKuvgwG16wQqZv0VCOACffYEq
+taTY9JIhasRtOZtmIvXMGjA=
+=+B59
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.290.ebuild b/app-admin/webmin/webmin-1.290.ebuild
index 686753cb20f3..c24c1146eb88 100644
--- a/app-admin/webmin/webmin-1.290.ebuild
+++ b/app-admin/webmin/webmin-1.290.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.290.ebuild,v 1.9 2006/08/04 16:55:04 tcort Exp $
-
-IUSE="apache2 pam postgres ssl webmin-minimal"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.290.ebuild,v 1.10 2006/08/06 16:20:59 vapier Exp $
 
 inherit eutils pam
 
@@ -16,9 +14,9 @@ SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
 
 LICENSE="BSD"
 SLOT="0"
-
 # ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
+IUSE="apache2 pam postgres ssl webmin-minimal"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
@@ -30,38 +28,38 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	# in webmin-minimal apache2 are not present
 	if ! use webmin-minimal ; then
 		# Bug #50810, #51943
 		if use apache2; then
-			epatch ${FILESDIR}/${PN}-1.140-apache2.patch
+			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
 		fi
 
 		# Correct ldapness
-		epatch ${FILESDIR}/${PN}-1.270-ldap-useradmin.patch
+		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
 
 		# Postfix should modify the last entry of the maps file
-		epatch ${FILESDIR}/${PN}-1.170-postfix.patch
+		epatch "${FILESDIR}"/${PN}-1.170-postfix.patch
 
 		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
 		tar -xf ${T}/vs.tar
 
 		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch ${FILESDIR}/virtual-server-2.60-nocgibin.patch
+		epatch "${FILESDIR}"/virtual-server-2.60-nocgibin.patch
 
 		# Check if a newly added IP is already active
-		epatch ${FILESDIR}/virtual-server-2.610-checkip.patch
+		epatch "${FILESDIR}"/virtual-server-2.610-checkip.patch
 
 		# Verify Postgres usernames
-		epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch
+		epatch "${FILESDIR}"/virtual-server-2.31-pgsql.patch
 
 		# Fix some all name virtual items
-		epatch ${FILESDIR}/virtual-server-2.31-namevirtual.patch
+		epatch "${FILESDIR}"/virtual-server-2.31-namevirtual.patch
 	fi
 
-	epatch ${FILESDIR}/${PN}-1.170-setup-nocheck.patch
+	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
 }
 
 src_install() {
@@ -84,9 +82,9 @@ src_install() {
 			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
 	fi
 
-	newinitd ${FILESDIR}/init.d.webmin webmin
+	newinitd "${FILESDIR}"/init.d.webmin webmin
 
-	newpamd ${FILESDIR}/webmin-pam webmin
+	newpamd "${FILESDIR}"/webmin-pam webmin
 	echo gentoo > ${D}/usr/libexec/webmin/install-type
 
 	# Fix ownership
@@ -139,5 +137,5 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
-	${ROOT}/etc/init.d/webmin stop >& /dev/null
+	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
 }