Version bump.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 115 insertions, 1 deletions

diff --git a/dev-libs/msgpack/ChangeLog b/dev-libs/msgpack/ChangeLog
index 2470ef4beb15..8fb1a51efe92 100644
--- a/dev-libs/msgpack/ChangeLog
+++ b/dev-libs/msgpack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/msgpack
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/msgpack/ChangeLog,v 1.15 2015/02/26 06:16:37 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/msgpack/ChangeLog,v 1.16 2015/03/21 06:14:48 radhermit Exp $
+
+*msgpack-1.0.0 (21 Mar 2015)
+
+  21 Mar 2015; Tim Harder <radhermit@gentoo.org> +msgpack-1.0.0.ebuild,
+  +files/msgpack-1.0.0-cflags.patch, +files/msgpack-1.0.0-static.patch:
+  Version bump.
 
   26 Feb 2015; Ben de Groot <yngwin@gentoo.org>
   msgpack-0.6.0_pre20150220.ebuild:
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
new file mode 100644
index 000000000000..fc6cacd0a03c
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
@@ -0,0 +1,25 @@
+--- msgpack-1.0.0/CMakeLists.txt
++++ msgpack-1.0.0/CMakeLists.txt
+@@ -213,10 +213,6 @@
+     ADD_SUBDIRECTORY (test)
+ ENDIF ()
+ 
+-IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+-    SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC")
+-    SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" )
+-ENDIF ()
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+     IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+         STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+--- msgpack-1.0.0/test/CMakeLists.txt
++++ msgpack-1.0.0/test/CMakeLists.txt
+@@ -52,9 +52,6 @@
+         ${CMAKE_THREAD_LIBS_INIT}
+     )
+     ADD_TEST (${source_file_we} ${source_file_we})
+-    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+-        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3")
+-    ENDIF ()
+     IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+         IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+             STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
new file mode 100644
index 000000000000..e40a9deaaece
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
@@ -0,0 +1,40 @@
+--- msgpack-1.0.0/CMakeLists.txt
++++ msgpack-1.0.0/CMakeLists.txt
+@@ -17,6 +17,7 @@
+ 
+ OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
+ OPTION (MSGPACK_32BIT "32bit compile" OFF)
++OPTION (MSGPACK_STATIC "Build static library" ON)
+ 
+ IF (MSGPACK_CXX11)
+    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+@@ -196,12 +197,15 @@
+     ${msgpack_HEADERS}
+ )
+ 
+-ADD_LIBRARY (msgpack-static STATIC
+-    ${msgpack_SOURCES}
+-    ${msgpack_HEADERS}
+-)
++IF (MSGPACK_STATIC)
++    ADD_LIBRARY (msgpack-static STATIC
++        ${msgpack_SOURCES}
++        ${msgpack_HEADERS}
++    )
++    SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
++    INSTALL (TARGETS msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++ENDIF ()
+ 
+-SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
+ SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib")
+ SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 4.0.0)
+ 
+@@ -233,7 +237,7 @@
+     SET(CMAKE_INSTALL_LIBDIR lib)
+ ENDIF ()
+ 
+-INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++INSTALL (TARGETS msgpack DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
+ INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
diff --git a/dev-libs/msgpack/msgpack-1.0.0.ebuild b/dev-libs/msgpack/msgpack-1.0.0.ebuild
new file mode 100644
index 000000000000..525ee999add9
--- /dev/null
+++ b/dev-libs/msgpack/msgpack-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/msgpack/msgpack-1.0.0.ebuild,v 1.1 2015/03/21 06:14:48 radhermit Exp $
+
+EAPI=5
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
+HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cxx static-libs test"
+
+DEPEND="
+	test? (
+		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-static.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use cxx MSGPACK_ENABLE_CXX)
+		$(cmake-utils_use static-libs MSGPACK_STATIC)
+		$(cmake-utils_use test MSGPACK_BUILD_TESTS)
+	)
+	cmake-multilib_src_configure
+}