[gentoo-commits] proj/sci:master commit in: sci-biology/fastqc/, sci-biology/fastqc/files/

2022-01-15 Thread Andrew Ammerlaan
commit: 583a4958059ee8ac661ecc8919618250f3a7188b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jan 15 11:49:42 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jan 15 11:49:42 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=583a4958

sci-biology/fastqc: version bump to 0.11.9

add desktop shortcuts and stuff

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-biology/fastqc/fastqc-0.11.3.ebuild | 48 ---
 sci-biology/fastqc/fastqc-0.11.9.ebuild | 41 +++
 sci-biology/fastqc/files/00fastqc   |  1 -
 sci-biology/fastqc/files/build.xml  | 59 -
 4 files changed, 41 insertions(+), 108 deletions(-)

diff --git a/sci-biology/fastqc/fastqc-0.11.3.ebuild 
b/sci-biology/fastqc/fastqc-0.11.3.ebuild
deleted file mode 100644
index bfbca83a0..0
--- a/sci-biology/fastqc/fastqc-0.11.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 prefix
-
-DESCRIPTION="Quality control FASTA/FASTQ sequence files"
-HOMEPAGE="https://www.bioinformatics.babraham.ac.uk/projects/fastqc/;
-SRC_URI="https://www.bioinformatics.babraham.ac.uk/projects/fastqc/fastqc_v"${PV}"_source.zip;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND} >=virtual/jdk-1.5:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"/FastQC
-
-src_prepare(){
-   cp "${FILESDIR}"/build.xml . || die
-   default
-}
-
-src_compile(){
-   ant || die
-}
-
-src_install(){
-   insinto "opt/${PN}"
-   doins -r bin
-   chmod a+x "${ED}/opt/${PN}/bin/fastqc"
-   # Add the package's bin directory to the PATH.
-   doenvd "${FILESDIR}/00fastqc"
-   if use prefix ; then
-   hprefixify "${ED}/etc/env.d/00fastqc"
-   fi
-
-   dodoc README.txt RELEASE_NOTES.txt
-}
-
-pkg_postinst() {
-   ewarn "Remember to run: env-update && source \"${EPREFIX}/etc/profile\" 
if you plan"
-   ewarn "to use this tool in a shell before logging out (or restarting"
-   ewarn "your login manager)"
-}

diff --git a/sci-biology/fastqc/fastqc-0.11.9.ebuild 
b/sci-biology/fastqc/fastqc-0.11.9.ebuild
new file mode 100644
index 0..614e535dd
--- /dev/null
+++ b/sci-biology/fastqc/fastqc-0.11.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2 java-ant-2 xdg
+
+DESCRIPTION="Quality control FASTA/FASTQ sequence files"
+HOMEPAGE="https://www.bioinformatics.babraham.ac.uk/projects/fastqc/;
+SRC_URI="https://github.com/s-andrews/FastQC/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+S="${WORKDIR}/FastQC-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+   dev-lang/perl
+   >=virtual/jre-1.8:*
+"
+DEPEND="
+   dev-lang/perl
+   >=virtual/jdk-1.8:*
+"
+BDEPEND="media-gfx/imagemagick"
+
+EANT_BUILD_TARGET="build"
+
+src_install(){
+   insinto "opt/${PN}"
+   doins -r bin/*
+   chmod a+x "${ED}/opt/${PN}/fastqc"
+   # add convenience symlink
+   dosym ../${PN}/${PN} /opt/bin/${PN}
+
+   convert ${PN}_icon.ico ${PN}.png || die
+   doicon ${PN}.png
+   make_desktop_entry ${PN} FastQC ${PN}
+   einstalldocs
+}
+

diff --git a/sci-biology/fastqc/files/00fastqc 
b/sci-biology/fastqc/files/00fastqc
deleted file mode 100644
index 021de8bb0..0
--- a/sci-biology/fastqc/files/00fastqc
+++ /dev/null
@@ -1 +0,0 @@
-PATH="/opt/fastqc/bin"

diff --git a/sci-biology/fastqc/files/build.xml 
b/sci-biology/fastqc/files/build.xml
deleted file mode 100644
index c4a692096..0
--- a/sci-biology/fastqc/files/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-



[gentoo-commits] proj/sci:master commit in: sci-biology/fastqc/, sci-biology/fastqc/files/

2015-03-05 Thread Martin Mokrejs
commit: 748a9abdd6948868e36aa058ab158d4c4506fdd2
Author: Martin Mokrejš mmokrejs AT fold DOT natur DOT cuni DOT cz
AuthorDate: Thu Mar  5 20:09:21 2015 +
Commit: Martin Mokrejs mmokrejs AT fold DOT natur DOT cuni DOT cz
CommitDate: Thu Mar  5 20:09:21 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=748a9abd

added build.xml exported by author from Eclipse IDE (it doesn't work under ant 
eclasses in my hands)

Package-Manager: portage-2.2.15

 sci-biology/fastqc/ChangeLog|  5 +++
 sci-biology/fastqc/fastqc-0.11.2.ebuild | 12 +--
 sci-biology/fastqc/files/build.xml  | 59 +
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/sci-biology/fastqc/ChangeLog b/sci-biology/fastqc/ChangeLog
index 6b6cbf5..b828a60 100644
--- a/sci-biology/fastqc/ChangeLog
+++ b/sci-biology/fastqc/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Mar 2015; Martin Mokrejs mmokr...@fold.natur.cuni.cz +files/build.xml,
+  fastqc-0.11.2.ebuild:
+  added build.xml exported by author from Eclipse IDE (it doesn't work under 
ant
+  eclasses in my hands)
+
 *fastqc-0.11.2 (24 Feb 2015)
 
   24 Feb 2015; Martin Mokrejs mmokr...@fold.natur.cuni.cz

diff --git a/sci-biology/fastqc/fastqc-0.11.2.ebuild 
b/sci-biology/fastqc/fastqc-0.11.2.ebuild
index b608266..dadc288 100644
--- a/sci-biology/fastqc/fastqc-0.11.2.ebuild
+++ b/sci-biology/fastqc/fastqc-0.11.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit java-pkg-2 eutils
+inherit java-pkg-2 eutils java-ant-2
 
 DESCRIPTION=Perl-based wrapper around java apps to quality control 
FASTA/FASTQ sequence files
 HOMEPAGE=http://www.bioinformatics.babraham.ac.uk/projects/fastqc/;
@@ -16,11 +16,17 @@ KEYWORDS=
 IUSE=
 
 DEPEND=sci-biology/picard
-   =virtual/jre-1.5
-RDEPEND=${DEPEND}
+   =virtual/jre-1.5:*
+RDEPEND=${DEPEND}
+   =virtual/jdk-1.5:*
+   dev-java/ant-core
 
 S=${WORKDIR}/FastQC
 
+src_prepare(){
+   cp ${FILESDIR}/build.xml . || die
+}
+
 src_install(){
dobin fastqc run_fastqc.bat
dodoc README.txt RELEASE_NOTES.txt

diff --git a/sci-biology/fastqc/files/build.xml 
b/sci-biology/fastqc/files/build.xml
new file mode 100644
index 000..c4a6920
--- /dev/null
+++ b/sci-biology/fastqc/files/build.xml
@@ -0,0 +1,59 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+!-- WARNING: Eclipse auto-generated file.
+  Any modifications will be overwritten.
+  To include a user specific buildfile here, simply create one in 
the same
+  directory with the processing instruction ?eclipse.ant.import?
+  as the first entry and export the buildfile again. --
+project basedir=. default=build name=FastQC
+property environment=env/
+property name=debuglevel value=source,lines,vars/
+property name=target value=1.5/
+property name=source value=1.5/
+path id=FastQC.classpath
+pathelement location=bin/
+pathelement location=jbzip2-0.9.jar/
+pathelement location=sam-1.103.jar/
+pathelement location=cisd-jhdf5.jar/
+/path
+target name=init
+mkdir dir=bin/
+copy includeemptydirs=false todir=bin
+fileset dir=.
+exclude name=**/*.launch/
+exclude name=**/*.java/
+/fileset
+/copy
+/target
+target name=clean
+delete dir=bin/
+/target
+target depends=clean name=cleanall/
+target depends=build-subprojects,build-project name=build/
+target name=build-subprojects/
+target depends=init name=build-project
+echo message=${ant.project.name}: ${ant.file}/
+javac debug=true debuglevel=${debuglevel} destdir=bin 
includeantruntime=false source=${source} target=${target}
+src path=./
+classpath refid=FastQC.classpath/
+/javac
+/target
+target description=Build all projects which reference this project. 
Useful to propagate changes. name=build-refprojects/
+target description=copy Eclipse compiler jars to ant lib directory 
name=init-eclipse-compiler
+copy todir=${ant.library.dir}
+fileset dir=${ECLIPSE_HOME}/plugins 
includes=org.eclipse.jdt.core_*.jar/
+/copy
+unzip dest=${ant.library.dir}
+patternset includes=jdtCompilerAdapter.jar/
+fileset dir=${ECLIPSE_HOME}/plugins 
includes=org.eclipse.jdt.core_*.jar/
+/unzip
+/target
+target description=compile project with Eclipse compiler 
name=build-eclipse-compiler
+property name=build.compiler 
value=org.eclipse.jdt.core.JDTCompilerAdapter/
+antcall target=build/
+/target
+target name=FastQCApplication
+java classname=uk.ac.babraham.FastQC.FastQCApplication 
failonerror=true fork=yes
+classpath refid=FastQC.classpath/
+/java
+/target
+/project