err merged too many things last commit

diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index 7be80f4e3e127bab9cf9221efbdc0547bda4f29f..ebd36a8173ef7a3820bc2b1de0d11b1306a16e0e 100644 (file)
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 MD5 cea85e921fc6586f5e3eeb611590ad6e ChangeLog 5828
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 8cae3b05d354320805b8b9d112402fe1 psmisc-21.4.ebuild 1332
+MD5 ab88999e6ea9d394da1d8be8f541e64f psmisc-21.4.ebuild 1362
 MD5 f8a6de9ef42d405c6ac24373df5c5f74 files/psmisc-21.4-selinux.diff.bz2 7720
 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63
 MD5 429eeb81b4aaa5515cfa08f533e5123d files/psmisc-21.4-no-nls.patch 1360
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB1xNMroRuSHgZdywRAtpTAJ0W7ZeYzCA3qgLtH9u4OEKFXm6h/QCfQqPW
-/eJwVxYHd4XIQmaaz5kazvs=
-=wzSR
+iD8DBQFB1xVTroRuSHgZdywRAvpmAKCC0J+2jNXnoeqcegbMooNKmhxc1gCfSQpG
+xWctZYtlDKAphu1U9HIuosI=
+=KfWU
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/psmisc/psmisc-21.4.ebuild b/sys-apps/psmisc/psmisc-21.4.ebuild
index 72e38cb557c27c3857c3f14b468857a55f9ce46f..ae97376b2a7d514745bc445b3e150948ce5556ca 100644 (file)
--- a/sys-apps/psmisc/psmisc-21.4.ebuild
+++ b/sys-apps/psmisc/psmisc-21.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.19 2005/01/01 21:16:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.4.ebuild,v 1.20 2005/01/01 21:25:27 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -32,15 +32,17 @@ src_unpack() {
 }
 
 src_compile() {
+       local myconf=""
+       use selinux && myconf="${myconf} --enable-flask"
        econf \
                $(use_enable nls) \
-               $(use_enable selinux flask) \
+               ${myconf} \
                || die
        emake || die
 }
 
 src_install() {
-       make install DESTDIR="${D}" || die
+       einstall || die
        dosym killall /usr/bin/pidof
 
        # Some packages expect these to use /usr, others to use /