gentoo resync : 28.12.2017

12 files changed, 76 insertions, 77 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e08f9acbf51f..0836c02de55f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cbrpager/Manifest b/app-misc/cbrpager/Manifest
index 7065c6cb2f5a..eda972769123 100644
--- a/app-misc/cbrpager/Manifest
+++ b/app-misc/cbrpager/Manifest
@@ -1,5 +1,3 @@
-DIST cbrpager-0.9.20.tar.gz 157732 BLAKE2B 0f0597b5a5e26da1f6f0ef71e271b215981cbb4f9f9c63d174ca53f70469266b1d2ca0918712fd19ce2eacbc74111d7e289697740251918760a84e7a59785771 SHA512 6756ce243a4cd7496ae75ff05c8d8cd5de23b6f284b5f214812b3569df8ff9e75fa6157f3d649b30193814669a868ac61fbc1579f9793446aa9882decb9e4191
 DIST cbrpager-0.9.22.tar.gz 146216 BLAKE2B 3396328ea7e017e0cf13722cc8545ce75ccf2cbc0446d1fcebefa02527dc32e3403ed29e456507495ebc3bcd94ce6a42b9b9f574b581952d94bee1efbc2a1ef9 SHA512 dc4bcf14528e6708a3ff0fc3b7e3163dfb9d6063f1cf40545b4f804915afedd9db4cd461834de7ee92fcd4b2f302b7f2ed0d9ae022e220dd8e6c95ccabea34d5
-EBUILD cbrpager-0.9.20.ebuild 633 BLAKE2B b5128672e54f8f087f33cfc5ac1137a802cd3c2d1157a0ae63cda94bded445d95f5435a9e29dd625456bca0e0ced990a650d5eb04fdc0c3b3f136a05cb53cf1b SHA512 a852ddb8d3077bf5f063f27e2c5b442e6d0c3173f9e47616f5d5c001f410a5638eddd653c6e72bd2c6d4e5f93ae6e4368e1916a8123b593dc51734015e5d0367
-EBUILD cbrpager-0.9.22.ebuild 637 BLAKE2B b739478fbb3b445d600a8a5811e5c245ed302ae8c5f03bb74704a07e7578fab2fd9ce9cf14376580cb44d8fa046e268ab7959816831a2e49de27a5c88947708a SHA512 51576f684fabc14a7ff1aa4faa9e8ae76f016173c874a3a08ff913c0547a2c888023ba47109ee03b03090b7e64498dda95629c28cef40e56d052d4cc008dfccd
+EBUILD cbrpager-0.9.22.ebuild 580 BLAKE2B 61f96297dd8ff69b70398e19bf3821ead3b66769a68690bea7cf7ba1fb738b926e604f0e6de9acb0fbee10d83179af1cff7adb93031c6874fdf21e634252b045 SHA512 3c62931298b02360c2fc69d0603c45ad27acb99a82ad48b20d523ad895e4ce2d4a71e88c45abd42a7b5b8c6f88dcf8e4a2673314e7f4bf21db934a84a0baa519
 MISC metadata.xml 321 BLAKE2B d02f200968d8ae7336e01364267000063fdbf1865e5e2a0130f396bae5f7c5be91a84acbe5e3b307c87b77d98229e16c42aa2a70c7356f5ca12bb8c4b7cba836 SHA512 78b81a6c1d3bc153ce6b9e5f3a7169daf841de3705a956721cba492f952f0baa2e5db340d87f0ea18e9d2f2a2a5fcccaac2ff72f095ccc90b48bf3a23857d5e4
diff --git a/app-misc/cbrpager/cbrpager-0.9.20.ebuild b/app-misc/cbrpager/cbrpager-0.9.20.ebuild
deleted file mode 100644
index b2152a59b8da..000000000000
--- a/app-misc/cbrpager/cbrpager-0.9.20.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils base
-
-DESCRIPTION="a simple comic book pager"
-HOMEPAGE="http://cbrpager.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="|| ( app-arch/unrar app-arch/rar )
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	base_src_install
-	dodoc AUTHORS ChangeLog CONTRIBUTORS NEWS README TODO || die
-	make_desktop_entry ${PN} "CBR Pager" ${PN} "Graphics;Viewer;Amusement;GTK"
-}
diff --git a/app-misc/cbrpager/cbrpager-0.9.22.ebuild b/app-misc/cbrpager/cbrpager-0.9.22.ebuild
index 0b183e40451b..71d60c799200 100644
--- a/app-misc/cbrpager/cbrpager-0.9.22.ebuild
+++ b/app-misc/cbrpager/cbrpager-0.9.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit eutils base
+inherit desktop
 
 DESCRIPTION="a simple comic book pager"
 HOMEPAGE="http://cbrpager.sourceforge.net"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="|| ( app-arch/unrar app-arch/rar )
@@ -21,7 +21,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_install() {
-	base_src_install
-	dodoc AUTHORS ChangeLog CONTRIBUTORS NEWS README TODO || die
+	default
+	dodoc CONTRIBUTORS
+
 	make_desktop_entry ${PN} "CBR Pager" ${PN} "Graphics;Viewer;Amusement;GTK"
 }
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index a74eb5feb6c4..28b4eed694aa 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,4 +1,4 @@
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
-EBUILD ckb-0.2.6-r1.ebuild 1011 BLAKE2B d6167e2b9d7c06cd691aa48b6f326e64e1d8dab0525fca3a99630c5fe7b2943a0d64f69764cb13fdd4c306b9551f209001ae1e862a0b19625c607c572009d415 SHA512 61f134be4dfda266a6ae4469126a6b8adc45adde59d42a550a90bc9c2208268806c312ab31a0e3b0cc95ea8c9745e51f20f32703b91723cdbc56ff13221f07f2
+EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
 MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
diff --git a/app-misc/ckb/ckb-0.2.6-r1.ebuild b/app-misc/ckb/ckb-0.2.6-r1.ebuild
index 7bb8d1c6bc51..e9ac7cbbdb3c 100644
--- a/app-misc/ckb/ckb-0.2.6-r1.ebuild
+++ b/app-misc/ckb/ckb-0.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-libs/quazip-0.7.2[qt5]
+DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 81402455e04d..b82312e201c0 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,3 @@
-AUX 0001-lddtree.py-work-around-pyelftools-API-change.patch 698 BLAKE2B 89d5cd05b2d6361887402d35ac68d4eacaa02255bd907f14bcb8aec226afa1552588cebac7cea2a337ee9a8ed828c411df9f8e0879d1a83998f0b756b41cf263 SHA512 0de6faafa5fb7f6d45c42f84cf5f5aec728130507b4231f7bc2b6499481d2caca49151f9eb72bdf82856f771d91972e930871079e6434179492f7cae9463f890
 AUX pax-utils-1.2.2-linux-2.6.32.patch 2152 BLAKE2B d068e7fbcab2ca3c61dc186f28132e9efa063db05a4a6df1c04aef6f978a6ead67d11a867e99ddab1ca78dd024097cf5e805c3dd95ca6320a0617f4ac607a676 SHA512 3a39e08e327e5389fb4a249dc27049a716695bd310197eafc54b62458e167eba53848e9fa3b0aa05e224a8f468fc130b979d0d314ca1dc8cbb0c5c494d67b352
 AUX pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch 2032 BLAKE2B 29af365d08618cc85ad57dce8a041857f1d04164a4b26c6184a2009b02f09b3ed9977c90031d359492dfd947ba09033d76211f310169207171639a5a189567b1 SHA512 b0e0679c726acc56686b23b6d4720cd5b7e4dff3f007e0443e3ec37a434ffb2def2c351c81ef960bf8e1008769662851017ef9aaedc9b52890578db4d313a54e
 AUX pax-utils-1.2.2-solaris.patch 5673 BLAKE2B af1fe089d469029922b09be19fe2e9d9271f9ee7ceac9826282d2eb3461a656f21c96720cdbc8b9c91661ac23327a8e5053ed7675afd47d7d8a037525a6d992d SHA512 df5cecdafe796fa7616767b93def2cd51d82a8911f7b195ca25048fb93a067a819cd362d3f5b4b02308ce67a688938a40aa2ecb04570d7bf3db83cb9847f62f1
diff --git a/app-misc/pax-utils/files/0001-lddtree.py-work-around-pyelftools-API-change.patch b/app-misc/pax-utils/files/0001-lddtree.py-work-around-pyelftools-API-change.patch
deleted file mode 100644
index 7a8b74ea1e03..000000000000
--- a/app-misc/pax-utils/files/0001-lddtree.py-work-around-pyelftools-API-change.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6557b1512ebfda508345e032e09ed85789c16c98 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 8 Nov 2016 15:37:27 -0500
-Subject: [PATCH] lddtree.py: work around pyelftools API change
-
-Section names now get returned as strings rather than bytes. See
-108eaea9 upstream.
-
-Bug: https://bugs.gentoo.org/599082
----
- lddtree.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lddtree.py b/lddtree.py
-index 3971a9a..8480248 100755
---- a/lddtree.py
-+++ b/lddtree.py
-@@ -72,6 +72,8 @@ def dbg(debug, *args, **kwargs):
- 
- def bstr(buf):
-   """Decode the byte string into a string"""
-+  if isinstance(buf, str):
-+      return buf
-   return buf.decode('utf-8')
- 
- 
--- 
-2.10.2
-
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
index 948fbcf5bcab..889d739ba604 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -2,4 +2,5 @@ AUX 1.6.6-ldflags.patch 1048 BLAKE2B 0e67a86bf33ffb3513263f58ec8ad9d7764af054eef
 DIST splitvt-1.6.6.tar.gz 64797 BLAKE2B cc867fe7cf57b541f5d124bb3bbac111e0cd4a4ef835df7c8abfc7e73c1d172f0a75512e54245b395d815308b6bf94d79c8b896099a4af51e8947ddf177e88bc SHA512 a0a0ea2251489f14e2ba7af9bb1b9d309d6fa310f434090d97af2a0805c398731dec45a5cc15c2074af4d3f33b02c5bab019743530619755382af80ff86fa670
 DIST splitvt_1.6.6-7.diff.gz 11073 BLAKE2B 595381265ecd1d7a654fbce4afde5f872e7ce35d3cd44936f78a3c714b7964586d7ec0ec17d986a0f2e6ff9c3e01cf3563b54185f2fa10bebc9ababd174d4879 SHA512 620f3f6e7f22284ef8054e371a87421beeb2ef355b7084748cbd1f7a3a128c9da11f291fdaf1d393010c0f7affce8d6e56a7ae0977d9831b9d3b98963c55c71f
 EBUILD splitvt-1.6.6-r2.ebuild 1186 BLAKE2B 77afd27128bf72eda6bb033e1fdc953f568aa1bde5265702eb28ce00f95e23821f50365796e5808521097d88f060817751f7aa26c5733bbaa9e8bb691996349d SHA512 34f836a3a8ff35ce55e9bc7d2d455d197415fc1f608491d3e3812e3875a669e742fb078f833083c8f58d1d20e8fc3cf4218f1e3f020622a6872b8e070c65326f
+EBUILD splitvt-1.6.6-r3.ebuild 1134 BLAKE2B d57d94d4165ce3c3bb2c2b930c9e27973c5bf55fbcc064ec67e80f06cf9f52b2f7e28d74a0a715b8cb32b046896e43c59b161babd0208658112cdc2a8f8d32b2 SHA512 40221834d1373699c1d811dbb3490afc1f178a8f95981a3cb6b0d52b13c4de5c93587caaaed63ac2b1404e20092f5b3cd003bcb3703e56a1c4a5300eaffdf617
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/splitvt/splitvt-1.6.6-r3.ebuild b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
new file mode 100644
index 000000000000..6fe1ef463d0a
--- /dev/null
+++ b/app-misc/splitvt/splitvt-1.6.6-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_P="${P/-/_}"
+DEB_PL="7"
+
+DESCRIPTION="Splitting terminals into two shells"
+HOMEPAGE="http://www.devolution.com/~slouken/projects/splitvt"
+SRC_URI="
+	http://www.devolution.com/~slouken/projects/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/s/splitvt/${MY_P}-${DEB_PL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-${DEB_PL}.diff
+	"${FILESDIR}"/${PV}-ldflags.patch
+)
+
+DOCS=( ANNOUNCE BLURB CHANGES NOTES README TODO )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:/usr/local/bin:${D}/usr/bin:g" \
+		-e "s:/usr/local/man/:${D}/usr/share/man/:g" config.c || die
+}
+
+src_configure() {
+	# upstream has their own weirdo configure script...
+	./configure || die "configure failed"
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:^CC = gcc:CC = $(tc-getCC):" Makefile || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	default
+	fperms 755 /usr/bin/xsplitvt
+	doman splitvt.1
+}
diff --git a/app-misc/wipe/Manifest b/app-misc/wipe/Manifest
index 3b8b6d8f5853..571e6a1993a5 100644
--- a/app-misc/wipe/Manifest
+++ b/app-misc/wipe/Manifest
@@ -1,4 +1,4 @@
 AUX wipe-2.3.1-LDFLAGS.patch 470 BLAKE2B 76b63c80c561bea0fa5bea750b7eae9c6b07b516c6b4ae7b0949fa3e60b2b9c665afb28d48abf5b1c6f6a97062faec16a8f8145a24a461e71cbecb1d67a75b1b SHA512 e44d409f8177466c22c5a76fcb242e424d4584e587c6a8e25c5d3d8adb976b11a5cce2e0a77b99833a06879a4df3bdb2c71e468f08b7c7b2888b5ed1907dbd79
 DIST wipe-2.3.1.tar.bz2 72297 BLAKE2B e4c15e3b2f64d21d05b915af2c841518f686bec297a6b97eb91b57c1af2e5fb70193f54718ca2f9fa9d04ba684ca21f116b75328695e29f757fe44c62c8504e8 SHA512 63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110
-EBUILD wipe-2.3.1.ebuild 790 BLAKE2B 0051cf2ff6420fbd4db31edd4bc1d0b80c26ef3b7827149365b9a7e0b24ad47e8dff2ee929a1cde851fd1205eb972242a3645db574e245bb48c1706942f5cc97 SHA512 036c6ede08059455baed7f567e98bdb5d7959d435a5dc853fb4708d59b5c9c9f53c233da6bcbd28c174cce8a940bdfdabb1e6d4a5c93c1bdf089677f062170c4
+EBUILD wipe-2.3.1.ebuild 792 BLAKE2B 6f93fee4cc851e862cb3a35a39d27ae66e7cd78221095ce620f2babd641b8d6c6dfd88a493f80cd0aeb316acc00f5b6c8e0306b5471ac1c61deb5e3837e3bb8d SHA512 33d3351e8e5f15481f7c82ca86107d5f97ec6e95ae126cf3f073993223a64b737ed128066446ca5feba1a2ca6834435e7e1de072288e8ff8e6a88f4c80cbdd46
 MISC metadata.xml 317 BLAKE2B 3b1e4414ce9e5ed8fc5e6b88c064937c1b484a1bd39117a3d1709bcae5ab185d66c4879c7e7f18027aa9f5788fe55df1aaabaaf9d2843b7ad15b8ae487e83501 SHA512 d4c733a3d33e0b3528b2fa38555f9318897900ec1a9e4ae35efdf0ffb0ab1af68059786dd9ab99d1d943310829887e8c01954c3c597a752e086a94d513b85e3b
diff --git a/app-misc/wipe/wipe-2.3.1.ebuild b/app-misc/wipe/wipe-2.3.1.ebuild
index c53200bc8276..8775ae458c90 100644
--- a/app-misc/wipe/wipe-2.3.1.ebuild
+++ b/app-misc/wipe/wipe-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Secure file wiping utility based on Peter Gutman's patterns"
 HOMEPAGE="http://wipe.sourceforge.net/"
@@ -17,19 +17,23 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
+	emake CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin wipe || die
-	doman wipe.1 || die
-	dodoc CHANGES README TODO TESTING || die
+	dobin wipe
+	doman wipe.1
+	einstalldocs
+	dodoc TESTING
 }
 
 pkg_postinst() {