diff options
Diffstat (limited to 'media-sound/tuxguitar')
| -rw-r--r-- | media-sound/tuxguitar/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/tuxguitar/Manifest | 6 | ||||
| -rw-r--r-- | media-sound/tuxguitar/tuxguitar-1.1.ebuild (renamed from media-sound/tuxguitar/tuxguitar-1.0.ebuild) | 37 |
3 files changed, 20 insertions, 30 deletions
diff --git a/media-sound/tuxguitar/ChangeLog b/media-sound/tuxguitar/ChangeLog index 1d2b709c..56679f7d 100644 --- a/media-sound/tuxguitar/ChangeLog +++ b/media-sound/tuxguitar/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for media-sound/tuxguitar -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Apr 2009; Serkan Kaba <serkan@gentoo.org> tuxguitar-1.0, tuxguitar-1.1: + Version bump. Remove unneeded comments. Migrate to EAPI 2 and use USE + dependencies when needed. Add new tuner plugin. Thanks to Raphaël Droz + <gibboris@gmail.com> for improvements. + 31 Aug 2008; Serkan Kaba <serkan@gentoo.org> tuxguitar-1.0.ebuild, +files/tuxguitar-1.0-ftp.patch: Backport ftp plugin fix from upstream and reenable ftp plugin. diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest index 081c2883..22443957 100644 --- a/media-sound/tuxguitar/Manifest +++ b/media-sound/tuxguitar/Manifest @@ -1,5 +1,5 @@ AUX tuxguitar-1.0-ftp.patch 3262 RMD160 5bbd2d3407d3eabc632db0471edf894fb622791e SHA1 002ec8262bf96d35365e36fb6886d37aaa3a270a SHA256 3d6a8a0dc81c175f56d1d282fe6bbbb146ae94bbff14f4bc630551259e4f5622 -DIST tuxguitar-src-1.0.tar.gz 2335631 RMD160 512436d255b010551d34aae163a141662d9f9539 SHA1 9b289414f5b7f6bd8dd3dd85c701097c3b798f1f SHA256 422336d69994c5041331ac95fc899e91e929b4a224910f75b4acd7cfd6f85c8a -EBUILD tuxguitar-1.0.ebuild 3732 RMD160 731ef154905639ed1b190bfb11ef079e364369bf SHA1 428eb0f0d700cc2b287d577c7afe1c2befbd36fc SHA256 8ece300bfeb7b3f59e3c2ba544071e736bf67eb1fb60666d87dfbf882903e55a -MISC ChangeLog 1542 RMD160 82f374612bd22d2207a2b749ad04e5060bf5099b SHA1 aceeefab19622c513abb04da8be388f7a35c75d7 SHA256 db286019b03c93453b795d4d6e90ac2520b10d322cfebedbadda509ea14fbeb6 +DIST tuxguitar-src-1.1.tar.gz 2478621 RMD160 886198a566c848dfdbde1dac36f2ca127ef20a29 SHA1 232fc1f30640b563aebf3129423c76456b3d8785 SHA256 c3ad3abbc98fe21f525fbbdd38391ee876533ef29f16ea8826dd283853237073 +EBUILD tuxguitar-1.1.ebuild 3324 RMD160 6e30a80b0aa399faa5e0b9a3268b0d81f0b0b690 SHA1 b59476b375b5eb3cfdce7dca59872ec052ff638e SHA256 f01d92dd6bf2cf4eaf3b2b23a55575a0434e1c5479a44bb3ce8db7087670588b +MISC ChangeLog 1807 RMD160 5f22430e754d9a15fe75630a140190d63133b7a1 SHA1 aabb89aab9daf02380ee8eea3ed3bfd3cc598827 SHA256 13eac474e14f8f6f2cc493b43c730458b0a47ee35a8cdc8668f52bd9c4063ce5 MISC metadata.xml 178 RMD160 243fc55bdb409205f2b1fac61222188ede7be6bd SHA1 c1af08bf5613c1355e48537956444b2013769b7e SHA256 dba7bb09845938f9ea24528b23774c7e23a4a55d75ab393da9ceac7400d56f3a diff --git a/media-sound/tuxguitar/tuxguitar-1.0.ebuild b/media-sound/tuxguitar/tuxguitar-1.1.ebuild index 90025ab7..1efce8b5 100644 --- a/media-sound/tuxguitar/tuxguitar-1.0.ebuild +++ b/media-sound/tuxguitar/tuxguitar-1.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=1 +EAPI="2" JAVA_PKG_IUSE="source" inherit eutils java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic fdo-mime gnome2-utils @@ -16,18 +16,16 @@ SLOT="0" IUSE="alsa fluidsynth oss pdf" # Test notes -# FTP plugin seems to connect but it doesn't list my files at FTP. # Couldn't get JSA plugin working out of the box with IcedTea. KEYWORDS="~amd64" -# FIXME: Are these X dependencies really needed to be here explicitly? -CDEPEND="dev-java/swt:3 +CDEPEND="dev-java/swt:3[cairo] alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) pdf? ( dev-java/itext:0 )" RDEPEND=">=virtual/jre-1.5 - alsa? ( media-sound/timidity++ ) - oss? ( media-sound/timidity++ ) + alsa? ( media-sound/timidity++[alsa] ) + oss? ( media-sound/timidity++[oss] ) ${CDEPEND}" DEPEND=">=virtual/jdk-1.5 @@ -35,20 +33,9 @@ DEPEND=">=virtual/jdk-1.5 S="${WORKDIR}/${MY_P}" -pkg_setup() { - if ! built_with_use 'dev-java/swt' 'cairo'; then - eerror "You must build dev-java/swt with cairo support" - die "dev-java/swt built without cairo" - fi - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${A} - cd "${S}" || die - epatch "${FILESDIR}"/${P}-ftp.patch - cd "${S}"/TuxGuitar/lib || die - java-pkg_jar-from swt-3 +src_prepare() { + java-pkg_jar-from --into TuxGuitar/lib swt-3 + java-pkg-2_src_prepare } src_compile() { @@ -71,7 +58,7 @@ src_install() { # TODO: Decide if plugin sources should be installed java-pkg_dolauncher ${PN} \ --main org.herac.tuxguitar.gui.TGMain \ - --java_args "-Xms128m -Xmx128m" + --java_args "-Xms128m -Xmx128m -Dtuxguitar.share.path=/usr/share/${PN}/lib/share" # Images and Files insinto /usr/share/${PN}/lib doins -r share || die "doins failed" @@ -109,12 +96,10 @@ plugin_install() { } #Return list of plugins to compile/install -#Removed FTP plugin from list as it's not working now. -#Check to see if it's working while bumping. list_plugins() { echo \ - $(usev alsa) ascii browser-ftp compat converter $(usev fluidsynth) \ - gtp jsa lilypond midi musicxml $(usev oss) $(usev pdf) ptb tef tray + $(usev alsa) ascii browser-ftp compat converter $(usev fluidsynth) gtp \ + jsa lilypond midi musicxml $(usev oss) $(usev pdf) ptb tef tray tuner } pkg_postinst() { |