x11-wm/muffin: Remove old

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com>
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 0 insertions, 257 deletions

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 824419c7d5b6..2e80ffa2d361 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1 @@
-DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
deleted file mode 100644
index 4d0d5827a62a..000000000000
--- a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-https://github.com/linuxmint/muffin/pull/577
-https://bugs.gentoo.org/767139
-
-From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 25 Jan 2021 22:30:35 -0800
-Subject: [PATCH 1/2] build: Add missing libtool dependencies.
-
-This fixes the build with slibtool.
----
- clutter/clutter/Makefile.am | 18 +++++++++++++++---
- src/Makefile.am             |  9 +++++++--
- 2 files changed, 22 insertions(+), 5 deletions(-)
-
-diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
-index a6366f4f2..ecfa568b7 100644
---- a/clutter/clutter/Makefile.am
-+++ b/clutter/clutter/Makefile.am
-@@ -666,7 +666,11 @@ Clutter-@MUFFIN_PLUGIN_API_VERSION@.gir: libmuffin-clutter-@MUFFIN_PLUGIN_API_VE
- 
- Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter
- Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
--Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
-+Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
-+	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \
- 	$(clutter_include_HEADERS) \
- 	$(clutter_deprecated_HEADERS) \
-@@ -687,7 +691,11 @@ Cally-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_VERSI
- 
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
--Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
-+Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
-+	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
- Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
-@@ -702,7 +710,11 @@ ClutterX11-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_
- 
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0
--ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
-+ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
-+	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection)
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
- ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9cb3af14e..37274a4bd 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -277,7 +277,12 @@ Meta-$(api_version).gir: libmuffin.la
- @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0 xfixes-4.0
- @META_GIR@_PACKAGES = gtk+-3.0
- @META_GIR@_CFLAGS = $(AM_CPPFLAGS)
--@META_GIR@_LIBS = libmuffin.la
-+@META_GIR@_LIBS = \
-+	libmuffin.la \
-+	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
-+	$(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
- @META_GIR@_FILES =				\
- 	muffin-enum-types.h			\
- 	$(libmuffininclude_base_headers)	\
-@@ -383,4 +388,4 @@ install-exec-local:
- 	      { rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so libmuffin-$$lib-0.so; }; \
- 	    } \
- 	  ) ; \
--	done
-\ No newline at end of file
-+	done
-
-From 0762515b658b6331c076603340ce572c002f9458 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 25 Jan 2021 22:30:44 -0800
-Subject: [PATCH 2/2] build: Fix undefined references with slibtool.
-
----
- Makefile.am                        | 2 +-
- src/Makefile.am                    | 2 +-
- src/compositor/plugins/Makefile.am | 9 ++++++---
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cf8382b67..c5d589ff7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- 
--SUBDIRS=cogl clutter src po doc data
-+SUBDIRS=cogl clutter src src/compositor/plugins po doc data
- 
- EXTRA_DIST = HACKING MAINTAINERS rationales.txt
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 37274a4bd..b75b1879f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,7 +3,7 @@
- 
- lib_LTLIBRARIES = libmuffin.la
- 
--SUBDIRS=wm-tester tools compositor/plugins
-+SUBDIRS=wm-tester tools
- 
- NULL =
- 
-diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
-index 09ab325a5..241b514c3 100644
---- a/src/compositor/plugins/Makefile.am
-+++ b/src/compositor/plugins/Makefile.am
-@@ -2,9 +2,9 @@
- pkglibdir=@MUFFIN_PLUGIN_DIR@
- 
- AM_CPPFLAGS= \
--  $(WARN_CFLAGS) \
-+	$(WARN_CFLAGS) \
- 	$(MUFFIN_CFLAGS) \
--  -I$(top_builddir)/src						\
-+	-I$(top_builddir)/src						\
- 	-I$(top_srcdir)/src						\
- 	-I$(top_srcdir)/cogl						\
- 	-I$(top_builddir)/cogl						\
-@@ -27,7 +27,10 @@ AM_CPPFLAGS= \
- default_la_CFLAGS   = $(WARN_CFLAGS) -fPIC
- default_la_SOURCES  = default.c
- default_la_LDFLAGS  = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
--default_la_LIBADD   = $(CLUTTER_LIBS)
-+default_la_LIBADD   = \
-+	$(CLUTTER_LIBS) \
-+	$(top_builddir)/src/libmuffin.la \
-+	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
- 
- pkglib_LTLIBRARIES = default.la
- 
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
deleted file mode 100644
index 3b692972bcb0..000000000000
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools gnome2-utils xdg-utils virtualx
-
-DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
-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 ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/json-glib-1.0
-	>=gnome-extra/cinnamon-desktop-4.8:0=
-	gnome-extra/zenity
-	>=media-libs/libcanberra-0.26[gtk3]
-	virtual/opengl
-	>=x11-libs/cairo-1.14:=[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libXi-1.6.0
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/pango-1.14.0[X,introspection?]
-	>=x11-libs/startup-notification-0.7:=
-	x11-misc/xkeyboard-config
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-# needs gtk-doc, not just -am, for gtk-doc.make
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.1-slibtool.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	gnome2_disable_deprecation_warning
-}
-
-# Wayland is not supported upstream.
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--enable-compile-warnings=minimum \
-		--disable-static \
-		--enable-shape \
-		--enable-sm \
-		--enable-startup-notification \
-		--enable-xsync \
-		--enable-verbose-mode \
-		--with-libcanberra \
-		$(use_enable introspection) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	dodoc HACKING MAINTAINERS *.txt doc/*.txt
-}
-
-src_test() {
-	virtx default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}