gentoo resync : 02.08.2019

3 files changed, 2 insertions, 77 deletions

diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 05c7b4c30a8a..82ddbb2226bd 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,8 +1,6 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
-DIST libgeotiff-1.4.0.tar.gz 1517881 BLAKE2B 5340029481b1d529626170e61b73948a620cf24e86297178eb84a76e4988dd5bde2c278f995d39fa598a84eaaac69e93a62e7d091a77830c5fd16a43cb20a750 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.4.0.ebuild 1507 BLAKE2B af67acd8b1095a41d858b412cb9b8056e364056c9a646f160e6b3e2f8eca16b94b3ccbba05cf67ed190d5200683d82635b593bd822c7e07ff91ede7f15fa362b SHA512 1f07cae9b9c412e3efa268f3517ccd6c744551496d2c4bd4235ec03c126515b2b173b767bd12533a4958abf11ab2b9c0e0be2c7b2a6ad345aaa52a109aa88bc0
-EBUILD libgeotiff-1.4.1-r1.ebuild 1281 BLAKE2B c3cbdba953235eb15c5f76ea021be22cc4276188ca6d708ca2d1f30e62a29fbcf2412fd7a054f6466869d07cf22a2041f42de5d788a7092d39d3dddee79195cb SHA512 8f1ba70d03e67c1e3994b3964c23eadf9a7e947141ea62463d5fb51289f81d2a2778237bbc120f3da8e931b81c96b814542720df78f2e31fc97bc0a818f6bcb9
+EBUILD libgeotiff-1.4.1-r1.ebuild 1280 BLAKE2B 4a9b5b8eddf22a9c0e1d3578029036146c00bec8883a1a59d09a274f28ef573dde917e2cc0daddf771d2ac94fc0de6fd9612cb3c1ce6130d6e4a958d3afb7df4 SHA512 ef13ec278afe453581231b4eab2d0e5d69eafc539025e902db6ca411842e105e20f5fd3f9fc085b50ddaf2d220435eb740f16779091428351ff1a5e37d828580
 EBUILD libgeotiff-1.5.1-r1.ebuild 1287 BLAKE2B f25dc592b8ea6f624a35a0a4e269d4b44705aa441d9844ee412c3891784d2f75b714fbb6cfba2235ca2ad7be89e45bcea1173a0ddc9e59750e86f8457b09eb9f SHA512 e0ffc07f1150e0b91443921674ef85533139184f43baa0736b03351acfc20b1b7d66dfc123b4aa3bd788e5f4cae1b142d46d7ac7164d855f1d97d07dfee2ba7b
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
deleted file mode 100644
index c7aebcf4ce30..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="http://geotiff.osgeo.org/"
-SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	virtual/jpeg
-	>=media-libs/tiff-3.9.1:0
-	sci-libs/proj
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P/RC*/}
-
-DOCS=( README ChangeLog )
-
-src_prepare() {
-	epatch_user
-	sed -i \
-		-e "s:-O3::g" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-debug=$(use debug && echo yes || echo no) \
-		--with-jpeg="${EPREFIX}"/usr/ \
-		--with-zip="${EPREFIX}"/usr/
-
-}
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api
-		cp "${FILESDIR}"/Doxyfile Doxyfile
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml docs/api/*
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	ewarn "You should rebuild any packages built against ${PN} by running:"
-	ewarn "# revdep-rebuild"
-	ewarn "or using preserved-rebuild features of portage-2.2:"
-	ewarn "# emerge @preserved-rebuild"
-	echo
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
index 87d53b8e09f3..aaa7845a9a1d 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 RDEPEND="