From 4d40a91cd0f8d2e4ab668432f70936aebb7f7417 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Thu, 29 Dec 2011 07:25:07 -0800 Subject: add porthole-0.6.1-r3, missing-attribute.patch. Fixes bug 323179. --- app-portage/porthole/Manifest | 5 ++ .../files/porthole-0.6.1-masking_status.patch | 17 +++++ .../files/porthole-0.6.1-missing-attribute.patch | 14 ++++ .../files/porthole-0.6.1-missing_import.patch | 19 ++++++ app-portage/porthole/porthole-0.6.1-r3.ebuild | 77 ++++++++++++++++++++++ 5 files changed, 132 insertions(+) create mode 100644 app-portage/porthole/Manifest create mode 100644 app-portage/porthole/files/porthole-0.6.1-masking_status.patch create mode 100644 app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch create mode 100644 app-portage/porthole/files/porthole-0.6.1-missing_import.patch create mode 100644 app-portage/porthole/porthole-0.6.1-r3.ebuild diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest new file mode 100644 index 0000000..01a0776 --- /dev/null +++ b/app-portage/porthole/Manifest @@ -0,0 +1,5 @@ +AUX porthole-0.6.1-masking_status.patch 485 RMD160 33844ab398f4b7b9d1f9a44bde16cbebd748f364 SHA1 6324045a2dea9532c2bd7f2567c7767999560d58 SHA256 1ba67b57505994566942f03722b6edccd817550a2fac984fbbcb25bf6c98b254 +AUX porthole-0.6.1-missing-attribute.patch 665 RMD160 4e0ed5fc3b6b01ac0a18d3295f730a17fcafd839 SHA1 434dd9d1d7483951443590cbfacd6ef1d4469146 SHA256 4d70d5d85fbc7de42bbef3f4bbe23d0feafd46252d0d38ae76aee9760df437ff +AUX porthole-0.6.1-missing_import.patch 858 RMD160 1f7413cceba3889cf4451c084b4cb0554b581180 SHA1 70d8ca1f2bc2bd86e116ff8f8985c1939cf9541b SHA256 d79428460882d99d4dc0fa5130a1adcb7523488347309a95fd37b7312b0dd8a1 +DIST porthole-0.6.1.tar.bz2 958696 RMD160 7265f695d02e2eec22954d827dcb7ae86712cd26 SHA1 d0d48b007152f1cc6922a8c6be4c793cdeb45d61 SHA256 eb9991cb078f51f5b4c9900995ffc3f7f5e3891e62b10cd1c5384efece010d62 +EBUILD porthole-0.6.1-r3.ebuild 2163 RMD160 cb884e44df9b5ed17f102488cfc7b1c316dfe256 SHA1 e408266f88c868acaad998f5bb25b15ab251ac47 SHA256 86517ee22d366558d086d270bc72992376c5109ef4c2e921aad943c2923f5f2f diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch new file mode 100644 index 0000000..e626fbb --- /dev/null +++ b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch @@ -0,0 +1,17 @@ +Index: porthole/backends/portagelib.py +=================================================================== +--- porthole/backends/portagelib.py (revision 1209) ++++ porthole/backends/portagelib.py (working copy) +@@ -452,7 +452,11 @@ + + + def get_masking_status(ebuild): +- return portage.getmaskingstatus(ebuild) ++ try: ++ status = portage.getmaskingstatus(ebuild) ++ except KeyError: ++ status = ['deprecated'] ++ return status + + + def get_masking_reason(ebuild): diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch new file mode 100644 index 0000000..aa011a1 --- /dev/null +++ b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch @@ -0,0 +1,14 @@ +diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py + +--- porthole/db/user_configs.py.old 2010-11-27 13:34:35.000000000 +0600 ++++ porthole/db/user_configs.py 2010-11-27 13:31:24.000000000 +0600 +@@ -364,7 +364,7 @@ + debug.dprint("USER_CONFIGS: set_user_config(): add: " + + "%s,\n remove: %s " %(str(add),str(remove))) + set_config.set_user_config(filename=file, name=name, ebuild=ebuild, +- comment=comment, username=privileges.USER, ++ comment=comment, username=privileges.user, + add=add, remove=remove) + self.set_config_callback() + else: + \ No newline at end of file diff --git a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch new file mode 100644 index 0000000..33c9e4e --- /dev/null +++ b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch @@ -0,0 +1,19 @@ +--- porthole/db/user_configs.py 2010/03/20 12:32:29 1217 ++++ porthole/db/user_configs.py 2010/03/20 14:10:46 1218 +@@ -36,6 +36,7 @@ + from porthole import backends + portage_lib = backends.portage_lib + from porthole.utils import debug ++from porthole.privilege import controller as privileges + + ## set up this module to act as a user configs data server, + ## watch the user configs for changes and auto update +@@ -363,7 +364,7 @@ + debug.dprint("USER_CONFIGS: set_user_config(): add: " + + "%s,\n remove: %s " %(str(add),str(remove))) + set_config.set_user_config(filename=file, name=name, ebuild=ebuild, +- comment=comment, username=priviliges.USER, ++ comment=comment, username=privileges.USER, + add=add, remove=remove) + self.set_config_callback() + else: diff --git a/app-portage/porthole/porthole-0.6.1-r3.ebuild b/app-portage/porthole/porthole-0.6.1-r3.ebuild new file mode 100644 index 0000000..3c8f5ff --- /dev/null +++ b/app-portage/porthole/porthole-0.6.1-r3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r2.ebuild,v 1.3 2011/02/23 07:20:23 fuzzyray Exp $ + +EAPI="2" +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +PYTHON_USE_WITH="xml threads" + +inherit distutils eutils + +DESCRIPTION="A GTK+-based frontend to Portage" +HOMEPAGE="http://porthole.sourceforge.net" +SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="nls" +LANGS="de pl ru vi it fr tr" +for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done + +RDEPEND=">=sys-apps/portage-2.1 + dev-python/pygtk:2 + gnome-base/libglade:2.0 + dev-python/pygtksourceview:2 + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.14 )" +RESTRICT_PYTHON_ABIS="3.*" + +src_prepare() { + epatch "${FILESDIR}/${P}-masking_status.patch" # bug 307037 + epatch "${FILESDIR}/${P}-missing_import.patch" # bug 323179 + epatch "${FILESDIR}/${P}-missing-attribute.patch" #bug 323179 +} + +src_compile(){ + # Compile localizations if necessary + if use nls ; then + cd scripts + ./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed" + fi +} + +src_install() { + distutils_src_install + + dodoc TODO README NEWS AUTHORS + + keepdir /var/log/porthole + fperms g+w /var/log/porthole + keepdir /var/db/porthole + fperms g+w /var/db/porthole + + # nls + if use nls; then + # mo directory doesn't exists with nls enabled and unsupported LINGUAS + [[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/* + fi +} + +pkg_preinst() { + chgrp portage "${D}"/var/log/porthole + chgrp portage "${D}"/var/db/porthole +} + +pkg_postinst() { + einfo + einfo "Porthole has updated the way that the upgrades are sent to emerge." + einfo "In this new way the user needs to set any 'Settings' menu emerge options" + einfo "Porthole automatically adds '--oneshot' for all upgrades selections" + einfo "Other options recommended are '--noreplace' along with '--update'" + einfo "They allow for portage to skip any packages that might have already" + einfo "been upgraded as a dependency of another previously upgraded package" + einfo +} -- cgit v1.2.3-18-g5258