[gentoo-commits] repo/gentoo:master commit in: media-sound/tuxguitar/

[gentoo-commits] repo/gentoo:master commit in: media-sound/tuxguitar/

[James Le Cuirot]

commit:     3dabd1e26db8d0c520bc2a5a916f383d82bec882
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 21:30:00 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 21:30:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dabd1e2

media-sound/tuxguitar: Only call append-flags once to avoid duplicates

Package-Manager: portage-2.3.0

 media-sound/tuxguitar/tuxguitar-1.3.2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
index 001b67c..fe46d5c 100644
--- a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -65,11 +65,12 @@ src_compile() {
 	local build_order=( ${LIBRARY_LIST[@]} ${PLUGIN_LIST[@]/#/TuxGuitar-} )
 	local directory
 
+	append-flags -fPIC $(java-pkg_get-jni-cflags)
+
 	for directory in ${build_order[@]}; do
 		cd "${S}"/${directory} || die "cd ${directory} failed"
 		eant
 		if [[ -d jni ]]; then
-			append-flags -fPIC $(java-pkg_get-jni-cflags)
 			CC=$(tc-getCC) emake -C jni
 		fi
 	done

[gentoo-commits] repo/gentoo:master commit in: media-sound/tuxguitar/

[Patrick Lauer]

commit:     4f820e85f31e119a664561796f1adfa934d47755
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 14:33:59 2017 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 14:39:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f820e85

media-sound/tuxguitar: Fix header

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-sound/tuxguitar/tuxguitar-1.3.2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
index fe46d5c4a8f..61ca5827d67 100644
--- a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $id$
 
 EAPI="6"
 JAVA_PKG_IUSE="source"

[gentoo-commits] repo/gentoo:master commit in: media-sound/tuxguitar/

[Jonathan Scruggs]

commit:     2efb5af1a23515fc2f0f5a6bbd8d4e11be57f9b4
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Jan 27 15:01:47 2018 +0000
Commit:     Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 17:19:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2efb5af1

media-sound/tuxguitar: update metadata information

 media-sound/tuxguitar/metadata.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/media-sound/tuxguitar/metadata.xml b/media-sound/tuxguitar/metadata.xml
index fcffe09fdb5..f11d4ce160e 100644
--- a/media-sound/tuxguitar/metadata.xml
+++ b/media-sound/tuxguitar/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>j.scruggs@gmail.com</email>
+		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		A multitrack tablature editor and player that allows you to
 		compose music using the following features:

[gentoo-commits] repo/gentoo:master commit in: media-sound/tuxguitar/

[Andreas Sturmlechner]

commit:     c3c6bc2129c964462846ea2625d96c52f6ba040e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 20:28:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 20:34:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c6bc21

media-sound/tuxguitar: fdo-mime->xdg-utils, eutils->desktop, HOMEPAGE

Add missing media-sound/fluidsynth slot op

Minur tidy-up:
no ${PN} in DESCRIPTION
CDEPEND -> COMMON_DEPEND
Sort DEPENDs

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/tuxguitar/tuxguitar-1.3.2.ebuild | 47 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
index 61ca5827d67..7c0a2bf1b65 100644
--- a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -1,39 +1,40 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic fdo-mime gnome2-utils
+EAPI=6
 
 MY_P="${P}-src"
-DESCRIPTION="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT"
-HOMEPAGE="http://tuxguitar.herac.com.ar/"
+JAVA_PKG_IUSE="source"
+inherit desktop java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="Multitrack guitar tablature editor and player written in Java-SWT"
+HOMEPAGE="http://www.tuxguitar.com.ar/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-
 IUSE="alsa fluidsynth jack lilypond oss pdf timidity tray"
-
 KEYWORDS="~amd64 ~x86"
 
-CDEPEND="dev-java/swt:3.7[cairo]
+COMMON_DEPEND="
+	dev-java/swt:3.7[cairo]
 	alsa? ( media-libs/alsa-lib )
 	pdf? ( dev-java/itext:5 )
-	fluidsynth? ( media-sound/fluidsynth )
-	lilypond? ( media-sound/lilypond )"
-
-RDEPEND=">=virtual/jre-1.5
+	fluidsynth? ( media-sound/fluidsynth:= )
+	lilypond? ( media-sound/lilypond )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5
 	timidity? ( media-sound/timidity++[alsa?,oss?] )
-	${CDEPEND}"
+"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+"
 
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
+PATCHES=( "${FILESDIR}"/${PN}-fixed-ant-files.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-fixed-ant-files.patch )
-
 LIBRARY_LIST=()
 PLUGIN_LIST=()
 
@@ -116,8 +117,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 	if use fluidsynth; then
 		ewarn "Fluidsynth plugin blocks behavior of JSA plugin."
 		ewarn "Enable only one of them in \"Tools > Plugins\""
@@ -125,6 +126,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: media-sound/tuxguitar/

[Andreas Sturmlechner]

commit:     105f5a0d30778f3e7082d6f1e85a219abce1ba9d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 21:34:00 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 21:36:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105f5a0d

media-sound/tuxguitar: Restrict to <media-sound/fluidsynth-2

Bug: https://bugs.gentoo.org/687878
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/tuxguitar/tuxguitar-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
index 7c0a2bf1b65..39bcac4c636 100644
--- a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPEND="
 	dev-java/swt:3.7[cairo]
 	alsa? ( media-libs/alsa-lib )
 	pdf? ( dev-java/itext:5 )
-	fluidsynth? ( media-sound/fluidsynth:= )
+	fluidsynth? ( <media-sound/fluidsynth-2:= )
 	lilypond? ( media-sound/lilypond )
 "
 RDEPEND="${COMMON_DEPEND}