commit: 06b18fa7ff04d5abcc2f8d216d0162a068255a7b Author: Jonas Maaskola <jonas <AT> maaskola <DOT> de> AuthorDate: Tue Jan 27 22:40:43 2015 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> CommitDate: Tue Jan 27 22:40:43 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=06b18fa7
sci-biology/discrover: bump package version, add USE flag for link-time optimization, install doc to /usr/share/doc/${PF} Package-Manager: portage-2.2.14 --- sci-biology/discrover/ChangeLog | 7 +++++++ .../{discrover-1.4.1.ebuild => discrover-1.5.2.ebuild} | 14 +++++++++++++- sci-biology/discrover/discrover-9999.ebuild | 16 ++++++++++++++-- sci-biology/discrover/metadata.xml | 5 ++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/sci-biology/discrover/ChangeLog b/sci-biology/discrover/ChangeLog index d81ca8c..fd6eb45 100644 --- a/sci-biology/discrover/ChangeLog +++ b/sci-biology/discrover/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*discrover-1.5.2 (27 Jan 2015) + + 27 Jan 2015; Jonas Maaskola <jo...@maaskola.de> +discrover-1.5.2.ebuild, + -discrover-1.4.1.ebuild, discrover-9999.ebuild, metadata.xml: + sci-biology/discrover: bump package version, add USE flag for link-time + optimization, install doc to /usr/share/doc/${PF} + *discrover-1.4.1 (05 Jan 2015) 05 Jan 2015; Jonas Maaskola <jo...@maaskola.de> +discrover-1.4.1.ebuild, diff --git a/sci-biology/discrover/discrover-1.4.1.ebuild b/sci-biology/discrover/discrover-1.5.2.ebuild similarity index 74% rename from sci-biology/discrover/discrover-1.4.1.ebuild rename to sci-biology/discrover/discrover-1.5.2.ebuild index 5ae256f..b17687e 100644 --- a/sci-biology/discrover/discrover-1.4.1.ebuild +++ b/sci-biology/discrover/discrover-1.5.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/maaskola/discrover/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+cairo dreme doc tikzlogo misc_scripts +rmathlib tcmalloc" +IUSE="+cairo dreme doc +lto tikzlogo misc_scripts +rmathlib tcmalloc" RDEPEND=" dev-libs/boost @@ -37,16 +37,28 @@ DEPEND="${RDEPEND} dev-texlive/texlive-latexrecommended media-gfx/imagemagick ) + lto? ( >=sys-devel/gcc-4.8 ) " +pkg_pretend() { + if use lto; then + if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) ; then + eerror "Compilation with link-time optimization and GCC older than 4.8 is not supported." + eerror "Please either disable the USE flag 'lto' or use >=sys-devel/gcc-4.8." + die "Compiling with USE flag 'lto' is not supported with <sys-devel/gcc-4.8." + fi + fi +} src_configure() { local mycmakeargs=( $(cmake-utils_use_with cairo CAIRO) $(cmake-utils_use_with dreme DREME) $(cmake-utils_use_with doc DOC) + $(cmake-utils_use_with lto LTO) $(cmake-utils_use_with tikzlogo TIKZLOGO) $(cmake-utils_use_with misc_scripts MISC_SCRIPTS) $(cmake-utils_use_with rmathlib RMATHLIB) $(cmake-utils_use_with tcmalloc TCMALLOC) + -DDOC_DIR="${EPREFIX}${PREFIX}/share/doc/${PF}" ) unset R_HOME diff --git a/sci-biology/discrover/discrover-9999.ebuild b/sci-biology/discrover/discrover-9999.ebuild index 5d3cf63..34ce8c0 100644 --- a/sci-biology/discrover/discrover-9999.ebuild +++ b/sci-biology/discrover/discrover-9999.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -inherit cmake-utils git-2 +inherit cmake-utils git-r3 DESCRIPTION="A sequence motif discovery tool that uses discriminative learning" HOMEPAGE="https://github.com/maaskola/discrover" @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/maaskola/${PN}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+cairo dreme doc tikzlogo misc_scripts +rmathlib tcmalloc" +IUSE="+cairo dreme doc +lto tikzlogo misc_scripts +rmathlib tcmalloc" RDEPEND=" dev-libs/boost @@ -37,16 +37,28 @@ DEPEND="${RDEPEND} dev-texlive/texlive-latexrecommended media-gfx/imagemagick ) + lto? ( >=sys-devel/gcc-4.8 ) " +pkg_pretend() { + if use lto; then + if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) ; then + eerror "Compilation with link-time optimization and GCC older than 4.8 is not supported." + eerror "Please either disable the USE flag 'lto' or use >=sys-devel/gcc-4.8." + die "Compiling with USE flag 'lto' is not supported with <sys-devel/gcc-4.8." + fi + fi +} src_configure() { local mycmakeargs=( $(cmake-utils_use_with cairo CAIRO) $(cmake-utils_use_with dreme DREME) $(cmake-utils_use_with doc DOC) + $(cmake-utils_use_with lto LTO) $(cmake-utils_use_with tikzlogo TIKZLOGO) $(cmake-utils_use_with misc_scripts MISC_SCRIPTS) $(cmake-utils_use_with rmathlib RMATHLIB) $(cmake-utils_use_with tcmalloc TCMALLOC) + -DDOC_DIR="${EPREFIX}${PREFIX}/share/doc/${PF}" ) unset R_HOME diff --git a/sci-biology/discrover/metadata.xml b/sci-biology/discrover/metadata.xml index 24958c9..0862889 100644 --- a/sci-biology/discrover/metadata.xml +++ b/sci-biology/discrover/metadata.xml @@ -10,7 +10,10 @@ Use Cairo for sequence logo plotting capabilities </flag> <flag name="dreme"> - Allow to use DREME from the MEME package for seeding + Enable usage of DREME from the MEME package for seeding + </flag> + <flag name="lto"> + Compile with link-time optimization (LTO) </flag> <flag name="tikzlogo"> Enable LaTeX/TikZ based ruby script for sequence logo drawing