Compilation fixes, thanks to Michael Schnake <schnake@composition.de>. Closes bug #46568

6 files changed, 159 insertions, 4 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index cc4054139893..934965f6cc00 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.11 2004/06/13 08:26:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.12 2004/06/18 19:57:01 fvdpol Exp $
+
+*hydrogen-0.8.2-r1 (18 Jun 2004)
+
+  18 Jun 2004; Frank van de Pol <fvdpol@gentoo.org> metadata.xml,
+  +files/hydrogen-0.8.2-ui-spacer.patch, +hydrogen-0.8.2-r1.ebuild:
+  Compilation fixes, thanks to Michael Schnake <schnake@composition.de>
+  closes bug #46568
 
   13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   hydrogen-0.8.1-r1.ebuild, hydrogen-0.8.1.ebuild, hydrogen-0.8.2.ebuild:
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 5425baad6705..77a3acb079a4 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,8 +1,11 @@
-MD5 836aad19856c850d1b86c024c3b38cc5 ChangeLog 1772
+MD5 1593c7986904f18252764c395523fb44 ChangeLog 2029
 MD5 d87e7ca09ed94f1e4b4d3d58206e511a hydrogen-0.8.1-r1.ebuild 2046
 MD5 6e9b7153d399f7aceb9ddfd689d96e84 hydrogen-0.8.1.ebuild 758
 MD5 07c4a21203670df7884ded6432488fe1 hydrogen-0.8.2.ebuild 2042
-MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
+MD5 7265452ab5b8fc5e97614d42b3d7e053 metadata.xml 220
+MD5 4ef17465390670abadfe7e9e743957bb hydrogen-0.8.2-r1.ebuild 2100
 MD5 799a80da707ff5ef9c2fe1b48ae0a6df files/digest-hydrogen-0.8.1 67
 MD5 dd475b26d81eb9e7275870a121454e24 files/digest-hydrogen-0.8.1-r1 319
 MD5 09d97690a9335d98d3bdbb5625b65efa files/digest-hydrogen-0.8.2 319
+MD5 7d42c8a8bb26e478ec8e9e835ea733b5 files/hydrogen-0.8.2-ui-spacer.patch 1902
+MD5 09d97690a9335d98d3bdbb5625b65efa files/digest-hydrogen-0.8.2-r1 319
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r1 b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r1
new file mode 100644
index 000000000000..6fbdcf9ee351
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r1
@@ -0,0 +1,5 @@
+MD5 65e16cabfaa414dabdd0039cad5eee94 hydrogen-0.8.2.tar.gz 2066644
+MD5 1980647fa79029fa1dd1eb4f5ad14d65 3355606.tar.gz 408406
+MD5 8ddc8e3f5d02f5e2f12533db45e77c55 DrumkitPack1.tar.gz 968204
+MD5 535b873aead13de2105cc2a5609ec977 DrumkitPack2.tar.gz 1282298
+MD5 def807440c5a5e01e22f2b7a52a872df EasternHop-1.tar.gz 417396
diff --git a/media-sound/hydrogen/files/hydrogen-0.8.2-ui-spacer.patch b/media-sound/hydrogen/files/hydrogen-0.8.2-ui-spacer.patch
new file mode 100644
index 000000000000..784f1f54b255
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.8.2-ui-spacer.patch
@@ -0,0 +1,60 @@
+diff -ru hydrogen-0.8.2/hydrogen_gui/AudioEngineInfoForm_UI.h hydrogen-0.8.2-fixed/hydrogen_gui/AudioEngineInfoForm_UI.h
+--- hydrogen-0.8.2/hydrogen_gui/AudioEngineInfoForm_UI.h	2004-04-02 10:36:53.114278728 +0200
++++ hydrogen-0.8.2-fixed/hydrogen_gui/AudioEngineInfoForm_UI.h	2004-04-02 10:38:31.781279064 +0200
+@@ -19,6 +19,7 @@
+ class QGroupBox;
+ class QLabel;
+ class QPushButton;
++class QSpacerItem;
+ 
+ class AudioEngineInfoForm_UI : public QWidget
+ {
+@@ -70,6 +71,8 @@
+     QHBoxLayout* layout9_2_2;
+     QHBoxLayout* Layout9;
+     QHBoxLayout* Layout9_2;
++    QSpacerItem* Spacer1;
++    QSpacerItem* Spacer2;
+ 
+ protected slots:
+     virtual void languageChange();
+diff -ru hydrogen-0.8.2/hydrogen_gui/LadspaFXSelector_UI.h hydrogen-0.8.2-fixed/hydrogen_gui/LadspaFXSelector_UI.h
+--- hydrogen-0.8.2/hydrogen_gui/LadspaFXSelector_UI.h	2004-04-02 10:36:53.106279944 +0200
++++ hydrogen-0.8.2-fixed/hydrogen_gui/LadspaFXSelector_UI.h	2004-04-02 10:38:41.614784144 +0200
+@@ -23,6 +23,7 @@
+ class QListBoxItem;
+ class QPushButton;
+ class QLabel;
++class QSpacerItem;
+ 
+ class LadspaFXSelector_UI : public QDialog
+ {
+@@ -58,6 +59,8 @@
+ 
+ protected:
+     QHBoxLayout* Layout33;
++    QSpacerItem* Spacer1;
++    QSpacerItem* Spacer2;
+ 
+ protected slots:
+     virtual void languageChange();
+diff -ru hydrogen-0.8.2/hydrogen_gui/PreferencesDialog_UI.h hydrogen-0.8.2-fixed/hydrogen_gui/PreferencesDialog_UI.h
+--- hydrogen-0.8.2/hydrogen_gui/PreferencesDialog_UI.h	2004-04-02 10:36:53.112279032 +0200
++++ hydrogen-0.8.2-fixed/hydrogen_gui/PreferencesDialog_UI.h	2004-04-02 10:39:17.151381760 +0200
+@@ -25,6 +25,7 @@
+ class QLineEdit;
+ class QSpinBox;
+ class QComboBox;
++class QSpacerItem;
+ 
+ class PreferencesDialog_UI : public QDialog
+ {
+@@ -99,6 +100,8 @@
+ 
+ protected:
+     QHBoxLayout* Layout33;
++    QSpacerItem* Spacer1;
++    QSpacerItem* Spacer2;
+ 
+ protected slots:
+     virtual void languageChange();
diff --git a/media-sound/hydrogen/hydrogen-0.8.2-r1.ebuild b/media-sound/hydrogen/hydrogen-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..3db97eedd9e2
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.8.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.8.2-r1.ebuild,v 1.1 2004/06/18 19:57:01 fvdpol Exp $
+
+inherit eutils
+
+DESCRIPTION="Linux Drum Machine"
+HOMEPAGE="http://hydrogen.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hydrogen/${P}.tar.gz \
+	mirror://sourceforge/hydrogen/3355606.tar.gz \
+	mirror://sourceforge/hydrogen/DrumkitPack1.tar.gz \
+	mirror://sourceforge/hydrogen/DrumkitPack2.tar.gz \
+	mirror://sourceforge/hydrogen/EasternHop-1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="alsa jack"
+
+
+RDEPEND="virtual/x11
+	>=media-libs/audiofile-0.2.3 \
+	alsa? ( media-libs/alsa-lib ) \
+	jack? ( media-sound/jack-audio-connection-kit ) \
+	>=x11-libs/qt-3"
+
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-ui-spacer.patch
+
+	# Drum kits to install
+	local KITS
+	KITS="3355606kit EasternHop-1 HipHop-1 HipHop-2 Synthie-1 TR808909 Techno-1"
+
+	# Grab our drumkits
+	cd ${P}/data/drumkits
+	tar zxf ${WORKDIR}/3355606/3355606kit.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack1/HipHop-1.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack1/HipHop-2.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack2/Synthie-1.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack2/TR808909.h2drumkit
+	tar zxf ${WORKDIR}/DrumkitPack2/Techno-1.h2drumkit
+	tar zxf ${WORKDIR}/EasternHop-1/EasternHop-1.h2drumkit
+
+	# Recurse into drumkit directories
+	sed -ie "s:GMkit:GMkit ${KITS}:" Makefile.am
+
+	# Set up drumkit Makefiles, model after GMkit
+
+	for kit in ${KITS}
+	do
+		cd ${kit}
+		cp ../GMkit/Makefile.* .
+		sed -ie "s:GMkit:${kit}:" Makefile.am
+		sed -i "/AC_CONFIG_FILES(\[ data\\/drumkits\\/GMkit/i\\AC_CONFIG_FILES([ data/drumkits/${kit}/Makefile ])\\" ${S}/configure.in
+		cd ..
+	done
+}
+
+src_compile() {
+	addwrite ${QTDIR}/etc/settings
+
+	einfo "Reconfiguring..."
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.6
+
+	./autogen.sh
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog FAQ README TODO
+}
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index d4ce46c038ab..5118637a85fe 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>torbenh@gentoo.org</email>
+  <email>fvdpol@gentoo.org</email>
 </maintainer>
 </pkgmetadata>