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 81E5E138331 for ; Fri, 27 Apr 2018 22:11:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 958A3E0951; Fri, 27 Apr 2018 22:11:37 +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 6494DE08F9 for ; Fri, 27 Apr 2018 22:11:37 +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 C6972335C98 for ; Fri, 27 Apr 2018 22:11:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10FA52B4 for ; Fri, 27 Apr 2018 22:11:32 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1524867074.fd40ac78005fbc99905dbb01968c04780a3e81b4.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/elfix/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/elfix/elfix-0.9.2.ebuild sys-apps/elfix/elfix-9999.ebuild X-VCS-Directories: sys-apps/elfix/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: fd40ac78005fbc99905dbb01968c04780a3e81b4 X-VCS-Branch: master Date: Fri, 27 Apr 2018 22:11:32 +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-Archives-Salt: d8d9bd38-292e-4a0c-9c87-6e83a1a2937b X-Archives-Hash: 867403757d58be7a7776c82c6642f1e9 commit: fd40ac78005fbc99905dbb01968c04780a3e81b4 Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 27 17:26:39 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Apr 27 22:11:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd40ac78 sys-apps/elfix: git-2->git-r3, git://->https:// Also eutils is unneeded, autotools is only needed on live ebuilds. Go ahead and bump to EAPI=6. Package-Manager: Portage-2.3.31, Repoman-2.3.9 Signed-off-by: Anthony G. Basile gentoo.org> sys-apps/elfix/elfix-0.9.2.ebuild | 25 ++++++++++++------------- sys-apps/elfix/elfix-9999.ebuild | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/sys-apps/elfix/elfix-0.9.2.ebuild b/sys-apps/elfix/elfix-0.9.2.ebuild index 11349cf6d6f..2bc81bd6ca5 100644 --- a/sys-apps/elfix/elfix-0.9.2.ebuild +++ b/sys-apps/elfix/elfix-0.9.2.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" - inherit git-2 +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git" + inherit autotools git-r3 else SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" @@ -21,6 +19,8 @@ LICENSE="GPL-3" SLOT="0" IUSE="+ptpax +xtpax" +DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO ) + REQUIRED_USE="|| ( ptpax xtpax )" # These only work with a properly configured PaX kernel @@ -33,7 +33,11 @@ DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=] RDEPEND="${DEPEND}" src_prepare() { - [[ ${PV} == "9999" ]] && ./autogen.sh + default + if [[ ${PV} == *9999* ]]; then + eautoreconf + cd doc && ./make.sh || die + fi } src_configure() { @@ -42,8 +46,3 @@ src_configure() { $(use_enable ptpax) \ $(use_enable xtpax) } - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog INSTALL README THANKS TODO -} diff --git a/sys-apps/elfix/elfix-9999.ebuild b/sys-apps/elfix/elfix-9999.ebuild index 9e35e46644d..0eaa5ebdfec 100644 --- a/sys-apps/elfix/elfix-9999.ebuild +++ b/sys-apps/elfix/elfix-9999.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" - inherit git-2 +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git" + inherit autotools git-r3 else SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" @@ -21,6 +19,8 @@ LICENSE="GPL-3" SLOT="0" IUSE="+ptpax +xtpax" +DOCS=( AUTHORS ChangeLog INSTALL README.md THANKS TODO ) + REQUIRED_USE="|| ( ptpax xtpax )" # These only work with a properly configured PaX kernel @@ -33,7 +33,11 @@ DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=] RDEPEND="${DEPEND}" src_prepare() { - [[ ${PV} == "9999" ]] && ./autogen.sh + default + if [[ ${PV} == *9999* ]]; then + eautoreconf + cd doc && ./make.sh || die + fi } src_configure() { @@ -42,8 +46,3 @@ src_configure() { $(use_enable ptpax) \ $(use_enable xtpax) } - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog INSTALL README THANKS TODO -}