gentoo resync : 09.03.2018

4 files changed, 53 insertions, 3 deletions

diff --git a/net-libs/libcork/Manifest b/net-libs/libcork/Manifest
index d6e996f5ada0..b4ca6c35ddf9 100644
--- a/net-libs/libcork/Manifest
+++ b/net-libs/libcork/Manifest
@@ -1,3 +1,5 @@
+AUX libcork-0.15.0-git.patch 539 BLAKE2B c3b50675afd74b3bd5c5049bf311ccf33dd4fc257bb4b9ccfb50007bff022ec9c260de0b507dfcf2ecd3ce3036e00fa1ef52f0d437003e6c2e5c52a8de3daab5 SHA512 2e32bd6c53c9fc3f7c27344a724138e5f3073a8d6f5b63a30cd86b48bf430a63b70cc0a2fdb93000f944cbc12655d12926c01ba374ec52e12cc126712fc41442
+AUX libcork-0.15.0-version.patch 498 BLAKE2B 15fbafc607e6a3dab0376ade883db9a783b1490b7a9063f1d3d815149198caf962e9375ed752fc077a5bf9a5cb767499071cf2aab8bf29a912024bac6eaa33da SHA512 1a0a0cf02bf51423760626a3e886c36b3e58f02cc09a5898313c185c339f08194b4bc9e118d8546aa8529d2a3047faecf85dbcf7a9097d0422b416306db05222
 DIST libcork-0.15.0.tar.gz 182736 BLAKE2B cfabcf4b040d3d2796511b5d7dce005fcff9bc6704dfaf89ea9eac36617b0c544e932ab3e12c0b06e4e3e916c50da10ba26401527a8e83bde523b91b911fd6da SHA512 8f41cce2101b96707068a21e5bd0a43c23f996c3620e7dd36621ed4bdd3f92851a92ea56ed92db40d7d8fe55ddfbdfcdaac4d2c8b2fc6cb3b1abe3b0e74c6a75
-EBUILD libcork-0.15.0.ebuild 396 BLAKE2B 0750fdcd3319acdc99cf3b95a0104c99fd6a308eda8091811794ff891b8bd90ce81cb5a3a65fe5a4157f29ed2c6dd0676eca0882f32d83e46fac56a877c91b9f SHA512 7c7ca6983cc6859a4161ee6ab8d2d48c4b2a378d8dbbed1f548d53057848b96bf9204d67dd4dc22c84cd5eb2c9301ee5e9d7a5098e9ed5ce562ed172f9af38b9
+EBUILD libcork-0.15.0.ebuild 710 BLAKE2B 3d7488a76ae382802bed5a646c1d389e3dc0f88e10f4bdd6899bcb5590c35aa83d4f6ae19ecb957cc6b54bc7658ad3b24390bf80cc931057992f263b22f2e076 SHA512 17980b953ca8fd4ddbd976ed76cde64c4c5b3c387f955a6917bfd682641ad1ae3950df7c3ae2b01007ae6c0c36283682d2fe03d16e83a26509586665268d75b4
 MISC metadata.xml 321 BLAKE2B 413fda934011eb441b90050b4b07cb32143b70be324588f93a2d34076f67e65dac26bbfac264155c62d03a8feccfa42e14e33f80dcbc3c92d9ca8606a57ee108 SHA512 b51116388b073e857b090b791063df90c082fb7268ae80b594362e84999e4f22de11636dbb8abc9d214f651799cf1385905706de5b875c9fefdcc3c9cbc09594
diff --git a/net-libs/libcork/files/libcork-0.15.0-git.patch b/net-libs/libcork/files/libcork-0.15.0-git.patch
new file mode 100644
index 000000000000..54a54a412f47
--- /dev/null
+++ b/net-libs/libcork/files/libcork-0.15.0-git.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e236f9..c8770f6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,11 +49,6 @@ execute_process(
+     OUTPUT_VARIABLE GIT_SHA1
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+-if(GIT_SHA1_RESULT)
+-    message(FATAL_ERROR
+-            "Cannot determine git commit: " ${GIT_SHA1_RESULT})
+-endif(GIT_SHA1_RESULT)
+-
+ #-----------------------------------------------------------------------
+ # Check for building on Tilera
+ # If the Tilera environment is installed, then $TILERA_ROOT is defined
diff --git a/net-libs/libcork/files/libcork-0.15.0-version.patch b/net-libs/libcork/files/libcork-0.15.0-version.patch
new file mode 100644
index 000000000000..64cef927443d
--- /dev/null
+++ b/net-libs/libcork/files/libcork-0.15.0-version.patch
@@ -0,0 +1,15 @@
+diff --git a/version.sh b/version.sh
+index 40e8d05..e06443f 100755
+--- a/version.sh
++++ b/version.sh
+@@ -17,8 +17,8 @@
+ # Note that the RELEASE-VERSION file should *not* be checked into git;
+ # please add it to your top-level .gitignore file.
+ 
+-version=$(git describe)
+-if [ -n ${version} ]; then
++[ -d .git ] && version=$(git describe)
++if [ -n "${version}" ]; then
+     # If we got something from git-describe, write the version to the
+     # output file.
+     echo ${version} > RELEASE-VERSION
diff --git a/net-libs/libcork/libcork-0.15.0.ebuild b/net-libs/libcork/libcork-0.15.0.ebuild
index 3a4e572ad7ff..f31843ee66bd 100644
--- a/net-libs/libcork/libcork-0.15.0.ebuild
+++ b/net-libs/libcork/libcork-0.15.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit cmake-utils
+
 DESCRIPTION="A simple, easily embeddable cross-platform C library"
 HOMEPAGE="https://github.com/dcreager/libcork"
 SRC_URI="https://github.com/dcreager/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -12,5 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/check"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	if ! [ -e "${S}"/RELEASE-VERSION ] ; then
+		echo ${PV} > "${S}"/RELEASE-VERSION || die
+	fi
+	eapply "${FILESDIR}"/${P}-git.patch
+	eapply "${FILESDIR}"/${P}-version.patch
+
+	cmake-utils_src_prepare
+}
+
+src_install() {
+	cmake-utils_src_install
+}