From 3a0a6849df5ba6ef18243b98ac317de03e3473f2 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 24 Sep 2015 19:29:34 +1000 Subject: [PATCH] sys-apps/systemd-ui: Removal after last rites. Bug #546192 --- profiles/package.mask | 5 -- sys-apps/systemd-ui/Manifest | 1 - .../files/systemd-ui-3-vala-0.24.patch | 35 ----------- sys-apps/systemd-ui/metadata.xml | 8 --- sys-apps/systemd-ui/systemd-ui-3.ebuild | 48 --------------- sys-apps/systemd-ui/systemd-ui-9999.ebuild | 60 ------------------- 6 files changed, 157 deletions(-) delete mode 100644 sys-apps/systemd-ui/Manifest delete mode 100644 sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch delete mode 100644 sys-apps/systemd-ui/metadata.xml delete mode 100644 sys-apps/systemd-ui/systemd-ui-3.ebuild delete mode 100644 sys-apps/systemd-ui/systemd-ui-9999.ebuild diff --git a/profiles/package.mask b/profiles/package.mask index 2f1c3b7d97f4..b7fee6b6a5e7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -202,11 +202,6 @@ dev-libs/iniparser:4 # See bug #556640 for more info. Removal in 30 days. dev-perl/gtk2-fu -# Mike Gilbert (03 Aug 2015) -# Unmaintained upstream. Fails to build. Removal in 30 days. -# Bugs: 478174, 546192, 556200. -sys-apps/systemd-ui - # Sergei Trofimovich (2 Aug 2015) # This package is a part of >=dev-lang/ghc-7.4. Gentoo # ebuilds use that. You can safely uninstall dev-haskell/deepseq diff --git a/sys-apps/systemd-ui/Manifest b/sys-apps/systemd-ui/Manifest deleted file mode 100644 index 467f94d50994..000000000000 --- a/sys-apps/systemd-ui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST systemd-ui-3.tar.xz 153680 SHA256 455e65000abf39bbccd937786b5f0d7c76ea631b6f28d7142f007fa141338dad SHA512 babc81dc6c205b3b95d19b4c762e2658c02942db884384f25324f63b4dca3cdafdb1b12e1a63ff33f9ff0c8152529cc700a1173c888cf4f6e3a9f0992889c9cd WHIRLPOOL 8f4f9b07c9debf2396581652ea8192bea954a25b8bd94157b0f7f836a6290c62b1ed82df61bdb48a3597774337ce3f4cfdd60c8799e73db92b25a35c9f3e5ab0 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 deleted file mode 100644 index ce5df6c75ce9..000000000000 --- a/sys-apps/systemd-ui/files/systemd-ui-3-vala-0.24.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 282a352dff49c13e185d826af2a248b55988bc32 Mon Sep 17 00:00:00 2001 -From: Michael Biebl -Date: Tue, 29 Apr 2014 20:20:51 +0000 -Subject: Fix ambiguity between `GLib.Notification' and `Notify.Notification' - -Notification is both defined by Notify and the latest GLib, resulting in -a build failure. Use Notify.Notification instead to avoid this -ambiguity. - -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746130 ---- -diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala -index 571cd94..f3887dd 100644 ---- a/src/gnome-ask-password-agent.vala -+++ b/src/gnome-ask-password-agent.vala -@@ -80,7 +80,7 @@ public class MyStatusIcon : StatusIcon { - string socket; - - PasswordDialog password_dialog; -- Notification n; -+ Notify.Notification n; - - public MyStatusIcon() throws GLib.Error { - GLib.Object(icon_name : "dialog-password"); -@@ -183,7 +183,7 @@ public class MyStatusIcon : StatusIcon { - } - set_from_icon_name(icon); - -- n = new Notification(title, message, icon); -+ n = new Notify.Notification(title, message, icon); - n.set_timeout(5000); - n.closed.connect(() => { - set_visible(true); --- -cgit v0.9.0.2-2-gbebe diff --git a/sys-apps/systemd-ui/metadata.xml b/sys-apps/systemd-ui/metadata.xml deleted file mode 100644 index fe305d209585..000000000000 --- a/sys-apps/systemd-ui/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - systemd@gentoo.org - Gentoo systemd team - - diff --git a/sys-apps/systemd-ui/systemd-ui-3.ebuild b/sys-apps/systemd-ui/systemd-ui-3.ebuild deleted file mode 100644 index 60875aa42aa8..000000000000 --- a/sys-apps/systemd-ui/systemd-ui-3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5 -VALA_MIN_API_VERSION=0.22 - -inherit autotools-utils systemd vala - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - !sys-apps/systemd[gtk] - >=dev-libs/glib-2.26:2 - dev-libs/libgee:0.8 - sys-apps/dbus - x11-libs/gtk+:3 - >=x11-libs/libnotify-0.7 -" -DEPEND="${RDEPEND} - app-arch/xz-utils - $(vala_depend) -" - -# Due to vala being broken. -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=( "${FILESDIR}/${P}-vala-0.24.patch" ) - -src_prepare() { - # Force the rebuild of .vala sources - touch src/*.vala || die - - # Fix hardcoded path in .vala. - sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die - - autotools-utils_src_prepare - vala_src_prepare -} diff --git a/sys-apps/systemd-ui/systemd-ui-9999.ebuild b/sys-apps/systemd-ui/systemd-ui-9999.ebuild deleted file mode 100644 index 8812d56b4097..000000000000 --- a/sys-apps/systemd-ui/systemd-ui-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -#if LIVE -AUTOTOOLS_AUTORECONF=yes -EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/${PN} - http://cgit.freedesktop.org/systemd/${PN}/" - -inherit git-2 -#endif - -# Needed per https://bugs.freedesktop.org/show_bug.cgi?id=69643#c5 -VALA_MIN_API_VERSION=0.22 - -inherit autotools-utils systemd vala - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="!sys-apps/systemd[gtk] - >=dev-libs/glib-2.26 - dev-libs/libgee:0.8 - sys-apps/dbus - x11-libs/gtk+:3 - >=x11-libs/libnotify-0.7" - -DEPEND="${RDEPEND} - app-arch/xz-utils - $(vala_depend)" - -#if LIVE -SRC_URI= -KEYWORDS= - -DEPEND="${DEPEND} - app-text/docbook-xml-dtd:4.2" -#endif - -# Due to vala being broken. -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_prepare() { - # Force the rebuild of .vala sources - touch src/*.vala || die - - # Fix hardcoded path in .vala. - sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die - - autotools-utils_src_prepare - vala_src_prepare -} -- 2.26.2