gentoo resync : 25.01.2018

6 files changed, 13 insertions, 138 deletions

diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
index b73153aace98..418230c8aebd 100644
--- a/dev-libs/device-atlas-api-c/Manifest
+++ b/dev-libs/device-atlas-api-c/Manifest
@@ -1,9 +1,4 @@
-AUX 2.1-cmake-install.patch 556 BLAKE2B 55e74449f1c5eb1e124104b9b65e43af87d114140101c8868a9b07e6e73630cf8cd33152a6bcfc2f6464bd7784e328d85a36f89386683822fc14f88d8814b09a SHA512 79909d2f50143082e3b04d63ea51364f9f5edea5802087f07d7857d0756bf04328d4d827d6d9cf228319cf48b3dcb2d0166b36598a3d1654a88323dbac895c76
-AUX 2.1.2-src-cmakelists.patch 657 BLAKE2B fc1ab65adc1360163532106d5eb3b903c85aaf55cb28f3c82adbe06629b76f03a763d25f53a848f4d9c1cb5896f0ab9d39f282abf85efd956a6dabbb0f2d6653 SHA512 d9f67fc26df12532a5c636d24f1373addb853fa51b45f734a3803f1fc19a3d1d88cdf2b501bb38c2dedf03f256b158cc31c8ada72559eae584348c6afee1d8f3
-DIST deviceatlas-enterprise-c-2.1.2_1.tgz 184432 SHA256 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372 SHA512 4ff269c55e74688dc1c954a1d9b0fc28aa135eccd20089f4da390522644bd1c08e2bc38e4ad15a64308a0e91b007a820dcdc3998c262fa5a7cfe1038e9f0e969 WHIRLPOOL 73c1c7eec0daed7632e8a5a7ceda956ec91cc603fe45df2fdbf2b54ecc950bd72ff59fdd85ff6a0ee70d54b2099ecc3219ef55f4aecb308f254851f93fe57738
-DIST deviceatlas-enterprise-c-2.1.2_2.tgz 184368 SHA256 feaa9198a5d6bed125b34742bd626ad0a0fcb862803916cd7d974413f8bdfdce SHA512 46c021b3430c6900f9172c13cdeb26931634345485c2fe0fe7b6911f7c6f6bee46ab3551e4fe11ef5b5caabe66c786c72b51db6875aa9d44aab673056b9debee WHIRLPOOL d85161010cf195eab5ef9c4e83404ad08cc10d607ace5bc6424ffb170ca09a26d5410534279eab1d721615db943f3a447ff908f62f76311ec80c3d95abbb49d4
-DIST deviceatlas-enterprise-c-2.1.zip 504286 SHA256 a02fc29486d245b1c8d946c663b71ba981e88fee8d037f5bc1bf255deb287974 SHA512 99a8e89f3d1c084a93b184685108ea65d1fd925e0c8b52599a42dbe70af3126103da0a9fd284b14ddf59b996204334d360a12651025413bc4d7f76054779275b WHIRLPOOL 939733a58f352cbeee852ccfea3f2f022310ceb7363a15889d9a6366532102ee700271b6008e0a57ae4d86cafe6354409f9520105e46eaabb5c41f1a7827f1b4
-EBUILD device-atlas-api-c-2.1.2_p1.ebuild 1071 BLAKE2B 0a26f7000c7908d2a84dcdb79fc6b325afd2dcdc157fb9a324d12a212a3e679cf016ec23f5ebbe48453f46929b06a554234bb7ea91156de0a64dda095d39bcd9 SHA512 45764ebfe8274a94c08bdcf277caf7b8247c0507492dd193f32491f21a23a0caafb5a0944d97feaa2e5501d100ae64163893ed4347780becebb782e14b08cfdc
-EBUILD device-atlas-api-c-2.1.2_p2.ebuild 1072 BLAKE2B 036b7caf5464ebcf7ef804cffec91727b95030181042b02ddcbbb66f9d93c5f7778ef3873cc92d93e40cac36d784ec9973a021b1cf12da2e7b3689a98537a9d7 SHA512 201fff3cfffa7c1491b29f86f46a9cbb06de65f01f1241e8474cab7e063311fe41346b8263ea1d03a4d7a2ececbbb677f4d129fcd3ca4836f3450de56581a2be
-EBUILD device-atlas-api-c-2.1.ebuild 1087 BLAKE2B 27e407431fe33bf5171ddf1b5ef77dc00608634c7621da9d74e425afc3802d1b2f62952d736a0235d80eab50e42fcac55532498fa7cb90bd10890900b333375a SHA512 be97dbacbf2fcffd7338c12e3355aa28e0ac2c1d58bc26a6ccd7cc5189c12d337081cb0957f695c2c376928eaf0b6940a3ae3e804825ec5f599139dbaf585f69
+AUX 2.1.3-src-cmakelists.patch 629 BLAKE2B f3bb4160bbbe58a92e33216f11b52f25b3fc80d58efd11830575b819a41165df51f3c7e8c1a4c431157296d34f179c95c596b2d37b22b5211ff3e7e05989e671 SHA512 08b5f1156341b91911adbba7d527f11f385642a8afcd0ad0e833f83e6c799dd85bb6195dddf9cde13672ec9f52b5b7094f57a09c85866c3c42e627495b45e9bb
+DIST deviceatlas-enterprise-c-2.1.3.tgz 183663 BLAKE2B e190aa8e9a4b9bc90af76e21eb425c0f040ef70e605c8f9e588bd0c859520a82807aaafddd24402d3365e94bcf3b7a875a65804f2b1b3bed6f0703f28a841440 SHA512 364811d42b2c0d937a12f2bbfee760701a1dee4e93bcc84423c8b236d59257a3440111ffc6072a7822b9694ea65986572550f67d0b1e5d68a784d1339b2b70aa
+EBUILD device-atlas-api-c-2.1.3.ebuild 1054 BLAKE2B 77f2191b854b8364939e6a41e18802d8f7df0d51102d90bf2504e10e3e47d11eecc6f3f2bb3a32f205baa0065bd5c7d68990164233177e139d7b98b7d6cd9ebc SHA512 d0f153771e46878c47ea4887799f703d3d9cbcc6fb2fc5ce96f31ded933ba9982f6de4e7ef881377f5e72cf652b2b8ebdd2b85360ceb7d8772e4c178def2f560
 MISC metadata.xml 794 BLAKE2B 5021d469addcb51164731491a3a9ae1c24c3a24ccf2159574bcd8cb2c3ec7aa5dd217beb093c696db8438ae31778c18f8d047e73deec3984683009f50279af41 SHA512 2da64d528f2e49d368ba7b8684d818f0d8bb979dd0c64d613f25bdca97a9c5a3af2eb85f4955e03ed52dc5eb43b3ba7bad21eb94bdd67d370e1ddfa6545b26a1
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p1.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p1.ebuild
deleted file mode 100644
index bc28a136dd90..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-src-cmakelists.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Then place the file in ${DISTDIR}/${MY_P}.zip"
-}
-
-multilib_src_install_all() {
-	if use doc ; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${P}/examples
-		doins examples/daexutil.h
-		doins examples/example{0,1,2,3}.c
-		doins examples/util.c
-		doins examples/EXAMPLES.USAGE
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p2.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
index 2923dead8a25..4679d064f462 100644
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.2_p2.ebuild
+++ b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,11 +39,11 @@ multilib_src_install_all() {
 	fi
 
 	if use examples; then
-		insinto /usr/share/doc/${P}/examples
-		doins examples/daexutil.h
-		doins examples/example{0,1,2,3}.c
-		doins examples/util.c
-		doins examples/EXAMPLES.USAGE
+		docinto examples
+		dodoc Examples/daexutil.h
+		dodoc Examples/example{0,1,2,3,4}.c
+		dodoc Examples/util.c
+		dodoc Examples/EXAMPLES.USAGE
 	fi
 
 	einstalldocs
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.ebuild
deleted file mode 100644
index c08e69401d96..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit unpacker cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-cmake-install.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Then place the file in ${DISTDIR}/${MY_P}.zip"
-}
-
-multilib_src_install_all() {
-	if use doc ; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${P}/examples
-		doins examples/daexutil.h
-		doins examples/example{0,1,2,3}.c
-		doins examples/util.c
-		doins examples/EXAMPLES.USAGE
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/files/2.1-cmake-install.patch b/dev-libs/device-atlas-api-c/files/2.1-cmake-install.patch
deleted file mode 100644
index 9f518629e5a1..000000000000
--- a/dev-libs/device-atlas-api-c/files/2.1-cmake-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./CMakeLists.txt	2016-11-08 22:54:33.351677837 +0000
-+++ ./CMakeLists.txt	2016-11-08 23:04:26.737184360 +0000
-@@ -16,6 +16,7 @@
-     set(MODEL 64)
- endif()
-
-+include(GNUInstallDirs)
- message(STATUS "${CMAKE_BUILD_TYPE} version")
-
- include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -31,6 +32,9 @@
-
- add_subdirectory(examples)
-
-+install(TARGETS da DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES dac.h dac_json.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+
- if (EXISTS "${PROJECT_SOURCE_DIR}/tests")
-     subdirs(tests)
- endif()
diff --git a/dev-libs/device-atlas-api-c/files/2.1.2-src-cmakelists.patch b/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch
index b81768aba648..6d1f9ff5586b 100644
--- a/dev-libs/device-atlas-api-c/files/2.1.2-src-cmakelists.patch
+++ b/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch
@@ -1,6 +1,6 @@
---- a/Src/CMakeLists.txt.orig	2017-05-20 22:56:14.138401705 +0100
-+++ b/Src/CMakeLists.txt	2017-05-20 22:58:11.376354697 +0100
-@@ -18,6 +18,7 @@
+--- a/Src/CMakeLists.txt
++++ b/Src/CMakeLists.txt
+@@ -18,6 +18,7 @@ if (NOT MODEL)
      set(MODEL 64)
  endif()
  
@@ -8,7 +8,7 @@
  message(STATUS "${CMAKE_BUILD_TYPE} version")
  
  include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -37,5 +38,5 @@
+@@ -37,5 +38,5 @@ set (CMAKE_EXE_LINKER_FLAGS -m32)
  set (CMAKE_SHARED_LINKER_FLAGS -m32)
  endif()