Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/vcftools/, sci-biology/vcftools/files/
Date: Sun, 25 Sep 2016 09:39:27
Message-Id: 1474796345.e81e21772377c90519cdd2e095b305e1039ecead.soap@gentoo
1 commit: e81e21772377c90519cdd2e095b305e1039ecead
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 25 09:26:02 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 25 09:39:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81e2177
7
8 sci-biology/vcftools: Remove old ebuild
9
10 Package-Manager: portage-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/2407
12
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 sci-biology/vcftools/Manifest | 1 -
16 .../files/vcftools-0.1.12b-buildsystem.patch | 53 ----------------------
17 sci-biology/vcftools/vcftools-0.1.12b.ebuild | 45 ------------------
18 3 files changed, 99 deletions(-)
19
20 diff --git a/sci-biology/vcftools/Manifest b/sci-biology/vcftools/Manifest
21 index 9a014b1..0e95b82 100644
22 --- a/sci-biology/vcftools/Manifest
23 +++ b/sci-biology/vcftools/Manifest
24 @@ -1,2 +1 @@
25 DIST vcftools-0.1.14.tar.gz 342369 SHA256 76d799dd9afcb12f1ed42a07bc2886cd1a989858a4d047f24d91dcf40f608582 SHA512 863a16b3b20d392deba7f04310af95f1ab21be537273692aa104e22d737af2eb1bc54a768af954f06188e0500e4f7a032d1189886eb3a439b108cb8189b14eb7 WHIRLPOOL 6de2e33a9882cb5567e2e22605a14851a7b1b458ec4152c87986ef8f49882e9af17e860f24ff40201905ca7d4a54bcfd4f8e8178509aca0bf65172d1c385d2c8
26 -DIST vcftools_0.1.12b.tar.gz 631374 SHA256 9d2324512e9f1237d5cece74ba63965eb43643e9eada8685afe8217760a20a91 SHA512 803790c8ddbfec1b006a5ce5c6d1c2e0f468978eb96d5ee61d38b863df5752f8b89e0c936803d690491e2d1a898d237ec8772c01b7e9d1a138c610f3a1decbfd WHIRLPOOL 3198f10cd97021f1878b4e2ab1cda3c0038061d301a99a36b1482c8d7bcc5e706f01d0bf3a46634d48dd2e741700032870da2a1dfe7a65022e318d4dde4c8863
27
28 diff --git a/sci-biology/vcftools/files/vcftools-0.1.12b-buildsystem.patch b/sci-biology/vcftools/files/vcftools-0.1.12b-buildsystem.patch
29 deleted file mode 100644
30 index 8519766..00000000
31 --- a/sci-biology/vcftools/files/vcftools-0.1.12b-buildsystem.patch
32 +++ /dev/null
33 @@ -1,53 +0,0 @@
34 -diff -ur vcftools_0.1.12b.orig/cpp/Makefile vcftools_0.1.12b/cpp/Makefile
35 ---- vcftools_0.1.12b.orig/cpp/Makefile 2014-08-01 21:11:22.000000000 +0200
36 -+++ vcftools_0.1.12b/cpp/Makefile 2015-04-03 17:24:38.830781049 +0200
37 -@@ -3,8 +3,8 @@
38 - # ($Revision: 1.1 $)
39 -
40 - # Compiler
41 --CC = gcc
42 --CPP = g++
43 -+CC ?= gcc
44 -+CPP ?= g++
45 - # Output executable
46 - EXECUTABLE = vcftools
47 - # Flag used to turn on compilation of PCA routines
48 -@@ -12,9 +12,9 @@
49 - VCFTOOLS_PCA = 0
50 - endif
51 - # Compiler flags
52 --CFLAGS = -O2 -m64
53 -+CFLAGS ?= -O2 -m64
54 - #CFLAGS = -Wall -O2 -pg -m64
55 --CPPFLAGS = -O2 -D_FILE_OFFSET_BITS=64
56 -+CPPFLAGS ?= -O2 -D_FILE_OFFSET_BITS=64
57 - #CPPFLAGS = -O2 -Wall -pg -D_FILE_OFFSET_BITS=64
58 - # Included libraries (zlib)
59 - LIB = -lz
60 -@@ -29,13 +29,13 @@
61 - # Define flag for PCA routine compilation
62 - CPPFLAGS += -DVCFTOOLS_PCA
63 - # Add LAPACK library
64 -- LIB += -llapack
65 -+ LIB += `$(PKG_CONFIG) --libs lapack`
66 - # Add PCA source code
67 - OBJS+= dgeev.o
68 - endif
69 -
70 - vcftools: $(OBJS)
71 -- $(CPP) $(CPPFLAGS) $(OBJS) -o vcftools $(LIB)
72 -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o vcftools $(LIB)
73 - ifdef BINDIR
74 - cp $(CURDIR)/$@ $(BINDIR)/$@
75 - endif
76 -@@ -47,8 +47,8 @@
77 - -include $(OBJS:.o=.d)
78 -
79 - %.o: %.cpp
80 -- $(CPP) -c $(CPPFLAGS) $*.cpp -o $*.o
81 -- $(CPP) -MM $(CPPFLAGS) $*.cpp > $*.d
82 -+ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $*.cpp -o $*.o
83 -+ $(CXX) -MM $(CXXFLAGS) $(CPPFLAGS) $*.cpp > $*.d
84 -
85 - # remove compilation products
86 - clean:
87
88 diff --git a/sci-biology/vcftools/vcftools-0.1.12b.ebuild b/sci-biology/vcftools/vcftools-0.1.12b.ebuild
89 deleted file mode 100644
90 index ddc214c..00000000
91 --- a/sci-biology/vcftools/vcftools-0.1.12b.ebuild
92 +++ /dev/null
93 @@ -1,45 +0,0 @@
94 -# Copyright 1999-2015 Gentoo Foundation
95 -# Distributed under the terms of the GNU General Public License v2
96 -# $Id$
97 -
98 -EAPI=5
99 -
100 -PERL_EXPORT_PHASE_FUNCTIONS=no
101 -inherit perl-module eutils toolchain-funcs
102 -
103 -MY_P="${PN}_${PV}"
104 -
105 -DESCRIPTION="Tools for working with VCF (Variant Call Format) files"
106 -HOMEPAGE="http://vcftools.sourceforge.net/"
107 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
108 -
109 -LICENSE="LGPL-3"
110 -SLOT="0"
111 -KEYWORDS="~x86 ~amd64"
112 -IUSE="lapack"
113 -
114 -RDEPEND="lapack? ( virtual/lapack )"
115 -DEPEND="${RDEPEND}
116 - virtual/pkgconfig"
117 -
118 -S="${WORKDIR}/${MY_P}"
119 -
120 -src_prepare() {
121 - epatch "${FILESDIR}"/${P}-buildsystem.patch
122 - tc-export CXX PKG_CONFIG
123 -}
124 -
125 -src_compile() {
126 - local myconf
127 - use lapack && myconf="VCFTOOLS_PCA=1"
128 - emake -C cpp ${myconf}
129 -}
130 -
131 -src_install(){
132 - perl_set_version
133 - dobin cpp/${PN}
134 - insinto ${VENDOR_LIB}
135 - doins perl/*.pm
136 - dobin perl/{fill,vcf}-*
137 - dodoc README.txt
138 -}