commit: 6d59c1f4f1eb664736e9b79dee18e42689f9029f
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 6 20:09:01 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct 6 20:22:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d59c1f4
mate-extra/mate-utils: remove old
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
mate-extra/mate-utils/Manifest | 3 -
.../files/mate-utils-1.12.0-dict-gtk3.patch | 53 ----------------
...de-correct-header-to-fix-occasional-ftbfs.patch | 25 --------
mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild | 74 ----------------------
mate-extra/mate-utils/mate-utils-1.14.1.ebuild | 72 ---------------------
mate-extra/mate-utils/mate-utils-1.16.1.ebuild | 72 ---------------------
mate-extra/mate-utils/metadata.xml | 1 -
7 files changed, 300 deletions(-)
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 5cc57d29ba1..d3d3685714f 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,4 +1 @@
-DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B
a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca
SHA512
fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47
-DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B
21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125
SHA512
7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4
-DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B
3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb
SHA512
d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0
DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B
e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2
SHA512
c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
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
deleted file mode 100644
index dff6dbe5582..00000000000
--- a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001
-From: Kir Kolyshkin <k...@openvz.org>
-Date: Mon, 16 May 2016 14:52:28 -0700
-Subject: [PATCH] mate-dict.pc: depend upon proper gtk version
-
-If the package is built against gtk-3.0 (as in
-./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0
-since it's hardcoded it there. This can lead to improper builds
-of packages using libmatedict (although I can't find any now),
-as well as improper RPM dependencies, like this:
-
- $ rpm -e gtk2-devel
- error: Failed dependencies:
- ...
- pkgconfig(gtk+-2.0) is needed by (installed)
mate-utils-devel-1.14.0-1gtk3.fc23.x86_64
-
-Fortunately, the file is already generated, so it's trivial to add
-a proper substitution.
-
-[v2: also add min GTK version required]
-
-Signed-off-by: Kir Kolyshkin <k...@openvz.org>
----
- configure.ac | 2 ++
- mate-dictionary/libgdict/mate-dict.pc.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64aba70..39cc6f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,6 +89,8 @@ case "$with_gtk" in
- LIBCANBERRA_GTK_REQUIRED=0.4
- ;;
- esac
-+AC_SUBST(GTK_API_VERSION)
-+AC_SUBST(GTK_REQUIRED)
-
- # common checks
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-diff --git a/mate-dictionary/libgdict/mate-dict.pc.in
b/mate-dictionary/libgdict/mate-dict.pc.in
-index e409a0c..8168de2 100644
---- a/mate-dictionary/libgdict/mate-dict.pc.in
-+++ b/mate-dictionary/libgdict/mate-dict.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
-
- Name: gdict-1.0
- Description: MATE Dictionary Protocol client library
--Requires: gtk+-2.0
-+Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
- Version: @GDICT_VERSION@
- Libs: -L${libdir} -lmatedict
- Cflags: -I${includedir}/mate-dict
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
deleted file mode 100644
index 09d201763f6..00000000000
---
a/mate-extra/mate-utils/files/mate-utils-1.12.0-include-correct-header-to-fix-occasional-ftbfs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 550229e422cd88fe39473f41cebe6cef12f6c8fb Mon Sep 17 00:00:00 2001
-From: monsta <mon...@inbox.ru>
-Date: Tue, 14 Mar 2017 15:08:47 +0300
-Subject: [PATCH] mate-dictionary: include correct header to fix occasional
- FTBFS
-
-taken from:
-https://git.gnome.org/browse/gnome-dictionary/commit/?id=d529e2dd056f05cb1115c2f68bb6f773b4b14948
----
- mate-dictionary/libgdict/gdict-client-context.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mate-dictionary/libgdict/gdict-client-context.h
b/mate-dictionary/libgdict/gdict-client-context.h
-index 2854fed..c52bbb4 100644
---- a/mate-dictionary/libgdict/gdict-client-context.h
-+++ b/mate-dictionary/libgdict/gdict-client-context.h
-@@ -20,7 +20,7 @@
- #ifndef __GDICT_CLIENT_CONTEXT_H__
- #define __GDICT_CLIENT_CONTEXT_H__
-
--#include <glib-object.h>
-+#include "gdict-context.h"
-
- #define GDICT_TYPE_CLIENT_CONTEXT (gdict_client_context_get_type
())
- #define GDICT_CLIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST
((obj), GDICT_TYPE_CLIENT_CONTEXT, GdictClientContext))
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
deleted file mode 100644
index d933999c86c..00000000000
--- a/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-RDEPEND="app-text/rarian:0
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=gnome-base/libgtop-2.12:2=
- sys-libs/zlib:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libSM:0
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/pango:0
- applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=media-libs/libcanberra-0.4:0[gtk]
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=media-libs/libcanberra-0.4:0[gtk3]
- )"
-
-DEPEND="${RDEPEND}
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}/${P}-dict-gtk3.patch"
- "${FILESDIR}/${P}-include-correct-header-to-fix-occasional-ftbfs.patch"
-)
-
-src_prepare() {
- # Make apps visible in all DEs.
- LC_ALL=C find . -iname '*.desktop.in*' -exec \
- sed -e '/OnlyShowIn/d' -i {} + || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-maintainer-flags \
- --enable-zlib \
- --enable-debug=$(usex debug yes minimum) \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_with X x) \
- $(use_enable applet gdict-applet) \
- $(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
b/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
deleted file mode 100644
index 62cb6981a09..00000000000
--- a/mate-extra/mate-utils/mate-utils-1.14.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=gnome-base/libgtop-2.12:2=
- sys-libs/zlib:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libSM:0
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/pango:0
- applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=media-libs/libcanberra-0.4:0[gtk]
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=media-libs/libcanberra-0.4:0[gtk3]
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- x11-base/xorg-proto"
-
-src_prepare() {
- # Make apps visible in all DEs.
- LC_ALL=C find . -iname '*.desktop.in*' -exec \
- sed -e '/OnlyShowIn/d' -i {} + || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-maintainer-flags \
- --enable-zlib \
- --enable-debug=$(usex debug yes minimum) \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_with X x) \
- $(use_enable applet gdict-applet) \
- $(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
deleted file mode 100644
index 62cb6981a09..00000000000
--- a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=gnome-base/libgtop-2.12:2=
- sys-libs/zlib:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- x11-libs/libSM:0
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/pango:0
- applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
- !gtk3? (
- >=x11-libs/gtk+-2.24:2
- >=media-libs/libcanberra-0.4:0[gtk]
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3
- >=media-libs/libcanberra-0.4:0[gtk3]
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- x11-base/xorg-proto"
-
-src_prepare() {
- # Make apps visible in all DEs.
- LC_ALL=C find . -iname '*.desktop.in*' -exec \
- sed -e '/OnlyShowIn/d' -i {} + || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-maintainer-flags \
- --enable-zlib \
- --enable-debug=$(usex debug yes minimum) \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_with X x) \
- $(use_enable applet gdict-applet) \
- $(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/metadata.xml
b/mate-extra/mate-utils/metadata.xml
index 516aaa5d49f..eaae5063853 100644
--- a/mate-extra/mate-utils/metadata.xml
+++ b/mate-extra/mate-utils/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="applet">Enable the mate dictionary applet</flag>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
</use>
<upstream>
<remote-id type="github">mate-desktop/mate-utils</remote-id>
