Revision bump to remove USE portaudio wrt #222841.

Package-Manager: portage-2.1.5

4 files changed, 124 insertions, 15 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 0f42e5c794ba..3439e39fc84f 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.63 2008/04/20 18:14:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.64 2008/05/19 19:49:04 drac Exp $
+
+*hydrogen-0.9.3-r3 (19 May 2008)
+
+  19 May 2008; Samuli Suominen <drac@gentoo.org> hydrogen-0.9.3-r2.ebuild,
+  +hydrogen-0.9.3-r3.ebuild:
+  Revision bump to remove USE portaudio wrt #222841.
 
   20 Apr 2008; Alexis Ballier <aballier@gentoo.org>
   +files/hydrogen-0.9.3-gcc43.patch, hydrogen-0.9.3-r2.ebuild:
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 6539d11e1224..b2083899c3ef 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.1-OSS.patch 995 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b SHA1 53ece944023dbd26cfa7ec5ae9e21a634082daa8 SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0
 AUX hydrogen-0.9.2-configure.in.patch 1346 RMD160 1dc980254521d44bf9413ae50fb61e4af2270ebe SHA1 98cbdd9934b47428622a2fb6ee3ea3857f973401 SHA256 c7c030d16087a2ec0b22f39181fc087e078c8cf0cf9d487b36f15c53e36b5be6
 AUX hydrogen-0.9.3-automagic.patch 751 RMD160 74d609894205b9edf52502ed9294c3f2485ac1de SHA1 281fc7cd9597dfd01e4abc6abffe2715b02d922c SHA256 0d63352c7269d07667735949f8be4637ec63a3b3bcdd46d2c764cb9d019721a7
@@ -9,13 +6,7 @@ AUX hydrogen-0.9.3-flac113.patch 1065 RMD160 c49ee2d09aab98ea9f93639d86bc60e90fa
 AUX hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356 RMD160 0d45efab658cff07be032d36fc1523f373d0ef54 SHA1 b170e964748a42016e8f8d2b0fe058d0b3e758b9 SHA256 cc653b60dce63e709e318935790bd0f292edb6afb4114352cbcedc8573f085a4
 AUX hydrogen-0.9.3-gcc43.patch 2434 RMD160 3cae0403a3b41e52c593d94447ab5bfb8eadd131 SHA1 9d333eb4d4fe5e8b73b1cfbbc07db80b623bf479 SHA256 99093e4ed118353af79d1323f303cdd78e8a3b73b338584360183c7f3c1f488e
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
-EBUILD hydrogen-0.9.3-r2.ebuild 3433 RMD160 9d9669f2adf81e37538b7ee59c4dad7d8715047a SHA1 48dd194cd2fc51824ff95c4bfbc1f54b50d538ca SHA256 5bfce2d916605815fee5db936c3f406fc901f35eeb5da462b34e824b3c463c3e
-MISC ChangeLog 10380 RMD160 92bc81bf363a0d2c62c4bd82833d59c39ce29a24 SHA1 bebca5896f431ef84fbb285aaa8ae2f9f37eb959 SHA256 0c66e76e2fd6a1f3568f6b70d881d69e953b7a69a44863ef3a2525517579d142
+EBUILD hydrogen-0.9.3-r2.ebuild 3434 RMD160 3c9611bf2ca26becb4a52dac84306401f8f06ab4 SHA1 cc4220482e369447b0aca4e3df50055fae74c6c9 SHA256 261579d9c836e7126e4fa837fd47148ab374818df0d76c0d9864aafa4fab0d10
+EBUILD hydrogen-0.9.3-r3.ebuild 3426 RMD160 eda6b787eff44542bfc93e0772dccea6de74fe4c SHA1 c7a4746d6236e64358e7f43af362803b5684b65a SHA256 e1e7147713c65897a04245a7f58a457cb17587607adab4886824be56707e1efd
+MISC ChangeLog 10568 RMD160 506770fc913467a4edd0418eb2b09ce2ccc1e5e0 SHA1 5d5ee5815c6b3f74db0b14400af95ab8f6670e77 SHA256 78ada4f27a9c7c6b96989f4989821a46c9cb9e5cda267483a46ad71acba2d152
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgLiCkACgkQvFcC4BYPU0pmpQCgt6Ga9ACzaX7xqQD1bq7C3Qw+
-J4kAoIAze4c4E0WQ+r/ZCJ55xbtarp1Q
-=VqQQ
------END PGP SIGNATURE-----
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
index bdaf910d11ae..39d2d5c94748 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.12 2008/04/20 18:14:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild,v 1.13 2008/05/19 19:49:04 drac Exp $
 
 inherit eutils kde-functions autotools multilib
 
@@ -17,7 +17,7 @@ RDEPEND="dev-libs/libxml2
 	media-libs/libsndfile
 	media-libs/audiofile
 	flac? ( media-libs/flac )
-	portaudio? ( media-libs/portaudio )
+	portaudio? ( =media-libs/portaudio-18* )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( media-libs/liblrdf )"
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild
new file mode 100644
index 000000000000..7287a93dd978
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/05/19 19:49:04 drac Exp $
+
+inherit eutils kde-functions autotools multilib
+
+DESCRIPTION="Linux Drum Machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug doc flac jack ladspa oss"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libsndfile
+	media-libs/audiofile
+	flac? ( media-libs/flac )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	dev-util/pkgconfig"
+
+need-qt 3
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ${CATEGORY}/${PN} with ALSA support you"
+		eerror "need to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
+		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
+		eerror "Please enable the cxx USE flag for media-libs/flac"
+		die "Missing FLAC C++ bindings."
+	fi
+}
+
+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
+
+	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"
+	epatch "${FILESDIR}/${P}-automagic.patch"
+	epatch "${FILESDIR}/${P}-desktop-noexec.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	eautoreconf
+}
+
+src_compile() {
+	export PORTAUDIOPATH="/usr"
+	# PortMidi not yet in the repository
+	# export PORTMIDIPATH="/usr"
+
+	# Disable portaudio v18 support wrt #222841
+	local myconf="$(use_enable jack jack-support) \
+			--disable-portaudio \
+			$(use_enable alsa) \
+			$(use_enable debug) \
+			$(use_enable flac flac_support) \
+			$(use_enable ladspa) \
+			$(use_enable ladspa lrdf-support) \
+			$(use_enable oss oss-support)"
+
+	econf ${myconf} || die "Failed configuring hydrogen!"
+	emake -j1 || die "Failed making hydrogen!"
+}
+
+src_install() {
+	pushd data/i18n
+	use doc && ./updateTranslations.sh
+	rm *.ts updateTranslations.sh
+	popd
+
+	pushd data/doc
+	use doc && ./updateManuals.sh
+	rm *.docbook updateManuals.sh
+	popd
+
+	emake 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
+}