net-p2p/c-lightning: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20

10 files changed, 14 insertions, 179 deletions

diff --git a/net-p2p/c-lightning/c-lightning-0.7.3.ebuild b/net-p2p/c-lightning/c-lightning-0.7.3.ebuild
deleted file mode 100644
index 0d71562f..00000000
--- a/net-p2p/c-lightning/c-lightning-0.7.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit git-r3 autotools libtool toolchain-funcs systemd python-r1
-
-DESCRIPTION="A specification compliant Lightning Network implementation in C"
-HOMEPAGE="https://github.com/ElementsProject/lightning"
-EGIT_REPO_URI="https://github.com/ElementsProject/lightning.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+sqlite"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-python/mako:=[${PYTHON_USEDEP}]
-	app-text/asciidoc
-	sys-devel/gettext"
-DEPEND="dev-libs/libsodium:=
-	dev-libs/gmp:0
-	sqlite? ( dev-db/sqlite:3 )
-	sys-libs/zlib:="
-RDEPEND="${DEPEND}
-	net-p2p/bitcoin-cli"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-build-do-not-Werror.patch"
-	"${FILESDIR}/${PV}-build-do-not-refresh-external-modules.patch"
-	"${FILESDIR}/${PV}-build-remove-deprecated-AM_ENABLE_MULTILIB.patch"
-	"${FILESDIR}/${PV}-build-use-FHS-docdir.patch"
-)
-
-src_prepare() {
-	default
-
-	export PYTEST=:
-	export CC="$(tc-getCC)" CONFIGURATOR_CC="${CBUILD}-gcc"
-	export CDEBUGFLAGS="-std=gnu11 -fstack-protector ${CFLAGS}"
-
-	sed -i \
-		-e "s:^VERSION=.*:VERSION=${PVR}:" \
-		Makefile \
-		|| die
-
-	local externals=( libbacktrace libsodium libwally-core )
-
-	for x in ${externals[@]} ; do
-		pushd "external/${x}" > /dev/null || die
-		eautoreconf
-		popd > /dev/null || die
-	done
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--enable-compat \
-		--disable-static \
-		--disable-developer \
-		--disable-experimental-features \
-		--disable-valgrind \
-		--disable-address-sanitizer
-}
-
-src_compile() {
-	emake CDEBUGFLAGS="${CDEBUGFLAGS}"
-}
-
-src_install() {
-	default
-
-	systemd_dounit contrib/init/lightningd.service
-}
diff --git a/net-p2p/c-lightning/c-lightning-0.8.0.ebuild b/net-p2p/c-lightning/c-lightning-0.8.1.ebuild
index 3a438c9d..dd491617 100644
--- a/net-p2p/c-lightning/c-lightning-0.8.0.ebuild
+++ b/net-p2p/c-lightning/c-lightning-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit git-r3 autotools libtool toolchain-funcs systemd python-r1
 
 DESCRIPTION="A specification compliant Lightning Network implementation in C"
@@ -24,7 +24,9 @@ DEPEND="dev-libs/libsodium:=
 	sqlite? ( dev-db/sqlite:3 )
 	sys-libs/zlib:="
 RDEPEND="${DEPEND}
-	net-p2p/bitcoin-cli"
+	net-p2p/bitcoin-cli
+	acct-user/bitcoin
+	acct-group/bitcoin"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-build-do-not-Werror.patch"
diff --git a/net-p2p/c-lightning/files/0.8.0-build-do-not-Werror.patch b/net-p2p/c-lightning/files/0.8.0-build-do-not-Werror.patch
deleted file mode 100644
index bd9a964f..00000000
--- a/net-p2p/c-lightning/files/0.8.0-build-do-not-Werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3b38929a6386e6de9873e8c200610602a0bb281d Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon, 13 May 2019 23:59:33 +0000
-Subject: [PATCH 1/3] build: do not -Werror
-
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 8ecc9700c404..da20d509c220 100755
---- a/configure
-+++ b/configure
-@@ -6,7 +6,7 @@ set -e
- CONFIGURATOR=ccan/tools/configurator/configurator
- CONFIG_VAR_FILE=config.vars
- CONFIG_HEADER=ccan/config.h
--BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror"
-+BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition"
- 
- usage_with_default()
- {
diff --git a/net-p2p/c-lightning/files/0.8.0-build-do-not-refresh-external-modules.patch b/net-p2p/c-lightning/files/0.8.0-build-do-not-refresh-external-modules.patch
deleted file mode 100644
index 7a85ed45..00000000
--- a/net-p2p/c-lightning/files/0.8.0-build-do-not-refresh-external-modules.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6d65270589ccef06c8472e5309d2ac4fd8264496 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon, 13 May 2019 23:50:38 +0000
-Subject: [PATCH 2/3] build: do not refresh external modules
-
----
- external/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/external/Makefile b/external/Makefile
-index 9079ae37bb69..258b64033d5d 100644
---- a/external/Makefile
-+++ b/external/Makefile
-@@ -36,7 +36,7 @@ endif
- EXTERNAL_LDLIBS := -Lexternal $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS)))
- 
- submodcheck: FORCE
--	@tools/refresh-submodules.sh $(SUBMODULES)
-+	: @tools/refresh-submodules.sh $(SUBMODULES)
- 
- # We build libsodium, since Ubuntu xenial has one too old.
- external/libsodium.a: external/libsodium/src/libsodium/libsodium.la
diff --git a/net-p2p/c-lightning/files/0.8.0-build-remove-deprecated-AM_ENABLE_MULTILIB.patch b/net-p2p/c-lightning/files/0.8.0-build-remove-deprecated-AM_ENABLE_MULTILIB.patch
deleted file mode 100644
index 415a71cf..00000000
--- a/net-p2p/c-lightning/files/0.8.0-build-remove-deprecated-AM_ENABLE_MULTILIB.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8271ca3e71e258c99675c0f873724d07a8c22440 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Mon, 13 May 2019 23:47:42 +0000
-Subject: [PATCH] build: remove deprecated AM_ENABLE_MULTILIB
-
----
- external/libbacktrace/configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/external/libbacktrace/configure.ac b/external/libbacktrace/configure.ac
-index 2aad65ad9c7f..0cebaab8fc9a 100644
---- a/external/libbacktrace/configure.ac
-+++ b/external/libbacktrace/configure.ac
-@@ -35,11 +35,6 @@ AC_CONFIG_SRCDIR(backtrace.h)
- AC_CONFIG_HEADER(config.h)
- AC_CONFIG_MACRO_DIR(config)
- 
--# with_target_subdir is used when configured as part of a GCC tree.
--if test -n "${with_target_subdir}"; then
--  AM_ENABLE_MULTILIB(, ..)
--fi
--
- AC_CANONICAL_SYSTEM
- target_alias=${target_alias-$host_alias}
- 
diff --git a/net-p2p/c-lightning/files/0.8.0-build-use-FHS-docdir.patch b/net-p2p/c-lightning/files/0.8.0-build-use-FHS-docdir.patch
deleted file mode 100644
index 20c626f0..00000000
--- a/net-p2p/c-lightning/files/0.8.0-build-use-FHS-docdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c2699e5305e99daebb0bafb3f8bcc5afe6371f0c Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 14 May 2019 01:33:02 +0000
-Subject: [PATCH 3/3] build: use FHS docdir
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 16a45b46078d..70d2131004b4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -452,7 +452,7 @@ libexecdir = $(exec_prefix)/libexec
- pkglibexecdir = $(libexecdir)/$(PKGNAME)
- plugindir = $(pkglibexecdir)/plugins
- datadir = $(PREFIX)/share
--docdir = $(datadir)/doc/$(PKGNAME)
-+docdir = $(datadir)/doc/$(PKGNAME)-$(VERSION)
- mandir = $(datadir)/man
- man1dir = $(mandir)/man1
- man5dir = $(mandir)/man5
diff --git a/net-p2p/c-lightning/files/0.7.3-build-do-not-Werror.patch b/net-p2p/c-lightning/files/0.8.1-build-do-not-Werror.patch
index 836ff05c..e26f05a3 100644
--- a/net-p2p/c-lightning/files/0.7.3-build-do-not-Werror.patch
+++ b/net-p2p/c-lightning/files/0.8.1-build-do-not-Werror.patch
@@ -1,4 +1,4 @@
-From b0c5647f184522ac11f817b8be542e6277a9efe3 Mon Sep 17 00:00:00 2001
+From a9d1f53a9a7f4b6e2cd31fbd4845607ae89d2607 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Mon, 13 May 2019 23:59:33 +0000
 Subject: [PATCH] build: do not -Werror
@@ -8,7 +8,7 @@ Subject: [PATCH] build: do not -Werror
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 0d28929502a8..9aec451beb2f 100755
+index 91dce80e70c1..7ac31556d566 100755
 --- a/configure
 +++ b/configure
 @@ -6,7 +6,7 @@ set -e
diff --git a/net-p2p/c-lightning/files/0.7.3-build-do-not-refresh-external-modules.patch b/net-p2p/c-lightning/files/0.8.1-build-do-not-refresh-external-modules.patch
index f6118a6c..78433648 100644
--- a/net-p2p/c-lightning/files/0.7.3-build-do-not-refresh-external-modules.patch
+++ b/net-p2p/c-lightning/files/0.8.1-build-do-not-refresh-external-modules.patch
@@ -1,4 +1,4 @@
-From 6ab2b283141a381c16ed207a543b5366e93d7fe2 Mon Sep 17 00:00:00 2001
+From 6c9b60c2242a85f89bb7b2ca31c1f793ee89bba4 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Mon, 13 May 2019 23:50:38 +0000
 Subject: [PATCH] build: do not refresh external modules
@@ -8,15 +8,15 @@ Subject: [PATCH] build: do not refresh external modules
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/external/Makefile b/external/Makefile
-index 697258120f1d..e365563b10e5 100644
+index ef7ca822d653..c323edb68550 100644
 --- a/external/Makefile
 +++ b/external/Makefile
-@@ -32,7 +32,7 @@ endif
- EXTERNAL_LDLIBS := -Lexternal $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS)))
+@@ -43,7 +43,7 @@ endif
+ EXTERNAL_LDLIBS := -L${TARGET_DIR} $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS)))
  
  submodcheck: FORCE
 -	@tools/refresh-submodules.sh $(SUBMODULES)
 +	: @tools/refresh-submodules.sh $(SUBMODULES)
  
  # We build libsodium, since Ubuntu xenial has one too old.
- external/libsodium.a: external/libsodium/src/libsodium/libsodium.la
+ $(TARGET_DIR)/libsodium.a: $(TARGET_DIR)/libsodium-build/src/libsodium/libsodium.la
diff --git a/net-p2p/c-lightning/files/0.7.3-build-remove-deprecated-AM_ENABLE_MULTILIB.patch b/net-p2p/c-lightning/files/0.8.1-build-remove-deprecated-AM_ENABLE_MULTILIB.patch
index 415a71cf..415a71cf 100644
--- a/net-p2p/c-lightning/files/0.7.3-build-remove-deprecated-AM_ENABLE_MULTILIB.patch
+++ b/net-p2p/c-lightning/files/0.8.1-build-remove-deprecated-AM_ENABLE_MULTILIB.patch
diff --git a/net-p2p/c-lightning/files/0.7.3-build-use-FHS-docdir.patch b/net-p2p/c-lightning/files/0.8.1-build-use-FHS-docdir.patch
index 70f2ae34..1b033b3d 100644
--- a/net-p2p/c-lightning/files/0.7.3-build-use-FHS-docdir.patch
+++ b/net-p2p/c-lightning/files/0.8.1-build-use-FHS-docdir.patch
@@ -1,4 +1,4 @@
-From 5ac9f6749086d573bcc43a04e7ae958ce9bdf431 Mon Sep 17 00:00:00 2001
+From 958793024920e9b60e2fd25aa7bb44e26fb2a434 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Tue, 14 May 2019 01:33:02 +0000
 Subject: [PATCH] build: use FHS docdir
@@ -8,10 +8,10 @@ Subject: [PATCH] build: use FHS docdir
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 7c19a5d6d5f3..c1ebb281690c 100644
+index 7f49817de936..147305077c65 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -452,7 +452,7 @@ libexecdir = $(exec_prefix)/libexec
+@@ -456,7 +456,7 @@ libexecdir = $(exec_prefix)/libexec
  pkglibexecdir = $(libexecdir)/$(PKGNAME)
  plugindir = $(pkglibexecdir)/plugins
  datadir = $(PREFIX)/share