Old.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 13 insertions, 131 deletions

diff --git a/x11-wm/muffin/ChangeLog b/x11-wm/muffin/ChangeLog
index 3c3b8a4ad337..5c39ee2173aa 100644
--- a/x11-wm/muffin/ChangeLog
+++ b/x11-wm/muffin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/muffin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.22 2014/07/23 15:39:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.23 2014/09/30 13:53:38 tetromino Exp $
+
+  30 Sep 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -muffin-1.8.2-r1.ebuild, -files/muffin-1.8.2-maximized-jump.patch:
+  Old.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> muffin-2.2.6.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index c23147ad4a53..4c994cee4784 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX muffin-1.8.2-maximized-jump.patch 1031 SHA256 1c4897ea53fc7005c98a3bb204a7301a9d056c1bcb900982295d2550034de946 SHA512 873e7bf9942bcf60ba08a15ca16ac53755956075983515091d71f73cec1cf96ce630cb64b1f4f5b33e2f34dc15522c58e942600ea48cc5e4ff035fe4f9e80522 WHIRLPOOL 80717451c7d5cda59750c0710f929ee76d9e10584886672a1e8061858ef120f347b68c317bf4e4636d6eb6f2a6310b14e21a6255475cf62af46e8b9612111de0
-DIST muffin-1.8.2.tar.gz 2685117 SHA256 903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049 SHA512 eb175e201e16c277cf3d3f69726249cc6ca992cafd5fa1c03b563a3a30705362874fc710eef5801cb42bf6692fd0e44723d2a261c757320ed687756a79287b92 WHIRLPOOL 20dcc04d64c0a7a5c594820f29dee9267d5ed2d818a2b8f23f913ec4d4c90a3ff11ae3a7d9d5804d9146798efef60a2eac8dccdb35367c55b5de08a9edfa6d6f
 DIST muffin-2.2.6.tar.gz 2705497 SHA256 5617504f5f8ecaf53268787728e6b7bf5da1514d9bc538dd0c047d467cca9ccf SHA512 d77d51c927216efbf2d833fbc2a6f1d6f1752316a35fdff75f5c25f4a148916757a33d1bb46fd89bdb678366fa17fd352282f084c350c35b561102bbf7f996cc WHIRLPOOL 34c314aab819c366857c23cf9babc9a2dda7e52b63fcb496237a80a31a780a60d054808a7dec1c3b0e945d869cdc2aa192bf76467a108a376c817e6b7a594326
-EBUILD muffin-1.8.2-r1.ebuild 2149 SHA256 99d8d351fc869c5202732e9c9dff0c7cf10f99b40c93fcc85454694172dc74b8 SHA512 bced147983c415e59e8f8c3ee1e3a303f9678f95d434626d0d62c8165e7ea101d6934b0f7ab4ab0815c4f62d4c8c8d5468825ec2bf62dccd9db884ea787bb2b0 WHIRLPOOL d1fbbea09fbc95d147e62c80a9a3dd04304111ed5e2268a34c7d96c7b004b6086ef3cd182a889f36993558e692d32886e06be65842396a13caf0e4e880e6ade7
 EBUILD muffin-2.2.6.ebuild 2160 SHA256 3cec87720af7b7e3b02813328d354bb180d49b71aa326763be913b0c8c38dacb SHA512 0ef16e35ba96326b8c1f9d4e54e5b0058309bb2f9b2d992ba7fef996657ba1eee515ff8fb6624fbb2131c03ec30981032190ee65055b4422f63514a79ee5d6da WHIRLPOOL 7e30218dc600fec022912d5181138846eb4f8f146caf5f204b7a8540886373fd3387457d68a5789b66bedf8fb3b34326832e57c755e151c1cbad2b563b8742cd
-MISC ChangeLog 3821 SHA256 13aec86f58bb94034c8230bc746764f1fc27cfb6d713c5111ac6df578e5d6907 SHA512 50022ac61119e41990112b16c5ab786101184b855b65aae4c7577adcc4f8d1924a852d34fdecbb301696cac0327553b6b38dae8e5d67f2b4548c4ba6d1a88f7a WHIRLPOOL 0a2f780b865860faf3ebbc579631b91d7a014bcefac61015da81c9afea681a019e998ec2239f30b195c69fed32171829272f8d2523aa089edada0f1101c9dca0
+MISC ChangeLog 3963 SHA256 76de2d56d78c3595b22b08be765e29f34e19f05f87751de01f17c4d620e71a4f SHA512 e205acdc41df27c0d9aca3b5d24fdaddd399cf9cc24b030210347fab60ac2e5c22633639cd744c89486f71650ca38f53cb0d126402cd28612fc7b43302a88029 WHIRLPOOL fdf477882cb00270b3bac1a60a3e33de66904792d6a044e95e024ca3f0640d29a2428d3344695d1233b8d1dc5aac5a119fc008f45028d36758ace97958dc1d66
 MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9cdAAoJELp701BxlEWfA6MP/Rvt4CDAVessLfdcV49YWFDE
-78bw48sKK5G0seo6ygv2rX2RyNgIHOSWTNDu2uE4XIcOU6elrCETXNM0HV2ONWV0
-Lif8GXlNnO6NTKlDHVHZQDsK9nxlZapZwZgBrMtVHBgg+GIDYY5kj8moXyir+ETG
-1OsWPPyXh4jl0zAFP5bsL1e5ekTTNRod3LC2oke6nLFinJc1Byd3u70rjKxgIK+r
-pbyf/uoNVo8juDaAoEPqgGULGDgnwwvhC/hvea//CNwOu0otF0anRGb4QScNUyWI
-4zyC2WPKfZggde5/0qtLyQbbJjNOB6CJz0ox04w/GVSD8aJm0i5KfATONbS5BZVZ
-gms3Smes9c/a96fdX37xHoPj7bGNmv2yMO14FS1etGCsUycbtDJxmDkSj56toPDi
-rvGDcxftEq7d2szYCtpZQAJjqLFtSGeUYOVEJxUulTZSok6ys9KuwukIR6psWO7r
-TtC6cpT9owDArH0tMMw4oI5048Q90XKL6bRGAnmTJLi7o1uzbeBmwRwftC9bvwoR
-UIsJOXrkCeA+A4BL44OYmAKtIAlyjV4vfZqx9xTYdQXOa0xnLVs03gWPpG7WHicu
-4MKzHcde0yMg3+U0L4b4bDm5Pm4uoNIHt0Or+Pzg0iQIezH6g8j5i3W2zRaSRgvj
-1C58g3XlCDc21XdGkcfl
-=Qtpf
+iQEcBAEBCAAGBQJUKrXjAAoJEJ0WA1zPCt1hB10IAJbvjlH41kK5AFSXj2pVFizo
+JD7w2bhUc1pAN8Qnop8wi49GaRRKnWE0n1l6VVJ+uwDhlpPH+c0X8tOr43dW1KS9
+xRHa5qbdlBIxxDn47T8J8fdBimRB1zE45QJC/JLz3SVFix6gjaEmdG+0y2WhSMsO
+O8XgcEj3X9XM+loTU70n7h6qFOTzgDR4pZaPTTEDh02EJhdsh1sPGf2Q61Bv8mDZ
+E8MQz6WxJ6s4jn9oXidTwvpckJVTA8+yfsUluew+TisPIO0/h0xwTezm7RFzvCF8
+rWz/t2qVOaGAD0/NCc4nBvsBvaXSvou6Kss4Zsucz6nlt/UUVK+nTZW+bh+y/qc=
+=vUk6
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/muffin/files/muffin-1.8.2-maximized-jump.patch b/x11-wm/muffin/files/muffin-1.8.2-maximized-jump.patch
deleted file mode 100644
index f7874c0b6a96..000000000000
--- a/x11-wm/muffin/files/muffin-1.8.2-maximized-jump.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 00fdf6c3078b3cf34707f7d740bf797d1ca77414 Mon Sep 17 00:00:00 2001
-From: Albert Pool <albertpool@solcon.nl>
-Date: Tue, 9 Jul 2013 16:08:59 +0200
-Subject: [PATCH] Fix maximized windows jumping to a different monitor
-
-Commit e5b46747d67f6f75ef06272d91f7f8cfc36af058 upstream
----
- src/core/constraints.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/core/constraints.c b/src/core/constraints.c
-index 4c4dedd..630c41c 100644
---- a/src/core/constraints.c
-+++ b/src/core/constraints.c
-@@ -567,6 +567,11 @@ typedef gboolean (* ConstraintFunc) (MetaWindow         *window,
-                        .083 * info->work_area_monitor.height;
-             }
- 
-+          /* idle_move_resize() uses the user_rect,
-+           * so make sure it uses the placed coordinates.
-+           */
-+          window->user_rect = info->current;
-+
-           if (window->maximize_horizontally_after_placement ||
-               window->maximize_vertically_after_placement)
-             meta_window_maximize_internal (window,   
--- 
-1.8.1.6
-
diff --git a/x11-wm/muffin/muffin-1.8.2-r1.ebuild b/x11-wm/muffin/muffin-1.8.2-r1.ebuild
deleted file mode 100644
index f9215df12d8e..000000000000
--- a/x11-wm/muffin/muffin-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.8.2-r1.ebuild,v 1.3 2013/12/08 19:55:37 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-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.10:=[X]
-	x11-libs/gdk-pixbuf:2[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/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
-
-	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
-	virtual/opengl
-
-	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
-	>=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() {
-	# Fix maximized windows jumping to a different monitor
-	epatch "${FILESDIR}/${PN}-1.8.2-maximized-jump.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 \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}