commit: 2e4829e28c14136d7f2518c0c9c61d89d284e943
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 9 21:05:32 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Aug 9 21:05:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=2e4829e2
x11-themes/mate-themes-meta: drop support for old themes versioning
Package-Manager: portage-2.3.0
.../mate-themes-meta-1.10-r1.ebuild | 34 ------------------
.../mate-themes-meta/mate-themes-meta-1.10.ebuild | 27 ---------------
.../mate-themes-meta/mate-themes-meta-1.12.ebuild | 34 ------------------
.../mate-themes-meta-9999-r1.ebuild | 40 ----------------------
.../mate-themes-meta/mate-themes-meta-9999.ebuild | 19 +++++-----
x11-themes/mate-themes-meta/metadata.xml | 1 -
6 files changed, 10 insertions(+), 145 deletions(-)
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-1.10-r1.ebuild
b/x11-themes/mate-themes-meta/mate-themes-meta-1.10-r1.ebuild
deleted file mode 100644
index 27f88f1..0000000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-1.10-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="unsupported-gtk3"
-
-DEPEND=""
-RDEPEND="|| (
- (
- =x11-libs/gtk+-3.16*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.16
- )
- (
- =x11-libs/gtk+-3.18*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.18
- )
- unsupported-gtk3? ( =x11-themes/mate-themes-${MATE_BRANCH}*:0 )
- )"
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
b/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
deleted file mode 100644
index 544dc31..0000000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
- (
- =x11-libs/gtk+-3.16*:3
- =x11-themes/mate-themes-1.10*:0/3.16
- )
- (
- =x11-libs/gtk+-3.18*:3
- =x11-themes/mate-themes-1.10*:0/3.18
- )
- =x11-themes/mate-themes-1.10*:0
- )"
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-1.12.ebuild
b/x11-themes/mate-themes-meta/mate-themes-meta-1.12.ebuild
deleted file mode 100644
index 27f88f1..0000000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-1.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="unsupported-gtk3"
-
-DEPEND=""
-RDEPEND="|| (
- (
- =x11-libs/gtk+-3.16*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.16
- )
- (
- =x11-libs/gtk+-3.18*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.18
- )
- unsupported-gtk3? ( =x11-themes/mate-themes-${MATE_BRANCH}*:0 )
- )"
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-9999-r1.ebuild
b/x11-themes/mate-themes-meta/mate-themes-meta-9999-r1.ebuild
deleted file mode 100644
index 357e3de..0000000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-9999-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- MATE_THEMES_V=".9999"
-else
- MATE_THEMES_V="*"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="gtk2-only"
-
-DEPEND=""
-RDEPEND="|| (
- gtk2-only? (
- !!11-libs/gtk+:3
- x11-themes/mate-themes:0
- )
- (
- =x11-libs/gtk+-3.16*:3
- =x11-themes/mate-themes-3.16${MATE_THEMES_V}:0/3.16
- )
- (
- =x11-libs/gtk+-3.18*:3
- =x11-themes/mate-themes-3.18${MATE_THEMES_V}:0/3.18
- )
- (
- =x11-libs/gtk+-3.20*:3
- =x11-themes/mate-themes-3.20${MATE_THEMES_V}:0/3.20
- )
- )"
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-9999.ebuild
b/x11-themes/mate-themes-meta/mate-themes-meta-9999.ebuild
index 7bcc3f0..357e3de 100644
--- a/x11-themes/mate-themes-meta/mate-themes-meta-9999.ebuild
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-9999.ebuild
@@ -5,11 +5,9 @@
EAPI=6
if [[ ${PV} == 9999 ]]; then
- MATE_BRANCH=9999
- KEYWORDS=""
+ MATE_THEMES_V=".9999"
else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
+ MATE_THEMES_V="*"
KEYWORDS="~amd64 ~arm ~x86"
fi
@@ -19,21 +17,24 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-IUSE="unsupported-gtk3"
+IUSE="gtk2-only"
DEPEND=""
RDEPEND="|| (
+ gtk2-only? (
+ !!11-libs/gtk+:3
+ x11-themes/mate-themes:0
+ )
(
=x11-libs/gtk+-3.16*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.16
+ =x11-themes/mate-themes-3.16${MATE_THEMES_V}:0/3.16
)
(
=x11-libs/gtk+-3.18*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.18
+ =x11-themes/mate-themes-3.18${MATE_THEMES_V}:0/3.18
)
(
=x11-libs/gtk+-3.20*:3
- =x11-themes/mate-themes-${MATE_BRANCH}*:0/3.20
+ =x11-themes/mate-themes-3.20${MATE_THEMES_V}:0/3.20
)
- unsupported-gtk3? ( =x11-themes/mate-themes-${MATE_BRANCH}*:0 )
)"
diff --git a/x11-themes/mate-themes-meta/metadata.xml
b/x11-themes/mate-themes-meta/metadata.xml
index c054244..72e7f05 100644
--- a/x11-themes/mate-themes-meta/metadata.xml
+++ b/x11-themes/mate-themes-meta/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo MATE Desktop</name>
</maintainer>
<use>
- <flag name="unsupported-gtk3">Allow unsupported GTK+3 or no
GTK+3</flag>
<flag name="gtk2-only">Allow dependency-resolution for a system
without GTK+3</flag>
</use>
</pkgmetadata>
