Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-taskmanager/files/, xfce-extra/xfce4-taskmanager/
Date: Sun, 25 Mar 2018 17:27:46
Message-Id: 1521998837.c936d73f92edd7a602090718cddeb1f526e009d1.mgorny@gentoo
1 commit: c936d73f92edd7a602090718cddeb1f526e009d1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 25 16:20:19 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 25 17:27:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c936d73f
7
8 xfce-extra/xfce4-taskmanager: Drop old
9
10 xfce-extra/xfce4-taskmanager/Manifest | 2 -
11 .../files/xfce4-taskmanager-1.0.0-UTF-8.patch | 24 ------------
12 xfce-extra/xfce4-taskmanager/metadata.xml | 1 -
13 .../xfce4-taskmanager-1.0.1.ebuild | 37 ------------------
14 .../xfce4-taskmanager-1.1.0.ebuild | 44 ----------------------
15 5 files changed, 108 deletions(-)
16
17 diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
18 index ce9a4788dce..4ba5f50b7b2 100644
19 --- a/xfce-extra/xfce4-taskmanager/Manifest
20 +++ b/xfce-extra/xfce4-taskmanager/Manifest
21 @@ -1,3 +1 @@
22 -DIST xfce4-taskmanager-1.0.1.tar.bz2 368495 BLAKE2B 24b7da6538f4db0370277dd201f2358032bb583e3ffdbeaf7c9011baf2383538455452b60d7ad101ccff15af519e2edaa0db3b051fd53b59299d6607eea4ca8d SHA512 2108a31738c9d544537b830de1089b776272333fa8599cbdf0598cca5af5ec312139ad52137902baa98ebf6c5167fb1ab62b34d7b790b539d01bbe40023411e5
23 -DIST xfce4-taskmanager-1.1.0.tar.bz2 365866 BLAKE2B a4f3df72e06f4333ecf189720aa94980cd89ae4fa48f17eeaf683339a2e27070c9ad606eb29a03a18d476af601d5a37bb778d93bd3eeac9a195eda6a6e37334b SHA512 a7b1d1a6836f89747c873c87e495830438cf3093fd044c43c951abca6a82ab2c0ae9a41eba89d570a83f41fb6ad447c9c4fc578930684c981fbe45de19e1d7f8
24 DIST xfce4-taskmanager-1.2.0.tar.bz2 435276 BLAKE2B 857494cedf5f6a43280379f1468ce55acaddac51e8e73a02a59bf96148fffa18a20da8a55099b404eb073fb971d7bb72bb597fc7089d0927d9219a76cadfd460 SHA512 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d
25
26 diff --git a/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch b/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch
27 deleted file mode 100644
28 index a43e77f85f5..00000000000
29 --- a/xfce-extra/xfce4-taskmanager/files/xfce4-taskmanager-1.0.0-UTF-8.patch
30 +++ /dev/null
31 @@ -1,24 +0,0 @@
32 -http://bugs.gentoo.org/488626
33 -http://bugzilla.xfce.org/show_bug.cgi?id=10417
34 -
35 ---- src/task-manager-linux.c
36 -+++ src/task-manager-linux.c
37 -@@ -128,7 +128,7 @@
38 - FILE *file;
39 - gchar filename[96];
40 - gint i;
41 -- gchar c;
42 -+ gint c;
43 -
44 - snprintf (filename, 96, "/proc/%i/cmdline", task->pid);
45 - if ((file = fopen (filename, "r")) == NULL)
46 -@@ -136,7 +136,7 @@
47 -
48 - /* Read full command byte per byte until EOF */
49 - for (i = 0; (c = fgetc (file)) != EOF && i < (gint)sizeof (task->cmdline) - 1; i++)
50 -- task->cmdline[i] = (c == '\0') ? ' ' : c;
51 -+ task->cmdline[i] = (c == '\0') ? ' ' : (gchar)c;
52 - task->cmdline[i] = '\0';
53 - if (task->cmdline[i-1] == ' ')
54 - task->cmdline[i-1] = '\0';
55 -
56
57 diff --git a/xfce-extra/xfce4-taskmanager/metadata.xml b/xfce-extra/xfce4-taskmanager/metadata.xml
58 index 3211925b8a9..6628a8203ec 100644
59 --- a/xfce-extra/xfce4-taskmanager/metadata.xml
60 +++ b/xfce-extra/xfce4-taskmanager/metadata.xml
61 @@ -6,7 +6,6 @@
62 <name>XFCE Team</name>
63 </maintainer>
64 <use>
65 - <flag name="gksu">Build against <pkg>x11-libs/libgksu</pkg> to provide "Run as root" option in the application's menu</flag>
66 <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
67 </use>
68 </pkgmetadata>
69
70 diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
71 deleted file mode 100644
72 index cf2beeb8175..00000000000
73 --- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
74 +++ /dev/null
75 @@ -1,37 +0,0 @@
76 -# Copyright 1999-2017 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=5
80 -inherit xfconf
81 -
82 -DESCRIPTION="Task Manager"
83 -HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
84 -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
85 -
86 -LICENSE="GPL-2"
87 -SLOT="0"
88 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
89 -IUSE="debug gksu"
90 -
91 -RDEPEND="x11-libs/cairo
92 - >=x11-libs/gtk+-2.12:2
93 - x11-libs/libwnck:1
94 - gksu? ( x11-libs/libgksu:2 )"
95 -DEPEND="${RDEPEND}
96 - dev-util/intltool
97 - sys-devel/gettext
98 - virtual/pkgconfig"
99 -
100 -pkg_setup() {
101 - PATCHES=(
102 - "${FILESDIR}"/${PN}-1.0.0-UTF-8.patch
103 - )
104 -
105 - XFCONF=(
106 - --enable-wnck
107 - $(use_enable gksu)
108 - $(xfconf_use_debug)
109 - )
110 -
111 - DOCS=( AUTHORS ChangeLog NEWS README THANKS )
112 -}
113
114 diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
115 deleted file mode 100644
116 index 8ade79ccd15..00000000000
117 --- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
118 +++ /dev/null
119 @@ -1,44 +0,0 @@
120 -# Copyright 1999-2017 Gentoo Foundation
121 -# Distributed under the terms of the GNU General Public License v2
122 -
123 -EAPI=5
124 -inherit xfconf
125 -
126 -DESCRIPTION="Task Manager"
127 -HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
128 -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
129 -
130 -LICENSE="GPL-2"
131 -SLOT="0"
132 -KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
133 -IUSE="debug gksu gtk3"
134 -
135 -RDEPEND="x11-libs/cairo:=
136 - gtk3? (
137 - x11-libs/gtk+:3=
138 - x11-libs/libwnck:3=
139 - )
140 - !gtk3? (
141 - >=x11-libs/gtk+-2.12:2=
142 - x11-libs/libwnck:1=
143 - gksu? ( x11-libs/libgksu:2= )
144 - )"
145 -# GTK+2 is required unconditionally
146 -# https://bugzilla.xfce.org/show_bug.cgi?id=11819
147 -DEPEND="${RDEPEND}
148 - dev-util/intltool
149 - sys-devel/gettext
150 - >=x11-libs/gtk+-2.12:2=
151 - virtual/pkgconfig"
152 -REQUIRED_USE="gksu? ( !gtk3 )"
153 -
154 -pkg_setup() {
155 - XFCONF=(
156 - --enable-wnck
157 - $(use_enable gtk3)
158 - $(use_enable gksu)
159 - $(xfconf_use_debug)
160 - )
161 -
162 - DOCS=( AUTHORS ChangeLog NEWS README THANKS )
163 -}