commit: fd40ac78005fbc99905dbb01968c04780a3e81b4 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Fri Apr 27 17:26:39 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> 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 <blueness <AT> 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 -}