Version bump, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 18 insertions, 110 deletions

diff --git a/x11-wm/muffin/ChangeLog b/x11-wm/muffin/ChangeLog
index bf95318747b4..d72f5bc22e80 100644
--- a/x11-wm/muffin/ChangeLog
+++ b/x11-wm/muffin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/muffin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.29 2015/04/08 17:29:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.30 2015/06/07 14:31:22 pacho Exp $
+
+*muffin-2.4.5 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org> +muffin-2.4.5.ebuild,
+  -muffin-2.2.6.ebuild, -muffin-2.4.3.ebuild, metadata.xml:
+  Version bump, drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> muffin-2.2.6.ebuild:
   Drop old Python implementations
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 08432eb3c4b0..88ac55d574b4 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,30 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST muffin-2.2.6.tar.gz 2705497 SHA256 5617504f5f8ecaf53268787728e6b7bf5da1514d9bc538dd0c047d467cca9ccf SHA512 d77d51c927216efbf2d833fbc2a6f1d6f1752316a35fdff75f5c25f4a148916757a33d1bb46fd89bdb678366fa17fd352282f084c350c35b561102bbf7f996cc WHIRLPOOL 34c314aab819c366857c23cf9babc9a2dda7e52b63fcb496237a80a31a780a60d054808a7dec1c3b0e945d869cdc2aa192bf76467a108a376c817e6b7a594326
-DIST muffin-2.4.3.tar.gz 2705582 SHA256 63fb96d7b2baf189d6ee0640d8357e2563ad87c833f37d0d24e0f17628678e41 SHA512 5f8415a3de0fb8c939eea67b3669ba6d3ca75c542888af42cd545dbf342c801d78c11d151e714f28ea42ec185cd23ba19c7a697fdba7c90e1ed6efa21222ece7 WHIRLPOOL e0f24878bb8c6f12e0a26ac0ac4f9512ebbd88c4adcb80432bd3f480e1a316032aa47fe425c3a9295ff1d06f25b6bd6c23897ec9d9811a742ef4c28fb42d565c
 DIST muffin-2.4.4.tar.gz 2706446 SHA256 027641f3bc12a5770f063ffbf9ff0a4797768d256449941ae0be779700b90805 SHA512 57321f73af81dd9e03ec81b56fec83a5a154f06fcfe113a8129aaa279f0e11bed446efe98693aa52f7d490b4ddc73ba76db237d75dfff7b670427b3c8fc8abff WHIRLPOOL 7c9ae74c3053b2d2eed876d63e509d02ff693fdd88aedf4ab835a7bf5105a098c1ca99ec36e35d2d24ae352a7caeaa661693e1532a30e14cb4044c2b6821dd58
-EBUILD muffin-2.2.6.ebuild 2157 SHA256 0da47e0b413fbf11a3cd61040e9fbb2b286b9c00d4ab1d818e84d1b69a0653a7 SHA512 558dc2381e3c06d95c268c1c53510bad854b6c83d1b1fdcc1cc961f942fff8a74a7dc58baf8ccfd53bc4fa5d77da00a9bd50b5ba104d28fb6edc6fbc0adcacc2 WHIRLPOOL a73869f6cbd50717d5dd79664915706205247f6af5d90874dccd7e59d3c2a792fcdfff1394c0505e28cea83c0c3666d4edc0180cd03d5ff1cc604ab1aca01277
-EBUILD muffin-2.4.3.ebuild 2158 SHA256 94b3108a5c36d9ccb24e8143b58885d6d4d1a96dd7a53204343fa7254e867e38 SHA512 9b1923fe287bc9a284db2163f21d975948de459c9ebfc456ac41aafda49c1ba934a1177cc64c51fe381e5e1ac204ecf108978ec360063fa9face810f77394db2 WHIRLPOOL e4cbb62b741da8e101656e828fa1f57e1a4524c9551d9f921d9d8fa981472d762db7bd74fb69090bf6e2d41318cf537f0ee449b755e6462bc9d1fdb4534e24ad
+DIST muffin-2.4.5.tar.gz 2706742 SHA256 b38d62cb0d4ec9e213cc41501bda0d4712eebab7cd4fbc5ca0bdf8b5e74f83f7 SHA512 f8a791d88823197f8b727e00cd67e22adabbdf6fbad3a1ebd1a75087a48e09ad4c39b9b5550303db661c54937f5f42e25c2ac47ccdd98d281b4ff9aad5f5d71f WHIRLPOOL 6d9ff8ee2a09040baa8930006a4e48a6ab6ee7082a56a30826b1f57e6a317aa942a3dc1d4aafe993ce54209fb8e20bf0cb759a9fe2a4547afaa3d870ce0da72f
 EBUILD muffin-2.4.4.ebuild 2156 SHA256 096a60e176d3a859ae7568a0819e5974af8f5c3beb551d987812b88f34bd86a7 SHA512 862759e7b0e6ceb643fdd191959b81f7d2ac5e10d5b8dd6177682cb13c53d0a15442109be8be2e826a4e586daed070aa9ad82c66b840bbd5d520771243f307bb WHIRLPOOL 04ca521c9a34df261205505a1490d4efcf76c3a4c3e9ade8d78504b916d75b7409ecaa3882ee89ae0ea4a3a1bae90bd4d61664ce81a53c8b7fdad03cca50796a
-MISC ChangeLog 4688 SHA256 f9a54d5bc956afee72d16245b4ac95a93aa58b38ab5481843fe9230ae47273b0 SHA512 996e76510e3aac8c6bc18dc3987a2c6b830f8d26b8e6bf4c772dff33c3b28ed3f00680167fcc24dc7d2b88a6d03fbf42643a67e846fdc6ff9900a1569fc0182b WHIRLPOOL 0f51fb71738fa52ffd54dcb327c238189709b918e7c151044741a4140225b626d41e748a7b354317d4e73ce67ae77d30de36c0fb56d1ed7507e41644b2c236b2
-MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
+EBUILD muffin-2.4.5.ebuild 2166 SHA256 8fcd3efa5fcd0b25dba2b67638dc8dd18d3bdf2dcdbbfe0a2862db820470520d SHA512 49e8ef8574a6091788d94dbb076a9481d22afc1b7f86113e935fe2e614a97fb30830af05503b1177c35c6ef2dca49f172322ebd4bf6a0022feb246f89acb217f WHIRLPOOL a03479d073cc98f2f12f21722cc5125a6100518e92244ed81dcfd7748c1d6b555b2476a99d5264668caef3f192546c6b227352bd84724e382b9b2da7d1d837cc
+MISC ChangeLog 4870 SHA256 66d1b3877cea7337cae00ea5992a74271f4ab1a261f14b677b5ec18a17534910 SHA512 72db315417bcf7f92de4972e802601ed2e08ee10403a97c7ac100b8c549e4fd57d02609aee093ee270fb01f02105a9791518d47a2f061a30b0a1c1ce8d970ffd WHIRLPOOL 47813ccd9e8691727356be56bf53a7b743b55dcf9ed5b276d540908aea28f8f5d3ff3c792162f48102da345df4b9194be8f4b8d8bd130b5375370a1e13d2d05c
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWV0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6xwQAKfp15x74uOQbAKluMo8Kd+u
-H029oNwp9LKEV2O3kbp0Uk1vGbMPX4SK/ZvGOV18CNi6YsEHmOKk+5m1uBJHip1f
-/hUdNUY2OxWrW/kpX0tWEKHhXjcFwTTqRw448nT9IJBfuj3Zmg3dwiptZj6Tm2O4
-DELlhXaj+AUk4VKZ+jE2mg7DlwM3IEtV8r1cv3FO9LjmhQGWkukaqGU+25kR4D/p
-NBDMLH40M0U0/jevTJbEbZNPVIelawZWo+3vTzyj4t3UA59XcGNfZnx35hgHfQ9T
-FZZVtj+aoRQaS/BItbrQNwbpn74KJa2G4m8vD2QalsHF1EoMWk9eQif0tff3rbMT
-7fNDLNzJ6bt44JmbEVrC157jHivoPldgx6hjaC96qnDlVW5z96169cv+dlSQEnX2
-xyG7mZJW0xXUiWz3dG5IhWRCsY6PBr2c7YACHNAx023RCLCaEf+Py5Sjv/7mEy8R
-OpzYbKs5nrYsFhIlDSanRz9OrhJh96pDgpADpf8m1Ykynjxe5r6m5jBJ4psR0aQt
-VzIv6O3TNEtjjqrnSsgniM4BNsgFHV+t/m9beaLLv0pehyZTpZPuQNnBNym5uS16
-6CU1EAN6Y5XX4xHHayJ6WUpqE5sXu/6JMaWPBqVYAllDWpQHYWymoEYncS989zkR
-unON/gWNHQ67Ln0n8v1g
-=u9IJ
+iEUEAREIAAYFAlV0VbsACgkQCaWpQKGI+9R1CwCeOKGewKKuwcE2x9DqLwDpQgju
+pnEAmNJAOLBr+MIyY0f3gaMt5IayMW8=
+=Wz/g
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index dad9001338dc..da6fd63d0085 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/x11-wm/muffin/muffin-2.2.6.ebuild b/x11-wm/muffin/muffin-2.2.6.ebuild
deleted file mode 100644
index cd327e107351..000000000000
--- a/x11-wm/muffin/muffin-2.2.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-2.2.6.ebuild,v 1.4 2015/04/08 17:29:20 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1
-
-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
-	>=gnome-extra/cinnamon-desktop-1.0:0=[introspection?]
-	>=media-libs/clutter-1.9.10:1.0=[introspection?]
-	>=media-libs/cogl-1.9.6: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/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 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=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() {
-	epatch_user
-	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)
-}
diff --git a/x11-wm/muffin/muffin-2.4.3.ebuild b/x11-wm/muffin/muffin-2.4.5.ebuild
index 57882cabe30f..6df15808fcf4 100644
--- a/x11-wm/muffin/muffin-2.4.3.ebuild
+++ b/x11-wm/muffin/muffin-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-2.4.3.ebuild,v 1.1 2015/02/12 11:54:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-2.4.5.ebuild,v 1.1 2015/06/07 14:31:22 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	>=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
+	>=dev-libs/glib-2.25.10:2[dbus]
 	>=gnome-extra/cinnamon-desktop-2.3:0=[introspection?]
 	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
 	>=media-libs/clutter-1.9.10:1.0=[introspection?]
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 
 	gnome-extra/zenity
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMON_DEPEND}