From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 29 Jan 2021 18:03:51 +0000
Subject: gentoo resync : 29.01.2021

---
 dev-util/bitcoin-tx/Manifest                       |  1 -
 dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch | 47 ----------------------
 2 files changed, 48 deletions(-)
 delete mode 100644 dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch

(limited to 'dev-util/bitcoin-tx')

diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index e48cdc745f74..49ee916e7960 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,3 @@
-AUX 0.19.1-no-libevent.patch 2262 BLAKE2B dc743112a7addd9abd0391cad7fd15d0060cf666c0fe13b6edb0eb065b49cab18099a9c812df560ebb456e57bbab64f65a4e2617fd262fff53e88eca62ec9b53 SHA512 6d8aad17f504b862d5f8f093db6cfa0db294b6f4130fc74116059400ca39833d75454c66b78644713480dfb062484354a1c457dc2e39c9f0ff27b8ccba5539d3
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
diff --git a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
deleted file mode 100644
index fa29f8bbac97..000000000000
--- a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1271,7 +1271,7 @@ if test x$use_pkgconfig = xyes; then
-         BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
-       fi
-       if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
--        PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
-+        PKG_CHECK_MODULES([EVENT], [libevent], [use_libevent=yes], [AC_MSG_ERROR(libevent not found.)])
-         if test x$TARGET_OS != xwindows; then
-           PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
-         fi
-@@ -1291,7 +1291,7 @@ if test x$use_pkgconfig = xyes; then
- else
- 
-   if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
--    AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
-+    AC_CHECK_HEADER([event2/event.h], [use_libevent=yes], AC_MSG_ERROR(libevent headers missing),)
-     AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
-     if test x$TARGET_OS != xwindows; then
-       AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
-@@ -1545,6 +1545,7 @@ AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
- AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
- AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
- AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
-+AM_CONDITIONAL([USE_LIBEVENT],[test x$use_libevent = xyes])
- AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
- AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
- AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes])
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -523,10 +523,13 @@ libbitcoin_util_a_SOURCES = \
-   util/strencodings.cpp \
-   util/string.cpp \
-   util/time.cpp \
--  util/url.cpp \
-   util/validation.cpp \
-   $(BITCOIN_CORE_H)
- 
-+if USE_LIBEVENT
-+libbitcoin_util_a_SOURCES += util/url.cpp
-+endif
-+
- if GLIBC_BACK_COMPAT
- libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
- AM_LDFLAGS += $(COMPAT_LDFLAGS)
-- 
cgit v1.2.3