diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2017-01-13 17:12:59 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-01-13 17:13:42 +0100 |
commit | 64dd653b3b2ae8ed253ec76cacbbe45021e74543 (patch) | |
tree | bbd7374dd37cfaa367d9e584aa47899fe15403d4 /sci-biology/mira/mira-4.0.2.ebuild | |
parent | sci-biology/mira: Update flex-2.6.3 fix; add cmath header (diff) | |
download | gentoo-64dd653b3b2ae8ed253ec76cacbbe45021e74543.tar.gz gentoo-64dd653b3b2ae8ed253ec76cacbbe45021e74543.tar.bz2 gentoo-64dd653b3b2ae8ed253ec76cacbbe45021e74543.zip |
sci-biology/mira: Bump to EAPI-6. Ebuild cleanup.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-biology/mira/mira-4.0.2.ebuild')
-rw-r--r-- | sci-biology/mira/mira-4.0.2.ebuild | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sci-biology/mira/mira-4.0.2.ebuild b/sci-biology/mira/mira-4.0.2.ebuild index 758e30b28e36..546255950ccb 100644 --- a/sci-biology/mira/mira-4.0.2.ebuild +++ b/sci-biology/mira/mira-4.0.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 MIRA_3RDPARTY_PV="06-07-2012" MY_PV="${PV/_}" # convert from mira-4.0_rc2 (Gentoo ebuild filename derived) to mira-4.0rc2 (upstream fromat) @@ -37,12 +37,16 @@ RDEPEND="${CDEPEND}" # THANKS doc/3rdparty/scaffolding_MIRA_BAMBUS.pdf ) DOCS=( AUTHORS GETTING_STARTED NEWS README HELP_WANTED THANKS ) +PATCHES=( + "${FILESDIR}/${PN}-4.0.2-boost-1.50.patch" + "${FILESDIR}/${PN}-4.0.2-cout.patch" + "${FILESDIR}/${PN}-4.0.2-cmath.patch" +) + src_prepare() { find -name 'configure*' -or -name 'Makefile*' | xargs sed -i 's/flex++/flex -+/' || die - epatch \ - "${FILESDIR}"/${PN}-3.4.0.2-boost-1.50.patch \ - "${FILESDIR}"/${P}-cout.patch \ - "${FILESDIR}"/${P}-cmath.patch + + default sed \ -e "s:-O[23]::g" \ @@ -54,13 +58,17 @@ src_prepare() { # Remove C++ source files that upstream built with flex. local f local PREBUILT_CXX_LEXER_FILES=( - "$S"/src/caf/caf_flexer.cc - "$S"/src/io/exp_flexer.cc - "$S"/src/mira/parameters_flexer.cc + "${S}"/src/caf/caf_flexer.cc + "${S}"/src/io/exp_flexer.cc + "${S}"/src/mira/parameters_flexer.cc ) for f in "${PREBUILT_CXX_LEXER_FILES[@]}"; do - [[ -f $f ]] && { rm "$f" || die "Failed to remove $f"; } || die "$f not found" + if [[ -f ${f} ]] ; then + rm "${f}" || die "Failed to remove ${f}" + else + die "${f} not found" + fi done } @@ -79,7 +87,6 @@ src_configure() { src_install() { default - dodoc ${DOCS[@]} dobin "${WORKDIR}"/3rdparty/{sff_extract,qual2ball,*.pl} dodoc "${WORKDIR}"/3rdparty/{README.txt,midi_screen.fasta} |