From eb9ff13cb137d9970792c4fc1769969bf7f3f7f4 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Tue, 27 Jan 2015 20:32:50 +0000 Subject: Bump for an additional patch (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8) --- app-portage/mirrorselect/ChangeLog | 9 ++++- ...ct-2.2.2-Add-outputmodefunctionassignment.patch | 24 +++++++++++++ .../mirrorselect/mirrorselect-2.2.2-r1.ebuild | 38 -------------------- .../mirrorselect/mirrorselect-2.2.2-r2.ebuild | 41 ++++++++++++++++++++++ 4 files changed, 73 insertions(+), 39 deletions(-) create mode 100644 app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch delete mode 100644 app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild create mode 100644 app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild diff --git a/app-portage/mirrorselect/ChangeLog b/app-portage/mirrorselect/ChangeLog index 9a76090e7b66..f002d45fddbb 100644 --- a/app-portage/mirrorselect/ChangeLog +++ b/app-portage/mirrorselect/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/mirrorselect # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.150 2015/01/27 04:24:32 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.151 2015/01/27 20:32:50 dolsen Exp $ + +*mirrorselect-2.2.2-r2 (27 Jan 2015) + + 27 Jan 2015; Brian Dolbec -mirrorselect-2.2.2-r1.ebuild, + +mirrorselect-2.2.2-r2.ebuild, + +files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch: + Bump adding missed output assignment patch. 27 Jan 2015; Brian Dolbec mirrorselect-2.2.2.ebuild, +mirrorselect-2.2.2-r1.ebuild, diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch new file mode 100644 index 000000000000..d170103a4657 --- /dev/null +++ b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch @@ -0,0 +1,24 @@ +From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Tue, 27 Jan 2015 10:19:05 -0800 +Subject: [PATCH] Add missed output mode function assignment. + +--- + mirrorselect/extractor.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py +index 59efad1..06dce6c 100644 +--- a/mirrorselect/extractor.py ++++ b/mirrorselect/extractor.py +@@ -107,6 +107,7 @@ class Extractor(object): + # setup the ssl-fetch ouptut map + connector_output = { + 'info':self.output.write, ++ 'debug': self.output.write, + 'error': self.output.print_err, + 'kwargs-info': {'level': 2}, + 'kwargs-debug': {'level':2}, +-- +2.2.2 + diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild deleted file mode 100644 index 8b6e3cc44d73..000000000000 --- a/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2-r1.ebuild,v 1.1 2015/01/27 04:24:32 dolsen Exp $ - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE="xml" - -inherit eutils distutils-r1 prefix - -DESCRIPTION="Tool to help select distfiles mirrors for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect" -SRC_URI="http://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz - http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test - " - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -RDEPEND=" - dev-util/dialog - net-analyzer/netselect - >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}] - " - -PATCHES=( "${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch" ) - -python_prepare_all() { - python_setup - eprefixify setup.py mirrorselect/main.py - echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed" - distutils-r1_python_prepare_all -} diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild new file mode 100644 index 000000000000..5114e0b1af60 --- /dev/null +++ b/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2-r2.ebuild,v 1.1 2015/01/27 20:32:50 dolsen Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE="xml" + +inherit eutils distutils-r1 prefix + +DESCRIPTION="Tool to help select distfiles mirrors for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect" +SRC_URI="http://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz + http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test + " + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +RDEPEND=" + dev-util/dialog + net-analyzer/netselect + >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}] + " + +PATCHES=( + "${FILESDIR}/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch" + "${FILESDIR}/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch" +) + +python_prepare_all() { + python_setup + eprefixify setup.py mirrorselect/main.py + echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version + VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed" + distutils-r1_python_prepare_all +} -- cgit v1.2.3-65-gdbad