Call only once the autotools with eautoreconf, do not install destop entry as executable (reported by Josh Saddler), fix automagic on portaudio, regenerate doc with doc useflag, make flac optional, parallel make appears to work thus drop -j1, add missing dep for docbook2html when regenerating doc

(Portage version: 2.1.3_rc7)

5 files changed, 153 insertions, 1 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index ff60e9583e22..7e519adea7a9 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,17 @@
 # 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.50 2007/07/06 17:45:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.51 2007/07/09 06:12:38 aballier Exp $
+
+*hydrogen-0.9.3-r2 (09 Jul 2007)
+
+  09 Jul 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/hydrogen-0.9.3-automagic.patch,
+  +files/hydrogen-0.9.3-desktop-noexec.patch, +hydrogen-0.9.3-r2.ebuild:
+  Call only once the autotools with eautoreconf, do not install destop entry
+  as executable (reported by Josh Saddler), fix automagic on portaudio,
+  regenerate doc with doc useflag, make flac optional, parallel make appears
+  to work thus drop -j1, add missing dep for docbook2html when regenerating
+  doc
 
   06 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   hydrogen-0.9.3-r1.ebuild:
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r2 b/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r2
new file mode 100644
index 000000000000..6b770b479057
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.3-r2
@@ -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-automagic.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-automagic.patch
new file mode 100644
index 000000000000..522c9bb79192
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-automagic.patch
@@ -0,0 +1,21 @@
+Index: hydrogen-0.9.3/configure.in
+===================================================================
+--- hydrogen-0.9.3.orig/configure.in
++++ hydrogen-0.9.3/configure.in
+@@ -368,6 +368,8 @@ echo ""
+ echo "--- Checking for PortAudio -------------------------------------"
+ 
+ portaudio_support=false
++AC_ARG_ENABLE(portaudio, [  --disable-portaudio   Compile without portaudio support], [want_portaudio=$enableval])
++if test "x$want_portaudio" != "xno"; then
+ AC_MSG_CHECKING([whether PORTAUDIOPATH environment variable is set])
+ if test "x$PORTAUDIOPATH" = "x"; then
+ 	AC_MSG_RESULT(PORTAUDIOPATH is not set. No PortAudio support.)
+@@ -390,6 +392,7 @@ fi
+ echo "-----------------------------------------------------------------"
+ echo ""
+ 
++fi
+ 
+ 
+ 
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.3-desktop-noexec.patch b/media-sound/hydrogen/files/hydrogen-0.9.3-desktop-noexec.patch
new file mode 100644
index 000000000000..abe15e331a6e
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.3-desktop-noexec.patch
@@ -0,0 +1,13 @@
+Index: hydrogen-0.9.3/Makefile.in
+===================================================================
+--- hydrogen-0.9.3.orig/Makefile.in
++++ hydrogen-0.9.3/Makefile.in
+@@ -225,7 +225,7 @@ install:
+ 	mkdir -p $(DESTDIR)$(prefix)/share/hydrogen/data/
+ 	cp -R data $(DESTDIR)$(prefix)/share/hydrogen
+ 	mkdir -p $(DESTDIR)$(prefix)/share/hydrogen/data/
+-	@install -vD hydrogen.desktop $(DESTDIR)$(prefix)/share/applications/hydrogen.desktop
++	@install -vD -m 644 hydrogen.desktop $(DESTDIR)$(prefix)/share/applications/hydrogen.desktop
+ 	cd plugins;make install;cd ..
+ 	
+ 	
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..e4fd40199be1
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r2.ebuild
@@ -0,0 +1,104 @@
+# 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-r2.ebuild,v 1.1 2007/07/09 06:12:38 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 doc flac jack ladspa oss portaudio"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libsndfile
+	media-libs/audiofile
+	flac? ( media-libs/flac )
+	portaudio? ( media-libs/portaudio )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )
+	doc? ( app-text/docbook-sgml-utils )"
+
+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
+}
+
+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"
+	eautoreconf
+}
+
+src_compile() {
+	export PORTAUDIOPATH="/usr"
+	# PortMidi not yet in the repository
+	# export PORTMIDIPATH="/usr"
+
+	local myconf="$(use_enable jack jack-support) \
+			$(use_enable 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 || 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
+}