Drop 2.2.2-r3 as it has a bug wrt dynamic linking / static linking

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)

3 files changed, 5 insertions, 161 deletions

diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index c8dc89b7106c..5e8041bca536 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,10 @@
 # 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.114 2014/03/23 19:19:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.115 2014/03/23 19:21:17 swift Exp $
+
+  23 Mar 2014; Sven Vermeulen <swift@gentoo.org> -libselinux-2.2.2-r3.ebuild,
+  -files/libselinux-2.2.2-build.patch:
+  Dropping incorrect builds
 
 *libselinux-2.2.2-r4 (23 Mar 2014)
 
diff --git a/sys-libs/libselinux/files/libselinux-2.2.2-build.patch b/sys-libs/libselinux/files/libselinux-2.2.2-build.patch
deleted file mode 100644
index 4a32f5b798ce..000000000000
--- a/sys-libs/libselinux/files/libselinux-2.2.2-build.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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 libsepol static lib
- - 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 -lsepol
- 
- %.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.2.2-r3.ebuild b/sys-libs/libselinux/libselinux-2.2.2-r3.ebuild
deleted file mode 100644
index bb53705ecc5f..000000000000
--- a/sys-libs/libselinux/libselinux-2.2.2-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.2.2-r3.ebuild,v 1.1 2014/03/08 22:11:32 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-
-inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
-
-SEPOL_VER="2.2"
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://userspace.selinuxproject.org"
-SRC_URI="http://userspace.selinuxproject.org/releases/20131030/${P}.tar.gz
-	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${P}-r1.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python static-libs"
-
-RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
-	>=dev-libs/libpcre-8.30-r2[static-libs?]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )"
-
-src_prepare() {
-	EPATCH_MULTI_MSG="Applying libselinux patches ... " \
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-	epatch "${FILESDIR}"/${PN}-2.2.2-build.patch #500674
-
-	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
-}
-
-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
-
-	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
-	done
-}