From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 24 Feb 2018 19:58:07 +0000
Subject: gentoo resync : 24.02.2018

---
 net-libs/zmqpp/Manifest                            |  5 +--
 .../zmqpp/files/zmqpp-4.2.0-multilib-strict.patch  | 15 +++++++++
 net-libs/zmqpp/zmqpp-4.1.2.ebuild                  | 34 -------------------
 net-libs/zmqpp/zmqpp-4.2.0.ebuild                  | 38 ++++++++++++++++++++++
 4 files changed, 56 insertions(+), 36 deletions(-)
 create mode 100644 net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
 delete mode 100644 net-libs/zmqpp/zmqpp-4.1.2.ebuild
 create mode 100644 net-libs/zmqpp/zmqpp-4.2.0.ebuild

(limited to 'net-libs/zmqpp')

diff --git a/net-libs/zmqpp/Manifest b/net-libs/zmqpp/Manifest
index df005375a4d1..10565ff96367 100644
--- a/net-libs/zmqpp/Manifest
+++ b/net-libs/zmqpp/Manifest
@@ -1,3 +1,4 @@
-DIST zmqpp-4.1.2.tar.gz 92834 BLAKE2B 6084b5bbd6e85b83a7bc214c21e96e5f386a418b27f20e92c69918db176650888692551e044b4bc4cdea34cdd666058a6e72f53b4f393212cff7a8a8bb6c2376 SHA512 9a485ce94ff94705016c16b553b4058198f91146189d6af899c3aa5aecf4326dacbdbe5ca521232971cfa2bf47fd1c34abefaf819839725bd07d6a08d513fcc6
-EBUILD zmqpp-4.1.2.ebuild 718 BLAKE2B e05c79e48ccd2689a25d732fdfa2453b9de7df1461f4d3e11bf6847915b8c65f8bc5c41bf7b7fe9343fcd7ff7473f70a5e25cf5a7505c15ea46e7b0ab168d7de SHA512 def42ed023430c12cc4e23f04fc477fdb6e856d15435117e57e5e690b21382ed6403391e121c5c8a5262436b71d8037d90c27866bb1654cc4ab1af51afabe46d
+AUX zmqpp-4.2.0-multilib-strict.patch 496 BLAKE2B a91028c19591f329832ed81798a96bb153ddc56e9344161fbab1ce24cfad1c04ab461ecc35b008e9d7a1c80db798d79d3569d514d5c1f419209ae6e01887a0c8 SHA512 2696c95f5ae7dc5a36141b756ea73c0fcd50b9ba7c3e4e9ff3187d0bb76c22bc52fdcb334e748e27a2f1fd6f71dc7ec97b60c73b6733f0d1c598c63c041d0fc1
+DIST zmqpp-4.2.0.tar.gz 102942 BLAKE2B c72e807e68aa9142e3e7f06a1c9207a4477538b6ffa1a9077d70dd4f7f2a7c17809bc9f71a478aad4cb3204955252d6468cf14f1aef014c062a08e7f68b2f1d0 SHA512 a6b767278d85f38e5d78a958980782f15e3214db169ec2da118216c002657e525783d4ad3b9043d742801acf77b9b070ea12c18ec0e311e01f13d90d409277a7
+EBUILD zmqpp-4.2.0.ebuild 773 BLAKE2B 68b73ee1d0455c0f63eba2fe3e1b6dafd48e5ed4178236632992706b77a4d1f9646a707f1f2bab260c01b31f1142254ef9450cc044c8fdc846ff8e5c3440036c SHA512 e98ae794bbc2736d622b5d7b150a77e8cdc07b115eb7dde0b10822802d04c64609ee84600aeb93e0a033bdc31807356a72eadd00eb7ea2bf354262b1f6c0dcbe
 MISC metadata.xml 340 BLAKE2B 449dcee565bd94118423698d1b0a0775ed49e399489904411ba41257fca80b6a6ff3ca4cb735571e4b64d7441ad1603de687ee113498b2193e323d16d4f12c16 SHA512 603c91cf185cf470c55b427d8aacbab2e7b2298e4e1d49f3af5fc50257a4eaf7b3ed301a134696743b550db32ffab956efa17c25c7d2a524a7d6d65b230841f9
diff --git a/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
new file mode 100644
index 000000000000..798c028396cb
--- /dev/null
+++ b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489916a..e6ca7d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,8 +231,8 @@ endif()
+ # -------
+ install(TARGETS ${INSTALL_TARGET_LIST}
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(DIRECTORY src/zmqpp DESTINATION include/
+         FILES_MATCHING PATTERN "*.hpp")
diff --git a/net-libs/zmqpp/zmqpp-4.1.2.ebuild b/net-libs/zmqpp/zmqpp-4.1.2.ebuild
deleted file mode 100644
index 0c069c867d2b..000000000000
--- a/net-libs/zmqpp/zmqpp-4.1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="ZeroMQ 'highlevel' C++ bindings"
-HOMEPAGE="https://github.com/zeromq/zmqpp"
-if [[ $PV == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zeromq/zmqpp.git"
-else
-	SRC_URI="https://github.com/zeromq/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="net-libs/zeromq[static-libs?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DIS_TRAVIS_CI_BUILD=OFF
-		-DZMQPP_BUILD_SHARED=ON
-		$(cmake-utils_use static-libs ZMQPP_BUILD_STATIC)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
new file mode 100644
index 000000000000..4eb86e192ea6
--- /dev/null
+++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="ZeroMQ 'highlevel' C++ bindings"
+HOMEPAGE="https://github.com/zeromq/zmqpp"
+if [[ $PV == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zeromq/zmqpp.git"
+else
+	SRC_URI="https://github.com/zeromq/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND="net-libs/zeromq[static-libs?]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-multilib-strict.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DIS_TRAVIS_CI_BUILD=OFF
+		-DZMQPP_BUILD_SHARED=ON
+		$(cmake-utils_use static-libs ZMQPP_BUILD_STATIC)
+	)
+
+	cmake-utils_src_configure
+}
-- 
cgit v1.2.3