summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-06-03 02:34:55 +0000
committerMichał Górny <mgorny@gentoo.org>2015-06-03 02:34:55 +0000
commiteb41714a0b87f7d176ea69414c55bfb70c841fe4 (patch)
treea4e74a396517e3e6fbbcb9cd0ef318a5fa09feb5 /app-arch
parentStable on ppc and x86, wrt bug #543930 (diff)
downloadgentoo-2-eb41714a0b87f7d176ea69414c55bfb70c841fe4.tar.gz
gentoo-2-eb41714a0b87f7d176ea69414c55bfb70c841fe4.tar.bz2
gentoo-2-eb41714a0b87f7d176ea69414c55bfb70c841fe4.zip
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!)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/xz-utils/ChangeLog9
-rw-r--r--app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild (renamed from app-arch/xz-utils/xz-utils-5.2.1.ebuild)5
-rw-r--r--app-arch/xz-utils/xz-utils-9999.ebuild7
3 files changed, 15 insertions, 6 deletions
diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 50494400275a..67e7da0d4be6 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -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 <mgorny@gentoo.org> +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 <vapier@gentoo.org> xz-utils-5.0.8.ebuild:
Mark arm64/m68k/s390/sh stable.
diff --git a/app-arch/xz-utils/xz-utils-5.2.1.ebuild b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
index 1a58f851782b..f3abdbf45b58 100644
--- a/app-arch/xz-utils/xz-utils-5.2.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.1 2015/02/26 17:44:16 vapier Exp $
+# $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
@@ -28,7 +28,7 @@ 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="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 @@ src_prepare() {
}
multilib_src_configure() {
+ use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf \
$(use_enable nls) \
$(use_enable threads) \
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 748e01f97b26..cd1079970451 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -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 @@ 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="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 @@ src_prepare() {
}
multilib_src_configure() {
+ use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf \
$(use_enable nls) \
$(use_enable threads) \