diff options
author | Michał Górny <mgorny@gentoo.org> | 2013-07-22 09:24:11 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2013-07-22 09:24:11 +0000 |
commit | e505880f2f25a4249e055c402b498c66385deae2 (patch) | |
tree | 19377be599519be62202074fc633036d625852ce /app-portage | |
parent | New ebuild for ardour 3.3 (diff) | |
download | gentoo-2-e505880f2f25a4249e055c402b498c66385deae2.tar.gz gentoo-2-e505880f2f25a4249e055c402b498c66385deae2.tar.bz2 gentoo-2-e505880f2f25a4249e055c402b498c66385deae2.zip |
Drop old.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'app-portage')
-rw-r--r-- | app-portage/gentoopm/ChangeLog | 6 | ||||
-rw-r--r-- | app-portage/gentoopm/files/pkgcore-0.8.1-api.patch | 56 | ||||
-rw-r--r-- | app-portage/gentoopm/gentoopm-0.2.5-r2.ebuild | 41 | ||||
-rw-r--r-- | app-portage/gentoopm/gentoopm-0.2.7.ebuild | 41 |
4 files changed, 5 insertions, 139 deletions
diff --git a/app-portage/gentoopm/ChangeLog b/app-portage/gentoopm/ChangeLog index ef500e653fd0..26ba5e8a8854 100644 --- a/app-portage/gentoopm/ChangeLog +++ b/app-portage/gentoopm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/gentoopm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/ChangeLog,v 1.39 2013/02/16 11:58:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/ChangeLog,v 1.40 2013/07/22 09:24:10 mgorny Exp $ + + 22 Jul 2013; Michał Górny <mgorny@gentoo.org> -files/pkgcore-0.8.1-api.patch, + -gentoopm-0.2.5-r2.ebuild, -gentoopm-0.2.7.ebuild: + Drop old. *gentoopm-0.2.8 (16 Feb 2013) diff --git a/app-portage/gentoopm/files/pkgcore-0.8.1-api.patch b/app-portage/gentoopm/files/pkgcore-0.8.1-api.patch deleted file mode 100644 index 8dcfd1798711..000000000000 --- a/app-portage/gentoopm/files/pkgcore-0.8.1-api.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 553961c332e9a588da9085228f297767d47884e2 Mon Sep 17 00:00:00 2001 -From: Brian Harring <ferringb@gmail.com> -Date: Sun, 14 Oct 2012 15:03:39 -0700 -Subject: [PATCH] Fix pkgcore support for >0.8. - ---- - gentoopm/pkgcorepm/__init__.py | 7 +++++-- - gentoopm/pkgcorepm/repo.py | 8 ++++++-- - 2 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/gentoopm/pkgcorepm/__init__.py b/gentoopm/pkgcorepm/__init__.py -index aa117a0..1071e49 100644 ---- a/gentoopm/pkgcorepm/__init__.py -+++ b/gentoopm/pkgcorepm/__init__.py -@@ -33,8 +33,11 @@ class PkgCorePM(PackageManager): - - @property - def installed(self): -- return PkgCoreInstalledRepo(self._domain.named_repos['vdb'], -- self._domain) -+ if hasattr(self._domain, 'repos_raw'): -+ repos = self._domain.repos_raw -+ else: -+ repos = self._domain.named_repos -+ return PkgCoreInstalledRepo(repos['vdb'], self._domain) - - @property - def Atom(self): -diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py -index dc43148..d3bacf9 100644 ---- a/gentoopm/pkgcorepm/repo.py -+++ b/gentoopm/pkgcorepm/repo.py -@@ -18,14 +18,18 @@ from .filter import transform_filters - - class PkgCoreRepoDict(PMRepositoryDict): - def __iter__(self): -+ if hasattr(self._domain, 'repos_raw'): -+ trees = self._domain.repos_raw -+ else: -+ trees = self._domain.named_repos - try: -- trees = self._domain.named_repos['repo-stack'].trees -+ trees = trees['repo-stack'].trees - except KeyError: # pkgcore-0.7.5+ - def _match_ebuild_repos(x): - return isinstance(x, UnconfiguredTree) - - trees = filter(_match_ebuild_repos, -- self._domain.named_repos.values()) -+ trees.values()) - rev = -1 - else: - rev = 1 --- -1.7.12 - diff --git a/app-portage/gentoopm/gentoopm-0.2.5-r2.ebuild b/app-portage/gentoopm/gentoopm-0.2.5-r2.ebuild deleted file mode 100644 index e6754ce20216..000000000000 --- a/app-portage/gentoopm/gentoopm-0.2.5-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.5-r2.ebuild,v 1.2 2012/10/14 22:54:06 ferringb Exp $ - -EAPI=4 -PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2' - -inherit base python-distutils-ng - -DESCRIPTION="A common interface to Gentoo package managers" -HOMEPAGE="https://bitbucket.org/mgorny/gentoopm/" -SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~mips x86 ~amd64-fbsd ~x86-fbsd" -IUSE="doc" - -RDEPEND="|| ( >=sys-apps/portage-2.1.10.3 - >=sys-apps/pkgcore-0.8 - >=sys-apps/paludis-0.64.2[python-bindings] )" -DEPEND="doc? ( dev-python/epydoc )" -PDEPEND="app-admin/eselect-package-manager" - -python_prepare_all() { - base_src_prepare -} - -src_compile() { - python-distutils-ng_src_compile - - if use doc; then - "${PYTHON}" setup.py doc || die - fi -} - -python_install_all() { - if use doc; then - dohtml -r doc/* - fi -} diff --git a/app-portage/gentoopm/gentoopm-0.2.7.ebuild b/app-portage/gentoopm/gentoopm-0.2.7.ebuild deleted file mode 100644 index 37e51190c543..000000000000 --- a/app-portage/gentoopm/gentoopm-0.2.7.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.7.ebuild,v 1.3 2013/01/09 21:38:33 zerochaos Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} ) - -inherit distutils-r1 - -DESCRIPTION="A common interface to Gentoo package managers" -HOMEPAGE="https://bitbucket.org/mgorny/gentoopm/" -SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="doc" - -RDEPEND="|| ( - sys-apps/pkgcore - >=sys-apps/portage-2.1.10.3 - >=sys-apps/paludis-0.64.2[python-bindings] )" -DEPEND="doc? ( dev-python/epydoc )" -PDEPEND="app-admin/eselect-package-manager" - -python_compile_all() { - if use doc; then - python_export_best - "${PYTHON}" setup.py doc || die - fi -} - -python_test() { - "${PYTHON}" setup.py test || die -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/* ) - - distutils-r1_python_install_all -} |