commit: b893b7aac8bd5b68e4ebccb0a522128ed25ba64c
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 19:28:46 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:24 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=b893b7aa
mate-base/mate-applets-meta: 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-applets-meta-1.12.ebuild | 27 ----------------------
.../mate-applets-meta-1.16.ebuild | 26 ---------------------
...1.18.ebuild => mate-applets-meta-1.22.0.ebuild} | 8 +++----
...1.14.ebuild => mate-applets-meta-1.24.0.ebuild} | 17 +++++++-------
.../mate-applets-meta-9999.ebuild | 11 +++++----
mate-base/mate-applets-meta/metadata.xml | 3 ---
6 files changed, 19 insertions(+), 73 deletions(-)
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
b/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
deleted file mode 100644
index 1b98c00..0000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- MATE_BRANCH=9999
-else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 netspeed sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
- appindicator? (
=mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
- netspeed? ( =net-analyzer/mate-netspeed-${MATE_BRANCH}*[gtk3(-)=] )
- sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
b/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
deleted file mode 100644
index e6c203a..0000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- MATE_BRANCH=9999
-else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator gtk3 sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
- appindicator? (
=mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
- sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
b/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
similarity index 77%
rename from mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
rename to mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
index e58f851..e66d7f1 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
if [[ ${PV} == 9999 ]]; then
MATE_BRANCH=9999
else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ inherit eapi7-ver
+ MATE_BRANCH="$(ver_cut 1-2)"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Meta package for MATE panel applets"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
b/mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
similarity index 52%
rename from mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
rename to mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
index e6c203a..e2fda45 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
if [[ ${PV} == 9999 ]]; then
MATE_BRANCH=9999
else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
- KEYWORDS="~amd64 ~arm ~x86"
+ inherit eapi7-ver
+ MATE_BRANCH="$(ver_cut 1-2)"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Meta package for MATE panel applets"
@@ -17,10 +17,11 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-IUSE="appindicator gtk3 sensors"
+IUSE="appindicator sensors"
DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*[gtk3(-)=]
- appindicator? (
=mate-extra/mate-indicator-applet-${MATE_BRANCH}*[gtk3(-)=] )
- sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}*[gtk3(-)=] )
+RDEPEND="
+ =mate-base/mate-applets-${MATE_BRANCH}*
+ appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
+ sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
b/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
index 1ed7c6e..e2fda45 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
if [[ ${PV} == 9999 ]]; then
MATE_BRANCH=9999
else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
- KEYWORDS="~amd64 ~arm ~x86"
+ inherit eapi7-ver
+ MATE_BRANCH="$(ver_cut 1-2)"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Meta package for MATE panel applets"
@@ -20,7 +20,8 @@ SLOT="0"
IUSE="appindicator sensors"
DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
+RDEPEND="
+ =mate-base/mate-applets-${MATE_BRANCH}*
appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
"
diff --git a/mate-base/mate-applets-meta/metadata.xml
b/mate-base/mate-applets-meta/metadata.xml
index 69703b5..1d4f049 100644
--- a/mate-base/mate-applets-meta/metadata.xml
+++ b/mate-base/mate-applets-meta/metadata.xml
@@ -8,9 +8,6 @@
<use>
<flag name="appindicator">Pull in
<pkg>mate-extra/mate-indicator-applet</pkg>
for AppIndicator applet</flag>
- <flag name="gtk3">Make sure applets are built with GTK+3
instead of GTK+2</flag>
- <flag name="netspeed">Pull in
<pkg>net-analyzer/mate-netspeed</pkg>
- for net speed monitoring applet</flag>
<flag name="sensors">Pull in
<pkg>mate-extra/mate-sensors-applet</pkg>
for hw sensors applet</flag>
</use>
