gentoo resync : 06.08.2019

5 files changed, 37 insertions, 9 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index c5b5ce4b3c7e..f2bef769e92f 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/ViSP-images/Manifest b/sci-misc/ViSP-images/Manifest
index 4c07f6dfbdf0..f782535f9096 100644
--- a/sci-misc/ViSP-images/Manifest
+++ b/sci-misc/ViSP-images/Manifest
@@ -1,5 +1,7 @@
 DIST ViSP-images-3.0.1.zip 70498859 BLAKE2B a1b64e49337713c6ed96d471d8e94ca37a149359e736e28dcc87e3d9d75a8f8a7d0147bba822f4889122d235b86b0aac7d7db4647067416056476d13d41881bc SHA512 b3fac5b08a9aad24c27e9f887a096386995a30af616c0137ca2e61445c96dc474a905604133740d550827f7e67d2c0d492774e0c0277e4ca44c5df6df06c8477
 DIST visp-images-3.1.0.zip 81133842 BLAKE2B 6702582d4cbd53b72edfa57999cf42069ec5b3f5179983368552f72fdfdf5480a7e25f87dcf5e53856b310f83c5e0bb872e8353aeea1032c73ee00bd0a77f618 SHA512 0d865234c1f6278a9f0bd3bfc58aeb9083e7ee8a748b2f7ab96d3aedd21ef164cbf1dc3113facfafdbac2e0256aa932b8b5f8efa2e348f1ce834c50e703cf14d
+DIST visp-images-3.2.0.zip 84366211 BLAKE2B a0cb17bf7e79ed187a40f229b236e83127bd449f48a4046c21235f6f6cd37b25a324ba74c1337a110b91a42789249e71ce86fc2fa81e1573733db1bf4fff1cc5 SHA512 1249f63ca648e0248d6dcc13ae19a8485d347c90f3f929d4725909ec1b25962f58a999e8feed664ed51ccba9a3ba95a184385aabd0a5aef88f118dbb2a020c14
 EBUILD ViSP-images-3.0.1.ebuild 503 BLAKE2B 6e4bf456707cbc22048c5930e08cab78fcfc171a426dd2311b024b11dc73f5ef64b603249f0734b9f3e8bbb4add346707cd9ab5c90e905940e6ee4667eea08b4 SHA512 ebee1ff121e00f304aa6e2769c347334c1924acd00907a08a1442a33ef69077359faf01dbe8def2ff5e4dafd34e5f6822226e7bb7e1c473f891cd1d2a9ec1db9
 EBUILD ViSP-images-3.1.0.ebuild 550 BLAKE2B 27fe8cf848925371eb2b5fa8310edc386ee49e6a6a2a9c0dcf19120e8dd64dcead041d33ebe1af88a18beba51441bf6168b434fab6fd37cd9509584314bade49 SHA512 3ac46e91dfe5585d7557c96bf1b77d92124de4a3d93ec92654f0727dbf40ffbe8a60fd7e7bcf760cf312182be04d05bd9cb66888a93569ce21255ed00902ac3e
+EBUILD ViSP-images-3.2.0.ebuild 547 BLAKE2B e8a9da04ebb39e8bb5140d5be1ccf87b507f79e830fa94c2be74ca43d1f7e194c7dfd47342f832398e60338a03d1647d8d838be9d5f1368d6ffd1b6b343f2f7f SHA512 6ac2b1294ab67aa5379e0834b2e6df45a29eab46d7e79d55b2044ee9ddda11daee387277b933031d12c09f4765b560892730748fc5d2328bf862a75a1a38b01e
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild b/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
new file mode 100644
index 000000000000..ff0ecbb3bdf4
--- /dev/null
+++ b/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="ViSP images data set"
+HOMEPAGE="http://www.irisa.fr/lagadic/visp/"
+SRC_URI="http://visp-doc.inria.fr/download/dataset/visp-images-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/visp-images-${PV}"
+
+src_install() {
+	dodoc README.md
+	rm -f README.md LICENSE.txt
+	dodir /usr/share/visp-images-data/
+	mv "${S}" "${ED}/usr/share/visp-images-data/${PN}"
+}
diff --git a/sci-misc/gt-itm/Manifest b/sci-misc/gt-itm/Manifest
index 17977e50792f..c08ad6271576 100644
--- a/sci-misc/gt-itm/Manifest
+++ b/sci-misc/gt-itm/Manifest
@@ -1,5 +1,5 @@
 AUX gt-itm-implicits.patch 2731 BLAKE2B b8aaea5e6016d9c3e6badc3a5f02f83188830bbe79501183dbfea9453d3af51479d46e83a7053eb86241a203c3a808f8e9a0d78cb350c01eb9d6c6483be4bc91 SHA512 64dc41be9d914e1df68780576300c54aa8091862b37ae44b5530312b8eaafbda76d97021f62544bce7c57e447959eea5a83c72074a714b4894bf4fddc79b5fe7
-DIST gt-itm.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
-DIST sgb2ns.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
-EBUILD gt-itm-19961004-r2.ebuild 2077 BLAKE2B 7628ed27586f3a71e15c71ca0863ff7dd49b5b6a087524060e28c0467dbf7c0db039b46bb41fe38de5c0191496957d6fcd51f8dc8658ee329b5996c90f92fff7 SHA512 eb9a4a175782790a4d473ed74721b3aa13df0fba4fca34831cdca7474059e596e8081fc92ff16024f49d05d8ef40ebad4f88b836145999bf2c9d79b4f6c54e02
+DIST gt-itm-19961004.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
+DIST sgb2ns-19961004.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
+EBUILD gt-itm-19961004-r2.ebuild 2118 BLAKE2B ce805335d8360fd8fb6f268a5a1afb0c573f514ceca3401786f6c1048da8ba30f3a57863eb2c53af1a0c0abdcefa3235ba4ca9ac294fd137ce8a26f3ddcaed61 SHA512 5504fb37e2fcdc8469cebdacbdf5cbc3bf85ded66154a91a85419a16f946f9d8fff9c3e7f8037e5ab34f811aa790e9a754fd6e41f99e327b93bdca6d7ab54e1d
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild b/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
index 36c7552cf47e..99585d83edfe 100644
--- a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
+++ b/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,9 @@ inherit toolchain-funcs
 
 DESCRIPTION="Routines to generate / analyze graphs using models for internetwork topology"
 HOMEPAGE="http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html
-		  http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm"
-SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz
-		 http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz"
+		http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm"
+SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> ${P}.tar.gz
+		http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-${PV}.tar.gz"
 
 LICENSE="all-rights-reserved sgb2ns"
 SLOT="0"
@@ -27,12 +27,13 @@ PATCHES=( "${FILESDIR}"/${PN}-implicits.patch )
 DOCS=( README docs/. )
 
 src_unpack() {
-	unpack sgb2ns.tar.gz
+	unpack "sgb2ns-${PV}.tar.gz"
 
 	mkdir "$S" || die
 	cd "$S" || die
-	unpack gt-itm.tar.gz
+	unpack "${P}.tar.gz"
 }
+
 src_prepare() {
 	sed -ri -e '/^[[:alnum:]]+\.o:/d' \
 		-e 's|LIBS = -lm -lgb.*|LIBS = -lm -lgb|' \