Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/, x11-wm/muffin/files/
Date: Sun, 31 May 2020 19:05:29
Message-Id: 1590951876.963730a86fba237bdc6dbc3bf573917727de501e.mattst88@gentoo
1 commit: 963730a86fba237bdc6dbc3bf573917727de501e
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 19:01:50 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 19:04:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963730a8
7
8 x11-wm/muffin: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-wm/muffin/Manifest | 1 -
13 .../files/muffin-4.0-clutter-configure.patch | 13 ----
14 .../muffin/files/muffin-4.0-cogl-configure.patch | 25 -------
15 x11-wm/muffin/muffin-4.0.3.ebuild | 81 ----------------------
16 4 files changed, 120 deletions(-)
17
18 diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
19 index 7a57532ecf2..59b28ebff37 100644
20 --- a/x11-wm/muffin/Manifest
21 +++ b/x11-wm/muffin/Manifest
22 @@ -1,2 +1 @@
23 -DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c
24 DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3
25
26 diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
27 deleted file mode 100644
28 index f5ab1de9af2..00000000000
29 --- a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
30 +++ /dev/null
31 @@ -1,13 +0,0 @@
32 -diff --git a/clutter/configure.ac b/clutter/configure.ac
33 -index 0b3c3e5..9c0e6cd 100644
34 ---- a/clutter/configure.ac
35 -+++ b/clutter/configure.ac
36 -@@ -231,7 +231,7 @@ AC_ARG_ENABLE(
37 - [wayland-egl-server],
38 - [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
39 - [],
40 -- enable_wayland_egl_server=yes
41 -+ enable_wayland_egl_server=no
42 - )
43 -
44 - AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
45
46 diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
47 deleted file mode 100644
48 index 1e9721dd1bf..00000000000
49 --- a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
50 +++ /dev/null
51 @@ -1,25 +0,0 @@
52 -From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001
53 -From: Kristian Fiskerstrand <k_f@g.o>
54 -Date: Wed, 28 Nov 2018 19:57:20 +0100
55 -Subject: [PATCH] Fix
56 -
57 ----
58 - cogl/configure.ac | 2 +-
59 - 1 file changed, 1 insertion(+), 1 deletion(-)
60 -
61 -diff --git a/cogl/configure.ac b/cogl/configure.ac
62 -index b06677a..209f449 100644
63 ---- a/cogl/configure.ac
64 -+++ b/cogl/configure.ac
65 -@@ -700,7 +700,7 @@ AC_ARG_ENABLE(
66 - [wayland-egl-server],
67 - [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
68 - [],
69 -- enable_wayland_egl_server=yes
70 -+ enable_wayland_egl_server=no
71 - )
72 - AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
73 - [
74 ---
75 -2.18.1
76 -
77
78 diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
79 deleted file mode 100644
80 index 47f849d8b75..00000000000
81 --- a/x11-wm/muffin/muffin-4.0.3.ebuild
82 +++ /dev/null
83 @@ -1,81 +0,0 @@
84 -# Copyright 1999-2019 Gentoo Authors
85 -# Distributed under the terms of the GNU General Public License v2
86 -
87 -EAPI=6
88 -inherit autotools eutils gnome2
89 -
90 -DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
91 -HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
92 -SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
93 -
94 -LICENSE="GPL-2+"
95 -SLOT="0"
96 -IUSE="+introspection test xinerama"
97 -KEYWORDS="amd64 x86"
98 -
99 -RESTRICT="test"
100 -
101 -COMMON_DEPEND="
102 - >=x11-libs/pango-1.2[X,introspection?]
103 - >=x11-libs/cairo-1.14:=[X]
104 - x11-libs/gdk-pixbuf:2[introspection?]
105 - >=x11-libs/gtk+-3.9.12:3[X,introspection?]
106 - >=dev-libs/glib-2.37.3:2[dbus]
107 - >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
108 - >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
109 - >=media-libs/libcanberra-0.26[gtk3]
110 - >=x11-libs/libXcomposite-0.3
111 - >=x11-libs/startup-notification-0.7:=
112 -
113 - x11-libs/libICE
114 - x11-libs/libSM
115 - x11-libs/libX11
116 - x11-libs/libXcomposite
117 - x11-libs/libXcursor
118 - x11-libs/libXdamage
119 - x11-libs/libXext
120 - x11-libs/libXfixes
121 - x11-libs/libXrandr
122 - x11-libs/libXrender
123 - virtual/opengl
124 -
125 - gnome-extra/zenity
126 -
127 - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
128 - xinerama? ( x11-libs/libXinerama )
129 -"
130 -# needs gtk-doc, not just -am, for gtk-doc.make
131 -DEPEND="${COMMON_DEPEND}
132 - ${PYTHON_DEPS}
133 - >=app-text/gnome-doc-utils-0.8
134 - sys-devel/gettext
135 - dev-util/gtk-doc
136 - dev-util/gtk-doc-am
137 - >=dev-util/intltool-0.35
138 - virtual/pkgconfig
139 - x11-base/xorg-proto
140 - test? ( app-text/docbook-xml-dtd:4.5 )
141 -"
142 -RDEPEND="${COMMON_DEPEND}
143 - !x11-misc/expocity
144 -"
145 -
146 -src_prepare() {
147 - eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch
148 - eautoreconf
149 - gnome2_src_prepare
150 -}
151 -
152 -src_configure() {
153 - DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
154 - gnome2_src_configure \
155 - --disable-static \
156 - --enable-shape \
157 - --enable-sm \
158 - --enable-startup-notification \
159 - --enable-xsync \
160 - --enable-verbose-mode \
161 - --with-libcanberra \
162 - $(use_enable introspection) \
163 - $(use_enable xinerama)
164 -}