Enable shared libs, make static libs optional. Backport libdir and soname changes from upstream.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 77 insertions, 5 deletions

diff --git a/dev-cpp/gflags/ChangeLog b/dev-cpp/gflags/ChangeLog
index fb5fc58601bf..ae8c51ee7138 100644
--- a/dev-cpp/gflags/ChangeLog
+++ b/dev-cpp/gflags/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gflags
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/ChangeLog,v 1.25 2014/07/14 03:34:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/ChangeLog,v 1.26 2014/07/15 01:19:44 floppym Exp $
+
+  15 Jul 2014; Mike Gilbert <floppym@gentoo.org> +files/gflags-2.1.1-libs.patch,
+  gflags-2.1.1.ebuild:
+  Enable shared libs, make static libs optional. Backport libdir and soname
+  changes from upstream.
 
 *gflags-2.1.1 (14 Jul 2014)
 
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 5f3a90f96d54..e70cd2a4bfa1 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gflags-2.1.1-libs.patch 1975 SHA256 0906b7e45563eddfe31b7ca1b4862f374c09342a320dbb313ec408a08e743d5f SHA512 8e75d43de9de8053de42573bd0f243b8060bb1f43f995fe555c0cb984bacddddbc670c9f17115f054e5a54bc52a7d3df20b39b03c3229bae397ad3dfbcf9a66c WHIRLPOOL 8d8e5b581edb0539d8d22c91af5deef204abb50ffb22f54c819f9ae177de66118275eb0a46b37098c426e701162b1ed30668b55d43de3959486c23a73f1ea020
 DIST gflags-2.0.tar.gz 513739 SHA256 ce4a5d3419f27a080bd68966e5cd9507bfa09d14341e07b78a1778a7a172d7d7 SHA512 ba7061d5d57fcadb53ef70f846caacc44c319552e7dd6b05def38f961d3d89f4023e4eda95845efb399f3e94f24f75bdadfc67b22e29bccc94e46de8db501b83 WHIRLPOOL a86acb21e91bdcaebd6b6c97079ae147c7549c6db29a5c8ebf1917b9ae8703523efef285837d328702d64aaa83bd4810e1ecae65dc58eb12379ab2f0300dd19e
 DIST gflags-2.1.1.tar.gz 102015 SHA256 432edece8102fc141c2e3381e2eb5eabb1ce7614851cc96bdec4715105086238 SHA512 18d1a0a1271f12f0e87447e3a9d6810f531f5b190d84274465add5a928c189caac911ec2592422895961ab3c0c7566ff50c0c22f71d185ac3413c54bdbfb00ef WHIRLPOOL 608dc62262d8b4a0451dd3493b02fd35ad5214f1793f173ca5d93e631e15b59cc4557b2a2f9f5e67f72c2ad0d6cd343648b113bf4701fd8f6c3f5d949ac41813
 EBUILD gflags-2.0-r1.ebuild 763 SHA256 cd6538ef378746575555b9a2dbf843f849fed2e8239dbee2a76312c3e3d91b65 SHA512 a158750ca996a2b5752386c23e3ebd4af94764e9eda1a72221702e536334dd6c67916e5cdb4ed8e0fb493b8107e36322f6c7457d2780e1de160e36f8180df1e8 WHIRLPOOL e9b4ab7fc9b49f6969e5897ddd8322bcf090f45c9f610045435fdc57c893d0e3cd7b96642936095d6484105f62a0c98a3b79d965f62d614442c37aed2ab4430b
 EBUILD gflags-2.0.ebuild 731 SHA256 d9565f1c8e82729ae841ffa1db9325cb2e22a3f7835055e8a4dcdbb256aa2fb9 SHA512 fea7ce0fb70982c21695d332971c3514be06a32ab0df14c3f0fcac13c1cb9745cc404fd02953cea15bcd863e681b8ce56864912f00f398ab38401a6e873d53ee WHIRLPOOL 2d9681046083e5a5aeee8851fcc026b9c71c0a8660e71f45df733271e322de676d26d62ef6602922c7b359a82d261d56fb9ebf97d108e7f9f75670dbc2875305
-EBUILD gflags-2.1.1.ebuild 704 SHA256 d3badb80344dc54bf66bb8406ecfc62a32feac4bf2db20540231feed6a0d9984 SHA512 8c587f498ee8cd422a2ba1cd217fdc88dcde5de7ec32ba04c5db441146ba40661bbeac66df0e6e302dce02b8d88e63bcc272e4c7b1b4a8a88ae5d4f6b4c84d9c WHIRLPOOL d84f424b90ea44b671913cb7927038623008db027f78f93ac124e915125714d16dd07c44a336cba378228e537fe72752e40d5004d612f5e28420e9bbc174c960
-MISC ChangeLog 3514 SHA256 7e79b9f6fd9294f42b01dabe1c35cb94f61e3b62806179685f442de6acd14120 SHA512 138b48a3d052a0870f6d4ea0f9b6e1acb2822399b7dc0466a5534db2ffbaad9165cdaa1f9cfbbbc7262906fe16df717e4ffeed63d5cafd1888b196e30d60dd23 WHIRLPOOL 492a99df556d3b0fea6fe2f917e1892c6bc9e0c15755a120701d7d1182f0038c2de11c189697b3d78bba7b3db5a5cbca7c6210a6e3ea0b3e80fd480b83d13274
+EBUILD gflags-2.1.1.ebuild 914 SHA256 0dba43c803ab149a8ba8fcd34b2360d26112d6b7a92966ef9226d4ae35e1d2fb SHA512 dbc3c04ff1bffa69299cf711514b688b7389d64f6525b4102d27b666b4753976a4f53cf0b47d288cb2502710a65ba3031d9a5aa9f59008770f004d091c3a89f0 WHIRLPOOL 058b58991119a99fdbbd6388ca2e83c85ccb27d653b30ae7e2458289a2ffc057b82457b5401d70e7ca4fcadcfa7b01afdb10b02aab5c6382bdcca41d2a662df1
+MISC ChangeLog 3720 SHA256 2b057be9ef8336e9a01f6f13d0e452775872dfba16785a5f78aa7f24f01f0f04 SHA512 9c4def5072a582e79376051d516b50db4921d47c7b36fe68547bc49bf5c82623b1756508e474984733152a7334d6fdee9bbcbd1c0c0e6b6d293bab575f0471cc WHIRLPOOL 5cb3282ae166e8f57194cbf04ede6171c4647d163053d4f83a25ee7c80fba058b7b2e94b2f26ecb6ac2c9a42b387abbdc8f4f58ab2026bbb638cbcf9a0852c75
 MISC metadata.xml 289 SHA256 9544b6246d963794455ace4d80c5e285920b534f98c87017ae7e285378050050 SHA512 5717a8e612700d6d5e8a0e0bf188efaf148c92782af7600209eb3e9a167e075fe8feaefab52c43290b1c5535ca63ca8f5969e470dfd7387c682868bb4621eddd WHIRLPOOL 09b74b91214bd09684c0af82d77153c9eb39bf45d5833cc67fb896e7c79243a4fd89441e6b95956c9c1f1f70a969650bbd06f0d104d1ab9ec43c0ffb5ed63b59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlPEgbUACgkQC77qH+pIQ6TAOAEAkptzjX8/dXQUaWYY9lFg2Kuu
+sov2b/vcXnlfa4JrawQA/jBvYIgwQdhT0XB4Z6rFDrEakKnSsxcW29Twr2hvH8rR
+=y9vX
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/gflags/files/gflags-2.1.1-libs.patch b/dev-cpp/gflags/files/gflags-2.1.1-libs.patch
new file mode 100644
index 000000000000..0e59cb937e14
--- /dev/null
+++ b/dev-cpp/gflags/files/gflags-2.1.1-libs.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17d38b4..ca2c1df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,6 +22,8 @@ version_numbers (
+     PACKAGE_VERSION_PATCH
+ )
+ 
++set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}")
++
+ # ----------------------------------------------------------------------------
+ # options
+ set (GFLAGS_NAMESPACE   "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.")
+@@ -256,7 +258,9 @@ foreach (TYPE IN ITEMS STATIC SHARED)
+         endif ()
+         set_target_properties (
+           gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}"
+-                                           OUTPUT_NAME "gflags${opts}"
++                                           OUTPUT_NAME         "gflags${opts}"
++                                           VERSION             "${PACKAGE_VERSION}"
++                                           SOVERSION           "${PACKAGE_SOVERSION}"
+         )
+         if (HAVE_SHLWAPI_H)
+           target_link_libraries (gflags${opts}-${type} shlwapi.lib)
+@@ -280,9 +284,18 @@ if (OS_WINDOWS)
+   set (CONFIG_INSTALL_DIR  CMake)
+ else ()
+   set (RUNTIME_INSTALL_DIR bin)
+-  set (LIBRARY_INSTALL_DIR lib)
++  # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora
++  # package maintainers. Also package maintainers of other distribution
++  # packages need to be able to specify the name of the library directory.
++  if (NOT LIB_INSTALL_DIR)
++    set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
++  endif ()
++  set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}"
++    CACHE PATH "Directory of installed libraries, e.g., \"lib64\""
++  )
++  mark_as_advanced (LIBRARY_INSTALL_DIR)
+   set (INCLUDE_INSTALL_DIR include)
+-  set (CONFIG_INSTALL_DIR  lib/cmake/${PACKAGE_NAME})
++  set (CONFIG_INSTALL_DIR  ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME})
+ endif ()
+ 
+ file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}")
diff --git a/dev-cpp/gflags/gflags-2.1.1.ebuild b/dev-cpp/gflags/gflags-2.1.1.ebuild
index 874628962f9a..4c7e6d8a27cf 100644
--- a/dev-cpp/gflags/gflags-2.1.1.ebuild
+++ b/dev-cpp/gflags/gflags-2.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/gflags-2.1.1.ebuild,v 1.1 2014/07/14 03:34:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gflags/gflags-2.1.1.ebuild,v 1.2 2014/07/15 01:19:44 floppym Exp $
 
 EAPI="5"
 
-inherit cmake-multilib multilib-minimal
+inherit cmake-multilib
 
 DESCRIPTION="Google's C++ argument parsing library"
 HOMEPAGE="http://code.google.com/p/gflags/"
@@ -13,6 +13,17 @@ SRC_URI="https://github.com/schuhschuh/gflags/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+PATCHES=( "${FILESDIR}/gflags-2.1.1-libs.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		$(cmake-utils_use_build static-libs STATIC_LIBS)
+	)
+	cmake-utils_src_configure
+}
 
 multilib_src_install_all() {
 	rm -rf "${ED}"/usr/share/doc