gentoo resync : 03.11.2019

4 files changed, 75 insertions, 51 deletions

diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 6a54facd0d30..3827d9f6b9bf 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -3,6 +3,7 @@ AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047
 AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
-EBUILD xar-1.8-r1.ebuild 1193 BLAKE2B a19751f073b99f3d24f01a49252bb07954f21fe53616a3fb632d1a3f6cedd25d427e21f473579d1aa7355ce384685886a8afc9caae178bed9b2560da909f5d16 SHA512 af10895611f19ed52b691f4fca0a2aa06895daa49e02a3067e77e69641eaf9746577f0798fbf6da39bd072a750c8a24f33cfff26b1ef9319e1ff6845b560eaa5
-EBUILD xar-1.8-r2.ebuild 1444 BLAKE2B b7d6a945190c5e8b1ba45b40d23e6baa1e569bf8ba2f18fef79edfd4bc19c3da1d6d3a7be741fb1f56f4f09e68cf9ef9548ff7de100cc27339da3143dfaa9e29 SHA512 7244df1c6dfc828582a1ae71f21abbab8278bd61c6bfc1dd13fd8811e18c156cb83140882fcca50368289ade0a528bebc16b58e510610c62e79fd4ca6c21fd84
+DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
+EBUILD xar-1.8-r2.ebuild 1456 BLAKE2B e92704dbcc169f5835cf94ce00990d9ab253fbbcbd5941c956fe12ee1d87222f0fb7151146dd58ceb6c1271ddbb0d40aa238a3d9b0b0b7ff8a9f646492526fb5 SHA512 118f460be2983419829c050119ce0b2f4c10c18574d5f074af209386e1c079d3001a05681fbcd347a5a97a5d688ec04c71e71e6b21a2b25a1ef3f8f52ae3e8f6
+EBUILD xar-1.8-r3.ebuild 2001 BLAKE2B 3dab7ee32ea82cc9e495437b12fd3938a91b9892723af22f96a73eda4a9dfa06d9f8b35f96996dff63ae17416f442fd034d6bd4dfc53d6e0eb7dc3d00dcab621 SHA512 243ba1c4497bd3148b55719a2fcf28a82c84140241663721d7886d9736332e9e3a6c4188209b6cfddb8699e7f7fc33915b660856e0c812eb715540bd65428e16
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
deleted file mode 100644
index a9d20e9f4226..000000000000
--- a/app-arch/xar/xar-1.8-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib-minimal ltprune
-
-APPLE_PV=400
-DESCRIPTION="An easily extensible archive format"
-HOMEPAGE="https://opensource.apple.com/source/xar/"
-SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libressl kernel_Darwin"
-
-DEPEND="
-	!kernel_Darwin? (
-		virtual/acl
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
-	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
-	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
-)
-
-S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
-
-multilib_src_configure() {
-	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static
-}
-
-multilib_src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 4a33df6ca299..e0a73c431287 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic multilib-minimal ltprune
+inherit flag-o-matic multilib-minimal
 
 APPLE_PV=400
 DESCRIPTION="An easily extensible archive format"
@@ -48,5 +48,5 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild
new file mode 100644
index 000000000000..2b1ae6a93b9c
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib-minimal multilib
+
+APPLE_PV=417.1
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl kernel_Darwin"
+
+DEPEND="
+	!kernel_Darwin? (
+		!kernel_SunOS? ( virtual/acl )
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+	default
+
+	# make lib headers available (without installing first?)
+	cd "${S}"/include || die
+	mv ../lib/*.h . || die
+
+	# strip RPATH pointing to ED
+	cd "${S}"/src || die
+	sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+	# avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+	# file, this doesn't happen outside portage, but it does from the
+	# ebuild env, causing the install phase to re-compile xar.o and link
+	# the executable
+	echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+}
+
+multilib_src_configure() {
+	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+	# botched check, fix it up
+	if use kernel_SunOS ; then
+		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}