gentoo resync : 08.06.2019

4 files changed, 2 insertions, 63 deletions

diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
index 57add58ae81a..6cc468b4621e 100644
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@@ -1,8 +1,4 @@
 AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb
-DIST unshield-1.4.2.tar.gz 46051 BLAKE2B 76e8e724916f5c43c84b17db34f2c5905f99fe424679b9c9fef76e1892d0a2f90e6c195f1a02a8446473860578c34678e395f65cf5973019ed7be5d3dea14e84 SHA512 3ddd5df47198adade66acf89644efe3a1c87d60fcdf511f8e5c1fb29bbb07e77a9abc57a05b161ecb54a26a2a86242bbcba6e90df770b1325965ff5aa8eddf58
 DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa
-DIST unshield-1.4.tar.gz 37199 BLAKE2B 7f32cdbac3dca8e5e7dfca7e9ae7d12066b0484a8e75f611af173ec12dfd03dfd0ee7b79d05e3c7fb45a3285bbbfacf6020ad100907345a1501b3a8de81c81bc SHA512 b09c29fa8e5785f2ca90b40105304802d00d201dde42ef4f5e4b5504ca8edf10da426c7ed1daa8c0685980f085eb20437162812a2068a0c03c0dfd240edbf944
-EBUILD unshield-1.4.2.ebuild 846 BLAKE2B f9528f21ca70da097527aa4f3b7beb2d1c3f18dbb181a0dcb4f512d05ceaca4a7ba6e8c095507a0428c851ea84b3a5832a3997f8274284721ab7daf375bbb8bb SHA512 99f96f2328ae4efe4dc1cc78014b12d630b69413e0f98823d9ad895d45bf3a7bfd96ea132105786699d165440cfc64fa1352f2cbca472699947fb88e3b732772
-EBUILD unshield-1.4.3.ebuild 889 BLAKE2B c262543a00374f4ad4bee887587614121a4cd7a4a7e087e4a86b8fc7b2e85c1cff36617248f50790267f618b6704fca35ed1ee56ecc3557303d1c8119e267576 SHA512 1dd045a9f77de2dce8fbd1e2c5b0ef692adc52a4f14a8f2236862857bef0ad43c0d65bb5035ec8b87dba68f9ac236f820a3ddf466c9025f4be6e609c2d9cf585
-EBUILD unshield-1.4.ebuild 932 BLAKE2B bf19ee8b959311ca950bf81a1d518386614f26dbc5fd799a065fb67847a4c98b9b081a5df3c4624c9bd721995531e56d3b1b41cd5e6d36ec07778bfbf37665d8 SHA512 81c169fa18106e9a4bbebe63ac9f3f4e43f9d4750091a33f65336e36f2995fb1382d5a02bb51b17fb403a06a77ad3a6c0bf47fffa783205b1e53720fc35254a9
+EBUILD unshield-1.4.3.ebuild 887 BLAKE2B 0047de0c471b60bb51a4e7f4830eb8fd0cca449ca18e7b668f048ec1574792394243160c9974713d9a62f9da6b719c9f1db3b3da7e06b3998b937a3813ebddbe SHA512 a180935e33e5c92ffcc244360aa4142fa6103de44468155c3db5b2544e79586fa225f80a890a921858b33167fdffccf20fd5a121fbf1d0e08321f83d9fa00bfd
 MISC metadata.xml 224 BLAKE2B 39d3ea8455cb2158a24af3db4266dd569cd7765eafa967c5ae2a2cc9f9ceec9d0a8928b5e99d9e5bc5f610501bb6129f1648d6560e0a4980ef9e026dc821a164 SHA512 3c955bc3bb3a290848f9cc01472321c321ad63b98a10eb1a7986024db98c099e5a18c628c6398b37c42e69d333fe88d74cca5c22293aba196991aa317e6ed670
diff --git a/app-arch/unshield/unshield-1.4.2.ebuild b/app-arch/unshield/unshield-1.4.2.ebuild
deleted file mode 100644
index 1410d202234b..000000000000
--- a/app-arch/unshield/unshield-1.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="InstallShield CAB file extractor"
-HOMEPAGE="https://github.com/twogood/unshield"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-
-# OpenSSL (or LibreSSL) is detected at build time, and used to determine
-# whether or not a hand-rolled md5 implementation is used. The build
-# system prefers OpenSSL's implementation if it's available, and OpenSSL
-# is common enough, so we prefer it too. Since the dependency is
-# automagic (there's no way to hide it), we require Open/LibreSSL
-# unconditionally.
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.4.3.ebuild
index 1577c7f0553f..77af3622c0e2 100644
--- a/app-arch/unshield/unshield-1.4.3.ebuild
+++ b/app-arch/unshield/unshield-1.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 
 # OpenSSL (or LibreSSL) is detected at build time, and used to determine
 # whether or not a hand-rolled md5 implementation is used. The build
diff --git a/app-arch/unshield/unshield-1.4.ebuild b/app-arch/unshield/unshield-1.4.ebuild
deleted file mode 100644
index 44fa7c700751..000000000000
--- a/app-arch/unshield/unshield-1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="InstallShield CAB file extractor"
-HOMEPAGE="https://github.com/twogood/unshield"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-
-# OpenSSL (or LibreSSL) is detected at build time, and used to determine
-# whether or not a hand-rolled md5 implementation is used. The build
-# system prefers OpenSSL's implementation if it's available, and OpenSSL
-# is common enough, so we prefer it too. Since the dependency is
-# automagic (there's no way to hide it), we require Open/LibreSSL
-# unconditionally.
-IUSE="libressl"
-
-DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-# Without this, the build fails looking for unshield_config.h.
-CMAKE_IN_SOURCE_BUILD=y