diff options
| author |   Jason Zaman <perfinion@gentoo.org> | 2016-10-07 23:10:37 +0800 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2016-10-07 23:16:37 +0800 |
| commit | 3e43d2c4b1dc59de43f7e8108208e9f985e83fea (patch) | |
| tree | 38bee4ff9c46e16a1af55a25fa2348d65454e998 /sys-libs | |
| parent | kde-apps/kdepimlibs: remove old (diff) | |
| download | gentoo-3e43d2c4b1dc59de43f7e8108208e9f985e83fea.tar.gz gentoo-3e43d2c4b1dc59de43f7e8108208e9f985e83fea.tar.bz2 gentoo-3e43d2c4b1dc59de43f7e8108208e9f985e83fea.zip | |
sys-libs/libselinux: Drop patch that was already included
Package-Manager: portage-2.3.0
Diffstat (limited to 'sys-libs')
3 files changed, 0 insertions, 41 deletions
diff --git a/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch b/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch deleted file mode 100644 index a2f704df7144..000000000000 --- a/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 024a8628e698e8c90f7876a35c820f30c6957031 Mon Sep 17 00:00:00 2001 -From: Jason Zaman <jason@perfinion.com> -Date: Sun, 2 Oct 2016 02:06:35 +0800 -Subject: [PATCH] libselinux: versioned ruby pkg-config and query vendorarchdir - properly - -Gentoo and Arch have pkg-config entries for "ruby-$(RUBYLIBVER)" but not -for "ruby". Check if that exists first then fall back to plain ruby if -it does not. - -The ruby install paths were incorrect. Fedora 20 installed to -/usr/lib64/ruby/vendor_ruby/, Arch needs it to be vendor_ruby as well, -site_ruby does not work. Thanks to Nicolas Iooss for the correct way to -query for the path. - -Signed-off-by: Jason Zaman <jason@perfinion.com> ---- - libselinux/src/Makefile | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile -index 7169230..f9e3de1 100644 ---- libselinux/src/Makefile -+++ libselinux/src/Makefile -@@ -16,9 +16,8 @@ PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_i - PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) - PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER) - RUBYLIBVER ?= $(shell $(RUBY) -e 'print RUBY_VERSION.split(".")[0..1].join(".")') --RUBYPLATFORM ?= $(shell $(RUBY) -e 'print RUBY_PLATFORM') --RUBYINC ?= $(shell $(PKG_CONFIG) --cflags ruby) --RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) -+RUBYINC ?= $(shell $(PKG_CONFIG) --exists ruby-$(RUBYLIBVER) && $(PKG_CONFIG) --cflags ruby-$(RUBYLIBVER) || $(PKG_CONFIG) --cflags ruby) -+RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') - LIBBASE ?= $(shell basename $(LIBDIR)) - - VERSION = $(shell cat ../VERSION) --- -2.7.3 - diff --git a/sys-libs/libselinux/libselinux-2.6_rc2.ebuild b/sys-libs/libselinux/libselinux-2.6_rc2.ebuild index 0c6c84222e02..4e99ff956601 100644 --- a/sys-libs/libselinux/libselinux-2.6_rc2.ebuild +++ b/sys-libs/libselinux/libselinux-2.6_rc2.ebuild @@ -47,7 +47,6 @@ DEPEND="${RDEPEND} src_prepare() { if [[ ${PV} != 9999 ]] ; then # If needed for live builds, place them in /etc/portage/patches - eapply "${FILESDIR}/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch" eapply "${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch" fi diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index 0c6c84222e02..4e99ff956601 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-9999.ebuild @@ -47,7 +47,6 @@ DEPEND="${RDEPEND} src_prepare() { if [[ ${PV} != 9999 ]] ; then # If needed for live builds, place them in /etc/portage/patches - eapply "${FILESDIR}/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch" eapply "${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch" fi |