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

5 files changed, 39 insertions, 5 deletions

diff --git a/sci-biology/discrover/ChangeLog b/sci-biology/discrover/ChangeLog
index d81ca8c9f..fd6eb453a 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 <jonas@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 <jonas@maaskola.de> +discrover-1.4.1.ebuild,
diff --git a/sci-biology/discrover/Manifest b/sci-biology/discrover/Manifest
index 1696d9c31..761387b9b 100644
--- a/sci-biology/discrover/Manifest
+++ b/sci-biology/discrover/Manifest
@@ -1 +1 @@
-DIST discrover-1.4.1.tar.gz 236507 SHA256 abe181563828fd6f73941d98c954d8b0a88317cab9789c855a01b1eeb1686dc1 SHA512 950ee3fd4c37a5f9386d9800b2f5e0bb0e144818de28d35098e5de3074a9fd2572d0244034f5e4c28cc6c850741930e7139e24677a3e57dab2ab4da4277f87bf WHIRLPOOL ea415f005aa6782dec62b1c8011921e234dd929bf75f672deecc1856dea205f2bf2afa9c48b62bdbca305b8c5fe7b9d99d16d3777bb6c14cacc0020e66ba69d4
+DIST discrover-1.5.2.tar.gz 257926 SHA256 047222c605b8e49096bb6d003a3aa1bea10fb489f990441c6d02804acd957d8b SHA512 31e8414f625dd3cfc2564145ffebdc0f69dad9cbe1c70034b874be04922b3867694ea5a525b8bff9823135527b7eed84ed3592a53705ba8f113d54f08c9f9438 WHIRLPOOL 76365fa0db51fe94186b8524e17a3a15c820dfe982af71c6ac02c649fc030b8d92b895ed600444235ba23887b422a9683e1ebeffddfb7c21fe9c471e958ded45
diff --git a/sci-biology/discrover/discrover-1.4.1.ebuild b/sci-biology/discrover/discrover-1.5.2.ebuild
index 5ae256fa1..b17687ee4 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 5d3cf6316..34ce8c0f2 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 24958c9f0..086288960 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