Remove X dependencies. Remove old versions.

svn path=/java-overlay/; revision=6469

6 files changed, 8 insertions, 203 deletions

diff --git a/media-sound/tuxguitar/ChangeLog b/media-sound/tuxguitar/ChangeLog
index 90990bab..e5fe2d8a 100644
--- a/media-sound/tuxguitar/ChangeLog
+++ b/media-sound/tuxguitar/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jul 2008; Serkan Kaba <serkan@gentoo.org> -tuxguitar-0.9.1.ebuild,
+  -tuxguitar-0.9.1-r1.ebuild, -tuxguitar-0.9.1-r2.ebuild,
+  tuxguitar-1.0.ebuild:
+  Remove X dependencies. Remove old versions.
+
   12 Jul 2008; Serkan Kaba <serkan@gentoo.org> tuxguitar-1.0.ebuild:
   Removed ftp from list of plugins to build.
 
diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
index 25741a63..f3e0fc26 100644
--- a/media-sound/tuxguitar/Manifest
+++ b/media-sound/tuxguitar/Manifest
@@ -1,8 +1,4 @@
-DIST TuxGuitar-0.9.1-src.tar.gz 584005 RMD160 2698e7243ab06a0fd8be2094038dd14d583a50bb SHA1 689a2a47c375a6ee58a33d7f5e8a94e207f01870 SHA256 c4e3832e4e4befdfcd86860440b51522409bc90436e4027f4c0581217c53f62c
 DIST tuxguitar-src-1.0.tar.gz 2335631 RMD160 512436d255b010551d34aae163a141662d9f9539 SHA1 9b289414f5b7f6bd8dd3dd85c701097c3b798f1f SHA256 422336d69994c5041331ac95fc899e91e929b4a224910f75b4acd7cfd6f85c8a
-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 3768 RMD160 9e96a083454ef39b6dbb217a24de6fd96d23512a SHA1 e6f9459137ef51566a32c510e79e0a705835d61c SHA256 680d56a6639846991a90397bc35d566a0d590dbb3e7494bd192679893124c848
-MISC ChangeLog 1172 RMD160 a1c7e967cd38ff1b9fd207502f6e5f2e00df0514 SHA1 325e21aae9e4fb0249e4b1f0f075f6677d7fa866 SHA256 c289c38dadadb874d0445bc3f2f4eb45b3741e07615ed88ccfb7acfb2dcef6a6
+EBUILD tuxguitar-1.0.ebuild 3665 RMD160 2f336ac72a23ff2a42fcbb5b8cf6566d137fa07c SHA1 0ecb93f42c6a8ea08d807effc176c81b2f7744c9 SHA256 42dfe5271d4a927fcd82a16178546c3bef88d1a65c42503aece1b7e0aafd8aa2
+MISC ChangeLog 1373 RMD160 0723d6f4ba211aff05ab222feb6de95f3f53ce37 SHA1 db7c04ef509f3fa13021d88b1ad5f2ac1d2bfa1e SHA256 eee531b68d5483a1b0e0711f0fc04497c88960ddd40c5fa4bb8c52f1f8db905c
 MISC metadata.xml 178 RMD160 243fc55bdb409205f2b1fac61222188ede7be6bd SHA1 c1af08bf5613c1355e48537956444b2013769b7e SHA256 dba7bb09845938f9ea24528b23774c7e23a4a55d75ab393da9ceac7400d56f3a
diff --git a/media-sound/tuxguitar/tuxguitar-0.9.1-r1.ebuild b/media-sound/tuxguitar/tuxguitar-0.9.1-r1.ebuild
deleted file mode 100644
index 552d0b65..00000000
--- a/media-sound/tuxguitar/tuxguitar-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT, it can open GP3 and GP4 files"
-HOMEPAGE="http://www.herac.com.ar/soluciones/tuxguitar.htm"
-SRC_URI="mirror://sourceforge/${PN}/TuxGuitar-${PV}-src.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="virtual/libc
-		|| ( ( x11-libs/libXxf86vm
-				x11-libs/libXext
-				x11-libs/libX11
-			) virtual/x11 )
-		>=virtual/jre-1.5
-		dev-java/swt
-		dev-java/itext"
-DEPEND=">=virtual/jdk-1.5
-		dev-java/ant-core
-		${RDEPEND}"
-
-IUSE=""
-
-S="${WORKDIR}/TuxGuitar-${PV}-src"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e "s/lib\.itext\.jar=lib\/itext-.*/lib\.itext\.jar=lib\/itext\.jar/" ${S}/build.properties
-
-	mkdir -p ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from swt-3
-	java-pkg_jar-from itext iText.jar itext.jar
-}
-
-src_compile() {
-	eant
-}
-
-src_install() {
-	java-pkg_dojar TuxGuitar.jar
-
-	use source && java-pkg_dosrc src/org
-
-	java-pkg_dolauncher ${PN} \
-		--main org.herac.tuxguitar.gui.TuxGuitar \
-		--java_args "-Xms128m -Xmx128m -Dtuxguitar.shared.path=/usr/share/tuxguitar"
-
-	# Images and Files
-	cp -r share/* ${D}/usr/share/${PN}/
-
-	dodir /usr/share/pixmaps/
-	cp share/files/icon.png ${D}/usr/share/pixmaps/tuxguitar-icon.png
-	make_desktop_entry ${PN} TuxGuitar tuxguitar-icon.png
-}
diff --git a/media-sound/tuxguitar/tuxguitar-0.9.1-r2.ebuild b/media-sound/tuxguitar/tuxguitar-0.9.1-r2.ebuild
deleted file mode 100644
index f0eb26c5..00000000
--- a/media-sound/tuxguitar/tuxguitar-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT, it can open GP3 and GP4 files"
-HOMEPAGE="http://www.herac.com.ar/soluciones/tuxguitar.htm"
-SRC_URI="mirror://sourceforge/${PN}/TuxGuitar-${PV}-src.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="virtual/libc
-		|| ( ( x11-libs/libXxf86vm
-				x11-libs/libXext
-				x11-libs/libX11
-			) virtual/x11 )
-		>=virtual/jre-1.5
-		dev-java/swt
-		dev-java/itext"
-DEPEND=">=virtual/jdk-1.5
-		dev-java/ant-core
-		${RDEPEND}"
-
-IUSE=""
-
-S="${WORKDIR}/TuxGuitar-${PV}-src"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e "s/lib\.itext\.jar=lib\/itext-.*/lib\.itext\.jar=lib\/itext\.jar/" ${S}/build.properties
-
-	mkdir -p ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from swt-3
-	java-pkg_jar-from itext iText.jar itext.jar
-}
-
-src_compile() {
-	eant
-}
-
-src_install() {
-	java-pkg_dojar TuxGuitar.jar
-
-	java-pkg_addcp "/usr/share/tuxguitar"
-
-	use source && java-pkg_dosrc src/org
-
-	java-pkg_dolauncher ${PN} \
-		--main org.herac.tuxguitar.gui.TuxGuitar \
-		--java_args "-Xms128m -Xmx128m"
-
-	# Images and Files
-	cp -r share/* ${D}/usr/share/${PN}/
-
-	dodir /usr/share/pixmaps/
-	cp share/files/icon.png ${D}/usr/share/pixmaps/tuxguitar-icon.png
-	make_desktop_entry ${PN} TuxGuitar tuxguitar-icon.png
-}
diff --git a/media-sound/tuxguitar/tuxguitar-0.9.1.ebuild b/media-sound/tuxguitar/tuxguitar-0.9.1.ebuild
deleted file mode 100644
index efb1b30b..00000000
--- a/media-sound/tuxguitar/tuxguitar-0.9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT, it can open GP3 and GP4 files"
-HOMEPAGE="http://www.herac.com.ar/soluciones/tuxguitar.htm"
-SRC_URI="mirror://sourceforge/${PN}/TuxGuitar-${PV}-src.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="virtual/libc
-		|| ( ( x11-libs/libXxf86vm
-				x11-libs/libXext
-				x11-libs/libX11
-			) virtual/x11 )
-		>=virtual/jre-1.5
-		dev-java/swt
-		dev-java/itext"
-DEPEND=">=virtual/jdk-1.5
-		dev-java/ant-core
-		${RDEPEND}"
-
-IUSE=""
-
-S="${WORKDIR}/TuxGuitar-${PV}-src"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e "s/lib\.itext\.jar=lib\/itext-.*/lib\.itext\.jar=lib\/itext\.jar/" ${S}/build.properties
-
-	mkdir -p ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from swt-3
-	java-pkg_jar-from itext iText.jar itext.jar
-}
-
-src_compile() {
-	eant
-}
-
-src_install() {
-	java-pkg_dojar TuxGuitar.jar
-
-	use source && java-pkg_dosrc src/org
-
-	java-pkg_dolauncher ${PN} \
-		--main org.herac.tuxguitar.gui.TuxGuitar \
-		--java_args "-Xms128m -Xmx128m"
-
-	# Images and Files
-	cp -r share ${D}/usr/share/${PN}/lib
-
-	dodir /usr/share/pixmaps/
-	cp share/files/icon.png ${D}/usr/share/pixmaps/tuxguitar-icon.png
-	make_desktop_entry ${PN} TuxGuitar tuxguitar-icon.png
-}
diff --git a/media-sound/tuxguitar/tuxguitar-1.0.ebuild b/media-sound/tuxguitar/tuxguitar-1.0.ebuild
index 17420735..5b87e248 100644
--- a/media-sound/tuxguitar/tuxguitar-1.0.ebuild
+++ b/media-sound/tuxguitar/tuxguitar-1.0.ebuild
@@ -21,12 +21,7 @@ IUSE="alsa fluidsynth oss pdf"
 
 KEYWORDS="~amd64"
 # FIXME: Are these X dependencies really needed to be here explicitly?
-CDEPEND="virtual/libc
-		|| ( ( x11-libs/libXxf86vm
-				x11-libs/libXext
-				x11-libs/libX11
-			) virtual/x11 )
-	dev-java/swt:3
+CDEPEND="dev-java/swt:3
 	alsa? ( media-libs/alsa-lib )
 	fluidsynth? ( media-sound/fluidsynth )
 	pdf? ( dev-java/itext:0 )"