Version bump.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 16 insertions, 148 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 4e22fade203a..d48f774bbd57 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.284 2014/08/10 09:38:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.285 2014/08/15 10:05:21 jer Exp $
+
+*dpkg-1.17.12 (15 Aug 2014)
+
+  15 Aug 2014; Jeroen Roovers <jer@gentoo.org> -dpkg-1.17.10-r1.ebuild,
+  -dpkg-1.17.11.ebuild, +dpkg-1.17.12.ebuild,
+  -files/dpkg-1.17.11-selinux.patch:
+  Version bump.
 
 *dpkg-1.17.11 (10 Aug 2014)
 
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 71007af3d3d7..93693c2f1d89 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 AUX dpkg-1.17.0-gzip-rsyncable.patch 291 SHA256 653215618c3713f0a03efba0d4606e6bbe0e51c02ccffae9caf988b0b6500b2f SHA512 c7e0d0f1417afe9bd76bcac7f1f54a775a2a328db558a4431580a4854a436fe1a054840284fb92d22bdcfd266cf5cca71a00e94f47379c9a1862eadad908ed5a WHIRLPOOL 5c4be3edc74fef092612c529e0ff4a8fed6ad96c929d2494afcc2d640ce2e2bff8826cea359ad1515320afd215d6d71394a1f7a0cd928d992937eb9517c41e66
 AUX dpkg-1.17.1-flags.patch 300 SHA256 b0be51022f576bc0867570192ce5871a0da4ca2a66a4e35bafe167d063d84723 SHA512 6dbede2fdde0e28f5e66d77f694a8aabe55b1395ba6a8d26a4808bbe2909cda00946c21a513bbe60b68e76f5669ef08139c72c036f9a16c095e7d702483ed9f4 WHIRLPOOL 66fa84b14d4e26778205c774929c1ef28e3f2ad344af236fecb2a53b1ec409c2a051368febc572f707cc6d18f2b6506d9f662763278b301f0b75fab2dcdaccfa
-AUX dpkg-1.17.11-selinux.patch 1261 SHA256 25d07208f919e22de243d5d8e489091968c326d39a87b52a5934fd9c2d6f9e8a SHA512 874436163694fd3c111aecf48c801778d6cc1f5ea8a826110644af111fb19cbe702f290b6902171a80d1cc96d647f09317f7bc266396356d5ae0aff88877198f WHIRLPOOL b418799ecf7e3bcae8634cb8dc21e161deac7b93e1f095370b3d2532a9dbce5a8d90ffb6b5dd2fd9c81f75c2feae945de34a5c7e56c7e2258de9bffa893e8755
 DIST dpkg_1.17.10.tar.xz 4198340 SHA256 a3a6d4da2b99484c04b2aa8af83d59d87a988baea627d276308467b22310b4d9 SHA512 db4fdd08cf00eeb611759c02eb70285f36d8fadb7d9d5b35123c02181889319ae46e8ec0d051b64f0d5e7ea3c20da63ba7b9015a9aecdba9b2cb3e20f2e87ecd WHIRLPOOL 15be369b0e10bd8f18ad212d03f614feccf612a125227644d39611beac78b0e42971399b1def825ce9c336aa32c07a8740e7180954879bef7940b641ff02169f
-DIST dpkg_1.17.11.tar.xz 4210392 SHA256 02ba4776d2cae24a6908879bf557196edda1ec97d8519d28e877da45f1a3a95b SHA512 a07f0830f65b9bb4f5fab573c474d9f6c974bc9eca4e11d487eac7715e88ff58960dc70d2e2a1e40925c8fef4b0e40e664cb4428d081e03f13f87338b3708149 WHIRLPOOL abd18440f9836a24ab79a361212a0b55ffb9e4ebdc5b90c802be9c06b9727945ee553178f060bb6867b78a608e86da0c8ea4a85a10a85eb26ffa731e9bbb6524
-EBUILD dpkg-1.17.10-r1.ebuild 2233 SHA256 e4fbbcbd9d5091210cbdc53c603ee6f0cafa18061d0774357ab76700dcedbcbd SHA512 67001c89b20ae0556bb408a1a6d5bc86da5e76240e3e1c261a92d4703a9ac3b1ee5a004a4b1ddfb720e47d0af52668d755612e88969301877a70f323f8b49934 WHIRLPOOL e369380be039d43e311c764110d120e766b75c7a8539dc7cbce67ccc805961a42e53286c9ac7d52f9ed8c31fd5b3e475f6ab89b9ac7f0f01b2f73ad154a95c8e
+DIST dpkg_1.17.12.tar.xz 4214396 SHA256 053cdacdc4166dc31160fc7b33a616261796513fdd4a5d4e79d4e972af11a52c SHA512 67dbfc765ec9e937142cf486ba763ae2f17384a7dab433fbf78945291acb4963a3eef336f3db09c2f374ffb1878a94ee69f2569e04eabd9f9a8a9d2808ae2063 WHIRLPOOL 5d4ed06973a7124fa69788701ac3e27df380aae0b7d5fc39772518e4bafd4444937a340ae8d06e35248a0e31c9477376b46a7a95fc9e8f915211bae1b764863e
 EBUILD dpkg-1.17.10.ebuild 2266 SHA256 569ce785f84458c7fefa12076e578901f876e3a87c580271c7e8f3bfa39c81ee SHA512 6283670ca8df670af0e2473e2819ba1611c4a2b37cb5322e824bd897cde5de6e2ba2efa63bf22b08d6fc712e7c3b32ba71f1ce55cc195a41d655574d451e2c6f WHIRLPOOL 2a6b8e06662c21510efba2c7a20ccbe1316a67bb2bfc0a2bc0fc485308048c6b5ea9d54c83112e6472bdc11a1a2d341a865604614b1f36b96a160720e2522a8b
-EBUILD dpkg-1.17.11.ebuild 2325 SHA256 4b521a721dc88e9b1bc7d6fe51e24585134f4b866c05ff4ba177bd3ddbf93333 SHA512 2f01c1db47b76bb2bd9e786d4797ccb2c3338c599ea7705deb905acefdd209525e469f5828bd5cc69df72186efdfbb8be642aa51b98b3ac9e0a85be9b3fc6e4c WHIRLPOOL 8d0eb9850e5e96fb9573e9cfbbed73d10448497d0d4facaae10fb7e61bc053f9fe09b19d82c02a9ad741ef64e237171afca55772e0dec191e05ba29f9b945a6b
-MISC ChangeLog 36480 SHA256 bf61a2817e669633d16ea70468e83ff33dcbbf718afa6c2a0cb314488a92a2b0 SHA512 c266f8d1fb8ee5d665944c65033d684ff0874ca184ccbe1b29c16cfe0dac741b764d506e7889c7fddfa0422c7602a1786e66df6b3af87479d67689549c2cae09 WHIRLPOOL a0ba82bebdb22ada03fc1cde519b56c16ae7ba9ba406964706b75ed7d1dded49166b48f0a08ce50e219d5d8585f7a70f37ced6ad52228a52e5431e31aa3abe2a
+EBUILD dpkg-1.17.12.ebuild 2274 SHA256 f1d484f310ce34bc12ee1ec950f8047ddf42690a4fb1c8975a83d3683c1de2d0 SHA512 5119b8647fca553eeea60e9738df15a5048f00564c124577345df806d8cb870356e98b58db8b49401efb1d58adbde25fb508570c3180c05afeb5550a7d5bc841 WHIRLPOOL 0db36d3f11f9b4489f3641dc4c557d917a4d920ebbed2bfb430b091be5e7f4862d15e3f80e93995dca14329edfc3842923b64530145cc43551c58eb4feb719d0
+MISC ChangeLog 36681 SHA256 6bdcd73811059fb96f8d7a29c04d0e43a1150742f78ede4889c8c0911d042a30 SHA512 13dd98b18fe61a0bc7c1d4c09eb82a3160c53967564cbf2ae3862800daa6d7c80c86f30eb90f5d0ec47c4743eba7e87b0edb045065a107a7a8b002c64e213646 WHIRLPOOL d0bf53b36cbd41babe7e517af44963006da56786ea46ddb9f1f1a53981c77abd2a4adbefaf11417b2b01f7e9717b7de282b407b51bcf0a7503aa019a6b0cf8c7
 MISC metadata.xml 317 SHA256 f48084abf12897b2bfb8c8deed589e6345a0d3a15920fdeb88ed1cb93075d65c SHA512 d9331f4e18aba133de8bea164c2e9d9595985bc5d700a16d43d95b178477059e4f509bb4ce94443892332f86e6f939b2a0609c2debc2597cb2f45b21931cbcb1 WHIRLPOOL 1fe30c423435f91c30831d7f766ebd86644c98de32ac7296d5459c0090b7c71af4d7d25efafef6c0d65a6b824311f0e1b004db50487ff27a4d9359e0426a2ee4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnPXwACgkQVWmRsqeSphN3bwCfVzgTJenHqyYwZsyjcXGOTKDj
-15wAnicVhiAHR2yXTaMdS1sooN2p1qR1
-=qABG
+iEYEAREIAAYFAlPt22IACgkQVWmRsqeSphMeZQCfQ00sO55+tkYSrRS+vXga218s
+ffMAniT7A8K6QfpNkxG+TuOVUGZwI7Vv
+=kYRb
 -----END PGP SIGNATURE-----
diff --git a/app-arch/dpkg/dpkg-1.17.10-r1.ebuild b/app-arch/dpkg/dpkg-1.17.10-r1.ebuild
deleted file mode 100644
index 92f2957cae3d..000000000000
--- a/app-arch/dpkg/dpkg-1.17.10-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.10-r1.ebuild,v 1.1 2014/06/13 13:10:59 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 test unicode +update-alternatives +zlib"
-
-RDEPEND="
-	>=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	lzma? ( app-arch/xz-utils )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )
-"
-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
-
-	# 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 zlib) \
-		$(use_with lzma liblzma) \
-		--disable-compiler-warnings \
-		--disable-dselect \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var \
-		--without-selinux
-}
-
-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/dpkg-1.17.11.ebuild b/app-arch/dpkg/dpkg-1.17.12.ebuild
index 5c15bfedb01c..390aebd69a30 100644
--- a/app-arch/dpkg/dpkg-1.17.11.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.12.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/app-arch/dpkg/dpkg-1.17.11.ebuild,v 1.1 2014/08/10 09:38:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.12.ebuild,v 1.1 2014/08/15 10:05:21 jer Exp $
 
 EAPI=5
 inherit eutils multilib autotools toolchain-funcs
@@ -48,8 +48,6 @@ src_prepare() {
 
 	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
@@ -70,9 +68,9 @@ src_configure() {
 		$(use_enable unicode) \
 		$(use_enable update-alternatives) \
 		$(use_with bzip2 bz2) \
+		$(use_with lzma liblzma) \
 		$(use_with selinux) \
 		$(use_with zlib) \
-		$(use_with lzma liblzma) \
 		--disable-compiler-warnings \
 		--disable-dselect \
 		--disable-silent-rules \
diff --git a/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch b/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch
deleted file mode 100644
index 352161ebb312..000000000000
--- a/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch
+++ /dev/null
@@ -1,46 +0,0 @@
- - 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
-