Adding support for static-libs, needed for bug #436752

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 117 insertions, 2 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index add7fe19b0a9..2e4d83b0343a 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.88 2012/10/13 16:42:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.89 2012/10/29 15:36:13 swift Exp $
+
+*libselinux-2.1.12-r1 (29 Oct 2012)
+
+  29 Oct 2012; <swift@gentoo.org> +libselinux-2.1.12-r1.ebuild:
+  Adding support for static-libs and RDEPEND on libpcre[static-libs] when
+  needed. See bug #436752. Also updates patching method and adds
+  Requires.private towards libpcre.
 
   13 Oct 2012; <swift@gentoo.org> libselinux-2.1.12.ebuild:
   Supporting user-provided patches using epatch_user
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 9352f99176b2..c26afd69995d 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -3,10 +3,12 @@ AUX libselinux-2.1.9-mountsys.patch 957 SHA256 ab2c728464411d3d44d19afe79ebcfa0f
 AUX libselinux-2.1.9-support_ruby19.patch 635 SHA256 095b618bdbf786545d552fbc25ab91369d4b9dbc72764c3379706b65bb6f106c SHA512 bd1150a12097ae0dfd0c34b0e1742fef3af9a8ccff921a6a64f8abe24a681db9d5a8936ecc0eb973119c5d33712834a85998dd6a057aa0cbcebdc9455b6ac217 WHIRLPOOL 7c74fff046041fd99d4c6ca66401208752bf489415807dd02f4a7a699b12741a0a838a8de8ddbc72cff8c158efc0ed02e8f2555023d9398b9e411183babcd280
 DIST libselinux-2.1.12.tar.gz 162162 SHA256 8dad879380e0ce1e4ab67195a08f6052c1396493bcb12fe92a033f49f7dbca9e SHA512 9bc18e321309d2eec84a219d5fd179d8e282eb65d6a89a5c93f5f9215fe10024205ca9672bb87006350e9549f14b925ad7d7d363c3fdfb4aa12cb428c8698d14 WHIRLPOOL a95f9b6bda72ff53d58c49d25411be9f3ee78c9e29f1ab63559009775cdedda952c2d01d651757db594aae9345b849c9008b271d5c560cec0ae0130be3fd3a9b
 DIST libselinux-2.1.9.tar.gz 155840 SHA256 749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f SHA512 5e4659360ea08928ea8bb8dee3ab64ffd3c76071d7c3a1009f1d69298c015a99ab1f1d1af2d1f8afdcdd01b8be309883a26d2c2ca05c1b528e08778f22a74c96 WHIRLPOOL 384b7c935cfd93aa2bca7ff68374925ecf9066c3b63b38325c4d53a8a20075fc003872f9f4838dc8c346edfaa5a334f49b36d4545855cfc6358410b153151926
+DIST patchbundle-libselinux-2.1.12-r1.tar.gz 814 SHA256 d24a5eefb482a81f5986fdec0f3d74220fc071adbc3a3726657c4dd5b767b57e SHA512 e8c49441cdce2ed2fe11a4103c55c4f9d6eca2605aad4020cc64febfbe67f8f1205ef30329272c7624c57ab0beec98d96c338ed4a01ffef25caf5d126e210ee9 WHIRLPOOL 42f6a267a9c260fb6d70627136037db12c9d5003e5d23f2767c0c6bb808dde61c905c9088f68055a9acea9d288258b90b90b6caf97833ebc0c4052b45fd1d62b
+EBUILD libselinux-2.1.12-r1.ebuild 2474 SHA256 49e419e6943ec7009dffdd36cdb5375ea0733b34f7fd883e0e58393efd2a9376 SHA512 007137301d027008215ee19cae97027e2fbdb0d80cbda3c2ad96af12acbca39c69b93fcecea835e9abd48ae5c099d3b31af7bd46d16fc33163fa01d3ca2da71c WHIRLPOOL 9367cdeec1bd80d9983763497d21681607b18a45744b88f2961d5c26687c55db316cac27a16583497bff5875cd40aea72122f9d99bd8404d9c3d10ee5964e71b
 EBUILD libselinux-2.1.12.ebuild 2186 SHA256 8b794233d599ba5dad9c2b9e0a0589c4f4d530390239389be96fd65dd2b5c756 SHA512 855744de8081a24f086793be3b62470b70350aa0a1ffddca53e35adc5b61c825f71fb03655b4f1154b107cd9d2c22d366fc99f971468b0cc7fb98719bdd47f1b WHIRLPOOL 21510d47ca91123ae2dbe9b61b73cf431d50bf80aa9c685341960eb181feef4aa22d9569c8ffc236f4550320d723c29656f01f4e51ccccb13e8ac6c9c21622c6
 EBUILD libselinux-2.1.9-r1.ebuild 2086 SHA256 d3acd67150515bd6c1a6e0e410d0eb536e1e838d5aa40d1e4c86f8f434916ed2 SHA512 33e17abc071687622cb13dc30537c006568873fce5acc2bc4a60be3d832a53282077392ddb409f83cd4ada2d99a39db36efc1b3db8955c576da6b07cc43cab3d WHIRLPOOL f622eec132bbe1c14cacc0de7a71c7a894503ed8f224563ecf0a7e510fdcc98f5e0791dc3823a96d41e0aef4df4cbfb983889287a2a5492687d246fee3a073b2
 EBUILD libselinux-2.1.9-r2.ebuild 2174 SHA256 1f9df4509631e5aacdf39a5800d8dad0b55b341e00618687875d20299b68a289 SHA512 4c04b330b093483947e10adb39e05585dd76cbb7fb4b33b2c7cbdcca534b24a183cba5b2079072e553550e348079885af36bbf10f14d40e5265977d57e9bfafc WHIRLPOOL 6966bd39a3ab99467c3a7304dd3cf3330ba4c2524b9cc09189a08ac4454bacd2b9e6c0957ddde906002ea8cab57148f0e38db278f60c3cc6496b3365c06031de
 EBUILD libselinux-2.1.9-r3.ebuild 2117 SHA256 5ab2c076bc26398961c81c248a17871c919b5478dd74d4f362ca5733cb4e9555 SHA512 1506027ba78d3c8193717d9f925ffd9cdef28a489b74601b9063274af69f6ad87e4faf622590cf10c78b6e1ea22036d7d0092aa1e32bac5d7a794ec1785f6d50 WHIRLPOOL 5cbfe8af6526658c495c3d898fc20c965f2a2454af0f00620500b76c2dfa55fe30b2a85441c60fd31a1d1e442eddf1e0a2bb5a47ed0bbd6fc627afd7816895e6
 EBUILD libselinux-2.1.9.ebuild 2022 SHA256 a369e589e190d7a4e96adcac6288b72ae63e79a388fbaee095a3fcecbab47683 SHA512 de836c2fd0f0266886ba5b42c44eed79cfe1748f064409d9519aab6bae9896eb8427cefce6c3eee2523832f8bb9b3e7e027676da4be4efb068e3d7786e3242b2 WHIRLPOOL ae764c8c36b3b6756f4533c22f098cf74c2587372e8eb8cb2f8bd2741aa398aafbc7802d41c06984231b7f3a1d0076b6982aea5e728ccc3ea554234d513ef823
-MISC ChangeLog 12415 SHA256 421f59be2eb85f75bc3f851705ea51794438074ff92c868a846c5adb53c673e5 SHA512 65124fbd97fe503097239b4db57ce6e6fdae21a0f90c756eb87db39a342bd838ad187ac8c3b9780af84616ca45e082a6db6cbb167d444f358b9e2558a09cc8b2 WHIRLPOOL 4e479fab8977338bbbcd2d62ea1d217b0028793c2388eaa232dd4d5f2fe90b30392d76c5b7b4cfb2a5837d425c8e08812f06a19c83bec79f685c7d3e90d4697f
+MISC ChangeLog 12692 SHA256 f264b72e86376a546f047787b06badd612312b0fe512a1775eedb5d99b308bbe SHA512 36bbf9bc8ed0ad05dd0a17eb064a7682f283fdbe684d20b11275d8eb45e275cda6b0eef6b705947ff5962e2d94abe06dff811f7048508a179513ead743674d11 WHIRLPOOL 6bf2755a63b5a0cbe5921eca0be1622dd73592628d3d07a07beba23983f972e98bd5aa1f2440fcafc1ae741177dbebb801cdabe6dec07d1c3103b0e59c319808
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
diff --git a/sys-libs/libselinux/libselinux-2.1.12-r1.ebuild b/sys-libs/libselinux/libselinux-2.1.12-r1.ebuild
new file mode 100644
index 000000000000..8e64cbbe620c
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.1.12-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.12-r1.ebuild,v 1.1 2012/10/29 15:36:13 swift Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
+
+inherit multilib python toolchain-funcs eutils
+
+SEPOL_VER="2.1.8"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r1.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python ruby static-libs"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=dev-libs/libpcre-8.30-r2[static-libs?]
+	ruby? ( dev-lang/ruby )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	ruby? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	# fix up paths for multilib
+	sed -i \
+		-e "/^LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
+		src/Makefile utils/Makefile || die
+
+	EPATCH_MULTI_MSG="Applying libselinux patches ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	epatch_user
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LDFLAGS="-fPIC $($(tc-getPKG_CONFIG) libpcre --libs) ${LDFLAGS}" all || die
+
+	if use python; then
+		python_copy_sources src
+		building() {
+			emake CC="$(tc-getCC)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="python-$(python_get_version)" LDFLAGS="-fPIC $($(tc-getPKG_CONFIG) libpcre --libs) ${LDFLAGS}" pywrap
+		}
+		python_execute_function -s --source-dir src building
+	fi
+
+	if use ruby; then
+		emake CC="$(tc-getCC)" rubywrap || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use python; then
+		installation() {
+			emake DESTDIR="${D}" PYLIBVER="python$(python_get_version)" PYPREFIX="python-$(python_get_version)" install-pywrap
+		}
+		python_execute_function -s --source-dir src installation
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-rubywrap || die
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize selinux
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup selinux
+	fi
+}