diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2010-02-21 16:10:00 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2010-02-21 16:10:00 +0000 |
| commit | c75c4d2d246e4d841d7488579dd2d89838765163 (patch) | |
| tree | 7eb28a38fcb96e9dd0104a368782053177cf2a5e /app-portage | |
| parent | Taking over maintenance as proxycommitter with upstream (diff) | |
| download | gentoo-2-c75c4d2d246e4d841d7488579dd2d89838765163.tar.gz gentoo-2-c75c4d2d246e4d841d7488579dd2d89838765163.tar.bz2 gentoo-2-c75c4d2d246e4d841d7488579dd2d89838765163.zip | |
app-portage/layman: Integrate fix for bug #306143
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/layman/ChangeLog | 8 | ||||
| -rw-r--r-- | app-portage/layman/files/layman-1.3.2-missing-import.patch | 53 | ||||
| -rw-r--r-- | app-portage/layman/layman-1.3.2-r1.ebuild (renamed from app-portage/layman/layman-1.3.2.ebuild) | 6 |
3 files changed, 65 insertions, 2 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 1919aa0911ac..9fbbd0c70e27 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-portage/layman # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.101 2010/02/20 21:11:38 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.102 2010/02/21 16:09:59 sping Exp $ + +*layman-1.3.2-r1 (21 Feb 2010) + + 21 Feb 2010; Sebastian Pipping <sping@gentoo.org> -layman-1.3.2.ebuild, + +layman-1.3.2-r1.ebuild, +files/layman-1.3.2-missing-import.patch: + Integrate fix for bug #306143 *layman-1.3.2 (20 Feb 2010) diff --git a/app-portage/layman/files/layman-1.3.2-missing-import.patch b/app-portage/layman/files/layman-1.3.2-missing-import.patch new file mode 100644 index 000000000000..f192dfd1e1aa --- /dev/null +++ b/app-portage/layman/files/layman-1.3.2-missing-import.patch @@ -0,0 +1,53 @@ +From 806b99591eaab8f398988dfc4f2a2452738dd622 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sun, 21 Feb 2010 17:02:24 +0100 +Subject: [PATCH] Fix missing import + +--- + doc/layman.8.xml | 2 +- + layman/makeconf.py | 2 ++ + layman/version.py | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/doc/layman.8.xml b/doc/layman.8.xml +index 246c83d..dc9cc38 100644 +--- a/doc/layman.8.xml ++++ b/doc/layman.8.xml +@@ -197,7 +197,7 @@ + <title>layman</title> + <date>January 2010</date> + <productname>layman</productname> +- <productnumber>1.3.2</productnumber> ++ <productnumber>1.3.2_p1</productnumber> + <copyright> + <year>2005-2009</year> + <holder>Gunnar Wrobel</holder> +diff --git a/layman/makeconf.py b/layman/makeconf.py +index 4bb70b5..fdd10c4 100644 +--- a/layman/makeconf.py ++++ b/layman/makeconf.py +@@ -19,6 +19,8 @@ import os + import codecs + import re + ++from layman.utils import path ++ + #=============================================================================== + # + # Helper class MakeConf +diff --git a/layman/version.py b/layman/version.py +index 631ffcc..c42c7f9 100644 +--- a/layman/version.py ++++ b/layman/version.py +@@ -20,7 +20,7 @@ + __version__ = "$Id: layman-1.3.2-missing-import.patch,v 1.1 2010/02/21 16:10:00 sping Exp $" + + +-VERSION = '1.3.2' ++VERSION = '1.3.2_p1' + + if __name__ == '__main__': + print VERSION +-- +1.6.6 + diff --git a/app-portage/layman/layman-1.3.2.ebuild b/app-portage/layman/layman-1.3.2-r1.ebuild index d42fe00ab25b..f852b90a65e0 100644 --- a/app-portage/layman/layman-1.3.2.ebuild +++ b/app-portage/layman/layman-1.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.2.ebuild,v 1.1 2010/02/20 21:11:38 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.2-r1.ebuild,v 1.1 2010/02/21 16:09:59 sping Exp $ EAPI="2" NEED_PYTHON=2.5 @@ -34,6 +34,10 @@ RDEPEND="${COMMON_DEPS} )" RESTRICT_PYTHON_ABIS="2.4 3.*" +src_prepare() { + epatch "${FILESDIR}"/${P}-missing-import.patch +} + pkg_setup() { if ! has_version dev-util/subversion; then ewarn "You do not have dev-util/subversion installed!" |