new upstream version, fixes #72986. updated maintainer information, chriswhite is retired. did some cleanup.

(Portage version: 2.0.51.19)

12 files changed, 57 insertions, 252 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index dcd3fa1862a6..7acdf9d8fe3f 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.29 2005/04/05 23:28:35 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.30 2005/04/11 13:55:30 luckyduck Exp $
+
+*hydrogen-0.9.1 (11 Apr 2005)
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -files/hydrogen-0.8.2-64bit.patch, -files/hydrogen-0.8.2-gcc34.patch,
+  -files/hydrogen-0.8.2-ui-spacer.patch,
+  -files/hydrogen-0.9.0_beta1-math.patch, -hydrogen-0.8.2-r4.ebuild,
+  +hydrogen-0.9.1.ebuild:
+  new upstream version, fixes #72986. updated maintainer information, chriswhite
+  is retired. did some cleanup.
 
   05 Apr 2005; Eric Shattow <jnc@gentoo.org> hydrogen-0.9.0.ebuild:
   Depend on libsndfile. Closes #88053
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index ad1cb0a75edf..72b2ca38bb7e 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 35c7681c9ae2f0fbf070b74b6a8c9270 ChangeLog 4412
-MD5 3e71292cbc41d18eb48605e620e76d09 hydrogen-0.8.2-r4.ebuild 3002
-MD5 5042cec54dffe0ecd8657c1cce08965e hydrogen-0.9.0.ebuild 1060
-MD5 4e5a50f7aee667b932576ab7fdcfc85f metadata.xml 219
-MD5 0aeb17f8b89b3d73dde268e756c16a2c files/digest-hydrogen-0.8.2-r4 575
+MD5 13f01a3eb79968c40815b84b7a210ab7 hydrogen-0.9.1.ebuild 1063
+MD5 7b4f2371e5557ac9eb10cb8e728c8bdf hydrogen-0.9.0.ebuild 1037
+MD5 4eb89df59197066f4f7f99b278336f6f ChangeLog 4831
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 1755f7143c139eddaed591c6ea39e695 files/digest-hydrogen-0.9.0 67
-MD5 a3d08a6bb459e313c2c59a5ad086eaea files/hydrogen-0.8.2-64bit.patch 1319
-MD5 edc486e93c7644938917e65e83e56e71 files/hydrogen-0.8.2-gcc34.patch 495
-MD5 7d42c8a8bb26e478ec8e9e835ea733b5 files/hydrogen-0.8.2-ui-spacer.patch 1902
-MD5 d577302a6cccb9cd150804bf1b3a96e2 files/hydrogen-0.9.0_beta1-math.patch 474
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCUyCs+uC/ViVka/0RAhvJAJ9HlNEGgK/LLrXom81mip98dCeAKwCffum1
-LwN6BzVc+sMBeoluUC1QJg4=
-=t4Go
------END PGP SIGNATURE-----
+MD5 c2de54ec169afbb90c9eaa6440bafed5 files/digest-hydrogen-0.9.1 67
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r4 b/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r4
deleted file mode 100644
index ee05cff65158..000000000000
--- a/media-sound/hydrogen/files/digest-hydrogen-0.8.2-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-MD5 2ccaed2a392a97143f31f52488fdde74 TD-7.tar.gz 873711
-MD5 ee0974b404d34a2c5cf3d8f3952a80e9 UltraAcousticKit.tar.gz 1874932
-MD5 8a573ea8040aa8ee3dacfcb3d3fc4ab8 Millo-Drums_v1.tar.gz 2650633
-MD5 bc2bcc16d404441ef3a5b1b86c6c4a25 HardElectro1.tar.gz 390222
diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.1 b/media-sound/hydrogen/files/digest-hydrogen-0.9.1
new file mode 100644
index 000000000000..291790581427
--- /dev/null
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.1
@@ -0,0 +1 @@
+MD5 3c2b1db257f126f6d6f97e75a3d18ace hydrogen-0.9.1.tar.gz 2317184
diff --git a/media-sound/hydrogen/files/hydrogen-0.8.2-64bit.patch b/media-sound/hydrogen/files/hydrogen-0.8.2-64bit.patch
deleted file mode 100644
index 2db2ea928f59..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.8.2-64bit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru hydrogen-0.8.2-orig/lib/DiskWriterDriver.cpp hydrogen-0.8.2/lib/DiskWriterDriver.cpp
---- hydrogen-0.8.2-orig/lib/DiskWriterDriver.cpp	2004-06-18 20:19:14.803571648 +0200
-+++ hydrogen-0.8.2/lib/DiskWriterDriver.cpp	2004-06-18 20:21:58.474689856 +0200
-@@ -75,9 +75,9 @@
- 
- 	afFreeFileSetup(outputSetup);
- 
--#if defined(i386) || defined(alpha)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- 	afSetVirtualByteOrder(outputFile, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
--#else
-+#elif __BYTE_ORDER == __BIG_ENDIAN
- 	afSetVirtualByteOrder(outputFile, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN);
- #endif
- 
-Only in hydrogen-0.8.2/lib: DiskWriterDriver.cpp~
-diff -ru hydrogen-0.8.2-orig/lib/Sample.cpp hydrogen-0.8.2/lib/Sample.cpp
---- hydrogen-0.8.2-orig/lib/Sample.cpp	2004-06-18 20:19:14.806571192 +0200
-+++ hydrogen-0.8.2/lib/Sample.cpp	2004-06-18 20:22:58.517561952 +0200
-@@ -143,9 +143,9 @@
- 	int samplewidth;
- 	afGetSampleFormat(samplefile, AF_DEFAULT_TRACK, &sampleformat, &samplewidth);
- 
--#if defined(i386) || defined(alpha)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- 	afSetVirtualByteOrder(samplefile, AF_DEFAULT_TRACK, AF_BYTEORDER_LITTLEENDIAN);
--#else
-+#elif __BYTE_ORDER == __BIG_ENDIAN
- 	afSetVirtualByteOrder(samplefile, AF_DEFAULT_TRACK, AF_BYTEORDER_BIGENDIAN);
- #endif
- 
-Only in hydrogen-0.8.2/lib: Sample.cpp~
diff --git a/media-sound/hydrogen/files/hydrogen-0.8.2-gcc34.patch b/media-sound/hydrogen/files/hydrogen-0.8.2-gcc34.patch
deleted file mode 100644
index abe84bda90c2..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.8.2-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru hydrogen-0.8.2-orig/lib/Hydrogen.cpp hydrogen-0.8.2/lib/Hydrogen.cpp
---- hydrogen-0.8.2-orig/lib/Hydrogen.cpp	2004-07-01 10:11:27.644571768 +0200
-+++ hydrogen-0.8.2/lib/Hydrogen.cpp	2004-07-01 10:13:53.642376728 +0200
-@@ -2502,7 +2502,7 @@
- 
- 	float fBPM = 60000.0 / fInterval;
- 
--	if ( abs(fOldBpm1 - fBPM) > 20 ) {	// troppa differenza, niente media
-+	if ( fabsf(fOldBpm1 - fBPM) > 20 ) {	// troppa differenza, niente media
- 		fOldBpm1 = fBPM;
- 		fOldBpm2 = fBPM;
- 		fOldBpm3 = fBPM;
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
deleted file mode 100644
index 784f1f54b255..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.8.2-ui-spacer.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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/files/hydrogen-0.9.0_beta1-math.patch b/media-sound/hydrogen/files/hydrogen-0.9.0_beta1-math.patch
deleted file mode 100644
index c7999c9876ec..000000000000
--- a/media-sound/hydrogen/files/hydrogen-0.9.0_beta1-math.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru hydrogen-0.9.0beta1-orig/hydrogen_gui/InstrumentPropertiesDialog.cpp hydrogen-0.9.0beta1/hydrogen_gui/InstrumentPropertiesDialog.cpp
---- hydrogen-0.9.0beta1-orig/hydrogen_gui/InstrumentPropertiesDialog.cpp	2004-08-18 03:41:32.296463024 +0200
-+++ hydrogen-0.9.0beta1/hydrogen_gui/InstrumentPropertiesDialog.cpp	2004-08-18 03:44:07.291900136 +0200
-@@ -22,6 +22,8 @@
-  *
-  */
- 
-+#include <math.h>
-+
- #include "InstrumentPropertiesDialog.h"
- #include "FilePreview.h"
- 
diff --git a/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild b/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild
deleted file mode 100644
index 8ab4e84a2dcc..000000000000
--- a/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.8.2-r4.ebuild,v 1.4 2005/01/03 09:37:57 corsair Exp $
-
-IUSE="alsa jack"
-
-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 \
-	mirror://sourceforge/hydrogen/TD-7.tar.gz \
-	mirror://sourceforge/hydrogen/UltraAcousticKit.tar.gz \
-	mirror://sourceforge/hydrogen/Millo-Drums_v1.tar.gz \
-	mirror://sourceforge/hydrogen/HardElectro1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
-
-RDEPEND=">=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
-	epatch ${FILESDIR}/${P}-64bit.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
-
-	# unpack drum kits
-	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
-	tar zxf ${WORKDIR}/EasternHop-1/EasternHop-1.h2drumkit
-	tar zxf ${WORKDIR}/TD-7/TD-7kit.h2drumkit
-	tar zxf ${WORKDIR}/UltraAcousticKit/UltraAcousticKit.h2drumkit
-	tar zxf ${WORKDIR}/Millo-Drums_v1/Millo-Drums_v.1.h2drumkit
-	tar zxf ${WORKDIR}/HardElectro1/HardElectro1.h2drumkit
-
-	# unpack demo songs
-	# (note that some songs are disabled due to incompatibility with this (newer?) version of hydrogen...)
-	cd ../demo_songs
-	#cp ${WORKDIR}/3355606/*.h2song .
-	#cp ${WORKDIR}/DrumkitPack1/*.h2song .
-	#cp ${WORKDIR}/DrumkitPack2/*.h2song .
-	#cp ${WORKDIR}/EasternHop-1/*.h2song .
-	#cp ${WORKDIR}/TD-7/*.h2song .
-	cp ${WORKDIR}/UltraAcousticKit/*.h2song .
-	cp ${WORKDIR}/Millo-Drums_v1/demo\ songs/*.h2song .
-	cp ${WORKDIR}/HardElectro1/*.h2song .
-
-	# fix file paths
-	for SONG in `ls *.h2song`; do
-		sed -i -e "s:/usr/local/share:/usr/share:" ${SONG}
-	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() {
-	local SUPPORTDIR=/usr/share/hydrogen
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README TODO
-
-	# install demo songs
-	insinto ${SUPPORTDIR}/data/demo_songs
-	doins data/demo_songs/*
-
-	# install drum kits
-	for KIT in `find data/drumkits -type d`; do
-		insinto ${SUPPORTDIR}/${KIT}
-		doins ${KIT}/*.xml
-		doins ${KIT}/*.wav
-	done
-}
diff --git a/media-sound/hydrogen/hydrogen-0.9.0.ebuild b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
index 7559fff444ab..c18c5c7464ba 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-2005 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.8 2005/04/05 23:28:35 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.9 2005/04/11 13:55:30 luckyduck Exp $
 
 IUSE="alsa jack ladspa"
 
@@ -18,7 +18,6 @@ KEYWORDS="amd64 ~ppc sparc x86 ppc64"
 
 DEPEND=">=media-libs/libsndfile-1.0.0
 	alsa? ( media-libs/alsa-lib )
-	media-libs/libsndfile
 	>=media-libs/audiofile-0.2.3
 	>=media-libs/flac-1
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/hydrogen/hydrogen-0.9.1.ebuild b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
new file mode 100644
index 000000000000..e9ed8a76f2e8
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 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.1 2005/04/11 13:55:30 luckyduck Exp $
+
+IUSE="alsa jack ladspa"
+
+inherit eutils kde-functions
+
+need-qt 3
+
+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 ~sparc ~x86 ~ppc64"
+
+DEPEND=">=media-libs/libsndfile-1.0.0
+	alsa? ( media-libs/alsa-lib )
+	>=media-libs/audiofile-0.2.3
+	>=media-libs/flac-1
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )
+	>=x11-libs/qt-3"
+
+src_compile() {
+	need-autoconf 2.5
+	econf $(use_enable jack jack-support) \
+	      $(use_enable alsa alsa-seq) \
+	      $(use_enable ladspa lrdf-support) \
+	      || die "Failed configuring hydrogen!"
+	emake || die "Failed making hydrogen!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index 1e8035259e42..e1774e3d9ad7 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
-<maintainer>
-  <email>sound@gentoo.org</email>
-</maintainer>
 </pkgmetadata>