gentoo resync : 21.01.2018

7 files changed, 5 insertions, 92 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f27237c5acef..aa5763a41b0e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 681273a9c020..2c6e0163dd6f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -5,7 +5,7 @@ DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2
 DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
-EBUILD qgis-2.18.12.ebuild 5279 BLAKE2B b4400f19270a6d724890e4c1e1c0c8273429ffc491cf46f5c7d6c0c27a621a9d198568f3d6f60665a7b13fcd9484ae551f73c148877fafca51c7852bb444e92b SHA512 8118478f8aa8bc7ca5221f48125b6fab899bb8bd4db12da89472fc853f1b0eb8094a51c715e1962970b67462b7ed7939f9a92142b52442fd9d735ab3ce9162a4
-EBUILD qgis-2.18.14.ebuild 5331 BLAKE2B c3600735a749a82521dcb6adaf3cf8fa72d91ccda47d64cadb6da3f69789b4fb188303e7073792fb1906fcb5d49763cb4d13c0634fa08f2d67c6b99301fb097e SHA512 b62acaea5e1f8a1467593f194cde90ef2558f64cd915f517a042299865822656db8a743c47cd2f8bfd3710fdbb7ec4ed66ba8f5cab681392db6852927d91b341
-EBUILD qgis-9999.ebuild 5971 BLAKE2B 3cfc09b23d178b499078df34f1533dcf026ae35d2c4438787178170abf1291de33b987d468e107d488ebbc05ca93f53c13478fef20b2b11c36fe9eb07d94f92a SHA512 e8b0925c559773f0dba5faa4acce416bd15b4e8d4eb7c9006027459bd305afc35d4be0aa4f036e80a22d26ea9556866ab6b0c967c67e77e2907cef9320d1e1a1
+EBUILD qgis-2.18.12.ebuild 5238 BLAKE2B 71ce0aa312a0dabb8ef91b0f256dd65253617e3e5b37da7c8b2ece291a977c824247860c315ec2e113a1b77468120728b16aef0b876abdd3bdd6f4c60477f920 SHA512 6ed6eea3577c8b33773cf2d998458ee4c6a9ed5fa47c4912e8b8f15657a4c8cfa8ff8b054614c65cf664924d4a0070b2025e5b897c51fd66b1fcbbcddd6db2e3
+EBUILD qgis-2.18.14.ebuild 5290 BLAKE2B ccc7da92432f441b9bd56aa3e3e9bc87d29d8ef0874114cce02a716c67ec188815997ff4f558f7ca9bd39984ea49c239bf8077039af05fb49d0292b849061415 SHA512 791c4c68cf8d25eba4d0a7b23fd9f79f7964346abb99050ab1336289e86bc3383515bbff9c01eb3a2004574c4723a46ac51d964539f5059cab900870de611f07
+EBUILD qgis-9999.ebuild 5930 BLAKE2B ac86c3182edffc326943b76ef3f0cad724bd22b95337ef0cdb1f356b1ef7f37fded0822520575681d87e7e429bccbf5e1bd59c1946ca6ddfd04b0ea65ddf6571 SHA512 479c145b8883921aaf6b6889c2f6978fabdc58ac293df06fd5d40f4cc50e9db5ee74cf50a7abd29384a4f097bbdaa7055728421e9548fdfa4e368452750013b8
 MISC metadata.xml 1121 BLAKE2B c81c6538e2b0a0094f7566fc72e2c4249d5ff21d999355502b0eaf89cb77b0be305d0df0aa366144bf4ced98e5b07969b33a4f6ee2efb3438cdf098788850571 SHA512 bdd356ee78300f01de7169ab2c8915c369e8e2d5a7cce85df21ba4c4835b65164cc28d7258e7ac0efba4b826cce2d90d179c9247b3f53c06ba73d6b2ac175d06
diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
index bd5c16407bf8..3dcd7a697d1f 100644
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -185,10 +185,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"
diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
index badd711d115a..eb148f3d4fee 100644
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -185,10 +185,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a167a5305cf5..13ed091c52e0 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -189,10 +189,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	if use postgres; then
 		elog "If you don't intend to use an external PostGIS server"
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 86e198753fa3..772347b9abb4 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,5 +1,4 @@
 DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
 EBUILD viking-1.6.2-r1.ebuild 1737 BLAKE2B 7ebeff16a268c416f2ad3483444810f631f75b94a8b01b610a70e38bfb3c5ce0eecd582fd3aaf263ec465807f4218f084d87d54a660df82ce5c323a75f49d66f SHA512 ca42b943d2ca07bb0445ec94f30962c582c457dcf75480833d43d563a4b3566bd16350bf6d3d8aed6b2688f8deebd0585fc1c8670e8d2a2c4430ca17f6cc40a9
-EBUILD viking-1.6.2.ebuild 1583 BLAKE2B 42a03bc5d7713ebf48f7c5ffcac88684aafc4d3a635adc7eefaad021bb36fc317d182604f8516b5a77f54b66a9ce3936f1ec9d90a18df27be4b10522756e6b77 SHA512 7b64f44743726d3b34d9f3f90c7c02f2d12ececabf2973456d819af5190714538aaf8fd0dd2c1c2e4f5329f7edc46da5389b9b2965a9012900c6b144f1eaafc8
 MISC metadata.xml 828 BLAKE2B 4ca303eae02e593e48080b7fbd77fbaeff6b617b221621509932b0ef209d64ca356c9aca9504867508f3e857e587ed5db61ed97d12c49dfafe458bbfe66ec567 SHA512 c8b9fe12169e2ea31110188f2bb0aba17138dd325af8ad04d26803bed10ec63657a2de7fcc0ccb774b2731a1a85cf3bdad14c88796e6747ecbe5abb72d88e057
diff --git a/sci-geosciences/viking/viking-1.6.2.ebuild b/sci-geosciences/viking/viking-1.6.2.ebuild
deleted file mode 100644
index a87d9ea127f7..000000000000
--- a/sci-geosciences/viking/viking-1.6.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="GPS data editor and analyzer"
-HOMEPAGE="https://sourceforge.net/projects/viking/"
-IUSE="doc +exif libexif gps +magic mapnik nls sqlite"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-COMMONDEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/glib:2
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	gps? ( >=sci-geosciences/gpsd-2.96 )
-	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
-	magic? ( sys-apps/file )
-	mapnik? ( sci-geosciences/mapnik )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${COMMONDEPEND}
-	sci-geosciences/gpsbabel
-"
-DEPEND="${COMMONDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	app-text/rarian
-	dev-libs/libxslt
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	econf \
-		--disable-deprecations \
-		--with-libcurl \
-		--with-expat \
-		--enable-google \
-		--enable-terraserver \
-		--enable-expedia \
-		--enable-openstreetmap \
-		--enable-bluemarble \
-		--enable-geonames \
-		--enable-geocaches \
-		--disable-dem24k \
-		$(use_enable exif geotag) \
-		$(use_with libexif ) \
-		$(use_enable gps realtime-gps-tracking) \
-		$(use_enable magic) \
-		$(use_enable mapnik) \
-		$(use_enable nls) \
-		$(use_enable sqlite mbtiles )
-}
-
-src_install() {
-	default
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}.pdf
-	fi
-}