x11-wm/marco: Version bump to 1.12.1, add 9999, add gtk3

Package-Manager: portage-2.2.26

4 files changed, 158 insertions, 0 deletions

diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 5b53856..0856a0e 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1 +1,2 @@
 DIST marco-1.10.3.tar.xz 1119064 SHA256 a07cfcc16d744a7c840011802e16a006a0770aaf84f63a4247b791bb31cb4f36 SHA512 8bb3a3a1af15f07e092fb3e8d6dd7a61d65cdb78525ad4e39f07feda04cd37f5f81b8c142ca09a7a929a39eb84e16b9e61ee26cbae0f4c147750430052e4e878 WHIRLPOOL 12099a938694ddc2e1daa47912df71cbbdc00e38bbb4dfbdf0748750eb6de65f7bbc9d493730253cfafb76b1ff51e9b2fde2545b040c948016acdffd665a5830
+DIST marco-1.12.1.tar.xz 1163996 SHA256 7f799115952a209e5063e5bd88d61d0baf430e630ca7783626af4dce46add084 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945 WHIRLPOOL 960074cb63e4bc3381c128f016b0f1c30b1ba2d04ccd3e9a059ac43fb14d81a562dd7b3d5004ddae3a77146737d078eddeed52da3cf66f5106fb22f2500a9e42
diff --git a/x11-wm/marco/marco-1.12.1.ebuild b/x11-wm/marco/marco-1.12.1.ebuild
new file mode 100644
index 0000000..b9b3c11
--- /dev/null
+++ b/x11-wm/marco/marco-1.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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-9999.ebuild b/x11-wm/marco/marco-9999.ebuild
new file mode 100644
index 0000000..b9b3c11
--- /dev/null
+++ b/x11-wm/marco/marco-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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/metadata.xml b/x11-wm/marco/metadata.xml
index 56911ed..092aa1b 100644
--- a/x11-wm/marco/metadata.xml
+++ b/x11-wm/marco/metadata.xml
@@ -5,6 +5,9 @@
         <email>mate@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/marco</remote-id>
     </upstream>