From: Christian Ruppert <idl0r@gentoo.org>
Date: Sat, 19 Jun 2010 17:57:23 +0000 (+0000)
Subject: Revision bump to fix bug 323179, thanks to Kete Tefid <ketetefid@gmail.com>.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f1d2a2376d667c2371612d8fff3edc8692093e1;p=gentoo.git

Revision bump to fix bug 323179, thanks to Kete Tefid <ketetefid@gmail.com>.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/app-portage/porthole/ChangeLog b/app-portage/porthole/ChangeLog
index 347dc416e2dc..406d83a35080 100644
--- a/app-portage/porthole/ChangeLog
+++ b/app-portage/porthole/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/porthole
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/ChangeLog,v 1.48 2010/05/17 22:29:28 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/ChangeLog,v 1.49 2010/06/19 17:57:22 idl0r Exp $
+
+*porthole-0.6.1-r2 (19 Jun 2010)
+
+  19 Jun 2010; Christian Ruppert <idl0r@gentoo.org>
+  +porthole-0.6.1-r2.ebuild, +files/porthole-0.6.1-missing_import.patch:
+  Revision bump to fix bug 323179, thanks to Kete Tefid
+  <ketetefid@gmail.com>.
 
   17 May 2010; Kenneth Prugh <ken69267@gentoo.org> porthole-0.6.1-r1.ebuild:
   amd64 stable, bug #313443
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
index ddc5ebcb6c50..7c550d677db4 100644
--- a/app-portage/porthole/Manifest
+++ b/app-portage/porthole/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX porthole-0.6.1-masking_status.patch 485 RMD160 33844ab398f4b7b9d1f9a44bde16cbebd748f364 SHA1 6324045a2dea9532c2bd7f2567c7767999560d58 SHA256 1ba67b57505994566942f03722b6edccd817550a2fac984fbbcb25bf6c98b254
+AUX porthole-0.6.1-missing_import.patch 858 RMD160 1f7413cceba3889cf4451c084b4cb0554b581180 SHA1 70d8ca1f2bc2bd86e116ff8f8985c1939cf9541b SHA256 d79428460882d99d4dc0fa5130a1adcb7523488347309a95fd37b7312b0dd8a1
 DIST porthole-0.6.0.tar.bz2 918432 RMD160 6b8d43308f3c3a7815713dc3423b9c1db2761978 SHA1 6ad75058ce4b20dca3683e9793115c570080b407 SHA256 1cb8cccbef6c2860474de53fe3d4ac65ee1b688722971b97830ef42cd76e2bd5
 DIST porthole-0.6.1.tar.bz2 958696 RMD160 7265f695d02e2eec22954d827dcb7ae86712cd26 SHA1 d0d48b007152f1cc6922a8c6be4c793cdeb45d61 SHA256 eb9991cb078f51f5b4c9900995ffc3f7f5e3891e62b10cd1c5384efece010d62
 EBUILD porthole-0.6.0.ebuild 1706 RMD160 ad0564c40ee5887732950843b2648298410976e0 SHA1 f18abdb98494cd51c4b90d96de8b5451e3148ccb SHA256 02c3b4058494e6baddc97d874e0bab6cc580e1dfd51700ae52b723e9cb1eb7b9
 EBUILD porthole-0.6.1-r1.ebuild 2051 RMD160 b1eb3c79f8b1f8de1a96abbe34fc9c15d60446e0 SHA1 0a28370d5cec2fe97b737405573aa1ba1f0fd249 SHA256 71ada3317a4c6d9158616ff3f73b597300294e2e2976b57a44b3d845e435f384
-MISC ChangeLog 6925 RMD160 6c0094c4d959a22b61f60561f01352c2d048c1c9 SHA1 c263fbc7a9c3cf0a4cfbdeae90e05bd600cd9c88 SHA256 9d2e78cda72e5b45ec91f9d9c6628fdae18d86df34afe76526883a157c44baea
+EBUILD porthole-0.6.1-r2.ebuild 2113 RMD160 b13191d9e34bf8a3d92c947d36cb77a632c6d2a5 SHA1 47c31c4668434e2c9ef05107e6c746236d883c4d SHA256 5efea2158147f42a4db6a2f9880cf37e8b0f620b828bb259f54530549c548d2e
+MISC ChangeLog 7163 RMD160 f030eac61339ef48cb16f1563f3d48ebbb785890 SHA1 ef6a27d748a3d1efcd3f9d86dda29effc704802e SHA256 01dfe67d04901626c1884f62ddf8be718c3173153a9538140a6757e78f947e18
 MISC metadata.xml 333 RMD160 81d8b5027bf8d349bac5089a7db92525b731cf1a SHA1 71116e25d8a005d380bddcf32e106a3f462f58e3 SHA256 a983bc5809b1b8fd545114c3d938e894b139835b5e9cc04bea6880d1538e66ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwdBQwACgkQixe2jn+ufTi3HgCfQXfqyoceUz6FtaW5966FyFP6
+Z4UAn3pM5yCSdSYBwWDWrcpT5oOIgK/v
+=X7A+
+-----END PGP SIGNATURE-----
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 000000000000..33c9e4ee3353
--- /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-r2.ebuild b/app-portage/porthole/porthole-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..cd38995a0ede
--- /dev/null
+++ b/app-portage/porthole/porthole-0.6.1-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 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.1 2010/06/19 17:57:22 idl0r 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 ~hppa ~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.4.0
+	>=gnome-base/libglade-2.5.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
+}
+
+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
+}