commit:     5af94853755a557a7ff0259261564ae3ec54df6b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 10:32:52 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 10:32:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af94853

app-arch/xar-1.8-r4: revbump: fix musl, ppc-macos, version branding

- (attempt to) fix musl linking problem by pulling in fts-standalone
- fix ppc-macos/old Darwin compiles by disabling CommonCrypto usage in
  favour of libre/openssl, which we fully control wrt versioning etc.
- add Gentoo version to xar --version output

Closes: https://bugs.gentoo.org/713948
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-arch/xar/xar-1.8-r4.ebuild | 82 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
new file mode 100644
index 00000000000..6106c668f82
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl"
+
+DEPEND="
+       elibc_musl? ( sys-libs/fts-standalone )
+       kernel_linux? ( 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
+
+       # drop Darwin specific reliance on CommonCrypto Framework, for it
+       # depends on what version of Darwin we're on, and it is much simpler
+       # to just use open/libressl instead, which we maintain and control
+       cd "${S}" || die
+       sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+               include/archive.h \
+               lib/hash.c \
+               || die
+
+       # fix branding somewhat
+       sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+}
+
+multilib_src_configure() {
+       append-libs $(pkg-config --libs openssl)
+       use elibc_musl && append-libs $(pkg-config --libs fts-standalone)
+       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
+}

Reply via email to