commit: 4c44df03b20e9277768a96989c90c91a7908fa9b Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Jan 8 15:39:10 2019 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Jan 15 16:36:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c44df03
app-portage/layman: Python 3.7, EAPI=7 Closes: https://bugs.gentoo.org/674884 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../{layman-9999.ebuild => layman-2.4.2-r2.ebuild} | 26 +++++++++++----------- app-portage/layman/layman-9999.ebuild | 26 +++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild similarity index 76% copy from app-portage/layman/layman-9999.ebuild copy to app-portage/layman/layman-2.4.2-r2.ebuild index 41753c3c889..917d938ba62 100644 --- a/app-portage/layman/layman-9999.ebuild +++ b/app-portage/layman/layman-2.4.2-r2.ebuild @@ -1,24 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy ) PYTHON_REQ_USE="xml(+),sqlite?" -inherit eutils distutils-r1 git-r3 linux-info prefix +inherit eutils distutils-r1 linux-info prefix + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi DESCRIPTION="Tool to manage Gentoo overlays" -HOMEPAGE="http://layman.sourceforge.net"; -EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" +HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" DEPEND="test? ( dev-vcs/subversion ) - app-text/asciidoc " RDEPEND=" @@ -78,11 +83,6 @@ python_test() { unset suite } -python_compile_all() { - # override MAKEOPTS to prevent build failure - emake -j1 -C doc -} - python_install_all() { distutils-r1_python_install_all diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild index 41753c3c889..917d938ba62 100644 --- a/app-portage/layman/layman-9999.ebuild +++ b/app-portage/layman/layman-9999.ebuild @@ -1,24 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy ) PYTHON_REQ_USE="xml(+),sqlite?" -inherit eutils distutils-r1 git-r3 linux-info prefix +inherit eutils distutils-r1 linux-info prefix + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi DESCRIPTION="Tool to manage Gentoo overlays" -HOMEPAGE="http://layman.sourceforge.net"; -EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" +HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" DEPEND="test? ( dev-vcs/subversion ) - app-text/asciidoc " RDEPEND=" @@ -78,11 +83,6 @@ python_test() { unset suite } -python_compile_all() { - # override MAKEOPTS to prevent build failure - emake -j1 -C doc -} - python_install_all() { distutils-r1_python_install_all
