| 1 |
commit: 4c44df03b20e9277768a96989c90c91a7908fa9b |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 15:39:10 2019 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 15 16:36:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c44df03 |
| 7 |
|
| 8 |
app-portage/layman: Python 3.7, EAPI=7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/674884 |
| 11 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{layman-9999.ebuild => layman-2.4.2-r2.ebuild} | 26 +++++++++++----------- |
| 15 |
app-portage/layman/layman-9999.ebuild | 26 +++++++++++----------- |
| 16 |
2 files changed, 26 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild |
| 19 |
similarity index 76% |
| 20 |
copy from app-portage/layman/layman-9999.ebuild |
| 21 |
copy to app-portage/layman/layman-2.4.2-r2.ebuild |
| 22 |
index 41753c3c889..917d938ba62 100644 |
| 23 |
--- a/app-portage/layman/layman-9999.ebuild |
| 24 |
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild |
| 25 |
@@ -1,24 +1,29 @@ |
| 26 |
-# Copyright 1999-2017 Gentoo Foundation |
| 27 |
+# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI="5" |
| 31 |
+EAPI="7" |
| 32 |
|
| 33 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) |
| 34 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy ) |
| 35 |
PYTHON_REQ_USE="xml(+),sqlite?" |
| 36 |
|
| 37 |
-inherit eutils distutils-r1 git-r3 linux-info prefix |
| 38 |
+inherit eutils distutils-r1 linux-info prefix |
| 39 |
+ |
| 40 |
+if [[ ${PV} == *9999 ]] ; then |
| 41 |
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" |
| 42 |
+ inherit git-r3 |
| 43 |
+else |
| 44 |
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 45 |
+ 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" |
| 46 |
+fi |
| 47 |
|
| 48 |
DESCRIPTION="Tool to manage Gentoo overlays" |
| 49 |
-HOMEPAGE="http://layman.sourceforge.net" |
| 50 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" |
| 51 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Layman" |
| 52 |
|
| 53 |
LICENSE="GPL-2" |
| 54 |
SLOT="0" |
| 55 |
-KEYWORDS="" |
| 56 |
IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" |
| 57 |
|
| 58 |
DEPEND="test? ( dev-vcs/subversion ) |
| 59 |
- app-text/asciidoc |
| 60 |
" |
| 61 |
|
| 62 |
RDEPEND=" |
| 63 |
@@ -78,11 +83,6 @@ python_test() { |
| 64 |
unset suite |
| 65 |
} |
| 66 |
|
| 67 |
-python_compile_all() { |
| 68 |
- # override MAKEOPTS to prevent build failure |
| 69 |
- emake -j1 -C doc |
| 70 |
-} |
| 71 |
- |
| 72 |
python_install_all() { |
| 73 |
distutils-r1_python_install_all |
| 74 |
|
| 75 |
|
| 76 |
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild |
| 77 |
index 41753c3c889..917d938ba62 100644 |
| 78 |
--- a/app-portage/layman/layman-9999.ebuild |
| 79 |
+++ b/app-portage/layman/layman-9999.ebuild |
| 80 |
@@ -1,24 +1,29 @@ |
| 81 |
-# Copyright 1999-2017 Gentoo Foundation |
| 82 |
+# Copyright 1999-2019 Gentoo Authors |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
-EAPI="5" |
| 86 |
+EAPI="7" |
| 87 |
|
| 88 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) |
| 89 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy ) |
| 90 |
PYTHON_REQ_USE="xml(+),sqlite?" |
| 91 |
|
| 92 |
-inherit eutils distutils-r1 git-r3 linux-info prefix |
| 93 |
+inherit eutils distutils-r1 linux-info prefix |
| 94 |
+ |
| 95 |
+if [[ ${PV} == *9999 ]] ; then |
| 96 |
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" |
| 97 |
+ inherit git-r3 |
| 98 |
+else |
| 99 |
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 100 |
+ 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" |
| 101 |
+fi |
| 102 |
|
| 103 |
DESCRIPTION="Tool to manage Gentoo overlays" |
| 104 |
-HOMEPAGE="http://layman.sourceforge.net" |
| 105 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git" |
| 106 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Layman" |
| 107 |
|
| 108 |
LICENSE="GPL-2" |
| 109 |
SLOT="0" |
| 110 |
-KEYWORDS="" |
| 111 |
IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" |
| 112 |
|
| 113 |
DEPEND="test? ( dev-vcs/subversion ) |
| 114 |
- app-text/asciidoc |
| 115 |
" |
| 116 |
|
| 117 |
RDEPEND=" |
| 118 |
@@ -78,11 +83,6 @@ python_test() { |
| 119 |
unset suite |
| 120 |
} |
| 121 |
|
| 122 |
-python_compile_all() { |
| 123 |
- # override MAKEOPTS to prevent build failure |
| 124 |
- emake -j1 -C doc |
| 125 |
-} |
| 126 |
- |
| 127 |
python_install_all() { |
| 128 |
distutils-r1_python_install_all |
Archives