gentoo resync : 15.12.2017

4 files changed, 58 insertions, 2 deletions

diff --git a/dev-embedded/stlink/Manifest b/dev-embedded/stlink/Manifest
index eda5cad0c7ab..46984a917732 100644
--- a/dev-embedded/stlink/Manifest
+++ b/dev-embedded/stlink/Manifest
@@ -1,4 +1,5 @@
+AUX stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch 1760 BLAKE2B b6f195ec18c1886dc561a85bea9792eedada56e9744f51af92f6dfb9f3303f3b6f038afcd60456462ffdc689d283e38f73a5058c8b4774257048f67976fc3407 SHA512 604a0c6e18dbd5a7645a2edc17754d8e6fce4f4d7fa595da1fa52c8e0c8178fcabe163195575e35c07933b04a5804d154b74fed19caec9c92427374905ddf0d0
 DIST stlink-1.4.0.tar.gz 138765 BLAKE2B e7dddd51e4ff0c0342b3df62a10b33736acf6380afc449e3ac7d67b607bc217df05b02ddcfed73d83190b9a5cb02f5f1d01beaab5de5f3cd92214fd916793b9e SHA512 cb7617068a6dcaf7e8d0ccfb8b918f0373f6120398dab40a8b8d6567705871226684fd19aad92e4bab623310a5da13ea9fd70153b619f58d3534f0a4ff3a9886
-EBUILD stlink-1.4.0.ebuild 757 BLAKE2B d5ea612a310233baebddbc58b307692c5a7d44002fcaec6fd7fbc75698a59160445a53fcf0049f3d2bc0f38ff3f206107c51a7febb1c997dc2755c8b9b5c5233 SHA512 3851532f4774e64cb067eba2ff000c86704c078fd30321fb24e6f06011752fdc55be8c857b8e1ae5c12ffd5c737c7e9cd7b15500e50073a3d4c65c1273f902be
-EBUILD stlink-9999.ebuild 757 BLAKE2B d5ea612a310233baebddbc58b307692c5a7d44002fcaec6fd7fbc75698a59160445a53fcf0049f3d2bc0f38ff3f206107c51a7febb1c997dc2755c8b9b5c5233 SHA512 3851532f4774e64cb067eba2ff000c86704c078fd30321fb24e6f06011752fdc55be8c857b8e1ae5c12ffd5c737c7e9cd7b15500e50073a3d4c65c1273f902be
+EBUILD stlink-1.4.0.ebuild 929 BLAKE2B 86439a1906feff17d6e0e3d89b33fa3c1824d8e0394b3a02d8fa3f66f03bfc75a9af3f7c1c9a24e9e1bec0666af27ded2e7d020d24ecfe226b686775aaed3743 SHA512 7d9b220d6dd5729b5b5756946d7f53b7595ceabad627cd8b03cbd782d42569c565b0d554cd970e11363ba2018e13f361bf9f465ee9d43304125f997d31550c20
+EBUILD stlink-9999.ebuild 798 BLAKE2B d9f16816c4e8e9eef92b8645520b5b69761d15c4519196fc2bd773d55022236f4baf61b1b32f4ba302b90120639bb46ac29d9087e7a86e5ee8bcc15b3b535c8c SHA512 5cf360edbf4d74654389bd14c3ce1ffd30f70a19ec79b43bb8e4ba433a024e5deb96e6ca62c6052c6e2cfeb7566ed16f801e9b66330394d92373132718c76dcc
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch b/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
new file mode 100644
index 000000000000..aa077c0823bd
--- /dev/null
+++ b/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
@@ -0,0 +1,50 @@
+From cbba564f60bacd30344f9bb5c7bebaf8283b6794 Mon Sep 17 00:00:00 2001
+From: Vasiliy Glazov <vascom2@gmail.com>
+Date: Fri, 8 Sep 2017 15:00:45 +0300
+Subject: [PATCH] Added LIB_INSTALL_DIR to correct libs install on 64-bit
+ systems (#636)
+
+* Added LIB_INSTALL_DIR to correct libs install on 64-bit systems
+* Add description for using LIB_INSTALL_DIR parameter.
+---
+ CMakeLists.txt   | 3 ++-
+ doc/compiling.md | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46790de..da99b6e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,8 @@ project(stlink C)
+ set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink Tools")
+ set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory")
+ set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory")
+-set(STLINK_LIBRARY_PATH "lib/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
++set(LIB_INSTALL_DIR "lib" CACHE PATH "Main library directory")
++set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
+ 
+ option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
+ 
+diff --git a/doc/compiling.md b/doc/compiling.md
+index 3518d10..41d1fb7 100644
+--- a/doc/compiling.md
++++ b/doc/compiling.md
+@@ -118,6 +118,15 @@ $ cmake -DSTLINK_UDEV_RULES_DIR="/usr/lib/udev/rules.d" \
+         -DSTLINK_MODPROBED_DIR="/usr/lib/modprobe.d" ..
+ ```
+ 
++## Build using different directory for shared libs
++
++To put the compiled shared libs into a different directory during installation
++you can use the following cmake option:
++
++```
++$ cmake -DLIB_INSTALL_DIR:PATH="/usr/lib64"  ..
++```
++
+ ## Windows (MinGW64) 
+ 
+ ### Prequistes
+-- 
+2.13.6
+
diff --git a/dev-embedded/stlink/stlink-1.4.0.ebuild b/dev-embedded/stlink/stlink-1.4.0.ebuild
index c7300459c355..c349f40b793c 100644
--- a/dev-embedded/stlink/stlink-1.4.0.ebuild
+++ b/dev-embedded/stlink/stlink-1.4.0.ebuild
@@ -25,10 +25,14 @@ RDEPEND="virtual/libusb:1
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+# Fix bug #630932; >1.4.0 should render this obsolete
+PATCHES=( "${FILESDIR}/${PN}-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
 		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
+		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
 	)
 
 	cmake-utils_src_configure
diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild
index c7300459c355..479ca67cd591 100644
--- a/dev-embedded/stlink/stlink-9999.ebuild
+++ b/dev-embedded/stlink/stlink-9999.ebuild
@@ -29,6 +29,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
 		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
+		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
 	)
 
 	cmake-utils_src_configure