From 70376e296ccf04cd15c03db6fd7a8c83bf0cf09f Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Tue, 31 May 2016 07:19:21 -0700 Subject: app-portage/layman: Bump with patch, fixes bug 582154 Package-Manager: portage-2.3.0_rc1 --- .../layman-2.4.1-sourcefileattributechanges.patch | 42 ++++++++++ app-portage/layman/layman-2.4.1-r1.ebuild | 93 ++++++++++++++++++++++ app-portage/layman/layman-2.4.1.ebuild | 89 --------------------- 3 files changed, 135 insertions(+), 89 deletions(-) create mode 100644 app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch create mode 100644 app-portage/layman/layman-2.4.1-r1.ebuild delete mode 100644 app-portage/layman/layman-2.4.1.ebuild (limited to 'app-portage/layman') diff --git a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch new file mode 100644 index 00000000000..207f474304c --- /dev/null +++ b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch @@ -0,0 +1,42 @@ +From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Tue, 10 May 2016 15:12:02 -0700 +Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied + 'sourcefile' attribute changes + +It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for +backward compatibility. +It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError. +The filepath of the affected file for the error message had an extra leading '_'. +Add the module name to the warning message. +--- + layman/module.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/layman/module.py b/layman/module.py +index 08bcbc2..092418f 100644 +--- a/layman/module.py ++++ b/layman/module.py +@@ -49,13 +49,14 @@ class Module(object): + kid = self.module_spec['provides'][submodule] + kidname = kid['name'] + try: ++ kid['module_name'] = '.'.join([mod_name, kid['sourcefile']]) ++ except KeyError: + kid['module_name'] = '.'.join([mod_name, kidname]) +- except ImportError: +- kid['module_name'] = '.'.join([mod_name, self.name]) +- f = self.__module.__file__ +- msg = 'Module.__initialize(); module spec is old, missing '\ ++ f = self._module.__file__ ++ msg = 'Module.__initialize(); %(module)s module spec is old, missing '\ + 'attribute: \'sourcefile\'.\nBackward compatibility '\ +- 'may be removed in the future.\nFile: %(f)s' % {'f': f} ++ 'may be removed in the future.\nFile: %(f)s' % { ++ 'module': self.name, 'f': f} + self.output.warn(msg) + kid['is_imported'] = False + self.kids[kidname] = kid +-- +2.8.3 + diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild new file mode 100644 index 00000000000..748813befa9 --- /dev/null +++ b/app-portage/layman/layman-2.4.1-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) +PYTHON_REQ_USE="xml(+),sqlite?" + +inherit eutils distutils-r1 linux-info prefix + +DESCRIPTION="Tool to manage Gentoo overlays" +HOMEPAGE="https://wiki.gentoo.org/wiki/Layman" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86" +IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" + +DEPEND="test? ( dev-vcs/subversion ) + " + +RDEPEND=" + bazaar? ( dev-vcs/bzr ) + cvs? ( dev-vcs/cvs ) + darcs? ( dev-vcs/darcs ) + git? ( dev-vcs/git ) + mercurial? ( dev-vcs/mercurial ) + g-sorcery? ( app-portage/g-sorcery ) + 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-0.2 ) + sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) + !sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + >=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] + " + +PATCHES=( + "${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch" +) + +layman_check_kernel_config() { + local CONFIG_CHECK + use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" + [[ -n ${CONFIG_CHECK} ]] && check_extra_config +} + +pkg_pretend() { + layman_check_kernel_config +} + +pkg_setup() { + layman_check_kernel_config +} + +python_prepare_all() { + python_setup + esetup.py setup_plugins + distutils-r1_python_prepare_all + eprefixify etc/layman.cfg layman/config.py +} + +python_test() { + suite=layman/tests/external.py + PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed" + unset suite +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /etc/layman + doins etc/layman.cfg + + doman doc/layman.8 + dohtml doc/layman.8.html + + keepdir /var/lib/layman + keepdir /etc/layman/overlays +} + +pkg_postinst() { + # now run layman's update utility + einfo "Running layman-updater..." + "${EROOT}"/usr/bin/layman-updater + einfo +} diff --git a/app-portage/layman/layman-2.4.1.ebuild b/app-portage/layman/layman-2.4.1.ebuild deleted file mode 100644 index 79dcd8c0df7..00000000000 --- a/app-portage/layman/layman-2.4.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) -PYTHON_REQ_USE="xml(+),sqlite?" - -inherit eutils distutils-r1 linux-info prefix - -DESCRIPTION="Tool to manage Gentoo overlays" -HOMEPAGE="https://wiki.gentoo.org/wiki/Layman" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86" -IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test" - -DEPEND="test? ( dev-vcs/subversion ) - " - -RDEPEND=" - bazaar? ( dev-vcs/bzr ) - cvs? ( dev-vcs/cvs ) - darcs? ( dev-vcs/darcs ) - git? ( dev-vcs/git ) - mercurial? ( dev-vcs/mercurial ) - g-sorcery? ( app-portage/g-sorcery ) - 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-0.2 ) - sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] ) - !sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - >=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}] - " - -layman_check_kernel_config() { - local CONFIG_CHECK - use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS" - [[ -n ${CONFIG_CHECK} ]] && check_extra_config -} - -pkg_pretend() { - layman_check_kernel_config -} - -pkg_setup() { - layman_check_kernel_config -} - -python_prepare_all() { - python_setup - esetup.py setup_plugins - distutils-r1_python_prepare_all - eprefixify etc/layman.cfg layman/config.py -} - -python_test() { - suite=layman/tests/external.py - PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed" - unset suite -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /etc/layman - doins etc/layman.cfg - - doman doc/layman.8 - dohtml doc/layman.8.html - - keepdir /var/lib/layman - keepdir /etc/layman/overlays -} - -pkg_postinst() { - # now run layman's update utility - einfo "Running layman-updater..." - "${EROOT}"/usr/bin/layman-updater - einfo -} -- cgit v1.2.1