gentoo resync : 19.04.2018

5 files changed, 24 insertions, 126 deletions

diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index bcd9bb58abf9..0ec75fae22d3 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,8 +1,3 @@
-AUX libnova-0.12.1-configure.patch 331 BLAKE2B 5940e0d20aa6830d53f01e133e088d68a6b5cd10ac41f7b5b61ffbdcf3fe159c16f878a9e7d64844734eb218365c4bace2c2f947b217624573d54583d9a3060d SHA512 fda0ca74341894b544dcf4261bb2abb438dc26c7021c575e45bda0d8215a612a4b3f5456e0f115fd52cbe11c7f79a5cf0f2322bb5f85bd978fffa5c377858f02
-DIST libnova-0.12.3.tar.gz 1505676 BLAKE2B 96ece7030bcbfa831c6daa3ef02a1a9d100bd5145d881a9596e0a42ba1917dde007e79da95a433870957c526d0be65f8cb480b5633b0e9a5115a731688e79aea SHA512 e39c55c339dc2d7c899ffb7d0a898a5c2d6ebca5cf3a788db21d84f230a7379bfc0dd4736ed7ae66d8a449d1be9d68b8a4382ae55af4aa638bb734402c43bc72
-DIST libnova-0.14.0.tar.gz 1547373 BLAKE2B 75078d77868419e3cc6d6a7b5c513ebbf32062e4c08c54d5fa80d6e0f4d44eff8118b5d3df4b32d5e14e2f1b9eb989b154391a98eb79dcc83b2cf5f22bad67e6 SHA512 373d32e4f380563f895483d9054cf19bbfc69e32089f75dc91f84daf28610eba94f5615b0eb7004b25b9c702450d594463606b349b93dc9cde46d0d860029da7
 DIST libnova-0.15.0.tar.gz 1533794 BLAKE2B e87ffd3b8a895ca7ac9913ad3aacff526718442546df5687f2156718f721665ffff27e69af4bcb65bac5df1fda89fc6fc8fe9876a4b74392986771cf157dc48c SHA512 77ab0ccbfe462c03a21e88656cb4d6389994ea1da0ee8da997f19a83d24ad8fd9e505e70e1580b75332e826e5b7859b5f2af4417f65eb811440493ba586f2574
-EBUILD libnova-0.12.3.ebuild 1127 BLAKE2B 6203f62ea6219ab024501af2f5e641f922b129076f1d60fc8e6a62fc1d679ff27c4b635f644bcfa24669a088aa03a10aa2174cec0315155363646ddd014fbf36 SHA512 d6490764d1558afb0fc4eec5d473e198924e6f983d4439931475f9348427b742fb30a12d9d2a082902a28b042e416acf52c8ec711323f76df42d63e505446a35
-EBUILD libnova-0.14.0.ebuild 823 BLAKE2B a96161abf24de6ef882ed02d0103140b6272cbe31de519f071ffd0e753f4ebacbd4adcfeb7cadcd86014ae70e0242b5baeec127ff74fd1e821e28e02476e18af SHA512 b8867669b87e048a909ed22f1d0d1bc017bc99645e8e5cbfcca3601e78d9385d8c73f929ee7b983d84dbe684a3ee1d8e0b0d147f85428153ad807968c4278ff5
-EBUILD libnova-0.15.0.ebuild 883 BLAKE2B f8f05303c582298a9fb7c0d9862c3c85e10ff7a2797d1c81b14831b1e14074627a35a924dbd793f3a7921e2f75d4f4537ed4ca70a963f9a94bec1e73cb89fd45 SHA512 7eacc54f8b2dd3ef3b25e76b7a8650578ff56748636d73c7e13e25ca9a1fa587a1aff9b86d452a06d8cef52b323e591b027b9c6d589e512ef768ff188910f154
+EBUILD libnova-0.15.0.ebuild 979 BLAKE2B e93a6fcd3da8c34a69cea40881ea26340928c5a7c125c46eabcb50634f82aca8bf71fcf46b462ec7d6de3a9ce0baaa3583dc8b5515295c8610ac70ec5df20ed8 SHA512 683649b71c8decd8ed1341fcbda4785bf8285cd54d895703ce9206066c088983e4ee802ec26c545eff14a77ec13b706152c7cda076094bc9fad02dca42d86db3
 MISC metadata.xml 637 BLAKE2B dff43562550feffed3b305c3aa5473a1ea4256c10f1db163b8e7af9f751611525d0720d18eff17a64dd3cd0de1a441a912b79e86e43e307d50b439cb95ccc480 SHA512 f94be1667b076464ade40edbc7fdc3e73ee743c518e862df1277914826e91d9adc075d1a756e6a48a309bc32da384dfc17d5973f1e2b9e116d48cda697c5ece8
diff --git a/sci-libs/libnova/files/libnova-0.12.1-configure.patch b/sci-libs/libnova/files/libnova-0.12.1-configure.patch
deleted file mode 100644
index b87b27d75dc9..000000000000
--- a/sci-libs/libnova/files/libnova-0.12.1-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.in.orig	2007-11-25 19:24:54.503391146 +0000
-+++ configure.in	2007-11-25 19:26:16.736077320 +0000
-@@ -54,7 +54,6 @@
- AC_STRUCT_TM
- 
- LIBS="$LIBS -lm"
--CFLAGS=-Wall
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -74,5 +73,6 @@
- src/libnova/Makefile
- lntest/Makefile
- doc/Makefile
-+doc/doxyfile
- examples/Makefile
- ])
diff --git a/sci-libs/libnova/libnova-0.12.3.ebuild b/sci-libs/libnova/libnova-0.12.3.ebuild
deleted file mode 100644
index f531c830dbd5..000000000000
--- a/sci-libs/libnova/libnova-0.12.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
-HOMEPAGE="http://libnova.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.1-configure.patch
-	# 0.12.3 does not pass test with > -02
-	replace-flags -O? -O1
-	eautoreconf
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd doc
-		emake doc || die "emake in doc failed"
-	fi
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	"${S}"/lntest/lntest || die "lntest failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die
-	if use doc; then
-		dohtml doc/html/* || die "dohtml failed"
-	fi
-	if use examples; then
-		make clean
-		rm -f examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
diff --git a/sci-libs/libnova/libnova-0.14.0.ebuild b/sci-libs/libnova/libnova-0.14.0.ebuild
deleted file mode 100644
index 23a5867f38e0..000000000000
--- a/sci-libs/libnova/libnova-0.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
-HOMEPAGE="http://libnova.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~bicatali/${P}.tar.gz"
-# bad tar ball on sf, rebuild it from svn
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-src_install() {
-	default
-	use doc && dohtml doc/html/*
-	if use examples; then
-		make clean
-		rm -f examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/libnova/libnova-0.15.0.ebuild b/sci-libs/libnova/libnova-0.15.0.ebuild
index 5f190893d757..a0f7d8f6be46 100644
--- a/sci-libs/libnova/libnova-0.15.0.ebuild
+++ b/sci-libs/libnova/libnova-0.15.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Celestial Mechanics and Astronomical Calculation Library"
 HOMEPAGE="http://libnova.sourceforge.net/"
@@ -12,29 +11,40 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
 src_prepare() {
+	default
 	sed -i -e '/CFLAGS=-Wall/d' configure.in || die
-	autotools-utils_src_prepare
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile -C doc doc
+	default
+	use doc && emake -C doc doc
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dohtml doc/html/*
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
 	if use examples; then
-		make clean
-		rm examples/Makefile*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		emake clean
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
 	fi
 }