commit: 847bb08dbaecfb136bf307446f0624d18c623685
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 22 15:48:08 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Mar 22 15:48:08 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=847bb08d
update layman-9999 from the main tree.
---
app-portage/layman/Manifest | 2 +-
app-portage/layman/layman-9999.ebuild | 64 ++++++++++++++++++-----------------
2 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 9f728af..d624526 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,2 +1,2 @@
-EBUILD layman-9999.ebuild 1754 SHA256
86c7ea7250fdf61d312a1b16a2f9e328e72ad66bdfb688c97f5719b65458ef54 SHA512
589606a4bcc24599feff477fff0d4a34ead4c61327178d5dfd6324f9c5dd40e210bd0a131b9036e47003c96a92faffc366fcd7ecfc96d46d18c8cd0315b4071e
WHIRLPOOL
b8dcd32a85fa23cd868009d92d790a259dba7c305e9865934477f5d086421f6b5ee6e4ca1b8b4f40a35204dbd72462901f5ed813151b4568fa555e618ed43755
+EBUILD layman-9999.ebuild 1856 SHA256
d7425f2369aeb93bec938e94aa04d8936cc4e1abef3e5d9f1af7446465685d2c SHA512
c1b55071e587cd54abee01226e6e44ef3fced95f516f74e4b68708e6ed6a1a49ab58d6d7ff6ed366c35a692965913e889ae906081a2077e941f74ed151cd1d7f
WHIRLPOOL
6da7bafd2d1126e51df38647e8732d3c8cbbf7ca9b227d098a1b23da234e77baa39611b4f687e49a16f0f0134a4f619b1e9d4ac7fd11064f58b9dd88ff072c2e
MISC metadata.xml 912 SHA256
67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10 SHA512
1316c41eb9d6c1b5d57ed69bd2b50a2ce100af9d94a6aa16d8a56978d1ddd57fc58b5cd8cd101e9ec54ce1248e43868277d3d0b9f03e87587155e455d3e50783
WHIRLPOOL
438e1a0603c20401b0b64104591a3de92bda266bf127c51fd986420fb6f415d0fa9d67c01f2b3d802a2bcc9095d233d18cddaac05696262df28e6ae1efaa17ab
diff --git a/app-portage/layman/layman-9999.ebuild
b/app-portage/layman/layman-9999.ebuild
index 700a5d2..10e87d7 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v
1.25 2012/10/21 03:00:31 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v
1.33 2014/03/10 03:32:07 dolsen Exp $
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-PYTHON_USE_WITH="xml"
+EAPI="5"
-inherit eutils distutils git-2 prefix
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit eutils distutils-r1 git-2 prefix
DESCRIPTION="Tool to manage Gentoo overlays"
HOMEPAGE="http://layman.sourceforge.net";
@@ -18,13 +17,12 @@
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/layman.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="bazaar cvs darcs +git mercurial subversion test"
+IUSE="bazaar cvs darcs +git gpg mercurial subversion test"
-COMMON_DEPS="dev-lang/python"
-DEPEND="${COMMON_DEPS}
- test? ( dev-vcs/subversion )
+DEPEND="test? ( dev-vcs/subversion )
app-text/asciidoc"
-RDEPEND="${COMMON_DEPS}
+
+RDEPEND="
bazaar? ( dev-vcs/bzr )
cvs? ( dev-vcs/cvs )
darcs? ( dev-vcs/darcs )
@@ -32,36 +30,42 @@ RDEPEND="${COMMON_DEPS}
mercurial? ( dev-vcs/mercurial )
subversion? (
|| (
+ >=dev-vcs/subversion-1.5.4[http]
>=dev-vcs/subversion-1.5.4[webdav-neon]
>=dev-vcs/subversion-1.5.4[webdav-serf]
)
- )"
+ )
+ gpg? ( =dev-python/pyGPG-9999 )
+ virtual/python-argparse[${PYTHON_USEDEP}]
+ sys-apps/portage[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.2.1
+ dev-python/ndg-httpsclient
+ dev-python/pyasn1
+ >=dev-python/pyopenssl-0.13
+ "
-src_prepare() {
+python_prepare_all() {
+ distutils-r1_python_prepare_all
eprefixify etc/layman.cfg layman/config.py
}
-src_test() {
- testing() {
- for suite in layman/tests/{dtest,external}.py ; do
- PYTHONPATH="." "$(PYTHON)" ${suite} \
- || die "test suite '${suite}' failed"
- done
- }
- python_execute_function testing
+python_test() {
+ for suite in layman/tests/{dtest,external}.py ; do
+ PYTHONPATH="." "${PYTHON}" ${suite} \
+ || die "test suite '${suite}' failed"
+ done
}
-src_compile() {
- distutils_src_compile
+python_compile_all() {
# override MAKEOPTS to prevent build failure
- emake -j1 -C doc || die "emake -C doc failed"
+ emake -j1 -C doc
}
-src_install() {
- distutils_src_install
+python_install_all() {
+ distutils-r1_python_install_all
insinto /etc/layman
- doins etc/layman.cfg || die
+ doins etc/layman.cfg
doman doc/layman.8
dohtml doc/layman.8.html
@@ -71,8 +75,6 @@ src_install() {
}
pkg_postinst() {
- distutils_pkg_postinst
-
# now run layman's update utility
einfo "Running layman-updater..."
"${EROOT}"/usr/bin/layman-updater
