From 532c8aec5f0deaca78b31b1e0bff5d76b7ef31bd Mon Sep 17 00:00:00 2001
From: Serkan Kaba <serkan@gentoo.org>
Date: Fri, 4 Jul 2008 20:58:43 +0000
Subject: Add call to java-pkg-2_pkg_setup in pkg_setup. Use
 java-pkg_get-jni-cflags to determine JNI CFLAGS. Whitespace.

svn path=/java-overlay/; revision=6399
---
 media-sound/tuxguitar/ChangeLog            |  4 ++++
 media-sound/tuxguitar/Manifest             |  4 ++--
 media-sound/tuxguitar/tuxguitar-1.0.ebuild | 14 ++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'media-sound/tuxguitar')

diff --git a/media-sound/tuxguitar/ChangeLog b/media-sound/tuxguitar/ChangeLog
index 7db6c16b..14a69f9e 100644
--- a/media-sound/tuxguitar/ChangeLog
+++ b/media-sound/tuxguitar/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jul 2008; Serkan Kaba <serkan@gentoo.org> tuxguitar-1.0.ebuild:
+  Add call to java-pkg-2_pkg_setup in pkg_setup. Use java-pkg_get-jni-cflags
+  to determine JNI CFLAGS. Whitespace.
+
   02 Jul 2008; Serkan Kaba <serkan@gentoo.org> tuxguitar-1.0.ebuild:
   Removed note on midi plugin.
 
diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
index 112c5ea9..1d2a55c1 100644
--- a/media-sound/tuxguitar/Manifest
+++ b/media-sound/tuxguitar/Manifest
@@ -3,5 +3,5 @@ DIST tuxguitar-src-1.0.tar.gz 2335631 RMD160 512436d255b010551d34aae163a141662d9
 EBUILD tuxguitar-0.9.1-r1.ebuild 1465 RMD160 07ec215ef9bc117ae789f5dfaab003fd6bb19248 SHA1 c72b3982450b094e2a9e67183ef38a041f9853a0 SHA256 0d9ee98036726353d2b5ad9b07a7d0e3840c078fdb5a0e030b4bc4ad38c5c44f
 EBUILD tuxguitar-0.9.1-r2.ebuild 1460 RMD160 1047a4fd35fbc57321d33a7a65b7c22530d43448 SHA1 c7f8edc8864bc6739b8aa0a5af2d762ec132cd17 SHA256 f9057ca56680e6566974a7e61727139ddabe4b67ffdbe9035f7defe132135615
 EBUILD tuxguitar-0.9.1.ebuild 1421 RMD160 fef1f17b1ccc50c3a71126287f0a3463f9951409 SHA1 464a2899d495f8a24d3313d7839bad2bc7fe4d20 SHA256 2b8d13c1171a0e5bb0f4106c84642f789d74303f5d5f51abea3377bd608168ad
-EBUILD tuxguitar-1.0.ebuild 3674 RMD160 abfab63fbbb9da9194d9a571303b384e71416abf SHA1 51a221c4dc183b115c0d171d6c9900d5e887c42c SHA256 ec1d8570f3d487f504b6bac4f6298a2bac3adde227bbeeb1105687e56c2024fb
-MISC ChangeLog 683 RMD160 6721976adaebd918cf09b370b61c088d63da5315 SHA1 61f5301b774bdafb30fe0497604a30799876e6e0 SHA256 94d812755a9a9ab136254acbaddbe34df1643d118da8d7413ba33578c6ed482e
+EBUILD tuxguitar-1.0.ebuild 3640 RMD160 cdef178a1969f1b842ccf34c196c9a4819ace8e9 SHA1 667a6e5308961467766ea912bf559d1f3359a026 SHA256 8b433405992ad4546eb9760c942ab5f8d0d5d8f7a792db167bcba71f327047c7
+MISC ChangeLog 869 RMD160 59a979d161800c754468f4cd8fee1c81cb2ea7be SHA1 74eb24cf838d5d53894f6794fcf14f030680bdbc SHA256 a57f4d053d025966eefaf37001a0ed86fd348bf150a14f42d07d753731880c99
diff --git a/media-sound/tuxguitar/tuxguitar-1.0.ebuild b/media-sound/tuxguitar/tuxguitar-1.0.ebuild
index 96cd031f..31659191 100644
--- a/media-sound/tuxguitar/tuxguitar-1.0.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.0.ebuild
@@ -44,7 +44,8 @@ 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 
+	fi
+	java-pkg-2_pkg_setup
 }
 
 src_unpack() {
@@ -86,15 +87,13 @@ src_install() {
 	doins "${S}/misc/${PN}.xml"
 	doicon "${S}/misc/${PN}.xpm" || die "doicon failed"
 	domenu "${S}/misc/${PN}.desktop" || die "domenu failed"
-	
-	
 }
 
 plugin_compile() {
 	cd "${S}"/TuxGuitar-${1} || die
 	eant all
 	if [[ -d jni ]]; then
-		append-flags "-I${JAVA_HOME}/include/ -I${JAVA_HOME}/include/linux"
+		append-flags $(java-pkg_get-jni-cflags)
 		cd jni || die "\"cd jni\" failed"
 		CC=$(tc-getCC) emake || die "emake failed"
 	fi
@@ -107,7 +106,6 @@ plugin_install() {
 	insinto ${TUXGUITAR_INST_PATH}/share/plugins
 	doins ${BINARY_NAME}.jar || die "doins ${BINARY_NAME}.jar failed"
 	#TuxGuitar has its own classloader. No need to register the plugins.
-	
 	if [[ -d jni ]]; then
 		java-pkg_doso jni/lib${BINARY_NAME}-jni.so
 	fi
@@ -122,7 +120,7 @@ list_plugins() {
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
-        gnome2_icon_cache_update
+	gnome2_icon_cache_update
 	if use fluidsynth; then
 		ewarn "Fluidsynth plugin blocks behavior of JSA plugin."
 		ewarn "Enable only one of them in \"Tools > Plugins\""
@@ -130,6 +128,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-        fdo-mime_desktop_database_update
-        gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
 }
-- 
cgit v1.2.3