1 |
commit: 4d40a91cd0f8d2e4ab668432f70936aebb7f7417 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 29 15:25:07 2011 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Dec 29 15:25:07 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=4d40a91c |
7 |
|
8 |
add porthole-0.6.1-r3, missing-attribute.patch. Fixes bug 323179. |
9 |
|
10 |
--- |
11 |
app-portage/porthole/Manifest | 5 ++ |
12 |
.../files/porthole-0.6.1-masking_status.patch | 17 +++++ |
13 |
.../files/porthole-0.6.1-missing-attribute.patch | 14 ++++ |
14 |
.../files/porthole-0.6.1-missing_import.patch | 19 +++++ |
15 |
app-portage/porthole/porthole-0.6.1-r3.ebuild | 77 ++++++++++++++++++++ |
16 |
5 files changed, 132 insertions(+), 0 deletions(-) |
17 |
|
18 |
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest |
19 |
new file mode 100644 |
20 |
index 0000000..01a0776 |
21 |
--- /dev/null |
22 |
+++ b/app-portage/porthole/Manifest |
23 |
@@ -0,0 +1,5 @@ |
24 |
+AUX porthole-0.6.1-masking_status.patch 485 RMD160 33844ab398f4b7b9d1f9a44bde16cbebd748f364 SHA1 6324045a2dea9532c2bd7f2567c7767999560d58 SHA256 1ba67b57505994566942f03722b6edccd817550a2fac984fbbcb25bf6c98b254 |
25 |
+AUX porthole-0.6.1-missing-attribute.patch 665 RMD160 4e0ed5fc3b6b01ac0a18d3295f730a17fcafd839 SHA1 434dd9d1d7483951443590cbfacd6ef1d4469146 SHA256 4d70d5d85fbc7de42bbef3f4bbe23d0feafd46252d0d38ae76aee9760df437ff |
26 |
+AUX porthole-0.6.1-missing_import.patch 858 RMD160 1f7413cceba3889cf4451c084b4cb0554b581180 SHA1 70d8ca1f2bc2bd86e116ff8f8985c1939cf9541b SHA256 d79428460882d99d4dc0fa5130a1adcb7523488347309a95fd37b7312b0dd8a1 |
27 |
+DIST porthole-0.6.1.tar.bz2 958696 RMD160 7265f695d02e2eec22954d827dcb7ae86712cd26 SHA1 d0d48b007152f1cc6922a8c6be4c793cdeb45d61 SHA256 eb9991cb078f51f5b4c9900995ffc3f7f5e3891e62b10cd1c5384efece010d62 |
28 |
+EBUILD porthole-0.6.1-r3.ebuild 2163 RMD160 cb884e44df9b5ed17f102488cfc7b1c316dfe256 SHA1 e408266f88c868acaad998f5bb25b15ab251ac47 SHA256 86517ee22d366558d086d270bc72992376c5109ef4c2e921aad943c2923f5f2f |
29 |
|
30 |
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 |
31 |
new file mode 100644 |
32 |
index 0000000..e626fbb |
33 |
--- /dev/null |
34 |
+++ b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch |
35 |
@@ -0,0 +1,17 @@ |
36 |
+Index: porthole/backends/portagelib.py |
37 |
+=================================================================== |
38 |
+--- porthole/backends/portagelib.py (revision 1209) |
39 |
++++ porthole/backends/portagelib.py (working copy) |
40 |
+@@ -452,7 +452,11 @@ |
41 |
+ |
42 |
+ |
43 |
+ def get_masking_status(ebuild): |
44 |
+- return portage.getmaskingstatus(ebuild) |
45 |
++ try: |
46 |
++ status = portage.getmaskingstatus(ebuild) |
47 |
++ except KeyError: |
48 |
++ status = ['deprecated'] |
49 |
++ return status |
50 |
+ |
51 |
+ |
52 |
+ def get_masking_reason(ebuild): |
53 |
|
54 |
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 |
55 |
new file mode 100644 |
56 |
index 0000000..aa011a1 |
57 |
--- /dev/null |
58 |
+++ b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch |
59 |
@@ -0,0 +1,14 @@ |
60 |
+diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py |
61 |
+ |
62 |
+--- porthole/db/user_configs.py.old 2010-11-27 13:34:35.000000000 +0600 |
63 |
++++ porthole/db/user_configs.py 2010-11-27 13:31:24.000000000 +0600 |
64 |
+@@ -364,7 +364,7 @@ |
65 |
+ debug.dprint("USER_CONFIGS: set_user_config(): add: " + |
66 |
+ "%s,\n remove: %s " %(str(add),str(remove))) |
67 |
+ set_config.set_user_config(filename=file, name=name, ebuild=ebuild, |
68 |
+- comment=comment, username=privileges.USER, |
69 |
++ comment=comment, username=privileges.user, |
70 |
+ add=add, remove=remove) |
71 |
+ self.set_config_callback() |
72 |
+ else: |
73 |
+ |
74 |
\ No newline at end of file |
75 |
|
76 |
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 |
77 |
new file mode 100644 |
78 |
index 0000000..33c9e4e |
79 |
--- /dev/null |
80 |
+++ b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch |
81 |
@@ -0,0 +1,19 @@ |
82 |
+--- porthole/db/user_configs.py 2010/03/20 12:32:29 1217 |
83 |
++++ porthole/db/user_configs.py 2010/03/20 14:10:46 1218 |
84 |
+@@ -36,6 +36,7 @@ |
85 |
+ from porthole import backends |
86 |
+ portage_lib = backends.portage_lib |
87 |
+ from porthole.utils import debug |
88 |
++from porthole.privilege import controller as privileges |
89 |
+ |
90 |
+ ## set up this module to act as a user configs data server, |
91 |
+ ## watch the user configs for changes and auto update |
92 |
+@@ -363,7 +364,7 @@ |
93 |
+ debug.dprint("USER_CONFIGS: set_user_config(): add: " + |
94 |
+ "%s,\n remove: %s " %(str(add),str(remove))) |
95 |
+ set_config.set_user_config(filename=file, name=name, ebuild=ebuild, |
96 |
+- comment=comment, username=priviliges.USER, |
97 |
++ comment=comment, username=privileges.USER, |
98 |
+ add=add, remove=remove) |
99 |
+ self.set_config_callback() |
100 |
+ else: |
101 |
|
102 |
diff --git a/app-portage/porthole/porthole-0.6.1-r3.ebuild b/app-portage/porthole/porthole-0.6.1-r3.ebuild |
103 |
new file mode 100644 |
104 |
index 0000000..3c8f5ff |
105 |
--- /dev/null |
106 |
+++ b/app-portage/porthole/porthole-0.6.1-r3.ebuild |
107 |
@@ -0,0 +1,77 @@ |
108 |
+# Copyright 1999-2011 Gentoo Foundation |
109 |
+# Distributed under the terms of the GNU General Public License v2 |
110 |
+# $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 $ |
111 |
+ |
112 |
+EAPI="2" |
113 |
+PYTHON_DEPEND="2" |
114 |
+SUPPORT_PYTHON_ABIS="1" |
115 |
+PYTHON_USE_WITH="xml threads" |
116 |
+ |
117 |
+inherit distutils eutils |
118 |
+ |
119 |
+DESCRIPTION="A GTK+-based frontend to Portage" |
120 |
+HOMEPAGE="http://porthole.sourceforge.net" |
121 |
+SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2" |
122 |
+ |
123 |
+LICENSE="GPL-2" |
124 |
+SLOT="0" |
125 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" |
126 |
+IUSE="nls" |
127 |
+LANGS="de pl ru vi it fr tr" |
128 |
+for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done |
129 |
+ |
130 |
+RDEPEND=">=sys-apps/portage-2.1 |
131 |
+ dev-python/pygtk:2 |
132 |
+ gnome-base/libglade:2.0 |
133 |
+ dev-python/pygtksourceview:2 |
134 |
+ nls? ( virtual/libintl )" |
135 |
+DEPEND="${RDEPEND} |
136 |
+ nls? ( >=sys-devel/gettext-0.14 )" |
137 |
+RESTRICT_PYTHON_ABIS="3.*" |
138 |
+ |
139 |
+src_prepare() { |
140 |
+ epatch "${FILESDIR}/${P}-masking_status.patch" # bug 307037 |
141 |
+ epatch "${FILESDIR}/${P}-missing_import.patch" # bug 323179 |
142 |
+ epatch "${FILESDIR}/${P}-missing-attribute.patch" #bug 323179 |
143 |
+} |
144 |
+ |
145 |
+src_compile(){ |
146 |
+ # Compile localizations if necessary |
147 |
+ if use nls ; then |
148 |
+ cd scripts |
149 |
+ ./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed" |
150 |
+ fi |
151 |
+} |
152 |
+ |
153 |
+src_install() { |
154 |
+ distutils_src_install |
155 |
+ |
156 |
+ dodoc TODO README NEWS AUTHORS |
157 |
+ |
158 |
+ keepdir /var/log/porthole |
159 |
+ fperms g+w /var/log/porthole |
160 |
+ keepdir /var/db/porthole |
161 |
+ fperms g+w /var/db/porthole |
162 |
+ |
163 |
+ # nls |
164 |
+ if use nls; then |
165 |
+ # mo directory doesn't exists with nls enabled and unsupported LINGUAS |
166 |
+ [[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/* |
167 |
+ fi |
168 |
+} |
169 |
+ |
170 |
+pkg_preinst() { |
171 |
+ chgrp portage "${D}"/var/log/porthole |
172 |
+ chgrp portage "${D}"/var/db/porthole |
173 |
+} |
174 |
+ |
175 |
+pkg_postinst() { |
176 |
+ einfo |
177 |
+ einfo "Porthole has updated the way that the upgrades are sent to emerge." |
178 |
+ einfo "In this new way the user needs to set any 'Settings' menu emerge options" |
179 |
+ einfo "Porthole automatically adds '--oneshot' for all upgrades selections" |
180 |
+ einfo "Other options recommended are '--noreplace' along with '--update'" |
181 |
+ einfo "They allow for portage to skip any packages that might have already" |
182 |
+ einfo "been upgraded as a dependency of another previously upgraded package" |
183 |
+ einfo |
184 |
+} |