Use PREFIX, not DESTDIR for SHLIBS call (bug #502078)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 112 insertions, 15 deletions

diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
index f4f2aa5091ea..bfe43ac72488 100644
--- a/sys-libs/libsemanage/ChangeLog
+++ b/sys-libs/libsemanage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libsemanage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.64 2014/02/02 17:05:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.65 2014/03/23 19:29:35 swift Exp $
+
+*libsemanage-2.2-r2 (23 Mar 2014)
+
+  23 Mar 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.2-r2.ebuild:
+  Fix bug #502078 - have SHLIBS use PREFIX, not DESTDIR
 
   02 Feb 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.2-r1.ebuild:
   Support multilib
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index a9f7efebfac9..82c59cc8e915 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -5,23 +5,24 @@ DIST libsemanage-2.1.10.tar.gz 136757 SHA256 de2e8077245581e94576276f54e80a53c23
 DIST libsemanage-2.2.tar.gz 138208 SHA256 11f60bfa0f1c6063cd9bd99ce0cb4acc9d6d9e9b8d7743d39e847bcd7803bd75 SHA512 09032b1b322fec7346164939ade118034812cb538ebc72121640d4ac5c89d2a66b59caa465027cfbebb590dee039a26d4345eafedf365d7f6ad0b5e90377d50f WHIRLPOOL 49170c5ee9ff57dcc4a15aa72386f37993f76436f0da25808c60dab2d03ba52932d0d4fa753c326900d83d2fae30f8bcf659251f17327783f2e2be3deb4842f4
 EBUILD libsemanage-2.1.10.ebuild 3884 SHA256 b0a3467e46df2105fa9d12561a1f1782874c92bbcf4d961ea94ad52a232ef0aa SHA512 cc97afe63df1dbfa3fa2b5809b09078a837c4d3f9c092b04e87e9ef598f2389a39eeab7e5b81224dff8c48b2970c5f5242615112a80fa0d1eb3069469f770144 WHIRLPOOL e7b6103c495be1f2449caac3497d769a453bd81b119aa420848d6ceaf0d1b6ce5013daed1eb2c037e74024b54cb9c058e5ce1b1b759d3d269f0a7f5ab2f921f5
 EBUILD libsemanage-2.2-r1.ebuild 3213 SHA256 45000d5c45b67c6b79a4934f013ba262172300ac73b08b20a0b309b095a5fc8b SHA512 63ebad94e26ab8fce1936da680d6d253cd7227d9e1c849875db636012dba617703d806159dc61ac733ecee4aa28688365c45ee9a8ac2cc0712ea2997752998a6 WHIRLPOOL 958af031fc3495cb4acfb17e49004483bfcf78c5a8285c0b223e23b47acecd66ee7aabb7cf7ec78ef65a1bc032943dbd6ff0f9a633fbaff455b19f281488840e
+EBUILD libsemanage-2.2-r2.ebuild 3212 SHA256 71803e1e7626a67080e62c585296dbee78ce7f075d665ad41b7b90817020949d SHA512 4bcc333d9b7d74d0142a1c3745ac9bea27918c73e8e914420d2235cfbe98ce77add179abd5d186600cdc037a5f2c3fc6563625b38fab7f7d3fe2c42386f2844d WHIRLPOOL 2652895cd27e357d8d3a13a98dee82d9e341e3f756a1f3d65416c26450137060a656f55f9ad0831fc9a83f0fe6041648c4830693f01a8555485d3a3acb229772
 EBUILD libsemanage-2.2.ebuild 4121 SHA256 0df9712bd636e333e189519b56295f4c9adf5ae02a31490a9299273252fc098d SHA512 96697790366f50eb3c502618e8e38bc161df60c235f28d5a9f5a2ac6bb6c1cedf3d63111be5e30e3fe2336c056ec30f35d064a4fff096625c5e35df575d728cd WHIRLPOOL b14b75c0f62a6ff5674dcf68ad46b54d463407e3b77885e85d728a4f50792aef9446572e14f63aca5437c852d5a43a626eda4a70af7606adf3e7da08dff3b1db
-MISC ChangeLog 8786 SHA256 c515a5f5b67e2c4242e79942352bf02092f16eab130a84d3703490cf46a7b611 SHA512 ef9f1abbbdf47601b627af5895b1286449778d78ae7f4edf769f008b6e5b76e454db214a286b320cdca002170829b7ec226fac7ae1fb4dd6181ca9bf59184135 WHIRLPOOL 461b21deb03c43385e8110b1fe4b41d5e48046fd038a4952a36b0f78287399ecb82706d59e4952b1ca08f3e43558013fe57619fb77304986295a5ac21c12e0bf
+MISC ChangeLog 8955 SHA256 74ff77ec6df260375d685eb5d077c6cd7e11a2b62c9c36fe87c83037a10ff232 SHA512 0ffb3bb323b6a2e3ec9a3aae2e00f08136900226c95c2ab21b948cd997b1547f38980ca2b91606db84a3a4a8e993773acf4ab4d5fd9a40ca62af91bd9b8e0d0d WHIRLPOOL 627631c89e6c3d9cb513edb5990d23f5f18da07b1ddcb67c60bfec75bf622000eabb5832f8433d590efe1e5ded09f48c8d366f585a70a890b4bb1c47dd43ac28
 MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS7nrLAAoJEC7dUkA7aK9HkkMP/0pLsT9nMAnSzpVxrLjfaly6
-ksDnakbI1jY6KQRHUS2obwY9h/yhd6Jc/uHr9LrXhYiwr17XOThUkWiLdZAqv6LH
-SqpiIwOO8OHXM6Yt0a4hOAHU6Q2QF4BI0rGSjZOGpBe0IVYrCUrn/AXPx+Gzlikj
-gO5/cKk65aewreNF5A6LfgazbUqDbvchXVSP9oDWnSZ+8+VOHSffm4d1Zeov12OK
-IdGkof8IEknyslHqqg9EQStkUDZsWHkPH6Yo2d4EiykYalX/IzMrB61oPU1ecoYH
-Q4whk3eO5mxKarYUHurqw3N7ag/zLY1QbH4rbh+Wk7Td6P4SnQfijnwXm37nlghe
-l/5+C6ATR/Cu5+zOkjnx0+Sq2AZjY1gh9U297ixHbE8R596YsYhN8wnA8sIxBPmF
-yw9it1UOussp+DFgNbpDpGjIciSkH9FxWIlBTTAa73xUCSZVtLDdlIXmNWRMEzzW
-Pghv8fNUCIrCVvEDNc4GaeeYk5HAifLtkHrF4bEKcAr92ozpNRt3qY59M199QIil
-jp/+t8BTRlFoH0t8dwKVV7F/gO82WjPZcIGQexPI3pVYspq+u4BDf2E7ucgAnvoC
-eN287TAN3J32g9rpbNnTp8HZPxCZehEtpPVSSNzxakl3Gw8X3wHGxDyseHJdp7Hc
-LF1r3LGgCNeOgKdAWPe/
-=iBc9
+iQIcBAEBCAAGBQJTLzWhAAoJEC7dUkA7aK9HzCEP/RJhJPE0a3SJTs9k8sNhD+6g
+wR/6X+lhWrEd1ntulajDVU6tcjvwMOsPvCfDsfvcOKpOW9FmKPgn7bc1JssR3+rV
+CzO3Q8kx4SOA2jekTf1vN5UOfLNL2twAdE6WJllDZ9DDnJ5rOXIUeIT5dNilxLs0
+xZsMRP4EkAnuhaVYRIoVR964996Hhbaw5aqnWK3yYoSCj3gMgDOWWGJ+6Oyq+b2P
+0o4atzFof587fNjJuRfBagC1wZlsLxwMqKVdJTfeFjfjSSdfgsnb4oO6iIHKZPpw
+7dCJvOQZvEjoHn4sT6R1JY61udYWWwnImndOvR/bRmTrYQzXatjrtA0CzH6NTcB2
+vrff+4pvAv6G/+5/sBLzworQCTRn+eySTPAIvVzUtq0bOw9wUu3nylKpmAepki43
+Z3sfwkkK7m+R7vWyFqIdpG4iWAZ5XvJKG+AazkwCb4xL6OZvDb9agOj23DTuCh3Y
+ETe6xuVaMnYJ23stefM/gpoTE7jwlcRKcFENk60eZFKJJWuX/8B20AHgsGm2ZOJG
+3l+twOozP9WA/tvRq5xJy6M3NUZHE1sqaP8eiEhzlIh/dZMiixwYRyswYlIlKHZt
+zhDFatMMPUVIuqsqdj7kst+PbdjlWO/WXvDi+nPPsg0wuYKS6Yhez/Wh7PW/IvJJ
+3re0Y5cbf3MWHukPn0DE
+=8Mhk
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsemanage/libsemanage-2.2-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.2-r2.ebuild
new file mode 100644
index 000000000000..3aa96bc62736
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.2-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.2-r2.ebuild,v 1.1 2014/03/23 19:29:35 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+SEPOL_VER="2.2"
+SELNX_VER="2.2.2-r1"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libselinux-${SELNX_VER}
+	dev-libs/ustr
+	sys-process/audit"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? (
+		>=dev-lang/swig-2.0.4-r1
+		virtual/pkgconfig
+		${PYTHON_DEPS}
+	)"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" all || die
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
+		}
+		python_foreach_impl building swigify
+		python_foreach_impl building pywrap
+	fi
+}
+
+multilib_src_install() {
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(PREFIX)/$(get_libdir)" \
+		emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" install-pywrap
+		}
+		python_foreach_impl installation
+	fi
+}