gentoo resync : 19.03.2019

4 files changed, 69 insertions, 80 deletions

diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 684ef4ba3e4d..96e5dac81da8 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,12 +1,10 @@
 AUX cabextract-1.9-fix-bigendian.patch 424 BLAKE2B ce74e2a626705cc82a76852d97701329477d1956463a6c589a1f005462cfb5ca7cf61f86e651da793fdef8fbb6e17115d312da666d5168190967eb69f4633548 SHA512 70c07f4bdea2be135d7f24c7b24ab1f8a672b3772226e47bfa13b065cb73ec7f2fb3c1ad3ed1bda3f3a3d8ee6774ae90163b5702be300f058d9f028bd85f6b9e
 AUX cabextract-1.9-remove-spurious-test_files.patch 423 BLAKE2B 33c226d287ab77a3bf7388093149ebace4542112ce4fcdd6a2a8808858da44d1278a89ba5f415de84d2f4a1475af3f0f863c1401b2a091d5ce7192f6d52caddb SHA512 8f6bc900cb04d2177b6a179ef91046cf47fdada15118ad530d588ccab1ae4c7617d851a2cf36c73018f336c812564b0d6abdee1bd549330aa19ba9cbfc7d17d7
-DIST cabextract-1.6.tar.gz 241731 BLAKE2B 49a94b1b0d8a6c9f61cd51280a035e3fedb8d7a2d097b132bc56114c6003a558647a7f8c47b8d08fcac1999e68bea5303adb2b03c8e6dd010995e8b0c6dcd442 SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8
-DIST cabextract-1.7.tar.gz 293760 BLAKE2B d5ab4783c944d5d8b1d9ed8a2fbbfd60aeeab9f12b836032f982efc5721055b2caa521147246b3b5274d9456b1dbd2d513455cfd57750cf6d7fdc18f109f96c9 SHA512 63789e485d57299f2a0a60dc6d9a94e83639eb59b73789eff52977d3d3bd37a1c00713c86a4c6289e35541d0b7240ea0545ba84013713c070b4324ae1f2865ce
 DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
+DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14
 DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
-EBUILD cabextract-1.6.ebuild 1115 BLAKE2B d6898fc1ef97920e8c7a54d3f79963a59f93b90b0c432f3cf088efaa202a4eb37b1385cdae1c2f91b97f3252938216f55192851291824c33c79ec02df6f7a08e SHA512 10c82fad424f0e5093816ebab945c37e88180618431be7b1068c847534ceb83e3e9ee0379862ec3dc312b65b01cfc2954d3300dd98d36455421d6814840df534
-EBUILD cabextract-1.7.ebuild 1155 BLAKE2B 0f93ea1453dae2141d540a11ca038cc8dec1443d93bb4b517735e3b2eab92ab5f56a94330cb442896808d500600fe78a19a83e32c2e167f49fed37eec9ae402c SHA512 d0503c4541eb6eaf93fb3dfa50a6a968b8355a17cdfe5d52af0ccf2187b886bd23e1db740fb0f3647b43c88f1537fc6d992fc0cb96eda675f4e45672a4856266
 EBUILD cabextract-1.8.ebuild 1152 BLAKE2B e4db9bd87b69f44a8be2e56462245531b639a6a4700ac087f8919319997dff2fc9c3267e21a763fa7607a678598b20bfdc6705eba76a19d268aa9e945460b5d2 SHA512 9da9c8b743b7eb5a091af81ffc9d010dbea4580e6b15a43c8e68c0638b14c397412b1f4c4d1fca8759cf3a18d033dccec351dafddf894cb888ee39948189a09b
 EBUILD cabextract-1.9-r2.ebuild 1670 BLAKE2B 4472600bd7e89c2be27073b13d5012e52aaabb92418745f8796b76a54d3d1ec7858ce08d56d1200d88db845a90e730ab65c959c6ae0ab0a6366271992154da46 SHA512 6d11319f7af3a32bdca6f015b62678260812bcd44672d313ec007b18d5ff310e0a73686b87710e9a3d3e9e86dd1f0b4c59c2461d2eea1c2d2c9537d87b363441
+EBUILD cabextract-1.9.1.ebuild 1566 BLAKE2B 1053df84c408ba80d89fdc1e5aab1b826d278b91b009da43120b30edda5b5ce4717923c3b47c04f8f0401c4854e4c70f2af76e44787021389ce59fb3b1660eb7 SHA512 e169dba7c24cd69c454427d4627b0a9d51b3f412c6862fe3d7d97927940192966662170e1968f9edc757bd54f0ff66c3accd33114f319ab198d77accc82de033
 EBUILD cabextract-9999.ebuild 1566 BLAKE2B 79681bf62a5e3a14c21c7491e47e650b21e2fb518dd8a7df870da3afce17a74f79089c5b25981bc20e64a9044376b9bd77425d75c065acfdd0d03d2771d6d1bc SHA512 d6f9ce211b4114a29084decd6f56e7675b31115bf507518e1f4d07547e5c2d40ea71408f275da12b8723d47a1ed6280b31019b07112af9960d9b583862ba4832
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.6.ebuild b/app-arch/cabextract/cabextract-1.6.ebuild
deleted file mode 100644
index da02381ab494..000000000000
--- a/app-arch/cabextract/cabextract-1.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="https://www.cabextract.org.uk/"
-SRC_URI="https://www.cabextract.org.uk/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="extras"
-
-RDEPEND="extras? ( dev-lang/perl )"
-
-src_prepare() {
-	# the code attempts to set up a fnmatch replacement, but then fails to code
-	# it properly leading to undefined references to rpl_fnmatch().  This may be
-	# removed in the future if building still works by setting "yes" to "no".
-	export ac_cv_func_fnmatch_works=yes
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
-	dohtml doc/wince_cab_format.html
-	if use extras; then
-		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
-	fi
-}
diff --git a/app-arch/cabextract/cabextract-1.7.ebuild b/app-arch/cabextract/cabextract-1.7.ebuild
deleted file mode 100644
index 694d49c73d70..000000000000
--- a/app-arch/cabextract/cabextract-1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="https://www.cabextract.org.uk/"
-SRC_URI="https://www.cabextract.org.uk/${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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="extras"
-
-RDEPEND="extras? ( dev-lang/perl )"
-
-src_prepare() {
-	default
-	# the code attempts to set up a fnmatch replacement, but then fails to code
-	# it properly leading to undefined references to rpl_fnmatch().  This may be
-	# removed in the future if building still works by setting "yes" to "no".
-	export ac_cv_func_fnmatch_works=yes
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic )
-	default
-	docinto html
-	dodoc doc/wince_cab_format.html
-	if use extras; then
-		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
-	fi
-}
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
new file mode 100644
index 000000000000..fb656c5eab7b
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
+	inherit git-r3
+	MY_P="${PN}-9999"
+
+	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	MY_PV="${PV/_alpha/alpha}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
+
+	LIBMSPACK_DEPEND=">=dev-libs/libmspack-0.8_alpha:="
+fi
+
+DESCRIPTION="Extracts files from Microsoft cabinet archive files"
+HOMEPAGE="https://www.cabextract.org.uk/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="extras"
+
+DEPEND="${LIBMSPACK_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${LIBMSPACK_DEPEND}
+	extras? ( dev-lang/perl )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		# Re-create file layout from release tarball
+		pushd "${WORKDIR}" &>/dev/null || die
+		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
+		rm -r "${S}" || die
+		mv "${WORKDIR}"/${PN}-source "${S}" || die
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-external-libmspack=yes
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README TODO doc/magic )
+	default
+	docinto html
+	dodoc doc/wince_cab_format.html
+	if use extras; then
+		dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
+	fi
+}