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/snpfile/, sci-biology/snpfile/files/
Date: Sun, 26 Feb 2017 12:41:08
Message-Id: 1488112846.6710439219e65405295365827841440f1cf151e2.soap@gentoo
1 commit: 6710439219e65405295365827841440f1cf151e2
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 12:25:06 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 12:40:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67104392
7
8 sci-biology/snpfile: Modernise to EAPI 6
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/4083
12
13 .../snpfile/files/snpfile-2.0.1-ax-boost.patch | 35 ++++++++++++++++
14 .../snpfile/files/snpfile-2.0.1-gentoo.diff | 8 ++--
15 sci-biology/snpfile/snpfile-2.0.1-r2.ebuild | 47 ++++++++++++++++++++++
16 3 files changed, 86 insertions(+), 4 deletions(-)
17
18 diff --git a/sci-biology/snpfile/files/snpfile-2.0.1-ax-boost.patch b/sci-biology/snpfile/files/snpfile-2.0.1-ax-boost.patch
19 new file mode 100644
20 index 0000000000..f77b476f99
21 --- /dev/null
22 +++ b/sci-biology/snpfile/files/snpfile-2.0.1-ax-boost.patch
23 @@ -0,0 +1,35 @@
24 +Modernise autoconf code to use modern archive macros.
25 +
26 +--- a/configure.in
27 ++++ b/configure.in
28 +@@ -1,7 +1,7 @@
29 + AC_INIT(snpfile, 2.0.1, mailund@×××××××.dk)
30 + AM_INIT_AUTOMAKE
31 + AC_CONFIG_MACRO_DIR([m4])
32 +-AM_CONFIG_HEADER(config.hh)
33 ++AC_CONFIG_HEADERS([config.hh])
34 +
35 + LT_INIT
36 + AC_PROG_CXX
37 +@@ -14,18 +14,9 @@
38 + fi
39 + AC_DEFINE_UNQUOTED(PREFIX, "$thePREFIX", [Installation prefix])
40 +
41 +-AX_BOOST([1.33.1],,
42 +-AC_ERROR([[
43 +-************************************************************************
44 +-************************************************************************
45 +-The Boost library was not found on this system. We use this library
46 +-extensively, and cannot proceed without it. You can obtain it from
47 +-<http://www.boost.org>.
48 +-************************************************************************
49 +-************************************************************************
50 +-]])
51 +-)
52 +-
53 ++AX_BOOST_BASE([1.33.1])
54 ++AX_BOOST_PROGRAM_OPTIONS
55 ++AX_BOOST_SIGNALS
56 +
57 + AC_OUTPUT([
58 + Makefile
59
60 diff --git a/sci-biology/snpfile/files/snpfile-2.0.1-gentoo.diff b/sci-biology/snpfile/files/snpfile-2.0.1-gentoo.diff
61 index e6a8d60ec6..b2a8a6b630 100644
62 --- a/sci-biology/snpfile/files/snpfile-2.0.1-gentoo.diff
63 +++ b/sci-biology/snpfile/files/snpfile-2.0.1-gentoo.diff
64 @@ -2,8 +2,8 @@ Fixing as-needed issues, provide shared libs
65
66 https://bugs.gentoo.org/show_bug.cgi?id=294971
67
68 ---- Makefile.am
69 -+++ Makefile.am
70 +--- a/Makefile.am
71 ++++ b/Makefile.am
72 @@ -1,440 +1,92 @@
73 ACLOCAL_AMFLAGS = -I m4
74
75 @@ -516,8 +516,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=294971
76 + type_trait.hh
77 +libsnpfile_la_LIBADD = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_SIGNALS_LIB)
78 +
79 ---- configure.in
80 -+++ configure.in
81 +--- a/configure.in
82 ++++ b/configure.in
83 @@ -1,10 +1,11 @@
84 AC_INIT(snpfile, 2.0.1, mailund@×××××××.dk)
85 AM_INIT_AUTOMAKE
86
87 diff --git a/sci-biology/snpfile/snpfile-2.0.1-r2.ebuild b/sci-biology/snpfile/snpfile-2.0.1-r2.ebuild
88 new file mode 100644
89 index 0000000000..8062ca014a
90 --- /dev/null
91 +++ b/sci-biology/snpfile/snpfile-2.0.1-r2.ebuild
92 @@ -0,0 +1,47 @@
93 +# Copyright 1999-2017 Gentoo Foundation
94 +# Distributed under the terms of the GNU General Public License v2
95 +# $Id$
96 +
97 +EAPI=6
98 +
99 +inherit autotools
100 +
101 +DESCRIPTION="A library and API for manipulating large SNP datasets"
102 +HOMEPAGE="http://www.birc.au.dk/~mailund/SNPFile/"
103 +SRC_URI="http://www.birc.au.dk/~mailund/SNPFile/download/${P}.tar.gz"
104 +
105 +LICENSE="GPL-3"
106 +SLOT="0"
107 +IUSE="static-libs"
108 +KEYWORDS="~amd64 ~x86"
109 +
110 +RDEPEND="dev-libs/boost:="
111 +DEPEND="
112 + ${RDEPEND}
113 + >=sys-devel/autoconf-archive-2016.09.16"
114 +
115 +PATCHES=(
116 + "${FILESDIR}"/${P}-gcc44.patch
117 + "${FILESDIR}"/${P}-gentoo.diff
118 + "${FILESDIR}"/${P}-gold.patch
119 + "${FILESDIR}"/${P}-ax-boost.patch
120 +)
121 +
122 +src_prepare() {
123 + default
124 + mv configure.{in,ac} || die
125 + rm m4/ax_boost.m4 || die
126 + eautoreconf
127 +}
128 +
129 +src_configure() {
130 + econf $(use_enable static-libs static)
131 +}
132 +
133 +src_install() {
134 + default
135 +
136 + if ! use static-libs; then
137 + find "${D}" -name '*.la' -delete || die
138 + fi
139 +}