From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1021321-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BBAC61382C5
for <garchives@archives.gentoo.org>; Mon, 30 Apr 2018 02:58:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C03F7E0C10;
Mon, 30 Apr 2018 02:58:38 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 98916E0C10
for <gentoo-commits@lists.gentoo.org>; Mon, 30 Apr 2018 02:58:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D478B335C88
for <gentoo-commits@lists.gentoo.org>; Mon, 30 Apr 2018 02:58:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 44FE528D
for <gentoo-commits@lists.gentoo.org>; Mon, 30 Apr 2018 02:58:35 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1525056872.386007da3c3f8b904dfeab74ab2b3bb825b1bad6.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-arch/xz-utils/xz-utils-9999.ebuild
X-VCS-Directories: app-arch/xz-utils/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 386007da3c3f8b904dfeab74ab2b3bb825b1bad6
X-VCS-Branch: master
Date: Mon, 30 Apr 2018 02:58:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: fa95e9c8-a8c3-4e1a-a90a-0a81f2d4131f
X-Archives-Hash: 4d13ad65d69eb1830655df20efeddd96
commit: 386007da3c3f8b904dfeab74ab2b3bb825b1bad6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 02:54:32 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 02:54:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386007da
app-arch/xz-utils: Bumped live ebuild to EAPI-6.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-arch/xz-utils/xz-utils-9999.ebuild | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index e770562d7a4..a58675ea9d0 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -4,9 +4,9 @@
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
-EAPI=5
+EAPI=6
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.tukaani.org/xz.git"
@@ -16,8 +16,9 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+ [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- S=${WORKDIR}/${MY_P}
+ S="${WORKDIR}/${MY_P}"
EXTRA_DEPEND=
fi
@@ -39,6 +40,7 @@ DEPEND="${RDEPEND}
RESTRICT="!extra-filters? ( test )"
src_prepare() {
+ default
if [[ ${PV} == "9999" ]] ; then
eautopoint
eautoreconf
@@ -77,9 +79,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
- prune_libtool_files --all
- rm "${ED}"/usr/share/doc/xz/COPYING* || die
- mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+ rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
}
pkg_preinst() {