mgorny 15/06/03 02:34:55 Modified: xz-utils-9999.ebuild ChangeLog Added: xz-utils-5.2.1-r1.ebuild Removed: xz-utils-5.2.1.ebuild Log: Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/139 by nigoro. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.21 app-arch/xz-utils/xz-utils-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild?r1=1.20&r2=1.21 Index: xz-utils-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xz-utils-9999.ebuild 28 Apr 2014 17:19:43 -0000 1.20 +++ xz-utils-9999.ebuild 3 Jun 2015 02:34:55 -0000 1.21 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.20 2014/04/28 17:19:43 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.21 2015/06/03 02:34:55 mgorny Exp $ # Remember: we cannot leverage autotools in this ebuild in order # to avoid circular deps with autotools @@ -28,7 +28,7 @@ # See top-level COPYING file as it outlines the various pieces and their licenses. LICENSE="public-domain LGPL-2.1+ GPL-2+" SLOT="0" -IUSE="nls static-libs +threads" +IUSE="elibc_FreeBSD nls static-libs +threads" RDEPEND="!<app-arch/lzma-4.63 !app-arch/lzma-utils @@ -46,6 +46,7 @@ } multilib_src_configure() { + use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714 ECONF_SOURCE="${S}" econf \ $(use_enable nls) \ $(use_enable threads) \ 1.96 app-arch/xz-utils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/ChangeLog?rev=1.96&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/ChangeLog?rev=1.96&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/ChangeLog?r1=1.95&r2=1.96 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- ChangeLog 4 Apr 2015 22:34:26 -0000 1.95 +++ ChangeLog 3 Jun 2015 02:34:55 -0000 1.96 @@ -1,6 +1,13 @@ # ChangeLog for app-arch/xz-utils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.95 2015/04/04 22:34:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.96 2015/06/03 02:34:55 mgorny Exp $ + +*xz-utils-5.2.1-r1 (03 Jun 2015) + + 03 Jun 2015; Michał Górny <[email protected]> +xz-utils-5.2.1-r1.ebuild, + -xz-utils-5.2.1.ebuild, xz-utils-9999.ebuild: + Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo- + portage-rsync-mirror/pull/139 by nigoro. 04 Apr 2015; Mike Frysinger <[email protected]> xz-utils-5.0.8.ebuild: Mark arm64/m68k/s390/sh stable. 1.1 app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild?rev=1.1&content-type=text/plain Index: xz-utils-5.2.1-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild,v 1.1 2015/06/03 02:34:55 mgorny Exp $ # Remember: we cannot leverage autotools in this ebuild in order # to avoid circular deps with autotools EAPI="4" inherit eutils multilib toolchain-funcs libtool multilib-minimal if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="http://git.tukaani.org/xz.git"; inherit git-2 autotools SRC_URI="" EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 else MY_P="${PN/-utils}-${PV/_}" SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S=${WORKDIR}/${MY_P} EXTRA_DEPEND= fi DESCRIPTION="utils for managing LZMA compressed files" HOMEPAGE="http://tukaani.org/xz/"; # See top-level COPYING file as it outlines the various pieces and their licenses. LICENSE="public-domain LGPL-2.1+ GPL-2+" SLOT="0" IUSE="elibc_FreeBSD nls static-libs +threads" RDEPEND="!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57" DEPEND="${RDEPEND} ${EXTRA_DEPEND}" src_prepare() { if [[ ${PV} == "9999" ]] ; then eautopoint eautoreconf else elibtoolize # to allow building shared libs on Solaris/x64 fi } multilib_src_configure() { use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714 ECONF_SOURCE="${S}" econf \ $(use_enable nls) \ $(use_enable threads) \ $(use_enable static-libs static) \ $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}) } multilib_src_install() { default multilib_is_native_abi && gen_usr_ldscript -a lzma } multilib_src_install_all() { prune_libtool_files --all rm "${ED}"/usr/share/doc/xz/COPYING* || die mv "${ED}"/usr/share/doc/{xz,${PF}} || die } pkg_preinst() { preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0) } pkg_postinst() { preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0) }
