gentoo resync : 24.12.2018

5 files changed, 48 insertions, 5 deletions

diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index a206a23b59df..eacef1721f28 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,3 +1,5 @@
+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
@@ -5,6 +7,6 @@ DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e
 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.ebuild 1543 BLAKE2B 707fedbda86cab166376cbb6eeffa4129ce1721fda5166348ee44e2afdcca71f77eb5231f422a8742068df79dc24d965ff32953dc5eba88b713e58b940ded721 SHA512 47e0dcdb5b20b8eeb864617b7727d145f820ae4a655172e3b7da42b2aef3c73e69d6ecfe49e9fc84bc6b680310d44dfb0312322131d001ad06c512944a2d1e46
-EBUILD cabextract-9999.ebuild 1545 BLAKE2B 63e227bc1912b9b79227015436421a4732a56611dd8c95effbcff7f16a0a18cc5dd00f2c71a1d9129771c910c3fc35dd2fea8133a1d3c41ee34331652529ef26 SHA512 51f060bcf741c5e4be1d0926a846d664aa91db0f270833fc1345c6242d28d69e86c90ffd6462d60a9ec30209192f4cb7a4a64bf659b118d2eac338daa7c1173a
+EBUILD cabextract-1.9-r2.ebuild 1666 BLAKE2B a9f8833387531ead5fae84b54f3f7ada7bb2cca091ed3e6fca4b92aa19a3f5ecd96ebac828b57102b26810fe431284e53776537f5d3403cbc978040c5ec685c4 SHA512 a5ce8046364fe81c2af042e49bfd3e93cf2a0e7316ecc9415f0ae7cc3d11a9a9cb208b32e7e68863d8fa1f1d268e553693981c4efb3dc3b05d56d822ffb64c14
+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.9.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
index 68a27ed3bc97..32c897bac175 100644
--- a/app-arch/cabextract/cabextract-1.9.ebuild
+++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	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"
+	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"
@@ -29,7 +29,13 @@ IUSE="extras"
 
 DEPEND="${LIBMSPACK_DEPEND}
 	virtual/pkgconfig"
-RDEPEND="extras? ( dev-lang/perl )"
+RDEPEND="${LIBMSPACK_DEPEND}
+	extras? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-bigendian.patch
+	"${FILESDIR}"/${P}-remove-spurious-test_files.patch
+)
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
index 49070540a767..6f8a446e8da4 100644
--- a/app-arch/cabextract/cabextract-9999.ebuild
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -29,7 +29,8 @@ IUSE="extras"
 
 DEPEND="${LIBMSPACK_DEPEND}
 	virtual/pkgconfig"
-RDEPEND="extras? ( dev-lang/perl )"
+RDEPEND="${LIBMSPACK_DEPEND}
+	extras? ( dev-lang/perl )"
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
new file mode 100644
index 000000000000..760dd9dbb013
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
+
+---
+ configure.ac  | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_C_BIGENDIAN
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
diff --git a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
new file mode 100644
index 000000000000..d80b8704834c
--- /dev/null
+++ b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/2f78851e3927b05931574b380ca6dccaf91e3807
+
+---
+ test/bugs.test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/test/bugs.test
++++ b/test/bugs.test
+@@ -2,7 +2,7 @@
+ # test that known crash bugs remain fixed
+ . test/testcase
+ 
+-$cabextract -t $test_files/bugs/*.cab
++$cabextract -t bugs/*.cab
+ 
+ # fail if exit code indicates a crash (SIGBUS, SIGSEGV, etc.)
+ test $? -le 1