gentoo resync : 18.11.2018

3 files changed, 135 insertions, 0 deletions

diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index f416766e06c2..a206a23b59df 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,7 +1,10 @@
 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.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.ebuild 1543 BLAKE2B 707fedbda86cab166376cbb6eeffa4129ce1721fda5166348ee44e2afdcca71f77eb5231f422a8742068df79dc24d965ff32953dc5eba88b713e58b940ded721 SHA512 47e0dcdb5b20b8eeb864617b7727d145f820ae4a655172e3b7da42b2aef3c73e69d6ecfe49e9fc84bc6b680310d44dfb0312322131d001ad06c512944a2d1e46
+EBUILD cabextract-9999.ebuild 1545 BLAKE2B 63e227bc1912b9b79227015436421a4732a56611dd8c95effbcff7f16a0a18cc5dd00f2c71a1d9129771c910c3fc35dd2fea8133a1d3c41ee34331652529ef26 SHA512 51f060bcf741c5e4be1d0926a846d664aa91db0f270833fc1345c6242d28d69e86c90ffd6462d60a9ec30209192f4cb7a4a64bf659b118d2eac338daa7c1173a
 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.ebuild
new file mode 100644
index 000000000000..68a27ed3bc97
--- /dev/null
+++ b/app-arch/cabextract/cabextract-1.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 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="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
+}
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
new file mode 100644
index 000000000000..49070540a767
--- /dev/null
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 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="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
+}