gentoo resync : 16.02.1018

13 files changed, 104 insertions, 133 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 470474c9ed27..e35e227ed668 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 456259c5b917..b69a657508dc 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,6 @@
+AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801af378d4f1a5953228e3485a7a0fd497f55e03134bf446f44b89e3c8cee9547b7d6043da2af8e8daceeef01117b SHA512 2371a86ad9961937c625fd29a7f6229038ecf9ec48591ec0e152d17c9cb78c8524a31c7b667ecf9e630a84abbfc334541aec7be2d2b30b51c0fe286c0028a8c8
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
+DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
+EBUILD gcab-1.2.ebuild 1154 BLAKE2B 87357df96560ed1a7536a76325937373c49a9e41cfba98b173ac5947a77e51dba4010442936b2a804dc7de302174333ab0dc220a9874e259686de8464f75ee91 SHA512 ce1e8912e6f86556b184b896e7a477bda4a104dbc8624299f5fdc03bb493e95aa281266f9dd4a9826c9b4bca37116e78f94b93f1d09d6d19a67844ac821b6d0e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch
new file mode 100644
index 000000000000..10a171926cb9
--- /dev/null
+++ b/app-arch/gcab/files/1.2-optional-vapi.patch
@@ -0,0 +1,44 @@
+From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 12 Feb 2019 11:44:10 +0200
+Subject: [PATCH] build-sys: Support disabling vapi generation independent of
+ introspection
+
+---
+ libgcab/meson.build | 12 +++++++-----
+ meson_options.txt   |  1 +
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libgcab/meson.build b/libgcab/meson.build
+index f939617..3c4ac68 100644
+--- a/libgcab/meson.build
++++ b/libgcab/meson.build
+@@ -93,9 +93,11 @@ if get_option('introspection')
+     ],
+     install : true
+   )
+-  gnome.generate_vapi('libgcab-1.0',
+-    sources: gir[0],
+-    packages : ['gio-2.0'],
+-    install : true,
+-  )
++  if get_option('vapi')
++    gnome.generate_vapi('libgcab-1.0',
++      sources: gir[0],
++      packages : ['gio-2.0'],
++      install : true,
++    )
++  endif
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index bbcbbea..b7ade3f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('docs', type : 'boolean', value : true, description : 'enable developer documentation')
+ option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
++option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
+-- 
+2.17.0
+
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
new file mode 100644
index 000000000000..734b3f1b4a88
--- /dev/null
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 940ffd2f3cda..e3f52108b425 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -3,6 +3,6 @@ AUX lbzip2-2.5-glibc-2.28.patch 2142 BLAKE2B 408be3d126974d745e596a5a2f7b61246ed
 DIST lbzip2-2.3.tar.gz 630226 BLAKE2B c08a7257eff859c0b7fb66ae638a57f837f1a2380c500c42ea65dc36e5650b30865d3c4c9820d6fed62bdbc4e3bdf7bae9e8bfe519897d9aac7f0c77cceacfb2 SHA512 4f694445cc90377bf8dac5046b952ff174db571f390c2d7b0aa001f73c76f3d3f048ff8e7297c2055ed1f7b210174496dc31d6628e1cbeff63146a36a442ad4c
 DIST lbzip2-2.5.tar.gz 651399 BLAKE2B a53fc34084ed16c0e78a9f084f68fc0bd1217245e9470ee023f0a4f5a1e2ae4e5866086f9fbc3ff7ec5654c595b4388d9eff495bc0228edbe0322bf9d1fd1f23 SHA512 76e96cfa75b3ed515b2f891349dffc1403daab2dd0a2a614fa0c811cec6ca25faa395da08ad68a9b6ba4069332c4571f70fb7424f06ef3d800c3082c08d7d3d7
 EBUILD lbzip2-2.3-r1.ebuild 806 BLAKE2B e396324e0fde98a11c66232506c5beac4a5fc24c43ff5ba9550e5408cdd53efffee000b6f03ab70ea7f50a7982a3c20e9ff92fde74dabb1513a3ddb7c35f67b0 SHA512 ce7cb5acd3357e7ad80c782c90c6decd8a9ff6041064988ceb454d559058c1f531c92a903324a2b0e64560119fae3f03f54c6c8fb9b00345382220b5c52338b7
-EBUILD lbzip2-2.5-r1.ebuild 834 BLAKE2B 2b944059fcdffb2b52afa1daf3b0f7f1f465a00ac50156cbb773c0669df89675c47321d7927648445f5ae85c3cbe7942730bf1639c461b8514ff1da618003c25 SHA512 038c95292163ec6a384d6776bef88e1069a3111b02b3331af5d1687b87730cbf20008cf660414486c9e2480e6dafb012c8c967ec5eb79905740a97948cfd99dc
+EBUILD lbzip2-2.5-r1.ebuild 832 BLAKE2B ac10ac9c47aa5e1d35729a623dcf399570a0830eb3e7acb073844d71bed3cf009e8329cc5aafd027c0e12b0e14d69dc150c639671f2299ac9ef93947805635d0 SHA512 555f578c530824043884fa0748956a96e42675227abe6d78a287d5afc99e547e171b046ae1c136bb3885b8812fa2b0365b42237f583991021ff8ddb0a84f24c4
 EBUILD lbzip2-2.5.ebuild 826 BLAKE2B c002af26958aa3d8e0cf2d2e6721e24afabd7080ff6680376828ad05c27e267307114ed096d876f74573cdeb35d35f913fd84c3b1154661c5c0a29e05c341877 SHA512 f63095d9320ab1ba66a8142b13592c5444e79315e1d765da3e47631df79e3b98ff6ab325725ab1dd00990c92190e05c9cc3d098b2b79340568435bd6033b03fa
 MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/lbzip2-2.5-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
index 78726f555327..1de8a1e5ad69 100644
--- a/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index fb360423ebb2..0a4ed7396749 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -7,5 +7,5 @@ DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85e
 DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6
 EBUILD tar-1.30-r1.ebuild 2256 BLAKE2B 14041fd4a3c198894c8d470869d52eb94c332cc227fc6f7786145b569f299bc50021c9736dcc4c0b17d7b634b98c2f3318010e53ef6a7e8fa42b2719eee44e67 SHA512 bc06e1350a7df2b30c05d14a78e3de305382206de857b83ec98cd0e376fc832af37d3a2ce0c9ced072da45a6cb981e0438e36d610d63475db1c65cc7c71dd778
 EBUILD tar-1.30.ebuild 2187 BLAKE2B cb952591e27678df72ad53da254bb901d355bf9af7dbe0e22b59a92d3b49fc90c20a9f170154a3ff77bc5aa3cbb2962930cf9258feb5f0f11de3b4dbe2d76f7c SHA512 89fa12ce7849917a85402d98e6532205b294a1793f8f563af952736f282a13ac52f982c0ed87d55a65c7e04f2d150ce5a348bd178ff10512eab822401cee81b2
-EBUILD tar-1.31-r1.ebuild 2269 BLAKE2B 7cdb121cda49c6156ae5c90bb4f15134521058c6d7352c6e253998f0d4a953ae551ead3a58ee4689d81dd0aab678afe7bb54b76a5b1373f56dd769d933290be4 SHA512 eec3e287701de600e32d5c36331c66f4d6889fcb819877d4e76a217cc4db265040779586fe94de065a05cb3d3c8b58b463bf7a31bd4a55c78b1ede8f0a2107db
+EBUILD tar-1.31-r1.ebuild 2266 BLAKE2B 9f281e2266b2773b14d633a8b88d1fb4a076f701a6453ecaa5383ba767ebb16440874c03ff2d1512e25e98f8e1ccc7f806002b19f897ea18a095d59468b4bd66 SHA512 edb72f897b41f164c8142c3b44765797e5e0c11bfd6ba07cf69a7e84a520058024b047f31e9b340d788df972bf98ea5d0675f36b88a9e74de005948ad1f750b0
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.31-r1.ebuild b/app-arch/tar/tar-1.31-r1.ebuild
index 4ffa7630641a..e1e080951528 100644
--- a/app-arch/tar/tar-1.31-r1.ebuild
+++ b/app-arch/tar/tar-1.31-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 5d8884110c2a..a2711802d3bb 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,9 +1,4 @@
-AUX zopfli-1.0.1-makefile.patch 1979 BLAKE2B 7210faf2c8451f42efdd236fc5592fda8bba9010fcfe85112efb79799835382382073021a8695167fe9bb3672f13bb256c3c90cb21ef1e9a13ac652392cc50c6 SHA512 f26b02d88df75d9ce9bf8d86ae5bbf3cdc548be14a81939d26cbfbb2b6b29b74fcf40a62dd4ad20650e7c147d8234f6a0d5d82ff8780c2a1d54ae59825cd43b9
 AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
-DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413e5000ab1fabe7edd2877b9bbc04a0041c5f02fa67fe6a818f68eb4af15251dabf7e599615656956e315b5ece497e2afa1a SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca
-DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
-EBUILD zopfli-1.0.0_p20140705.ebuild 677 BLAKE2B 9ab00361713213e8f01da29b9ace8e1761d70f08a2b7a35535848d4303f0309571852f54aac7b83193c8a323ec13d5e3fd2211416ac91187c6e62b9fa26c7ee1 SHA512 2ed577374b97e3bae087491a10b88d0967930a5de22663bf489844a0577f743bb6562d08b21c1df05396c82c5af0c16f843fde738a5eff37135cc8b2051b615c
-EBUILD zopfli-1.0.1-r2.ebuild 922 BLAKE2B f0ad60d9dd445277d41ef91cd28f329f6cb3d4297cf5cc42c89f27a0595778ff2e83e6050e3dd545796cbeac46756ffc8e279949b6c5cdc7bc8dd49d0ffda622 SHA512 acabf1c21f7d8f4c02fa5f6569f8bfdc1b4b5303a480bde95b762a84c04e7f67aba16761f358c65d14bfc9735e3157788b1317dc2e2b8b1352acbb92aa4a4d33
-EBUILD zopfli-1.0.2.ebuild 922 BLAKE2B 2d8c0b193c86c8f900810ef8748c730649892aa3031e7a85b5c6fb3a03ba8af759831341e9ca89532ea7033bb7c4cbc9f5b0966f5cb6ad39e4f3fec9b329bc5b SHA512 ae65b7cef4869bdb985374252fd036e14bae31de13c22e754d0a96fc0edd9e74058fd779c3a45feadf5be40dcf8b2be72aae9e5294cccbe4777aa14d3d8a2fac
+EBUILD zopfli-1.0.2.ebuild 917 BLAKE2B e2affd91253682ac8e5b559c1b60efc3d3b34c69de0ca4af9130c1c7c0686535477859353cf17ef9fcc5c9fe8ca98c607a415827edc55379d863bb22d904f063 SHA512 d73f8500e43193a1f4c40d29110cdf093c0681fc47873246de3b4abc184fbdad87eb1efa04307fddd7714bfa977439f2009f992f5c831a1e6c8adeb90c843b05
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
diff --git a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
deleted file mode 100644
index a4a7dc280912..000000000000
--- a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- zopfli-zopfli-1.0.1/Makefile
-+++ zopfli-zopfli-1.0.1/Makefile
-@@ -1,8 +1,10 @@
--CC = gcc
--CXX = g++
-+CC ?= gcc
-+CXX ?= g++
- 
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS += -W -Wall -Wextra -ansi -pedantic
-+CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
-+LDFLAGS += -L.
-+LIBS = -lm
- 
- ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
-                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
-@@ -18,24 +20,28 @@
- 
- .PHONY: zopfli zopflipng
- 
-+all: zopfli zopflipng
-+
- # Zopfli binary
--zopfli:
--	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
-+zopfli: libzopfli
-+	$(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
- 
- # Zopfli shared library
- libzopfli:
- 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
--	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
-+	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
-+	@ln -s libzopfli.so.1.0.1 libzopfli.so.1
-+	@ln -s libzopfli.so.1.0.1 libzopfli.so
- 
- # ZopfliPNG binary
--zopflipng:
--	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
-+zopflipng: libzopflipng
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
- 
- # ZopfliPNG shared library
--libzopflipng:
--	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
--	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
-+libzopflipng: libzopfli
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
-+	@ln -s libzopflipng.so.1.0.0 libzopflipng.so.1
-+	@ln -s libzopflipng.so.1.0.0 libzopflipng.so
- 
- # Remove all libraries and binaries
- clean:
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
deleted file mode 100644
index 13820f174c00..000000000000
--- a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Very good, but slow, deflate or zlib compression"
-HOMEPAGE="https://github.com/Hello71/zopfli/"
-SRC_URI="https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	tc-export CC CXX
-
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc CONTRIBUTORS README README.${PN}png
-}
diff --git a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild b/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
deleted file mode 100644
index cb39213529a9..000000000000
--- a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Very good, but slow, deflate or zlib compression"
-HOMEPAGE="https://github.com/google/zopfli/"
-SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DOCS=( CONTRIBUTORS README README.zopflipng )
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
-
-src_prepare() {
-	default
-	tc-export CC CXX
-}
-
-# The Makefile has no install phase
-src_install() {
-	dolib.so libzopfli.so*
-	doheader src/zopfli/zopfli.h
-
-	dobin ${PN}
-
-	# This version was erroneously not bumped to match ${PV}
-	dolib.so libzopflipng.so*
-	doheader src/zopflipng/zopflipng_lib.h
-
-	dobin zopflipng
-}
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
index 9cedbfeb2e43..bd8cc57da2bf 100644
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )