Drop support for media-sound/fluidsynth[oss]. Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key )

5 files changed, 14 insertions, 149 deletions

diff --git a/media-sound/qsynth/ChangeLog b/media-sound/qsynth/ChangeLog
index 8247d99bcf22..cf7fc7f51b7d 100644
--- a/media-sound/qsynth/ChangeLog
+++ b/media-sound/qsynth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qsynth
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.61 2015/03/26 13:31:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.62 2015/03/30 18:36:06 mrueg Exp $
+
+  30 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -qsynth-0.3.7.ebuild,
+  -qsynth-0.3.8.ebuild, qsynth-0.3.6.ebuild, qsynth-0.3.9.ebuild:
+  Drop support for media-sound/fluidsynth[oss]. Remove old.
 
 *qsynth-0.3.9 (26 Mar 2015)
 
diff --git a/media-sound/qsynth/qsynth-0.3.6.ebuild b/media-sound/qsynth/qsynth-0.3.6.ebuild
index 03ffeda63e29..cb6c036e2e4b 100644
--- a/media-sound/qsynth/qsynth-0.3.6.ebuild
+++ b/media-sound/qsynth/qsynth-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.6.ebuild,v 1.8 2013/03/02 22:01:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.6.ebuild,v 1.9 2015/03/30 18:36:06 mrueg Exp $
 
 EAPI=4
 LANGS="cs de es ru"
@@ -19,10 +19,11 @@ KEYWORDS="amd64 ppc x86"
 DEPEND=">=dev-qt/qtcore-4.2:4
 	>=dev-qt/qtgui-4.2:4
 	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11
-	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
+	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
 DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
 
 src_prepare() {
diff --git a/media-sound/qsynth/qsynth-0.3.7.ebuild b/media-sound/qsynth/qsynth-0.3.7.ebuild
deleted file mode 100644
index 37fae7d0dd3e..000000000000
--- a/media-sound/qsynth/qsynth-0.3.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.7.ebuild,v 1.1 2013/04/17 18:34:24 aballier Exp $
-
-EAPI=4
-LANGS="cs de es ru"
-
-inherit qt4-r2 eutils flag-o-matic
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-qt/qtcore-4.2:4
-	>=dev-qt/qtgui-4.2:4
-	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11
-	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_prepare() {
-	sed -e '/@install/,/share\/locale$/d' -i Makefile.in || die "sed translations failed"
-
-	sed -e 's/@make/@\$(MAKE)/' -i Makefile.in || die "sed Makefile failed"
-
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	# Stupidly, qsynth's configure does *not* use pkg-config to
-	# discover the presence of Qt4, but uses fixed paths; as they
-	# don't really work that well for our case, let's just use this
-	# nasty hack and be done with it. *NOTE*: this hinders
-	# cross-compile.
-	append-flags -I/usr/include/qt4
-	append-ldflags -L/usr/$(get_libdir)/qt4
-
-	econf \
-		$(use_enable debug)
-	eqmake4 "${PN}.pro" -o "${PN}.mak"
-}
-
-src_compile() {
-	lupdate "${PN}.pro" || die "lupdate failed"
-	qt4-r2_src_compile
-}
-
-src_install () {
-	qt4-r2_src_install
-
-	insinto /usr/share/locale
-	local lang
-	for lang in ${LANGS} ; do
-		if use linguas_${lang} ; then
-			doins "src/translations/${PN}_${lang}.qm"
-		fi
-	done
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm -rf "${D}/usr/share/applications/qsynth.desktop"
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.3.8.ebuild b/media-sound/qsynth/qsynth-0.3.8.ebuild
deleted file mode 100644
index 5b9372dd18e9..000000000000
--- a/media-sound/qsynth/qsynth-0.3.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.8.ebuild,v 1.1 2014/01/18 12:35:37 aballier Exp $
-
-EAPI=4
-LANGS="cs de es fr ru sr"
-
-inherit qt4-r2 eutils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-qt/qtcore-4.2:4
-	>=dev-qt/qtgui-4.2:4
-	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11
-	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_configure() {
-	econf \
-		$(use_enable debug)
-
-	eqmake4 "${PN}.pro" -o "${PN}.mak"
-}
-
-src_compile() {
-	lupdate "${PN}.pro" || die "lupdate failed"
-	qt4-r2_src_compile
-}
-
-src_install () {
-	qt4-r2_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm -rf "${D}/usr/share/applications/qsynth.desktop"
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.3.9.ebuild b/media-sound/qsynth/qsynth-0.3.9.ebuild
index a16f464bfacd..34a8335f6f1a 100644
--- a/media-sound/qsynth/qsynth-0.3.9.ebuild
+++ b/media-sound/qsynth/qsynth-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.9.ebuild,v 1.1 2015/03/26 13:31:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.9.ebuild,v 1.2 2015/03/30 18:36:06 mrueg Exp $
 
 EAPI=5
 LANGS="cs de fr ru sr"
@@ -19,10 +19,11 @@ KEYWORDS="~amd64 ~ppc ~x86"
 DEPEND=">=dev-qt/qtcore-4.2:4
 	>=dev-qt/qtgui-4.2:4
 	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11
-	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
+	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
 DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
 
 src_configure() {