Gentoo Archives: gentoo-commits

From: Dion Moult <moult@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-ui/files/, profiles/, sys-apps/systemd-ui/
Date: Thu, 24 Sep 2015 09:43:32
Message-Id: 1443086974.3a0a6849df5ba6ef18243b98ac317de03e3473f2.moult@gentoo
1 commit: 3a0a6849df5ba6ef18243b98ac317de03e3473f2
2 Author: Dion Moult <moult <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 24 09:29:34 2015 +0000
4 Commit: Dion Moult <moult <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 24 09:29:34 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0a6849
7
8 sys-apps/systemd-ui: Removal after last rites. Bug #546192
9
10 profiles/package.mask | 5 --
11 sys-apps/systemd-ui/Manifest | 1 -
12 .../systemd-ui/files/systemd-ui-3-vala-0.24.patch | 35 -------------
13 sys-apps/systemd-ui/metadata.xml | 8 ---
14 sys-apps/systemd-ui/systemd-ui-3.ebuild | 48 -----------------
15 sys-apps/systemd-ui/systemd-ui-9999.ebuild | 60 ----------------------
16 6 files changed, 157 deletions(-)
17
18 diff --git a/profiles/package.mask b/profiles/package.mask
19 index 2f1c3b7..b7fee6b 100644
20 --- a/profiles/package.mask
21 +++ b/profiles/package.mask
22 @@ -202,11 +202,6 @@ dev-libs/iniparser:4
23 # See bug #556640 for more info. Removal in 30 days.
24 dev-perl/gtk2-fu
25
26 -# Mike Gilbert <floppym@g.o> (03 Aug 2015)
27 -# Unmaintained upstream. Fails to build. Removal in 30 days.
28 -# Bugs: 478174, 546192, 556200.
29 -sys-apps/systemd-ui
30 -
31 # Sergei Trofimovich <slyfox@g.o> (2 Aug 2015)
32 # This package is a part of >=dev-lang/ghc-7.4. Gentoo
33 # ebuilds use that. You can safely uninstall dev-haskell/deepseq
34
35 diff --git a/sys-apps/systemd-ui/Manifest b/sys-apps/systemd-ui/Manifest
36 deleted file mode 100644
37 index 467f94d..0000000
38 --- a/sys-apps/systemd-ui/Manifest
39 +++ /dev/null
40 @@ -1 +0,0 @@
41 -DIST systemd-ui-3.tar.xz 153680 SHA256 455e65000abf39bbccd937786b5f0d7c76ea631b6f28d7142f007fa141338dad SHA512 babc81dc6c205b3b95d19b4c762e2658c02942db884384f25324f63b4dca3cdafdb1b12e1a63ff33f9ff0c8152529cc700a1173c888cf4f6e3a9f0992889c9cd WHIRLPOOL 8f4f9b07c9debf2396581652ea8192bea954a25b8bd94157b0f7f836a6290c62b1ed82df61bdb48a3597774337ce3f4cfdd60c8799e73db92b25a35c9f3e5ab0
42
43 diff --git a/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch b/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch
44 deleted file mode 100644
45 index ce5df6c..0000000
46 --- a/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch
47 +++ /dev/null
48 @@ -1,35 +0,0 @@
49 -From 282a352dff49c13e185d826af2a248b55988bc32 Mon Sep 17 00:00:00 2001
50 -From: Michael Biebl <biebl@××××××.org>
51 -Date: Tue, 29 Apr 2014 20:20:51 +0000
52 -Subject: Fix ambiguity between `GLib.Notification' and `Notify.Notification'
53 -
54 -Notification is both defined by Notify and the latest GLib, resulting in
55 -a build failure. Use Notify.Notification instead to avoid this
56 -ambiguity.
57 -
58 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746130
59 ----
60 -diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
61 -index 571cd94..f3887dd 100644
62 ---- a/src/gnome-ask-password-agent.vala
63 -+++ b/src/gnome-ask-password-agent.vala
64 -@@ -80,7 +80,7 @@ public class MyStatusIcon : StatusIcon {
65 - string socket;
66 -
67 - PasswordDialog password_dialog;
68 -- Notification n;
69 -+ Notify.Notification n;
70 -
71 - public MyStatusIcon() throws GLib.Error {
72 - GLib.Object(icon_name : "dialog-password");
73 -@@ -183,7 +183,7 @@ public class MyStatusIcon : StatusIcon {
74 - }
75 - set_from_icon_name(icon);
76 -
77 -- n = new Notification(title, message, icon);
78 -+ n = new Notify.Notification(title, message, icon);
79 - n.set_timeout(5000);
80 - n.closed.connect(() => {
81 - set_visible(true);
82 ---
83 -cgit v0.9.0.2-2-gbebe
84
85 diff --git a/sys-apps/systemd-ui/metadata.xml b/sys-apps/systemd-ui/metadata.xml
86 deleted file mode 100644
87 index fe305d2..0000000
88 --- a/sys-apps/systemd-ui/metadata.xml
89 +++ /dev/null
90 @@ -1,8 +0,0 @@
91 -<?xml version="1.0" encoding="UTF-8"?>
92 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
93 -<pkgmetadata>
94 - <maintainer>
95 - <email>systemd@g.o</email>
96 - <name>Gentoo systemd team</name>
97 - </maintainer>
98 -</pkgmetadata>
99
100 diff --git a/sys-apps/systemd-ui/systemd-ui-3.ebuild b/sys-apps/systemd-ui/systemd-ui-3.ebuild
101 deleted file mode 100644
102 index 60875aa..0000000
103 --- a/sys-apps/systemd-ui/systemd-ui-3.ebuild
104 +++ /dev/null
105 @@ -1,48 +0,0 @@
106 -# Copyright 1999-2014 Gentoo Foundation
107 -# Distributed under the terms of the GNU General Public License v2
108 -# $Id$
109 -
110 -EAPI=5
111 -
112 -# Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5
113 -VALA_MIN_API_VERSION=0.22
114 -
115 -inherit autotools-utils systemd vala
116 -
117 -DESCRIPTION="System and service manager for Linux"
118 -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
119 -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
120 -
121 -LICENSE="GPL-2"
122 -SLOT="0"
123 -KEYWORDS="~amd64 ~x86"
124 -IUSE=""
125 -
126 -RDEPEND="
127 - !sys-apps/systemd[gtk]
128 - >=dev-libs/glib-2.26:2
129 - dev-libs/libgee:0.8
130 - sys-apps/dbus
131 - x11-libs/gtk+:3
132 - >=x11-libs/libnotify-0.7
133 -"
134 -DEPEND="${RDEPEND}
135 - app-arch/xz-utils
136 - $(vala_depend)
137 -"
138 -
139 -# Due to vala being broken.
140 -AUTOTOOLS_IN_SOURCE_BUILD=1
141 -
142 -PATCHES=( "${FILESDIR}/${P}-vala-0.24.patch" )
143 -
144 -src_prepare() {
145 - # Force the rebuild of .vala sources
146 - touch src/*.vala || die
147 -
148 - # Fix hardcoded path in .vala.
149 - sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die
150 -
151 - autotools-utils_src_prepare
152 - vala_src_prepare
153 -}
154
155 diff --git a/sys-apps/systemd-ui/systemd-ui-9999.ebuild b/sys-apps/systemd-ui/systemd-ui-9999.ebuild
156 deleted file mode 100644
157 index 8812d56..0000000
158 --- a/sys-apps/systemd-ui/systemd-ui-9999.ebuild
159 +++ /dev/null
160 @@ -1,60 +0,0 @@
161 -# Copyright 1999-2014 Gentoo Foundation
162 -# Distributed under the terms of the GNU General Public License v2
163 -# $Id$
164 -
165 -EAPI=4
166 -
167 -#if LIVE
168 -AUTOTOOLS_AUTORECONF=yes
169 -EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/${PN}
170 - http://cgit.freedesktop.org/systemd/${PN}/"
171 -
172 -inherit git-2
173 -#endif
174 -
175 -# Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5
176 -VALA_MIN_API_VERSION=0.22
177 -
178 -inherit autotools-utils systemd vala
179 -
180 -DESCRIPTION="System and service manager for Linux"
181 -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
182 -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
183 -
184 -LICENSE="GPL-2"
185 -SLOT="0"
186 -KEYWORDS="~amd64 ~x86"
187 -IUSE=""
188 -
189 -RDEPEND="!sys-apps/systemd[gtk]
190 - >=dev-libs/glib-2.26
191 - dev-libs/libgee:0.8
192 - sys-apps/dbus
193 - x11-libs/gtk+:3
194 - >=x11-libs/libnotify-0.7"
195 -
196 -DEPEND="${RDEPEND}
197 - app-arch/xz-utils
198 - $(vala_depend)"
199 -
200 -#if LIVE
201 -SRC_URI=
202 -KEYWORDS=
203 -
204 -DEPEND="${DEPEND}
205 - app-text/docbook-xml-dtd:4.2"
206 -#endif
207 -
208 -# Due to vala being broken.
209 -AUTOTOOLS_IN_SOURCE_BUILD=1
210 -
211 -src_prepare() {
212 - # Force the rebuild of .vala sources
213 - touch src/*.vala || die
214 -
215 - # Fix hardcoded path in .vala.
216 - sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die
217 -
218 - autotools-utils_src_prepare
219 - vala_src_prepare
220 -}