1 |
commit: f34703669276d66a0bc30006ad813ea5514b3784 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 29 19:44:18 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 22:11:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3470366 |
7 |
|
8 |
app-laptop/batti: Remove last-rited package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708114 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-laptop/batti/Manifest | 1 - |
14 |
app-laptop/batti/batti-0.3.8-r4.ebuild | 45 ---------------------- |
15 |
.../batti/files/batti-0.3.8-upower-0.99.patch | 34 ---------------- |
16 |
.../batti/files/batti-0.3.8-upower-capital.patch | 32 --------------- |
17 |
app-laptop/batti/metadata.xml | 11 ------ |
18 |
profiles/package.mask | 5 --- |
19 |
6 files changed, 128 deletions(-) |
20 |
|
21 |
diff --git a/app-laptop/batti/Manifest b/app-laptop/batti/Manifest |
22 |
deleted file mode 100644 |
23 |
index 683411cfd68..00000000000 |
24 |
--- a/app-laptop/batti/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1 +0,0 @@ |
27 |
-DIST batti-0.3.8.tar.gz 59783 BLAKE2B cba35af1d8d3e5f2e44e27eb2727fc2115d89d5ff79bd54f263a25678c4a5d9d87da685905f85c3d47bdeeeba164bb0dce09082adb211acc51a02ec514e0122a SHA512 39e0085a13847359eb555eff80c3f3b166775558fba3c76ecb4315786e2ce4307d21dcac5fab38da4ee3cc2035356906eb1354ced56a1f007735029e0484a4de |
28 |
|
29 |
diff --git a/app-laptop/batti/batti-0.3.8-r4.ebuild b/app-laptop/batti/batti-0.3.8-r4.ebuild |
30 |
deleted file mode 100644 |
31 |
index 2b1697948b2..00000000000 |
32 |
--- a/app-laptop/batti/batti-0.3.8-r4.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,45 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
- |
41 |
-inherit distutils-r1 gnome2-utils |
42 |
- |
43 |
-DESCRIPTION="A upower based battery monitor for the system tray, similar to batterymon" |
44 |
-HOMEPAGE="https://code.google.com/p/batti-gtk/" |
45 |
-SRC_URI="https://batti-gtk.googlecode.com/files/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-2" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="amd64 x86" |
50 |
-IUSE="libnotify" |
51 |
- |
52 |
-RDEPEND=" |
53 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
54 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
55 |
- sys-power/upower |
56 |
- x11-themes/hicolor-icon-theme |
57 |
- libnotify? ( x11-libs/libnotify ) |
58 |
-" |
59 |
-DEPEND="" |
60 |
- |
61 |
-src_prepare() { |
62 |
- default |
63 |
- if has_version ">=sys-power/upower-0.99"; then |
64 |
- eapply "${FILESDIR}/${P}-upower-0.99.patch" |
65 |
- eapply "${FILESDIR}/${P}-upower-capital.patch" |
66 |
- fi |
67 |
-} |
68 |
- |
69 |
-pkg_preinst() { |
70 |
- gnome2_icon_savelist |
71 |
-} |
72 |
- |
73 |
-pkg_postinst() { |
74 |
- gnome2_icon_cache_update |
75 |
-} |
76 |
- |
77 |
-pkg_postrm() { |
78 |
- gnome2_icon_cache_update |
79 |
-} |
80 |
|
81 |
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch b/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch |
82 |
deleted file mode 100644 |
83 |
index 6f313a594c9..00000000000 |
84 |
--- a/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch |
85 |
+++ /dev/null |
86 |
@@ -1,34 +0,0 @@ |
87 |
-diff -Naur batti-0.3.8.orig/src/PowerBackend.py batti-0.3.8/src/PowerBackend.py |
88 |
---- batti-0.3.8.orig/src/PowerBackend.py 2014-04-15 19:30:34.123260000 +0200 |
89 |
-+++ batti-0.3.8/src/PowerBackend.py 2014-04-15 19:32:11.859168509 +0200 |
90 |
-@@ -180,17 +180,6 @@ |
91 |
- |
92 |
- properties = dbus.Interface(iface, 'org.freedesktop.DBus.Properties') |
93 |
- |
94 |
-- if properties.Get(self.dbus_interface, 'CanSuspend'): |
95 |
-- self.__can_suspend = True |
96 |
-- else: |
97 |
-- self.__can_suspend = False |
98 |
-- |
99 |
-- if properties.Get(self.dbus_interface, 'CanHibernate'): |
100 |
-- self.__can_hibernate = True |
101 |
-- else: |
102 |
-- self.__can_hibernate = False |
103 |
-- |
104 |
-- |
105 |
- def __get_interface(self): |
106 |
- dkit_obj = self.__bus.get_object(self.dbus_service, self.dbus_object) |
107 |
- return dbus.Interface(dkit_obj, self.dbus_interface) |
108 |
-@@ -201,12 +190,6 @@ |
109 |
- self.__mc_action(widget, event, data) |
110 |
- |
111 |
- |
112 |
-- def can_suspend(self): |
113 |
-- return self.__can_suspend and self.__get_interface().SuspendAllowed() |
114 |
-- |
115 |
-- def can_hibernate(self): |
116 |
-- return self.__can_hibernate and self.__get_interface().HibernateAllowed() |
117 |
-- |
118 |
- def suspend(self): |
119 |
- self.__get_interface().Suspend() |
120 |
- |
121 |
|
122 |
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-capital.patch b/app-laptop/batti/files/batti-0.3.8-upower-capital.patch |
123 |
deleted file mode 100644 |
124 |
index e7f62761661..00000000000 |
125 |
--- a/app-laptop/batti/files/batti-0.3.8-upower-capital.patch |
126 |
+++ /dev/null |
127 |
@@ -1,32 +0,0 @@ |
128 |
-From 1e0fe57a93ed3996bad295e20eeda81f6af483af Mon Sep 17 00:00:00 2001 |
129 |
-From: Christian Ruppert <idl0r@g.o> |
130 |
-Date: Wed, 20 Jul 2016 20:14:32 +0200 |
131 |
-Subject: [PATCH] The type property (in recent UPower at least) needs to have a |
132 |
- capital T - "Type" |
133 |
- |
134 |
---- |
135 |
- src/PowerBackend.py | 4 ++-- |
136 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
137 |
- |
138 |
-diff --git a/src/PowerBackend.py b/src/PowerBackend.py |
139 |
-index e020b98..56bcb61 100644 |
140 |
---- a/src/PowerBackend.py |
141 |
-+++ b/src/PowerBackend.py |
142 |
-@@ -165,7 +165,7 @@ def __init__(self): |
143 |
- self.__batteries = {} |
144 |
- for dev in devices: |
145 |
- (prop_iface, dev_iface) = self.__get_battery(dev) |
146 |
-- type = prop_iface.Get(self.device_interface, 'type') |
147 |
-+ type = prop_iface.Get(self.device_interface, 'Type') |
148 |
- if type == self.bat_type: |
149 |
- power_bat = UPowerBattery(prop_iface, dev_iface) |
150 |
- self.__batteries[dev] = power_bat |
151 |
-@@ -228,7 +228,7 @@ def set_right_popup_menu_action(self, action): |
152 |
- def __device_added(self, udi): |
153 |
- (prop_iface, dev_iface) = self.__get_battery(udi) |
154 |
- try: |
155 |
-- type = prop_iface.Get(self.device_interface, 'type') |
156 |
-+ type = prop_iface.Get(self.device_interface, 'Type') |
157 |
- if type == self.bat_type: |
158 |
- power_bat = UPowerBattery(prop_iface, dev_iface) |
159 |
- power_bat.set_left_popup_menu_action(self.__mc_action) |
160 |
|
161 |
diff --git a/app-laptop/batti/metadata.xml b/app-laptop/batti/metadata.xml |
162 |
deleted file mode 100644 |
163 |
index c26d102ee70..00000000000 |
164 |
--- a/app-laptop/batti/metadata.xml |
165 |
+++ /dev/null |
166 |
@@ -1,11 +0,0 @@ |
167 |
-<?xml version="1.0" encoding="UTF-8"?> |
168 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
169 |
-<pkgmetadata> |
170 |
- <maintainer type="person"> |
171 |
- <email>naota@g.o</email> |
172 |
- <name>Naohiro Aota</name> |
173 |
- </maintainer> |
174 |
- <upstream> |
175 |
- <remote-id type="google-code">batti-gtk</remote-id> |
176 |
- </upstream> |
177 |
-</pkgmetadata> |
178 |
|
179 |
diff --git a/profiles/package.mask b/profiles/package.mask |
180 |
index 2c183bb6b87..9cb977224ef 100644 |
181 |
--- a/profiles/package.mask |
182 |
+++ b/profiles/package.mask |
183 |
@@ -224,11 +224,6 @@ dev-embedded/pk2-la |
184 |
# Stuck on Python 2 and pygtk. Masked for removal in 30 days. |
185 |
app-misc/metromap |
186 |
|
187 |
-# Andreas Sturmlechner <asturm@g.o> (2020-04-30) |
188 |
-# Maintainer timeout, unmaintained upstream, last release in 2011, bug #708114 |
189 |
-# Stuck on Python 2 and pygtk. Masked for removal in 30 days. |
190 |
-app-laptop/batti |
191 |
- |
192 |
# Matt Turner <mattst88@g.o> (2020-04-29) |
193 |
# Masked for testing |
194 |
>=dev-libs/gjs-1.64 |