gentoo resync : 30.12.2017

42 files changed, 545 insertions, 134 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a773459b746c..c43e8263c1e2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index 89e05954f8d6..52036f6a8a60 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -1,8 +1,9 @@
 AUX Makefile-r1.patch 908 BLAKE2B 998f82d8fbce9d1d993574f27a8f0fb87695140afe2d0e181202ba6a121001e0850ce85696310e2c69223135d58c4361e436fb8597d8900e5d3ad242c24a580a SHA512 09303ec59ebdefa0b5033e55b635c0451f176696c64bdd7e06dbe68efdf3cfb869da4896a09be1e9730da0350ea88fb47302c36b516d45ecf8ca178cc648938a
 AUX Makefile.patch 350 BLAKE2B 67a2e4b01be33fa0151f018b06a80711e4c68084fc5ecadbfb4df8bccbd91b370318cb891e9f799941bc96832fbb69c3db4d724f7697f165c9fd7a823e5847bb SHA512 39431930173e0a2eb6b771623d15aa70bdd0bc90cb01b2d64893ca4fec0d0019d4900b39e4a31c09524d921d9f1f0aa6f0312bb50bd430d6950dfda78455b5cf
+AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 DIST afio-2.5.tgz 179184 BLAKE2B 2e4e31b27ce7c7cc60ea81d6d7101289e8cfbe4ff6a52c185abef482e06d233c739e60d40bc2ee35c79405606e5cfe27746813a8e74dbbe1b407d4092707aee5 SHA512 8e8fba115989b60284d09fb37b8f4782b6adc4a0887a05544615a38e62c6b3a48c3194b53ea4496fea64b25d420ff89cf6faab31646998f3612082118fcbb052
-EBUILD afio-2.5.1-r1.ebuild 675 BLAKE2B 89d79cf2da6593f87fdccc6fb0adc4c242a04998a6c230ec912e3bf038b52a0e24de6ad86f986d3125a28dc664ecd4b3d6d2ec1bcbad5941cb31f05a78f7a63a SHA512 c8e90367f959c7505169f3df268933c6756867ec6aadea04444bf17a8b79512e7e5c58408fd3d9326c8f5d1f3013919515b4dfdd81f09a889ff37521371e8c3e
+EBUILD afio-2.5.1-r1.ebuild 691 BLAKE2B 064eb754b4257839ab92953a2daa90611014c1714f3c30df2eeae4c5f7cdb525ffa786834a1235028c696ea1b9917a47922fbd66de78e59cd83e47a261c17155 SHA512 f058255a379de4d9c2ca78c2b0c860ab0cd36c87daab8116d35120e8f080591539e96e218a7983c692858cfc534bb0bf361f8428dc16e4640f2c9976448ea60c
 EBUILD afio-2.5.1.ebuild 666 BLAKE2B ec8dd3cd9796a9a865c3d6ef985ae57e1ed2aefe1d86a4ab1141a0140edfde4863428c20848562c2716fbba84f91ccc8f92f5d3ba7a7c9adc80429ecdb789b3d SHA512 f1e396c6fa251be9a1753af5c0bf979af3bc348d9b6bb1d33c6ba048e73436729df9ff342a67e55ca72689cdb588fa3b8f3db533b5b99b4ed7a61d78ce483cf1
 EBUILD afio-2.5.ebuild 929 BLAKE2B fb37adb79739b5c0b5ce8fc9bb725f41ab7074c9b0ad8f2751bb682ca086d0cf350e6233f5a57835ffc0b9d760695ddb0767c9ef7af76d7b1f3dde82a5764356 SHA512 884f402c47f65285a694885626ec5250117ee2d988496d4b4c631ac3708b3fba00e254bd54ec25855782225640612f1355889fb0ae1b15c2daa0f93627f4e2eb
-MISC metadata.xml 580 BLAKE2B c60974a6f45a50aee82927a71b9f063d3724b1437ff592cca3014e8197415ea8d164047840ac7d722c312d4b0e0972cb9df25e08bde5a6c8d605804e7aa43f66 SHA512 b13cf166120b3dff08a5977e1f72b3e14d689b893b055892c86c9060cba94ef0b640208a00439dc377432d0d2d2115462e75fb0883a7566895770674faacceec
+MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r1.ebuild b/app-arch/afio/afio-2.5.1-r1.ebuild
index 0c3a74af973a..d5037ac66c3f 100644
--- a/app-arch/afio/afio-2.5.1-r1.ebuild
+++ b/app-arch/afio/afio-2.5.1-r1.ebuild
@@ -11,12 +11,11 @@ SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
 
-PATCHES=( "${FILESDIR}"/Makefile-r1.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch )
 
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC
 }
 
@@ -27,7 +26,7 @@ src_install() {
 
 	local i
 	for i in {1..4}; do
-		docinto "script$i"
-		dodoc "script$i"/*
+		docinto "script${i}"
+		dodoc -r "script${i}"/.
 	done
 }
diff --git a/app-arch/afio/files/afio-2.5.1-fix-build-system.patch b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch
new file mode 100644
index 000000000000..5f3e8355c1a2
--- /dev/null
+++ b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -71,15 +71,12 @@
+ MW=
+ #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
+ 
+-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
+-
+-CC=gcc
+-
+-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
+-LDFLAGS =
++CC ?= gcc
++CFLAGS += -Wall -Wstrict-prototypes
++CPPFLAGS += ${LARGEFILEFLAGS} ${2} ${3} ${6} ${8} ${c} ${d} ${e2} ${f} ${g}
+ 
+ afio : afio.o compfile.o exten.o match.o $M
+-	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ clean:
+ 	rm -f *.o afio 
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index b232df5209c8..1d91069b9e13 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-Afio makes cpio-format archives. It deals somewhat gracefully
-with input data corruption, supports multi-volume archives during interactive
-operation, and can make compressed archives that are much safer than compressed
-tar or cpio archives. Afio is best used as an 'archive engine' in a backup
-script.
-</longdescription>
+		Afio makes cpio-format archives. It deals somewhat gracefully
+		with input data corruption, supports multi-volume archives during interactive
+		operation, and can make compressed archives that are much safer than compressed
+		tar or cpio archives. Afio is best used as an 'archive engine' in a backup
+		script.
+	</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">afio</remote-id>
 	</upstream>
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index 2396357d9e06..e627c3859a22 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -1,6 +1,6 @@
 AUX arc-5.21m-darwin.patch 268 BLAKE2B f353d9a5cfecb4c434cc65303190523fdc0a8af159c0e2d8ae6b13d19597611a12a55a983723b0b54f2fde737d6a1538c7757dc4cb2aaf8a6014d4e4a05a836e SHA512 1250a494f793d899286989f6715a504f22b651f60019149ad1b4b4d423ad2d59fc948bdd317e773ea99bb4f52f79771450a9e69263c994c7cda79bd3bec5e94f
-AUX arc-5.21m-gentoo-fbsd.patch 268 BLAKE2B d4a439e9b270dc0666acf61d487d5eaa36ebd1552d210da67f5f16fea1667b7d9ccafc78a75e6f6aa0b7932a0508026c16c453c6a925946801cfcb194649045f SHA512 252e57b2391e2487a4be411133da12e53cc52611b1d30ef74c7cce2d926fae08a72e4f3989f13d36eaa9dcbd44ac37d2ca5add3a438a35a662cdef02aefcad73
+AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
 AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 858 BLAKE2B 049eb8fbc405bdb3788cbd2e51bdd202801ff7df13130f2d3171e241288a219d89b07d5095c21b46402598fc9285144023dae3ff1be1710f9ef043e30121a317 SHA512 056a3c4746a45801bf41066fac10d343e8313e961af3e738b4cec4537dac414038e58e7c064a9d061f8926ec85766de69dd63f9694c064e6a72d7503d44d84a5
+EBUILD arc-5.21p.ebuild 845 BLAKE2B c3fdb7752cfccd76653e7ed12fc8ccffc41bfb53d2102b646f54d60dc4608e07be997449a694b54445d25a0b0620cd56694f6b4e5a1d554467633db3893a1008 SHA512 c17f89ba7b4155aa00c0c2f3ea23249148047a312153822b5ce33f34f0e91c8afbf2f52d09369bd2366047ce6508d475b3ca9c985b069f3b1d029f2575583594
 MISC metadata.xml 356 BLAKE2B 8f18c0ad0004f2b5a4ad4d35cb420a709bdeaaba374491c58e19ceadc06b6bccdb54419cb4c93985498e9b99b33417d2cecfe26db6228cc500a407e172124f2f SHA512 22f42b35b8c8ad43bac261820902eb8fc9835c2ed1a96e75a56fc97e0732060e6354e9485458f928177f201f7f6ebd9e75c7cae9a1cff4b376b997d3c3f20d18
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index 5cc46fabebae..21daa1b15601 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Create & extract files from DOS .ARC files"
 HOMEPAGE="http://arc.sourceforge.net"
@@ -14,17 +14,22 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.21m-darwin.patch
+	"${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
+	"${FILESDIR}"/${PN}-5.21o-interix.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P/p/m}-darwin.patch \
-		"${FILESDIR}"/${P/p/m}-gentoo-fbsd.patch \
-		"${FILESDIR}"/${P/p/o}-interix.patch
+	default
+
 	sed -i Makefile \
 		-e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \
 		|| die "sed Makefile"
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" OPT="${LDFLAGS}" || die "emake failed."
+	emake CC="$(tc-getCC)" OPT="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch
index 552bfd14edd7..f2762f74b9d2 100644
--- a/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch
+++ b/app-arch/arc/files/arc-5.21m-gentoo-fbsd.patch
@@ -1,5 +1,5 @@
---- tmclock.c	2005-09-21 18:39:57 +0200
-+++ tmclock.c.new	2007-06-16 15:58:26 +0200
+--- a/tmclock.c
++++ b/tmclock.c
 @@ -18,8 +18,10 @@
  #include <sys/time.h>
  #else
diff --git a/app-arch/funzix/Manifest b/app-arch/funzix/Manifest
index 873ba1f65b10..4d69293a899c 100644
--- a/app-arch/funzix/Manifest
+++ b/app-arch/funzix/Manifest
@@ -1,3 +1,4 @@
+AUX funzix-1.0-fix-build-system.patch 113 BLAKE2B eb18a424d7f3e029f42c5102bf63f0b6e54dad213540832bdc4e4fd99fa83d52af891792248218608bd4f9883d9e2c76b3722303d54424e17b019a069235f071 SHA512 21d2f71a792ef23a501e691f514dbc4dd2c549542f6c1426bb3fbfc86d41cb97916295384a24075a6b10304a8c913b0379ae46ed42c0f87b4838dfa0b6111ddf
 DIST funzix-1.0.tar.bz2 10792 BLAKE2B d7d6035e558cf6501ee84626f9720dab9d44eb87fb3cedc72721ff491c8535ecd913935b1c9618b85c471b3443a7386485b9bc01c7bd09e01752eda8261b9690 SHA512 30abf29571df7be4a1e92270cb3b4949244f5e50b088bc128c8ac63da88c244f0fe810b4d05b76c68220576b06a1c47e84a3f3339d82a4f0e35a841b29ec4c2c
-EBUILD funzix-1.0.ebuild 456 BLAKE2B 286240173835c7b262aac464890513e2a8aab4af6b16ad3ecb1dc5c32127acbdf778c2d3f8da413b3aa703304e3abde9e557230f33f88d740b9f586185c82d48 SHA512 48815f2f4cd6b6744fb0c7ba86b403b5987369176f87f60d26d0125f1c42703b5128a71d4a2bb2a86db0e2c24e6290a38ef2d3f17294db65696ab3d8989f2d20
+EBUILD funzix-1.0.ebuild 487 BLAKE2B 9ab5c04537139bd95d7cc27c3c7f02d276e1d476a2b36a0b4530012146c420b3e9ba9591ce952ab3aaa575715c7a7b17d3e39f7620bf70c37008ea272610ada5 SHA512 e8b5cd0a598d16026cf87b80e95c97556f09f6f5df3ca068d60d8fb029680a8efaf1807accff4f9d5b669c4fc3fd77319d91b26822e119abd3084747685bdaa4
 MISC metadata.xml 243 BLAKE2B bdd58ee3763af689265c063ddc89e4ed90465bd520910a43e92e5d2c85aba25732a8224063b6efe0fa2891578b80ab490bd7389022cca63b6bf962c05893e0ad SHA512 1fc5c4b9fcfc9ecf016a6997a0a7fe145d2819b63bea1cc18ac8489245b347ccd41f10b1d826f6ba4f14d321308a87a51871cfcf6da3c73d80640ece101a348f
diff --git a/app-arch/funzix/files/funzix-1.0-fix-build-system.patch b/app-arch/funzix/files/funzix-1.0-fix-build-system.patch
new file mode 100644
index 000000000000..1fd5482d4dcd
--- /dev/null
+++ b/app-arch/funzix/files/funzix-1.0-fix-build-system.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -Wall -g
++CFLAGS += -Wall
+ LDLIBS += -lz
+ 
+ all: funzix
diff --git a/app-arch/funzix/funzix-1.0.ebuild b/app-arch/funzix/funzix-1.0.ebuild
index 9d479a6c8eff..8f62fd7801f6 100644
--- a/app-arch/funzix/funzix-1.0.ebuild
+++ b/app-arch/funzix/funzix-1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="unpacker for the bogus ZIX format"
@@ -12,11 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+PATCHES=( "${FILESDIR}"/${PN}-1.0-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin funzix || die
-	dodoc README
+	dobin funzix
+	einstalldocs
 }
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 8a246c39de5a..f58cb20c51a9 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -3,5 +3,5 @@ AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af4
 DIST makeself-2.1.5.run 38210 BLAKE2B b3e68e1c12cfaa2fb66cc53104fb0ec8148b93fac3a26a7e4e5de64672fca5709edd500039a9ccad5e8a6031997332e1096fe6dc5e92fbe83663aa1f2757dc15 SHA512 c556770deea504573c50bc7c15340ed91c65d372e93c47dfc10fd6e8265b2462842da12b36898d4291cbac9e954ec12f2f6972bcf40e97ed82dbd22af21d3a91
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
 EBUILD makeself-2.1.5-r2.ebuild 611 BLAKE2B 48bf67bb209957e2c5358f4b6d1e568fd8cdb9a285e636b0dc0cfa0c0583d815724f26e573cffd36d61ba29b89f85a979896ea1c773408a5dd33fdef7eab4e46 SHA512 15fe5dd43cc8ad08ce85839797acd99d17e7ddd2981eb13a05e266c4f90c232e72990186daaa78e81e6795a9fb49cff86dc52ff6d18569dccb6be5c4c235148b
-EBUILD makeself-2.2.0-r2.ebuild 717 BLAKE2B 83e8eebcbbdb395ca1c25c809288eb250093224892da5373489e3241f5eddffae6bf3ea025b87a6b67c1192897df23d8ed8a30db24542eaa79910aca36f2f94f SHA512 df0e06607383abc05b0f3c2be8fa4cef9a597574501c7e1f8baea8feda55144448d6dbea52aa107c441dc6d2acfb80872dbe206e797d7f9b1a3de6ad2d8400a8
+EBUILD makeself-2.2.0-r2.ebuild 716 BLAKE2B 80f733052775326ebc5022488696c9a019e1e4151fec02e8cee4febf7313824c8bb6a3f05bdc1ebd0aeae7c09c05dc1973f2aff1a474c06d7c06a8ad6fcefe1f SHA512 4a7bebbf19f7399b078306b26a3a4acb2e9c1c212f7034114ec69148a2042072015fba630094ff0b043c7a1ca2283f7b34ba7112318bdf9acf9adeb79621029b
 MISC metadata.xml 254 BLAKE2B 3ab17d846132717878fe0587992dc65ac209a16e145e687773a2221f2ea17cb0568d03b4c3b20954ff4ad7deb6e15ead243d5b0410742c2c4c7dd24c56d69081 SHA512 fb782a70e1be3e60d1cc5465b54e05eb5eb3956d281d0951cc53a7b0f320255bc0ec62ffd08b18c765dd6ee0ad3f8c364c93c52ea884375f2782a1bcb90fb9eb
diff --git a/app-arch/makeself/makeself-2.2.0-r2.ebuild b/app-arch/makeself/makeself-2.2.0-r2.ebuild
index cdbdf7c7a640..52c5aa12b2c1 100644
--- a/app-arch/makeself/makeself-2.2.0-r2.ebuild
+++ b/app-arch/makeself/makeself-2.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/megastep/makeself/archive/release-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-arch/par/Manifest b/app-arch/par/Manifest
index 9b764566184d..78b88788eba0 100644
--- a/app-arch/par/Manifest
+++ b/app-arch/par/Manifest
@@ -1,3 +1,4 @@
+AUX par-1.1-fix-build-system.patch 320 BLAKE2B a26b6d38129771b727fbd68340033303643f1214a1df0fc72a14d953679a0ad3161d6fd60264ef656fa330555d339b28e697ff5eabd2a759a6fdfe95bdf5d1ab SHA512 a9d802c3a2e60aa7e3be3dfd3f43365b46f3b6e8ff25ce2fca953df6db0fa97c42510665f6b191b090c267be8ab51e317e5d8df573db11a0cf72b2ade5bf5a64
 DIST par-v1.1.tar.gz 40959 BLAKE2B a15a7addccf1edb036e73219cbd6c9f92ecc41c7cda16136f5a703e812d56bf8a84a31681c0fd02b9bd5e8a29ca76e4c9c61b8f2752104c8891ac9416bf169f7 SHA512 539be3cac0513429f44c9d53dcd61afa02b1e5a2935def3164398577882f47199b5a393f21ed6a1d6972409034bb0a7b63f338d69aa1fcdd3655adaf5993b95d
-EBUILD par-1.1.ebuild 725 BLAKE2B 5240904752f48fa8bd578f5df8c7a781a52fc0e271f0001151a7e1ba7b36f86782f1a87fe1d4cf831cf506b412a6d14f525e708c0f83dfe80a19daadfb3a7676 SHA512 9af4730337f01df83edba8c9e2c225fa8dbf8594960e6bbdc4127cc2e04e01c1e2d62ecf4b08722bea32074fbc04c0ab7b8949672bbb9ebdecec339f500a2701
+EBUILD par-1.1.ebuild 613 BLAKE2B 2295b899a7f2fa5344468b2b511ec05ac131da2de6ed948be2f92b24c5aa0fe10ce1b26c1a4b8b13663104a963cc0a063f5818f7fcc67143b36d1d5d2b58ad15 SHA512 a7487d67500a9be2dbf7ff37c28acdfd59e25e8590d93f8ee7c01ea5741e06fd8d8aaa26479a3d4ac9213a15dd8ba8a839e75c4cebd43898bac4913134403594
 MISC metadata.xml 245 BLAKE2B 2238bcaede7173c554f122293f371ef5fdbc9fcd11c670a5a729505e1dd5e9d676c42870c7cdedb3d4d60cd82575bf110d8398657d3af32007138d201b45faa6 SHA512 023dccf92d6be9a5ccefa97f75d1d4df7a5590ec62f5969e24f45ba12be7d2128e0b2bcf0e5a0b59e2616d586c830c58fa43535d17e38c00b896b05490ecdf42
diff --git a/app-arch/par/files/par-1.1-fix-build-system.patch b/app-arch/par/files/par-1.1-fix-build-system.patch
new file mode 100644
index 000000000000..30361579f226
--- /dev/null
+++ b/app-arch/par/files/par-1.1-fix-build-system.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ 
+-CFLAGS=-g -W -Wall -Wno-unused -O2
++CFLAGS += -W -Wall -Wno-unused
+ 
+ par: backend.o checkpar.o makepar.o rwpar.o rs.o md5.o fileops.o main.o readoldpar.o interface.o ui_text.o
+-	$(CC) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ clean:
+ 	rm -f core par par.exe *.o
diff --git a/app-arch/par/par-1.1.ebuild b/app-arch/par/par-1.1.ebuild
index a0bb3fff9ad7..63ac82a7d472 100644
--- a/app-arch/par/par-1.1.ebuild
+++ b/app-arch/par/par-1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -14,23 +14,19 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND="!app-text/par
+DEPEND="
+	!app-text/par
 	!dev-util/par"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/par-cmdline
+PATCHES=( "${FILESDIR}"/${PN}-1.1-fix-build-system.patch )
 
-src_prepare() {
-	sed -i \
-		-e 's/\$(CC)/$(LINK.o)/' \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin par || die "dobin failed"
-	dodoc AUTHORS NEWS README
+	dobin par
+	einstalldocs
 }
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index e44faff6c8a5..311de1944c0d 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,5 @@
 DIST pigz-2.3.4.tar.gz 105412 BLAKE2B 821fac7cd0f113ea81b284c1df5d464c2a2bf8f88742ee432eb6fdc31d097983983f22280a52dda04c3f1735297af690bcebdfd70679560525a5c3731652695e SHA512 c0d5da6c5b2da50841aaf3958d5694edca0356d4bef211175e9f2f17e0c815e80b2e62bb39c7761c8f83fdaa84ca7373e130cdb0fa2c96f91c397556cbf7ba2a
+DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
 EBUILD pigz-2.3.4.ebuild 939 BLAKE2B 758fe8bc5d39191bd4b3fe7ce27097e5a2066a102b33ff2985b7efbf528ffd407ae1512f93468c00629761d327879b4916a6efcf5dd901dbfcbc93c051036aca SHA512 302e35b9d71cc701aa80e51db4f15bb59ca2e539195fe15d765249cc7bad3e914bb5e0786a2c949b1916373a4d53f60fe009c58e1b9f4e2a4f43d4e697ca1804
+EBUILD pigz-2.4.ebuild 944 BLAKE2B f1e8735848abf2191d33d49d7b82ce5282a61729190f6ed50b189404d25b77bcefb6f37b6c8bbba1e4103cd8918795bf4ed0ba4ba1d339b27b48c26e657c6084 SHA512 9f2c44c679e867d4d813d93f975a0ed9de6cde5be6c0844c2b414593cc49bc03680bb075ee821c1b18c45dfaed540d976aa5c02e38404179b877f3ae93bf8109
 MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
new file mode 100644
index 000000000000..631e27619c32
--- /dev/null
+++ b/app-arch/pigz/pigz-2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A parallel implementation of gzip"
+HOMEPAGE="http://www.zlib.net/pigz/"
+SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+IUSE="static symlink test"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )"
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/un${PN}
+	dodoc README
+	doman ${PN}.1
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/gzip
+		dosym un${PN} /usr/bin/gunzip
+	fi
+}
diff --git a/app-arch/pure-sfv/Manifest b/app-arch/pure-sfv/Manifest
index 02d8d0696196..ddb4fb155873 100644
--- a/app-arch/pure-sfv/Manifest
+++ b/app-arch/pure-sfv/Manifest
@@ -1,4 +1,4 @@
-AUX pure-sfv-0.3-asneeded.patch 392 BLAKE2B 22d00d12d38456d9d547dc33c03477dda9b8f2e8f0a01f6643dfe04b39d8d33e7995287f731b17dff5a514db575dd858b7099d2bc2499a29860a162595ffd6c2 SHA512 74ce8a8628e2d0571556301ac8d0ec46ad7f9da50fe515197eb6ba81d9a7b41da1f4886e6d7b7fe6e411688bfec00296ce2f18c742d224e80bf1a8b614a0672a
+AUX pure-sfv-0.3-fix-build-system.patch 517 BLAKE2B 87fddfd692c2d21ba5369ed57280d7b56568bae03396d9702e963285d6346a95693b049ef046c68a5116c7dd98e50444b1a50419c18fde99be0e67a142b775fa SHA512 317527bbf283ec603d06cf4705adf04915d57d7251301403dc43c359359f644728f61ba0997b04753f5c1c820341d5e0986ad0e3fb8c93a932d2000c9fc2c207
 DIST pure-sfv_0.3_src.tar.gz 79069 BLAKE2B 77bfa8ccad35a9f3bde4a5710deceb9e0786e905cd0ff44903b08154043012849c7f5f797806429b9005aa6977e23c451cd1cfeee2870c35298248d0783a078c SHA512 defacdaa0b78f708c83198e911ad93a5c5456bf15e2b33df61c984241df8a82ff4d962b8c7994c6413b36a61df2cc6d91c467bf8994fa43e0ac01db2585a78a6
-EBUILD pure-sfv-0.3-r1.ebuild 681 BLAKE2B 404ab69d02c14a7d3f516a590dba16f3c4149748820b8b64f7a864bfdbaafa4a0d16d4f47100b663496682d0a8e927240ed15059956aaabf7333dc8a8a9bf6b1 SHA512 ffc5d677fe40682bf744968c1ec7b21633c888f470eb0efaeefc2888d398d102f332e80587254a77693d9e5ee27e1aa9fb8fd7ded63d64fb1e0453c8fc867e0e
+EBUILD pure-sfv-0.3-r1.ebuild 618 BLAKE2B 2eb5441f25c272303a5135009948eba2123fa7c65db8f512ceca160a0163dbd538dea456aa1b3a59e61797ba20d069dfdfbbef3971924df2a57b981fec4dceb3 SHA512 085a72af3f963aa2a5e9a6eb53ab191e4fb055e851bbc758209a285ca48a5450b6979d4ff081e774e4649c69977b385f198b944da2d5ec098118145c1d05622c
 MISC metadata.xml 245 BLAKE2B 8b7fc4825aab5e4cfdb98dbb19741e82e1f550601f15430d7ef70ea99e7d589cac19abfb8e248252be008b25820fb6de7b23d80cba84301e823e313fbb848a25 SHA512 4423c18a453e8c9b251ccc387341ffa1e1f492c2b0408d05b3948b94fd8f135145740bb9a04862d5f567c931c50c113f685a08fb10667ed1fcd1a005cbbe46da
diff --git a/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch b/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch
deleted file mode 100644
index 926dd1318bdc..000000000000
--- a/app-arch/pure-sfv/files/pure-sfv-0.3-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2009-01-03 18:36:24.349399478 +0100
-+++ Makefile	2009-01-03 18:36:37.218398964 +0100
-@@ -65,7 +65,7 @@
- OBJ = ${SRCS:%.c=%.o}
- 
- pure-sfv: $(OBJ)
--	$(CC) -lm -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(OBJ)
-+	$(CC) -DVERSION=\"$(VERSION)\" $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJ) -lm
- 
- PURIFY_OPTIONS=-follow-child-processes=yes -always-use-cache-dir=yes
- PURIFY=purify
diff --git a/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch b/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
new file mode 100644
index 000000000000..ca2143f1f956
--- /dev/null
+++ b/app-arch/pure-sfv/files/pure-sfv-0.3-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -54,18 +54,16 @@
+ 
+ VC_CRAP = pure-sfv.ncb pure-sfv.plg
+ 
+-CFLAGS +=	-Wall -Werror -O2 -g -Wno-unused
+ INSTALL_PREFIX = /usr/local
+ INSTALL_PROGRAM = /usr/bin/install -c
+ 
+ all: pure-sfv
+ 
+-CC = gcc
+ 
+ OBJ = ${SRCS:%.c=%.o}
+ 
+ pure-sfv: $(OBJ)
+-	$(CC) -lm -DVERSION=\"$(VERSION)\" $(CFLAGS) -o $(PROG) $(OBJ)
++	$(CC) -DVERSION=\"$(VERSION)\" $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(PROG) $(OBJ) -lm
+ 
+ PURIFY_OPTIONS=-follow-child-processes=yes -always-use-cache-dir=yes
+ PURIFY=purify
diff --git a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild b/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
index ca26b16fbcfb..f28c6df42ec4 100644
--- a/app-arch/pure-sfv/pure-sfv-0.3-r1.ebuild
+++ b/app-arch/pure-sfv/pure-sfv-0.3-r1.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="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="utility to test and create .sfv files and create .par files"
 HOMEPAGE="http://pure-sfv.sourceforge.net/"
@@ -15,20 +15,15 @@ KEYWORDS="amd64 ~hppa ppc x86"
 IUSE=""
 RESTRICT="test"
 
-DEPEND=""
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${PN}-0.3-fix-build-system.patch )
 
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -i Makefile -e "s:-Werror -O2 -g::"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	append-cflags -Wall -Wno-unused
+	tc-export CC
 }
 
 src_install() {
-	dobin pure-sfv || die "dobin failed"
-	dodoc ReadMe.txt
+	dobin pure-sfv
+	newdoc ReadMe.txt README
 }
diff --git a/app-arch/rzip/Manifest b/app-arch/rzip/Manifest
index 4cef3d7cfd4d..4cc217a623a4 100644
--- a/app-arch/rzip/Manifest
+++ b/app-arch/rzip/Manifest
@@ -1,4 +1,5 @@
+AUX rzip-2.1-CVE-2017-8364.patch 1006 BLAKE2B dc84fc222e5fcf1c0e5a37eda05bfb136b9603eb3c510edabd91bfc639b2c4a9f9956ce8cf152c94fb255c1b749a5eb8dfd0d13f65a2a4682a008f6fc236ab4d SHA512 18f594eca2f805770dad7569ad8cffbb934e74b85b04cc91cbcbb04fbc936529f68121504c50b037cfb848e9ba90131a5b35a1d236f0c1453d55fd8b415a7ed6
 AUX rzip-2.1-darwin.patch 4829 BLAKE2B 7e6cd7273573517aa29e73f0556e6b33d4386d71872d643d448859a48308b8fcd59b1a2c6749117e39c8184ac4239053a97757b2e4e821b7b9e7232e99af2120 SHA512 a3cd2c98a486626767eacd5a949ecf1f328f11bd663a1f4b9f758314dde709e9fd73fb1239dec8737d4511f61225f47682b610b9a2609646613a774d6f6ad5f8
 DIST rzip-2.1.tar.gz 46785 BLAKE2B da38d7ae74149824dd33f3ecb1a7f6f63d63a8ee54c57565e4edc5915b503882d4de20b19c22228e8d3fc698477b6c8f095c2a399d442101a83ee66f4bfbcc63 SHA512 06ed760ba2b7f09781a2e9312b645d41c145f96e3ee55ddf573714493e92466366ec6394267e5e06b0d8c42dcb67e1ae99dafa417a84737ce2b4a650a9059a6f
-EBUILD rzip-2.1-r2.ebuild 1076 BLAKE2B 0372dbdd2e76d788565a36b3a8551ed1c285b36b6e3730dc0f28661db1e2491b3a321cd3aa78563c17475420008e8a700ccf54b47d0e88053c0bee7ba021b80f SHA512 edac7b942f7778fc54726abfa63995fa6fe5d80d074ed67cfc45722cf893671c692bf389a5af4d1bf0f5419c44afbffa03211dd42261224b32d5b7d2b0320821
+EBUILD rzip-2.1-r3.ebuild 1098 BLAKE2B 1e460e70954a817ddb95638de32d3333079741a6101c33f55c0b5dd16911343253ecdf3e6e41ad18f7ddd4ba1ca2593d4c476a5475aadf320086457b79deeeb2 SHA512 a3789a90c00622d6e2d9c54bdee2a3b9c69a18cb9d266d150088dee340062f243af38056f767c6cfc094e6f6c537dbcb7c1974a8816075c9045b94b8ef0eed39
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/rzip/files/rzip-2.1-CVE-2017-8364.patch b/app-arch/rzip/files/rzip-2.1-CVE-2017-8364.patch
new file mode 100644
index 000000000000..3c65e6f1939d
--- /dev/null
+++ b/app-arch/rzip/files/rzip-2.1-CVE-2017-8364.patch
@@ -0,0 +1,33 @@
+Index: rzip-2.1/stream.c
+===================================================================
+--- rzip-2.1.orig/stream.c
++++ rzip-2.1/stream.c
+@@ -147,16 +147,16 @@ static int write_u32(int f, u32 v)
+ 	return 0;
+ }
+ 
+-static int read_buf(int f, uchar *p, int len)
++static int read_buf(int f, uchar *p, unsigned int len)
+ {
+ 	int ret;
+ 	ret = read(f, p, len);
+ 	if (ret == -1) {
+-		err_msg("Read of length %d failed - %s\n", len, strerror(errno));
++		err_msg("Read of length %u failed - %s\n", len, strerror(errno));
+ 		return -1;
+ 	}
+ 	if (ret != len) {
+-		err_msg("Partial read!? asked for %d bytes but got %d\n", len, ret);
++		err_msg("Partial read!? asked for %u bytes but got %d\n", len, ret);
+ 		return -1;
+ 	}
+ 	return 0;
+@@ -399,7 +399,7 @@ static int fill_buffer(struct stream_inf
+ 	if (sinfo->s[stream].buf) {
+ 		free(sinfo->s[stream].buf);
+ 	}
+-	sinfo->s[stream].buf = malloc(u_len);
++	sinfo->s[stream].buf = malloc(c_len > u_len ? c_len : u_len);
+ 	if (!sinfo->s[stream].buf) {
+ 		return -1;
+ 	}
diff --git a/app-arch/rzip/rzip-2.1-r2.ebuild b/app-arch/rzip/rzip-2.1-r3.ebuild
index 1c8043ac3fb6..915c6deeef2b 100644
--- a/app-arch/rzip/rzip-2.1-r2.ebuild
+++ b/app-arch/rzip/rzip-2.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Compression program for large files"
 HOMEPAGE="https://rzip.samba.org/"
@@ -14,17 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND="app-arch/bzip2"
+RDEPEND="app-arch/bzip2:="
+DEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1-darwin.patch
+	"${FILESDIR}"/${PN}-2.1-CVE-2017-8364.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-darwin.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}
-
 pkg_postinst() {
 	ewarn "Warning: Gentoo shipped a broken rzip for quite some time. During"
 	ewarn "compression of large files it didn't set the right file size, so"
diff --git a/app-arch/stuffit/Manifest b/app-arch/stuffit/Manifest
index 2a65aa106820..14f52665da9b 100644
--- a/app-arch/stuffit/Manifest
+++ b/app-arch/stuffit/Manifest
@@ -1,3 +1,3 @@
 DIST stuffit520.611linux-i386.tar.gz 1955619 BLAKE2B fb80abef29d266c93747b3359c62840afa15a32786a82ee01cab22cf0eddad750817c87b767632df5bb2ef681c1c9dd6dfe136dae388f8390bcab0b137a2c0bc SHA512 a1d4631c2d238b49c710816cd5ed8a01dcf52c29b870297b8dfd76fb0cb6e725c5b0f9d4a6c155c7b6980005df52fc4597632f72e90f00bf93ad80a28972270a
-EBUILD stuffit-5.2.0.611.ebuild 1465 BLAKE2B 941f699e4773b0375e94219d5117e51d67527ea90ef2b02609bcbbb47371c03e9d5793059d96dd6a4eb6efad956871a6a4cc1737b466c95abc356400f20ee82d SHA512 d34265918291a3043262aded8ceb3bee13860eb5b8e5503f681ff9002176aaebc7abb1a21dba3779e7c10b7dd6b7301811489f7d92c0191c25a2e3aaca8b0bc0
+EBUILD stuffit-5.2.0.611.ebuild 1471 BLAKE2B 33b12391d0b2ee3a638b85f5010ad500032570d52a875ed72f36403f43fd238a6e47b9316f30be82966a78e6f602ff45b9db764d898f6894490e1eada29cacce SHA512 816b2b903025599753824cff5eed538c327b49ab146c26967e5246fdc0e2b2168f1531266970c1670d2cf2bcf1f45ab7eb3332b41294734c2214ad7e69b42cea
 MISC metadata.xml 302 BLAKE2B f1870466f061240593b130854dc1baaffbc351f573e2f8e7bd4e5d8dcb986a794d151bc6a41bb7929b34a5bea104f0f95efbedd3bd068af39896fd444997cf45 SHA512 cb8ca2c4b1b49221c5e2ef4d37a9f8faa4a03ec8e116dfe31185f0a09aeaadf1034f45f655d984658e8318f057ca9028edb4cd373abb0d5bfe05ff6dd83d00b3
diff --git a/app-arch/stuffit/stuffit-5.2.0.611.ebuild b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
index e6853abaea75..2e6528ed2126 100644
--- a/app-arch/stuffit/stuffit-5.2.0.611.ebuild
+++ b/app-arch/stuffit/stuffit-5.2.0.611.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_P="stuffit520.611linux-i386"
+
 DESCRIPTION="Aladdin Software's StuffIt and StuffIt Expander"
 HOMEPAGE="http://www.stuffit.com/"
-SRC_URI="http://my.smithmicro.com/downloads/files/stuffit520.611linux-i386.tar.gz"
+SRC_URI="http://my.smithmicro.com/downloads/files/${MY_P}.tar.gz"
 
 LICENSE="Stuffit"
 SLOT="0"
@@ -14,7 +17,7 @@ RESTRICT="fetch strip"
 
 S="${WORKDIR}"
 
-INSTALLDIR="/opt/stuffit"
+INSTALLDIR=/opt/stuffit
 
 pkg_nofetch() {
 	einfo "Please download stuffit from"
@@ -27,7 +30,6 @@ pkg_nofetch() {
 }
 
 src_install() {
-
 	# First do the binaries
 	exeinto ${INSTALLDIR}/bin
 	doexe bin/stuff
@@ -39,20 +41,20 @@ src_install() {
 
 	# Now the documentation
 	docinto stuff
-	dodoc doc/stuff/README
-	dohtml doc/stuff/stuff.html
+	dodoc doc/stuff/{README,stuff.html}
 	docinto unstuff
-	dodoc doc/unstuff/README
-	dohtml doc/unstuff/unstuff.html
+	dodoc doc/unstuff/{README,unstuff.html}
 
 	# And now the man pages
 	doman man/man1/*
 
 	# Also add the executables to the path
 	dodir /etc/env.d
-	echo -e "PATH=${INSTALLDIR}/bin\nROOTPATH=${INSTALLDIR}/bin" > \
-		"${D}"/etc/env.d/10stuffit
-
+	cat > "${T}"/10stuffit <<- EOF || die
+		PATH="${EPREFIX}${INSTALLDIR}/bin"
+		ROOTPATH="${EPREFIX}${INSTALLDIR}/bin"
+	EOF
+	doenvd "${T}"/10stuffit
 }
 
 pkg_postinst() {
diff --git a/app-arch/tapeutils/Manifest b/app-arch/tapeutils/Manifest
index e32e873452ed..6bf3520f4e40 100644
--- a/app-arch/tapeutils/Manifest
+++ b/app-arch/tapeutils/Manifest
@@ -1,3 +1,5 @@
+AUX tapeutils-0.4-fix-C-decl.patch 700 BLAKE2B c3786edd42d711a528b7fc81c6c9569e2cd265aae7c4205fc642d8ee088d756f2b810197af3fd4aa2c0303e310ced41a9013d76ceb84cb9d5adf5a91ad4227c6 SHA512 bb38dd764d94279894f2ed76b8e882622a30db6b68bfb48ef882422fc326274842961fc0d27b2d812444382dd19aaee64788f8a4a604c2506961c405d4f20621
+AUX tapeutils-0.4-fix-build-system.patch 201 BLAKE2B b0c4d271b1a52ce613d57c7006f485f63e93dba380fb2a8e6db0da50cbc752b2cbe115f05e9b0c475a690ec2dfda87bc9d0beab33a8292cb2af2779c69f271a0 SHA512 c286c5592874a147341182fa98f13181937fd5ef0f581b8ebdd790f156dcc1c358e1b69240cf8fbccd2d3d34c319e29b2a9e8a3674fede6b712c4f12538710ff
 DIST tapeutils-0.4.tar.gz 14116 BLAKE2B 1eb633ef1593b6f50142ae0128438a4346fafdaa4a847ff9e21caf278f1123844af16dc2c04d3d0cc2c015d0ec7fc15eaab48e6be9ae7c18d3cd2972434f2617 SHA512 b87b725c3f1610f5a116263120ffea84a7e81146cc9e46be69391388bb0b3bf4814d16428bfabd285557a0f72a3607f138e454b61989f2606697875e30c948bd
-EBUILD tapeutils-0.4.ebuild 596 BLAKE2B fe4d890a3403a21700c9bf8592749d56afd7941044b274a7c8e42a1bbb1602fad9ec6386789961bafb4d90e612b753a85e35ab41232781769a463d2d49810444 SHA512 c0f70db3528c69bbdbb5d2f770eb891e7ae5d5cf79cf82539e38308a490b3e65b3a62d985388e02df5728243bcb33f8f2599fad978f87d3e9a2e516ea45d0a3b
+EBUILD tapeutils-0.4.ebuild 655 BLAKE2B 3f59c8b660b90afd9f51c510069a4c85e298eb88ffb71588119335e18701b8fb33fd619288e0eb96c938fd2fbe2b866554df20eda27d0f037d5ee18703b57255 SHA512 43386adefd194fe12d0430de17b57a3992b694c1c1520daa89a94e2eaadbdabcaac843a6b759bbaca706523a5c9d2d5e641513bdadcbb3ee2fe67eef3c2c6f3d
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch
new file mode 100644
index 000000000000..ee07c252d168
--- /dev/null
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-C-decl.patch
@@ -0,0 +1,31 @@
+--- a/tapecopy.c
++++ b/tapecopy.c
+@@ -26,6 +26,8 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <stdlib.h>
++
+ #include "tapeio.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+--- a/tapedump.c
++++ b/tapedump.c
+@@ -26,6 +26,8 @@
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <stdlib.h>
++
+ #include "tapeio.h"
+ #include "stdio.h"
+ #include "stdarg.h"
+@@ -158,7 +160,7 @@
+       len = getrec (src, buf, MAX_REC_LEN);
+       if (len == 0)
+ 	{
+-	  printf ("total length of file %d = %d records, %d bytes\n",
++	  printf ("total length of file %d = %d records, %lu bytes\n",
+ 		  file, record, filebytes);
+ 	  tapebytes += filebytes;
+ 	  file++;
diff --git a/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch
new file mode 100644
index 000000000000..e1670a47fe2b
--- /dev/null
+++ b/app-arch/tapeutils/files/tapeutils-0.4-fix-build-system.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,6 @@
+ # options
+ # -----------------------------------------------------------------------------
+ 
+-CFLAGS = -O2
+-LDFLAGS = 
+ 
+ # CFLAGS = -g
+ # LDFLAGS = -g
diff --git a/app-arch/tapeutils/tapeutils-0.4.ebuild b/app-arch/tapeutils/tapeutils-0.4.ebuild
index b70a469e36db..50e3aac72747 100644
--- a/app-arch/tapeutils/tapeutils-0.4.ebuild
+++ b/app-arch/tapeutils/tapeutils-0.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="Utilities for manipulation of tapes and tape image files"
@@ -12,13 +14,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+DEPEND=""
 RDEPEND="!app-emulation/hercules"
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-0.4-fix-C-decl.patch
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin tapecopy tapedump || die
+	dobin tapecopy tapedump
 	# no docs to install
 }
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index 45de279879f8..4946293a7f8e 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,6 +1,7 @@
 AUX no.in_path.patch 1341 BLAKE2B 7ec890361f9c7a30b5b60682773bbdfbf2eed2d6de19ded5ba4ba6d3dff1f08f9f4b79c927fa5bfdc2d8ad2de76f8101259350b011e5ceec8ec00e634b9f0fac SHA512 79e218cb222ac8024a8c6decab688428677298269c11bfca683921a84e70056f9fd58b12f290cf30944017fff1c794a713701cfd0c722fd98180a2c3d521a1c8
+AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
 DIST adflib.zip 254914 BLAKE2B 9683ea4edbeb7254e0c162140063e2aa53e183aba31b4b7bf1ab498a5bb218ae687a54d87e50cc2b15e5725a2f77c16e9ca4dba23b5d5a373f513747839055a9 SHA512 fe8edf5247ba82e475f62f96fcb72d50bf80641e14e957c99694def98735eb327a67208e3460504a0d109c9497d6e81f0cd8ce07ddc73486adc9e7070a75074a
-EBUILD unadf-0.7.12.ebuild 640 BLAKE2B 9b5080c1eab3f84df2682b8386a9c2ff92842223f2c004472a721c1f0af1d4a05aaa990ad01327f7aeaa4ed196dea2f877ca2fe383947657eca7d44c79a319a3 SHA512 e7cdedb3d7fc0b5b20fab9bd932311a99d3829e2345b78b74d098397bfba1c64532dfd2e6404fffe64a210bcda09f7d05755d46b4241d4148b187866be571671
+EBUILD unadf-0.7.12-r1.ebuild 713 BLAKE2B dec763f597a3b70d61f79d06e0fd318d0185b27d751ecb7043f4d827af9599ca3639868fd24ee0ffebdaff0758cfe72c24526f9b41bda95d865e0cadc1c504c6 SHA512 2a118c374eb133f1eb75d60905fb33cf016fab65c232e05e9e9d3a9966ebba8a9913028a96f1b4ca0fb2d97b0693f1ff0ff502e4bb578a33ff143361ea5af7a3
 EBUILD unadf-0.7.9b.ebuild 875 BLAKE2B 9df1ceefc07e087ebf0b5f5f5a99963fe19cf1a391eda0036a9950b5bc6af080cc4c8f4257fe83bcb4424f9c2562a5ed83903f2f7f854adf31724e71075b39ec SHA512 be619ea1d383e7279313c45c2cdd77aa32854962c04a1693bf99488ed9032c6de2b4a84ad0211d3358989cb68d9f8637bba5e625fab9fe3ee4ccc15d692a8f1a
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-arch/unadf/files/unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch b/app-arch/unadf/files/unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch
new file mode 100644
index 000000000000..5547e0047cbc
--- /dev/null
+++ b/app-arch/unadf/files/unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch
@@ -0,0 +1,146 @@
+Description: Fix unsafe extraction by using mkdir() instead of shell command
+  This commit fixes following vulnerabilities:
+
+  - CVE-2016-1243: stack buffer overflow caused by blindly trusting on
+    pathname lengths of archived files
+
+    Stack allocated buffer sysbuf was filled with sprintf() without any
+    bounds checking in extracTree() function.
+
+  - CVE-2016-1244: execution of unsanitized input
+
+    Shell command used for creating directory paths was constructed by
+    concatenating names of archived files to the end of the command
+    string.
+
+  So, if the user was tricked to extract a specially crafted .adf file,
+  the attacker was able to execute arbitrary code with privileges of the
+  user.
+
+  This commit fixes both issues by
+
+    1) replacing mkdir shell commands with mkdir() function calls
+    2) removing redundant sysbuf buffer
+
+Author: Tuomas Räsänen <tuomasjjrasanen@tjjr.fi>
+Last-Update: 2016-09-20
+--
+--- a/examples/unadf.c
++++ b/examples/unadf.c
+@@ -24,6 +24,8 @@
+ 
+ #define UNADF_VERSION "1.0"
+ 
++#include <sys/stat.h>
++#include <sys/types.h>
+ 
+ #include<stdlib.h>
+ #include<errno.h>
+@@ -31,17 +33,15 @@
+ 
+ #include "adflib.h"
+ 
+-/* The portable way used to create a directory is to call the MKDIR command via the
+- * system() function.
+- * It is used to create the 'dir1' directory, like the 'dir1/dir11' directory
++/* The portable way used to create a directory is to call mkdir()
++ * which is defined by following standards: SVr4, BSD, POSIX.1-2001
++ * and POSIX.1-2008
+  */
+ 
+ /* the portable way to check if a directory 'dir1' already exists i'm using is to
+  * do fopen('dir1','rb'). NULL is returned if 'dir1' doesn't exists yet, an handle instead
+  */
+ 
+-#define MKDIR "mkdir"
+-
+ #ifdef WIN32
+ #define DIRSEP '\\'
+ #else
+@@ -51,6 +51,13 @@
+ #define EXTBUFL 1024*8
+ 
+ 
++static void mkdirOrLogErr(const char *const path)
++{
++	if (mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO))
++		fprintf(stderr, "mkdir: cannot create directory '%s': %s\n",
++			path, strerror(errno));
++}
++
+ void help()
+ {
+     puts("unadf [-lrcsp -v n] dumpname.adf [files-with-path] [-d extractdir]");
+@@ -152,7 +159,6 @@ void extractTree(struct Volume *vol, str
+ {
+ 	struct Entry* entry;
+     char *buf;
+-    char sysbuf[200];
+ 
+     while(tree) {
+         entry = (struct Entry*)tree->content;
+@@ -162,16 +168,14 @@ void extractTree(struct Volume *vol, str
+                 buf=(char*)malloc(strlen(path)+1+strlen(entry->name)+1);
+                 if (!buf) return;
+                 sprintf(buf,"%s%c%s",path,DIRSEP,entry->name);
+-                sprintf(sysbuf,"%s %s",MKDIR,buf);
+                 if (!qflag) printf("x - %s%c\n",buf,DIRSEP);
++                if (!pflag) mkdirOrLogErr(buf);
+             }
+             else {
+-                sprintf(sysbuf,"%s %s",MKDIR,entry->name);
+                 if (!qflag) printf("x - %s%c\n",entry->name,DIRSEP);
++                if (!pflag) mkdirOrLogErr(entry->name);
+             }
+ 
+-            if (!pflag) system(sysbuf);
+-
+ 	        if (tree->subdir!=NULL) {
+                 if (adfChangeDir(vol,entry->name)==RC_OK) {
+                     if (buf!=NULL)
+@@ -301,21 +305,20 @@ void processFile(struct Volume *vol, cha
+         extractFile(vol, name, path, extbuf, pflag, qflag);
+     }
+     else {
+-        /* the all-in-one string : to call system(), to find the filename, the convert dir sep char ... */
+-        bigstr=(char*)malloc(strlen(MKDIR)+1+strlen(path)+1+strlen(name)+1);
++        bigstr=(char*)malloc(strlen(path)+1+strlen(name)+1);
+         if (!bigstr) { fprintf(stderr,"processFile : malloc"); return; }
+ 
+         /* to build to extract path */
+         if (strlen(path)>0) {
+-            sprintf(bigstr,"%s %s%c%s",MKDIR,path,DIRSEP,name);
+-            cdstr = bigstr+strlen(MKDIR)+1+strlen(path)+1;
++            sprintf(bigstr,"%s%c%s",path,DIRSEP,name);
++            cdstr = bigstr+strlen(path)+1;
+         }
+         else {
+-            sprintf(bigstr,"%s %s",MKDIR,name);
+-            cdstr = bigstr+strlen(MKDIR)+1;
++            sprintf(bigstr,"%s",name);
++            cdstr = bigstr;
+         }
+         /* the directory in which the file will be extracted */
+-        fullname =  bigstr+strlen(MKDIR)+1;
++        fullname =  bigstr;
+ 
+         /* finds the filename, and separates it from the path */
+         filename = strrchr(bigstr,'/')+1;
+@@ -333,7 +336,7 @@ void processFile(struct Volume *vol, cha
+                     return;
+                 tfile = fopen(fullname,"r"); /* the only portable way to test if the dir exists */
+                 if (tfile==NULL) { /* does't exist : create it */
+-                    if (!pflag) system(bigstr);
++                    if (!pflag) mkdirOrLogErr(bigstr);
+                     if (!qflag) printf("x - %s%c\n",fullname,DIRSEP);
+                 }
+                 else
+@@ -350,7 +353,7 @@ void processFile(struct Volume *vol, cha
+                     return;
+                 tfile = fopen(fullname,"r");
+                 if (tfile==NULL) {
+-                    if (!pflag) system(bigstr);
++                    if (!pflag) mkdirOrLogErr(bigstr);
+                     if (!qflag) printf("x - %s%c\n",fullname,DIRSEP);
+                 }
+                 else
diff --git a/app-arch/unadf/unadf-0.7.12.ebuild b/app-arch/unadf/unadf-0.7.12-r1.ebuild
index 8250209a1c24..e6592e1c01e4 100644
--- a/app-arch/unadf/unadf-0.7.12.ebuild
+++ b/app-arch/unadf/unadf-0.7.12-r1.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 MY_PN="adflib"
 
 DESCRIPTION="Extract files from Amiga adf disk images"
-SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://lclevy.free.fr/adflib/"
+SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
-DEPEND=""
-RDEPEND=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-0.7.12-CVE-2016-1243_CVE-2016-1244.patch )
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -29,5 +30,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
index b99c7ba7e181..ab1d11f64299 100644
--- a/app-arch/unarj/Manifest
+++ b/app-arch/unarj/Manifest
@@ -1,6 +1,7 @@
 AUX unarj-2.65-CAN-2004-0947.patch 1523 BLAKE2B f746d4a06119c6c8b926e208d122dc54338706f13534badbdf66edae0bbe6551afdca0de235553812fb258db4f55029ad54832f5625cd1e5e8c1595e2af06e88 SHA512 714580c0602b12013ca39fc3850298c1fe11d48ac156a5883a3d7b0c5a8adabd96d85963e5e4500df82ebc9300366d437be0f67bf6577739da9ce880eaa44b85
-AUX unarj-2.65-gentoo-fbsd.patch 220 BLAKE2B 5252a5138452497709b6fc72690a55d2372ac5788126327416b2a1ffc18c684c3b8a01bea3ef36c01f43ee955d2614c9a2710e00a5d3d42c4a52fa6325331b8e SHA512 4f6949bb8c65d9cf86846cf57c6e51ef13d6d419a76b19e90ed39c776e08e3ca212ec731f13d3f209d979239a7a3302bbbdeff36af3962ac6841d2829691a6bd
+AUX unarj-2.65-Wformat-security.patch 1303 BLAKE2B c13a77846264f9e5e8ab552179d005ead44e5c4418a58206cea3d00a2f3470b5176c82558a0ad2e1765c9a3d14760e941324af3057de9cf21f6d2c6191442600 SHA512 498386e182976b97f46614b73d345836b60440236b71d41bedd9b7671331d98dd485554eb93353055ae5d93619a8eeed0dc84a558cafb1c84188cb5fc865415e
+AUX unarj-2.65-gentoo-fbsd.patch 168 BLAKE2B db8ad647f7666cc2e0032b35f5cfc36d63a38f918e4424681778f8d3ad599a1356c4c0733c35d4140618a311b8e07da61b035d7ff391efec1f1ae6fea7de9a78 SHA512 fc3d42d7ee9b38e871938c159398e773102e9d83896393f074f0cf02b4619d6d663668cea50d84d04b1372b7b5d4f6e46db36345123a65750b545416ef7f2eb2
 AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
 DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
-EBUILD unarj-2.65.ebuild 783 BLAKE2B b11a53d890bab3fbe13b5a4c30390e77672064d24a378e87e3d2aacf497fca815f7184448fae454c4b89b911c67fe22eb664dd7fa95e59664b14a3e42e8e828f SHA512 bd42993bc7a866dddc7822c269d8bd64952bf4e5291b777e522668a4a44e374bec204ba2e66989805a403be1bfbf0a40337234e7f0631d264a6def4e72c4f0c7
+EBUILD unarj-2.65.ebuild 726 BLAKE2B 9d30c053d0671c7b804734afbea557a7f1c86213c3bce1d5d29b44371cb81408d45d52e0acadab67280e9cec5381c4a94fc227edabfa5585beedc3a9a68cf8d5 SHA512 171e05906682922bd79516ab32a628a6e7fbe3229b370cbe16c616d5ae29cd47eb04182712d55329d7c6d443d43d745a5cf5e58ea0d8a091f541a68c49b7561c
 MISC metadata.xml 515 BLAKE2B ef334f1e25735b01d99508a442cd6e2e1d499449bf52c0e408b0cbeec374f96dc388781228a6a63ef536a4751d8130e17aec005d4261234a52cd3e6d909cdf32 SHA512 72e4397504e316cca89b760d909cf151146f122e349283d4509f40036eee1272008ca8cfa2f2dc4b4204ecd450e6135f9ca1ffd8670aef6cda29d0865a61907e
diff --git a/app-arch/unarj/files/unarj-2.65-Wformat-security.patch b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
new file mode 100644
index 000000000000..a076dd91f13d
--- /dev/null
+++ b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
@@ -0,0 +1,66 @@
+Bug: https://bugs.gentoo.org/520478
+
+--- a/unarj.c
++++ b/unarj.c
+@@ -699,7 +699,7 @@
+     }
+     if ((arj_flags & GARBLE_FLAG) != 0)
+     {
+-        printf(M_ENCRYPT);
++        puts(M_ENCRYPT);
+         printf(M_SKIPPED, filename);
+         skip();
+         return -1;
+@@ -763,7 +763,7 @@
+     }
+     printf(M_EXTRACT, name);
+     if (host_os != OS && file_type == BINARY_TYPE)
+-        printf(M_DIFFHOST);
++        puts(M_DIFFHOST);
+     printf("  ");
+ 
+     crc = CRC_MASK;
+@@ -779,10 +779,10 @@
+     set_ftime_mode(name, time_stamp, file_mode, (uint) host_os);
+ 
+     if ((crc ^ CRC_MASK) == file_crc)
+-        printf(M_CRCOK);
++        puts(M_CRCOK);
+     else
+     {
+-        printf(M_CRCERROR);
++        puts(M_CRCERROR);
+         error_count++;
+     }
+     return 1;
+@@ -808,10 +808,10 @@
+         decode_f();
+ 
+     if ((crc ^ CRC_MASK) == file_crc)
+-        printf(M_CRCOK);
++        puts(M_CRCOK);
+     else
+     {
+-        printf(M_CRCERROR);
++        puts(M_CRCERROR);
+         error_count++;
+     }
+     return 1;
+@@ -958,7 +958,7 @@
+     int i;
+ 
+     for (i = 0; M_USAGE[i] != NULL; i++)
+-        printf(M_USAGE[i]);
++        puts(M_USAGE[i]);
+ }
+ 
+ int
+@@ -973,7 +973,7 @@
+     argc = ccommand(&argv);
+ #endif
+ 
+-    printf(M_VERSION);
++    puts(M_VERSION);
+ 
+     if (argc == 1)
+     {
diff --git a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
index 755b9b696cc9..2091f091e2d2 100644
--- a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
+++ b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
@@ -1,5 +1,5 @@
---- environ.c	2007-06-19 12:44:09 +0200
-+++ environ.c.new	2007-06-19 12:44:37 +0200
+--- a/environ.c
++++ b/environ.c
 @@ -437,7 +437,6 @@
  #endif
  
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
index d579027e1d33..ec1cba73be8e 100644
--- a/app-arch/unarj/unarj-2.65.ebuild
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Utility for opening arj archives"
 HOMEPAGE="http://www.arjsoftware.com/"
@@ -12,21 +14,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-CAN-2004-0947.patch
-	epatch "${FILESDIR}"/${P}-sanitation.patch
-	epatch "${FILESDIR}"/${P}-gentoo-fbsd.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-CAN-2004-0947.patch
+	"${FILESDIR}"/${P}-sanitation.patch
+	"${FILESDIR}"/${P}-gentoo-fbsd.patch
+	"${FILESDIR}"/${PN}-2.65-Wformat-security.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die
 }
 
 src_install() {
-	dobin unarj || die 'dobin failed'
-	dodoc unarj.txt technote.txt || die 'dodoc failed'
+	dobin unarj
+	dodoc unarj.txt technote.txt
 }
diff --git a/app-arch/unmakeself/Manifest b/app-arch/unmakeself/Manifest
index ebb0a24a21fa..d5b2189013b3 100644
--- a/app-arch/unmakeself/Manifest
+++ b/app-arch/unmakeself/Manifest
@@ -1,3 +1,3 @@
 DIST unmakeself-1.1.tar.gz 3635 BLAKE2B 650a7f45dc5204f5ae42002addc5892fb3ce3d4d2b8b5ed343329cd34ae7086e1f680ddcb25123255feff1dd2a70d4427a30aa0a8ac7c0309b19847fefcb5390 SHA512 3e8a05a907b8807080208300f6c20577587a0e87000c6746ba457c276e4dff37c8d61227bd1db37e60ac20d9532290c4110a1204c8389a8a1e97a121b68c682b
-EBUILD unmakeself-1.1.ebuild 519 BLAKE2B 467865405a6259384cdf05962667b5a5785fc2c6b5abbc8f4ef553ce928a7a9f2a36fea946f6506345f82756df94fadc010110cada96e9a9b4cad88f7d23ae73 SHA512 da37aa52b933214d89a0fa1d4f39758d068b7499dffe7fa6c47d2785a4cf08fd209561f3c26a966d866f70cea683112a0a4ea83ba2157a0e32223e7b36ad85eb
+EBUILD unmakeself-1.1.ebuild 649 BLAKE2B e7300969dde8da439e1507cf2c6d3118235f86057a92dd44b8c9f37b150de79a9993750b9f4561a6ffc09a3a6adf001a28a6a47442cd6b93665d69b8deb95a2b SHA512 a477b5fb578a1fa96a0c4d55019d57dd24a290c5eece162b70e984455165fd66ea92663eee8a10d1eb0c0b25361df701df05e13c982d8d2bfff4ff6c07d3a8fa
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-arch/unmakeself/unmakeself-1.1.ebuild b/app-arch/unmakeself/unmakeself-1.1.ebuild
index cdf879bc73c6..716482427e1b 100644
--- a/app-arch/unmakeself/unmakeself-1.1.ebuild
+++ b/app-arch/unmakeself/unmakeself-1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit toolchain-funcs
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Makeself archive extractor"
 HOMEPAGE="http://www.freshports.org/archivers/unmakeself"
@@ -13,12 +14,21 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="app-arch/libarchive[bzip2,zlib]"
+RDEPEND="app-arch/libarchive:=[bzip2,zlib]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags libarchive)
+	export LDLIBS=$($(tc-getPKG_CONFIG) --libs libarchive)
+
+	tc-export CC
+}
 
 src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS=-larchive ${PN} || die "emake failed"
+	emake ${PN}
 }
 
 src_install() {
-	dobin unmakeself || die "dobin failed"
+	dobin unmakeself
 }
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
index 1a49b8a37899..07217d558479 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -2,6 +2,6 @@ AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0e
 DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
 DIST unp_2.0~pre7.tar.bz2 14492 BLAKE2B 5155aa3a63ba9aaad981c42ea88602b97c08416384d166979f35a1ddec592b7cfbf4f002a500de0f21a374732f1a5aec85e69bcbb915ca7936edd67f04875898 SHA512 b90238a3e359d45e4b0ec3e5559a682fce3a7a37f74dd5419b005bb7bd3e3e5be03dde2e5d40d1671c0274ff1d795560fa238a572fe6cf3ab12f17dd1e2bcd1d
 EBUILD unp-2.0_pre7.ebuild 907 BLAKE2B 35828af309a0b824d5e90244c1673b3a60ac1deb85135a5727349364969ed3d75b1b24a03febce0b5811cb92fbb91928ca4a245bd71e62715e05497fa47161b2 SHA512 22c61e13cefc72e3b048bd1a9d4cf1736c1970f3896eb5a801df93e0da48d6d54faa17e4ff1879e63cc4e3a7e69e44e3519f0ba5f90bf14ec70cac85525c0d7b
-EBUILD unp-2.0_pre7_p1-r1.ebuild 1232 BLAKE2B d9afe13177aa50a29e89862399a4bbfe2a70a91c0950491c3a829339e70f0ae60916b1d45de73d23f487bfb6136d4b9533e78db2279952713da32973cecc43e3 SHA512 787b6750fa1b67b5462e40b3499b0aae9d2dac9706c96804a20a645266beb9c56f468a5ef53635f7736350131d8e498342f4aa1ff890c65fcf5a1859aa1d4aeb
+EBUILD unp-2.0_pre7_p1-r1.ebuild 1231 BLAKE2B 591462db99a2937a260cc27b2edfe086405954ae118bdbc72b28f37e877270b87907695a292b4273aa895bbd98eeb870692411d11fb53b8a1b42e51dc196fb2a SHA512 15419f7849c02357eb7dc4c38ff99302acbdf4325dd90e31d28290ccccc923819cb5b5618c55bd50ee29ad7e55feb6a3a52ff8d070522a67cc97829c132f5823
 EBUILD unp-2.0_pre7_p1.ebuild 1028 BLAKE2B bb3893a4d7513454e34c6c3d11d53790e25d57bf7af309ce8a1215ddae861b49637df86318281cd3e12f2f1d1f4d78c5da3dd79fbcf11bcf93c983ab59004120 SHA512 5095690f96dbc6a3fe47bf550863ee3b795b14ed9b9e6f3594ea5ae7ac2ef93774f0d30277a9eb2f0e9ba53ca0ca9e4c481dd462cd5de52fb178d3156af02901
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
index c2ad30c74766..f62ac3041d62 100644
--- a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
+++ b/app-arch/unp/unp-2.0_pre7_p1-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=6
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"