From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 dev-libs/libe/Manifest                        |  3 ++-
 dev-libs/libe/files/libe-0.11.0-strtoul.patch | 11 +++++++++
 dev-libs/libe/libe-0.11.0.ebuild              | 32 +++++++++++++++------------
 3 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 dev-libs/libe/files/libe-0.11.0-strtoul.patch

(limited to 'dev-libs/libe')

diff --git a/dev-libs/libe/Manifest b/dev-libs/libe/Manifest
index 348c57d391bf..ca90234dade0 100644
--- a/dev-libs/libe/Manifest
+++ b/dev-libs/libe/Manifest
@@ -1,3 +1,4 @@
+AUX libe-0.11.0-strtoul.patch 246 BLAKE2B 0f114e529a4af885b628ab8db54b7f69d2e5b5ee4311469ddb15e77f431e7e86b88aaf8b94b288de8cdb0246ee37b0d4fd0fd6a849b3a97467893ffd7c751ac8 SHA512 3c9213064ead8bf7c549310ba26ef0705eb61a6b438ccac74f80ec0040ce07cb51b0e89a46a2b97d7af98e3075aa2674e5b8b470c21f12bd21b9b7ec17468dbe
 DIST libe-0.11.0.tar.gz 414542 BLAKE2B 5b7c312b837659811cca7e64c0006fb5b3378086b82f44b5819f975a11038cc305338555d60758e1f8435672a855668ab2e6719a4a42c9c7d596ca4d35a1aa5d SHA512 178003b19f5ad2b3503a929bce131d329e5eafba9f46ae3343cf4271e248ef883b84945e642239a7cdc96185e1b975bcf62004831042c2ab232e7813efbb5339
-EBUILD libe-0.11.0.ebuild 529 BLAKE2B fb93bfe1be9e7d509caf08796ea516086ffa94199d95b715ff4a9e3cbef7fb1ed1f7c91910afa63eea3d9a1913f7dbaa5952a1bb998bd6dbc096cb1799b0630e SHA512 eea4f6e3820d187a0d5f128e943493211571e97f2761f99fc8df36c9e043fa4eeda725b359996302d5d8f061f856a87dc85e1b3105c5f68133ebead0da0e5081
+EBUILD libe-0.11.0.ebuild 619 BLAKE2B ef58b960ed2c8a9b769361a32db84d4616cfd4d3121d1686dbc53e52e1334e15e9174319821b4758f8a8dc0a3784630eaf4ad5bc3c04e4c06f6dddcf1e0ebe6f SHA512 f2bd9e69ce8ef105b2d40121a814321f20ad1e5df489cf29330664cd0bb65523f3e9b7fa258b464993dd29987747c6229c5c1859ef34609a5b1d131d817714f5
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libe/files/libe-0.11.0-strtoul.patch b/dev-libs/libe/files/libe-0.11.0-strtoul.patch
new file mode 100644
index 000000000000..e993c593252f
--- /dev/null
+++ b/dev-libs/libe/files/libe-0.11.0-strtoul.patch
@@ -0,0 +1,11 @@
+--- a/e/convert.h
++++ b/e/convert.h
+@@ -58,7 +58,7 @@
+ 
+     errno = 0;
+ #ifdef _MSC_VER
+-    ret = _strtoui64(s.c_str(), &endptr, base);
++    ret = strtoul(s.c_str(), &endptr, base);
+ #else
+     ret = strtoull(s.c_str(), &endptr, base);
+ #endif
diff --git a/dev-libs/libe/libe-0.11.0.ebuild b/dev-libs/libe/libe-0.11.0.ebuild
index be48fd2433c4..45011db72260 100644
--- a/dev-libs/libe/libe-0.11.0.ebuild
+++ b/dev-libs/libe/libe-0.11.0.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
-
-# bit messy at the moment, next release should fix it I hope
-RESTRICT="test"
+EAPI=7
 
 DESCRIPTION="Hyperdex libe support library"
-
 HOMEPAGE="http://hyperdex.org"
 SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+# bit messy at the moment, next release should fix it I hope
+RESTRICT="test"
+
+RDEPEND="dev-libs/libpo6"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-IUSE=""
+PATCHES=( "${FILESDIR}"/${PN}-0.11.0-strtoul.patch )
+
+src_configure() {
+	econf --disable-static
+}
 
-RDEPEND=">=dev-libs/libpo6-0.8.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+src_install() {
+	default
 
-src_prepare() {
-	sed -i -e 's/_strtoui64/strtoul/' e/convert.h || die
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
-- 
cgit v1.2.3