summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2017-09-16 15:52:10 +0200
committerDavid Seifert <soap@gentoo.org>2017-09-16 15:59:08 +0200
commitc088dec53c87470f6eb3e6afd62801f5017fb914 (patch)
tree8c92da7c227ea82e94f61b4965c99c4484aa9533 /sci-chemistry/dssp/dssp-2.2.1-r1.ebuild
parentnet-analyzer/tcpdump: Restore stable 4.9.2 for amd64 and x86 (diff)
downloadgentoo-c088dec53c87470f6eb3e6afd62801f5017fb914.tar.gz
gentoo-c088dec53c87470f6eb3e6afd62801f5017fb914.tar.bz2
gentoo-c088dec53c87470f6eb3e6afd62801f5017fb914.zip
sci-chemistry/dssp: Fix boost TR1 header include
Closes: https://bugs.gentoo.org/630776 Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'sci-chemistry/dssp/dssp-2.2.1-r1.ebuild')
-rw-r--r--sci-chemistry/dssp/dssp-2.2.1-r1.ebuild28
1 files changed, 15 insertions, 13 deletions
diff --git a/sci-chemistry/dssp/dssp-2.2.1-r1.ebuild b/sci-chemistry/dssp/dssp-2.2.1-r1.ebuild
index a50e602ad32b..b660e9ef3c96 100644
--- a/sci-chemistry/dssp/dssp-2.2.1-r1.ebuild
+++ b/sci-chemistry/dssp/dssp-2.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="The protein secondary structure standard"
HOMEPAGE="http://swift.cmbi.ru.nl/gv/dssp/"
@@ -17,17 +17,19 @@ IUSE=""
RDEPEND="dev-libs/boost:=[threads]"
DEPEND="${RDEPEND}"
-src_prepare() {
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-gentoo.patch
+ "${FILESDIR}"/${PN}-2.2.1-boost-1.65-tr1-removal.patch
+)
+
+src_configure() {
tc-export CXX
- cat >> make.config <<- EOF
- BOOST_LIB_SUFFIX = -mt
- BOOST_LIB_DIR = "${EPREFIX}/usr/$(get_libdir)"
- BOOST_INC_DIR = "${EPREFIX}/usr/include"
+ cat >> make.config <<- EOF || die
+ BOOST_LIB_SUFFIX = -mt
+ BOOST_LIB_DIR = "${EPREFIX}/usr/$(get_libdir)"
+ BOOST_INC_DIR = "${EPREFIX}/usr/include"
EOF
-
- epatch \
- "${FILESDIR}"/${PN}-2.1.0-gentoo.patch
}
src_install() {
@@ -36,8 +38,8 @@ src_install() {
doman doc/mkdssp.1
dodoc README.txt changelog
- cat >> "${T}"/30-${PN} <<- EOF
- DSSP="${EPREFIX}"/usr/bin/${PN}
+ cat >> "${T}"/30-${PN} <<- EOF || die
+ DSSP="${EPREFIX}"/usr/bin/${PN}
EOF
doenvd "${T}"/30-${PN}
}