summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-09-09 00:31:41 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-09-09 00:31:41 +0000
commit896f6695641e499a76b6c773f6be2fb01afb6ad6 (patch)
treed29d7724d92f51e1639dc7f5aded5ba6d78ea6b9 /x11-wm/muffin
parent2.2.0_alpha125 version bump. This includes all of the fixes in 2.1.11.14, and (diff)
downloadgentoo-2-896f6695641e499a76b6c773f6be2fb01afb6ad6.tar.gz
gentoo-2-896f6695641e499a76b6c773f6be2fb01afb6ad6.tar.bz2
gentoo-2-896f6695641e499a76b6c773f6be2fb01afb6ad6.zip
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)
Diffstat (limited to 'x11-wm/muffin')
-rw-r--r--x11-wm/muffin/ChangeLog9
-rw-r--r--x11-wm/muffin/muffin-1.0.3_p2.ebuild (renamed from x11-wm/muffin/muffin-1.0.1.ebuild)19
2 files changed, 23 insertions, 5 deletions
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 <tetromino@gentoo.org>
+ -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 <tetromino@gentoo.org> 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.3_p2.ebuild
index 8bfd8d2a013b..e70e370ea2e9 100644
--- a/x11-wm/muffin/muffin-1.0.1.ebuild
+++ b/x11-wm/muffin/muffin-1.0.3_p2.ebuild
@@ -1,17 +1,21 @@
# 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 $
+# $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 gnome2
+inherit eutils 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"
+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"
@@ -56,7 +60,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!x11-misc/expocity"
-S="${WORKDIR}/linuxmint-muffin-e5c8fdb"
+S="${WORKDIR}/linuxmint-muffin-e00fc85"
pkg_setup() {
DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
@@ -73,3 +77,10 @@ pkg_setup() {
$(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
+}