gentoo resync : 25.12.2017

6 files changed, 22 insertions, 22 deletions

diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 4bbf92da3935..bd08bfb98df8 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -3,9 +3,9 @@ AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014
 DIST libftdi-0.19.tar.gz 406671 BLAKE2B 47979967d8597584e46a5d9297ed24454d0583869110b52af7662a04a4b037ea57ec6ba133a61d355f0ccf1366b14195a8ccb13d7bb585264cdd1d528f2cf2d9 SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.2.tar.bz2 100672 BLAKE2B 314ee2695324bc3f6adad56d7ff8fddabfb86714a689ee309afc6aa8498a19fc55d2ea8f4edf0c378d944494505def3faabf1d9c3bb98e6c228526c392d26f09 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05
-EBUILD libftdi-0.19.ebuild 1234 BLAKE2B 6d3b3c223704cf104efb709c64106887962e2a2f5138586e2f3a8f2178dd87886a4993ed01b337f622c4efded07c857a4368c6a95f2682f1a39b84857e86b867 SHA512 3618b73cc502240a88fef090da39abb8e4a71add63f782e79763ef88621438bf0bc95efa45f936463daeb7905d7264d36abd45fd979594e39ad46d3fd8209bea
-EBUILD libftdi-0.20-r1.ebuild 1780 BLAKE2B 48e56d6a4c7e18c18d99a7397dc0acdbef87377394f82b698d06658e4c58bb8f56386810f6cd5e4e75edb0d01d6dccfc20003df6ec856aa3b002e773c272fabe SHA512 b82aa918db8fb28c0185849423cc20eccae76cebfa15a0f49257ca9d0eccb64f3c80188ead3d8056e73f8ce3945de5ccfe114d11f0d224f641779f0ead47768e
-EBUILD libftdi-1.2-r1.ebuild 1711 BLAKE2B d5023c8feae79998eefcad1ddd69bd4da5c7f4433fba511fd7337b527f1bacc6d65a5938a5071ffb1ade1603de8f9169c1b95087eda03e9f17ac8188d7e0b9e6 SHA512 36b0809ec968d944aa253b645cfca615445ea15b092df4afb0bac1f116ae5f77923ee1abf94632fee5c9ab9ebe553b3c6602be854e5903b94bfb3a95b9ddfc9e
-EBUILD libftdi-1.2-r2.ebuild 1721 BLAKE2B 82321eb4a9f3fda05c2b3d3ac89c5dd36016dc6b543c19f4f2a05e121d4d0eea9d1bc6a52762264d4f02070997a911ee5670389ab32780ed15b3bc54d787a0d8 SHA512 ab24bcde6120173308fa144bee5fe9e12e3e93f33c6370707a39d5f4f092c1fe6c2115c9464a3060ebbe3dca69759986cd21eb1150fb9ce5fb6b340f8a5d9aee
-EBUILD libftdi-9999.ebuild 1721 BLAKE2B 82321eb4a9f3fda05c2b3d3ac89c5dd36016dc6b543c19f4f2a05e121d4d0eea9d1bc6a52762264d4f02070997a911ee5670389ab32780ed15b3bc54d787a0d8 SHA512 ab24bcde6120173308fa144bee5fe9e12e3e93f33c6370707a39d5f4f092c1fe6c2115c9464a3060ebbe3dca69759986cd21eb1150fb9ce5fb6b340f8a5d9aee
+EBUILD libftdi-0.19.ebuild 1235 BLAKE2B 2c76a4080ad380355b24c9f2fe1c40ece41e80f8fad57c5c93233c9c13feabe1370263bda92f1ab55124bf0881b4bdb85bc5dcf20d8f52abb8c8b854fbd17e96 SHA512 35b81492bacdcf1ddf9fd8d2aea8e9149a83264d9da2cd524e7ff90497fbfd5132e17c47a5105ca73c26dc7f5826d4b4d81413d65169194bea6d1a1ac38791f4
+EBUILD libftdi-0.20-r1.ebuild 1834 BLAKE2B 048da8d61f6959bf6cb91f86ea573a44a912152c4703be5a8326970e7bec93fdb010d1abf001b4b6b749d06b65a9e9f8358db19b790916fa355cf8536e9a3713 SHA512 3ce94d14f19e250c1ecff203f4be72a96438ce473d308f291f485338c3bddfe54b6d78362cc9f95108b8f750ec15fcfbb6d69ac4f9eb9692a9f5c55e5135e5e7
+EBUILD libftdi-1.2-r1.ebuild 1717 BLAKE2B fa33c5993b734ae0eddbd87e3bf098d392ae8e808608ba435713b94bc77323aed77a26c8eed13a4578966a3723b780633bae9c40cc1d644a2c35f683a201421c SHA512 fd235ee3c492ca0a119ff616719f29776637e09362c0c14b64be3eb8dbabd6cd763b05ffc8bdce64d736e198d78cabd905987eb72c1bc492f029aae3f6ae3eb3
+EBUILD libftdi-1.2-r2.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
+EBUILD libftdi-9999.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-0.19.ebuild b/dev-embedded/libftdi/libftdi-0.19.ebuild
index 69ea48c31b00..71475c707666 100644
--- a/dev-embedded/libftdi/libftdi-0.19.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.19.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
 
 if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3 autotools
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2 autotools
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
 	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 87f52c9e3e58..8aed5262ba38 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit cmake-utils python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
@@ -20,6 +20,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="cxx doc examples python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:0
 	cxx? ( dev-libs/boost )
@@ -28,7 +29,10 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-include.patch
+	"${FILESDIR}"/${P}-cmake-version.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -44,12 +48,11 @@ src_prepare() {
 		-e '/SET(LIB_SUFFIX /d' \
 		CMakeLists.txt || die
 
-	eapply "${FILESDIR}"/${P}-cmake-{include,version}.patch
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
diff --git a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
index 8c4d73cf0ed8..9ca55beeaad6 100644
--- a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-	inherit git-2
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
@@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
@@ -33,8 +34,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -42,7 +41,7 @@ pkg_setup() {
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
diff --git a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
index c52061be670e..e35ae39feab1 100644
--- a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
@@ -33,8 +34,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -42,7 +41,7 @@ pkg_setup() {
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index c52061be670e..e35ae39feab1 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
@@ -33,8 +34,6 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -42,7 +41,7 @@ pkg_setup() {
 S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)