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/samtools/, sci-biology/samtools/files/
Date: Sun, 27 Mar 2016 23:53:28
Message-Id: 1459122771.deaa21ff2b928318d0e1b8fe45aa404411f08086.soap@gentoo
1 commit: deaa21ff2b928318d0e1b8fe45aa404411f08086
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 23:52:51 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 23:52:51 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deaa21ff
7
8 sci-biology/samtools: Move to SLOT="0.1-legacy" for future legacy versions
9
10 Package-Manager: portage-2.2.28
11
12 .../samtools/files/samtools-0.1.20-buildsystem.patch | 20 ++++++++++----------
13 ...tools-0.1.20.ebuild => samtools-0.1.20-r1.ebuild} | 2 +-
14 2 files changed, 11 insertions(+), 11 deletions(-)
15
16 diff --git a/sci-biology/samtools/files/samtools-0.1.20-buildsystem.patch b/sci-biology/samtools/files/samtools-0.1.20-buildsystem.patch
17 index dfdd890..eb9f693 100644
18 --- a/sci-biology/samtools/files/samtools-0.1.20-buildsystem.patch
19 +++ b/sci-biology/samtools/files/samtools-0.1.20-buildsystem.patch
20 @@ -75,15 +75,15 @@
21 .PHONY:all-recur lib-recur clean-recur cleanlocal-recur install-recur
22
23 -lib:libbam.a
24 -+lib:libbam-legacy.a
25 ++lib:libbam-0.1-legacy.a
26
27 -libbam.a:$(LOBJS)
28 -+libbam-legacy.a:$(LOBJS)
29 ++libbam-0.1-legacy.a:$(LOBJS)
30 $(AR) -csru $@ $(LOBJS)
31
32 samtools:lib-recur $(AOBJS)
33 - $(CC) $(CFLAGS) -o $@ $(AOBJS) $(LDFLAGS) libbam.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread
34 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) libbam-legacy.a -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread
35 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -L. -lbam-0.1-legacy -Lbcftools -lbcf $(LIBPATH) $(LIBCURSES) -lm -lz -lpthread
36
37 razip:razip.o razf.o $(KNETFILE_O)
38 - $(CC) $(CFLAGS) -o $@ $^ -lz
39 @@ -105,21 +105,21 @@
40
41 -libbam.1.dylib-local:$(LOBJS)
42 - libtool -dynamic $(LOBJS) -o libbam.1.dylib -lc -lz
43 -+libbam-legacy.1.dylib-local:$(LOBJS)
44 -+ libtool -dynamic $(LOBJS) -o libbam-legacy.1.dylib -lc -lz
45 ++libbam-0.1-legacy.1.dylib-local:$(LOBJS)
46 ++ libtool -dynamic $(LOBJS) -o libbam-0.1-legacy.1.dylib -lc -lz
47
48 -libbam.so.1-local:$(LOBJS)
49 - $(CC) -shared -Wl,-soname,libbam.so -o libbam.so.1 $(LOBJS) -lc -lz
50 -+libbam-legacy.so.1-local:$(LOBJS)
51 -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libbam-legacy.so -o libbam-legacy.so.1 $(LOBJS) -lc -lz -lm -lpthread
52 ++libbam-0.1-legacy.so.1-local:$(LOBJS)
53 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libbam-0.1-legacy.so -o libbam-0.1-legacy.so.1 $(LOBJS) -lc -lz -lm -lpthread
54
55 dylib:
56 @$(MAKE) cleanlocal; \
57 case `uname` in \
58 - Linux) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam.so.1-local;; \
59 - Darwin) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam.1.dylib-local;; \
60 -+ Linux) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam-legacy.so.1-local;; \
61 -+ Darwin) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam-legacy.1.dylib-local;; \
62 ++ Linux) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam-0.1-legacy.so.1-local;; \
63 ++ Darwin) $(MAKE) CFLAGS="$(CFLAGS) -fPIC" libbam-0.1-legacy.1.dylib-local;; \
64 *) echo 'Unknown OS';; \
65 esac
66
67 @@ -162,7 +162,7 @@
68
69 bamcheck:bamcheck.o
70 - $(CC) $(CFLAGS) -o $@ bamcheck.o -L.. -lm -lbam -lpthread -lz
71 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ bamcheck.o -L.. -lm -lbam-legacy -lpthread -lz
72 ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ bamcheck.o -L.. -lm -lbam-0.1-legacy -lpthread -lz
73
74 bamcheck.o:bamcheck.c ../faidx.h ../khash.h ../sam.h ../razf.h
75 $(CC) $(CFLAGS) -c -I.. -o $@ bamcheck.c
76
77 diff --git a/sci-biology/samtools/samtools-0.1.20.ebuild b/sci-biology/samtools/samtools-0.1.20-r1.ebuild
78 similarity index 99%
79 rename from sci-biology/samtools/samtools-0.1.20.ebuild
80 rename to sci-biology/samtools/samtools-0.1.20-r1.ebuild
81 index 3ee9956..744d15f 100644
82 --- a/sci-biology/samtools/samtools-0.1.20.ebuild
83 +++ b/sci-biology/samtools/samtools-0.1.20-r1.ebuild
84 @@ -13,7 +13,7 @@ HOMEPAGE="http://samtools.sourceforge.net/"
85 SRC_URI="https://github.com/samtools/samtools/archive/${PV}.tar.gz -> ${P}.tar.gz"
86
87 LICENSE="MIT"
88 -SLOT="legacy"
89 +SLOT="0.1-legacy"
90 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
91 IUSE="examples"