Version bump for bug #440612; thanks to Anton Bolshakov et al. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 40 insertions, 221 deletions

diff --git a/x11-wm/muffin/ChangeLog b/x11-wm/muffin/ChangeLog
index 0f2594e17f7d..87d6c4ef6739 100644
--- a/x11-wm/muffin/ChangeLog
+++ b/x11-wm/muffin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/muffin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.9 2012/09/28 08:13:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.10 2012/12/30 02:38:45 tetromino Exp $
+
+*muffin-1.1.2 (30 Dec 2012)
+
+  30 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -muffin-1.0.2.ebuild, -muffin-1.0.2-r1.ebuild,
+  -files/muffin-1.0.2-frame-initialize-style-contexts.patch,
+  -muffin-1.0.3_p2.ebuild, +muffin-1.1.2.ebuild:
+  Version bump for bug #440612; thanks to Anton Bolshakov et al. Drop old.
 
 *muffin-1.1.1 (28 Sep 2012)
 
diff --git a/x11-wm/muffin/files/muffin-1.0.2-frame-initialize-style-contexts.patch b/x11-wm/muffin/files/muffin-1.0.2-frame-initialize-style-contexts.patch
deleted file mode 100644
index 650501513cf6..000000000000
--- a/x11-wm/muffin/files/muffin-1.0.2-frame-initialize-style-contexts.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7253a75b18452f71db3f2d58d0b0e5ccc6ff16cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Sat, 10 Mar 2012 21:28:13 +0100
-Subject: [PATCH] frames: Explicitly initialize style contexts
-
-We were relying on GTK+ emitting GtkWidget::style-updated during
-widget initialization to create the GtkStyleContexts used for
-window decorations. A recent GTK+ update broke this assumption,
-so do the necessary initialization ourselves.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671796
----
- src/ui/frames.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index 0204f1a..1b4ef8d 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -273,6 +273,7 @@ meta_frames_init (MetaFrames *frames)
- 
-   frames->style_variants = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                   g_free, g_object_unref);
-+  update_style_contexts (frames);
- 
-   gtk_widget_set_double_buffered (GTK_WIDGET (frames), FALSE);
- 
--- 
-1.7.8.5
-
diff --git a/x11-wm/muffin/muffin-1.0.2-r1.ebuild b/x11-wm/muffin/muffin-1.0.2-r1.ebuild
deleted file mode 100644
index 828072345d5f..000000000000
--- a/x11-wm/muffin/muffin-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.0.2-r1.ebuild,v 1.4 2012/05/22 06:41:16 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit 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/tarball/${PV} -> ${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.10[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.7.5:1.0[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
-
-S="${WORKDIR}/linuxmint-muffin-08ffc65"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-gconf
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)
-		$(use_enable xinerama)"
-}
-
-src_prepare() {
-	# Patch from mutter-3.3.92, fixes window decorations with gtk+-3.4
-	epatch "${FILESDIR}/${P}-frame-initialize-style-contexts.patch"
-
-	gnome2_src_prepare
-}
diff --git a/x11-wm/muffin/muffin-1.0.2.ebuild b/x11-wm/muffin/muffin-1.0.2.ebuild
deleted file mode 100644
index 1b70991e5aa6..000000000000
--- a/x11-wm/muffin/muffin-1.0.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.0.2.ebuild,v 1.3 2012/05/22 06:41:16 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-SRC_URI="https://github.com/linuxmint/muffin/tarball/${PV} -> ${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.10[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.7.5:1.0[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
-
-S="${WORKDIR}/linuxmint-muffin-08ffc65"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-gconf
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)
-		$(use_enable xinerama)"
-}
diff --git a/x11-wm/muffin/muffin-1.0.3_p2.ebuild b/x11-wm/muffin/muffin-1.1.2.ebuild
index e70e370ea2e9..3a41406a414b 100644
--- a/x11-wm/muffin/muffin-1.0.3_p2.ebuild
+++ b/x11-wm/muffin/muffin-1.1.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.0.3_p2.ebuild,v 1.1 2012/09/09 00:31:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.1.2.ebuild,v 1.1 2012/12/30 02:38:45 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit autotools gnome2
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -14,24 +14,24 @@ HOMEPAGE="http://cinnamon.linuxmint.com/"
 MY_PV="${PV/_p/-UP}"
 MY_P="${PN}-${MY_PV}"
 
-SRC_URI="https://github.com/linuxmint/muffin/tarball/${MY_PV} -> ${MY_P}.tar.gz
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-gtk-doc-syntax.patch.xz"
+SRC_URI="https://github.com/linuxmint/muffin/tarball/${MY_PV} -> ${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+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.10[X]
+	>=x11-libs/cairo-1.10:=[X]
 	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.7.5:1.0[introspection?]
+	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
+	>=dev-libs/glib-2.25.10:2
+	>=media-libs/clutter-1.9.10:1.0=[introspection?]
+	media-libs/cogl:1.0=[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
+	>=x11-libs/startup-notification-0.7:=
 	>=x11-libs/libXcomposite-0.2
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
 
 	x11-libs/libICE
 	x11-libs/libSM
@@ -51,8 +51,8 @@ COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.8
 	sys-devel/gettext
-	virtual/pkgconfig
 	>=dev-util/intltool-0.35
+	virtual/pkgconfig
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/xextproto
@@ -60,27 +60,25 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity"
 
-S="${WORKDIR}/linuxmint-muffin-e00fc85"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-gconf
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)
-		$(use_enable xinerama)"
-}
+S="${WORKDIR}/linuxmint-muffin-ab1d98e"
 
 src_prepare() {
-	# gobject-introspection-1.33 compat; in 1.0.9
-	epatch "${WORKDIR}/${MY_P}-gtk-doc-syntax.patch"
-
+	# Regenerate obsolete Makefile.in
+	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 \
+		--enable-compile-warnings=maximum \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}