Noved to github; also add in masked 2.4 series

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

15 files changed, 450 insertions, 50 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 4b709f2941bb..b56d021ffb1e 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.130 2014/09/16 23:03:43 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.131 2014/09/21 10:17:04 swift Exp $
+
+*libselinux-2.4_rc2 (21 Sep 2014)
+
+  21 Sep 2014; Sven Vermeulen <swift@gentoo.org>
+  +files/0005-use-ruby-include-with-rubylibver.patch,
+  +files/0006-build-related-fixes-bug-500674.patch, +libselinux-2.4_rc2.ebuild,
+  libselinux-2.3-r1.ebuild:
+  Noved to github; also add in masked 2.4 series
 
   16 Sep 2014; Brian Dolbec <dolsen@gentoo.org> libselinux-2.3-r1.ebuild:
   Add python-3.4 target, needed for dep of portage. Tested and 
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 0dc63694aa6d..2a57fbe34f24 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,24 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0005-use-ruby-include-with-rubylibver.patch 634 SHA256 ca87111f9eb48b45b7271f4863ad4fbae99b64fd28a457cb15920250b0ded834 SHA512 6755c06e39a924dacc8cd21e8b56138938b55a54e76baddd2243bb4ec2cb99a92ca9d825f2f789ea84e87b1d795334a6b936e627d45b097ff724f00eb566c118 WHIRLPOOL 76a35b23454c941c32efdb2ed87a3fa3b044929d24acdcec53ab36f7d300bc94d6d8165a7b55483cc26ad21b4415aa47cb1540c07c498d3eeef2717f60a8ec3c
+AUX 0006-build-related-fixes-bug-500674.patch 2846 SHA256 68084a13ed0366c279e37c6ce24703d0ddcbc46b2b4b88bb8af286b77df4212d SHA512 7eff094adfc4d276e72705735b3f73b2b8a4f78be153db749939cbf6c8df2246cf45d4eda0041696642ae22d3e1715f1fdc8b6351c13eb6003e48043fa38200b WHIRLPOOL dc2b99d5345e21f18de44dc56cb7996c5b567c932e4d3a2e6808a21233f582868333cc0d7c0eb2299b8d71a0cd46d2c0e88bfc6d351211b6374762b7863d72f6
 DIST libselinux-2.2.2.tar.gz 171013 SHA256 30ab363416806da907b86b97f1d31c252473e3200358bb1570f563c8312b5a3e SHA512 1270cba11ec0795a2cea3706ac5547655d0e65dcd2141932000526f3d0c781b6ae114051b2bb53950b8ef207a318335329280b9fc9fd81796e8e4a27cf6ae841 WHIRLPOOL a444e44225ced35b126bbd2e8924aaf5c9f4da7abb9663d20a32b97babe750245c22d75e2238de0958b73295cf582b8aec39e23312886b96417120c600ed37dc
 DIST libselinux-2.3.tar.gz 171254 SHA256 0b1e0b43ecd84a812713d09564019b08e7c205d89072b5cbcd07b052cd8e77b2 SHA512 8cfcd20ab0b43ffbb32389e0498b21e43cde643dcdf471a2354f1ca557f11641d250871ed5e71b9dde4c5f47ac1048746fe514f8f6cfad668fa179ed5136e802 WHIRLPOOL e975a391559aca3f8b251d2aa484cf8e344d09caa43ff56dd929e75a0ad195cf8d9a88b950679f589f4deb74aea0d22be4e7ad00b11eacc080288df0b5ac7ccb
+DIST libselinux-2.4-rc2.tar.gz 165817 SHA256 8b3b79247e6b93d49b6a9a38627e1e933cf96000117a36fe38af6a17a7d95b4d SHA512 60854a6b3efc52aa1b3f5d300aebaac889b26a51a58a8e4a5dce22a26707506b524b01706a10b6b3415e25c9eee1fbe5474e7bb7d83144ad1443c79562a565d7 WHIRLPOOL 7517be13cad652d921cf892a4e37a3e4d45676d512858a744bad5a0ed551bba210da17555845a82f14b5115c5879c813075633d76664b2bab2ade91df76a712b
 DIST patchbundle-libselinux-2.2.2-r5.tar.gz 2304 SHA256 ad77f499c05ec3b5707cb9db518a891dd9c84ccb77db07e686c87e5799e1802c SHA512 a01db39a7aade27b0127dd0e2f3185587ff4d913b7b1be7beac36dc2d3e1007de5e6bae8a11bc84567385420fff064ba54892d8e113c8fd54ad3c598dde7648d WHIRLPOOL 5886d9de6fcf073d54ca5e0eac3f8b4754c44382e7044debb223f94ecc81ea0e26b7638037eef17eb6f8ce4cc5046a4bb9f93b9b7767480908ee5b2ced0413ac
 DIST patchbundle-libselinux-4.tar.gz 2631 SHA256 91bf43c84ce3d3178c8d21fdcf97380a635fa2465d1611fe4e0e3838a586c78c SHA512 bd2f9762f095e3dbc67e77ee04968cb8e87d460fdf10feff91cb1ce6027e19a660bb57617887e44608d39720e8f95500c451c4b284d58c0a756a04b08fa305c2 WHIRLPOOL 07a6a69d33c46c443907aae2ae4f3646a0360565e28d0a50cbcf81f8b5d8c259812d3e086841fc21c2a8104ce9863fc6c9c1d32e28ea08ebc7baf2d45af3509f
 EBUILD libselinux-2.2.2-r5.ebuild 2534 SHA256 a98b5b6f55cba51844b9307156d0174b5aa350092d998a7d7cb4ebef691b41ca SHA512 9c789b638cd8822cdd738906de5a0e52f2cdf5c5c88316048a790a775d9f41601ae49e971709f572dd3eca964af8ec262fcb41ed1387a6d6be1ece74ed879fe2 WHIRLPOOL 1b6800e9eb589da42f05e9d8eff6009aa4aff6e1b55bc0e81f1b8cef280726e2105a069accdf645e68f0213c02bbd610c068536a57a7e56ae42156192ef288b1
-EBUILD libselinux-2.3-r1.ebuild 3916 SHA256 6d4f1de048b3025634296b2599239ef795061c7b62c793e1adb3bfd120885420 SHA512 14fee0ec9b75044025809f9b3137a6ddba477813b256a7af19b628a44f9c35daaaf62b6728ee605f00d22eacda7c5c48984b34a011488cbf5d526a5a525a426e WHIRLPOOL 190b5160640d1c27e30c68ae8bacbdea5fff584cb32ff5295c4855a83a0a2e526e54a46c295952e7b75c2b7cd529bd54062ca847b8edeb33edb63954712b281a
-MISC ChangeLog 19310 SHA256 c469fc5382d598a6478834d54513bf555d4349071fb52ae5367b8507b33b2344 SHA512 464c85902ca7ae8507a59c7fce08a7b29fc61df8cf36d575b7d947b774b4992e884e5c80be6255e1ef5dc4c974c8bbaa0323291d4d5bcbbcaad131bdc3e9dcd4 WHIRLPOOL 5fed60ebbb73c30ecdcb7448c40d61d751c9f067eb2b3726fb66d4b1b881e5d44b8b55960529a826e6a370e695fb2831dcc98b27ea098279778c3e5379abac73
+EBUILD libselinux-2.3-r1.ebuild 3947 SHA256 ca0baaae337084e32d687b2c8d74c50b995d91e737a26ed3cddd4f51c121e68e SHA512 7e57b18370145fad0ffb13f0d121a3efe0f9bac0c51a1f5a9aa24e4bb8d8a42e25dfa2025252e43e05ac5ac020a1cff2ca2d0b842943d5746b269f0d22140f2c WHIRLPOOL 6686edc1ee477fd6495935b1038e6a0341727c2b9600098ed0deed8b8a8eced95f6b9466600b4846cf4ea78d091e3b9378daf1ddb109481e8d2c50160ff41fd7
+EBUILD libselinux-2.4_rc2.ebuild 3846 SHA256 66c873baa7f32acfa7678b2896e7c83b16ecc8556e7ee4e40844e96af0afa653 SHA512 029b993d39c8c883caf5175014223caff857fcff391c69134a8d194c0a941118ebf7907767f8c5bc71aa80432ac482254ab1451500a3ac256ad6f779e4bf5206 WHIRLPOOL 00bf289ec7574d34bfbf572dfa178ce47b94e104ba84c8c3e29cc7a7d48516987eb8e83596e68a966bbddc63e1e849bc1a8c807639cf5812cbf36065ef7e148c
+MISC ChangeLog 19605 SHA256 8621ee7091ce73892224352d42d624794132a85fddb94a1b960d454a0f8216e9 SHA512 99622e74e80b085803497da7978d4aee8329b6759d627eb409e136fcecf59619e9c59b773f3619537b0a78f46687a9c44e63a71012a886d0f3829feebd5a1ff6 WHIRLPOOL 4bb9eda38364ee68c043c73d4d288c4ad20218f6af1b4d77798d47150a9ebb23195140fa8910aacea8eddd2638d1aacd1dfe4aa4cc8e4b1c3366feb270f4e52a
 MISC metadata.xml 406 SHA256 934da6149d008c09754c0654dbea6c49da117923adc6fbf3fcabac58195b9c45 SHA512 5bd2b0637c4d77b6113540dff5c4253390b1fcc69b864aaf2196d2c6e8c2c10fbb06bfcb69ba73978e3a2c3ca60fc6e4eccc0ea02a818b34a66c137f993a33a0 WHIRLPOOL f34ec6f0a7f35b9c2a8f29688fc58b6228484e3ba0568d65b6d8e24cc91662b6704ea532e036cf0a6ceca83b4e118bb7c8a64c6c4ba45bd60e2fa2d73d2d2abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQF8BAEBCABmBQJUGMHIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
-MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfL9RUH/2ngq9IXEFT4gE80wKoaUnUc
-gMbJjQOWf0rERxRffdb+kIwhdIoZkKZ8NHXYCfN9gMc7+c3aOFQOks4jBYavZr6T
-cqlbQaVHvvst7aY1KecA9W2uwKqLGjaLPCd2NwliXqmMdXPW+x2qdqrAFhYVPf7U
-J6sKc0stNiSsN/bxvKwQZgG3p6JWqTNwn3Qx8nSXMptgnKWdhzVVoVZEdlQYRDW2
-xA43GwtuZFvbdVzYYjNBEbLaHOKJNZTo6uVIf3oojU9RToD3DCk6JgWZfIYMOOVZ
-aN3GzXNLa29Go5vNpnqZcu5sobNXNSYvce1fZmPCHxWrsHP312SSfIeK7bEjKHg=
-=4HzL
+iQIcBAEBCAAGBQJUHqViAAoJEC7dUkA7aK9HqhIP/3Mb34w0aOtPwh4EuptW2Bmm
+JiKY5+uyd5oKV1ae1Hk+a+jiHM482OwKf4/Dyzgcj7dyWb+VJXsD9UToM3U/YiLb
+hOpLggtMdc3L8mKSvEO59n6w6yol65g6y61bDbGc5+nM5Z+vh8lZ2X2K77cJR6qP
+TxIvDolBHe4ukViHFp8D/bsnrlmwAqUSTyEYH865Q5pa/Y1mPf7pKm2PQO1JGcUM
+TkhZKaYAGbkBGRdLayekVAe90pdBsQZgJkwPWO49iKf1/lxgp+ISevfMUsKzoXCx
+u6pH796JVcA0++a6RJZVrKZgMy9j8uKpuu50ApcOH2eMVg9yrfV4Ygj2w/p2MmRS
+qvHNhnGBPCA6choMJi50Nm9WyxdlI+bwE2KK4gy76OQgjSY+1cb2I/ygDmOAyVTj
+uHykm+R8l3LdYeF/0le9JcdjC2rHZuD8D09lXWcTnxDJN7pXGD9LT+8RAee/ZGzN
+FYkL4L9F0eQ2hlbD+wOriZ0TbJMw46ItABKS+oirASXy9IvratlC5uT3lCy+zbbC
+NtE5HwFWjmmPiQOVy2MUyIVeAQY8PATqZmD5zcx996GdFJiw4tjas9GgT32tN65n
+Bam9bXImRDt76s3I93MxOivFwJeEFIv1s/Lw6hsjY3qVXszdiebN7pO7GArovbU8
+in/DOvt/jm0hPTHwI8bS
+=YJa+
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libselinux/files/0005-use-ruby-include-with-rubylibver.patch b/sys-libs/libselinux/files/0005-use-ruby-include-with-rubylibver.patch
new file mode 100644
index 000000000000..0fc84141a3db
--- /dev/null
+++ b/sys-libs/libselinux/files/0005-use-ruby-include-with-rubylibver.patch
@@ -0,0 +1,12 @@
+diff -uNr libselinux-2.2.2.orig/src/Makefile libselinux-2.2.2/src/Makefile
+--- libselinux-2.2.2.orig/src/Makefile	2013-11-06 20:56:30.000000000 +0100
++++ libselinux-2.2.2/src/Makefile	2013-11-25 21:02:05.327561766 +0100
+@@ -16,7 +16,7 @@
+ 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)
++RUBYINC ?= $(shell pkg-config --cflags ruby-$(RUBYLIBVER))
+ RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+ LIBBASE ?= $(shell basename $(LIBDIR))
+ 
diff --git a/sys-libs/libselinux/files/0006-build-related-fixes-bug-500674.patch b/sys-libs/libselinux/files/0006-build-related-fixes-bug-500674.patch
new file mode 100644
index 000000000000..cec91b12829a
--- /dev/null
+++ b/sys-libs/libselinux/files/0006-build-related-fixes-bug-500674.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/500674
+
+random fixes:
+ - make sure PCRE_CFLAGS get used
+ - use PCRE_LIBS via pkg-config
+ - move LDFLAGS to before objects, not after
+ - do not hardcode -L$(LIBDIR) (let the toolchain handle it)
+ - do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it)
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -75,7 +75,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi
+           -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \
+           -Werror -Wno-aggregate-return -Wno-redundant-decls
+ 
+-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS)
++override CFLAGS += -I../include $(PCRE_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS)
+ 
+ SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \
+ 		-Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations
+@@ -104,17 +104,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
+ 	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(SWIGSO): $(SWIGLOBJ)
+-	$(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux
+ 
+ $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
+-	$(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux
+ 
+ $(LIBA): $(OBJS)
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ 
+ $(LIBSO): $(LOBJS)
+-	$(CC) $(CFLAGS) -shared -o $@ $^ -lpcre -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl $(PCRE_LIBS) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+ 	ln -sf $@ $(TARGET) 
+ 
+ $(LIBPC): $(LIBPC).in ../VERSION
+@@ -127,7 +127,7 @@ $(AUDIT2WHYLOBJ): audit2why.c
+ 	$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ)
+-	$(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a
+ 
+ %.o:  %.c policy.h
+ 	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -24,11 +24,12 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi
+           -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \
+           -Werror -Wno-aggregate-return -Wno-redundant-decls
+ override CFLAGS += -I../include -D_GNU_SOURCE $(EMFLAGS)
+-LDLIBS += -L../src -lselinux -L$(LIBDIR)
++LDLIBS += -L../src -lselinux
+ 
+ TARGETS=$(patsubst %.c,%,$(wildcard *.c))
+ 
+-sefcontext_compile: LDLIBS += -lpcre
++sefcontext_compile: CFLAGS += $(PCRE_CFLAGS)
++sefcontext_compile: LDLIBS += $(PCRE_LIBS)
+ 
+ ifeq ($(DISABLE_AVC),y)
+ 	UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel
diff --git a/sys-libs/libselinux/libselinux-2.3-r1.ebuild b/sys-libs/libselinux/libselinux-2.3-r1.ebuild
index be6426bd5514..8662bce6c10a 100644
--- a/sys-libs/libselinux/libselinux-2.3-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r1.ebuild,v 1.3 2014/09/16 23:03:43 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r1.ebuild,v 1.4 2014/09/21 10:17:04 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -17,7 +17,7 @@ SEPOL_VER="2.3"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20140506/${MY_P}.tar.gz
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz
 	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz"
 
 LICENSE="public-domain"
diff --git a/sys-libs/libselinux/libselinux-2.4_rc2.ebuild b/sys-libs/libselinux/libselinux-2.4_rc2.ebuild
new file mode 100644
index 000000000000..8e7599f06705
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.4_rc2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.4_rc2.ebuild,v 1.1 2014/09/21 10:17:04 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+USE_RUBY="ruby19 ruby20"
+
+PATCHBUNDLE="5"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+SEPOL_VER="2.4_rc2"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+		ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/0005-use-ruby-include-with-rubylibver.patch"
+	epatch "${FILESDIR}/0006-build-related-fixes-bug-500674.patch"
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export PKG_CONFIG RANLIB
+	local PCRE_CFLAGS=$(${PKG_CONFIG} libpcre --cflags)
+	local PCRE_LIBS=$(${PKG_CONFIG} libpcre --libs)
+	export PCRE_{CFLAGS,LIBS}
+
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+			emake \
+				CC="$(tc-getCC)" \
+				PYINC="-I${PYTHON_INCLUDEDIR}" \
+				PYTHONLIBDIR="${PYTHON_LIBPATH}" \
+				PYPREFIX="${EPYTHON##*/}" \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+			emake \
+				CC="$(tc-getCC)" \
+				RUBY=${1} \
+				RUBYINSTALL=$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]') \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" install-pywrap
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			LIBDIR="\$(PREFIX)/$(get_libdir)" emake DESTDIR="${D}" \
+				RUBY=${1} \
+				RUBYINSTALL="${D}/$(${1} -e 'print RbConfig::CONFIG["vendorarchdir"]')" \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+		done
+	done
+}
diff --git a/sys-libs/libsemanage/ChangeLog b/sys-libs/libsemanage/ChangeLog
index a7ebff40a8a9..d6fc7b5957f0 100644
--- a/sys-libs/libsemanage/ChangeLog
+++ b/sys-libs/libsemanage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libsemanage
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.76 2014/09/16 23:07:40 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/ChangeLog,v 1.77 2014/09/21 10:20:09 swift Exp $
+
+*libsemanage-2.4_rc2 (21 Sep 2014)
+
+  21 Sep 2014; Sven Vermeulen <swift@gentoo.org> +libsemanage-2.4_rc2.ebuild,
+  libsemanage-2.3-r2.ebuild, libsemanage-2.3-r3.ebuild:
+  Noved to github; also add in masked 2.4 series
 
   16 Sep 2014; Brian Dolbec <dolsen@gentoo.org> libsemanage-2.3-r3.ebuild:
   Add python-3.4 target. Tested and confirmed working by perfinion.
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 36b3348114e8..a4b8e887726d 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -3,21 +3,27 @@ Hash: SHA256
 
 DIST libsemanage-2.2.tar.gz 138208 SHA256 11f60bfa0f1c6063cd9bd99ce0cb4acc9d6d9e9b8d7743d39e847bcd7803bd75 SHA512 09032b1b322fec7346164939ade118034812cb538ebc72121640d4ac5c89d2a66b59caa465027cfbebb590dee039a26d4345eafedf365d7f6ad0b5e90377d50f WHIRLPOOL 49170c5ee9ff57dcc4a15aa72386f37993f76436f0da25808c60dab2d03ba52932d0d4fa753c326900d83d2fae30f8bcf659251f17327783f2e2be3deb4842f4
 DIST libsemanage-2.3.tar.gz 138231 SHA256 03e09e35e611c286e446bef92b6023ef2623815996f5a53394bb02e49a312e4b SHA512 defe3bbdbe51abdaa13a39f693c33446d8a1a8509ac1eb25c7770da2df6487bcb0ca31259d02b4531d4c81db5e221e94e95bec97f6a1a155e1de2f65e6f0da34 WHIRLPOOL 943d4d300aa8ad49c411b10b41c0c3e751c46dbcbbe129bdd1d2e975e231c58391d6ecdee6b27699fff9f6e6facf5b48fc8d57c2ff68692694c7de430750fac9
+DIST libsemanage-2.4-rc2.tar.gz 151013 SHA256 1e759200a4ef10943b3992b86d98004ad5751cf3a43b286cfa0500659debd815 SHA512 b9cfb0483481b68e5771dbb7c08413dbb7f41cfead45971ea98072aaa973723d45f6edf2ff67e909f7376de0c3d0d1e34abf1046e8f1db4607edbf0a310fc52a WHIRLPOOL f9d0abd6ff4f17d71a8c0ea74b3e4b9c3b312517d3ca8a76a4ff5a2c85d92c18f51fe25e069164691031bd121e315a86b75c37ae8281b00422400d265559349c
 EBUILD libsemanage-2.2-r2.ebuild 3210 SHA256 97027d0ced1e3aa603feb38cd4974d43e9d559519b9ff83bdb52d831080d01b2 SHA512 4f543459d29f85c42ef0370e51bb5055342e04382f4b13ca018d47da3af4acf0073bfbe0d8c340dfa00a4f2d69f7acf64df3471da543e46ed7888323b00236f8 WHIRLPOOL c8963d06b370e61c8313c0c6cd4b67ad9a28c994887266817aaa1af7a6d8761c51d9383ebd202560cdf17699d765bbcab70ed7adaa85aacf7645d8d5f656de9c
-EBUILD libsemanage-2.3-r2.ebuild 3419 SHA256 b7a5cfee7222898d1b1a487d9d4b3048af10c355538288b40b7b2cb53271768c SHA512 4b7e41a524b1eedc5b98806e6d671c99c239fb11e3793e1bde16e9f9ae8d0a2d6a9f0e53e602d4d079cba3f71c3c47878428ce1a05022ab72dd6a3133b501e3f WHIRLPOOL 9866968bb090ea33a2ff8276b51b363b3ca8f3b1702a3753333b329256d71f7d52df1a659630bf5f40e5dc1e686f25379dc3b87be96784059c55255554d35707
-EBUILD libsemanage-2.3-r3.ebuild 3508 SHA256 81893fcdd17879208bf15efdd1a38b0407cc04ea0b526d2d01450988c73877fa SHA512 a445a808a8f7f401fbbb19a550bdd3c93ba0fc8e14cc78c0aca1d8030be676811c26dd402d234513c87108a32dfe0eefc1743a29a62901d448f247d32a5fe06d WHIRLPOOL 0573f552b8bbd4e1d4dab6ef3444c0e5f31506e5064a5ebabe228f6b276b59c8875bbac20d1a1d74c4433f6b2b9ed0f85c8fb04cd535bac6b7220301b432c5e3
-MISC ChangeLog 10698 SHA256 5baf1c09b0bce3d66b0e518a2d45650461bb020d6639bb4d3b6bf9f9b01b228e SHA512 b1dc5339021370cb42a7352212289bb7d3cbe656c9d6368abc7c26ad94efa7d19ea7517697ebd44b4450a562a798a2c2f016a2ee0987bad90d4b8048d303d18e WHIRLPOOL df83681b3e5fbb714d2b01882f0cf16eacc71f836cb3d3785b6fb922b596861f5f02b73b133ce726b22b1ac83ade11031ed78ce7a59c03b4aa62800029327221
+EBUILD libsemanage-2.3-r2.ebuild 3451 SHA256 c7a81769d7838df565c99ee28fad062dbdf02311ff41579d060bae7ee878d994 SHA512 3c13ea458d3e803d6ef27c1abb13e5262674291a16a5681007a8f82e32660b907a129403bf20f131e2b2eaf27ecce8b007e7ee032c0e588a43c7f0158ceb1be1 WHIRLPOOL 15a2968969ad36f4213d81c15151a6ea620eec5f21af5ec8de2a6f3357ff9b1446d23e8f2cc17beecd8a75ba593e1ff67fd7f947af703a58851e225882e5e22f
+EBUILD libsemanage-2.3-r3.ebuild 3539 SHA256 1fb1ba032e613d7df00e40e47b6f722b1cb202d5c494736253ceb50d1e154557 SHA512 13c0b8cbb59bb0095e4981080a32d86c7b04c3e384ef6684f013975fd006858c9bb84a99331d4f8874faed9776e3457b899991bf00ee4d6f644b7d2d4280d11b WHIRLPOOL 5b85a12d882867ba4923f981cbfa4d0f421a559129ab14c6478393f72dd64de9d81005f5f124a8ab83eafcd88dda8b0c4fdc5aaf1a3c1e67144150e79136ac67
+EBUILD libsemanage-2.4_rc2.ebuild 3549 SHA256 282783f8df0962d5035954cedaed996c119ae8806fdb40d6e9656543e0b3943c SHA512 dc265873655347c4aed4da4072df9ae047a781b1d0aff042d0fc750f58211c7163081d8a3df12ee28e9e45925fa2de5f43957ad17c0a8f76e4bc819902a4b61b WHIRLPOOL 84058341789f3fe9bec16c2f18d8f67f4cf0a983244da199737d04dc4af1750b8dc5d50e9b1a7a5b2ed08255dae0961df722a45103b576c1a396c1233f9647d8
+MISC ChangeLog 10917 SHA256 71b5006e39c100b2cf7a9f29a656799a6eefb420278eb9a5121c3a427b5355f3 SHA512 8f30cdff1e6287bcb94852e0c35ae2472a0b6e4059e8062da432862ebdadf9243b6f5d00b9a3b3ec1b2642b8d76e77ee5611d257c888c8cd79016106bd2af0f4 WHIRLPOOL 15c53e843c4cebf83f1c546f8dbfd90f2bfb1fc806c1b43fa12914d8b17225b0bf0ab593417c9f298d2c4e2683e24c2b30cc22c221ba406d54407084fa662e38
 MISC metadata.xml 233 SHA256 c5a240155da9b7588e31ff668d3656486a16868654c076f7e1aea823a6b85ae9 SHA512 96a2805dfeebf2e9458e4b602da2cff381f9a3a2e05feb0b36d22b25cac15417e54c8f0572f14f3f944ca7d20377f20ef217ad51105e273a40525b1174df714a WHIRLPOOL 1e68c6d8f1f0446a8be9a001f4c89d641a2055fc9d440be286f753fbf8a216f9d0ed530694f1ff5859a1604eff125316fdcf9593cb91113e4735cc3fa8e8b9a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQF8BAEBCABmBQJUGMK0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy
-MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLsQAH/1rUcZYDS7esgVho6mpKqwS2
-SivxsSz3eWR9AhTxzhI4//jDanW2oVKc1Z38bf8B7o/vMCyQhaiplE/MfEPHcJeT
-DgCRxMI10UwqPBfdObBpCSxH78rnDMQhoM8ooMqJAW6K9YSmvi8gbVCwIdlSx4lS
-5p3NDxiQz8A6JN55SzL2jeEKiThDiqNfMG8kOsG+9PL2jzovgYWTRFk/4VuCBpmP
-zOaRmNyNKTE6Bh/CRsKKQ0wIGYtLrKMHBjaAqBKDeRf4Uqsc8G3c1nDyGL2/6wWz
-IHvIjRF7ttWs513oWgmEgwtTNKzi0KXJOSB9V7upAZr/JvC1dtaXu1uaNT7my4U=
-=N9xd
+iQIcBAEBCAAGBQJUHqYbAAoJEC7dUkA7aK9HznQQAKEslETZoLrxdr9AavNv+xVd
+5x/H/fYuQGCz87lScz7rvq6NfzNucUlC4TS6ICXwerNIgLr6XFlKkZNSaRjo4eRe
+JndrYgSF6t1VxXFgwysjLlRCxpU07CN62acULrkSxFliPC/ebUiMwVdEY0mujQUd
+Rv19nQpyyCJfsYRnO0W+aOx1FOj47JxaDUfwOHYov0S6/iWn9sOzFy+ltlbswFmX
+RnGfYzBV31G+OlQcSBRrq67t4TtmiUODfxnKzottubs8QLg6yEu86e92bnmEnpOQ
+U0YnHs73DNA5t1lGiir16odb9jyJageVsKC59QY679Aljygto2f1BNCiJevvzo/q
+/iCR3zKTb+xU5Gq5/bqcnTYX6COTxf9hpf65rKc3A9eqkze3v3wY7LYC5aFP5Awt
+fyDjA/XKPE3JR762mrh1DHblB0ZqfrX6itw3xaoX7r79t6h+a74aQj+WzcKCnGJi
+UzFP+2Loy9WDxMlN2DCXitqo0JsiO5fUT2mhX9KGVLsEsIOM55BXeWZcszISkQyC
+4b1uPHHLyPmrHu465X+PeDLw4DKlZ7a+6JDyjK0bVqAJc9bDnZgG6MtrDg1czn9K
+g4xy4z0P0SI9IxR3AeDgdDj4L4oX2MkpwocE/D0I/euToiVgza3AcKBtifbt8/zU
+1zycdOrdxl7tZmMluo4C
+=tH+H
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
index 39fdfa021c4d..a2c080dfe7e8 100644
--- a/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild,v 1.3 2014/07/30 11:56:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r2.ebuild,v 1.4 2014/09/21 10:20:09 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
@@ -14,7 +14,7 @@ SELNX_VER="2.3"
 
 DESCRIPTION="SELinux kernel and policy management library"
 HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20140506/${MY_P}.tar.gz"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/libsemanage/libsemanage-2.3-r3.ebuild b/sys-libs/libsemanage/libsemanage-2.3-r3.ebuild
index e6ddd5d0c757..b9a97938c2eb 100644
--- a/sys-libs/libsemanage/libsemanage-2.3-r3.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r3.ebuild,v 1.2 2014/09/16 23:07:40 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r3.ebuild,v 1.3 2014/09/21 10:20:09 swift Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -14,7 +14,7 @@ SELNX_VER="2.3"
 
 DESCRIPTION="SELinux kernel and policy management library"
 HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20140506/${MY_P}.tar.gz"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild b/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild
new file mode 100644
index 000000000000..2f2b29eeb20c
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.4_rc2.ebuild,v 1.1 2014/09/21 10:20:09 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+
+inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+SEPOL_VER="2.4_rc2"
+SELNX_VER="2.4_rc2"
+
+DESCRIPTION="SELinux kernel and policy management library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
+	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
+	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? (
+		>=dev-lang/swig-2.0.4-r1
+		virtual/pkgconfig
+		${PYTHON_DEPS}
+	)"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	epatch_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building_py() {
+			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${ED}/usr/$(get_libdir)" \
+		SHLIBDIR="${ED}/usr/$(get_libdir)" \
+		DESTDIR="${ED}" install
+
+	if multilib_is_native_abi && use python; then
+		installation_py() {
+			emake DESTDIR="${ED}" LIBDIR="${ED}/usr/$(get_libdir)" \
+				SHLIBDIR="${ED}/usr/$(get_libdir)" install-pywrap
+		}
+		python_foreach_impl installation_py
+	fi
+}
diff --git a/sys-libs/libsepol/ChangeLog b/sys-libs/libsepol/ChangeLog
index c402ad495bae..189b6eac65b5 100644
--- a/sys-libs/libsepol/ChangeLog
+++ b/sys-libs/libsepol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libsepol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.67 2014/08/05 09:41:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/ChangeLog,v 1.68 2014/09/21 10:21:23 swift Exp $
+
+*libsepol-2.4_rc2 (21 Sep 2014)
+
+  21 Sep 2014; Sven Vermeulen <swift@gentoo.org> +libsepol-2.4_rc2.ebuild,
+  libsepol-2.3.ebuild:
+  Noved to github; also add in masked 2.4 series
 
   05 Aug 2014; Sven Vermeulen <swift@gentoo.org> -libsepol-2.1.9-r3.ebuild:
   Remove old ebuilds
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index a499d476e6c0..d9a03d84f291 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 DIST libsepol-2.2.tar.gz 209622 SHA256 77a4b27006295805bdbd7f240038cb32a49be1d60847d413899501702933fc0f SHA512 96e489eb29f5256fbcb1a522d3738e0c5f05fff55041989c7c26331987abc71d80ed8fdbe228aadb60248869552c5d62fa5721b6218fb093ad027bfb44fac772 WHIRLPOOL 4d1eeaa0e1964461b0b28de9e3d19e38bb28e386413280c8ef45919906c25abaf575a3ecd0f40dce0de82800d34b5e1c3d5060f1e93d0270e5fe3c3105964305
 DIST libsepol-2.3.tar.gz 209570 SHA256 cc8d8642c3b7b95d6928d65dcbca2ab0627abc1c05166637851e63c1a6eae68f SHA512 5155645642f7f09c7e1d17736d7ce1654c973d1feb9401ee67aad0a96f9bd561105b4ab1f564c60362821985023ac523d20ed40da0e5a52973f7984217ad0d03 WHIRLPOOL 15b19d021c4a52cfdae118a7a1ddd7057722286553a0e1dccfe5d92f0b8c5b1291388b8bb8d37b8f5e51fd162f57708746ccde67d0d9ae035506839cf9ba3bc0
+DIST libsepol-2.4-rc2.tar.gz 569842 SHA256 43303df588d8531d686e76724b597d0d02b7dcd10205201424ed6a3fa0da8632 SHA512 cd22ac9aff7d3bc3d4d462955eb5994f112cf9436e35ceb6f06057cfb1f45d62355f20d33a27409d28d2a4fc08ce5eea1b432f4d4df50b43b4d7388bd61cc889 WHIRLPOOL 5e7ed7c6c2c5222532c60c4dde516e82d06c97e3ed3b3907b9ab4d6c9c55629ffbad4a69e3204c41876c4279e593a157f225bd70e4ebca66eb44ddf07bc484a6
 EBUILD libsepol-2.2.ebuild 1222 SHA256 08c723ba250cd5f8ddd6b01010270d3072a7be7589fc7e25549d8603c0c98d98 SHA512 3e3bcd6304e473b051168ab45d53d191d25e854adf0956cee5e0a7903d123c10caffe1b279a7f42c48dc84d5d1871c39559a96a1473971bae310fc28db12444f WHIRLPOOL 5fc3833e733ee06c892d0a62dd457256ca680e44bbd953f8042346d45df0383d2a339f133b6e5491e1947f53497c27dd21e1e8fe9cd6cdf05efdef9951a501a9
-EBUILD libsepol-2.3.ebuild 1267 SHA256 b2180e83238f7137c4a385ccf835bf7b5951e3252ce97bbb5d136a935dbaa33e SHA512 d8e89904d7ea32da37e6c87f3610ec742901595e4929bbef1f20ec08c0f8206751cf993e03564155bf3b2bff525b8246ebb5bfeea166b41c2ffbb67788f805e3 WHIRLPOOL 8f1ed0eee9a8e2e7e0a2f2926ae5abadaff99ffdd7b5fbb8caf96dcc24a451c3be5d70b95c204a80b491f16b88ce1a7dae2c31ecc4eb220598dc3954e65077f6
-MISC ChangeLog 9036 SHA256 ecc7d9d0538c9d510342b414b7101922c93646727acd6e136a547166135303d2 SHA512 0f5e3ab64108e284ebce9e2bc4b00e9c5f06d31ad003d17112ab3072c939a05e8b1567e9a8f08c08f6b05e62c4bc9759cb59a99277c0d622052dc224b0ca6995 WHIRLPOOL f3a9ea71ce871302ac22b5652b37e4cab6aed251359b3b36bfdc7d36e45c4b391c119ba5e351c6c5236210df9ec23365ad5219fafd27d38f96874ce41253e0dd
+EBUILD libsepol-2.3.ebuild 1226 SHA256 6dac824eb4add323ca26044c508caf12de9a93a332fa7e5c565648961b54c2d7 SHA512 219630436dd903175b5337b7b2b746d47db4877537fff4d60c8df1cb06bcc6f7f837949ec7ed5747357bd05f1c5d6878650e65572aaceec3516a18d333bb54ca WHIRLPOOL b102e0c1eff77c265505d1b96b5f38cb64c1cd00789faae455971069fdab38d6188d576820c1aa54fdb47135a7b4a9e0ed16b1e827ca0aa6448c534cb946f03c
+EBUILD libsepol-2.4_rc2.ebuild 1084 SHA256 f09545febfa9ec70e1a47ac87b8a26e9ba882e8017da57d0908d0ded2ff329a5 SHA512 4fc2d93e4cefc78db6625ef6e56ef288265f044780735ee5f85cd62390fb2c882d82aaa34fa5c78817116c47ef65993895be0082af31978de4cceeeae01b21da WHIRLPOOL 1670171d3b51ddbcc20c9aa374118bb8944a6b1e6c7cb3a94f271b37cd1d7f19c5c20cca4c3f20ff22749f0f93a5a864ca4848ab1bac4dd895cc71284e018eb4
+MISC ChangeLog 9217 SHA256 95a928a7ec7142ac277fa70588e8333ba97b672ea226ca3e25f3565e7365c74e SHA512 ea08f5d5591e456d87ef58466cb160c0c506dfffbf471264aa4c72e640725ffdca9f249f41617a4fd76fcd4a26754805143a46664b5f6456ef6e23a767e45444 WHIRLPOOL a015a4d147553850e0f6069d7b2ab6bc2f8a6078aef2f1b13ae25ae89a6e26779b89f951a579bca1f6e0a40df03164bd948643e76e5dde0b0294830449198f25
 MISC metadata.xml 255 SHA256 34be115c595485e6f130e95be8e55b8cad13a3a80a04b538c42f3544ad0936c9 SHA512 91b84276affda6ab0bc9245150d8004517342b7fad0b2f2804bb71eb6f7ef519f4631a3202a0fa48158421f1197a3ae21f20dc7fe2ded22de32767047d51fc4e WHIRLPOOL eece77047bd215015bb84ffe8c01b657f1c363a337cd129cb4c666ee51ebb8e842101428c4a149bce99683dad69e5848366cca356c2b145be7b811c818010129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT4KaRAAoJEC7dUkA7aK9HbzQP/2l83CsMnnkQSEIomwH9c6jG
-R7my/9Nppmeyk6v6El/DVEA9xGs/Wqzz01NDH8GvDXYycxgVq3V+V9Gm5mfJEOdq
-fKlcQI2DRATqoiI3AJHaa4rYyXX9I9XAb3XNFRfVvmF6zu30HSORE76miiEgQYAb
-FGHAmvOBWTohBDbkDnG0WcGEJt8Z9HI190XVevx9DZx4Jz6obACprVWofGzo9qX6
-aNfWHAOyAwPJCwyRFqCHSh9ZiawDdxUUjiHGfOnmbjq+lQY2JVXQ7zLq6W4fA8s8
-eCMzuYyWC4LIN+V5HtxRTNVBmWCGEmpYRGkN2TYe1WDjhJVJksV33qa/av5XiHRf
-m7qUL7wsBE2xWnNV4XT9czYJ+eAnyo66TK6OM4AI0ttckgefz64OfLvuLcLgLz3e
-dNova5FeSYsWGmuI8uXiObQJNJL3uBFZwkFmSCgaI+cts9Jw/AJuJkkRT6iQDNlT
-D7m8ddq/XMI1feXmAky5TB0CmPVk9Y+UU6CMbMHH2SbqecOE+9sg8unZOxBV1uwm
-7DoX6oEl2Ssft+3Zs2p8t7BsRCS+3x5gyNKSBfwwRWRSD9NJGp0FLyP1r33kwC5U
-lheEiBBDQ6UUf/D3LusDN8S+TxdE9Qn7EDZuIH7rCEltdedBRMhgs1DHrhI32pL/
-96SbQJLsGkoJHHAPZhsV
-=6EEo
+iQIcBAEBCAAGBQJUHqZkAAoJEC7dUkA7aK9Hn6kP/A88yc1Pj/MJG50xfDmOTNKc
+YL6ddHOoIuuOFWEQqVqzjm0FdXRM2RFab38Scl1PVS86TuFFrMATLd2s27HQMfpr
+xomaKFkw9NqwT4Fn4Qgi92bqy7IcRIxfDYKzR0mJx0S5al0JMmcGBWlrFH41mWj9
+Tb6qSyp6GAYffGXdFcjAbIIpdV3ouST5dWJpShedqEepnJWIfJpWm2/2uIP9oUun
+wmuvd5CnHfhTJcfxojLh9mGzv5y0lahEsLSVaIsOq3BYgJO5SYB1quj02J1NkChy
+tQ03YOCv6/lQj0dh+zizVXZr2ROLDa7/0lZzs+d1BFa3ZkOyJIv6Z41bsD+k9Cnt
+XAzkkeCuvafTxZA4Bt8sZH7eGvbePxFg1YXi8VTtEMMFyBFMX+xw1EcmYNHAmQxu
+vxA7xHlcAS4HjeLay5krlNAwb+Ed07XXOC4UuUOUZM2J3wPfXXgI1kkSdmxHtwkJ
+VPthPldRqnWXfO4+52BfWVphiWydEFvefKYMzelJ3oPbMvmLy1j4fkPuhcOtbcfm
+Wf2g1X86oLpiEDuJXLG9zuVGqL/fo9/gJPjEQmIPuPF4KPby9XSgFyzYLe64SFfm
+29jxmYdFUcvtA6/a8GNgaQM9uWGHI+/iRecOWOHUbPMQSn4fHhKIvq6X/SIE5ulD
+WfFFvk0PjYJsBWdQwbr8
+=qL54
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libsepol/libsepol-2.3.ebuild b/sys-libs/libsepol/libsepol-2.3.ebuild
index 49b101bbacc9..a6de99a9c819 100644
--- a/sys-libs/libsepol/libsepol-2.3.ebuild
+++ b/sys-libs/libsepol/libsepol-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.3.ebuild,v 1.2 2014/07/30 11:02:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.3.ebuild,v 1.3 2014/09/21 10:21:23 swift Exp $
 
 EAPI="4"
 
@@ -10,8 +10,7 @@ MY_P="${P//_/-}"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20140506/${MY_P}.tar.gz"
-#	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r1.tar.gz"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/libsepol/libsepol-2.4_rc2.ebuild b/sys-libs/libsepol/libsepol-2.4_rc2.ebuild
new file mode 100644
index 000000000000..e5b5237e79f7
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-2.4_rc2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.4_rc2.ebuild,v 1.1 2014/09/21 10:21:23 swift Exp $
+
+EAPI="4"
+
+inherit multilib toolchain-funcs eutils multilib-minimal
+
+MY_P="${P//_/-}"
+
+DESCRIPTION="SELinux binary policy representation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	epatch_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export RANLIB;
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		emake DESTDIR="${D}" install
+}