Add dependency over sys-apps/shadow and check if it was built with pam USE flag enabl...

Package-Manager: portage-2.1.4.4

diff --git a/sys-apps/usermode/ChangeLog b/sys-apps/usermode/ChangeLog
index 261d04b1d67f1b0458a8b932cc21cefd3366beef..58f855354c34225e9ec8ddf5492e8277be28ba8f 100644 (file)
--- a/sys-apps/usermode/ChangeLog
+++ b/sys-apps/usermode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usermode
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/ChangeLog,v 1.6 2008/01/31 06:30:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/ChangeLog,v 1.7 2008/02/21 21:03:51 flameeyes Exp $
+
+  21 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> usermode-1.93.ebuild:
+  Add dependency over sys-apps/shadow and check if it was built with pam USE
+  flag enabled. Closes bug #210859.
 
   31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   -usermode-1.86.ebuild, -usermode-1.87.ebuild, -usermode-1.92.ebuild:

diff --git a/sys-apps/usermode/Manifest b/sys-apps/usermode/Manifest
index 9b660722ce1cbd1f598052fe446ff228350b5dbb..dbe766b9d894f89239b132e096a279f4bc4ac3d0 100644 (file)
--- a/sys-apps/usermode/Manifest
+++ b/sys-apps/usermode/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST usermode-1.93-1.fc8.src.rpm 374617 RMD160 69f9a80f3838cab09e54907a8cb46992174a8873 SHA1 71a07e2583520cdb5077d0636e6801645edb5381 SHA256 ce49afb6b914b0a37662d49f6fc25f39710eb6359270cb992a555026e38249a3
-EBUILD usermode-1.93.ebuild 1820 RMD160 7431a4d4c656a4fbe733106dedb885b2e58ff6cc SHA1 5c873678d1cf7bad8faa238718bc9a55d61f0eaa SHA256 2bdd8896ec8aa2542e0a10e182dffde96e2786e14836af037ad817f77571f93f
-MISC ChangeLog 1525 RMD160 221dc431e97edf48b6a0fc0ba64db6276770a462 SHA1 5440c8ff11a6ebc2f1db0d9d2780a8f39dfb10eb SHA256 f341606d6bac86d17ad7efd057a8fa9c1859e48645f8210f57868f779a1ee392
+EBUILD usermode-1.93.ebuild 2215 RMD160 f2254da21d7e06795774460e2749e7b23736e88f SHA1 6422f68dbd4aaa5ecc4583fb92accd227797e0f4 SHA256 a0841e26ae4bb84d1f8fb3dfcf9e9ba9241de5d7d0eb763a6193611fec82f274
+MISC ChangeLog 1714 RMD160 9cd3b3b03b999a21d57343ab0c2ad4df345b844e SHA1 f8320a349d139491fae330ce492ee473a739b31d SHA256 99a79dd87504b5c2c239f41d2e35c656a0cd13add9f201b4367b59f1aff7f0b8
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHvec9AiZjviIA2XgRAi0HAJ9zg1D22WCLVJuNVn83/WJs7O3wHwCg8Gdf
+JdUwrr51ZxWxz7dq58Nw5is=
+=Cghm
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/usermode/usermode-1.93.ebuild b/sys-apps/usermode/usermode-1.93.ebuild
index 998a4c472cc82ce1a7bde575ac3f31be8c2d2b2a..73f349fba1090f52fba7098890fd1dd729d964a7 100644 (file)
--- a/sys-apps/usermode/usermode-1.93.ebuild
+++ b/sys-apps/usermode/usermode-1.93.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/usermode-1.93.ebuild,v 1.1 2007/10/15 10:38:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/usermode-1.93.ebuild,v 1.2 2008/02/21 21:03:51 flameeyes Exp $
 
-inherit flag-o-matic rpm autotools
+inherit flag-o-matic rpm autotools eutils
 
 # Tag for which Fedora Core version it's from
 FCVER="8"
@@ -25,11 +25,23 @@ RDEPEND="=dev-libs/glib-2*
        dev-util/desktop-file-utils
        sys-libs/system-config-base
        >=sys-libs/pam-0.75
+       sys-apps/shadow
        dev-perl/XML-Parser
        sys-libs/libuser"
 DEPEND="${RDEPEND}
        sys-devel/gettext"
 
+pkg_setup() {
+       if ! built_with_use sys-apps/shadow pam; then
+               eerror "${CATEGORY}/${PN} depends on the chfn and passwd PAM service"
+               eerror "configuration files installed by sys-apps/shadow with PAM"
+               eerror "enabled."
+               eerror "Please re-install sys-apps/shadow with the pam USE flag"
+               eerror "enabled."
+               die "sys-apps/shadow was built without PAM support."
+       fi
+}
+
 src_unpack() {
        rpm_src_unpack
        cd "${S}"