From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 87E91138334 for ; Fri, 8 Nov 2019 09:48:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AC17E096A; Fri, 8 Nov 2019 09:48:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3AA17E096A for ; Fri, 8 Nov 2019 09:48:01 +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 2B6B634CA86 for ; Fri, 8 Nov 2019 09:47:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A63638A9 for ; Fri, 8 Nov 2019 09:47:55 +0000 (UTC) From: "Lars Wendler" 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" Message-ID: <1573206464.5b3feae07252c3445c9740a2a8fb418689844d22.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/automake/automake-1.16.1-r2.ebuild sys-devel/automake/automake-9999.ebuild X-VCS-Directories: sys-devel/automake/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 5b3feae07252c3445c9740a2a8fb418689844d22 X-VCS-Branch: master Date: Fri, 8 Nov 2019 09:47:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9fb33f48-dbfa-4362-ac98-7eeb40bcaf6e X-Archives-Hash: 3e815a44d13fbc0cb550402a02ae497d commit: 5b3feae07252c3445c9740a2a8fb418689844d22 Author: Lars Wendler gentoo org> AuthorDate: Fri Nov 8 09:38:59 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Nov 8 09:47:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3feae0 sys-devel/automake: EAPI-7 bumps Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> sys-devel/automake/automake-1.16.1-r2.ebuild | 36 ++++++++++++++++---------- sys-devel/automake/automake-9999.ebuild | 38 ++++++++++++++++++---------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild index 963d7cd4783..70e1fed3e37 100644 --- a/sys-devel/automake/automake-1.16.1-r2.ebuild +++ b/sys-devel/automake/automake-1.16.1-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 versionator +inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" @@ -13,11 +13,11 @@ if [[ ${PV} == 9999 ]] ; then else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} + MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -39,9 +39,12 @@ RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + test? ( ${PYTHON_DEPS} ) +" PATCHES=( "${FILESDIR}"/automake-1.16.1-py3-compile.patch @@ -68,8 +71,8 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die + pushd "${ED}"/usr/share/info >/dev/null || die + rm dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -98,16 +101,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile=""${ED}"/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi } diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild index 6932450d2cc..9490f85d527 100644 --- a/sys-devel/automake/automake-9999.ebuild +++ b/sys-devel/automake/automake-9999.ebuild @@ -1,23 +1,23 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 versionator +inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} + MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" else - MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b" + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" # Alpha/beta releases are not distributed on the usual mirrors. @@ -39,9 +39,12 @@ RDEPEND="dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip sys-apps/help2man - test? ( ${PYTHON_DEPS} )" + test? ( ${PYTHON_DEPS} ) +" pkg_setup() { use test && python-any-r1_pkg_setup @@ -64,8 +67,8 @@ src_prepare() { # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { - pushd "${ED%/}"/usr/share/info >/dev/null || die - rm -f dir || die + pushd "${ED}"/usr/share/info >/dev/null || die + rm dir || die # Rewrite all the references to other pages. # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. @@ -94,16 +97,23 @@ src_install() { default slot_info_pages - rm "${ED%/}"/usr/share/aclocal/README || die - rmdir "${ED%/}"/usr/share/aclocal || die + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die rm \ - "${ED%/}"/usr/bin/{aclocal,automake} \ - "${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die # remove all config.guess and config.sub files replacing them # w/a symlink to a specific gnuconfig version local x for x in guess sub ; do - dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x} + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} done + + # Avoid QA message about pre-compressed file in docs + local tarfile=""${ED}"/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi }