From 896f6695641e499a76b6c773f6be2fb01afb6ad6 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Sun, 9 Sep 2012 00:31:41 +0000 Subject: Version bump to 1.0.3-UP2 with clutter-1.10 compatibility (bug #413573, thanks to Aljosha Papsch). Drop old. (Portage version: 2.2.0_alpha124/cvs/Linux x86_64) --- x11-wm/muffin/ChangeLog | 9 +++- x11-wm/muffin/muffin-1.0.1.ebuild | 75 ------------------------------- x11-wm/muffin/muffin-1.0.3_p2.ebuild | 86 ++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 76 deletions(-) delete mode 100644 x11-wm/muffin/muffin-1.0.1.ebuild create mode 100644 x11-wm/muffin/muffin-1.0.3_p2.ebuild (limited to 'x11-wm/muffin') diff --git a/x11-wm/muffin/ChangeLog b/x11-wm/muffin/ChangeLog index 2185ffa82147..3219cec26b3f 100644 --- a/x11-wm/muffin/ChangeLog +++ b/x11-wm/muffin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/muffin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.7 2012/05/22 06:41:16 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.8 2012/09/09 00:31:41 tetromino Exp $ + +*muffin-1.0.3_p2 (09 Sep 2012) + + 09 Sep 2012; Alexandre Rostovtsev + -muffin-1.0.1.ebuild, +muffin-1.0.3_p2.ebuild: + Version bump to 1.0.3-UP2 with clutter-1.10 compatibility (bug #413573, + thanks to Aljosha Papsch). Drop old. 22 May 2012; Alexandre Rostovtsev muffin-1.0.1.ebuild, muffin-1.0.2.ebuild, muffin-1.0.2-r1.ebuild: diff --git a/x11-wm/muffin/muffin-1.0.1.ebuild b/x11-wm/muffin/muffin-1.0.1.ebuild deleted file mode 100644 index 8bfd8d2a013b..000000000000 --- a/x11-wm/muffin/muffin-1.0.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.0.1.ebuild,v 1.3 2012/05/22 06:41:16 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" -HOMEPAGE="http://cinnamon.linuxmint.com/" - -SRC_URI="https://github.com/linuxmint/muffin/tarball/${PV} -> ${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+-2.91.7:3[introspection?] - >=gnome-base/gconf-2:2 - >=dev-libs/glib-2.14:2 - >=media-libs/clutter-1.7.5:1.0[introspection?] - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/startup-notification-0.7 - >=x11-libs/libXcomposite-0.2 - - 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 - - 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 - virtual/pkgconfig - >=dev-util/intltool-0.35 - test? ( app-text/docbook-xml-dtd:4.5 ) - xinerama? ( x11-proto/xineramaproto ) - x11-proto/xextproto - x11-proto/xproto" -RDEPEND="${COMMON_DEPEND} - !x11-misc/expocity" - -S="${WORKDIR}/linuxmint-muffin-e5c8fdb" - -pkg_setup() { - DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt" - G2CONF="${G2CONF} - --disable-static - --enable-gconf - --enable-shape - --enable-sm - --enable-startup-notification - --enable-xsync - --enable-verbose-mode - --enable-compile-warnings=maximum - --with-libcanberra - $(use_enable introspection) - $(use_enable xinerama)" -} diff --git a/x11-wm/muffin/muffin-1.0.3_p2.ebuild b/x11-wm/muffin/muffin-1.0.3_p2.ebuild new file mode 100644 index 000000000000..e70e370ea2e9 --- /dev/null +++ b/x11-wm/muffin/muffin-1.0.3_p2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.0.3_p2.ebuild,v 1.1 2012/09/09 00:31:41 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" +HOMEPAGE="http://cinnamon.linuxmint.com/" + +MY_PV="${PV/_p/-UP}" +MY_P="${PN}-${MY_PV}" + +SRC_URI="https://github.com/linuxmint/muffin/tarball/${MY_PV} -> ${MY_P}.tar.gz + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-gtk-doc-syntax.patch.xz" + +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+-2.91.7:3[introspection?] + >=gnome-base/gconf-2:2 + >=dev-libs/glib-2.14:2 + >=media-libs/clutter-1.7.5:1.0[introspection?] + >=media-libs/libcanberra-0.26[gtk3] + >=x11-libs/startup-notification-0.7 + >=x11-libs/libXcomposite-0.2 + + 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 + + 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 + virtual/pkgconfig + >=dev-util/intltool-0.35 + test? ( app-text/docbook-xml-dtd:4.5 ) + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/xproto" +RDEPEND="${COMMON_DEPEND} + !x11-misc/expocity" + +S="${WORKDIR}/linuxmint-muffin-e00fc85" + +pkg_setup() { + DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt" + G2CONF="${G2CONF} + --disable-static + --enable-gconf + --enable-shape + --enable-sm + --enable-startup-notification + --enable-xsync + --enable-verbose-mode + --enable-compile-warnings=maximum + --with-libcanberra + $(use_enable introspection) + $(use_enable xinerama)" +} + +src_prepare() { + # gobject-introspection-1.33 compat; in 1.0.9 + epatch "${WORKDIR}/${MY_P}-gtk-doc-syntax.patch" + + gnome2_src_prepare +} -- cgit v1.2.3-65-gdbad