[gentoo-commits] repo/gentoo:master commit in: sci-libs/libgenome/, sci-libs/libgenome/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libgenome/, sci-libs/libgenome/files/

[David Seifert]

commit:     c44d450a927693cd4d0ebb694cbebd0afcfef47a
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 19:37:27 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 21:06:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44d450a

sci-libs/libgenome: Allow for compiling with GCC 6

Gentoo-bug: 594372
* EAPI=6

Package-Manager: portage-2.3.1

 .../libgenome/files/libgenome-1.3-fix-c++14.patch  | 30 ++++++++++++++++++++++
 sci-libs/libgenome/libgenome-1.3-r1.ebuild         | 26 ++++++++++++-------
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/sci-libs/libgenome/files/libgenome-1.3-fix-c++14.patch b/sci-libs/libgenome/files/libgenome-1.3-fix-c++14.patch
new file mode 100644
index 00000000..ffe30ef
--- /dev/null
+++ b/sci-libs/libgenome/files/libgenome-1.3-fix-c++14.patch
@@ -0,0 +1,30 @@
+Fix building with C++14, which errors out due to collisions with internal abs() function.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594372
+ 
+--- a/libGenome/gnDefs.h
++++ b/libGenome/gnDefs.h
+@@ -175,13 +175,6 @@
+ 
+ #define CONTIG_SECTION_SIZE 3
+ 
+-// some compilers don't have abs() for 64 bit ints
+-#if (defined(__GNUG__) && ( __GNUC__ <= 2 )) || defined(__INTEL_COMPILER) || (defined _MSC_VER && defined __cplusplus)
+-
+-int64 abs( int64 a );
+-
+-#endif
+-
+ #ifdef __cplusplus
+ namespace genome {
+ #endif
+--- a/libGenome/Makefile.am
++++ b/libGenome/Makefile.am
+@@ -29,7 +29,7 @@
+ gnGenomeSpec.cpp  gnLocation.cpp  \
+ gnRAWSource.cpp gnBaseFeature.cpp gnSEQSource.cpp gnSequence.cpp \
+ gnContigSpec.cpp gnSourceHeader.cpp gnException.cpp \
+-gnFastTranslator.cpp gnPosSpecificTranslator.cpp gnDefs.cpp
++gnFastTranslator.cpp gnPosSpecificTranslator.cpp
+ 
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
+ 

diff --git a/sci-libs/libgenome/libgenome-1.3-r1.ebuild b/sci-libs/libgenome/libgenome-1.3-r1.ebuild
index 77c6ca7..a52575c 100644
--- a/sci-libs/libgenome/libgenome-1.3-r1.ebuild
+++ b/sci-libs/libgenome/libgenome-1.3-r1.ebuild
@@ -1,32 +1,40 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI=6
 
-MY_TAG="mauve-2-3-0-release"
-#ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/libGenome/tags/${MY_TAG}"
-
-#inherit subversion autotools
 inherit autotools
 
 DESCRIPTION="Library for sci-biology/mauve"
 HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-#SRC_URI=""
 SRC_URI="mirror://gentoo/${PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
+IUSE="doc static-libs"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
+PATCHES=( "${FILESDIR}/${PN}-1.3-fix-c++14.patch" )
+
 src_prepare() {
+	default
+	rm libGenome/gnDefs.cpp || die
 	eautoreconf
 }
 
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }