gentoo resync : 26.11.2017

3 files changed, 86 insertions, 13 deletions

diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 4612f32e1216..1e0defc2aab3 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,12 +1,11 @@
-AUX libftdi-0.20-cmake-include.patch 687 SHA256 19016ce8156cbc49fbe89b4d253bf191443cda799211dce2df282d0653dd9b60 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90 WHIRLPOOL ab531f36f9b7ddf862243ba2a639a3b72f18cc295659c5bd4188e9e0a669f6a47dcbd67b797e136b87c23422528a8a22ed8701c7dd2529290e2417f7a40a9f48
-AUX libftdi-0.20-cmake-version.patch 1010 SHA256 2c994cf13542045d70d05d776021f1a2ed44e50c0647d6133d86ab3b98c7d2bb SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91 WHIRLPOOL 722d06dfceadf764c08fb49be072e97a39b8be76623a16363533d444c51cc9f5b49a39ab480a88ccc74e7d949a8e8c9bc48df9fba23f335e42899bc657c1c512
-DIST libftdi-0.19.tar.gz 406671 SHA256 567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972 WHIRLPOOL b3ee2812697cb8e0e549d580b07b2d67f2bc7bbb5da823e80172748d2d907e67c36314c4524beb2278e131a57c1ae4e25efaaa7b243ab80b30a3f88fa9f6fd7a
+AUX libftdi-0.20-cmake-include.patch 687 BLAKE2B 8817db6e200adcb3d76da91565fe25f694445a46325a6435d6d0545d6741b0d15b199f96aabf01ca664eeb3355008acc6ec309f5fa87f975584935ecd74558f7 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90
+AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014549bdae23e35fefb0d2f6cf14c4610d79ebfbbb11e94174b6c1ff260d83713c4c4db395c725bbe836142e0e80092324a3f SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91
+DIST libftdi-0.19.tar.gz 406671 BLAKE2B 47979967d8597584e46a5d9297ed24454d0583869110b52af7662a04a4b037ea57ec6ba133a61d355f0ccf1366b14195a8ccb13d7bb585264cdd1d528f2cf2d9 SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972
 DIST libftdi-0.20.tar.gz 423570 SHA256 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 WHIRLPOOL b1eab592bd6a21a123c7e951d5e4cdafc740c20773b8c5c7c86eef2a05bc8a190a2758a04187d3436de464a49dc329d4e4c9e54792287cc5c39a0ec7d08425d2
-DIST libftdi1-1.2.tar.bz2 100672 SHA256 a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b558488d6 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05 WHIRLPOOL 7e6646a23b8e8f1c0fec6b1ad3231797653e1788abfb7340cd391c792d2f48e4cada0ca832e325947b49d964919d5b81cddd8b43f3962d185605afbabd743fbf
-EBUILD libftdi-0.19.ebuild 1234 SHA256 767b1c39ffbaa889d60600353f11fda29e83d095bb27bc5dc3dfcab58bfe796b SHA512 3618b73cc502240a88fef090da39abb8e4a71add63f782e79763ef88621438bf0bc95efa45f936463daeb7905d7264d36abd45fd979594e39ad46d3fd8209bea WHIRLPOOL 46ed635dfa57c471189444b38c40d5a2be4e27b6d6cd98146b37c4cb4475757f0fdca23cf02cc22871dc8e71bd9c28c89db2ecfeaa61fe9bdffd2a483f65063d
-EBUILD libftdi-0.20-r1.ebuild 1780 SHA256 eda575c331894e849317a89b0b2336d1fe944b5540d7c7901fcaada99f1d63e9 SHA512 b82aa918db8fb28c0185849423cc20eccae76cebfa15a0f49257ca9d0eccb64f3c80188ead3d8056e73f8ce3945de5ccfe114d11f0d224f641779f0ead47768e WHIRLPOOL 79b3e04140001fc900d3b30883c884844ac83adce687a240445b14346eb4c7caa6968a291160fb0977a6273769abb4e0e612f761d9c02de7e49a71d81c7ea0fb
-EBUILD libftdi-1.2-r1.ebuild 1711 SHA256 36d0d338b7f69901b39175f252f8fb1eabce57b5d9c77ec65d222c51e416bec8 SHA512 36b0809ec968d944aa253b645cfca615445ea15b092df4afb0bac1f116ae5f77923ee1abf94632fee5c9ab9ebe553b3c6602be854e5903b94bfb3a95b9ddfc9e WHIRLPOOL c3398086752d736a22a288bdc9322e7909edc4bc166c57cabfa8eeb7f017d37305a820c604acf51389120152dbc361ce6fdeb4ef0f7c1f04ad56cae3bf899aac
-EBUILD libftdi-9999.ebuild 1719 SHA256 f8db37307c378b1acd5c2b865ce37e95c0a89f84bad12bb1ba26949d221bbcfe SHA512 47aff56b37396b7d52f588e7a063d8765b4c5a7d81f6481747ba8e543ed8230f5a21756819e3582588abcab8d9f5b7977750d621c531aefbbeafa57b77d5a926 WHIRLPOOL 9df60f7c70f2178e9ecea0ecbfc98218f2df3e1c846d15d418d41b3e89dc6fe90cd776cd11efeabd1cdb839ca070cce4ade6b8c977ad59207b841811664258df
-MISC ChangeLog 4632 SHA256 198b905ea49c887fb0ae33085aeddd99a0cc2270fd7db1821b3918de2c8df186 SHA512 5e12e7078b178d780bf35e6da13c60704470d4ad9beebd8c2d4879aaa19feed250b8f3d29d29f04a2cd4633930c6b7bc49e3340adc7252c7e824b06bab7ee132 WHIRLPOOL 9897aca6284519e1b7a4b4c01c9f99bd6fae0dfafbb9191e348d201606edb9cbd6ef00513c589c8822e5571f085d28a957f7455bd6725a9b3cc4ee46ec9bc748
-MISC ChangeLog-2015 8164 SHA256 61e6e8e3c871f8ff1483d125f879d14760e6ad315570efe77639799d0d924e74 SHA512 ffea194231ceb93b30412a2e72cb57863a4c49ae2017af37f5f48da5713344f17a8016c2fc5f8108e2a11614a7ba0cf1f93c1669bbc95198ba8f2c57190fff26 WHIRLPOOL 55b05256ee157eca0755f454d5a059ccd381a01557d1c4f01cffe088686eaaed963dc67f492c2f2ceedd966eb47c45130bf808e77c5277ce086dfadff9a9b1e8
-MISC metadata.xml 317 SHA256 2826c2648992575017ff0ca363e8277eac7805ae446ddf612eb2141469c6b963 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba WHIRLPOOL d3658ebd3cdb705394e48622e3a4b5b22ce54a54536f1137ca27e17c201b6160b4cb8c6515cd5f0a79ba675da85f06c1c7d65b308582f3b25da56a4c0517af3d
+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
+MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
new file mode 100644
index 000000000000..c52061be670e
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+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}"
+else
+	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
+
+LICENSE="LGPL-2"
+SLOT="1"
+IUSE="cxx doc examples python static-libs test tools"
+
+RDEPEND="virtual/libusb:1
+	cxx? ( dev-libs/boost )
+	python? ( ${PYTHON_DEPS} )
+	tools? (
+		!<dev-embedded/ftdi_eeprom-1.0
+		dev-libs/confuse:=
+	)"
+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
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	mycmakeargs=(
+		-DFTDIPP=$(usex cxx)
+		-DDOCUMENTATION=$(usex doc)
+		-DEXAMPLES=$(usex examples)
+		-DPYTHON_BINDINGS=$(usex python)
+		-DSTATICLIBS=$(usex static-libs)
+		-DBUILD_TESTS=$(usex test)
+		-DFTDI_EEPROM=$(usex tools)
+		-DCMAKE_SKIP_BUILD_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use doc ; then
+		# Clean up crap man pages. #356369
+		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
+
+		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
+	fi
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 6cf8dd476f96..c52061be670e 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 	inherit git-r3
+	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
@@ -27,7 +27,7 @@ RDEPEND="virtual/libusb:1
 	python? ( ${PYTHON_DEPS} )
 	tools? (
 		!<dev-embedded/ftdi_eeprom-1.0
-		dev-libs/confuse
+		dev-libs/confuse:=
 	)"
 DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )