From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C062138350 for ; Thu, 9 Apr 2020 22:52:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88C2DE08EF; Thu, 9 Apr 2020 22:52:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64001E08E8 for ; Thu, 9 Apr 2020 22:52:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7290334F009 for ; Thu, 9 Apr 2020 22:52:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E6831D7 for ; Thu, 9 Apr 2020 22:52:30 +0000 (UTC) From: "Adam Feldman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Adam Feldman" Message-ID: <1586472564.b893b7aac8bd5b68e4ebccb0a522128ed25ba64c.np-hardass@gentoo> Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets-meta/ X-VCS-Repository: proj/gentoo-mate X-VCS-Files: mate-base/mate-applets-meta/mate-applets-meta-1.12.ebuild mate-base/mate-applets-meta/mate-applets-meta-1.14.ebuild mate-base/mate-applets-meta/mate-applets-meta-1.16.ebuild mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild mate-base/mate-applets-meta/mate-applets-meta-1.24.0.ebuild mate-base/mate-applets-meta/mate-applets-meta-9999.ebuild mate-base/mate-applets-meta/metadata.xml X-VCS-Directories: mate-base/mate-applets-meta/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: Adam Feldman X-VCS-Revision: b893b7aac8bd5b68e4ebccb0a522128ed25ba64c X-VCS-Branch: master Date: Thu, 9 Apr 2020 22:52:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 257a660f-eac3-4fcf-84b2-d2ac9bb9aed1 X-Archives-Hash: f53abac657cdf2ca1086a4ebe4b0ade1 commit: b893b7aac8bd5b68e4ebccb0a522128ed25ba64c Author: Adam Feldman gentoo org> AuthorDate: Mon Mar 30 19:28:46 2020 +0000 Commit: Adam Feldman gentoo 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 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 @@ Pull in mate-extra/mate-indicator-applet for AppIndicator applet - Make sure applets are built with GTK+3 instead of GTK+2 - Pull in net-analyzer/mate-netspeed - for net speed monitoring applet Pull in mate-extra/mate-sensors-applet for hw sensors applet