~dep to flac 1.1.2, rev bump in ~arch with a flac 1.1.3 compatibility fix, bug #152007

Package-Manager: portage-2.1.2-r9

9 files changed, 202 insertions, 32 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index bd92e9c62bc7..1e99d1936c3c 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.46 2007/02/02 14:33:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.47 2007/02/12 19:23:13 aballier Exp $
+
+*hydrogen-0.9.3-r1 (12 Feb 2007)
+
+  12 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/hydrogen-0.9.3-flac113.patch, hydrogen-0.9.0.ebuild,
+  hydrogen-0.9.1.ebuild, hydrogen-0.9.2.ebuild, hydrogen-0.9.3.ebuild,
+  +hydrogen-0.9.3-r1.ebuild:
+  ~dep to flac 1.1.2, rev bump in ~arch with a flac 1.1.3 compatibility fix,
+  bug #152007
 
   02 Feb 2007; Simon Stelling <blubb@gentoo.org> hydrogen-0.9.3.ebuild:
   multilib-strict fix; bug 155967; credit to Malcolm Lashley
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index b6e00582dd4b..73a405ac7004 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.9.1-OSS.patch 995 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b SHA1 53ece944023dbd26cfa7ec5ae9e21a634082daa8 SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0
 MD5 6b397bce8176411819610e6b92401be2 files/0.9.1-OSS.patch 995
 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b files/0.9.1-OSS.patch 995
@@ -10,6 +13,10 @@ AUX hydrogen-0.9.2-configure.in.patch 1346 RMD160 1dc980254521d44bf9413ae50fb61e
 MD5 21654c55d948be825818367aae49597c files/hydrogen-0.9.2-configure.in.patch 1346
 RMD160 1dc980254521d44bf9413ae50fb61e4af2270ebe files/hydrogen-0.9.2-configure.in.patch 1346
 SHA256 c7c030d16087a2ec0b22f39181fc087e078c8cf0cf9d487b36f15c53e36b5be6 files/hydrogen-0.9.2-configure.in.patch 1346
+AUX hydrogen-0.9.3-flac113.patch 1065 RMD160 c49ee2d09aab98ea9f93639d86bc60e90fa595e0 SHA1 a4a034bab94b71f9d9dc9a546b05d9509a2411a0 SHA256 6c9024c257217d7b5cdcd8cfe50746274186435a82d1cda5d4bfd02a0ad70232
+MD5 2fc3124d42d210e769428f149047fe32 files/hydrogen-0.9.3-flac113.patch 1065
+RMD160 c49ee2d09aab98ea9f93639d86bc60e90fa595e0 files/hydrogen-0.9.3-flac113.patch 1065
+SHA256 6c9024c257217d7b5cdcd8cfe50746274186435a82d1cda5d4bfd02a0ad70232 files/hydrogen-0.9.3-flac113.patch 1065
 AUX hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356 RMD160 0d45efab658cff07be032d36fc1523f373d0ef54 SHA1 b170e964748a42016e8f8d2b0fe058d0b3e758b9 SHA256 cc653b60dce63e709e318935790bd0f292edb6afb4114352cbcedc8573f085a4
 MD5 e43555677b71dcf988a5e85a2304c301 files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356
 RMD160 0d45efab658cff07be032d36fc1523f373d0ef54 files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356
@@ -18,26 +25,30 @@ DIST hydrogen-0.9.0.tar.gz 2322401 RMD160 ae38d1d78fe34b138c05d714e6ad18131461f3
 DIST hydrogen-0.9.1.tar.gz 2317184 RMD160 0f12092f3c3b04034e18662f4c4685cbd5ccda51 SHA1 3749d24e3f82c01e10dfa81c9282d255710422aa SHA256 c7769c867e56f6f3e492a3cc74ecbdf0db6905668b974a41fcc6d987ab8e063f
 DIST hydrogen-0.9.2.tar.gz 2851868 RMD160 8aa12c8ac136c3868ef61fe71436b85a736d7185 SHA1 85db447e81624a661646b50fdbbe4f937988ee25 SHA256 438aaaa296d4207a0227cd4c85c581512c7a669eb35f33b099058de1ed146016
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
-EBUILD hydrogen-0.9.0.ebuild 1088 RMD160 a898aa320d72ab44a1df40bb8489489fb249395f SHA1 cb079b2a02d9427adb9516a3e0cd9e3a70df6b8c SHA256 eea3038fb86593566319e0486328294d588110d0086f27c822226ec7ad34e342
-MD5 9a065ff3208694116139dd87012578da hydrogen-0.9.0.ebuild 1088
-RMD160 a898aa320d72ab44a1df40bb8489489fb249395f hydrogen-0.9.0.ebuild 1088
-SHA256 eea3038fb86593566319e0486328294d588110d0086f27c822226ec7ad34e342 hydrogen-0.9.0.ebuild 1088
-EBUILD hydrogen-0.9.1.ebuild 1297 RMD160 5ecf10b2d6fbd26d22ba31537b056e17300a6177 SHA1 7341eca5975434fdabbf023f471a83c5ac64193d SHA256 7743666ccf604e9cb7a9fa19d328b6546c239a67552f805a21a4b5adf6315d26
-MD5 418b6e55183fc73c587c130dc4a52c4b hydrogen-0.9.1.ebuild 1297
-RMD160 5ecf10b2d6fbd26d22ba31537b056e17300a6177 hydrogen-0.9.1.ebuild 1297
-SHA256 7743666ccf604e9cb7a9fa19d328b6546c239a67552f805a21a4b5adf6315d26 hydrogen-0.9.1.ebuild 1297
-EBUILD hydrogen-0.9.2.ebuild 2436 RMD160 f25e1f982711e2b32ffe04a2e44cd48353abcd2c SHA1 382729bfc9774f8f9c965da4489949046bcc9929 SHA256 b4072b3d8d9bf8a434cd204a3668be80d0e1c79e046fb0e79e5445451d8364f4
-MD5 bab29c994439c6919fd435b292bcea1c hydrogen-0.9.2.ebuild 2436
-RMD160 f25e1f982711e2b32ffe04a2e44cd48353abcd2c hydrogen-0.9.2.ebuild 2436
-SHA256 b4072b3d8d9bf8a434cd204a3668be80d0e1c79e046fb0e79e5445451d8364f4 hydrogen-0.9.2.ebuild 2436
-EBUILD hydrogen-0.9.3.ebuild 2559 RMD160 709e8eac1f27f8360995fa7f5638aa9c26d43153 SHA1 043f220a75ae741895bce594fca33a6945fa9b8c SHA256 80e705b156284737d8f09f94fb95f699bca7572f01ede697ecb8d754a04d65ab
-MD5 259b6e85ccd304fc3ef028d37f57fd14 hydrogen-0.9.3.ebuild 2559
-RMD160 709e8eac1f27f8360995fa7f5638aa9c26d43153 hydrogen-0.9.3.ebuild 2559
-SHA256 80e705b156284737d8f09f94fb95f699bca7572f01ede697ecb8d754a04d65ab hydrogen-0.9.3.ebuild 2559
-MISC ChangeLog 7508 RMD160 f99e0aa9ffd6baf9af946131715d509bb43b8a6f SHA1 a699cacfe7e62915db3b8611f3a6f2e96941cf83 SHA256 8ec29ec9f8a5f4da7254d38d7c0062b73f0fc1058bf3a9f94f4359206249d5f5
-MD5 30dcfdb01f430857341324c56f0d4e71 ChangeLog 7508
-RMD160 f99e0aa9ffd6baf9af946131715d509bb43b8a6f ChangeLog 7508
-SHA256 8ec29ec9f8a5f4da7254d38d7c0062b73f0fc1058bf3a9f94f4359206249d5f5 ChangeLog 7508
+EBUILD hydrogen-0.9.0.ebuild 1090 RMD160 49c9be397553dc55caa9e762929175dfa062a260 SHA1 2932b0c8c946a0608f3e990f9d1a92d331a3dbb9 SHA256 fabbe13c51c69d1f540bdd1698fcfcecdd742223652b83463121b9a0aef49657
+MD5 65f7aa923afa275f1e089c4825bf8788 hydrogen-0.9.0.ebuild 1090
+RMD160 49c9be397553dc55caa9e762929175dfa062a260 hydrogen-0.9.0.ebuild 1090
+SHA256 fabbe13c51c69d1f540bdd1698fcfcecdd742223652b83463121b9a0aef49657 hydrogen-0.9.0.ebuild 1090
+EBUILD hydrogen-0.9.1.ebuild 1299 RMD160 b399303c2640f4626ecece871deb1f81ae5b9f0b SHA1 e98a0115d5638c0b44499c2871d68c01a4432ae8 SHA256 ea7353a0bef2b732a51cddbd3a0ecbfc7c6df9f4a582bc6f66200750fffcd63b
+MD5 a835cea48c8a9d0c34aa91cef08a4ed9 hydrogen-0.9.1.ebuild 1299
+RMD160 b399303c2640f4626ecece871deb1f81ae5b9f0b hydrogen-0.9.1.ebuild 1299
+SHA256 ea7353a0bef2b732a51cddbd3a0ecbfc7c6df9f4a582bc6f66200750fffcd63b hydrogen-0.9.1.ebuild 1299
+EBUILD hydrogen-0.9.2.ebuild 2442 RMD160 87d819e14f91424b04811ba070702a04f8be9243 SHA1 acd00f5c2cf041bd8af615dfb9036a698cbeffb6 SHA256 20afe384147bc2b5098006b786f376649ea855c1dfa9610244eb3ae4bed07b89
+MD5 c445e24cfce6f093eb5216935f2e19f9 hydrogen-0.9.2.ebuild 2442
+RMD160 87d819e14f91424b04811ba070702a04f8be9243 hydrogen-0.9.2.ebuild 2442
+SHA256 20afe384147bc2b5098006b786f376649ea855c1dfa9610244eb3ae4bed07b89 hydrogen-0.9.2.ebuild 2442
+EBUILD hydrogen-0.9.3-r1.ebuild 2610 RMD160 5d348b56436fc0df61fb42ef68cff9a35fe0268c SHA1 dc79a5e09ec6de1f7f594fa988cf3b85465962b1 SHA256 497fda043faf46183159f9aa94bbbf20736324b4fbd6af1bb425603dfca4ae6f
+MD5 47fc12630e434f517287573c3964687d hydrogen-0.9.3-r1.ebuild 2610
+RMD160 5d348b56436fc0df61fb42ef68cff9a35fe0268c hydrogen-0.9.3-r1.ebuild 2610
+SHA256 497fda043faf46183159f9aa94bbbf20736324b4fbd6af1bb425603dfca4ae6f hydrogen-0.9.3-r1.ebuild 2610
+EBUILD hydrogen-0.9.3.ebuild 2569 RMD160 6d2d00ca6f3f19078bc2a2aa0d2fd32ce6873ebd SHA1 6e376dcfcb0151964731595d4e4648e685b69fe8 SHA256 cbb423b17ed608653291926374dac13fbf25669cbf4fd5478e1649f304b4e37e
+MD5 91c95fe7543e8acce6576d291d7b5fa4 hydrogen-0.9.3.ebuild 2569
+RMD160 6d2d00ca6f3f19078bc2a2aa0d2fd32ce6873ebd hydrogen-0.9.3.ebuild 2569
+SHA256 cbb423b17ed608653291926374dac13fbf25669cbf4fd5478e1649f304b4e37e hydrogen-0.9.3.ebuild 2569
+MISC ChangeLog 7851 RMD160 d0da52f9b8178c61762d3a46912e8f3df1697bfc SHA1 3541e14aeaf46dd62143203cacf15fe2e4becac1 SHA256 548f9a15e0ab851c5e2270dfa37e693c69d58962b3f7e9b670420204c7c90584
+MD5 bc5ff6f35b997fb4b0a49e7f187c894d ChangeLog 7851
+RMD160 d0da52f9b8178c61762d3a46912e8f3df1697bfc ChangeLog 7851
+SHA256 548f9a15e0ab851c5e2270dfa37e693c69d58962b3f7e9b670420204c7c90584 ChangeLog 7851
 MISC metadata.xml 257 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe SHA1 97fa9c254875dfa462f68355cf8b5579a2d7b6df SHA256 c78b9281ef43dc8c1966c705dae4e1f1b713209322c56a20a9a0b71e8c28faa9
 MD5 958cdff6e2710ee30529dd9af63497de metadata.xml 257
 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe metadata.xml 257
@@ -54,3 +65,13 @@ SHA256 a3d1f2d0024de1e7e4575a4ff19d7f327b9af9eb9c123d511be321addb45ce0e files/di
 MD5 1a0871d2c47e8e3a837dc56ce9b1db6b files/digest-hydrogen-0.9.3 247
 RMD160 ebb239e261e5aad2c35b176c983fef7cce1827ab files/digest-hydrogen-0.9.3 247
 SHA256 85dd02bd475c60bde105e175bef2b0e8c7ef2519d003f2cbf2c6df1ebb793d65 files/digest-hydrogen-0.9.3 247
+MD5 1a0871d2c47e8e3a837dc56ce9b1db6b files/digest-hydrogen-0.9.3-r1 247
+RMD160 ebb239e261e5aad2c35b176c983fef7cce1827ab files/digest-hydrogen-0.9.3-r1 247
+SHA256 85dd02bd475c60bde105e175bef2b0e8c7ef2519d003f2cbf2c6df1ebb793d65 files/digest-hydrogen-0.9.3-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF0L6svFcC4BYPU0oRArH4AJ9pZ4dTif75LZ7OgKTjPIXPgT+bggCfZ9Cn
+/eMG9vxsGWPsgsKIYIPv4f4=
+=ikm+
+-----END PGP SIGNATURE-----
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r1 b/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r1
new file mode 100644
index 000000000000..6b770b479057
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r1
@@ -0,0 +1,3 @@
+MD5 d5840b5d330d433d00ea1727efb0fc7f hydrogen-0.9.3.tar.gz 2771792
+RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 hydrogen-0.9.3.tar.gz 2771792
+SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a hydrogen-0.9.3.tar.gz 2771792
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch
new file mode 100644
index 000000000000..29a263c26273
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-flac113.patch
@@ -0,0 +1,45 @@
+--- src/lib/FLACFile.cpp.old	2007-02-11 20:12:34.000000000 +0100
++++ src/lib/FLACFile.cpp	2007-02-11 20:18:25.000000000 +0100
+@@ -33,6 +33,13 @@
+ //#include "FLAC/file_decoder.h"
+ #include <FLAC++/all.h>
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
++
+ /// Reads a FLAC file...not optimized yet
+ class FLACFile_real : public FLAC::Decoder::File, public Object
+ {
+@@ -164,16 +171,28 @@
+ 	}
+ 
+ 	set_metadata_ignore_all();
++
++#ifdef LEGACY_FLAC
+ 	set_filename( sFilename.c_str() );
+ 
+ 	State s=init();
+ 	if( s != FLAC__FILE_DECODER_OK ) {
++#else
++	FLAC__StreamDecoderInitStatus s=init(sFilename.c_str() );
++	if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++#endif
+ 		errorLog( "[load] Error in init()" );
+ 	}
+ 
++#ifdef LEGACY_FLAC
+ 	if ( process_until_end_of_file() == false ) {
+ 		errorLog( "[load] Error in process_until_end_of_file()" );
+ 	}
++#else
++	if ( process_until_end_of_stream() == false ) {
++		errorLog( "[load] Error in process_until_end_of_stream()" );
++	}
++#endif
+ }
+ 
+ 
diff --git a/media-sound/hydrogen/hydrogen-0.9.0.ebuild b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
index 610ad4d4faf3..3d25b6b33125 100644
--- a/media-sound/hydrogen/hydrogen-0.9.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.13 2006/09/23 00:27:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.14 2007/02/12 19:23:13 aballier Exp $
 
 inherit eutils kde-functions
 
@@ -16,7 +16,7 @@ IUSE="alsa jack ladspa"
 DEPEND=">=media-libs/libsndfile-1.0.0
 	alsa? ( media-libs/alsa-lib )
 	>=media-libs/audiofile-0.2.3
-	>=media-libs/flac-1
+	~media-libs/flac-1.1.2
 	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/liblrdf )"
 need-qt 3
diff --git a/media-sound/hydrogen/hydrogen-0.9.1.ebuild b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
index ac112fa555e2..7834d9a47f94 100644
--- a/media-sound/hydrogen/hydrogen-0.9.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.7 2006/09/23 00:27:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.8 2007/02/12 19:23:13 aballier Exp $
 
 inherit eutils kde-functions
 
@@ -15,7 +15,7 @@ IUSE="alsa jack ladspa"
 
 DEPEND=">=media-libs/libsndfile-1.0.0
 	>=media-libs/audiofile-0.2.3
-	>=media-libs/flac-1
+	~media-libs/flac-1.1.2
 	=x11-libs/qt-3*
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/hydrogen/hydrogen-0.9.2.ebuild b/media-sound/hydrogen/hydrogen-0.9.2.ebuild
index 6695fc5c5b89..dd43b962e014 100644
--- a/media-sound/hydrogen/hydrogen-0.9.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.2.ebuild,v 1.4 2007/02/04 08:23:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.2.ebuild,v 1.5 2007/02/12 19:23:13 aballier Exp $
 
 inherit eutils kde-functions autotools
 
@@ -15,7 +15,7 @@ IUSE="alsa debug jack ladspa oss"
 
 RDEPEND="media-libs/libsndfile
 	media-libs/audiofile
-	media-libs/flac
+	~media-libs/flac-1.1.2
 	media-libs/portaudio
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..8ec0e2b24870
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r1.ebuild,v 1.1 2007/02/12 19:23:13 aballier Exp $
+
+inherit eutils kde-functions autotools multilib
+
+DESCRIPTION="Linux Drum Machine"
+HOMEPAGE="http://hydrogen.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug jack ladspa oss portaudio"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libsndfile
+	media-libs/audiofile
+	media-libs/flac
+	portaudio? ( media-libs/portaudio )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )"
+
+need-qt 3
+
+src_unpack() {
+	unpack ${A}
+	if use ppc; then
+		cd ${S}/src
+		epatch ${FILESDIR}/0.9.1-OSS.patch || die "patching failed"
+	fi
+	cd ${S}
+
+	mv data/doc/man ${S}
+	# broken or portability issue
+	find . -iname Makefile.in -exec sed -i -e "s:update-menus::" {} \;
+	# find PortAudio/Midi files
+	sed -e "s:pa_unix_oss:lib:g" -e "s:pa_common:include:g" \
+		-e "s:pm_linux:lib:g" -e "s:pm_common:include:g" \
+		-i configure.in
+	sed -e "s:lib/hydrogen:$(get_libdir)/hydrogen:g" -i plugins/wasp/Makefile.in
+	make -f Makefile.cvs
+
+	epatch ${FILESDIR}/hydrogen-0.9.2-configure.in.patch
+	epatch ${FILESDIR}/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch
+	epatch "${FILESDIR}/${P}-flac113.patch"
+}
+
+src_compile() {
+	export PORTAUDIOPATH="${ROOT}usr"
+	# PortMidi not yet in the repository
+	# export PORTMIDIPATH="${ROOT}usr"
+
+	local myconf="$(use_enable jack jack-support) \
+			$(use_enable portaudio) \
+			$(use_enable alsa) \
+			$(use_enable debug) \
+			$(use_enable ladspa) \
+			$(use_enable ladspa lrdf-support) \
+			$(use_enable oss oss-support)"
+
+	eautoconf
+	econf ${myconf} || die "Failed configuring hydrogen!"
+	emake -j1 || die "Failed making hydrogen!"
+}
+
+src_install() {
+	pushd data/i18n
+	./updateTranslations.sh
+	rm *.ts updateTranslations.sh
+	popd
+
+	pushd data/doc
+	./updateManuals.sh
+	rm *.docbook updateManuals.sh
+	popd
+
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+	dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
+	doman man/C/hydrogen.1
+
+	for N in 16 24 32 48 64 ; do
+		dodir /usr/share/icons/hicolor/${N}x${N}/apps
+		dosym /usr/share/hydrogen/data/img/gray/icon${N}.png \
+			 /usr/share/icons/hicolor/${N}x${N}/apps/hydrogen.png
+	done
+	dodir /usr/share/icons/hicolor/scalable/apps
+	dosym /usr/share/hydrogen/data/img/gray/icon.svg \
+		/usr/share/icons/hicolor/scalable/apps/hydrogen.svg
+}
diff --git a/media-sound/hydrogen/hydrogen-0.9.3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
index 53284747700f..aa3dd4e6748d 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.12 2007/02/02 14:33:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.13 2007/02/12 19:23:13 aballier Exp $
 
 inherit eutils kde-functions autotools multilib
 
@@ -16,7 +16,7 @@ IUSE="alsa debug jack ladspa oss portaudio"
 RDEPEND="dev-libs/libxml2
 	media-libs/libsndfile
 	media-libs/audiofile
-	media-libs/flac
+	~media-libs/flac-1.1.2
 	portaudio? ( media-libs/portaudio )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )