Fix build with libpng 1.5 and add missing dep for the wrd interface.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

3 files changed, 17 insertions, 14 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 81a88753c635..68e388c047d2 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/timidity++
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.133 2010/10/10 19:13:36 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.134 2011/02/16 16:24:52 aballier Exp $
+
+  16 Feb 2011; Alexis Ballier <aballier@gentoo.org>
+  timidity++-2.13.2-r13.ebuild:
+  Fix build with libpng 1.5 and add missing dep for the wrd interface.
 
   10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> timidity++-2.13.2-r11.ebuild,
   timidity++-2.13.2-r13.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index abd83ecaa962..7c03b27b61f2 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -18,15 +18,15 @@ AUX timidity.desktop.2 257 RMD160 9820f1876d172775bc69a25c577d4f2e5efd6edc SHA1
 AUX timidity.xpm 1522 RMD160 2b64234979909343fc2775e5eedfe8960a3190d1 SHA1 181555a128d9a512bb74192c85cbfa20099f41d1 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8ac43119a8b4db6
 DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
-DIST timidity++-2.13.2-patchset-1.tar.bz2 8018 RMD160 4efe175ac87a0d35ab94d2bedb7d78d59f161af5 SHA1 775bdd7a2abc9a9bc7e09289fc667b63604e7703 SHA256 adfd4ce6876e24a0be9f4e6eb6dd0802722d72082a117564d1adc658fb07c9e0
+DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 RMD160 4b1e37c734d124757cbaf7cdf35b487c95a3660a SHA1 4805580e618bddac42bbb4ba9d035f5d1d162caa SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc
 EBUILD timidity++-2.13.2-r11.ebuild 5351 RMD160 8a7028ef934dff51b24b91aac90971ffbe09c8f6 SHA1 2e77d7b5811b0c39278e50a13f9d1811a2c9f104 SHA256 48141cb0ca704d6440523bfd18d2c47da2110d72f59646ddf54329c5cd618c27
-EBUILD timidity++-2.13.2-r13.ebuild 5013 RMD160 998ade4667c0a3b7b720aa81aee24aaf7c6d5fda SHA1 481811cabb26fef518748b131b8b52e321886853 SHA256 17654bc2f29d103bc569cc8267f46376619ae732b7b8407fcef49291badfb0d3
-MISC ChangeLog 21170 RMD160 b903da0512c88cfa4a111e9b9cc1393c607894af SHA1 143d5c8c32a47418b1239aef5cebfb4b5dafa688 SHA256 961c5fcf27caebc932375b50379fc2500c7187a58d35bf3f93471d61796939bb
+EBUILD timidity++-2.13.2-r13.ebuild 5042 RMD160 0322a310846e7f9c6fae462f93396f83b7bb8ce0 SHA1 b607de2f8e19b066399f7c3272c9839a60a7efeb SHA256 ab6670bc79a73fe0a1cd533f8194129ba5a5c61488afa05faf4c819b5b34b9ab
+MISC ChangeLog 21331 RMD160 666b436fe53e06990909a6bf46cba6b2f01fd28e SHA1 295e1c341411c5f5a9542752384a5079dd82aa35 SHA256 501836bf612dff87284a1a5b3060c27c7bd8ae3304e8c11415ed39d7702ae98b
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyyEnAACgkQOeoy/oIi7uxobgCfbttdqdkcroGN00BCxHEGuLVR
-90EAnAkjO17uRtoeb3X0pwc3Jek4KXJi
-=7xn2
+iEYEARECAAYFAk1b+loACgkQvFcC4BYPU0q0SwCfa71wK2dblBzwPfHj8FdxayCj
+GDAAn1hYMVQ4r7NFToRxRXNQxHoSpt2K
+=mYwY
 -----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/timidity++-2.13.2-r13.ebuild b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
index 7d41c5e6f1bf..d51ab48e82c7 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r13.ebuild,v 1.3 2010/10/10 19:13:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r13.ebuild,v 1.4 2011/02/16 16:24:52 aballier Exp $
 
 EAPI=2
 inherit autotools eutils elisp-common
@@ -12,7 +12,7 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
 HOMEPAGE="http://timidity.sourceforge.net/"
 SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
+	mirror://gentoo/${P}-patchset-2.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,8 +32,7 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
 	speex? ( media-libs/speex )
 	ao? ( >=media-libs/libao-0.8.5 )
 	motif? ( >=x11-libs/openmotif-2.3:0 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXext )
+	X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 )
 	!~media-libs/libpng-1.4.1"
 RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )