From 50b9a43fdd9dcc78cd8c28d5c3d5d69e2f8e205c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 14 Apr 2007 14:26:41 +0000
Subject: [PATCH] arm/s390/sh stable Package-Manager: portage-2.1.2.3

---
 app-admin/webmin/Manifest            | 18 ++++++++++++++----
 app-admin/webmin/webmin-1.340.ebuild |  5 +++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index ccdf3781da4a..7d6c4a5d546a 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
@@ -92,10 +95,10 @@ EBUILD webmin-1.320.ebuild 3926 RMD160 bb9b9426826c2462319d034058474824eb0e5d95
 MD5 2bb0bc14131be44885bff4048d13137d webmin-1.320.ebuild 3926
 RMD160 bb9b9426826c2462319d034058474824eb0e5d95 webmin-1.320.ebuild 3926
 SHA256 f1c8171565bf1a03f182f1c1e348e21c1c43f1b6306ce17afad6d30b8b87054e webmin-1.320.ebuild 3926
-EBUILD webmin-1.340.ebuild 3919 RMD160 b310992b31ab2f63efd2aad0d4a8991e3c86ac33 SHA1 df462070e5b99fc7de126f5bec23653d050907b5 SHA256 584567b6bfc6b893471f3e95f5c1e8ee655c5b2236585c75e658fef843baa108
-MD5 642ff424a94241d45a89fb4d80971123 webmin-1.340.ebuild 3919
-RMD160 b310992b31ab2f63efd2aad0d4a8991e3c86ac33 webmin-1.340.ebuild 3919
-SHA256 584567b6bfc6b893471f3e95f5c1e8ee655c5b2236585c75e658fef843baa108 webmin-1.340.ebuild 3919
+EBUILD webmin-1.340.ebuild 3985 RMD160 acaef5bf2337ebaa907114fd12666139e75a5a6e SHA1 cae2f4e13d497bbfc00d2ec04ee34061cd0b2827 SHA256 5f8285871c7dc53ebd9b9dde361aea8b216e08bb97a6a2a7dbe5e55609b74482
+MD5 e585c9c9d5c704a24040afe1fb29c90e webmin-1.340.ebuild 3985
+RMD160 acaef5bf2337ebaa907114fd12666139e75a5a6e webmin-1.340.ebuild 3985
+SHA256 5f8285871c7dc53ebd9b9dde361aea8b216e08bb97a6a2a7dbe5e55609b74482 webmin-1.340.ebuild 3985
 MISC ChangeLog 19803 RMD160 3dbbad3a6d773a861ea640f64bffc08b9257f4a7 SHA1 d90d21dfebdc74dbb9af02f8affab3fabb1b408b SHA256 0d3e58b908da4fb092303717113c7865a3929cca4f83c58955c9540a0ba63133
 MD5 71b60739957186305342368b7ab22511 ChangeLog 19803
 RMD160 3dbbad3a6d773a861ea640f64bffc08b9257f4a7 ChangeLog 19803
@@ -122,3 +125,10 @@ SHA256 3805b7fcb6d50a4849b4bbca24bf54c1cfba337636c085cd74eabccbd2c0246b files/di
 MD5 76b0dda2c3a573c214219c83125ed9da files/digest-webmin-1.340 780
 RMD160 9e7165ab0bd7d5febeb5003b562bc0f88edf01d4 files/digest-webmin-1.340 780
 SHA256 efa549b7b193d855ff4dfbcc70e53d4e0d4bc10e6dc34c8e1a68b64b58a3082f files/digest-webmin-1.340 780
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGIOTY8bi6rjpTunYRAiqiAKDKDerE1z4iGw90ibqjQHy7h2HcMACgmMhE
+4aNseUMG6DObGV5y8oBtvNA=
+=tRY+
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.340.ebuild b/app-admin/webmin/webmin-1.340.ebuild
index 49d6cdb15f09..34b48b30690f 100644
--- a/app-admin/webmin/webmin-1.340.ebuild
+++ b/app-admin/webmin/webmin-1.340.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.340.ebuild,v 1.4 2007/04/13 16:38:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.340.ebuild,v 1.5 2007/04/14 14:26:41 vapier Exp $
 
 inherit eutils pam
 
@@ -15,7 +15,7 @@ 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"
@@ -131,5 +131,6 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
+	# XXX: this is wrong ... prerm is called during upgrades as well
 	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
 }
-- 
2.26.2