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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 50 insertions, 236 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/Manifest b/x11-wm/muffin/Manifest
index d663cf8f4d6a..27abfb1a86a8 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,25 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX muffin-1.0.2-frame-initialize-style-contexts.patch 1053 SHA256 1718f868b2e2f88519dfef69a67ecddcf411183579ea5497844cbbc11b324932 SHA512 be3da3d4640575e7b0156fe3f11cd95e70538794715df05916bb7bb9155b16ac0f764913bd1921b6c1f242c6797606f969cccaa184d00230e251f3837236bd37 WHIRLPOOL 78f5030c6fec1fdc159c9d3471c9e3785e5cb4b194a7378620d968ec34c16b0872d812bac11c70c6ed3a8db82d9321ad9df75aaf38def5b21a73900e42566aa7
-DIST muffin-1.0.2.tar.gz 3127221 SHA256 a8ad2a0f45442f92d4864ab3fc9cc87dbba44f7ca558ddcbb0846da42a10b749 SHA512 485e0c67539d6b4735ed229a36889fce93a8b942541a26ba6ec78247d187d629168a176771c34b3c96569282e86f448958ed1d7731c17e320cf2df1c9b38a855 WHIRLPOOL 059d9052679f897bf425b53c03c786eabe9e7fe68f8b886bf7732fff43c20c664744deb812423a721f62b5b5753dbbb7d13ae2acc8710aa15836e960e2f2a685
-DIST muffin-1.0.3-UP2-gtk-doc-syntax.patch.xz 8792 SHA256 d1162906200769a44142b70dea885dcdf51830efc78ff188bea65accd3c1ffab SHA512 403021da514f29ddbfebb2274aebc00a4ebbea48ff9dc04bbe2a427d418d27781ed0eacd456503f0b05f62965c450867c12dd6f3579844be1689c603f0a16263 WHIRLPOOL 4e8b9aa39f7d9fc6226224f27497d3fd6c79925dd961b5953b2022e56f87758bce305afcc20ee22d680ff5039aee8109220a5cb2f14100e82be909fe3281e0ef
-DIST muffin-1.0.3-UP2.tar.gz 3127200 SHA256 17b8daaa62dbb0a48c56505b08e143fdb5b9a1fea6c2688d7dd9c712a50d9249 SHA512 9d96c7747d7a27145f5e7aef0ea08e54c374f05b6cf0ef4da068c56bdbf233254d2128973fa42dda8815ab00f9c5403d3b98131b35f16513a2ac75ba0028ce1d WHIRLPOOL 1b68ff40b678f1cc77b681fa091a966ff60368bc982a75ba47747a74a8edd77401f563aad763cc757df2e0383ce72bfbf26134b55751de1ec85f9d8141c57b98
 DIST muffin-1.1.1.tar.gz 3084269 SHA256 fc69e23faf08549d87b974d253bae350d16b5d96eeea07e95e7cb602b1d7f75c SHA512 2e9208fe4eaf0dd886a6f6c04f228878f36b996cae5093f0579769c1a69947e5fb0f311ca2fa419a804412db44640282398b56aa4d460364757e510565723821 WHIRLPOOL 13b9102d9398ee3657da8445b0987be5087388a97b3114f1b52f308f2ed371818a6d7bc7e4f4acd6ea08f7b56506ae177fe0bd13c3c7e2271466a6abafc6c099
-EBUILD muffin-1.0.2-r1.ebuild 2096 SHA256 82d30af7c63ce8231e3ac2621fffe63aebc86cbb6e69a2d1f25b4a0bcbcac3c6 SHA512 6ee189a4b46797cf93b6acd17397e724ba1fd182f263337b61cfccf4db8693a208ecfc14f3105b46d2fda7299a89ce948b318a13acd86aeaf57fa751ef2615d4 WHIRLPOOL 5dd5bcdba485a236bbb408b128f59c379cd130ac1b35dac5c4e19b96392c57d74a7df4b9d817ef88c10ac0f5c5e7fb3ed8e429df36cccbc6b2e535a6490cab70
-EBUILD muffin-1.0.2.ebuild 1913 SHA256 f79e4c4ea03d1b24865afe10d5de83712fee4683eaa5df5f6daf7aca311ca06d SHA512 ed705dc32f0f9992b4fb505e1911bfddeacf9d476001a2f8a323cb7bb0eb37f24cb73a94215b94089efbbcbdae531a17bbe85d46d9758da123bcf91fedf7aa8b WHIRLPOOL a9af3643bdacac2ed9104da25cddce2ab3f1300861d0a4a544d9c1d50d8a6c5aee7b1cee76e4112afac5668b2493f6293ea81e4c216881990876ee54aff53be1
-EBUILD muffin-1.0.3_p2.ebuild 2192 SHA256 d8d2bc175ec945a07e32e48f81e5bed38dfb22a09da11c407f0bb341c2aef064 SHA512 807e5b626005a096873bbec9a975c9d728cf608307d3d52b20ac666d5fbc2095ae58193b42decf1b59c13fd47574375276c96954f2958a4a0bf171071e322454 WHIRLPOOL 92d6892ed52a0f049f490ddd9d4fe1a8a6cb8d73dc2d9ee2e2d3b6017fb0f0039b4af2b2d11eb16e43d52ac489315c8bc12245c0d4bca4afc1af06160a745a81
+DIST muffin-1.1.2.tar.gz 3084262 SHA256 19523f5286e937d9be0649bcbec49f65ab1e4378b844b408dff70be9fb43dce0 SHA512 83a8d04d10c991f7b05d86fe896af50c121cfabdfbeb08d98498cd68c5dc7320a60cf27b3b8ca048c70c7894d52fffddca60204b8102a46a031a65b5550ff7cf WHIRLPOOL 9df990718537edd002fd7cff7f500a34b8bd124983d7aaf7f68621a0906b0135311b00804d62242027a66aa8c778666409980f719d53b2c832daf5fff52ec2b4
 EBUILD muffin-1.1.1.ebuild 2084 SHA256 cccb542cdbab435ec8faaea154beb66b229a1e1586462305ba1d48d0a52d2023 SHA512 e18ed8d3aae8a09f0e2c838dfe7883bdfd35acd66dd226c4e632ce555efe6e1ccf84e1ad765a045427a86fdae2292e82892cebc5b1434748d5b0ea72c5ca14b1 WHIRLPOOL a2a0496f4d486bfb8d5e14417d05b0825f14eefa28a862ce2437053c2be8ee5cf56299a43fc9d9292454ee7ed08682a11dc42ee8d2e8da4f1c4d748d560c7380
-MISC ChangeLog 1977 SHA256 8a31b7d94bb682f44d425f53a5d6be50ed07498e10e886bb7358961ead56e5dc SHA512 369dba4a11f462c6440094f414cbe31bec77426a9185538f75cb4171f0a9201c81a4a4cbff23adc8c43ccfd687a720b1a52954559d6125fe1c1733f9668b14b0 WHIRLPOOL 75c5c3a8ce6e658e849ec552ee9415b563845e570d636c731c1e425325aa3b794e57657328b89ddf23f43bce46f97611e4e94247a84f6618e54406ed1836e762
+EBUILD muffin-1.1.2.ebuild 2156 SHA256 e14178e8d885c76d586559938eea943ef441d2053b8ca02aed6cc5d8245f8c7a SHA512 7420aa3f0632bba6e89eb1131ebc55753e9d19cf28e2afa7f9420ceb1781ab5ff173f30c76505f16dd300db6eee46c2a2a5f9829b61bfb40e9c05fb64b562c16 WHIRLPOOL a58aa00eb0bc9c6c28feded2a419badd63bc522c55175d288a45b5d386f8336a1ad71fe3944280f988b88b9d6111900cccfc8c2eb469eb277e3fc3c8cb4663ec
+MISC ChangeLog 2301 SHA256 7f64e62c0b57bec34d178ee7920ce96a362d533b9447f07d7a098aa77ece9f18 SHA512 1e61f5c03dfd5dee88dd12ab211127b67d53513d5e10442b561f6f12e5b8090630c7cf3a04fdcb9a6663f547538d47097a71fe0a67c221c9956d89da9902c95f WHIRLPOOL 42c70158c5ab6992453087dc4d18df8d53727eba99e4a42e13f847fcf2a24acd7e202fb0b1bea70bae50bf01b45bae5b8db9c625b9f4880d202df32fd10fa298
 MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZVwYAAoJEJ0WA1zPCt1hQPkH/jDnLEtx8Cwvhh3m5kelsZgC
-1q8QKAIGBmVP1el2UfIGHxnI+aSQmvJ+6go5gsf1+hBRBThV6n8TugsPdND9OIJ7
-Hrni1VD1f5g3DuT55FanJ8GTWcB408ivy+k3nlpJE+z84LOMl3im6Eohr+MZcrXy
-yr5FvLm9YRV7j+Fu8DKSn47Q4Uo42I6o2Epoi2DmtuZJ01Yspnq88Fm2X+nxr+Mn
-czcXa6zt18KzTZZ1IR82bsdP4GYrF1vwDkF2CkZPPzjOF7AhzkCJS1h5O/Ro/nNr
-UpQ5WeCwLpcPibQERrli8RpDpdSF1LqAVbhY5ezLDxXBiuARsXWyA2XjurJYxVQ=
-=Ii3M
+iQEcBAEBCAAGBQJQ36k2AAoJEJ0WA1zPCt1hHp0H/icpIAEMxm8L0kZRjJiuQJvF
+Y0VKA4Rioj5M/1p/b+wguFSkhDzFOvJOGqQBcOUqnS/3hAoAMWyHuERALM/c6p79
+lBRqbuu1ftBXIxxSrWLQztznnPTqTC334sp7AQONsJUtLJx7lAfy2yD2Z+5oRxSb
+q7FMHAZMJLTlo97jF/vx2iAzxtijpqPYMqvVrevX4hCPH5kbCUvwA4hD0mrOcX67
+J5GazRTuTzVBg1Q/ISmvACnDBcqLoiJeSNn3Sx/D/0Wa1IygnUQnogVVjRKZF8Yb
+wqjUsUj35r+cRChLqc+Pan+EPXIopOB3miqL3Fmv0ozUUIevGGfXSGvXD4jkXCI=
+=YvXH
 -----END PGP SIGNATURE-----
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)
+}