[gentoo-commits] proj/hardened-dev:master commit in: sys-libs/libselinux/files/, sys-libs/libselinux/

["Sven Vermeulen" <sven.vermeulen@siphos.be>]

commit:     01fd0b01233fe83722a4324ac1d1de2e6143b949
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Oct  6 19:20:12 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Sat Oct  6 19:20:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=01fd0b01

Supporting ruby19

(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/libselinux-2.1.9-support_ruby19.patch    |   12 ++++++++++
 sys-libs/libselinux/libselinux-2.1.12.ebuild       |   10 +-------
 ...ux-2.1.12.ebuild => libselinux-2.1.9-r3.ebuild} |   23 +++++++-------------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch b/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch
new file mode 100644
index 0000000..02ee2b3
--- /dev/null
+++ b/sys-libs/libselinux/files/libselinux-2.1.9-support_ruby19.patch
@@ -0,0 +1,12 @@
+diff -ur libselinux-2.1.9.orig/src/Makefile libselinux-2.1.9/src/Makefile
+--- libselinux-2.1.9.orig/src/Makefile	2012-10-06 21:11:43.140757973 +0200
++++ libselinux-2.1.9/src/Makefile	2012-10-06 21:12:54.896758126 +0200
+@@ -15,7 +15,7 @@
+ PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
+ RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
+-RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
++RUBYINC ?= $(shell pkg-config --cflags ruby-$(RUBYLIBVER))
+ RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+ LIBBASE=$(shell basename $(LIBDIR))
+ 

diff --git a/sys-libs/libselinux/libselinux-2.1.12.ebuild b/sys-libs/libselinux/libselinux-2.1.12.ebuild
index 698f60f..23d4fec 100644
--- a/sys-libs/libselinux/libselinux-2.1.12.ebuild
+++ b/sys-libs/libselinux/libselinux-2.1.12.ebuild
@@ -6,10 +6,8 @@ EAPI="4"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
 
-inherit multilib python toolchain-funcs eutils ruby-ng
+inherit multilib python toolchain-funcs eutils
 
 SEPOL_VER="2.1.8"
 
@@ -24,7 +22,7 @@ IUSE="python ruby"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	>=dev-libs/libpcre-8.30-r2
-	ruby? ( $(ruby_implementations_depend) )"
+	ruby? ( dev-lang/ruby )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	ruby? ( dev-lang/swig )
@@ -36,10 +34,6 @@ pkg_setup() {
 	if use python; then
 		python_pkg_setup
 	fi
-
-	if use ruby; then
-		ruby-ng_pkg_setup
-	fi
 }
 
 src_unpack() {

diff --git a/sys-libs/libselinux/libselinux-2.1.12.ebuild b/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
similarity index 75%
copy from sys-libs/libselinux/libselinux-2.1.12.ebuild
copy to sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
index 698f60f..1b82011 100644
--- a/sys-libs/libselinux/libselinux-2.1.12.ebuild
+++ b/sys-libs/libselinux/libselinux-2.1.9-r3.ebuild
@@ -1,21 +1,19 @@
 # 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.3 2012/10/06 16:36:49 swift Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
 
-inherit multilib python toolchain-funcs eutils ruby-ng
+inherit multilib python toolchain-funcs eutils
 
-SEPOL_VER="2.1.8"
+SEPOL_VER="2.1.4"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20120924/${P}.tar.gz"
+SRC_URI="http://userspace.selinuxproject.org/releases/20120216/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -23,10 +21,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python ruby"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=dev-libs/libpcre-8.30-r2
-	ruby? ( $(ruby_implementations_depend) )"
+	ruby? ( dev-lang/ruby )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	ruby? ( dev-lang/swig )
 	python? ( dev-lang/swig )"
 
@@ -36,10 +32,6 @@ pkg_setup() {
 	if use python; then
 		python_pkg_setup
 	fi
-
-	if use ruby; then
-		ruby-ng_pkg_setup
-	fi
 }
 
 src_unpack() {
@@ -53,15 +45,16 @@ src_prepare() {
 		-e "/^SHLIBDIR/s/lib/$(get_libdir)/" \
 		src/Makefile utils/Makefile || die
 	epatch "${FILESDIR}/${P}-mountsys.patch"
+	epatch "${FILESDIR}/${P}-support_ruby19.patch"
 }
 
 src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC $(pkg-config --libs libpcre) ${LDFLAGS}" all || die
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" LDFLAGS="-fPIC ${LDFLAGS}" all || die
 
 	if use python; then
 		python_copy_sources src
 		building() {
-			emake CC="$(tc-getCC)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="python-$(python_get_version)" LDFLAGS="-fPIC $(pkg-config --libs libpcre) ${LDFLAGS}" pywrap
+			emake CC="$(tc-getCC)" PYINC="-I$(python_get_includedir)" PYTHONLIBDIR="$(python_get_library -l)" PYPREFIX="python-$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap
 		}
 		python_execute_function -s --source-dir src building
 	fi