Fixed --as-needed issue with 0.9.0 and 0.9.1, fixed configure script for 0.9.2 and 0.9.3. Took maintainership. Closes bug #132511.

Package-Manager: portage-2203-svn

9 files changed, 110 insertions, 13 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index feee67a7239a..b0c7afc68f79 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,14 @@
 # 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.35 2006/02/23 17:10:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.36 2006/05/07 02:54:50 eldad Exp $
+
+  07 May 2006; Eldad Zack <eldad@gentoo.org>
+  +files/hydrogen-0.9.0-asneeded.patch,
+  +files/hydrogen-0.9.2-configure.in.patch, metadata.xml,
+  hydrogen-0.9.0.ebuild, hydrogen-0.9.1.ebuild, hydrogen-0.9.2.ebuild,
+  hydrogen-0.9.3.ebuild:
+  Fixed --as-needed issue with 0.9.0 and 0.9.1, fixed configure script for
+  0.9.2 and 0.9.3. Took maintainership. Closes bug #132511.
 
 *hydrogen-0.9.3 (23 Feb 2006)
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f3efeedc1c06..3018af9c0102 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,11 +1,23 @@
-MD5 ef5aab3b47298671b72d70c55b597757 ChangeLog 5663
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b0027334569ff91004051922ee01a1a4 ChangeLog 6038
 MD5 6b397bce8176411819610e6b92401be2 files/0.9.1-OSS.patch 995
 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 495c26b0ca0a5699da5846a3e304e781 hydrogen-0.9.0.ebuild 1021
-MD5 72b9e338641b127e6913bc165115495e hydrogen-0.9.1.ebuild 1270
-MD5 562dfd0b2df7c7f189392a0ac9af05cb hydrogen-0.9.2.ebuild 2375
-MD5 af4ea481d5f70c50fec4ba2fa26ffeda hydrogen-0.9.3.ebuild 2355
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0e8d856ad0cf71ff196438ecb24062b0 files/hydrogen-0.9.0-asneeded.patch 1025
+MD5 21654c55d948be825818367aae49597c files/hydrogen-0.9.2-configure.in.patch 1346
+MD5 fea473fcef25faecb98954bbba814d7b hydrogen-0.9.0.ebuild 1112
+MD5 10b1831d7ab2e0688391bc11f2f52101 hydrogen-0.9.1.ebuild 1321
+MD5 d9fc02ee718af6e1dee8be969182a221 hydrogen-0.9.2.ebuild 2451
+MD5 11bce677c6682fa4cd4c84eb6e0406be hydrogen-0.9.3.ebuild 2431
+MD5 958cdff6e2710ee30529dd9af63497de metadata.xml 257
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEXWGLT+MN7JbqCpMRAg7wAJ0fK0bSByOQRJ5mLKgrAvcfC42sYQCffH0p
+QWCVLABu0e7eSSUKevzDoII=
+=5WgA
+-----END PGP SIGNATURE-----
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.0-asneeded.patch b/media-sound/hydrogen/files/hydrogen-0.9.0-asneeded.patch
new file mode 100644
index 000000000000..edad0da12dda
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.0-asneeded.patch
@@ -0,0 +1,22 @@
+--- tools/Makefile.in.orig	2006-05-07 03:14:53.000000000 +0300
++++ tools/Makefile.in	2006-05-07 03:15:51.000000000 +0300
+@@ -249,7 +249,7 @@
+ x_libraries = @x_libraries@
+ INCLUDES = -I../lib $(all_includes)
+ hydrogenPlayer_SOURCES = hydrogenPlayer.cpp
+-hydrogenPlayer_LDADD = ../lib/libhydrogen.a ../lib/xml/libtinyxml.a ../lib/drivers/libdrivers.a ../lib/fx/libfx.a ../lib/smf/libsmf.a
++hydrogenPlayer_LDADD = ../lib/libhydrogen.a ../lib/xml/libtinyxml.a ../lib/drivers/libdrivers.a ../lib/fx/libfx.a ../lib/smf/libsmf.a $(USER_LDFLAGS)
+ hydrogenPlayer_LDFLAGS = -ldl $(all_libraries)
+ #>- all: all-am
+ #>+ 1
+--- hydrogen_gui/Makefile.in.orig	2006-05-07 03:15:59.000000000 +0300
++++ hydrogen_gui/Makefile.in	2006-05-07 03:16:12.000000000 +0300
+@@ -368,7 +368,7 @@
+ 	../lib/drivers/libdrivers.a \
+ 	../lib/fx/libfx.a \
+ 	../lib/smf/libsmf.a \
+-	$(LIB_QPE) $(LIB_QT) $(LIBSOCKET)
++	$(LIB_QPE) $(LIB_QT) $(LIBSOCKET) $(USER_LDFLAGS)
+ 
+ EXTRA_DIST = \
+ 	AudioEngineInfoForm_UI.ui AudioEngineInfoForm.cpp AudioEngineInfoForm.h \
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch b/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch
new file mode 100644
index 000000000000..c06ee8400f8b
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.2-configure.in.patch
@@ -0,0 +1,36 @@
+--- configure.in.orig	2006-05-07 04:59:45.000000000 +0300
++++ configure.in	2006-05-07 05:28:24.000000000 +0300
+@@ -15,8 +15,8 @@
+ -----------------------------------------------------------------
+ 
+ "
+-#ac_qmake_lflags="-static"
+-#AC_SUBST(ac_qmake_lflags)
++ac_qmake_lflags="${LDFLAGS}"
++AC_SUBST(ac_qmake_lflags)
+ 
+ 
+ # static build
+@@ -38,8 +38,9 @@
+ AC_DEFINE_UNQUOTED(CONFIG_PREFIX, ["$ac_prefix"], [Default installation prefix.])
+ 
+ 
+-AC_ARG_ENABLE(profile, [  --enable-profile     enable profile info (default=no)], [useProfile="yes"], [useProfile="no"])
++AC_ARG_ENABLE(profile, [  --enable-profile     enable profile info (default=no)], [useProfile=$enableval])
+ if test "x$useProfile" = "xyes"; then
++	echo " * Profile mode enabled."
+ 	ac_qmake_cflags="-pg"
+ 	ac_qmake_cxxflags="-pg"
+ 	ac_qmake_lflags="-pg"
+@@ -49,9 +50,9 @@
+ fi
+ 
+ dnl Enable debugging argument option.
+-AC_ARG_ENABLE(debug, [  --enable-debug          enable debugging (default=no)], [ac_debug="debug"], [ac_debug="release"])
++AC_ARG_ENABLE(debug, [  --enable-debug          enable debugging (default=no)], [debug_enabled=$enableval])
+ AC_SUBST(ac_debug)
+-if test "x$ac_debug" = "xdebug"; then
++if test "x$ac_debug" = "xyes"; then
+ 	AC_DEFINE(CONFIG_DEBUG, 1, [Define if debugging is enabled.])
+ 	features_list="${features_list} (Debug)"
+ 	echo " * Debug mode enabled."
diff --git a/media-sound/hydrogen/hydrogen-0.9.0.ebuild b/media-sound/hydrogen/hydrogen-0.9.0.ebuild
index 1c5293fd2bea..4d48f6b75bcd 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-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.0.ebuild,v 1.11 2006/01/07 17:20:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.0.ebuild,v 1.12 2006/05/07 02:54:50 eldad Exp $
 
 inherit eutils kde-functions
 
@@ -21,6 +21,13 @@ DEPEND=">=media-libs/libsndfile-1.0.0
 	ladspa? ( media-libs/liblrdf )"
 need-qt 3
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/hydrogen-0.9.0-asneeded.patch
+}
+
+
 src_compile() {
 	need-autoconf 2.5
 	econf $(use_enable jack jack-support) \
diff --git a/media-sound/hydrogen/hydrogen-0.9.1.ebuild b/media-sound/hydrogen/hydrogen-0.9.1.ebuild
index 60d9d2c3de1f..66e88afbf4e5 100644
--- a/media-sound/hydrogen/hydrogen-0.9.1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.1.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.1.ebuild,v 1.5 2006/01/07 17:20:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.1.ebuild,v 1.6 2006/05/07 02:54:50 eldad Exp $
 
 inherit eutils kde-functions
 
@@ -28,6 +28,8 @@ src_unpack() {
 	if use ppc; then
 		epatch ${FILESDIR}/${PV}-OSS.patch
 	fi
+
+	epatch ${FILESDIR}/hydrogen-0.9.0-asneeded.patch
 }
 
 src_compile() {
diff --git a/media-sound/hydrogen/hydrogen-0.9.2.ebuild b/media-sound/hydrogen/hydrogen-0.9.2.ebuild
index a853f799bd20..a5923ad2b46d 100644
--- a/media-sound/hydrogen/hydrogen-0.9.2.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.2.ebuild
@@ -1,8 +1,8 @@
 # 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.2.ebuild,v 1.1 2006/01/07 17:20:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.2.ebuild,v 1.2 2006/05/07 02:54:50 eldad Exp $
 
-inherit eutils kde-functions
+inherit eutils kde-functions autotools
 
 DESCRIPTION="Linux Drum Machine"
 HOMEPAGE="http://hydrogen.sourceforge.net/"
@@ -40,6 +40,8 @@ src_unpack() {
 		-e "s:pm_linux:lib:g" -e "s:pm_common:include:g" \
 		-i configure.in
 	make -f Makefile.cvs
+
+	epatch ${FILESDIR}/hydrogen-0.9.2-configure.in.patch
 }
 
 src_compile() {
@@ -56,6 +58,7 @@ src_compile() {
 			$(use_enable ladspa lrdf-support) \
 			$(use_enable oss oss-support)"
 
+	eautoconf
 	econf ${myconf} || die "Failed configuring hydrogen!"
 	emake || die "Failed making hydrogen!"
 }
diff --git a/media-sound/hydrogen/hydrogen-0.9.3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
index a5cc9080de46..10f7f4e4a773 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2006/02/23 17:10:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.2 2006/05/07 02:54:50 eldad Exp $
 
-inherit eutils kde-functions
+inherit eutils kde-functions autotools
 
 DESCRIPTION="Linux Drum Machine"
 HOMEPAGE="http://hydrogen.sourceforge.net/"
@@ -41,6 +41,8 @@ src_unpack() {
 		-e "s:pm_linux:lib:g" -e "s:pm_common:include:g" \
 		-i configure.in
 	make -f Makefile.cvs
+
+	epatch ${FILESDIR}/hydrogen-0.9.2-configure.in.patch
 }
 
 src_compile() {
@@ -57,6 +59,7 @@ src_compile() {
 			$(use_enable ladspa lrdf-support) \
 			$(use_enable oss oss-support)"
 
+	eautoconf
 	econf ${myconf} || die "Failed configuring hydrogen!"
 	emake || die "Failed making hydrogen!"
 }
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index e1774e3d9ad7..5ea9bf880470 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<maintainer>
+        <email>eldad@gentoo.org</email>
+        <name>Eldad Zack</name>
+</maintainer>
 </pkgmetadata>