Remove usage of kde-functions.eclass; clean up ebuild a bit

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 29 insertions, 19 deletions

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index 9c6cae531c0f..d071e9baeb9e 100644
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/hydrogen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.88 2010/01/07 19:43:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.89 2010/01/11 18:50:00 abcd Exp $
+
+  11 Jan 2010; Jonathan Callen <abcd@gentoo.org> hydrogen-0.9.3-r4.ebuild:
+  Remove usage of kde-functions.eclass; clean up ebuild a bit
 
   07 Jan 2010; Brent Baude <ranger@gentoo.org> hydrogen-0.9.4.ebuild:
   Marking hydrogen-0.9.4 ppc for bug 298363
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 3af4ed20b5ef..94715d9bea7d 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,3 +1,6 @@
+-----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,7 +12,14 @@ AUX hydrogen-0.9.3-gcc43noalsa.patch 346 RMD160 99b3b287b912a207b834a49b39a7e004
 AUX hydrogen-0.9.3-gcc44.patch 602 RMD160 ff3690e5c5f9b783dd32b492f90766a3a36d1d92 SHA1 5cee2166883948a09ed3b4c77d0343d6b132edec SHA256 323287db15751c3846825871c37bfa06de7c754f20afa2c9cec7b0e3330a5c13
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
 DIST hydrogen-0.9.4.tar.gz 3808532 RMD160 9f1514462eaa756fe0a3e8fed3ff647a32ad033d SHA1 e988710f82af858c0c688cb1d1e19d789fca49ef SHA256 982b768b48e8402104949c64fac4d74d804f41b6ab1b90457711840da99685d7
-EBUILD hydrogen-0.9.3-r4.ebuild 2943 RMD160 8934d8c894557c1580fb157f7c2454ce61af888d SHA1 0cf609e3d9d2060147976405a90b16df4eb1ca35 SHA256 c1a069bc9c5a8aa27572c23facb983be0b4cef69493d1739c509dae58351f34c
+EBUILD hydrogen-0.9.3-r4.ebuild 2834 RMD160 7132f7af754d88d707f548feff72d232ee944fdf SHA1 17279ead3384d99b27b2fa55a05a111e740135ac SHA256 1e5d9ae93d13d02498894c80e25da70376b59b5d127f6c64475733fe31ec6122
 EBUILD hydrogen-0.9.4.ebuild 1506 RMD160 804e2b1e12679eafc26c3010299bf99d8501714e SHA1 175d06ddb9483d350577c798cbab90d62b26ffd3 SHA256 be06ec7ffd4c290459c19674e399b43ac2b07057535eaee28f2ebbf67551fd73
-MISC ChangeLog 13622 RMD160 5340b9752a9106652cf4a2677dd0da32a3933d3e SHA1 79be8fb3052d7bb3623ed6e15df1c415e41d3b06 SHA256 02e4119c96cf91234c42b0be2e86fdb46c59b1011ab7599da958dab8afa796e9
+MISC ChangeLog 13758 RMD160 198990b2c04b2aa03909b3ba107f1294d0b3cd0c SHA1 92292b6a726931cbc4f9676c02c3d364dc25c3b0 SHA256 a402989053286a2cc004d8e2ffbbedfe3969797d442b0da76b7617400a878217
 MISC metadata.xml 163 RMD160 c2b208c0913f8c5bd1148627b5c3c9e37b53060a SHA1 4195ac5ca8352b0f52be6ed92640e4365be5bf0d SHA256 39a67c65d2e7583b6ee9e20fcab1fd821e28c51134eb2f76a7fe0598a2c2b4cb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktLct4ACgkQOypDUo0oQOpFawCgoZewhmOTlCaahG9DfS3sLdS0
+eC0AoJ52EAeot8MvCqDRKyRfbBaSI3o2
+=L8Q2
+-----END PGP SIGNATURE-----
diff --git a/media-sound/hydrogen/hydrogen-0.9.3-r4.ebuild b/media-sound/hydrogen/hydrogen-0.9.3-r4.ebuild
index 410d513c771f..e2315a7bf999 100644
--- a/media-sound/hydrogen/hydrogen-0.9.3-r4.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r4.ebuild,v 1.10 2009/12/27 09:34:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3-r4.ebuild,v 1.11 2010/01/11 18:50:00 abcd Exp $
 
 EAPI=2
 
-inherit eutils kde-functions autotools multilib
+inherit eutils autotools multilib
 
 DESCRIPTION="Linux Drum Machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
@@ -18,6 +18,7 @@ IUSE="alsa debug doc +flac jack ladspa oss"
 RDEPEND="dev-libs/libxml2
 	media-libs/libsndfile
 	media-libs/audiofile
+	x11-libs/qt:3
 	flac? ( media-libs/flac[cxx] )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
@@ -26,12 +27,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/docbook-sgml-utils )
 	dev-util/pkgconfig"
 
-need-qt 3
-
 src_prepare() {
 	if use ppc; then
 		cd "${S}/src"
-		epatch "${FILESDIR}/0.9.1-OSS.patch" || die "patching failed"
+		epatch "${FILESDIR}/0.9.1-OSS.patch"
 	fi
 	cd "${S}"
 
@@ -60,16 +59,14 @@ src_configure() {
 	# 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!"
+	econf $(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)
 }
 
 src_compile() {