[gentoo-commits] proj/sci:master commit in: sci-biology/igv/

["Justin Lecher" <jlec@gentoo.org>]

commit:     d16e20f697612139018c0cf45bf15c05e8681f37
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 13:23:52 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 13:23:52 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d16e20f6

sci-biology/igv: fix SLOT operators; drop KEYWORDS for live ebuilds

Package-Manager: portage-2.2.17

---
 sci-biology/igv/ChangeLog         |  6 +++++-
 sci-biology/igv/igv-2.0.32.ebuild | 35 -----------------------------------
 sci-biology/igv/igv-2.0.35.ebuild | 20 +++++++++++---------
 sci-biology/igv/metadata.xml      | 10 +++++-----
 4 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/sci-biology/igv/ChangeLog b/sci-biology/igv/ChangeLog
index 57895e3..8fe0e05 100644
--- a/sci-biology/igv/ChangeLog
+++ b/sci-biology/igv/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/igv
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2015; Justin Lecher <jlec@gentoo.org> -igv-2.0.32.ebuild,
+  igv-2.0.35.ebuild, metadata.xml:
+  sci-biology/igv: fix SLOT operators; drop KEYWORDS for live ebuilds
+
   23 Mar 2014; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> igv-2.0.35.ebuild:
   API bumped, whitespace removal
 

diff --git a/sci-biology/igv/igv-2.0.32.ebuild b/sci-biology/igv/igv-2.0.32.ebuild
deleted file mode 100644
index 67a0c5b..0000000
--- a/sci-biology/igv/igv-2.0.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-#ESVN_REPO_URI="http://igv.googlecode.com/svn/trunk"
-ESVN_REPO_URI="http://igv.googlecode.com/svn/tags/Version_${PV}"
-
-EANT_BUILD_TARGET="all"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_NEEDS_TOOLS="true"
-WANT_ANT_TASKS="ant-apache-bcel"
-
-inherit subversion java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrative Genomics Viewer"
-HOMEPAGE="http://www.broadinstitute.org/igv/"
-SRC_URI=""
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64"
-
-COMMON_DEPS=""
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPS}"
-
-src_install() {
-	java-pkg_newjar igv.jar
-	for i in lib/*.jar; do java-pkg_dojar $i; done
-	java-pkg_dolauncher igv --jar igv.jar --main org.broad.igv.ui.Main
-}

diff --git a/sci-biology/igv/igv-2.0.35.ebuild b/sci-biology/igv/igv-2.0.35.ebuild
index a9021e7..e5d4e93 100644
--- a/sci-biology/igv/igv-2.0.35.ebuild
+++ b/sci-biology/igv/igv-2.0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,30 +17,32 @@ inherit subversion java-pkg-2 java-ant-2
 DESCRIPTION="Integrative Genomics Viewer"
 HOMEPAGE="http://www.broadinstitute.org/igv/"
 SRC_URI=""
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS=""
 
-COMMON_DEPS="dev-java/batik
+COMMON_DEPS="
+	dev-java/batik
 	dev-java/absolutelayout
 	dev-java/jama
 	dev-java/commons-logging
-	dev-java/commons-math
+	dev-java/commons-math:3
 	dev-java/concurrent-util
 	dev-java/jcommon
 	dev-java/jfreechart
 	dev-java/hdf-java
 	dev-java/jlfgr
-	dev-java/junit
+	dev-java/junit:0
 	dev-java/log4j
 	dev-db/mysql-connector-c++
 	sci-biology/samtools
 	dev-java/swing-layout
 	sci-biology/vcftools"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.6:*
 	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.6:*
 	${COMMON_DEPS}"
 
 src_install() {
@@ -90,8 +92,8 @@ src_install() {
 	# /usr/share/igv/lib/xml-apis-1.3.04.jar
 	# /usr/share/igv/lib/xml-apis-ext-1.3.04.jar
 	cd lib || die
-	rm AbsoluteLayout.jar Jama*.jar batik*.jar commons-logging*.jar commons-math*.jar concurrent*.jar jcommon*.jar jfreechart*.jar jhdf*.jar jlfgr*.jar junit*.jar log4j*.jar sam*.jar swing*.jar vcf*.jar
-	cd ..
+	rm AbsoluteLayout.jar Jama*.jar batik*.jar commons-logging*.jar commons-math*.jar concurrent*.jar jcommon*.jar jfreechart*.jar jhdf*.jar jlfgr*.jar junit*.jar log4j*.jar sam*.jar swing*.jar vcf*.jar || die
+	cd .. || die
 
 	for i in lib/*.jar; do java-pkg_dojar $i; done
 

diff --git a/sci-biology/igv/metadata.xml b/sci-biology/igv/metadata.xml
index 3302123..fc7c769 100644
--- a/sci-biology/igv/metadata.xml
+++ b/sci-biology/igv/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
 </pkgmetadata>