gentoo resync : 13.01.2018

6 files changed, 64 insertions, 53 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f07d1ac9887b..6d08dad05446 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6678840894a2..0c4bae34922a 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,5 +8,5 @@ DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
 EBUILD fftw-3.3.6_p2.ebuild 4433 BLAKE2B ba57766a5fc3f4dbf6eb5545b55e2c8eeed8a5e63cc35746fb78d9b583f2ba7831062ccc471cc426f12c1635cd5b259967e1a855a9465d2b566847d7ce896322 SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b
-EBUILD fftw-9999.ebuild 4629 BLAKE2B f4330901801b3a0fccd943915f7efa4a28b82b317a3e90f00ed05a90fa56515c758ec2e714cc280cc335c10f25019bcf4a7fd6ceccb985a4a1330041f7a615bd SHA512 3eb9c89f8bb1ff625f0c5dceb3286a59a61e5561f4ef29da8f4b860a3212ca315b582660a50cd647bf4676758654ce3124eaa0ec6c78dbbc852169d4a79b8079
+EBUILD fftw-9999.ebuild 4654 BLAKE2B b4118a314849101394a263073a661735c3e2ed85ff0b1b55ac3f62e23d295bd92259cca9f21f4e65839d3f264febdadd4198789fa5728c5c71a7c305ecac0bcd SHA512 b19cb97bbc3cd97e3d8c0500bf667e960ae252c6b3ef083736ba903f8bfacb284dd0369b15f3013754978cc9fe71f8dc5f21441e1854bea9967fbfb5a898f94f
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index bef41e83ea09..c08278dde801 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -30,11 +30,11 @@ DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 if [[ ${PV} = *9999 ]]; then
 	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild"
+		dev-ml/ocamlbuild
+		doc? ( media-gfx/transfig )"
 fi
 
 S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -146,7 +146,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
+	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
 }
 
 multilib_src_test() {
@@ -164,6 +164,7 @@ src_test() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -171,8 +172,6 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 63a417dcdf9a..86bcd876a8e3 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
-DIST indi-1.3.1.zip 20752009 BLAKE2B 45dcdae1fa3b830ef9220c1d38212aae74bbc64911577a67f8926b8f88c7567df49766db84bc2b037ae63e9467c4cef1dc831750313c620905db0d9213d4eb40 SHA512 80184287aebf1bc8381ba9f36b83f346411348c610c6c06c7b9aeb4a2c9f3a9713e4f043af66cb777d7fa8fe208d98fa1134c1f0935a706d1797eae38f0ef3f0
 DIST indilib-1.4.1.tar.gz 1529660 BLAKE2B e869ba6b7430515a88f536d1738a9e5beb2622fad20d47ef2e981f9f00eb46e8703b2ad7842dca00b784d972cae639db3c8bfbb301ecbec8d582f372dae2f360 SHA512 b1655070fbc71095215a06edc88b8fff247ed3dcab86c2af058978b209e48ce1701f3a6eef13d0b200be58abfcfdffe7800ecea35d820fc2fb158ea0f899833f
-EBUILD indilib-1.3.1.ebuild 825 BLAKE2B 017cb6fd2585f80288db3a45f2b9c6064a1d7767ba5bce0f34c60879189e610e3d8bc0338738417a89498e209fdb6ece4197621c04813fe74f624e6e56dfac62 SHA512 a7896fc0db97ebdd8b4f64b953abf10db3da8ef0158bbddfbd9fdfb0866545fe49017c618e3b0a280e0fa1b039baed48f3c78cbbc60efeba021e81bdea3ed33a
+DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
 EBUILD indilib-1.4.1.ebuild 845 BLAKE2B 67d815e51377ee5b154f91835e89352c77d5bdeccb69fe547da980a6be529ac08fdbaa07e69a505ffe542efc9793bb2fb63a2c7c88a95d9cecc6ef83ffe40824 SHA512 8bd626e97b2e8dff6081c62664be68cd5e42179315c5587a377e3a043d04dc416f89fbea44213e374d5470cd43866172f0bcd8f226b824e6ab8e16d7d21b4375
+EBUILD indilib-1.6.0.ebuild 1118 BLAKE2B 80c98094301156bbd7908f3ee3444b06ac529c43b6e488dce8b432571f894da0fa5323d2e74c1b0b09d03055bd505391c026dc7b81aab247d747c69ae1348bdb SHA512 992e6b768c3643e936108d4252f90c205e9176573326acc955918fc1e31da4bfcbc6a44ce3d7440b90a1ddf9d78494335e4a95fcb0f0426561306ede052ff413
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.3.1.ebuild b/sci-libs/indilib/indilib-1.3.1.ebuild
deleted file mode 100644
index accd09d2328b..000000000000
--- a/sci-libs/indilib/indilib-1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="lib${PN/lib/}"
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://www.indilib.org/"
-SRC_URI="mirror://sourceforge/${PN/lib/}/${PN/lib/}-${PV}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio
-	sci-libs/gsl
-	sci-libs/libnova
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	sys-kernel/linux-headers
-"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-S=${WORKDIR}/${PN/lib/}-${PV}/${MY_PN}
-
-src_configure() {
-	local mycmakeargs=(
-		-INDI_BUILD_UNITTESTS=OFF
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/indilib/indilib-1.6.0.ebuild b/sci-libs/indilib/indilib-1.6.0.ebuild
new file mode 100644
index 000000000000..e071e3c07b76
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="lib${PN/lib/}"
+
+inherit cmake-utils udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="http://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/releases/download/v${PV}/${MY_PN}_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ogg test"
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-libs/libnova
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	virtual/libusb:0
+	ogg? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	test? (
+		dev-cpp/gmock
+		dev-cpp/gtest
+	)
+"
+
+DOCS=( AUTHORS ChangeLog COPYRIGHT README TODO )
+
+S=${WORKDIR}/${MY_PN}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DINDI_BUILD_UNITTESTS=$(usex test)
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
+		$(cmake-utils_use_find_package ogg OggTheora)
+	)
+
+	cmake-utils_src_configure
+}