gentoo resync : 09.06.2018

5 files changed, 16 insertions, 20 deletions

diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 948a2223143e..80ed43d582da 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,8 +1,8 @@
 AUX smatch-1.57-restrict.patch 406 BLAKE2B c22cd24b1666c73daef2b90bd9e8235c418630f153430206f5d32b224782e7d500a6524eadec6ad6c0ff4d379725b84ecc7d8dcd185e7451593e50cfd7929e04 SHA512 fa4816a24a2f0ff4aaf057ac83fc0ba4d9787f0e2daa7e6999700448068460adddce6fcac3efdb7aa69e4d60b9eb34f4ff17056e8037419ac4f5d21b5be5514d
 DIST smatch-1.57.tar.gz 491677 BLAKE2B 150ba84dc797497b2522d28b443a89fbec221a00fcade85014d434f675ec60908a473770c695dbf65a5ed273c3e665aa9dc4ec9a91bc071651388a9ec90f1bfa SHA512 031f417c97d58b617b2e375a28f509f71eb2735212a98aee0e21880a28842078ad3c24b5375a03f73d75fec582a9d187ed6a00a0512c4792e5ffce82dfd79b99
 DIST smatch-1.59.tar.gz 495530 BLAKE2B 668a050e229cd9b4e5881fe059f5a8654164f5a155c471559ce7a82e66bcb2170f89a25680be7ff867f2765b574f363ef95a15a65ca98d47dbd8aed20f588f9a SHA512 5e18f48dbbe11255a06b427205aefd1f8f5a11bb0b238f9134b89e6f5cb838fcae649a4e87a4a04473a33077c94e88aab46b06e33cc87cfe451fa83b5846ccc7
-EBUILD smatch-1.57-r1.ebuild 1258 BLAKE2B 5b6baf229c0fca1923f1695b6746277ec997359db638d278bb1d166c627a7308d5dd3a281ba41a89ab7520d4faa95fff4d6eebbcf64d27bfdd38ae6fe380b215 SHA512 27b2c45fb70953190af70913aa3bf80030b95edd45d1204063db364209df8d453a4c94a57c837fbadf3cf39f1598a5b77b5e5de28654d4ad2762388ac035fb8c
-EBUILD smatch-1.57.ebuild 1209 BLAKE2B fdf5382e44a2c9be25050715d6fb3c6e5e1fcd1195c66b62c359eeb4b2bf2a85191105495bd2016cfac61a20f9b870f48366b3315856e1a39dfba12a9b12e237 SHA512 85aa6e85b35628e53b54e617ab639267f50b12927d5c415d3cee82f19a384462c17d53a65869a9ea4a7b675b4a8b70d757705727af87ac684eb5a1a9167f6a12
-EBUILD smatch-1.59.ebuild 1217 BLAKE2B 3189864e942557f9117dedabf1a9f69e552ffa61b371dfea6ed47151af73594a04f47512a8475ca73829b98167a1c0f4a4c1be76447c086421c5e5e6cba5295d SHA512 c22981a1e5917b32c7ad113df8b7dec529a38bbbaa06ce3abe79c8d23b7b7c86eca90637db0486dcc07d05dbaa48746410f18ce5e5218957f3b831babe810ce4
-EBUILD smatch-9999.ebuild 1217 BLAKE2B 3189864e942557f9117dedabf1a9f69e552ffa61b371dfea6ed47151af73594a04f47512a8475ca73829b98167a1c0f4a4c1be76447c086421c5e5e6cba5295d SHA512 c22981a1e5917b32c7ad113df8b7dec529a38bbbaa06ce3abe79c8d23b7b7c86eca90637db0486dcc07d05dbaa48746410f18ce5e5218957f3b831babe810ce4
+EBUILD smatch-1.57-r1.ebuild 1259 BLAKE2B f7087313102dcddbf48144d7e4466d5b84d736ba6332dcc3c613dca105933cac4b88ee128d62b61e002a2fa9558d190535d83909de3b7da79a63cbf5abb32386 SHA512 d79a795083b48938abd2dcf68cd119b0db642c563e57ba8e38a3ec1031e3bb3ee29c40abc3db6f98b1c0300836871586ace56447376b203dc0ef5395342bd268
+EBUILD smatch-1.57.ebuild 1210 BLAKE2B d9a0ad71528dd7676e0dc3891413cc6bbe17ce875905b7c184a47148331d5222dfcd4e4614c3f9b510f8b49fe2e1f0372e6ae3a740a66bda4e1fe2a5b86eabb1 SHA512 310410b07f94e7ce5fb353696139e28b88af5b0bf112fd078a2c79dcbb6816d6db9dac9c5c2049a3a7215a4b311915b5b33dbecc0d34aecbd2e5cd3bd05b8c5c
+EBUILD smatch-1.59.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
+EBUILD smatch-9999.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
 MISC metadata.xml 337 BLAKE2B 3215b338ec89ebd2d1d39e33c5903a6ad571ee6ad4236968a2c250f2d7882c90c2791746df43455a7fd63ebff544177f49c9e0074a31ccd81f7ef68f1eabfa82 SHA512 8d4007163912848eb4e4b525c808e7c69fe5aa93913398db793b6ed73936cc936a25e1fe7dce4a915b4caf6b2796d6dd4d1a52ed6dfbd2e0fb0faf6c0ba1c7e0
diff --git a/sys-devel/smatch/smatch-1.57-r1.ebuild b/sys-devel/smatch/smatch-1.57-r1.ebuild
index fd7fc3e72b97..6a2ec7381faa 100644
--- a/sys-devel/smatch/smatch-1.57-r1.ebuild
+++ b/sys-devel/smatch/smatch-1.57-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -22,6 +22,7 @@ else
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 LICENSE="OSL-1.1"
@@ -31,8 +32,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-restrict.patch
 	sed -i \
diff --git a/sys-devel/smatch/smatch-1.57.ebuild b/sys-devel/smatch/smatch-1.57.ebuild
index e807d2044380..f232ca67e03a 100644
--- a/sys-devel/smatch/smatch-1.57.ebuild
+++ b/sys-devel/smatch/smatch-1.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,7 +7,7 @@ inherit multilib toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -22,6 +22,7 @@ else
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 LICENSE="OSL-1.1"
@@ -31,8 +32,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
diff --git a/sys-devel/smatch/smatch-1.59.ebuild b/sys-devel/smatch/smatch-1.59.ebuild
index b2a8198a82ca..b8be38b5cade 100644
--- a/sys-devel/smatch/smatch-1.59.ebuild
+++ b/sys-devel/smatch/smatch-1.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,11 +7,12 @@ inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -24,8 +25,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index b2a8198a82ca..b8be38b5cade 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,11 +7,12 @@ inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
 		http://repo.or.cz/r/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${PN}
 fi
 
 DESCRIPTION="static analysis tool for C"
@@ -24,8 +25,6 @@ IUSE=""
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \