[gentoo-commits] repo/user/superposition:master commit in: net-libs/opendht/, net-libs/opendht/files/

[Philip Miess]

commit:     ba1e6d36b59b0255cb66989a1f8a73eee403a78f
Author:     Philip Miess <Philip_Miess <AT> yahoo <DOT> com>
AuthorDate: Fri Apr 23 23:00:59 2021 +0000
Commit:     Philip Miess <Phil_miess <AT> yahoo <DOT> com>
CommitDate: Fri Apr 23 23:00:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/user/superposition.git/commit/?id=ba1e6d36

move opendht to supported python versions

Signed-off-by: Philip Miess <Philip_Miess <AT> yahoo.com>

 net-libs/opendht/Manifest                  |  3 ++
 net-libs/opendht/files/argon2_system.patch | 53 ++++++++++++++++++++++++++++++
 net-libs/opendht/metadata.xml              | 13 ++++++++
 net-libs/opendht/opendht-1.10.1-r1.ebuild  | 46 ++++++++++++++++++++++++++
 4 files changed, 115 insertions(+)

diff --git a/net-libs/opendht/Manifest b/net-libs/opendht/Manifest
new file mode 100644
index 0000000..b7d9766
--- /dev/null
+++ b/net-libs/opendht/Manifest
@@ -0,0 +1,3 @@
+AUX argon2_system.patch 1995 BLAKE2B 704a654d5129979b02a269a1b83b5d49c41d4ba26dda12a91e9c5c8fd39d3e75df1fce677e908394bd58f3c1bc0189cfde96adf5a647982ca2d00250f80c471b SHA512 3fbe48411c15eef1fc9d3d94c3f365fd8f4114a7bdaf08b94937c6af0ff4719c179c118bee761f5e0d76ae2a4a6e7e0f3804dd37b53f08d73dcc77e959954acf
+EBUILD opendht-1.10.1-r1.ebuild 1007 BLAKE2B 01bd780d978591ce1f3626492bb19d03951d8387a9a5f20478886eef09bd036eddebd26dda4f3e5366019d2400e1f5bfb7ea89fdb64da8e84ac624c68c94a94b SHA512 e2440cf73da85cf50605678c8e4814026c918d964061a6005726da12088cb1476836af25508148c79f9885798fd27dfbcf3789853e5b671ca02dbc33708d0f33
+MISC metadata.xml 459 BLAKE2B cb50e6e65860f5c8204d484dbab31856172c1c28a32c84286c79175dcffae7e8fe496dc2aef499037ee22a78599de0a83c2c758b3537067e78181eba19f42174 SHA512 f4df0ff9fb852ff4d6fc1979e4042d745ccf645ca2f12855563a2c0d6384708a49b475aa5dd2e7298c8821d95b70353177f438158cacc1feb8030bae48188dab

diff --git a/net-libs/opendht/files/argon2_system.patch b/net-libs/opendht/files/argon2_system.patch
new file mode 100644
index 0000000..6fe5363
--- /dev/null
+++ b/net-libs/opendht/files/argon2_system.patch
@@ -0,0 +1,53 @@
+Description: Use Gentoo's argon2 library
+Bug: https://github.com/savoirfairelinux/opendht/issues/83
+Author: Alexandre Viau <aviau@××××××.org>
+Last-Update: 2016-06-27
+--- ./CMakeLists.txt	2017-02-21 14:31:08.651579119 +0300
++++ ./CMakeLists.txt	2017-02-21 14:42:10.475425173 +0300
+@@ -62,10 +62,4 @@
+     src/securedht.cpp
+     src/dhtrunner.cpp
+-    src/argon2/argon2.c
+-    src/argon2/core.c
+-    src/argon2/blake2/blake2b.c
+-    src/argon2/thread.c
+-    src/argon2/encoding.c
+-    src/argon2/ref.c
+     src/indexation/pht.cpp
+     src/log.cpp
+@@ -123,5 +117,5 @@
+         target_link_libraries(opendht-static -flto -fuse-linker-plugin)
+     endif ()
+-    target_link_libraries(opendht-static gnutls nettle)
++    target_link_libraries(opendht-static gnutls nettle argon2)
+     install (TARGETS opendht-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
+ endif ()
+@@ -138,5 +132,5 @@
+         target_link_libraries(opendht -flto -fuse-linker-plugin)
+     endif ()
+-    target_link_libraries(opendht gnutls nettle)
++    target_link_libraries(opendht gnutls nettle argon2)
+     install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
+ endif ()
+ --- ./src/crypto.cpp	2017-02-21 14:31:07.969600917 +0300
++++ ./src/crypto.cpp	2017-02-21 14:47:02.711084414 +0300
+@@ -28,5 +28,5 @@
+ #include <nettle/aes.h>
+
+-#include "argon2/argon2.h"
++#include "argon2.h"
+ }
+ 
+--- ./tools/CMakeLists.txt	2017-02-21 14:31:08.632579726 +0300
++++ ./tools/CMakeLists.txt	2017-02-21 14:49:29.956687421 +0300
+@@ -4,7 +4,7 @@
+ add_executable (dhtchat dhtchat.cpp tools_common.h)
+
+-target_link_libraries (dhtnode LINK_PUBLIC gnutls readline)
+-target_link_libraries (dhtscanner LINK_PUBLIC gnutls readline)
+-target_link_libraries (dhtchat LINK_PUBLIC gnutls readline)
++target_link_libraries (dhtnode LINK_PUBLIC gnutls readline argon2)
++target_link_libraries (dhtscanner LINK_PUBLIC gnutls readline argon2)
++target_link_libraries (dhtchat LINK_PUBLIC gnutls readline argon2)
+
+ if (OPENDHT_SHARED)

diff --git a/net-libs/opendht/metadata.xml b/net-libs/opendht/metadata.xml
new file mode 100644
index 0000000..e6029c5
--- /dev/null
+++ b/net-libs/opendht/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<longdescription>A lightweight C++11 Distributed Hash Table implementation</longdescription>
+ <use>
+    <flag name="python">
+      Install Python bindings. Requires <pkg>dev-python/cython</pkg>.
+    </flag>
+    <flag name="tools">
+      Install extra opendht tools (dhtchat, dhtnode and dhtscanner).
+    </flag>
+ </use>
+</pkgmetadata>

diff --git a/net-libs/opendht/opendht-1.10.1-r1.ebuild b/net-libs/opendht/opendht-1.10.1-r1.ebuild
new file mode 100644
index 0000000..d77b472
--- /dev/null
+++ b/net-libs/opendht/opendht-1.10.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit eutils git-r3 cmake-utils python-r1
+
+DESCRIPTION="A lightweight C++11 Distributed Hash Table implementation"
+HOMEPAGE="https://github.com/savoirfairelinux/opendht/blob/master/README.md"
+EGIT_REPO_URI="https://github.com/savoirfairelinux/${PN}.git"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_BRANCH="master"
+	KEYWORDS=""
+else
+	EGIT_COMMIT="${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="doc python static-libs tools"
+
+DEPEND=">=dev-libs/msgpack-2.0
+	>=net-libs/gnutls-3.3
+	python? ( dev-python/cython[$(python_gen_usedep python3_{7,8,9})] )
+	tools? ( sys-libs/readline:0 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPENDHT_PYTHON=$(usex python)
+		-DOPENDHT_STATIC=$(usex static-libs)
+		-DOPENDHT_TOOLS=$(usex tools)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use !doc && rm README.md
+	cmake-utils_src_install
+}