summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2013-10-27 18:18:51 +0000
committerSven Vermeulen <swift@gentoo.org>2013-10-27 18:18:51 +0000
commit2a98777599349a003956067130e20827ab9f221e (patch)
tree441f738c50a4d0298e01586465284388cf017875 /sys-libs/libselinux
parentVersion bump. (diff)
downloadgentoo-2-2a98777599349a003956067130e20827ab9f221e.tar.gz
gentoo-2-2a98777599349a003956067130e20827ab9f221e.tar.bz2
gentoo-2-2a98777599349a003956067130e20827ab9f221e.zip
Fix bug 488102 - Only call ruby-ng pkg_setup if USE=ruby is set
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'sys-libs/libselinux')
-rw-r--r--sys-libs/libselinux/ChangeLog5
-rw-r--r--sys-libs/libselinux/libselinux-2.1.13-r4.ebuild9
2 files changed, 12 insertions, 2 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/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
}