summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2013-10-27 18:19:01 +0000
committerSven Vermeulen <swift@gentoo.org>2013-10-27 18:19:01 +0000
commit3ac7ff0c18923a05758cbe6c0d1d2f76ba7227dd (patch)
tree4991e1fa6542aec8826e8a96c29edf07139c6103 /sys-libs
parentVersion bump. (diff)
downloadhistorical-3ac7ff0c18923a05758cbe6c0d1d2f76ba7227dd.tar.gz
historical-3ac7ff0c18923a05758cbe6c0d1d2f76ba7227dd.tar.bz2
historical-3ac7ff0c18923a05758cbe6c0d1d2f76ba7227dd.zip
Fix bug 488102 - Only call ruby-ng pkg_setup if USE=ruby is set
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0x2EDD52403B68AF47
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libselinux/ChangeLog5
-rw-r--r--sys-libs/libselinux/Manifest34
-rw-r--r--sys-libs/libselinux/libselinux-2.1.13-r4.ebuild9
3 files changed, 28 insertions, 20 deletions
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 8298b30898ca..71dd67c2db02 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libselinux
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.103 2013/09/05 19:44:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.104 2013/10/27 18:18:51 swift Exp $
+
+ 27 Oct 2013; Sven Vermeulen <swift@gentoo.org> libselinux-2.1.13-r4.ebuild:
+ Fix bug 488102 - Only call ruby-ng pkg_setup if USE=ruby is set
05 Sep 2013; Michał Górny <mgorny@gentoo.org> libselinux-2.1.13-r4.ebuild:
Clean up PYTHON_COMPAT from old implementations.
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index ff92151b7959..905527a7b81d 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -19,25 +19,23 @@ EBUILD libselinux-2.1.12.ebuild 2186 SHA256 8b794233d599ba5dad9c2b9e0a0589c4f4d5
EBUILD libselinux-2.1.13-r1.ebuild 3299 SHA256 c12efb1771f1a55efff50e0ccc29887111aae4f7e1dbb1d3150b94aeae423b64 SHA512 bb3aab781877770a901da936f3d83a230933ad947a2ef67ce39ee581a10dad5233094977f63faf5219964b16d16af8a8225fb5368e53099656e0051cd9ccfd8f WHIRLPOOL d5d2a5233e5ea94b3d741e0b112c110cfc88d87427f75cafdb5f583db8f467ddd11a15fe522b53ed0f44bcc3a1b5b353133caa21e3067034fa0ad9deea3c6f09
EBUILD libselinux-2.1.13-r2.ebuild 3297 SHA256 5ad7f7d5e2dfbf09cbf3bda0ab5cd79362a66f39e58aec6f101a9129fbb23440 SHA512 4697645ae6d07a5732304fdf6508e767ac1dfd4448abfbfb813c99b9dfc1375822e08c6259031de6490c08921fe6bb5d0234a3bb9659f6eb763f2a395b6aee53 WHIRLPOOL 63ca300ca18566752e06af6d9fb05501101d87cc197746d60d3863045cd4b9e201c4db7865e1174c862815bc1eb1b35b7d19cc8bae6ebd577e0b3b22f1dc7bb9
EBUILD libselinux-2.1.13-r3.ebuild 3299 SHA256 82325ab152c473ae4b546a457aef638b1830702ead9696f47571430237da7cba SHA512 53af7e037b45e77e9f6c70ec1c36b0f7521d53e0a50417e3bb8dc0ead176f3dcf7a6c03ac352bd6efc5cdfb8325e92aa4ea68475b07de90af7f55ff86f049731 WHIRLPOOL f7f1bba95a2e45c3a4b2b5f4883da9e6b3648795fc3babfff47e25e8d2c1a88dcf8c3c0324a45d85b515f598f9c1aff942811f8f6a229e4a6d07c10ab2a62611
-EBUILD libselinux-2.1.13-r4.ebuild 3205 SHA256 38684dd89e49a7c848b11e5515851dfd556fce543287e80276c292bc23f409da SHA512 141b16de306ae7034ad1af3e5c4ef4f3b3b1099277ab1a0956f93a5a8a632ae07e5db8154be448cb25c79d380c8bc476ea37d0c845349741e0baa220ba45e235 WHIRLPOOL 940558b1115878725fb25d834ef274dfc7c25612a9cab7e5e9ebdeb74382bee65823fbfdc25cee879c7bbc400090dc2e73a3706f167cb40dd7d78d13dd946743
-MISC ChangeLog 14724 SHA256 e794c8fbf255f68b8784dd8a709210582ac666be4ea032b2fd18fbe0088975eb SHA512 3ac19a219279fd7923816b5cc13669cbd27920bd213fbabb426cfc2644d3fcdf4d08bf40b662163ed1c8d818ec1a3851b16ca414979e90f505ed80cf7e3f08b2 WHIRLPOOL b9e7becbb2fb5414fed1d6d4241143bc8ef6849e16d00176503db9dd162b79f91fc535a3a8e555268ca4fcc863ff856d5bf0f68a61c02d60d7d11dc86077973e
+EBUILD libselinux-2.1.13-r4.ebuild 3316 SHA256 b412cf44b76e33a10fc81c34a07420cf2ecc150b9b4483e3a0490490ae672c10 SHA512 f6f4efc55af9e460aec0be2bae9047b5d34f275219fb8bca710211b2a93bf45623639fc27d02abb1b323ad30c92fdce981443442f6eea49a4ae13f5079e3f4de WHIRLPOOL 56614e5b63b20e24d6bae136845faca66fc4ce93e380f9fd0b0ba155f33c5a444a64e85e25d741648bd7155e2ef28796f568a194c91a610ab7207ec6aabbf35a
+MISC ChangeLog 14868 SHA256 e7cbe5bc7edb1b2feeaf82bbc919f77ab0c8f4f096b28e8825d591f8696fc0a9 SHA512 b1ef6ea2871affd20a4d6f3ec500fe38fd23f4f62080ebbdd1b989fe753361e195adf2f33aa2f758a42b2be6dfb476e53e796137b0cf2552d4bf094a37671ca0 WHIRLPOOL 0a3e06cc49f694c7fa74ebf213d93e3f2e3026431faad78d0ef1981554cd2a3f3f4d267fe255872aacad50c8a22a7745ef96b6f11cac710f5420a3191dab08ef
MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCABmBQJSKN+DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1IcQAK1My5wvNwdfCZhPtgYdYLeJ
-Fg3yzTbclk1ODmDA/xeIBdqI+0o+NgKJgRcZQhOZb/sZqzCJWacPhqJ1dheWlATJ
-GHOLiaB/pRdhjWRtVlZRdFHSc+kXc6hL6LyOFGg8CTpl6uO6d61GpSBRbppJLY1f
-ICcQI+ryieWQ4kzF4DISGtXv8Ozfg8VuZoUgdHqlbNs99W2fCKMj3x6y0oyUx6O9
-50sGMkmdJ93KE5GVlhBhurDCi/VVvME3r7i+qB6DPU8RLfjJUPfMskLltUnEAygn
-yNxAJilbzgKRvBkegcmhNVzwEW0T5W0+SZg2hMKFanYDGUN7gRWM4mx+FMDPKMAq
-tuRu96XbQg7tUa3CA/NltXSQRXS0qpqMuhRaqHEkkdq8PFLnIO98k/rzi/DQpGE8
-GGz5AsEDPQ2Aq1OOGE6S59rcwk6KVcnt0Z//GMST5CCGSqOvGJmaGqwmhBDes8S2
-ZdPQ7hVOquBv2ZALF223IHL5XEruSSqf+sxniaOFkWs/DfLrPkZ+DLUbEWgbYzBb
-ppkX7KKqARbR5/NfBxyx9P5THuaNF7xbwyaHWErdDD7l4JNTq8wQdN/KJ+3Kk9nn
-IpSrts270WcQrokqFXB+QCn29R0QZTtT8PZEsHlOioicjkeFs26jGy9AHnHc0Vcy
-dxDUh6HsB/+SogKzDguq
-=1z8W
+iQIcBAEBCAAGBQJSbVkIAAoJEC7dUkA7aK9HavMP+wZa6HEyibzrTTepHaM8HvTW
+5Uu+VpFQS5OhCVCJ4NVutlNUEO3b4gDF6ap2iUb++01j+S1HpNrvwGmkhRfxmYDg
+gvXgbJbNF6pOUNdmxUrU3ufUeSAsgULgewbvBngrTGfB4EGYXuO/KznxBPeTtTiw
+ovQzT/KW7dYTzriwqZajDq73RbIfvBIKqmJnvl00jfXDTPt9a7ctkexJoU/UURLe
+BsOnxjZBu9gPzu4Pzlbo9SrvJhr8DoLK4cX81PPzl5eJ0jRRzAVKY6NMzF/jZLPI
+S50SoCLMzD35OIlTtFacA4s75gVv1g4bSYYsV4iMLJL5nUNIlMIckwVbLvgHfWm2
+gPIitMBdUoQaxxpl+LjY4Eu9zGib0Et9Ui87tlO78BgJKNHtlWqe2S6LaDQEJISj
+ONeB6UG8jT2OlNQlgEwIMpLZ2Czp8qrj2MS0F/HHHazNGVJC2edg13hfU8l7am37
+7J3c7ypR55oWmVY+4x1qWvQtup6EVDoeDLqAZzhQY1sH0J8DS6/24cXkop8OAHas
+BlYl75NVpPIZ02QtbQxAhAPX6+jRhRHVQcRVyRAALPiDESH0PFdJTiLCuOeZE/U7
+hCT9yBYqhaDx6syLQBykMaEJ4u+Eo2z15FoQsYRg3lvpHeHMKHJzYHVQN4Ack3vw
+XeZn/Fa5/MRGTCSNO4LJ
+=HE9X
-----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild b/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild
index db1a204acf92..738a9f22775a 100644
--- a/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild,v 1.4 2013/09/05 19:44:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild,v 1.5 2013/10/27 18:18:51 swift Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 python3_2 )
@@ -32,6 +32,13 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}"
+pkg_setup() {
+ # prevent ruby-ng to mess if ruby is not asked for
+ if use ruby; then
+ ruby-ng_pkg_setup
+ fi
+}
+
src_unpack() {
default
}