From 01c9fc6f868e4c225051415ecc492ac0bcfcabc8 Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@gentoo.org>
Date: Mon, 13 Mar 2017 10:33:57 +0100
Subject: x11-wm/marco: add mate-base/mate-desktop as runtime dependency, bug
 #611478 #605630

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=611478
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=605630

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 x11-wm/marco/marco-1.12.1-r1.ebuild | 77 +++++++++++++++++++++++++++++++++++
 x11-wm/marco/marco-1.14.2-r1.ebuild | 80 +++++++++++++++++++++++++++++++++++++
 x11-wm/marco/marco-1.14.2.ebuild    | 79 ------------------------------------
 x11-wm/marco/marco-1.16.0-r1.ebuild | 80 +++++++++++++++++++++++++++++++++++++
 x11-wm/marco/marco-1.16.0.ebuild    | 79 ------------------------------------
 5 files changed, 237 insertions(+), 158 deletions(-)
 create mode 100644 x11-wm/marco/marco-1.12.1-r1.ebuild
 create mode 100644 x11-wm/marco/marco-1.14.2-r1.ebuild
 delete mode 100644 x11-wm/marco/marco-1.14.2.ebuild
 create mode 100644 x11-wm/marco/marco-1.16.0-r1.ebuild
 delete mode 100644 x11-wm/marco/marco-1.16.0.ebuild

(limited to 'x11-wm/marco')

diff --git a/x11-wm/marco/marco-1.12.1-r1.ebuild b/x11-wm/marco/marco-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..beb7936f32b6
--- /dev/null
+++ b/x11-wm/marco/marco-1.12.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3 startup-notification test xinerama"
+
+RDEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32.10:2
+	>=gnome-base/libgtop-2:2=
+	gnome-extra/zenity:0
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	x11-libs/cairo:0
+	>=x11-libs/pango-1.2:0[X]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/libXcomposite-0.3:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	>=x11-libs/startup-notification-0.7:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	xinerama? ( x11-libs/libXinerama:0 )
+	!!x11-wm/mate-window-manager"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.34.90:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/marco-1.14.2-r1.ebuild b/x11-wm/marco/marco-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..5cdf56cdaaf6
--- /dev/null
+++ b/x11-wm/marco/marco-1.14.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3 startup-notification test xinerama"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32.10:2
+	>=gnome-base/libgtop-2:2=
+	x11-libs/cairo:0
+	>=x11-libs/pango-1.2:0[X]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/libXcomposite-0.3:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	>=x11-libs/startup-notification-0.7:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	xinerama? ( x11-libs/libXinerama:0 )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity:0
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.34.90:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/marco-1.14.2.ebuild b/x11-wm/marco/marco-1.14.2.ebuild
deleted file mode 100644
index 56ba2f5008af..000000000000
--- a/x11-wm/marco/marco-1.14.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.16.0-r1.ebuild b/x11-wm/marco/marco-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..5cdf56cdaaf6
--- /dev/null
+++ b/x11-wm/marco/marco-1.16.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3 startup-notification test xinerama"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.32.10:2
+	>=gnome-base/libgtop-2:2=
+	x11-libs/cairo:0
+	>=x11-libs/pango-1.2:0[X]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/libXcomposite-0.3:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	>=x11-libs/startup-notification-0.7:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	xinerama? ( x11-libs/libXinerama:0 )
+	!!x11-wm/mate-window-manager"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity:0
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.34.90:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	x11-proto/xextproto:0
+	x11-proto/xproto:0
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto:0 )"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc {,doc/}*.txt
+}
diff --git a/x11-wm/marco/marco-1.16.0.ebuild b/x11-wm/marco/marco-1.16.0.ebuild
deleted file mode 100644
index 56ba2f5008af..000000000000
--- a/x11-wm/marco/marco-1.16.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-proto/xextproto:0
-	x11-proto/xproto:0
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto:0 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
-- 
cgit v1.2.3-65-gdbad