[gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/

["Matt Turner" <mattst88@gentoo.org>]

commit:     963730a86fba237bdc6dbc3bf573917727de501e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 19:01:50 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 31 19:04:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963730a8

x11-wm/muffin: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-wm/muffin/Manifest                             |  1 -
 .../files/muffin-4.0-clutter-configure.patch       | 13 ----
 .../muffin/files/muffin-4.0-cogl-configure.patch   | 25 -------
 x11-wm/muffin/muffin-4.0.3.ebuild                  | 81 ----------------------
 4 files changed, 120 deletions(-)

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 7a57532ecf2..59b28ebff37 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1 @@
-DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
 DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3

diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
deleted file mode 100644
index f5ab1de9af2..00000000000
--- a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/clutter/configure.ac b/clutter/configure.ac
-index 0b3c3e5..9c0e6cd 100644
---- a/clutter/configure.ac
-+++ b/clutter/configure.ac
-@@ -231,7 +231,7 @@ AC_ARG_ENABLE(
-   [wayland-egl-server],
-   [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
-   [],
--  enable_wayland_egl_server=yes
-+  enable_wayland_egl_server=no
- )
- 
- AS_IF([test "x$enable_wayland_egl_server" = "xyes"],

diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
deleted file mode 100644
index 1e9721dd1bf..00000000000
--- a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <k_f@gentoo.org>
-Date: Wed, 28 Nov 2018 19:57:20 +0100
-Subject: [PATCH] Fix
-
----
- cogl/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/configure.ac b/cogl/configure.ac
-index b06677a..209f449 100644
---- a/cogl/configure.ac
-+++ b/cogl/configure.ac
-@@ -700,7 +700,7 @@ AC_ARG_ENABLE(
-   [wayland-egl-server],
-   [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
-   [],
--  enable_wayland_egl_server=yes
-+  enable_wayland_egl_server=no
- )
- AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
-       [
--- 
-2.18.1
-

diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
deleted file mode 100644
index 47f849d8b75..00000000000
--- a/x11-wm/muffin/muffin-4.0.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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://developer.linuxmint.com/projects/cinnamon-projects.html"
-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"
-
-RESTRICT="test"
-
-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/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
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch
-	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)
-}