1 |
commit: 1b749d5fa20f57e25d2bf97d51a05f5d99991c7a |
2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 3 20:00:27 2019 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 3 20:00:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b749d5f |
7 |
|
8 |
net-misc/connman-notify: bump & drop old |
9 |
|
10 |
Upstream added even better py3 support than my rough patch |
11 |
|
12 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
13 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
14 |
|
15 |
net-misc/connman-notify/Manifest | 2 +- |
16 |
.../connman-notify-0_pre20140623.ebuild | 38 ---------------------- |
17 |
....ebuild => connman-notify-0_pre20191003.ebuild} | 4 +-- |
18 |
.../files/connman-notify-py3-support.patch | 38 ---------------------- |
19 |
4 files changed, 2 insertions(+), 80 deletions(-) |
20 |
|
21 |
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest |
22 |
index bdd935254e9..17f0cb40722 100644 |
23 |
--- a/net-misc/connman-notify/Manifest |
24 |
+++ b/net-misc/connman-notify/Manifest |
25 |
@@ -1 +1 @@ |
26 |
-DIST connman-notify-0_pre20140623.tar.bz2 2858 BLAKE2B b76865e5392f9b6ed2dada5b323e0f867fa70b5ba21bb6342069f7f6a28468d2915dc9c573bcb4ebc061c3039fa6f0bbfd6969464d264b710f3aee149b1162a5 SHA512 8da432cfe0653c29d83afffeacd11e9d66795be061040286ec8b90ce28c334c729af24cb7e1aee0f32e2b2626949f7ee9c95c52b4a3191392236bad7b204a267 |
27 |
+DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4 |
28 |
|
29 |
diff --git a/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild b/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild |
30 |
deleted file mode 100644 |
31 |
index 3d32d97d793..00000000000 |
32 |
--- a/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,38 +0,0 @@ |
35 |
-# Copyright 1999-2018 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-PYTHON_COMPAT=( python2_7 ) |
41 |
- |
42 |
-inherit desktop python-single-r1 vcs-snapshot |
43 |
- |
44 |
-MY_COMMIT="0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d" |
45 |
- |
46 |
-DESCRIPTION="Desktop notification integration for connman" |
47 |
-HOMEPAGE="https://gitlab.com/wavexx/connman-notify/" |
48 |
-SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2" |
49 |
- |
50 |
-EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="~amd64 ~x86" |
55 |
-IUSE="" |
56 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
57 |
- |
58 |
-DEPEND="${PYTHON_DEPS}" |
59 |
-RDEPEND="${DEPEND} |
60 |
- dev-python/notify-python[${PYTHON_USEDEP}] |
61 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
62 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
63 |
- net-misc/connman |
64 |
- virtual/notification-daemon" |
65 |
- |
66 |
-src_install() { |
67 |
- python_fix_shebang ${PN} |
68 |
- dobin ${PN} |
69 |
- dodoc README.rst |
70 |
- |
71 |
- make_desktop_entry ${PN} ${PN} ${PN} Network |
72 |
-} |
73 |
|
74 |
diff --git a/net-misc/connman-notify/connman-notify-0_pre20140623-r1.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild |
75 |
similarity index 88% |
76 |
rename from net-misc/connman-notify/connman-notify-0_pre20140623-r1.ebuild |
77 |
rename to net-misc/connman-notify/connman-notify-0_pre20191003.ebuild |
78 |
index f3fa6cd20fe..4c4c3e6b29e 100644 |
79 |
--- a/net-misc/connman-notify/connman-notify-0_pre20140623-r1.ebuild |
80 |
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild |
81 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7} ) |
82 |
|
83 |
inherit desktop python-single-r1 vcs-snapshot |
84 |
|
85 |
-MY_COMMIT="0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d" |
86 |
+MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52" |
87 |
|
88 |
DESCRIPTION="Desktop notification integration for connman" |
89 |
HOMEPAGE="https://gitlab.com/wavexx/connman-notify/" |
90 |
@@ -27,8 +27,6 @@ RDEPEND="${PYTHON_DEPS} |
91 |
net-misc/connman |
92 |
virtual/notification-daemon" |
93 |
|
94 |
-PATCHES=( "${FILESDIR}"/connman-notify-py3-support.patch ) |
95 |
- |
96 |
src_install() { |
97 |
python_fix_shebang ${PN} |
98 |
dobin ${PN} |
99 |
|
100 |
diff --git a/net-misc/connman-notify/files/connman-notify-py3-support.patch b/net-misc/connman-notify/files/connman-notify-py3-support.patch |
101 |
deleted file mode 100644 |
102 |
index 59c88849556..00000000000 |
103 |
--- a/net-misc/connman-notify/files/connman-notify-py3-support.patch |
104 |
+++ /dev/null |
105 |
@@ -1,38 +0,0 @@ |
106 |
---- a/connman-notify |
107 |
-+++ b/connman-notify |
108 |
-@@ -7,8 +7,8 @@ |
109 |
- import argparse |
110 |
- import dbus |
111 |
- import dbus.mainloop.glib |
112 |
--import glib |
113 |
--import pynotify |
114 |
-+from gi.repository import GLib |
115 |
-+from gi.repository import Notify |
116 |
- |
117 |
- APP_NAME = 'connman' |
118 |
- SHORT_DEV = True |
119 |
-@@ -22,7 +22,7 @@ |
120 |
- |
121 |
- |
122 |
- def notify(subject, body): |
123 |
-- ntf = pynotify.Notification(subject, body) |
124 |
-+ ntf = Notify.Notification.new(subject, body) |
125 |
- ntf.show() |
126 |
- |
127 |
- |
128 |
-@@ -79,7 +79,7 @@ |
129 |
- if args.hide_addr: SHOW_ADDR = False |
130 |
- |
131 |
- dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) |
132 |
-- pynotify.init(APP_NAME) |
133 |
-+ Notify.init(APP_NAME) |
134 |
- bus = dbus.SystemBus() |
135 |
- manager = dbus.Interface(bus.get_object("net.connman", "/"), "net.connman.Manager") |
136 |
- |
137 |
-@@ -88,5 +88,5 @@ |
138 |
- signal_name="PropertyChanged", |
139 |
- path_keyword="path") |
140 |
- |
141 |
-- mainloop = glib.MainLoop() |
142 |
-+ mainloop = GLib.MainLoop() |
143 |
- mainloop.run() |