From: Chris PeBenito <pebenito@gentoo.org>
Date: Wed, 5 Jan 2005 03:51:55 +0000 (+0000)
Subject: fix selinux patch
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6914e68479a99dc0ced422ebbf03f8d6e81173aa;p=gentoo.git

fix selinux patch
---

diff --git a/sys-apps/psmisc/ChangeLog b/sys-apps/psmisc/ChangeLog
index 0ba93098dbab..4bfe673cd121 100644
--- a/sys-apps/psmisc/ChangeLog
+++ b/sys-apps/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/psmisc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.45 2005/01/01 22:07:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/ChangeLog,v 1.46 2005/01/05 03:51:55 pebenito Exp $
+
+  04 Jan 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/psmisc-21.5-selinux.diff.bz2, psmisc-21.5.ebuild:
+  Add missing SELinux patch for 21.5.
 
 *psmisc-21.5 (01 Jan 2005)
 
diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index b2d070a6da08..da0fe79640f8 100644
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 914a7c3e5ed701ac182e4b72dbb68a4e ChangeLog 5944
+MD5 deb2bc24bbae23a026a894853168687d ChangeLog 6096
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 2c96a78dbb37db282674d746f15e2b03 psmisc-21.5.ebuild 1208
 MD5 ab88999e6ea9d394da1d8be8f541e64f psmisc-21.4.ebuild 1362
-MD5 b94603b23b078474476ccd9da16cb675 files/digest-psmisc-21.5 63
-MD5 f8a6de9ef42d405c6ac24373df5c5f74 files/psmisc-21.4-selinux.diff.bz2 7720
+MD5 2003a0e5fd72aee0314c384a1ab1d939 psmisc-21.5.ebuild 1195
 MD5 b27975d795b1253e70ef1133dde797d0 files/digest-psmisc-21.4 63
 MD5 429eeb81b4aaa5515cfa08f533e5123d files/psmisc-21.4-no-nls.patch 1360
+MD5 f8a6de9ef42d405c6ac24373df5c5f74 files/psmisc-21.4-selinux.diff.bz2 7720
+MD5 b94603b23b078474476ccd9da16cb675 files/digest-psmisc-21.5 63
+MD5 277920d9195611033bc0e32e98474466 files/psmisc-21.5-selinux.diff.bz2 7783
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB1x81roRuSHgZdywRAondAJ0bS0sGDffh7SfwyfAgaULNZUBANgCdETvS
-YXvvRwi3i4Rf8P4Lm671l/U=
-=TdlC
+iD8DBQFB22RoMTuwkQ6eEKsRAnYcAJ4yqj64t+WrtuDGQDWnVuPZohsaAACgjlfH
+6+xpZzffyCHIcAYlG9IflA8=
+=IFlj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/psmisc/files/psmisc-21.5-selinux.diff.bz2 b/sys-apps/psmisc/files/psmisc-21.5-selinux.diff.bz2
new file mode 100644
index 000000000000..43c0f5ac9901
Binary files /dev/null and b/sys-apps/psmisc/files/psmisc-21.5-selinux.diff.bz2 differ
diff --git a/sys-apps/psmisc/psmisc-21.5.ebuild b/sys-apps/psmisc/psmisc-21.5.ebuild
index 03952924969c..c151d5a8d3d0 100644
--- a/sys-apps/psmisc/psmisc-21.5.ebuild
+++ b/sys-apps/psmisc/psmisc-21.5.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.5.ebuild,v 1.1 2005/01/01 22:07:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.5.ebuild,v 1.2 2005/01/05 03:51:55 pebenito Exp $
 
 inherit eutils
 
@@ -24,17 +24,18 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
+	if use selinux; then
+		epatch ${FILESDIR}/${SELINUX_PATCH}
+		libtoolize --copy --force
+	fi
 	epunt_cxx #73632
 }
 
 src_compile() {
-	local myconf=""
-	use selinux && myconf="${myconf} --enable-flask"
 	econf \
 		--bindir=/bin \
+		$(use_enable selinux) \
 		$(use_enable nls) \
-		${myconf} \
 		|| die
 	emake || die
 }