diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-01-07 16:38:47 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-01-07 16:38:47 +0000 |
| commit | 808e156036915cd54c00c6d96c13e22fcab661b1 (patch) | |
| tree | 87a468560f8cdf81a861f1a15f1127a75d51c0f8 /games-arcade/monkey-bubble | |
| parent | Allow user patches (diff) | |
| download | gentoo-2-808e156036915cd54c00c6d96c13e22fcab661b1.tar.gz gentoo-2-808e156036915cd54c00c6d96c13e22fcab661b1.tar.bz2 gentoo-2-808e156036915cd54c00c6d96c13e22fcab661b1.zip | |
avoid esound dep with patch from Martin von Gagern (bug #397997)
(Portage version: 2.1.10.41/cvs/Linux i686)
Diffstat (limited to 'games-arcade/monkey-bubble')
4 files changed, 35 insertions, 11 deletions
diff --git a/games-arcade/monkey-bubble/ChangeLog b/games-arcade/monkey-bubble/ChangeLog index db45107266d3..0100af5bb44d 100644 --- a/games-arcade/monkey-bubble/ChangeLog +++ b/games-arcade/monkey-bubble/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-arcade/monkey-bubble -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/ChangeLog,v 1.28 2009/03/03 20:35:41 mr_bones_ Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/ChangeLog,v 1.29 2012/01/07 16:38:46 mr_bones_ Exp $ + + 07 Jan 2012; Michael Sterrett <mr_bones_@gentoo.org> + monkey-bubble-0.4.0.ebuild, files/monkey-bubble-0.4.0-asneeded.patch, + +files/monkey-bubble-0.4.0-noesound.patch: + avoid esound dep with patch from Martin von Gagern (bug #397997) 03 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org> monkey-bubble-0.4.0.ebuild: diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch index 7bccffd385f4..7083cbeab23c 100644 --- a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch +++ b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch @@ -1,5 +1,5 @@ ---- monkey-bubble-0.3.2/src/net/Makefile.am.orig 2006-04-30 17:29:36.000000000 +0200 -+++ monkey-bubble-0.3.2/src/net/Makefile.am 2006-04-30 17:30:00.000000000 +0200 +--- monkey-bubble-0.3.2/src/net/Makefile.am.orig ++++ monkey-bubble-0.3.2/src/net/Makefile.am @@ -28,10 +28,10 @@ monkey_srv_LDFLAGS = @@ -13,8 +13,8 @@ $(libmonkeynet_a_OBJECTS): $(marshal_sources) ---- monkey-bubble-0.3.2/src/ui/Makefile.am.orig 2006-04-30 17:41:27.000000000 +0200 -+++ monkey-bubble-0.3.2/src/ui/Makefile.am 2006-04-30 17:41:52.000000000 +0200 +--- monkey-bubble-0.3.2/src/ui/Makefile.am.orig ++++ monkey-bubble-0.3.2/src/ui/Makefile.am @@ -50,10 +50,10 @@ diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch new file mode 100644 index 000000000000..be0a9a924a47 --- /dev/null +++ b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch @@ -0,0 +1,19 @@ +monkey-bubble-0.4.0: don't require the esd header. + +2010-07-12 Sven Herzberg +2012-01-07 Martin von Gagern + +References: +https://github.com/mquinson/monkey-bubble/commit/299623f8e6b0b6090e98 +https://bugs.gentoo.org/397997 + +--- monkey-bubble-0.4.0.orig/src/ui/main.c ++++ monkey-bubble-0.4.0/src/ui/main.c +@@ -11,7 +11,6 @@ + #include "ui-main.h" + #include "input-manager.h" + +-#include <esd.h> + #include <gtk/gtk.h> + #include <gst/gst.h> + #include <bonobo/bonobo-i18n.h> diff --git a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild index 45ad85928209..225bd77da956 100644 --- a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild +++ b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild,v 1.9 2010/11/16 21:02:39 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild,v 1.10 2012/01/07 16:38:46 mr_bones_ Exp $ EAPI=2 inherit autotools eutils gnome2 @@ -21,8 +21,7 @@ RDEPEND="x11-libs/gtk+:2 >=gnome-base/librsvg-2.0 >=gnome-base/gconf-2.0 media-libs/gstreamer:0.10 - >=dev-libs/libxml2-2.6.7 - media-sound/esound" + >=dev-libs/libxml2-2.6.7" DEPEND="${RDEPEND} app-text/scrollkeeper dev-util/intltool" @@ -31,7 +30,8 @@ src_prepare() { gnome2_src_prepare epatch \ "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-gnome-doc.patch + "${FILESDIR}"/${P}-gnome-doc.patch \ + "${FILESDIR}"/${P}-noesound.patch # bug 260895 sed -i \ -e 's/ -Werror//' \ |