[gentoo-commits] repo/gentoo:master commit in: dev-libs/uthash/files/, dev-libs/uthash/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/uthash/files/, dev-libs/uthash/

[Sam James]

commit:     e93f21233a33529cc68db70987e76eb14c80c6b7
Author:     Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Mon Sep 21 10:20:10 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 16:27:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93f2123

dev-libs/uthash: Version update to 2.1.0 with changes:

* Removed empty RDEPEND.
* Removed ${PN} in SRC_URI.

Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17624
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/uthash/Manifest                        |  1 +
 dev-libs/uthash/files/uthash-2.1.0-cflags.patch | 11 +++++++++
 dev-libs/uthash/uthash-2.1.0.ebuild             | 30 +++++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 352c96a33a5..294f633159b 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1 +1,2 @@
 DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
+DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0

diff --git a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
new file mode 100644
index 00000000000..588ec26078c
--- /dev/null
+++ b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
@@ -0,0 +1,11 @@
+--- uthash-2.1.0/tests/Makefile
++++ uthash-2.1.0/tests/Makefile
+@@ -18,7 +18,7 @@
+ CFLAGS += -I$(HASHDIR)
+ #CFLAGS += -DHASH_BLOOM=16
+ #CFLAGS += -O2
+-CFLAGS += -g
++#CFLAGS += -g
+ #CFLAGS += -Wstrict-aliasing=2
+ CFLAGS += -Wall 
+ #CFLAGS += -Wextra 

diff --git a/dev-libs/uthash/uthash-2.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild
new file mode 100644
index 00000000000..49f42356561
--- /dev/null
+++ b/dev-libs/uthash/uthash-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy-to-use hash implementation for C programmers"
+HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
+SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-lang/perl )"
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+src_test() {
+	cd tests || die
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	doheader src/*.h
+	dodoc doc/*.txt
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/uthash/files/, dev-libs/uthash/

[Sam James]

commit:     d0e604bac9f6462a3483cca607e51775ed91f942
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 21:09:07 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 21:09:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e604ba

dev-libs/uthash: minor changes post-merge

* Style changes
* Tidy up patch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/uthash/files/uthash-2.1.0-cflags.patch | 4 ++--
 dev-libs/uthash/uthash-2.2.0.ebuild             | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
index 588ec26078c..246a5827afa 100644
--- a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
+++ b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
@@ -1,5 +1,5 @@
---- uthash-2.1.0/tests/Makefile
-+++ uthash-2.1.0/tests/Makefile
+--- a/tests/Makefile
++++ b/tests/Makefile
 @@ -18,7 +18,7 @@
  CFLAGS += -I$(HASHDIR)
  #CFLAGS += -DHASH_BLOOM=16

diff --git a/dev-libs/uthash/uthash-2.2.0.ebuild b/dev-libs/uthash/uthash-2.2.0.ebuild
index 4204681a71c..d8c9c97693a 100644
--- a/dev-libs/uthash/uthash-2.2.0.ebuild
+++ b/dev-libs/uthash/uthash-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,9 +15,11 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-lang/perl )"
+BDEPEND="test? ( dev-lang/perl )"
 
-PATCHES=( "${FILESDIR}"/uthash-2.1.0-cflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
+)
 
 src_test() {
 	cd tests || die