From 5755ade43671e7a95fb41a56909e645ec4de7d2a Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sat, 7 Jan 2012 16:38:47 +0000 Subject: avoid esound dep with patch from Martin von Gagern (bug #397997) Package-Manager: portage-2.1.10.41/cvs/Linux i686 --- games-arcade/monkey-bubble/ChangeLog | 9 +++++++-- games-arcade/monkey-bubble/Manifest | 7 ++++--- .../files/monkey-bubble-0.4.0-asneeded.patch | 8 ++++---- .../files/monkey-bubble-0.4.0-noesound.patch | 19 +++++++++++++++++++ games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild | 10 +++++----- 5 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch (limited to 'games-arcade') 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 + 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 monkey-bubble-0.4.0.ebuild: diff --git a/games-arcade/monkey-bubble/Manifest b/games-arcade/monkey-bubble/Manifest index 9f082924316b..72e8a7c196a5 100644 --- a/games-arcade/monkey-bubble/Manifest +++ b/games-arcade/monkey-bubble/Manifest @@ -1,6 +1,7 @@ -AUX monkey-bubble-0.4.0-asneeded.patch 855 RMD160 e06b29d5ff4dbc3c0ca57501b7a926027f3e7024 SHA1 5f6b6f4e6b11d65c674ffb4a51c97519a38acf6b SHA256 95fcdd524913e4f4d4fb66d828c03fa531a0c788a823edb4036f8993503c6c19 +AUX monkey-bubble-0.4.0-asneeded.patch 711 RMD160 2d7b1e8f4b473a672102e79e2cebfde6b7a157a2 SHA1 781c2b7b3553ad53dbd1021c65f07d40e3af084a SHA256 1cf34d0e98fa1015776278268c7c65010b7ac0048a103ee709f009ff838c0fbb AUX monkey-bubble-0.4.0-gnome-doc.patch 1361 RMD160 38adec66dead7ba319ecb1e286ce73ae5bbfd899 SHA1 d9e45b7533c07196a33a1f1c34652a660c4f8995 SHA256 a0317ef6ff37c2f72b64000a3d584f97578103ae016b40ef54bed74b7a61cd78 +AUX monkey-bubble-0.4.0-noesound.patch 467 RMD160 106d24145ef39169b96c503e67415a88d92bb19a SHA1 90ddcba50274c8f94347164db1eceee572fb2b6f SHA256 cf6807d8c3baf79d6a2f2007eb439c0ce7c2484c1feb629fbaf596290261e816 DIST monkey-bubble-0.4.0.tar.gz 5360713 RMD160 1b01057841062bdefe9bbf5db565a2ee2b22153f SHA1 67b6d68f38c0182a676120c49646ab3b8725667d SHA256 eb96293a0fadbbfc3cd3ae0bbb557d9bf8a4dd8edccdd8ce1b913e8ba49a1c89 -EBUILD monkey-bubble-0.4.0.ebuild 1078 RMD160 b14fda1738b19c189bd7a8b5d656a303abba318c SHA1 282abc2de85c8a131f60017f6c83c3d3b999121d SHA256 5177e72b870d08a95246b694f5cdeb6160f01aa8f10ce90c7d1efacd34119db4 -MISC ChangeLog 3970 RMD160 0578474416787ef5f8da0e2dc04608650097e0ac SHA1 08042e08caf35d52a3920c88d6b1329573918114 SHA256 1474844ab148d5aed37b9d898e4d71770b8fdfcc037875b4cf93b98051991229 +EBUILD monkey-bubble-0.4.0.ebuild 1097 RMD160 1d30439980a7c69f6d453274492fe69d85a9656f SHA1 50089c89f8a97f85f103ef0473fc59c7e6e60920 SHA256 baa441201d9aaf02c245346e7bf02d0b53ed9a5badae44f97a772cd1a8ba5fc2 +MISC ChangeLog 4210 RMD160 878a8c5d6ab4d5e0d8e0a9ecb4f0fbd9796dd874 SHA1 0d100f9cf7434b5a3a86730456b22b41e414f21d SHA256 76320ca235b20e2e641610310cbfb37aa2228dec272bfd10f24574119cc5a2e0 MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe 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 + #include + #include + #include 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//' \ -- cgit v1.2.3-65-gdbad