commit: 15715f1eb3542f0bce570c36742dfb1ce33f2a50
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 17:55:44 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=15715f1e
mate-extra/mate-indicator-applet: Drop old, sync with Gentoo
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
mate-extra/mate-indicator-applet/Manifest | 6 ++--
...-applet-1.14.1-indicator-ng-configure-fix.patch | 30 ----------------
.../mate-indicator-applet-1.12.1-r1.ebuild | 36 -------------------
.../mate-indicator-applet-1.14.1-r1.ebuild | 40 ----------------------
.../mate-indicator-applet-1.16.0.ebuild | 38 --------------------
....ebuild => mate-indicator-applet-1.22.0.ebuild} | 10 +++---
....ebuild => mate-indicator-applet-1.24.0.ebuild} | 18 ++++++----
.../mate-indicator-applet-9999.ebuild | 18 ++++++----
mate-extra/mate-indicator-applet/metadata.xml | 3 --
9 files changed, 29 insertions(+), 170 deletions(-)
diff --git a/mate-extra/mate-indicator-applet/Manifest
b/mate-extra/mate-indicator-applet/Manifest
index 902feec..a56e477 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,4 +1,2 @@
-DIST mate-indicator-applet-1.12.1.tar.xz 317984 BLAKE2B
98c5a52f499c1ed609b4c542aa96a3aecebcca529c66782e54954e3933ba50536ba3266f80522e576eddd1a6c97f1dff50059dfc48f38d4859ac57f370e120c2
SHA512
446ce32e8db22b153c7786292749645715e43c134e7fa00f81b7782a48163745307d396dbdd7765a63ec9514bec2f032f681028c55264e0fcf879c5e26fc9433
-DIST mate-indicator-applet-1.14.1.tar.xz 315480 BLAKE2B
337c216a11faa66332c4591cb8cf7b87dd0b2bf0180a5108f46c517fa8eb5353435c7f297a9f54431893033cb5d4b1f92b866825a304ea7b858a913540c8a2e8
SHA512
868f85546780d52aaadaa63ec14a8e92e673396653cebf7c5a9d0de459fc62d346fb10836298bf604eb50c63e5390cedd08576fb8903aeabdf2e2c4de5fc638f
-DIST mate-indicator-applet-1.16.0.tar.xz 317256 BLAKE2B
d9a9da94702a59c225aa7d80ad228fbdafb65bea496dcf681cc4c76b3b16a1b985b33714df585a945076f0bacd7080b1c122021ff05bd86306168924541a488a
SHA512
745f10ed20a453b02427982f59c81e85cdf80736aad62c4e149802c4df3646dfcd1dc822476f4d9cbd2f28c48e78c2e9a7e79652c8ba579a3e0bf9f16427b1a2
-DIST mate-indicator-applet-1.18.1.tar.xz 318464 BLAKE2B
989b84e2135ff3307a731b3eff981aea40002cbbd9b9e6ba61053a24e681fe3a3005b55ecf6dd027adf97d2bbfe3a12c0bdfdee2aac4860bac10fe3c03a4d681
SHA512
990cf60ff0b0a3e53f6ebc94abbdc15ce7b55258935763fb2d294a06c725e98e4b3389117e8fd04a9d1ce0ba691bc891542fd12c1ab58b29d99352a8369265d0
+DIST mate-indicator-applet-1.22.0.tar.xz 339564 BLAKE2B
0655ced0b24cc681ebd8e66b0749c9d98f9bc361830431bb408158ab174d5ea27aa022344cc667e37405ae693b52ed5c20e5b5ecec01b484c1928df36e1673d0
SHA512
6e1dd133a521f247ecb648b3ffa542e326f504fd3b0719a74099e83ac1dfa9fd4d7676af284f89f69d6684e5640f240930bb0fb43bcf7d59472786adf4c3200c
+DIST mate-indicator-applet-1.24.0.tar.xz 380136 BLAKE2B
1ae77c892f02127f7a0d778958e0f4acc2b14e01a4b8d8a316253c3b227eacd59cb556ed852de690f3ec4aec4d02874c2f594b41315cd85c87c16967ef9403ee
SHA512
0e82f572c1855c8623e537a45c2c0c0b98d3d642e46333eedc16c26607205293098a062008d0e568890ffdf6b8dc4c30a7f5e2e41a150f940917b3671783e413
diff --git
a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
b/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
deleted file mode 100644
index b9ae4fc..0000000
---
a/mate-extra/mate-indicator-applet/files/mate-indicator-applet-1.14.1-indicator-ng-configure-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06f6db28648cdeff02cc07f9a7f1410b228450a4 Mon Sep 17 00:00:00 2001
-From: monsta <mon...@inbox.ru>
-Date: Wed, 14 Sep 2016 18:20:25 +0300
-Subject: [PATCH] check for libindicator 12.10.2 for new style indicators
- support
-
-fixes build on Gentoo which has 12.10.1 - turned out this version
-had no indicator-ng yet.
-
-note that (as of now) 12.10.2 isn't officially released upstream,
-and Ubuntu has post-12.10.1 repo snapshot packaged and labeled as
-12.10.2. however, that snapshot already has 12.10.2 version in .pc
-file, so the build works with it.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5e9c505..9b4dafc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@ case "$with_gtk" in
- esac
-
- INDICATOR_REQUIRED_VERSION=0.3.90
--INDICATOR_NG_VERSION=12.10
-+INDICATOR_NG_VERSION=12.10.2
- INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
-
- PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
deleted file mode 100644
index f87a16f..0000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
- >=mate-base/mate-panel-1.8[gtk3(-)=]
- !gtk3? (
- >=dev-libs/libindicator-0.3.90:0
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- >=dev-libs/libindicator-0.3.90:3
- >=x11-libs/gtk+-3.0:3
- )"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
deleted file mode 100644
index 4af07eb..0000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
- >=mate-base/mate-panel-1.8[gtk3(-)=]
- !gtk3? (
- >=dev-libs/libindicator-0.3.90:0
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- >=dev-libs/libindicator-0.3.90:3
- >=x11-libs/gtk+-3.0:3
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-indicator-ng-configure-fix.patch" )
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
deleted file mode 100644
index 2f32c4c..0000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
- >=mate-base/mate-panel-1.8[gtk3(-)=]
- !gtk3? (
- >=dev-libs/libindicator-0.3.90:0
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- >=dev-libs/libindicator-0.3.90:3
- >=x11-libs/gtk+-3.0:3
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
similarity index 69%
copy from mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
copy to mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
index 560ab90..02aae41 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit mate versionator
+inherit mate eapi7-ver
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
SLOT="0"
IUSE=""
@@ -18,7 +18,7 @@ IUSE=""
COMMON_DEPEND="
>=dev-libs/libindicator-0.4:3
>=mate-base/mate-panel-1.17.0
- >=x11-libs/gtk+-3.14:3"
+ >=x11-libs/gtk+-3.22:3"
RDEPEND="${COMMON_DEPEND}"
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
similarity index 57%
rename from mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
rename to mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
index 560ab90..23ea522 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit mate versionator
+inherit mate eapi7-ver
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
fi
DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
SLOT="0"
IUSE=""
@@ -18,10 +18,14 @@ IUSE=""
COMMON_DEPEND="
>=dev-libs/libindicator-0.4:3
>=mate-base/mate-panel-1.17.0
- >=x11-libs/gtk+-3.14:3"
+ >=x11-libs/gtk+-3.22:3
+"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig
+"
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-9999.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-9999.ebuild
index 0540e49..23ea522 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-9999.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit mate versionator
+inherit mate eapi7-ver
if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
fi
DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
SLOT="0"
IUSE=""
@@ -18,10 +18,14 @@ IUSE=""
COMMON_DEPEND="
>=dev-libs/libindicator-0.4:3
>=mate-base/mate-panel-1.17.0
- >=x11-libs/gtk+-3.14:3"
+ >=x11-libs/gtk+-3.22:3
+"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+"
DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig
+"
diff --git a/mate-extra/mate-indicator-applet/metadata.xml
b/mate-extra/mate-indicator-applet/metadata.xml
index 9561edc..84f9d6c 100644
--- a/mate-extra/mate-indicator-applet/metadata.xml
+++ b/mate-extra/mate-indicator-applet/metadata.xml
@@ -5,9 +5,6 @@
<email>m...@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
- <use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
- </use>
<upstream>
<remote-id
type="github">mate-desktop/mate-indicator-applet</remote-id>
</upstream>
