dep fixes + gcc build fix, closes bugs #132726, #132729, #132848

(Portage version: 2.0.54-r2)

4 files changed, 32 insertions, 62 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index c48571ad51a1..cf9ac037d22f 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.37 2006/05/09 03:57:49 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.38 2006/05/12 22:01:10 eldad Exp $
+
+  12 May 2006; Eldad Zack <eldad@gentoo.org>
+  +files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch, hydrogen-0.9.3.ebuild:
+  Removed unneeded dep for app-text/docbook-sgml-utils, closes bug #132729.
+  Added useflag for portaudio, closes bug #132848. Added fix for gcc 4.1,
+  closes bug #132726.
 
   09 May 2006; Joshua Jackson <tsunam@gentoo.org> hydrogen-0.9.3.ebuild:
   Stable on x86; bug #132522
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index b61ad82b5ded..060526a81be3 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,62 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 0.9.1-OSS.patch 995 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b SHA1 53ece944023dbd26cfa7ec5ae9e21a634082daa8 SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0 size 995
+MD5 b9026c547bb52b8fbba22870e045b02a ChangeLog 6432
 MD5 6b397bce8176411819610e6b92401be2 files/0.9.1-OSS.patch 995
-RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b files/0.9.1-OSS.patch 995
-SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0 files/0.9.1-OSS.patch 995
-AUX hydrogen-0.9.0-asneeded.patch 1025 RMD160 78b5ed84e7ad8be3e3b80fd4d1f002b118259012 SHA1 b31656a7266bb29138d8f496d937ba8124657e62 SHA256 0563b78f4dfa881ac96f6214b399a8138b7f60185c3adc9aa6ccb073b0f1ce32 size 1025
+MD5 1755f7143c139eddaed591c6ea39e695 files/digest-hydrogen-0.9.0 67
+MD5 c2de54ec169afbb90c9eaa6440bafed5 files/digest-hydrogen-0.9.1 67
+MD5 5b50926aa278f221e8c29bba87e450d2 files/digest-hydrogen-0.9.2 67
+MD5 7aebeed959a927387e6e45e2449ccc8a files/digest-hydrogen-0.9.3 67
 MD5 0e8d856ad0cf71ff196438ecb24062b0 files/hydrogen-0.9.0-asneeded.patch 1025
-RMD160 78b5ed84e7ad8be3e3b80fd4d1f002b118259012 files/hydrogen-0.9.0-asneeded.patch 1025
-SHA256 0563b78f4dfa881ac96f6214b399a8138b7f60185c3adc9aa6ccb073b0f1ce32 files/hydrogen-0.9.0-asneeded.patch 1025
-AUX hydrogen-0.9.2-configure.in.patch 1346 RMD160 1dc980254521d44bf9413ae50fb61e4af2270ebe SHA1 98cbdd9934b47428622a2fb6ee3ea3857f973401 SHA256 c7c030d16087a2ec0b22f39181fc087e078c8cf0cf9d487b36f15c53e36b5be6 size 1346
 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
-DIST hydrogen-0.9.0.tar.gz 2322401 size 2322401
-DIST hydrogen-0.9.1.tar.gz 2317184 size 2317184
-DIST hydrogen-0.9.2.tar.gz 2851868 size 2851868
-DIST hydrogen-0.9.3.tar.gz 2771792 size 2771792
-EBUILD hydrogen-0.9.0.ebuild 1112 RMD160 7bdee17e532136f72b16917a68970e289a0a0eb2 SHA1 d2f4a9f348b97b07579d04314a4c67c051fa61fc SHA256 05f12c25963f9f6942d92449af5725f4190b6782e93314e751d17201922bd500 size 1112
+MD5 e43555677b71dcf988a5e85a2304c301 files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356
 MD5 fea473fcef25faecb98954bbba814d7b hydrogen-0.9.0.ebuild 1112
-RMD160 7bdee17e532136f72b16917a68970e289a0a0eb2 hydrogen-0.9.0.ebuild 1112
-SHA256 05f12c25963f9f6942d92449af5725f4190b6782e93314e751d17201922bd500 hydrogen-0.9.0.ebuild 1112
-EBUILD hydrogen-0.9.1.ebuild 1321 RMD160 1e9e9411537d4e693bd4b3d5f266797b86cb5186 SHA1 733ab3c5060497ea30d5007d5bfe50d25f7eff88 SHA256 b3e5bdc5809ef5455d44dc0429a4f050b329ce33b609387f7a6b9c17195ae5ee size 1321
 MD5 10b1831d7ab2e0688391bc11f2f52101 hydrogen-0.9.1.ebuild 1321
-RMD160 1e9e9411537d4e693bd4b3d5f266797b86cb5186 hydrogen-0.9.1.ebuild 1321
-SHA256 b3e5bdc5809ef5455d44dc0429a4f050b329ce33b609387f7a6b9c17195ae5ee hydrogen-0.9.1.ebuild 1321
-EBUILD hydrogen-0.9.2.ebuild 2451 RMD160 36483b2df794a875b9df5ff2063e6cab140d8c5b SHA1 b7fa7375f4ed36d0115ac1a18bb459901dd0a052 SHA256 2deeb19df7add6de99b5fb98ec1c14e5787509b056d2f087f0172700b72b270f size 2451
 MD5 d9fc02ee718af6e1dee8be969182a221 hydrogen-0.9.2.ebuild 2451
-RMD160 36483b2df794a875b9df5ff2063e6cab140d8c5b hydrogen-0.9.2.ebuild 2451
-SHA256 2deeb19df7add6de99b5fb98ec1c14e5787509b056d2f087f0172700b72b270f hydrogen-0.9.2.ebuild 2451
-EBUILD hydrogen-0.9.3.ebuild 2431 RMD160 1cd5253a5c1c7930b292fa8d40976e8032c39a32 SHA1 df7a9e10a40f87d5458e05cfa6c1ccce7e1f6ba2 SHA256 532ad8fbbec25494bfcd27a607eb1a82d37d1df6bdd932dc5d163f4e38df7b61 size 2431
-MD5 7629cc57661af2127997a4c88108bb3a hydrogen-0.9.3.ebuild 2431
-RMD160 1cd5253a5c1c7930b292fa8d40976e8032c39a32 hydrogen-0.9.3.ebuild 2431
-SHA256 532ad8fbbec25494bfcd27a607eb1a82d37d1df6bdd932dc5d163f4e38df7b61 hydrogen-0.9.3.ebuild 2431
-MISC ChangeLog 6142 RMD160 13c3777ec86dd7aef60fda5a362374d477c2022a SHA1 ce72435d8800bf05350634b9064bb27f6d488ea2 SHA256 cc063e13aa49639b8bffe0e792db0388446a572ad99c08fff39fe629829c9df7 size 6142
-MD5 044c3f08432caa6c15a2c2841b795e7a ChangeLog 6142
-RMD160 13c3777ec86dd7aef60fda5a362374d477c2022a ChangeLog 6142
-SHA256 cc063e13aa49639b8bffe0e792db0388446a572ad99c08fff39fe629829c9df7 ChangeLog 6142
-MISC metadata.xml 257 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe SHA1 97fa9c254875dfa462f68355cf8b5579a2d7b6df SHA256 c78b9281ef43dc8c1966c705dae4e1f1b713209322c56a20a9a0b71e8c28faa9 size 257
+MD5 a60b000ed86b7c3cd3465aaecd9d3923 hydrogen-0.9.3.ebuild 2496
 MD5 958cdff6e2710ee30529dd9af63497de metadata.xml 257
-RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe metadata.xml 257
-SHA256 c78b9281ef43dc8c1966c705dae4e1f1b713209322c56a20a9a0b71e8c28faa9 metadata.xml 257
-MD5 1755f7143c139eddaed591c6ea39e695 files/digest-hydrogen-0.9.0 67
-RMD160 628b745dc79bdff3a14ff03e8421966c325d20ec files/digest-hydrogen-0.9.0 67
-SHA256 6fdc3a0a822aa0c2752ebf417219a295353de6383b3f1c32e42f33a416771e11 files/digest-hydrogen-0.9.0 67
-MD5 c2de54ec169afbb90c9eaa6440bafed5 files/digest-hydrogen-0.9.1 67
-RMD160 394de292c437cd0243a1f194865b54687779145a files/digest-hydrogen-0.9.1 67
-SHA256 94d0eeedc355486e5e1e226bd96389a755f01048ab1eb18f01382cae9eb5f8f1 files/digest-hydrogen-0.9.1 67
-MD5 5b50926aa278f221e8c29bba87e450d2 files/digest-hydrogen-0.9.2 67
-RMD160 e98433f4877024ffe0949f3f24097cb9d7825157 files/digest-hydrogen-0.9.2 67
-SHA256 5f72212668739e4d78f1b6b2beb38f8e4407fe7793c29db9dd33f5d76b040161 files/digest-hydrogen-0.9.2 67
-MD5 7aebeed959a927387e6e45e2449ccc8a files/digest-hydrogen-0.9.3 67
-RMD160 5a7434a34c98626867da1384939a049c171e4ef9 files/digest-hydrogen-0.9.3 67
-SHA256 12fc667f76ec1ace97c5b4f67f080006cd61b3003a042f5a157f94439163c34d files/digest-hydrogen-0.9.3 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEYBNHSENan+PfizARAnO8AJ9vyIr+Ogl0bKO9e2Z9C8tn67tE9wCeKw+b
-2vChWXa9JlKlFNKPd/Xi9Co=
-=+BR7
------END PGP SIGNATURE-----
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch
new file mode 100644
index 000000000000..e03d20fc0885
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch
@@ -0,0 +1,11 @@
+--- src/lib/xml/tinyxml.h.orig	2006-05-13 00:39:24.000000000 +0300
++++ src/lib/xml/tinyxml.h	2006-05-13 00:39:53.000000000 +0300
+@@ -823,7 +823,7 @@
+ #endif
+ 
+ 	/// Construct.
+-	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
++	TiXmlDeclaration( const char * _version,
+ 										const char * _encoding,
+ 										const char * _standalone );
+ 
diff --git a/media-sound/hydrogen/hydrogen-0.9.3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
index f4bfa84ce162..c6bf9e18006b 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-2006 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.3 2006/05/09 03:57:49 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.4 2006/05/12 22:01:10 eldad Exp $
 
 inherit eutils kde-functions autotools
 
@@ -10,19 +10,18 @@ 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"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64"
+IUSE="alsa debug jack ladspa oss portaudio"
 
 RDEPEND="dev-libs/libxml2
 	media-libs/libsndfile
 	media-libs/audiofile
 	media-libs/flac
-	media-libs/portaudio
+	portaudio? ( media-libs/portaudio )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/liblrdf )"
-DEPEND="app-text/docbook-sgml-utils
-	${RDEPEND}"
+
 need-qt 3
 
 src_unpack() {
@@ -43,6 +42,7 @@ src_unpack() {
 	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
 }
 
 src_compile() {
@@ -53,6 +53,7 @@ src_compile() {
 	# export PORTMIDIPATH="${ROOT}usr"
 
 	local myconf="$(use_enable jack jack-support) \
+			$(use_enable portaudio) \
 			$(use_enable alsa) \
 			$(use_enable debug) \
 			$(use_enable ladspa) \