gentoo resync : 01.12.2017

3 files changed, 88 insertions, 4 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 54bc930bb593..584394f59abc 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -2,11 +2,13 @@ DIST muffin-2.8.5.tar.gz 2715965 SHA256 0ae19de74111f222b44f7bf8d159437a83c6ae2e
 DIST muffin-3.0.5.tar.gz 2717820 SHA256 11c27abedad6952aaa446d37ad23e910c3c51dc0dd8d29298cfae2c3ad917e64 SHA512 2d4d37099e33ee5b0817970f5f7e264d679752ef5a256916e54a7072419e8c75a67d8609c541238bd76c462a85c9841167e051b3ced968a557aa4a90f41b2d5c WHIRLPOOL e57f4ab9970cabae7039bdedeb3f02abfb1b4311824af39eb8022cff694f3c34d19183b133f81cc0663e195ea66b32602462e145f1ecb77c63d17d4ce2b065e7
 DIST muffin-3.2.0.tar.gz 2718913 SHA256 061966c2c8520804e1338de0dd499672a7f054aa7ae32b2fd98e49e656ad9a21 SHA512 f1c17fdaf4d8f32ae9e62a60811a24c120413ad2a1e824ee412527a2c3336c2523596cb06fcad01a2f1fbf1a09a78cc30a5769b1cb860ce26d96690a8c3c4043 WHIRLPOOL 14ca0f448f22cabde6aebde70438bba783c26f5b488b7691bf54c26cabd97eabdaf083cb5988f76f0a8bb13dd190d6ffd32214bc425e0234ec34eae40723e47e
 DIST muffin-3.4.0.tar.gz 2719701 SHA256 bbfd8997ad0f03d029f804c4927f464e89276ce384aef5aa6787dddc04e6ef85 SHA512 27c800dbd433f5eac19aa7db51994311acad347630f1f8b86f71846723f1b7d89929a1c900e6f8766b86ab078ed6b766554fe65dc12d81a61925e0396095e51d WHIRLPOOL 18c0e77aa3766528ea93c2eb88812f4bdb9d4360015799edff12c8a1b6951f61ff31767e61ab7dabcd3b20ec3f8097cfb84726f70bd77600a96beae0c8af7992
-DIST muffin-3.4.1.tar.gz 2720297 SHA256 f051c9bb1291381c9e32bf06ef829cb2ee894e8d6293a4d2738c8655d3643c26 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c WHIRLPOOL 9e9e4e646d64d416f88baf5bd245c22768ce71267fb2e8fe7709d8377a495beb6ab3fcf59f9a282800c6251211bbde9844474ddb6e847e1b71df7e7205f736bc
+DIST muffin-3.4.1.tar.gz 2720297 BLAKE2B 94b628bccd6542aa46d950fe6b2818baa8c429f7f116378267b38f302b99b9ff589eb7d95e303ca30f37d5d4a5c3af8d4a50d819a06db3584366892b819e81a3 SHA512 896dcb9c51d4aee28dcf16fbf721c1b3f581bc2a0f5344eb360655339e78f34ee89120c7a9b4ee3ffe55243c7c300f20140b76bfff52a7a9a9f292de33b9488c
+DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 EBUILD muffin-2.8.5.ebuild 2113 BLAKE2B 73cf05267d58cc0568cde5da90913dcfcbd88e0b0aaa6029f19e5fa0609755ccf2ac7467b624b0c7e95471f368ceac03261e9a618bc017d538c9ce0d781ad374 SHA512 572c9c02850d30fe088ff832a1a92df2ad422d250a6739e94d0240668e1669ad8f677ac55409b4d136bca6f8d6f5591b232096dab2bf09378e56c3ccd5c30f2c
 EBUILD muffin-3.0.5.ebuild 2070 BLAKE2B be1df268e344dc8ae35e29c18bcce44fbdae2be99382525467be1dd708ba76ca0b1651079519b3bc2163c1195f4741cede47d57773b1c939042dc9cac2ed17d0 SHA512 f3596e96d56b7b7577bc5c368c792322260221951fd5fb2eac71689d1d4cc54dc8ddc0b2990a41d5d7a5aafd6ff293c01fcc36f026853a2d2161fb4ee172ccd7
 EBUILD muffin-3.2.0-r1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
 EBUILD muffin-3.2.0.ebuild 2072 BLAKE2B f297b24912e563e831e94406f4afda05751273dd3b422d309682f7b935a63c1fd3bb430dc349fdfdfc54d95b85ca39fc16f42df00db8d9f2398399afb7418365 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac
 EBUILD muffin-3.4.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
 EBUILD muffin-3.4.1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-MISC metadata.xml 345 BLAKE2B 19867f3eea8f8950876b93234198d6d1e7c632d04422500527d7d4a5cfbd7d45f440355c657b094956b054009b4e94673cc581241ad74139441314104d956d3a SHA512 e58170ad4dfd2f521bb2a10519dcc46772b00e14b6bd3fa107532d1b825565d82fad2e814ae9ffa2150ed9435965095428ccc4131c946a7d63e10575940ac470
+EBUILD muffin-3.6.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
+MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index 658465f83128..7b5976166a10 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-        <email>cinnamon@gentoo.org</email>
-        <name>Cinnamon Project</name>
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/muffin</remote-id>
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
new file mode 100644
index 000000000000..54cfd8ecf95d
--- /dev/null
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0=[X,introspection?]
+	>=media-libs/cogl-1.13.3:1.0=[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}