Bump to EAPI=4. Migrate to qt4-r2.eclass. Respect LINGUAS. Patch by kensington in bug 409997. Remove old.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 34 insertions, 194 deletions

diff --git a/media-sound/qsynth/ChangeLog b/media-sound/qsynth/ChangeLog
index b9b45c62e963..f62f5b974290 100644
--- a/media-sound/qsynth/ChangeLog
+++ b/media-sound/qsynth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/qsynth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.54 2012/03/06 14:33:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.55 2012/05/07 10:39:04 yngwin Exp $
+
+  07 May 2012; Ben de Groot <yngwin@gentoo.org> -qsynth-0.3.2.ebuild,
+  -qsynth-0.3.4.ebuild, -qsynth-0.3.5.ebuild, qsynth-0.3.6.ebuild:
+  Bump to EAPI=4. Migrate to qt4-r2.eclass. Respect LINGUAS. Patch by kensington
+  in bug 409997. Remove old.
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> qsynth-0.3.6.ebuild:
   Marking qsynth-0.3.6 ppc for bug 393715
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index e974a902a497..2bb5c1f06a0c 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,10 +1,4 @@
-DIST qsynth-0.3.2.tar.gz 139129 RMD160 982fec5db78bb6fce1bb13326b8ba4f414513a7d SHA1 9344c72eb0a10497e2c42ba176eb2668b4b5a4ca SHA256 d747e6a3a1437580416a218df213624c2020a82bb261ac59d7bcfb821146d236
-DIST qsynth-0.3.4.tar.gz 190655 RMD160 cf3b9327348dbfedc2bca14ad3a7458859870f83 SHA1 ce794fe0efd75b2130049ffbab4268df2dedff39 SHA256 87542acdd2d238d60d1fd26a61157fcdd34c1ce667543f564f31fd027ced8b07
-DIST qsynth-0.3.5.tar.gz 217618 RMD160 4d51dc3b0f82da9534e4e5f1ad469ea30ee7370e SHA1 482960612dbc1ff921ff4e3dc6c61f82b9fb9d83 SHA256 1b120d9ae87f8b4bdab8792e2991ade424b6544a22cf807c22cde5e89c8fa507
 DIST qsynth-0.3.6.tar.gz 223774 RMD160 e29f91d38e324f9859a6ce5a05b7c794311578bf SHA1 dffba1d9125466ae4f6c3e408d2c8d9a6e884f4b SHA256 b5968da98661bac5c9fcc93d3a15851594dfbf3bb7d01ace15fbe8779d53fb3c
-EBUILD qsynth-0.3.2.ebuild 1409 RMD160 97215a1e35774db9c3656be5994713d62b89611c SHA1 dcb304f80373bb151b0fda77a01cd43063aa6d15 SHA256 28195f85b72068ef0b9d204638baaad5bbbc164cd0edf38c7c35fbcbdfdf1608
-EBUILD qsynth-0.3.4.ebuild 1631 RMD160 c8b04f844c50b60d60b9542b06005ba35d99ca15 SHA1 4afd2806f94e2eb066342a932b72d91a53766615 SHA256 9bd6b70d999c8029416ee565af9032adff0dab55b32f3495d3b7244465ec0fe3
-EBUILD qsynth-0.3.5.ebuild 1693 RMD160 c6472875168943e3689300fc20f54345f12a4b66 SHA1 4073c90aeb3ea20f666873ee078675f3ace43a9e SHA256 646c5499cbbdfd669e966a1f12aca77a81c0475b6ad97d2ea4d69999c3281fbc
-EBUILD qsynth-0.3.6.ebuild 1718 RMD160 39d27ef74f8c571219f55f4c32b3276c76b5ee67 SHA1 a522139d37552e69e993a556c2a83a6f0a95d540 SHA256 b192689044bc0d63fcb4f681d2e2e20c029eaa24162459ca5f98bd57acc9932b
-MISC ChangeLog 9551 RMD160 aaebb36d5b2b7c610c4eae8e41f5eccd0c8a8353 SHA1 f7e97a20b4bf443abcb1bdc5d7fad09f3b4c52ac SHA256 ceb858988f21c4bb2ebacb70e445596812f3dcd876d4c513b07e621c87d17da9
+EBUILD qsynth-0.3.6.ebuild 2083 RMD160 2a839f8669572d80dbaba90edeb715958ad5568f SHA1 afed7a1c5741bf89c5e5160c589ce4ff036f3997 SHA256 69b347cdbb2dc9a4bc888b1944747fdeff18e759f45fe212a2144608046372c8
+MISC ChangeLog 9799 RMD160 c73383a9c82e76d5663a11be1c2b9805a83629b7 SHA1 82026bc886a2e19409c08412ea872fcf948b9a63 SHA256 39c804b3797ad54d93ac60a99e86ed8980cd583cc4f2614d78e8bdb214b5b7fa
 MISC metadata.xml 643 RMD160 392f46e6a9607c1f90805225b4afaf21ec2e3c95 SHA1 6147c4982e9d5d57539c65571dd27c892483a960 SHA256 7bb3ca974f3b9456197c4298a283fbb2aa28061cd932a29ea234efe1c61876eb
diff --git a/media-sound/qsynth/qsynth-0.3.2.ebuild b/media-sound/qsynth/qsynth-0.3.2.ebuild
deleted file mode 100644
index 8392974e3667..000000000000
--- a/media-sound/qsynth/qsynth-0.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.2.ebuild,v 1.8 2012/02/05 17:38:35 armin76 Exp $
-
-EAPI=2
-inherit eutils flag-o-matic qt4
-
-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"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa debug jack"
-
-RDEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	>=media-sound/fluidsynth-1.0.7a[alsa?,jack?]"
-DEPEND="${RDEPEND}"
-
-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)
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	# 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 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.4.ebuild b/media-sound/qsynth/qsynth-0.3.4.ebuild
deleted file mode 100644
index 5279d5b32655..000000000000
--- a/media-sound/qsynth/qsynth-0.3.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.4.ebuild,v 1.3 2012/02/05 17:38:35 armin76 Exp $
-
-EAPI=2
-
-inherit qt4 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="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
-RDEPEND="${DEPEND}"
-
-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) \
-		|| die "econf failed"
-	eqmake4 "${PN}.pro" -o "${PN}.mak"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	# 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.5.ebuild b/media-sound/qsynth/qsynth-0.3.5.ebuild
deleted file mode 100644
index 3d4b855fc6f6..000000000000
--- a/media-sound/qsynth/qsynth-0.3.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.5.ebuild,v 1.2 2012/02/05 17:38:35 armin76 Exp $
-
-EAPI=2
-
-inherit qt4 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="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
-RDEPEND="${DEPEND}"
-
-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) \
-		|| die "econf failed"
-	eqmake4 "${PN}.pro" -o "${PN}.mak"
-}
-
-src_compile() {
-	lupdate  "${PN}.pro" || die
-	emake || die
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	# 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.6.ebuild b/media-sound/qsynth/qsynth-0.3.6.ebuild
index f41c0cf0eb4c..36059ae0143f 100644
--- a/media-sound/qsynth/qsynth-0.3.6.ebuild
+++ b/media-sound/qsynth/qsynth-0.3.6.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 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.5 2012/03/06 14:33:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.6.ebuild,v 1.6 2012/05/07 10:39:04 yngwin Exp $
 
-EAPI=2
+EAPI=4
+LANGS="cs de es ru"
 
-inherit qt4 eutils flag-o-matic
+inherit qt4-r2 eutils flag-o-matic
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sourceforge.net/"
@@ -22,6 +23,24 @@ DEPEND=">=x11-libs/qt-core-4.2:4
 	!pulseaudio? ( !jack? ( !alsa? ( >=media-sound/fluidsynth-1.0.7a[oss] ) ) )"
 RDEPEND="${DEPEND}"
 
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+src_prepare() {
+	local lang use_langs
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+			use_langs="${use_langs} src/translations/${PN}_${lang}.qm"
+		fi
+	done
+
+	sed -e "s|\$(translations_targets)|${use_langs}|" -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
@@ -32,19 +51,17 @@ src_configure() {
 	append-ldflags -L/usr/$(get_libdir)/qt4
 
 	econf \
-		$(use_enable debug) \
-		|| die "econf failed"
+		$(use_enable debug)
 	eqmake4 "${PN}.pro" -o "${PN}.mak"
 }
 
 src_compile() {
-	lupdate  "${PN}.pro" || die
-	emake || die
+	lupdate "${PN}.pro" || die "lupdate failed"
+	qt4-r2_src_compile
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO
+	qt4-r2_src_install
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags