[proaudio] [2790] media-sound/fluidsynth: updated repo uri, EAPI 5, cmake-utils eclass , oss flag removed, double flag replaced with float flag"

[subversion@xxxxxxxxxxxxx]

Revision: 2790
Author:   lilrc
Date:     2013-09-05 20:31:26 +0200 (Thu, 05 Sep 2013)
Log Message:
-----------
media-sound/fluidsynth: updated repo uri, EAPI 5, cmake-utils eclass, oss flag removed, double flag replaced with float flag"	

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/fluidsynth/ChangeLog
    trunk/overlays/proaudio/media-sound/fluidsynth/Manifest
    trunk/overlays/proaudio/media-sound/fluidsynth/fluidsynth-9999.ebuild
    trunk/overlays/proaudio/media-sound/fluidsynth/metadata.xml

Modified: trunk/overlays/proaudio/media-sound/fluidsynth/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/fluidsynth/ChangeLog	2013-08-11 13:28:52 UTC (rev 2789)
+++ trunk/overlays/proaudio/media-sound/fluidsynth/ChangeLog	2013-09-05 18:31:26 UTC (rev 2790)
@@ -1,7 +1,16 @@
 # ChangeLog for media-sound/fluidsynth
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Sep 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  fluidsynth-9999.ebuild, metadata.xml:
+  EAPI 5.
+  Updated repository URI.
+  The autotools build system has been made deprecated upstream, so the 
+  CMake build system is used instead.
+  oss USE flag removed.
+  double USE flag replaced with float (this is what upstream uses).
+
   13 Dec 2012; Karl Lindén <lilrc@xxxxxxxxxxxxxxxxxxxxx>
   fluidsynth-9999.ebuild:
   replaced dependency on media-sound/lash with virtual/liblash

Modified: trunk/overlays/proaudio/media-sound/fluidsynth/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/fluidsynth/Manifest	2013-08-11 13:28:52 UTC (rev 2789)
+++ trunk/overlays/proaudio/media-sound/fluidsynth/Manifest	2013-09-05 18:31:26 UTC (rev 2790)
@@ -1,3 +1,3 @@
-EBUILD fluidsynth-9999.ebuild 1919 SHA256 7ca446c1eb8d4d24b41f28e25d4b58daf68c2b10621581a90cf9f2b9492d2380 SHA512 9fc0952c915136d2a0e204575b4ab3c88d8e878903046d066bdff1296fedab1ff0db3d3c3e67409c18c2c4ef0145b9aab39cf0dfb9dfc9d19078e0d05b01301b WHIRLPOOL 5c349d72748459e7e2d5741d6bf88f54b1c137a68905276240e8c0829e42e42bb00def32c22e2ea4611e56d59cdd5553b8d351d1ca1c867dd7bd77309b57a6dd
-MISC ChangeLog 838 SHA256 0d83a3fdea5d565ec1752c0b618afe01f6c0360d321b6b9fc6d2779dbb73afd6 SHA512 ff43996d74ad890c9f5ff91862a6babc2d778c2c2fce2845181f6a6b890bda127f0806957614891ebd1decc1897e1872f0769f8d2a64dabd997bfbbf483a7a00 WHIRLPOOL 7adfb1bf4a9354f93b4d5e87197926bdf6bf9e9104fdd475f08376f886a367249c4ae8936321a60000287c4647cdfbf82f9e2b1ccaf6d639ae39ab67e696cdae
-MISC metadata.xml 348 SHA256 7b77453a9bb2c2f5cabf99550591c575c06a1b916c621f2123c9d7fffe4d15c6 SHA512 817538f5952a2bb2aa0075df61f9c8b61c8f09be69d353241b1e032bbe2e897f3516e291adbb452d0114e20e8225301b00cf18ce8b329f329cb1fad03f753a73 WHIRLPOOL 6d8b5c5849b9958f0b807bef526ae1e7f9e9e0019a6d929ddd136c37488e2aa4c8174fb7021799bacb9354b44e402c12a6a120afb95b06922aac7cfccce98480
+EBUILD fluidsynth-9999.ebuild 1805 SHA256 491fcfe8520aec29d39749dbc2a425f3a6749785dd6593ecb02413f116332720 SHA512 8444fde5f045fe201347d08dde141d1e27ad201c30615f38f60edcd9f74df3203cf6ff3a86c617779ebae4c6fc96e2e61d9f2fe8da26dd202bfa02237c58f2d2 WHIRLPOOL b25c363e452634479908156a64c2c7b8cb094bc6d62fe36fb12148e5783471984e84e20ad6abd8382a547618ffa6a02a70a0de0db1fafd9250ceec8b7376e5c2
+MISC ChangeLog 1182 SHA256 188e1576f6b37cfceb570ffc9a0cfd380405c4df0363d03143f9c72c9c5c564d SHA512 05d6fa467cf5d169827382c91346c9c2404b541c5b7fa2abe5a629cd4378a5e35752b586d108b0c5306a2ec2df8a77abd3a938ff05d57b334188e03f83efe909 WHIRLPOOL a1e5c116f6bba37793c510d58659e72845cb2e8cc12b69f6b0207da54fef8c88a59efc8602f3b04872a82276405f5afb50ef9cf63bfd7a9f8f360e86d61837fc
+MISC metadata.xml 341 SHA256 902fc79dbe0f6d956f053a46b731d0e9bab37c6738f39349fdbc0574bc86eb25 SHA512 13826041bf9dc5051cb77c6010ae69ef9d9b1d9ff07869af0836791be7db0dc1003940c242b74a7826dd1dd76c650611f48597a73191aa294f10041b71074411 WHIRLPOOL 495068a92a926a30b8e6f4b818751e5eb892f270f30058455f41c0272fdee02f1e0fec3aea2f0b86d24dc00f8e2078a2918602fbed81b3d8e76b181ed7e39119

Modified: trunk/overlays/proaudio/media-sound/fluidsynth/fluidsynth-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/fluidsynth/fluidsynth-9999.ebuild	2013-08-11 13:28:52 UTC (rev 2789)
+++ trunk/overlays/proaudio/media-sound/fluidsynth/fluidsynth-9999.ebuild	2013-09-05 18:31:26 UTC (rev 2790)
@@ -1,15 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-inherit autotools subversion
+EAPI="5"
+inherit cmake-utils subversion
 
-IUSE="alsa dbus debug doc double jack ladspa lash oss portaudio pulseaudio readline sndfile"
+IUSE="alsa dbus debug doc float jack ladspa lash portaudio pulseaudio \
+	readline sndfile"
 
 DESCRIPTION="Fluidsynth is a software real-time synthesizer based on the Soundfont 2 specifications."
 HOMEPAGE="http://www.fluidsynth.org/";
-ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk/${PN}";
+ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,65 +18,58 @@
 
 RDEPEND="
 	>=dev-libs/glib-2.6.5
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
 	jack? ( media-sound/jack-audio-connection-kit )
 	ladspa? ( >=media-libs/ladspa-sdk-1.12
-		  >=media-libs/ladspa-cmt-1.15 )
-	alsa? ( media-libs/alsa-lib
-		lash? ( virtual/liblash ) )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
+		>=media-libs/ladspa-cmt-1.15 )
+	lash? ( virtual/liblash )
 	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
 	readline? ( sys-libs/readline )
-	dbus? ( sys-apps/dbus )
 	sndfile? ( media-libs/libsndfile )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-pkg_setup() {
-	if use lash && ! use alsa; then
-		ewarn "ALSA support is required for lash support to be enabled."
-		ewarn "Continuing with lash support disabled."
+DOCS=( AUTHORS README THANKS TODO )
+
+# Convenience function needed because the build system is not very
+# standardized.
+# Usage: fluid_use() <USE-flag> [flag name]
+fluid_use() {
+	[[ -z ${1} ]] && die "enable_arg(): too few arguments"
+	if [[ ! -z ${2} ]]; then
+		echo "-Denable-${2}=$(usex ${1} on off)"
+	else
+		echo "-Denable-${1}=$(usex ${1} on off)"
 	fi
 }
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
-	local myopts=""
+	local mycmakeargs=(
+		$(fluid_use alsa)
+		$(fluid_use dbus)
+		$(fluid_use debug)
+		$(fluid_use float floats)
+		$(fluid_use jack)
+		$(fluid_use ladspa)
+		$(fluid_use lash)
+		$(fluid_use portaudio)
+		$(fluid_use pulseaudio)
+		$(fluid_use readline)
+		$(fluid_use sndfile libsndfile)
+	)
 
-	if use alsa; then
-		myopts="$(use_enable lash)"
-	else
-		myopts="--disable-lash"
-	fi
-
-	myopts+="
-	$(use_enable double)
-	$(use_enable ladspa)
-	$(use_enable debug)
-	$(use_enable sndfile libsndfile-support)
-	$(use_enable pulseaudio pulse-support)
-	$(use_enable alsa alsa-support)
-	$(use_enable portaudio portaudio-support)
-	$(use_enable jack jack-support)
-	$(use_with readline)
-	$(use_enable dbus dbus-support)"
-
-	econf $myopts
+	cmake-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install"
-	dodoc AUTHORS NEWS README THANKS TODO doc/*.txt
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/*.pdf
-
 	if use doc; then
-		cd doc
-		make doxygen
-		insinto /usr/share/doc/${PF}/html
-		doins api/html/*
+		cd "${BUILD_DIR}"
+		emake doxygen
+		HTML_DOCS=( "${BUILD_DIR}"/doc/api/html/ )
 	fi
+
+	cmake-utils_src_install
 }

Modified: trunk/overlays/proaudio/media-sound/fluidsynth/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/fluidsynth/metadata.xml	2013-08-11 13:28:52 UTC (rev 2789)
+++ trunk/overlays/proaudio/media-sound/fluidsynth/metadata.xml	2013-09-05 18:31:26 UTC (rev 2790)
@@ -6,6 +6,6 @@
 		<name>pro-audio overlay team</name>
 	</maintainer>
 	<use>
-		<flag name="double">Enable type double float instead of float for DSP samples</flag>
+		<flag name="float">Enable type float instead of double for DSP samples</flag>
 	</use>
 </pkgmetadata>