From acd50577d396e753b16c5a1aa3c856c786144f3e Mon Sep 17 00:00:00 2001
From: Chris PeBenito <pebenito@gentoo.org>
Date: Sun, 29 Jan 2006 20:00:59 +0000
Subject: Add python version handling to fix #120829, and add -fPIC to LDFLAGS
 to hopefully fix #119271. Package-Manager: portage-2.1_pre4

---
 sys-libs/libselinux/ChangeLog              |  6 +++++-
 sys-libs/libselinux/Manifest               | 22 +++++++++++++++++-----
 sys-libs/libselinux/libselinux-1.28.ebuild | 16 ++++++----------
 3 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'sys-libs')

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index fca52b043faa..93e8565bf545 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.39 2006/01/17 01:06:00 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.40 2006/01/29 20:00:59 pebenito Exp $
+
+  29 Jan 2006; Chris PeBenito <pebenito@gentoo.org> libselinux-1.28.ebuild:
+  Add python version handling to fix #120829, and add -fPIC to LDFLAGS to
+  hopefully fix #119271.
 
   17 Jan 2006; Chris PeBenito <pebenito@gentoo.org> libselinux-1.28.ebuild:
   Mark stable, x86, amd64, ppc, sparc.
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 1da163c7db68..6a9fa7dcf243 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5264372de429dcc2a2f5352b7b1a2ebf ChangeLog 5647
+MD5 fa9000a254b80c67d30afe79324811d6 ChangeLog 5823
+RMD160 16ea46a55e33fc8c0b5b917d9589a8f8ee43d279 ChangeLog 5823
+SHA256 dda810ab1e9a1bfd392e24246917245a42e4a6c889173495ccd1ced3ab0cb442 ChangeLog 5823
 MD5 7f7600bda169c50d374156b98d0fa86a files/digest-libselinux-1.24 63
+RMD160 31c0004225219d93b979d3377bb9fda311c1607d files/digest-libselinux-1.24 63
+SHA256 2100e45d94c1c924bd0f3d78aab9518beee03042cae80f210c834117a8112d7b files/digest-libselinux-1.24 63
 MD5 5c9f2de785e321be6926afae539f05b9 files/digest-libselinux-1.28 64
+RMD160 b4d452d84a499eb57393ab039b39f18f58eae544 files/digest-libselinux-1.28 64
+SHA256 d62c87d4fa403f7f490373767803bc0625669f20b415d78d2e708ac80bce2b6e files/digest-libselinux-1.28 64
 MD5 40825b53dc0b57fadf0823982bdac34b libselinux-1.24.ebuild 1131
-MD5 a762b62c89874cc6bbe07b43ba1f5727 libselinux-1.28.ebuild 1135
+RMD160 db35bec0f296a30cbfa5b66f8c1ed5f5951b0614 libselinux-1.24.ebuild 1131
+SHA256 c1d1d535b29bc7ef933e176fbfec760ead886be551c8b4f2fffdec19057caca6 libselinux-1.24.ebuild 1131
+MD5 d0a5cb029c9ac56681439cf00e4e8b3a libselinux-1.28.ebuild 988
+RMD160 5644a63b75458830d31bd1eb91ba228c7064fc3b libselinux-1.28.ebuild 988
+SHA256 9f9899021b27af6f94bdf669579bde6e72ed0915dbf1fa46d67dfb0a7f96448d libselinux-1.28.ebuild 988
 MD5 652c5e8a0a081bf4317359f04f65a603 metadata.xml 537
+RMD160 6adcd5fc653db8ad7780299214875297beb9c931 metadata.xml 537
+SHA256 e691ecff0c45ccbd6cf813fbd7f23e489dabad664e89e6b21b8c7c1785550f9e metadata.xml 537
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDzEMQJ+ChZlpDtAoRAsUDAJ9RRskQUZKErLS0uWB2CvBxVLVlBQCdE4nJ
-0byWmAwOFwnBz8PfcJCFcAw=
-=ofQ/
+iD8DBQFD3R8KJ+ChZlpDtAoRAgV/AKCGfOdtzJbTU+ehSpzAj4SwsAUnEACffrOA
+ox8jZbejtPpNOzKkMqEjBWY=
+=A4mX
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-1.28.ebuild b/sys-libs/libselinux/libselinux-1.28.ebuild
index bb30a74be646..ce368af99c04 100644
--- a/sys-libs/libselinux/libselinux-1.28.ebuild
+++ b/sys-libs/libselinux/libselinux-1.28.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.28.ebuild,v 1.4 2006/01/17 01:06:00 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.28.ebuild,v 1.5 2006/01/29 20:00:59 pebenito Exp $
 
 IUSE=""
 
 SEPOL_VER="1.10"
 
-inherit eutils multilib
+inherit eutils multilib python
+python_version
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -15,18 +16,13 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~mips ppc sparc x86"
 
-DEPEND="=sys-libs/libsepol-${SEPOL_VER}*"
+DEPEND="=sys-libs/libsepol-${SEPOL_VER}*
+	dev-lang/swig"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# make portage CFLAGS work
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/src/Makefile \
-		|| die "src Makefile CFLAGS fix failed."
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/utils/Makefile \
-		|| die "utils Makefile CFLAGS fix failed."
-
 	# fix up paths for multilib
 	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" ${S}/src/Makefile \
 		|| die "Fix for multilib LIBDIR failed."
@@ -35,7 +31,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+	emake PYLIBVER="python${PYVER}" LDFLAGS="-fPIC ${LDFLAGS}" || die
 }
 
 src_install() {
-- 
cgit v1.2.3-65-gdbad