5 files changed, 13 insertions, 23 deletions
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 294f633159b2..30e57e1d106c 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,2 +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
+DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe
diff --git a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch b/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
deleted file mode 100644
index e71506bce15b..000000000000
--- a/dev-libs/uthash/files/uthash-2.0.2-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uthash-2.0.2/tests/Makefile
-+++ uthash-2.0.2/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/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
index 588ec26078c0..246a5827afae 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.1.0.ebuild b/dev-libs/uthash/uthash-2.1.0.ebuild
index 49f42356561e..c991385c4c34 100644
--- a/dev-libs/uthash/uthash-2.1.0.ebuild
+++ b/dev-libs/uthash/uthash-2.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.2.0.ebuild
index 95707126da3f..d8c9c97693a2 100644
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ b/dev-libs/uthash/uthash-2.2.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-lang/perl )"
-RDEPEND=""
+BDEPEND="test? ( dev-lang/perl )"
 
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
+)
 
 src_test() {
 	cd tests || die