| 1 |
commit: 847bb08dbaecfb136bf307446f0624d18c623685 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 22 15:48:08 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Mar 22 15:48:08 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=847bb08d |
| 7 |
|
| 8 |
update layman-9999 from the main tree. |
| 9 |
|
| 10 |
--- |
| 11 |
app-portage/layman/Manifest | 2 +- |
| 12 |
app-portage/layman/layman-9999.ebuild | 64 ++++++++++++++++++----------------- |
| 13 |
2 files changed, 34 insertions(+), 32 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest |
| 16 |
index 9f728af..d624526 100644 |
| 17 |
--- a/app-portage/layman/Manifest |
| 18 |
+++ b/app-portage/layman/Manifest |
| 19 |
@@ -1,2 +1,2 @@ |
| 20 |
-EBUILD layman-9999.ebuild 1754 SHA256 86c7ea7250fdf61d312a1b16a2f9e328e72ad66bdfb688c97f5719b65458ef54 SHA512 589606a4bcc24599feff477fff0d4a34ead4c61327178d5dfd6324f9c5dd40e210bd0a131b9036e47003c96a92faffc366fcd7ecfc96d46d18c8cd0315b4071e WHIRLPOOL b8dcd32a85fa23cd868009d92d790a259dba7c305e9865934477f5d086421f6b5ee6e4ca1b8b4f40a35204dbd72462901f5ed813151b4568fa555e618ed43755 |
| 21 |
+EBUILD layman-9999.ebuild 1856 SHA256 d7425f2369aeb93bec938e94aa04d8936cc4e1abef3e5d9f1af7446465685d2c SHA512 c1b55071e587cd54abee01226e6e44ef3fced95f516f74e4b68708e6ed6a1a49ab58d6d7ff6ed366c35a692965913e889ae906081a2077e941f74ed151cd1d7f WHIRLPOOL 6da7bafd2d1126e51df38647e8732d3c8cbbf7ca9b227d098a1b23da234e77baa39611b4f687e49a16f0f0134a4f619b1e9d4ac7fd11064f58b9dd88ff072c2e |
| 22 |
MISC metadata.xml 912 SHA256 67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10 SHA512 1316c41eb9d6c1b5d57ed69bd2b50a2ce100af9d94a6aa16d8a56978d1ddd57fc58b5cd8cd101e9ec54ce1248e43868277d3d0b9f03e87587155e455d3e50783 WHIRLPOOL 438e1a0603c20401b0b64104591a3de92bda266bf127c51fd986420fb6f415d0fa9d67c01f2b3d802a2bcc9095d233d18cddaac05696262df28e6ae1efaa17ab |
| 23 |
|
| 24 |
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild |
| 25 |
index 700a5d2..10e87d7 100644 |
| 26 |
--- a/app-portage/layman/layman-9999.ebuild |
| 27 |
+++ b/app-portage/layman/layman-9999.ebuild |
| 28 |
@@ -1,14 +1,13 @@ |
| 29 |
-# Copyright 1999-2012 Gentoo Foundation |
| 30 |
+# Copyright 1999-2014 Gentoo Foundation |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.25 2012/10/21 03:00:31 dolsen Exp $ |
| 33 |
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.33 2014/03/10 03:32:07 dolsen Exp $ |
| 34 |
|
| 35 |
-EAPI="3" |
| 36 |
-SUPPORT_PYTHON_ABIS="1" |
| 37 |
-PYTHON_DEPEND="2:2.6" |
| 38 |
-RESTRICT_PYTHON_ABIS="2.4 3.*" |
| 39 |
-PYTHON_USE_WITH="xml" |
| 40 |
+EAPI="5" |
| 41 |
|
| 42 |
-inherit eutils distutils git-2 prefix |
| 43 |
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 ) |
| 44 |
+PYTHON_REQ_USE="xml(+)" |
| 45 |
+ |
| 46 |
+inherit eutils distutils-r1 git-2 prefix |
| 47 |
|
| 48 |
DESCRIPTION="Tool to manage Gentoo overlays" |
| 49 |
HOMEPAGE="http://layman.sourceforge.net" |
| 50 |
@@ -18,13 +17,12 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/layman.git" |
| 51 |
LICENSE="GPL-2" |
| 52 |
SLOT="0" |
| 53 |
KEYWORDS="" |
| 54 |
-IUSE="bazaar cvs darcs +git mercurial subversion test" |
| 55 |
+IUSE="bazaar cvs darcs +git gpg mercurial subversion test" |
| 56 |
|
| 57 |
-COMMON_DEPS="dev-lang/python" |
| 58 |
-DEPEND="${COMMON_DEPS} |
| 59 |
- test? ( dev-vcs/subversion ) |
| 60 |
+DEPEND="test? ( dev-vcs/subversion ) |
| 61 |
app-text/asciidoc" |
| 62 |
-RDEPEND="${COMMON_DEPS} |
| 63 |
+ |
| 64 |
+RDEPEND=" |
| 65 |
bazaar? ( dev-vcs/bzr ) |
| 66 |
cvs? ( dev-vcs/cvs ) |
| 67 |
darcs? ( dev-vcs/darcs ) |
| 68 |
@@ -32,36 +30,42 @@ RDEPEND="${COMMON_DEPS} |
| 69 |
mercurial? ( dev-vcs/mercurial ) |
| 70 |
subversion? ( |
| 71 |
|| ( |
| 72 |
+ >=dev-vcs/subversion-1.5.4[http] |
| 73 |
>=dev-vcs/subversion-1.5.4[webdav-neon] |
| 74 |
>=dev-vcs/subversion-1.5.4[webdav-serf] |
| 75 |
) |
| 76 |
- )" |
| 77 |
+ ) |
| 78 |
+ gpg? ( =dev-python/pyGPG-9999 ) |
| 79 |
+ virtual/python-argparse[${PYTHON_USEDEP}] |
| 80 |
+ sys-apps/portage[${PYTHON_USEDEP}] |
| 81 |
+ >=dev-python/requests-1.2.1 |
| 82 |
+ dev-python/ndg-httpsclient |
| 83 |
+ dev-python/pyasn1 |
| 84 |
+ >=dev-python/pyopenssl-0.13 |
| 85 |
+ " |
| 86 |
|
| 87 |
-src_prepare() { |
| 88 |
+python_prepare_all() { |
| 89 |
+ distutils-r1_python_prepare_all |
| 90 |
eprefixify etc/layman.cfg layman/config.py |
| 91 |
} |
| 92 |
|
| 93 |
-src_test() { |
| 94 |
- testing() { |
| 95 |
- for suite in layman/tests/{dtest,external}.py ; do |
| 96 |
- PYTHONPATH="." "$(PYTHON)" ${suite} \ |
| 97 |
- || die "test suite '${suite}' failed" |
| 98 |
- done |
| 99 |
- } |
| 100 |
- python_execute_function testing |
| 101 |
+python_test() { |
| 102 |
+ for suite in layman/tests/{dtest,external}.py ; do |
| 103 |
+ PYTHONPATH="." "${PYTHON}" ${suite} \ |
| 104 |
+ || die "test suite '${suite}' failed" |
| 105 |
+ done |
| 106 |
} |
| 107 |
|
| 108 |
-src_compile() { |
| 109 |
- distutils_src_compile |
| 110 |
+python_compile_all() { |
| 111 |
# override MAKEOPTS to prevent build failure |
| 112 |
- emake -j1 -C doc || die "emake -C doc failed" |
| 113 |
+ emake -j1 -C doc |
| 114 |
} |
| 115 |
|
| 116 |
-src_install() { |
| 117 |
- distutils_src_install |
| 118 |
+python_install_all() { |
| 119 |
+ distutils-r1_python_install_all |
| 120 |
|
| 121 |
insinto /etc/layman |
| 122 |
- doins etc/layman.cfg || die |
| 123 |
+ doins etc/layman.cfg |
| 124 |
|
| 125 |
doman doc/layman.8 |
| 126 |
dohtml doc/layman.8.html |
| 127 |
@@ -71,8 +75,6 @@ src_install() { |
| 128 |
} |
| 129 |
|
| 130 |
pkg_postinst() { |
| 131 |
- distutils_pkg_postinst |
| 132 |
- |
| 133 |
# now run layman's update utility |
| 134 |
einfo "Running layman-updater..." |
| 135 |
"${EROOT}"/usr/bin/layman-updater |
Archives