Version bump. Add USE=selinux.

(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 145 insertions, 1 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index a3f52238852a..4e22fade203a 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.283 2014/06/13 13:10:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.284 2014/08/10 09:38:03 jer Exp $
+
+*dpkg-1.17.11 (10 Aug 2014)
+
+  10 Aug 2014; Jeroen Roovers <jer@gentoo.org> +dpkg-1.17.11.ebuild,
+  +files/dpkg-1.17.11-selinux.patch:
+  Version bump. Add USE=selinux.
 
 *dpkg-1.17.10-r1 (13 Jun 2014)
 
diff --git a/app-arch/dpkg/dpkg-1.17.11.ebuild b/app-arch/dpkg/dpkg-1.17.11.ebuild
new file mode 100644
index 000000000000..5c15bfedb01c
--- /dev/null
+++ b/app-arch/dpkg/dpkg-1.17.11.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.11.ebuild,v 1.1 2014/08/10 09:38:03 jer Exp $
+
+EAPI=5
+inherit eutils multilib autotools toolchain-funcs
+
+DESCRIPTION="Package maintenance system for Debian"
+HOMEPAGE="http://packages.qa.debian.org/dpkg"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.0
+	dev-perl/TimeDate
+	>=sys-libs/ncurses-5.2-r7
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		>=sys-devel/gettext-0.18.2
+	)
+	test? (
+		dev-perl/DateTime-Format-DateParse
+		dev-perl/IO-String
+		dev-perl/Test-Pod
+		virtual/perl-Test-Harness
+	)
+"
+
+DOCS=( ChangeLog THANKS TODO )
+
+src_prepare() {
+	# do not expect Debian's gzip --rsyncable extension
+	epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
+
+	epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
+
+	epatch "${FILESDIR}"/${PN}-1.17.11-selinux.patch
+
+	# Force the use of the running bash for get-version (this file is never
+	# installed, so no need to worry about hardcoding a temporary bash)
+	sed -i -e '1c\#!'"${BASH}" get-version || die
+
+	# test fails (bug #414095)
+	sed -i utils/Makefile.am \
+		-e '/^test_cases/d;/100_update_alternatives/d' || die
+
+	use nls && strip-linguas -i po
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable nls) \
+		$(use_enable unicode) \
+		$(use_enable update-alternatives) \
+		$(use_with bzip2 bz2) \
+		$(use_with selinux) \
+		$(use_with zlib) \
+		$(use_with lzma liblzma) \
+		--disable-compiler-warnings \
+		--disable-dselect \
+		--disable-silent-rules \
+		--disable-start-stop-daemon \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
+	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
+}
diff --git a/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch b/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch
new file mode 100644
index 000000000000..352161ebb312
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch
@@ -0,0 +1,46 @@
+ - AM_CONDITIONAL should not be run conditionally.
+ - When you have established you cannot build it, you cannot test it either.
+ - Why does it try to build libselinux compatibility _using_ the libselinux headers and library?
+
+--- a/m4/dpkg-libs.m4
++++ b/m4/dpkg-libs.m4
+@@ -92,15 +92,16 @@
+ 		[AC_DEFINE([HAVE_SETEXECFILECON], [1],
+ 		           [Define to 1 if SELinux setexecfilecon is present])
+ 	])
+-	AM_CONDITIONAL(HAVE_SETEXECFILECON,
+-	               [test "x$ac_cv_lib_selinux_setexecfilecon" = "xyes"])
+-
+ 	AC_CHECK_HEADER([selinux/selinux.h],,
+ 		[if test -n "$with_selinux"; then
+ 			AC_MSG_FAILURE([selinux header not found])
+ 		 fi])
+ fi
+-])# DPKG_LIB_SELINUX
++AM_CONDITIONAL(HAVE_SETEXECFILECON,
++    [test "x$ac_cv_lib_selinux_setexecfilecon" = "xyes"])
++])
++
++# DPKG_LIB_SELINUX
+ 
+ # _DPKG_CHECK_LIB_CURSES_NARROW
+ # -----------------------------
+--- a/lib/compat/Makefile.am
++++ b/lib/compat/Makefile.am
+@@ -10,7 +10,6 @@
+ libcompat_test_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_LIBCOMPAT=1
+ libcompat_test_la_SOURCES = \
+ 	compat.h \
+-	selinux.c \
+ 	strnlen.c \
+ 	strndup.c \
+ 	strerror.c \
+@@ -57,7 +56,7 @@
+ libcompat_la_SOURCES += strsignal.c
+ endif
+ 
+-if !HAVE_SETEXECFILECON
++if HAVE_SETEXECFILECON
+ libcompat_la_SOURCES += selinux.c
+ endif
+