summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-05-19 23:49:59 +0200
committerDavid Seifert <soap@gentoo.org>2019-05-19 23:49:59 +0200
commit824a86b1faf1f0fa081621f7608d617db1799ed1 (patch)
treefe78f978d062802dd3784a1c61550202718fc807 /sci-biology
parentdev-python/python-gtkmvc: Remove last-rited pkg (diff)
downloadgentoo-824a86b1faf1f0fa081621f7608d617db1799ed1.tar.gz
gentoo-824a86b1faf1f0fa081621f7608d617db1799ed1.tar.bz2
gentoo-824a86b1faf1f0fa081621f7608d617db1799ed1.zip
sci-biology/cufflinks: Remove last-rited pkg
Closes: https://bugs.gentoo.org/671432 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/cufflinks/Manifest1
-rw-r--r--sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild57
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-boost-1.65-tr1-removal.patch14
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-flags.patch28
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-format-security.patch16
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch11
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch14
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch121
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-samtools-legacy.patch44
-rw-r--r--sci-biology/cufflinks/metadata.xml8
10 files changed, 0 insertions, 314 deletions
diff --git a/sci-biology/cufflinks/Manifest b/sci-biology/cufflinks/Manifest
deleted file mode 100644
index 94c9fada1f2a..000000000000
--- a/sci-biology/cufflinks/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cufflinks-2.2.1.tar.gz 766280 BLAKE2B 200ca88d15cdfca550a12a39cf69d4c41850532c76840d2a86a21654b317e28c7f35d36ba26105490e75d55c5527dd64da1ef3c14f2d467a60379c234a8e9e60 SHA512 4da7f3a6090ea8cf469a85208c91073abdcd8b0e71c51b0f7052ce8001c368055b9d9cb7726d463196f5b3ab0b4a49bf5241d321ac3fe061225ecc47b4ca209b
diff --git a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild
deleted file mode 100644
index 3892e03e23b2..000000000000
--- a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="Transcript assembly and differential expression/regulation for RNA-Seq"
-HOMEPAGE="http://cufflinks.cbcb.umd.edu/"
-SRC_URI="http://cufflinks.cbcb.umd.edu/downloads/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- sci-biology/samtools:0.1-legacy
- >=dev-libs/boost-1.62.0:=
- ${PYTHON_DEPS}"
-DEPEND="
- ${RDEPEND}
- dev-cpp/eigen:3
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-samtools-legacy.patch
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-gcc6.patch
- "${FILESDIR}"/${P}-boost-1.65-tr1-removal.patch
- "${FILESDIR}"/${P}-gcc7.patch
- "${FILESDIR}"/${P}-format-security.patch
- "${FILESDIR}"/${P}-gcc5-make_shared.patch
-)
-
-src_prepare() {
- default
- python_fix_shebang src/cuffmerge
-
- eautoreconf
-}
-
-src_configure() {
- # keep in sync with Boost
- append-cxxflags -std=c++14
- append-cppflags $($(tc-getPKG_CONFIG) --cflags eigen3)
-
- econf \
- --disable-optim \
- --with-boost-libdir="${EPREFIX}/usr/$(get_libdir)/" \
- --with-bam="${EPREFIX}/usr/" \
- $(use_enable debug) \
- PYTHON="${PYTHON}"
-}
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-boost-1.65-tr1-removal.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-boost-1.65-tr1-removal.patch
deleted file mode 100644
index 42a906e7a83a..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-boost-1.65-tr1-removal.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Boost 1.65 removed the TR1 headers.
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=630654
-
---- a/src/biascorrection.h
-+++ b/src/biascorrection.h
-@@ -15,7 +15,7 @@
- #include <vector>
- #include <list>
- #include <string>
--#include <boost/tr1/unordered_map.hpp>
-+#include <boost/unordered_map.hpp>
- #include <boost/thread.hpp>
- #include "common.h"
-
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-flags.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-flags.patch
deleted file mode 100644
index 47784088fab9..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 96ffbac..e88b8e4 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,8 @@ AC_CANONICAL_HOST
-
- # set CFLAGS and CXXFLAGS
- user_CFLAGS=${CFLAGS}
--generic_CFLAGS="-Wall -Wno-strict-aliasing -g -gdwarf-2 -Wunused -Wuninitialized -ftemplate-depth-1024"
-+generic_CFLAGS="-Wall -Wno-strict-aliasing -Wunused -Wuninitialized"
-+generic_CXXFLAGS="-Wall -Wno-strict-aliasing -Wunused -Wuninitialized -ftemplate-depth-1024"
- ext_CFLAGS=""
- debug_CFLAGS=""
- #echo "${host_cpu}-${host_os}"
-@@ -106,8 +107,8 @@ AC_ARG_ENABLE(profiling, [ --enable-profiling enable profiling with
- [ext_LDFLAGS="-lprofiler -ltcmalloc"], [])
-
- CFLAGS="${generic_CFLAGS} ${ext_CFLAGS} ${user_CFLAGS} ${debug_CFLAGS} ${OPENMP_CFLAGS}"
--CXXFLAGS="$CFLAGS"
--CXXFLAGS="${CXXFLAGS} ${BOOST_CPPFLAGS} ${BAM_CPPFLAGS} ${EIGEN_CPPFLAGS}"
-+CXXFLAGS="${generic_CFLAGS} ${CXXFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${BOOST_CPPFLAGS} ${BAM_CPPFLAGS} ${EIGEN_CPPFLAGS}"
- user_LDFLAGS="$LDFLAGS"
- LDFLAGS="${ext_LDFLAGS} ${user_LDFLAGS}"
-
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-format-security.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-format-security.patch
deleted file mode 100644
index fa13f78d8b52..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Andreas Tille <tille@debian.org>
-Date: Wed, 22 May 2013 13:27:40 +0200
-Description: When building with --format-security (Debhelper 9 hardening)
- this patch is needed to build successfully
-
---- a/src/locfit/makecmd.c
-+++ b/src/locfit/makecmd.c
-@@ -200,7 +200,7 @@ char *cmdline;
- /* vs is used to store the command line string. */
- sprintf(vn,"=clstr%d",clcount);
- vs = createvar(vn,STSYSTEM,1+strlen(cmdline),VCHAR);
-- sprintf((char *)vdptr(vs),cmdline);
-+ sprintf((char *)vdptr(vs),"%s",cmdline);
-
- /* va is used to store pointers to the command line fields. */
- sprintf(vn,"=cline%d",clcount);
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch
deleted file mode 100644
index 67a28df10249..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/differential.cpp
-+++ b/src/differential.cpp
-@@ -575,7 +575,7 @@
- boost::mutex::scoped_lock lock(meta_data_lock);
- #endif
- pair<SampleDiffMetaDataTable::iterator, bool> p;
-- p = meta_data_table.insert(make_pair(description, new SampleDifferenceMetaData()));
-+ p = meta_data_table.insert(make_pair(description, boost::make_shared<SampleDifferenceMetaData>()));
- return p.first->second;
- }
-
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch
deleted file mode 100644
index 6ee9bcf456d4..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/lemon/error.h
-+++ b/src/lemon/error.h
-@@ -67,9 +67,9 @@
- }
-
- ExceptionMember& operator=(const ExceptionMember& copy) {
-- if (ptr.get() == 0) return;
-+ if (ptr.get() == 0) return *this;
- try {
-- if (!copy.valid()) return;
-+ if (!copy.valid()) return *this;
- *ptr = copy.get();
- } catch (...) {}
- }
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch
deleted file mode 100644
index 48fe6e10ac96..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc7.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Author: Alex Mestiashvili <mailatgoogl@gmail.com>
-Origin: https://lists.debian.org/debian-med/2017/09/msg00021.html
-Bug-Debian: https://bugs.debian.org/871234
-Description: Fix gcc-7 build issue, thanks to Jeff Epler <jepler@unpythonic.net>
---- a/src/GHash.hh
-+++ b/src/GHash.hh
-@@ -88,7 +88,7 @@
- //nextkey is SET to the corresponding key
- GHashEntry* NextEntry() { //returns a pointer to a GHashEntry
- register int pos=fCurrentEntry;
-- while (pos<fCapacity && hash[pos].hash<0) pos++;
-+ while (pos<fCapacity && (hash[pos].hash)<0) pos++;
- if (pos==fCapacity) {
- fCurrentEntry=fCapacity;
- return NULL;
-@@ -186,7 +186,7 @@
- x=HASH2(h,n);
- GASSERT(1<=x && x<n);
- while(k[p].hash!=-1) p=(p+x)%n;
-- GASSERT(k[p].hash<0);
-+ GASSERT((k[p].hash)<0);
- k[p]=hash[i];
- }
- }
-@@ -225,7 +225,7 @@
- GTRACE(("GHash::insert: key=\"%s\"\n",ky));
- //GMessage("GHash::insert: key=\"%s\"\n",ky);
- GASSERT(0<=i && i<fCapacity);
-- GASSERT(hash[i].hash<0);
-+ GASSERT((hash[i].hash)<0);
- hash[i].hash=h;
- hash[i].mark=mrk;
- hash[i].key=Gstrdup(ky);
-@@ -266,7 +266,7 @@
- GTRACE(("GHash::insert: key=\"%s\"\n",ky));
- //GMessage("GHash::insert: key=\"%s\"\n",ky);
- GASSERT(0<=i && i<fCapacity);
-- GASSERT(hash[i].hash<0);
-+ GASSERT((hash[i].hash)<0);
- hash[i].hash=h;
- hash[i].mark=mrk;
- hash[i].key=(char *)ky;
-@@ -310,7 +310,7 @@
- if(i==-1) i=p;
- GTRACE(("GHash::replace: %08x: inserting: \"%s\"\n",this,ky));
- GASSERT(0<=i && i<fCapacity);
-- GASSERT(hash[i].hash<0);
-+ GASSERT((hash[i].hash)<0);
- hash[i].hash=h;
- hash[i].mark=mrk;
- hash[i].key=Gstrdup(ky);
-@@ -412,7 +412,7 @@
-
- template <class OBJ> char* GHash<OBJ>::NextKey() {
- register int pos=fCurrentEntry;
-- while (pos<fCapacity && hash[pos].hash<0) pos++;
-+ while (pos<fCapacity && (hash[pos].hash)<0) pos++;
- if (pos==fCapacity) {
- fCurrentEntry=fCapacity;
- return NULL;
-@@ -425,7 +425,7 @@
-
- template <class OBJ> OBJ* GHash<OBJ>::NextData() {
- register int pos=fCurrentEntry;
-- while (pos<fCapacity && hash[pos].hash<0) pos++;
-+ while (pos<fCapacity && (hash[pos].hash)<0) pos++;
- if (pos==fCapacity) {
- fCurrentEntry=fCapacity;
- return NULL;
-@@ -439,7 +439,7 @@
-
- template <class OBJ> OBJ* GHash<OBJ>::NextData(char* &nextkey) {
- register int pos=fCurrentEntry;
-- while (pos<fCapacity && hash[pos].hash<0) pos++;
-+ while (pos<fCapacity && (hash[pos].hash)<0) pos++;
- if (pos==fCapacity) {
- fCurrentEntry=fCapacity;
- nextkey=NULL;
-@@ -457,16 +457,16 @@
- // Get first non-empty entry
- template <class OBJ> int GHash<OBJ>::First() const {
- register int pos=0;
-- while(pos<fCapacity){ if(0<=hash[pos].hash) break; pos++; }
-- GASSERT(fCapacity<=pos || 0<=hash[pos].hash);
-+ while(pos<fCapacity){ if(0<=(hash[pos].hash)) break; pos++; }
-+ GASSERT(fCapacity<=pos || 0<=(hash[pos].hash));
- return pos;
- }
-
- // Get last non-empty entry
- template <class OBJ> int GHash<OBJ>::Last() const {
- register int pos=fCapacity-1;
-- while(0<=pos){ if(0<=hash[pos].hash) break; pos--; }
-- GASSERT(pos<0 || 0<=hash[pos].hash);
-+ while(0<=pos){ if(0<=(hash[pos].hash)) break; pos--; }
-+ GASSERT(pos<0 || 0<=(hash[pos].hash));
- return pos;
- }
-
-@@ -474,8 +474,8 @@
- // Find next valid entry
- template <class OBJ> int GHash<OBJ>::Next(int pos) const {
- GASSERT(0<=pos && pos<fCapacity);
-- while(++pos <= fCapacity-1){ if(0<=hash[pos].hash) break; }
-- GASSERT(fCapacity<=pos || 0<=hash[pos].hash);
-+ while(++pos <= fCapacity-1){ if(0<=(hash[pos].hash)) break; }
-+ GASSERT(fCapacity<=pos || 0<=(hash[pos].hash));
- return pos;
- }
-
-@@ -483,8 +483,8 @@
- // Find previous valid entry
- template <class OBJ> int GHash<OBJ>::Prev(int pos) const {
- GASSERT(0<=pos && pos<fCapacity);
-- while(--pos >= 0){ if(0<=hash[pos].hash) break; }
-- GASSERT(pos<0 || 0<=hash[pos].hash);
-+ while(--pos >= 0){ if(0<=(hash[pos].hash)) break; }
-+ GASSERT(pos<0 || 0<=(hash[pos].hash));
- return pos;
- }
-
diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-samtools-legacy.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-samtools-legacy.patch
deleted file mode 100644
index 374ce519ef86..000000000000
--- a/sci-biology/cufflinks/files/cufflinks-2.2.1-samtools-legacy.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Modify the buildsystem to work with the legacy version of samtools,
-which can coexist with the most recent version of samtools.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=577854
-
---- cufflinks-2.2.1/ax_bam.m4
-+++ cufflinks-2.2.1/ax_bam.m4
-@@ -102,7 +102,7 @@
-
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-- @%:@include <bam/bam.h>
-+ @%:@include <bam-0.1-legacy/bam.h>
- ]], [[
- ]])],[
- AC_MSG_RESULT(yes)
-@@ -171,7 +171,7 @@
-
- AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-- @%:@include <bam/version.hpp>
-+ @%:@include <bam-0.1-legacy/version.hpp>
- ]], [[
- ]])],[
- AC_MSG_RESULT(yes)
-@@ -189,7 +189,7 @@
- AC_MSG_NOTICE([Your bam libraries seem too old (version $_version).])
- fi
- else
-- BAM_LIB="-lbam"
-+ BAM_LIB="-lbam-0.1-legacy"
- AC_SUBST(BAM_CPPFLAGS)
- AC_SUBST(BAM_LDFLAGS)
- AC_SUBST(BAM_LIB)
---- cufflinks-2.2.1/src/hits.h
-+++ cufflinks-2.2.1/src/hits.h
-@@ -18,7 +18,7 @@
-
- #include <boost/shared_ptr.hpp>
-
--#include <bam/sam.h>
-+#include <bam-0.1-legacy/sam.h>
-
- #include "common.h"
- #include "multireads.h"
diff --git a/sci-biology/cufflinks/metadata.xml b/sci-biology/cufflinks/metadata.xml
deleted file mode 100644
index 959160fe46b1..000000000000
--- a/sci-biology/cufflinks/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-biology@gentoo.org</email>
- <name>Gentoo Biology Project</name>
- </maintainer>
-</pkgmetadata>