| 1 |
commit: 6d59c1f4f1eb664736e9b79dee18e42689f9029f |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 6 20:09:01 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 6 20:22:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d59c1f4 |
| 7 |
|
| 8 |
mate-extra/mate-utils: remove old |
| 9 |
|
| 10 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 12 |
|
| 13 |
mate-extra/mate-utils/Manifest | 3 - |
| 14 |
.../files/mate-utils-1.12.0-dict-gtk3.patch | 53 ---------------- |
| 15 |
...de-correct-header-to-fix-occasional-ftbfs.patch | 25 -------- |
| 16 |
mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild | 74 ---------------------- |
| 17 |
mate-extra/mate-utils/mate-utils-1.14.1.ebuild | 72 --------------------- |
| 18 |
mate-extra/mate-utils/mate-utils-1.16.1.ebuild | 72 --------------------- |
| 19 |
mate-extra/mate-utils/metadata.xml | 1 - |
| 20 |
7 files changed, 300 deletions(-) |
| 21 |
|
| 22 |
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest |
| 23 |
index 5cc57d29ba1..d3d3685714f 100644 |
| 24 |
--- a/mate-extra/mate-utils/Manifest |
| 25 |
+++ b/mate-extra/mate-utils/Manifest |
| 26 |
@@ -1,4 +1 @@ |
| 27 |
-DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47 |
| 28 |
-DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B 21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125 SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4 |
| 29 |
-DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B 3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb SHA512 d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0 |
| 30 |
DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a |
| 31 |
|
| 32 |
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index dff6dbe5582..00000000000 |
| 35 |
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,53 +0,0 @@ |
| 38 |
-From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001 |
| 39 |
-From: Kir Kolyshkin <kir@××××××.org> |
| 40 |
-Date: Mon, 16 May 2016 14:52:28 -0700 |
| 41 |
-Subject: [PATCH] mate-dict.pc: depend upon proper gtk version |
| 42 |
- |
| 43 |
-If the package is built against gtk-3.0 (as in |
| 44 |
-./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0 |
| 45 |
-since it's hardcoded it there. This can lead to improper builds |
| 46 |
-of packages using libmatedict (although I can't find any now), |
| 47 |
-as well as improper RPM dependencies, like this: |
| 48 |
- |
| 49 |
- $ rpm -e gtk2-devel |
| 50 |
- error: Failed dependencies: |
| 51 |
- ... |
| 52 |
- pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64 |
| 53 |
- |
| 54 |
-Fortunately, the file is already generated, so it's trivial to add |
| 55 |
-a proper substitution. |
| 56 |
- |
| 57 |
-[v2: also add min GTK version required] |
| 58 |
- |
| 59 |
-Signed-off-by: Kir Kolyshkin <kir@××××××.org> |
| 60 |
---- |
| 61 |
- configure.ac | 2 ++ |
| 62 |
- mate-dictionary/libgdict/mate-dict.pc.in | 2 +- |
| 63 |
- 2 files changed, 3 insertions(+), 1 deletion(-) |
| 64 |
- |
| 65 |
-diff --git a/configure.ac b/configure.ac |
| 66 |
-index 64aba70..39cc6f8 100644 |
| 67 |
---- a/configure.ac |
| 68 |
-+++ b/configure.ac |
| 69 |
-@@ -89,6 +89,8 @@ case "$with_gtk" in |
| 70 |
- LIBCANBERRA_GTK_REQUIRED=0.4 |
| 71 |
- ;; |
| 72 |
- esac |
| 73 |
-+AC_SUBST(GTK_API_VERSION) |
| 74 |
-+AC_SUBST(GTK_REQUIRED) |
| 75 |
- |
| 76 |
- # common checks |
| 77 |
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) |
| 78 |
-diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in |
| 79 |
-index e409a0c..8168de2 100644 |
| 80 |
---- a/mate-dictionary/libgdict/mate-dict.pc.in |
| 81 |
-+++ b/mate-dictionary/libgdict/mate-dict.pc.in |
| 82 |
-@@ -5,7 +5,7 @@ includedir=@includedir@ |
| 83 |
- |
| 84 |
- Name: gdict-1.0 |
| 85 |
- Description: MATE Dictionary Protocol client library |
| 86 |
--Requires: gtk+-2.0 |
| 87 |
-+Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@ |
| 88 |
- Version: @GDICT_VERSION@ |
| 89 |
- Libs: -L${libdir} -lmatedict |
| 90 |
- Cflags: -I${includedir}/mate-dict |
| 91 |
|
| 92 |
diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch |
| 93 |
deleted file mode 100644 |
| 94 |
index 09d201763f6..00000000000 |
| 95 |
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch |
| 96 |
+++ /dev/null |
| 97 |
@@ -1,25 +0,0 @@ |
| 98 |
-From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001 |
| 99 |
-From: monsta <monsta@×××××.ru> |
| 100 |
-Date: Tue, 14 Mar 2017 15:08:47 +0300 |
| 101 |
-Subject: [PATCH] mate-dictionary: include correct header to fix occasional |
| 102 |
- FTBFS |
| 103 |
- |
| 104 |
-taken from: |
| 105 |
-https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948 |
| 106 |
---- |
| 107 |
- mate-dictionary/libgdict/gdict-client-context.h | 2 +- |
| 108 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 109 |
- |
| 110 |
-diff --git a/mate-dictionary/libgdict/gdict-client-context.h b/mate-dictionary/libgdict/gdict-client-context.h |
| 111 |
-index 2854fed..c52bbb4 100644 |
| 112 |
---- a/mate-dictionary/libgdict/gdict-client-context.h |
| 113 |
-+++ b/mate-dictionary/libgdict/gdict-client-context.h |
| 114 |
-@@ -20,7 +20,7 @@ |
| 115 |
- #ifndef __GDICT_CLIENT_CONTEXT_H__ |
| 116 |
- #define __GDICT_CLIENT_CONTEXT_H__ |
| 117 |
- |
| 118 |
--#include <glib-object.h> |
| 119 |
-+#include "gdict-context.h" |
| 120 |
- |
| 121 |
- #define GDICT_TYPE_CLIENT_CONTEXT (gdict_client_context_get_type ()) |
| 122 |
- #define GDICT_CLIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext)) |
| 123 |
|
| 124 |
diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild |
| 125 |
deleted file mode 100644 |
| 126 |
index d933999c86c..00000000000 |
| 127 |
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild |
| 128 |
+++ /dev/null |
| 129 |
@@ -1,74 +0,0 @@ |
| 130 |
-# Copyright 1999-2018 Gentoo Foundation |
| 131 |
-# Distributed under the terms of the GNU General Public License v2 |
| 132 |
- |
| 133 |
-EAPI=6 |
| 134 |
- |
| 135 |
-MATE_LA_PUNT="yes" |
| 136 |
- |
| 137 |
-inherit mate |
| 138 |
- |
| 139 |
-if [[ ${PV} != 9999 ]]; then |
| 140 |
- KEYWORDS="amd64 ~arm x86" |
| 141 |
-fi |
| 142 |
- |
| 143 |
-DESCRIPTION="Utilities for the MATE desktop" |
| 144 |
-LICENSE="GPL-2" |
| 145 |
-SLOT="0" |
| 146 |
- |
| 147 |
-IUSE="X applet debug gtk3 ipv6 test" |
| 148 |
- |
| 149 |
-RDEPEND="app-text/rarian:0 |
| 150 |
- dev-libs/atk:0 |
| 151 |
- >=dev-libs/glib-2.36:2 |
| 152 |
- >=gnome-base/libgtop-2.12:2= |
| 153 |
- sys-libs/zlib:0 |
| 154 |
- x11-libs/cairo:0 |
| 155 |
- x11-libs/gdk-pixbuf:2 |
| 156 |
- x11-libs/libICE:0 |
| 157 |
- x11-libs/libSM:0 |
| 158 |
- x11-libs/libX11:0 |
| 159 |
- x11-libs/libXext:0 |
| 160 |
- x11-libs/pango:0 |
| 161 |
- applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) |
| 162 |
- !gtk3? ( |
| 163 |
- >=x11-libs/gtk+-2.24:2 |
| 164 |
- >=media-libs/libcanberra-0.4:0[gtk] |
| 165 |
- ) |
| 166 |
- gtk3? ( |
| 167 |
- >=x11-libs/gtk+-3.0:3 |
| 168 |
- >=media-libs/libcanberra-0.4:0[gtk3] |
| 169 |
- )" |
| 170 |
- |
| 171 |
-DEPEND="${RDEPEND} |
| 172 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
| 173 |
- app-text/yelp-tools:0 |
| 174 |
- dev-util/gtk-doc |
| 175 |
- dev-util/gtk-doc-am |
| 176 |
- >=dev-util/intltool-0.50.1:* |
| 177 |
- sys-devel/gettext:* |
| 178 |
- virtual/pkgconfig:* |
| 179 |
- x11-base/xorg-proto" |
| 180 |
- |
| 181 |
-PATCHES=( |
| 182 |
- "${FILESDIR}/${P}-dict-gtk3.patch" |
| 183 |
- "${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch" |
| 184 |
-) |
| 185 |
- |
| 186 |
-src_prepare() { |
| 187 |
- # Make apps visible in all DEs. |
| 188 |
- LC_ALL=C find . -iname '*.desktop.in*' -exec \ |
| 189 |
- sed -e '/OnlyShowIn/d' -i {} + || die |
| 190 |
- |
| 191 |
- mate_src_prepare |
| 192 |
-} |
| 193 |
- |
| 194 |
-src_configure() { |
| 195 |
- mate_src_configure \ |
| 196 |
- --disable-maintainer-flags \ |
| 197 |
- --enable-zlib \ |
| 198 |
- --enable-debug=$(usex debug yes minimum) \ |
| 199 |
- --with-gtk=$(usex gtk3 3.0 2.0) \ |
| 200 |
- $(use_with X x) \ |
| 201 |
- $(use_enable applet gdict-applet) \ |
| 202 |
- $(use_enable ipv6) |
| 203 |
-} |
| 204 |
|
| 205 |
diff --git a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild |
| 206 |
deleted file mode 100644 |
| 207 |
index 62cb6981a09..00000000000 |
| 208 |
--- a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild |
| 209 |
+++ /dev/null |
| 210 |
@@ -1,72 +0,0 @@ |
| 211 |
-# Copyright 1999-2018 Gentoo Foundation |
| 212 |
-# Distributed under the terms of the GNU General Public License v2 |
| 213 |
- |
| 214 |
-EAPI=6 |
| 215 |
- |
| 216 |
-MATE_LA_PUNT="yes" |
| 217 |
- |
| 218 |
-inherit mate |
| 219 |
- |
| 220 |
-if [[ ${PV} != 9999 ]]; then |
| 221 |
- KEYWORDS="~amd64 ~arm ~x86" |
| 222 |
-fi |
| 223 |
- |
| 224 |
-DESCRIPTION="Utilities for the MATE desktop" |
| 225 |
-LICENSE="GPL-2" |
| 226 |
-SLOT="0" |
| 227 |
- |
| 228 |
-IUSE="X applet debug gtk3 ipv6 test" |
| 229 |
- |
| 230 |
-COMMON_DEPEND=" |
| 231 |
- dev-libs/atk:0 |
| 232 |
- >=dev-libs/glib-2.36:2 |
| 233 |
- >=gnome-base/libgtop-2.12:2= |
| 234 |
- sys-libs/zlib:0 |
| 235 |
- x11-libs/cairo:0 |
| 236 |
- x11-libs/gdk-pixbuf:2 |
| 237 |
- x11-libs/libICE:0 |
| 238 |
- x11-libs/libSM:0 |
| 239 |
- x11-libs/libX11:0 |
| 240 |
- x11-libs/libXext:0 |
| 241 |
- x11-libs/pango:0 |
| 242 |
- applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) |
| 243 |
- !gtk3? ( |
| 244 |
- >=x11-libs/gtk+-2.24:2 |
| 245 |
- >=media-libs/libcanberra-0.4:0[gtk] |
| 246 |
- ) |
| 247 |
- gtk3? ( |
| 248 |
- >=x11-libs/gtk+-3.0:3 |
| 249 |
- >=media-libs/libcanberra-0.4:0[gtk3] |
| 250 |
- )" |
| 251 |
- |
| 252 |
-RDEPEND="${COMMON_DEPEND}" |
| 253 |
- |
| 254 |
-DEPEND="${COMMON_DEPEND} |
| 255 |
- app-text/rarian:0 |
| 256 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
| 257 |
- app-text/yelp-tools:0 |
| 258 |
- dev-util/gtk-doc |
| 259 |
- dev-util/gtk-doc-am |
| 260 |
- >=dev-util/intltool-0.50.1:* |
| 261 |
- sys-devel/gettext:* |
| 262 |
- virtual/pkgconfig:* |
| 263 |
- x11-base/xorg-proto" |
| 264 |
- |
| 265 |
-src_prepare() { |
| 266 |
- # Make apps visible in all DEs. |
| 267 |
- LC_ALL=C find . -iname '*.desktop.in*' -exec \ |
| 268 |
- sed -e '/OnlyShowIn/d' -i {} + || die |
| 269 |
- |
| 270 |
- mate_src_prepare |
| 271 |
-} |
| 272 |
- |
| 273 |
-src_configure() { |
| 274 |
- mate_src_configure \ |
| 275 |
- --disable-maintainer-flags \ |
| 276 |
- --enable-zlib \ |
| 277 |
- --enable-debug=$(usex debug yes minimum) \ |
| 278 |
- --with-gtk=$(usex gtk3 3.0 2.0) \ |
| 279 |
- $(use_with X x) \ |
| 280 |
- $(use_enable applet gdict-applet) \ |
| 281 |
- $(use_enable ipv6) |
| 282 |
-} |
| 283 |
|
| 284 |
diff --git a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild |
| 285 |
deleted file mode 100644 |
| 286 |
index 62cb6981a09..00000000000 |
| 287 |
--- a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild |
| 288 |
+++ /dev/null |
| 289 |
@@ -1,72 +0,0 @@ |
| 290 |
-# Copyright 1999-2018 Gentoo Foundation |
| 291 |
-# Distributed under the terms of the GNU General Public License v2 |
| 292 |
- |
| 293 |
-EAPI=6 |
| 294 |
- |
| 295 |
-MATE_LA_PUNT="yes" |
| 296 |
- |
| 297 |
-inherit mate |
| 298 |
- |
| 299 |
-if [[ ${PV} != 9999 ]]; then |
| 300 |
- KEYWORDS="~amd64 ~arm ~x86" |
| 301 |
-fi |
| 302 |
- |
| 303 |
-DESCRIPTION="Utilities for the MATE desktop" |
| 304 |
-LICENSE="GPL-2" |
| 305 |
-SLOT="0" |
| 306 |
- |
| 307 |
-IUSE="X applet debug gtk3 ipv6 test" |
| 308 |
- |
| 309 |
-COMMON_DEPEND=" |
| 310 |
- dev-libs/atk:0 |
| 311 |
- >=dev-libs/glib-2.36:2 |
| 312 |
- >=gnome-base/libgtop-2.12:2= |
| 313 |
- sys-libs/zlib:0 |
| 314 |
- x11-libs/cairo:0 |
| 315 |
- x11-libs/gdk-pixbuf:2 |
| 316 |
- x11-libs/libICE:0 |
| 317 |
- x11-libs/libSM:0 |
| 318 |
- x11-libs/libX11:0 |
| 319 |
- x11-libs/libXext:0 |
| 320 |
- x11-libs/pango:0 |
| 321 |
- applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) |
| 322 |
- !gtk3? ( |
| 323 |
- >=x11-libs/gtk+-2.24:2 |
| 324 |
- >=media-libs/libcanberra-0.4:0[gtk] |
| 325 |
- ) |
| 326 |
- gtk3? ( |
| 327 |
- >=x11-libs/gtk+-3.0:3 |
| 328 |
- >=media-libs/libcanberra-0.4:0[gtk3] |
| 329 |
- )" |
| 330 |
- |
| 331 |
-RDEPEND="${COMMON_DEPEND}" |
| 332 |
- |
| 333 |
-DEPEND="${COMMON_DEPEND} |
| 334 |
- app-text/rarian:0 |
| 335 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
| 336 |
- app-text/yelp-tools:0 |
| 337 |
- dev-util/gtk-doc |
| 338 |
- dev-util/gtk-doc-am |
| 339 |
- >=dev-util/intltool-0.50.1:* |
| 340 |
- sys-devel/gettext:* |
| 341 |
- virtual/pkgconfig:* |
| 342 |
- x11-base/xorg-proto" |
| 343 |
- |
| 344 |
-src_prepare() { |
| 345 |
- # Make apps visible in all DEs. |
| 346 |
- LC_ALL=C find . -iname '*.desktop.in*' -exec \ |
| 347 |
- sed -e '/OnlyShowIn/d' -i {} + || die |
| 348 |
- |
| 349 |
- mate_src_prepare |
| 350 |
-} |
| 351 |
- |
| 352 |
-src_configure() { |
| 353 |
- mate_src_configure \ |
| 354 |
- --disable-maintainer-flags \ |
| 355 |
- --enable-zlib \ |
| 356 |
- --enable-debug=$(usex debug yes minimum) \ |
| 357 |
- --with-gtk=$(usex gtk3 3.0 2.0) \ |
| 358 |
- $(use_with X x) \ |
| 359 |
- $(use_enable applet gdict-applet) \ |
| 360 |
- $(use_enable ipv6) |
| 361 |
-} |
| 362 |
|
| 363 |
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml |
| 364 |
index 516aaa5d49f..eaae5063853 100644 |
| 365 |
--- a/mate-extra/mate-utils/metadata.xml |
| 366 |
+++ b/mate-extra/mate-utils/metadata.xml |
| 367 |
@@ -7,7 +7,6 @@ |
| 368 |
</maintainer> |
| 369 |
<use> |
| 370 |
<flag name="applet">Enable the mate dictionary applet</flag> |
| 371 |
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag> |
| 372 |
</use> |
| 373 |
<upstream> |
| 374 |
<remote-id type="github">mate-desktop/mate-utils</remote-id> |
Archives