From 559cb975b7232b38b537b71d4edc4ff2b918cdf0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 3 Oct 2012 20:42:02 +0000 Subject: Fix /usr/lib handling in utils subdir too. Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64 --- sys-libs/libselinux/ChangeLog | 5 ++++- sys-libs/libselinux/Manifest | 24 ++++++++++++++++++++++-- sys-libs/libselinux/libselinux-2.1.9-r2.ebuild | 10 +++++----- 3 files changed, 31 insertions(+), 8 deletions(-) (limited to 'sys-libs') diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog index 2fb4d2361b72..356cef9c1874 100644 --- a/sys-libs/libselinux/ChangeLog +++ b/sys-libs/libselinux/ChangeLog @@ -1,6 +1,9 @@ # 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.84 2012/09/08 18:44:22 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.85 2012/10/03 20:42:02 vapier Exp $ + + 03 Oct 2012; Mike Frysinger libselinux-2.1.9-r2.ebuild: + Fix /usr/lib handling in utils subdir too. *libselinux-2.1.9-r2 (08 Sep 2012) diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest index c81f6ec7e3ef..9616fb39eed4 100644 --- a/sys-libs/libselinux/Manifest +++ b/sys-libs/libselinux/Manifest @@ -1,7 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX libselinux-2.1.9-mountsys.patch 957 SHA256 ab2c728464411d3d44d19afe79ebcfa0f7d69445245a505e330cf051ea65ed35 SHA512 c9d2df56f1513ea973d231d31ff958e419b7a64c882bfdaae0554752d847cc98885e27ef21f1a0ce821c05c376ee5d9140fc1f8f7009fd69e3b56eccfa709f0d WHIRLPOOL df27d264eafdc98e8e947c4c1d970a7dd693f465cd06163cc72de10b1433ea47b6d1e782dd38e100d7189d424d65fe81d8282423c623e89e8b1f0d99121cfc01 DIST libselinux-2.1.9.tar.gz 155840 SHA256 749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f SHA512 5e4659360ea08928ea8bb8dee3ab64ffd3c76071d7c3a1009f1d69298c015a99ab1f1d1af2d1f8afdcdd01b8be309883a26d2c2ca05c1b528e08778f22a74c96 WHIRLPOOL 384b7c935cfd93aa2bca7ff68374925ecf9066c3b63b38325c4d53a8a20075fc003872f9f4838dc8c346edfaa5a334f49b36d4545855cfc6358410b153151926 EBUILD libselinux-2.1.9-r1.ebuild 2086 SHA256 d3acd67150515bd6c1a6e0e410d0eb536e1e838d5aa40d1e4c86f8f434916ed2 SHA512 33e17abc071687622cb13dc30537c006568873fce5acc2bc4a60be3d832a53282077392ddb409f83cd4ada2d99a39db36efc1b3db8955c576da6b07cc43cab3d WHIRLPOOL f622eec132bbe1c14cacc0de7a71c7a894503ed8f224563ecf0a7e510fdcc98f5e0791dc3823a96d41e0aef4df4cbfb983889287a2a5492687d246fee3a073b2 -EBUILD libselinux-2.1.9-r2.ebuild 2269 SHA256 3ab1a4dac07b806ecd4d5d0e7e4f929fc442b762cbd08f909dc3e11046c487d6 SHA512 473489ecf21b7c43ea60e14590eccba93342e5d4977d38df63ab8ea6b726def11650e312c5f7150706fd68df807c81804f044f107d3c6d95dc1467104e552173 WHIRLPOOL 729d4785123debb0bcccdcf3a83d27e037db4e3c5368ab678b58b8ed8d85d80d5120f73d0a63bd232d7f6e50745d40beae6d3a819b02f85a3927a5c584b8cdb2 +EBUILD libselinux-2.1.9-r2.ebuild 2177 SHA256 0081c1bd8d6fb5aea2c01803a3dca138f3b107da0f2e2cc7ba713200d43475fb SHA512 3ce1acb120370e0d77149a3e8871f550c784deb0b2e86fcab96f4555a2ee258f7fad7145b48269d602f3245605ac2ae66b74fed1cc7ee1b4f08a008733db47b3 WHIRLPOOL 88fd3f3add3b92a4dd6acdbc13e0f8e137712d3d03e268c0fe763b11fd3a922c5d1289e5e51f435c65352ab46299ce9106506450f10e5929ead919f13268b71d EBUILD libselinux-2.1.9.ebuild 2022 SHA256 a369e589e190d7a4e96adcac6288b72ae63e79a388fbaee095a3fcecbab47683 SHA512 de836c2fd0f0266886ba5b42c44eed79cfe1748f064409d9519aab6bae9896eb8427cefce6c3eee2523832f8bb9b3e7e027676da4be4efb068e3d7786e3242b2 WHIRLPOOL ae764c8c36b3b6756f4533c22f098cf74c2587372e8eb8cb2f8bd2741aa398aafbc7802d41c06984231b7f3a1d0076b6982aea5e728ccc3ea554234d513ef823 -MISC ChangeLog 11801 SHA256 260881b41835552dee66953e3d0868d608ded60f8e19af9503934d78f90be2f1 SHA512 bf36e0743b7eb446ef0d09cf9b8d3f13cf1506b5611813a80be1b52f47d64cbcb2ccd45fd8b646e370dbab61f84247265b5fd3c7556f8de0e1c0acbe2c542036 WHIRLPOOL c1ca2cdeccb799d34324f9d4f778ae1bafaa29f0913e858bf80efa84b11752e28f9f019764ed097b08279a597e6a7dab9362644020bdd2fedac4355f7843f590 +MISC ChangeLog 11926 SHA256 a3919325f10833d2291de41f4d612d3bfd95d877cccd56a69442083c03a05331 SHA512 105852c491c1d8f81f42afa67cc81eea7a243484c9a83cfd3e1017e52bb573c8216d3fa9ece3d384c457ccc7e8bd4e26e3dd55e0e6eaa9b6e784fcd578453af1 WHIRLPOOL 2a8a0c885a34c918f3b417c4285ea7bb704f827afc4983af95aa5563a73d482c70059489536d31a2e26c037b84712975d9e71d1b3a9070af555235df9d9fbd7c MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJQbKMcAAoJELEHsLL7fEFWib0P/jM7OS+WZqMaDGC4mkYjQtrd +u+7psvy8xiTHBhmZUb2Gmx65/L3GzgFrS60BNpwVbZyAtbYoW7IkA314itvdV462 +lTQoc+yVHN4JXOShI+SEiNdafuWq7ZEtUSZ66bZRLh9S0ZuragjGeMK+/zKt2zRg ++iBpB6wqPiovqt0UwBnnmy7ym1E54x8ZlJkceSw6EMEdEpwB3SWGopKwuiVhPCET +XRnlf4jscLxRkdt7ACgPEF9g7EAVi2p5T0HUwDbyLuuvMbIfx86rtWNFfwiB/2uG +9Cf6JzK9y+eTNR8D0cdJcs1EXRQOJc2ygAf8fVHJSYkJTWQBl2fSrPQE5OfRtuH1 +1pyGciQWrACz1KC407tOi7zywnPifDvIdT8PN6aCi6BDZSnPR9do4WMN2/ufH3iO +91od0JUHe+TGGD6j85ioHC9eXh9DibgRS2C7LFRSDp5HuHkySyPaLYC7J1aMPuPi +t0GKbqrhVbwixfJgZA4vIPTa8d+25sTAQeGyAnqdX/a5PxUKQX0CYp5rtez1bCGy +NDK/FBt2U1MGcQ2uF5gxihm27DRWNyhn3bOQf+g6M10bfwv33rODF5sRtmzjERuS +wtwlwyuSdLN9GnQFmPcyITd+MqSMIvNAG8ewzOreM0zU8Zofv2MSaIri7qtJbxnq +r474zPB9gFDS0vsg24zR +=KPwt +-----END PGP SIGNATURE----- diff --git a/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild index 55c92fa6ee30..52f5540122d4 100644 --- a/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild +++ b/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild @@ -1,6 +1,6 @@ # 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.9-r2.ebuild,v 1.1 2012/09/08 18:44:22 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.9-r2.ebuild,v 1.2 2012/10/03 20:42:02 vapier Exp $ EAPI="4" PYTHON_DEPEND="python? *" @@ -46,10 +46,10 @@ src_unpack() { src_prepare() { # fix up paths for multilib - sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \ - || die "Fix for multilib LIBDIR failed." - sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" "${S}/src/Makefile" \ - || die "Fix for multilib SHLIBDIR failed." + sed -i \ + -e "/^LIBDIR/s/lib/$(get_libdir)/" \ + -e "/^SHLIBDIR/s/lib/$(get_libdir)/" \ + src/Makefile utils/Makefile || die epatch "${FILESDIR}/${P}-mountsys.patch" } -- cgit v1.2.3-65-gdbad