From 67efaff61522aeb024152ab6cddf7c40ffacb530 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Oct 2023 21:52:41 +0100 Subject: gentoo auto-resync : 19:10:2023 - 21:52:41 --- net-p2p/Manifest.gz | Bin 6925 -> 6924 bytes net-p2p/bitcoin-cli/Manifest | 2 +- net-p2p/bitcoin-cli/bitcoin-cli-25.0.ebuild | 13 - net-p2p/bitcoin-cli/bitcoin-cli-25.1.ebuild | 13 + net-p2p/bitcoin-core/Manifest | 8 +- net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild | 340 ----------------------- net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild | 340 +++++++++++++++++++++++ net-p2p/bitcoin-core/files/25.0-syslibs.patch | 9 +- net-p2p/bitcoin-core/files/bitcoind.logrotate-r1 | 2 +- net-p2p/bitcoin-qt/Manifest | 2 +- net-p2p/bitcoin-qt/bitcoin-qt-25.0.ebuild | 18 -- net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild | 18 ++ net-p2p/bitcoind/Manifest | 2 +- net-p2p/bitcoind/bitcoind-25.0.ebuild | 18 -- net-p2p/bitcoind/bitcoind-25.1.ebuild | 18 ++ net-p2p/qbittorrent/Manifest | 4 +- net-p2p/qbittorrent/files/qbittorrent.initd | 2 +- net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild | 138 +++++++++ net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild | 138 --------- 19 files changed, 543 insertions(+), 542 deletions(-) delete mode 100644 net-p2p/bitcoin-cli/bitcoin-cli-25.0.ebuild create mode 100644 net-p2p/bitcoin-cli/bitcoin-cli-25.1.ebuild delete mode 100644 net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild create mode 100644 net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild delete mode 100644 net-p2p/bitcoin-qt/bitcoin-qt-25.0.ebuild create mode 100644 net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild delete mode 100644 net-p2p/bitcoind/bitcoind-25.0.ebuild create mode 100644 net-p2p/bitcoind/bitcoind-25.1.ebuild create mode 100644 net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index 714258e438a1..b6004ca40055 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest index a6f97862faad..1c805f2a7ab5 100644 --- a/net-p2p/bitcoin-cli/Manifest +++ b/net-p2p/bitcoin-cli/Manifest @@ -8,5 +8,5 @@ DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa9 EBUILD bitcoin-cli-0.21.0.ebuild 2392 BLAKE2B 814a5a4e662a5d6f4f382535b57137404361a460f8d88130677d574c7ce54926b147a5d3cba2775393f10a41a826b77b3ea612ff599dace61bc1c2eb07511ce7 SHA512 078f07ea656c7db87b4266d188c5394cf45266c40a5ee63fb070b7a3abfd83366df5ca18549ca3b2af5261cdce1cb208a8fc8a232277c7b8e394fc1b6889f95f EBUILD bitcoin-cli-22.0.ebuild 2596 BLAKE2B 05c1d22d1b33fdabb77b289591fb8b8fa85f520a8361dbcc648193f476cbd29d3e976d2245b075bb1c62be362d394cfa5bd3ad7e0ac3afae7cefc0787e86a57b SHA512 9522cf5e9543902e609b8022ae657b489014c3d98f6065a0348f0c38aeb0389d12908ff38482cb469c62a8a549419aa687844d28cb2a221ebea03786bb25c761 EBUILD bitcoin-cli-24.0.1-r1.ebuild 1595 BLAKE2B 3142a527754a203d0b2017a1f3ab2c331a3e662cd17178cdc45291c783b5ba7f3fb1ca4aab05cc1a7fad9d06fb0395c568a431c6db51aede1d28686c036fd5d7 SHA512 bba4a719f3b34542bbda066226eecf3497033f49d61d947e47090dacce1f9d0d5e52628efc42f3776f767b86dd2bc589689714e6a2f8b8ede3a76c4b9c78c20a -EBUILD bitcoin-cli-25.0.ebuild 375 BLAKE2B 932ed60d6c5f306897c65a51408346077409936410cb84d7f80658bf813d872298d4ac779e64cb98fbf324116d203d20265a0410d95265d23a4f84cf2e0c7513 SHA512 7bb9eb3fcf3eab3fe16edd6819412f9764dbb185af95b8494f4228141fc46f9632b9a16e0f9d191187950e178a903914219c56cd77c25f45e735ed443040d80f +EBUILD bitcoin-cli-25.1.ebuild 375 BLAKE2B 932ed60d6c5f306897c65a51408346077409936410cb84d7f80658bf813d872298d4ac779e64cb98fbf324116d203d20265a0410d95265d23a4f84cf2e0c7513 SHA512 7bb9eb3fcf3eab3fe16edd6819412f9764dbb185af95b8494f4228141fc46f9632b9a16e0f9d191187950e178a903914219c56cd77c25f45e735ed443040d80f MISC metadata.xml 794 BLAKE2B d7258cb6e38b7f95f72212b3d67f2a6c4f69b8a94a55d46189b970bca6c56ba23ec44b1c36a6b4bce19ba65be0b8879fd8240a48324c296d72d0d87e52e41568 SHA512 ef417ee4a492db03efa50d88b16b35a1b1768b7b04aaecd8676539572f25b96a427caab6dae9f5568241e5f1eda06159bd9a52b12a9002c0611b349ad2656470 diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-25.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-25.0.ebuild deleted file mode 100644 index 04157a27bd07..000000000000 --- a/net-p2p/bitcoin-cli/bitcoin-cli-25.0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Transitional package for net-p2p/bitcoin-core[bitcoin-cli]" -HOMEPAGE="https://bitcoincore.org/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND="~net-p2p/bitcoin-core-${PV}[bitcoin-cli]" diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-25.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-25.1.ebuild new file mode 100644 index 000000000000..04157a27bd07 --- /dev/null +++ b/net-p2p/bitcoin-cli/bitcoin-cli-25.1.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Transitional package for net-p2p/bitcoin-core[bitcoin-cli]" +HOMEPAGE="https://bitcoincore.org/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="~net-p2p/bitcoin-core-${PV}[bitcoin-cli]" diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest index e9c04cdbf250..ac4ebb4b6f4b 100644 --- a/net-p2p/bitcoin-core/Manifest +++ b/net-p2p/bitcoin-core/Manifest @@ -1,9 +1,9 @@ -AUX 25.0-syslibs.patch 9152 BLAKE2B 8c35041cee2e95f0ed37906131d5f36ddec619f5fbf0b8cf459eeeed545671d1601b81ee2892f8d15add9cfbedaec76459698916f11248a3f7ea39befe22e9c9 SHA512 0a703604ca3523d98eff65477e8b0926a97a226f55658344c2752b7227568afe18835b506c910cb406fc44255d6dc500f87d2a855fbabd708fc3ee8dd12f873d +AUX 25.0-syslibs.patch 9154 BLAKE2B 6056ffa707c26dab36bdd885ff87fadda4ee5b3a0cb022fa22bd456636f2f8a6bcc2a660664d9debe95bc53b2636aa3418076f97f46bb7801d50a7a40357206e SHA512 5e593e8c18e281dccb40a303d832481d43553d086f7b7a3fcc1c9a823cda88889e7fe51473c049d57a3a2b2c49b7107febafcc60de12b1d91acc1134cb0377d9 AUX bitcoin-qt.protocol 150 BLAKE2B b18645f52a6884fc0e475a85809d5b79e207adc346307623c5f1edececcb4564ac17bdb9a0deeb5c12c41409a34f83c1f22ab89f32852c58d948affa1de57edb SHA512 6b71d9d3fc9e05e6c6595aaaa307be9b5007c25f4b11162c5d873e200576d35156c2c660f229799400a3fba6dc8a9663ff8824371d83242d52ee6472687118ab -AUX bitcoind.logrotate-r1 112 BLAKE2B 99234f16f2cf896acfc32f80988088fd6509a48790c2a56a97328a87b3fd22112dda0050b0de8240378062b5d491b17666b9ff9d7f3030acf8d8a67524e90c2e SHA512 106017dcfb52bf0ecae6166a260e756f5f13bf173c023522c4488d276fb35432bfcde9a944952d141d9ed456f93782031b8451e7d1db76a2b00600912b0327c0 +AUX bitcoind.logrotate-r1 113 BLAKE2B ad27bb7f4f136c17117ca1f149b504da13f7a4ed1f7dce04f1ada2723a8900e94a0e2611aaa0f6d7545fc11d5ca3ecd6925e41875a2c3ed8a4f3e778bfcfb2a4 SHA512 51c77cddd6ff1c852112669b0c4180b04a6a91d8bfdce9d1df6560ac5ef5ebdfcc3998d81a0a47f24834b7314fe132fd9e90386c7eb8933b9c14d59bcc95d876 AUX bitcoind.openrc 2690 BLAKE2B ef44f88f5d03e488ba4793954ff22949fdb293fac64c4264041a7ccd3e261e98ee0d8037f1b4f851a0753295a44168f9ed352a3d09b423d52ffa289fdf7fd1e1 SHA512 827f049acdfff90b3d7dc211a199e86c66c59780a0590d586b1cedf164bfdfc73223b3881001b75d3bc9e5350e41f08a867f3d8fb8b154b284e4ddb90f9c2dd9 AUX init.patch 1472 BLAKE2B 5974542d0890234ccb2cbbcbe022c45c94e5f0235ebb3b7cee3e2e6d61b9e45d7ec31c2ae7c560d38654fda3b6b7e6c4193b02985fe65502a26cb7bc3641dd8f SHA512 b303fa6adecc0d5aac6a9b78d0ab5d4df797e3af80568a0c08ba2b06296a80b9d5cb7e5b1e9af1fb0c83ad5d6e026fec492dfaee7fba56883325ee64f2b78840 AUX org.bitcoin.bitcoin-qt.desktop 465 BLAKE2B 7ce8818cd967e478e6d41106b7111616b81856ae83db742ee53a28dde203cc6a2230daa562c78e7b59d1014bfe1633b4074685acb404966b2b9649c22c356262 SHA512 4f9e20094a6fb99dc47a799c9fd752d328efa2539aaab2230f9225cb80f8889fa7a28e1277694d04db72f7a052d208d6a208671dd3d0c77a9ec9d7a95169f148 -DIST bitcoin-25.0.tar.gz 12413133 BLAKE2B 34f725e8c69ee3eb25d2a0c796f7688b3727603a4a34eb7ef4dd140c9b2995ecf28c60bfa45ad22614dcd445c9ddfdadd8dbb45dfbb9327c4b5dbe50c7ae9a11 SHA512 2be57fc760fa12d291dcf946522838b2e791e24e5dd98de20b5b72af2269269a66539c5bddce590e6cdb6464fd5ecb530cf549edc188ee6f08b4365fdcf850a2 -EBUILD bitcoin-core-25.0.ebuild 10371 BLAKE2B 1b519d39c03f66e0fe39d1df9dbc2cbfa4b5766716d5ae450eeb791b3565b9c28ae6844781b725fe1e0d07005515bc572db00de5e8c21b45da6b330117136e93 SHA512 54d4aa8afd90fefe51cc4a99c14006b3b6011e36e9e68715a1af67e1a0e6a5d0142d3f5ce05de6e8b22451459e4b0dbe3f852eb226c2252e1de29d993f80cd2a +DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab +EBUILD bitcoin-core-25.1.ebuild 10372 BLAKE2B 38136da64c2e7bd9496c14c10553519549fab1a3c881f5691115046d93b3414aad5b6986c0305014ea0c537f414149ab408bc1b66c29407ee537e91eb74fb458 SHA512 10bdc41236ce6bb162b5f2b41042c955161c65c111016a976e55fdb246ce6d1d079ed7e14995c1ce3686ec37dfce29fd133824e7bfd7c54e603ee13fa6ab5b5a MISC metadata.xml 1689 BLAKE2B 2f08040af65acaf771756f70b5810d2a8857abe9b6f828f62bc038f0e5b35d4f434948c1d0ec0aa4fb552b70a025a8d697f6e18e4058928e8eb7363d50a29ed0 SHA512 bd19ff1c3e06210400df633ca424a19ad231404e2b8fb6d3db2e5a5ff61aca05eb0e51116335c047148fda5ec7b09a895b475d5f275559096e7b3e0bc268020f diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild deleted file mode 100644 index 396432ac6598..000000000000 --- a/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools bash-completion-r1 db-use desktop python-any-r1 systemd xdg-utils - -DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency" -HOMEPAGE="https://bitcoincore.org/" -SRC_URI="https://bitcoincore.org/bin/${P}/${P/-core}.tar.gz" -S="${WORKDIR}/${P/-core}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 -IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer kde libs +man nat-pmp qrcode qt5 +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - dbus? ( qt5 ) - kde? ( qt5 ) - qrcode? ( qt5 ) - system-leveldb? ( || ( daemon qt5 ) ) -" -# dev-libs/univalue is now bundled, as upstream dropped support for system copy -# and their version in the Bitcoin repo has deviated a fair bit from upstream. -# Upstream also seems very inactive. -RDEPEND=" - !=dev-libs/boost-1.81.0:= - >=dev-libs/libevent-2.1.12:= - berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) - bitcoin-cli? ( !=net-libs/libnatpmp-20220705:= ) - qrcode? ( >=media-gfx/qrencode-4.1.1:= ) - qt5? ( - !=dev-qt/qtcore-5.15.5:5 - >=dev-qt/qtgui-5.15.5:5 - >=dev-qt/qtnetwork-5.15.5:5 - >=dev-qt/qtwidgets-5.15.5:5 - dbus? ( >=dev-qt/qtdbus-5.15.5:5 ) - ) - sqlite? ( >=dev-db/sqlite-3.38.5:= ) - system-leveldb? ( virtual/bitcoin-leveldb ) - system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.3.1:=[recovery,schnorr] ) - upnp? ( >=net-libs/miniupnpc-2.2.2:= ) - zeromq? ( >=net-libs/zeromq-4.3.4:= ) -" -DEPEND=" - ${RDEPEND} - systemtap? ( >=dev-util/systemtap-4.8 ) -" -BDEPEND=" - virtual/pkgconfig - daemon? ( - acct-group/bitcoin - acct-user/bitcoin - ) - qt5? ( >=dev-qt/linguist-tools-5.15.5:5 ) - test? ( ${PYTHON_DEPS} ) -" -IDEPEND=" - qt5? ( dev-util/desktop-file-utils ) -" - -DOCS=( - doc/bips.md - doc/bitcoin-conf.md - doc/descriptors.md - doc/files.md - doc/i2p.md - doc/JSON-RPC-interface.md - doc/multisig-tutorial.md - doc/p2p-bad-ports.md - doc/psbt.md - doc/reduce-memory.md - doc/reduce-traffic.md - doc/release-notes.md - doc/REST-interface.md - doc/tor.md -) - -PATCHES=( - "${FILESDIR}/25.0-syslibs.patch" - "${FILESDIR}/init.patch" -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - ! use system-leveldb || rm -r src/leveldb || die - if use system-libsecp256k1 ; then - rm -r src/secp256k1 || die - sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die - else - pushd src/secp256k1 >/dev/null || die - AT_NOELIBTOOLIZE=yes eautoreconf - popd >/dev/null || die - fi - eautoreconf - - # we say --disable-util-util, so we can't test bitcoin-util - sed -ne '/^ {/{h;:0;n;H;/^ }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \ - -i test/util/data/bitcoin-util-test.json || die - - sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev qt5 ' bitcoin-qt')/" \ - -i contrib/completions/bash/bitcoind.bash-completion || die -} - -src_configure() { - local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi - local myeconfargs=( - --disable-static - --${wallet}-wallet - $(use_with sqlite) - $(use_with berkdb bdb) - $(use_enable systemtap usdt) - $(use_with upnp miniupnpc) - $(use_with nat-pmp natpmp) - $(use_enable test tests) - --disable-bench - --disable-fuzz{,-binary} - $(use_with qrcode qrencode) - --disable-ccache - $(use_enable asm) - $(use_enable zeromq zmq) - $(use_enable man) - $(use_enable external-signer) - --with-utils - $(use_enable {bitcoin,util}-cli) - --enable-util-tx - --${wallet}-util-wallet - --disable-util-util - $(use_with libs) - $(use_with daemon) - $(use_with qt5 gui qt5) - $(use_with dbus qtdbus) - $(use_with system-leveldb) - $(use_with system-libsecp256k1) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - use external-signer && DOCS+=( doc/external-signer.md ) - use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md ) - use libs && DOCS+=( doc/shared-libraries.md ) - use systemtap && DOCS+=( doc/tracing.md ) - use zeromq && DOCS+=( doc/zmq.md ) - - default - - find "${ED}" -type f -name '*.la' -delete || die - ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die - - newbashcomp contrib/completions/bash/bitcoin-tx.bash-completion bitcoin-tx - use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash-completion bitcoin-cli - use daemon || use qt5 && newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind - - if use daemon ; then - insinto /etc/bitcoin - sed -ne 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ - share/examples/bitcoin.conf >"${ED}/etc/bitcoin/bitcoin.conf" || die - fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf - fperms 0660 /etc/bitcoin/bitcoin.conf - - newconfd contrib/init/bitcoind.openrcconf bitcoind - newinitd "${FILESDIR}/bitcoind.openrc" bitcoind - systemd_newunit contrib/init/bitcoind.service bitcoind.service - - keepdir /var/lib/bitcoind - fperms 0750 /var/lib/bitcoind - fowners bitcoin:bitcoin /var/lib/bitcoind - dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind - fi - - if use qt5 ; then - insinto /usr/share/icons/hicolor/scalable/apps - newins src/qt/res/src/bitcoin.svg bitcoin128.svg - - domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" - - if use kde ; then - insinto /usr/share/kservices5 - doins "${FILESDIR}/bitcoin-qt.protocol" - fi - fi - - if use examples ; then - docinto examples - dodoc -r contrib/{linearize,qos} - use zeromq && dodoc -r contrib/zmq - fi -} - -efmt() { - : ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}") -} - -pkg_preinst() { - if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then - if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then - dosym -r /var/lib/bitcoin{d,/.bitcoin} - elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then - efmt ewarn <<-EOF - Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin, - a deprecated location. To perform an automated migration to - ${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances - that may be using the deprecated path, and then run: - - # emerge --config ${CATEGORY}/${PN} - EOF - insinto /var/lib/bitcoin - mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die - dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf - dosym -r /var/lib/bitcoin{/.bitcoin,d} - fi - fi - - if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then - dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol - fi -} - -pkg_postinst() { - # we don't use xdg.eclass because it adds unconditional IDEPENDs - if use qt5 ; then - xdg_desktop_database_update - xdg_icon_cache_update - fi - - if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then - efmt -su elog <<-EOF - To have ${PN} automatically use Tor when it's running, be sure your \ - 'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \ - correctly, and: - - Using an init script: add the 'bitcoin' user to the 'tor' user group. - - Running bitcoind directly: add that user to the 'tor' user group. - EOF - fi -} - -pkg_postrm() { - if use qt5 ; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} - -pkg_config() { - if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] && - [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] - then - in_use() { - : ${1:?} ; local each - if command -v fuser >/dev/null ; then - fuser "${@}" >/dev/null 2>&1 - elif command -v lsof >/dev/null ; then - for each ; do - lsof -- "${each}" && return - done >/dev/null 2>&1 - elif mountpoint -q /proc ; then - { find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} + - awk '{ print $6 }' /proc/[0-9]*/maps - } 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}") - else - return 13 - fi - } - ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use" - in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock} - case $? in - 0) - eend 1 - efmt eerror <<-EOF - ${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any - running bitcoind instances that may be using this data directory, and then - retry this migration. - EOF - die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" - ;; - 13) - eend 1 - if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then - efmt eerror <<-EOF - Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use. - Do you have /proc mounted? To force the migration without checking, re-run - this command with BITCOIND_IS_NOT_RUNNING=1. - EOF - die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" - fi - ;; - *) - eend 0 - ;; - esac - - # find all relative symlinks that point outside the data dir - local -A symlinks - cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die - local each ; while read -r -d '' each ; do - local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] && - target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] && - symlinks["${each}"]="${target}" - done < <(find -type l -print0) - - einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." - rm -f -- "${EROOT}/var/lib/bitcoind" || die - mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} || - die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." - - # fix up the relative symlinks - cd -- "${EROOT}/var/lib/bitcoind" || die - for each in "${!symlinks[@]}" ; do - ln -fnrs -- "${symlinks[${each}]}" "${each}" # keep going even if this fails - done - - einfo 'Creating a transitional symlink for your convenience.' - ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin} - einfo 'You may remove this link when you no longer need it.' - else - einfo 'Nothing to do.' - fi -} diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild new file mode 100644 index 000000000000..0ed41f21df48 --- /dev/null +++ b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 db-use desktop python-any-r1 systemd xdg-utils + +DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency" +HOMEPAGE="https://bitcoincore.org/" +SRC_URI="https://bitcoincore.org/bin/${P}/${P/-core}.tar.gz" +S="${WORKDIR}/${P/-core}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 +IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer kde libs +man nat-pmp +qrcode qt5 +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + dbus? ( qt5 ) + kde? ( qt5 ) + qrcode? ( qt5 ) + system-leveldb? ( || ( daemon qt5 ) ) +" +# dev-libs/univalue is now bundled, as upstream dropped support for system copy +# and their version in the Bitcoin repo has deviated a fair bit from upstream. +# Upstream also seems very inactive. +RDEPEND=" + !=dev-libs/boost-1.81.0:= + >=dev-libs/libevent-2.1.12:= + berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) + bitcoin-cli? ( !=net-libs/libnatpmp-20220705:= ) + qrcode? ( >=media-gfx/qrencode-4.1.1:= ) + qt5? ( + !=dev-qt/qtcore-5.15.5:5 + >=dev-qt/qtgui-5.15.5:5 + >=dev-qt/qtnetwork-5.15.5:5 + >=dev-qt/qtwidgets-5.15.5:5 + dbus? ( >=dev-qt/qtdbus-5.15.5:5 ) + ) + sqlite? ( >=dev-db/sqlite-3.38.5:= ) + system-leveldb? ( virtual/bitcoin-leveldb ) + system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.3.1:=[recovery,schnorr] ) + upnp? ( >=net-libs/miniupnpc-2.2.2:= ) + zeromq? ( >=net-libs/zeromq-4.3.4:= ) +" +DEPEND=" + ${RDEPEND} + systemtap? ( >=dev-util/systemtap-4.8 ) +" +BDEPEND=" + virtual/pkgconfig + daemon? ( + acct-group/bitcoin + acct-user/bitcoin + ) + qt5? ( >=dev-qt/linguist-tools-5.15.5:5 ) + test? ( ${PYTHON_DEPS} ) +" +IDEPEND=" + qt5? ( dev-util/desktop-file-utils ) +" + +DOCS=( + doc/bips.md + doc/bitcoin-conf.md + doc/descriptors.md + doc/files.md + doc/i2p.md + doc/JSON-RPC-interface.md + doc/multisig-tutorial.md + doc/p2p-bad-ports.md + doc/psbt.md + doc/reduce-memory.md + doc/reduce-traffic.md + doc/release-notes.md + doc/REST-interface.md + doc/tor.md +) + +PATCHES=( + "${FILESDIR}/25.0-syslibs.patch" + "${FILESDIR}/init.patch" +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + ! use system-leveldb || rm -r src/leveldb || die + if use system-libsecp256k1 ; then + rm -r src/secp256k1 || die + sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die + else + pushd src/secp256k1 >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null || die + fi + eautoreconf + + # we say --disable-util-util, so we can't test bitcoin-util + sed -ne '/^ {/{h;:0;n;H;/^ }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \ + -i test/util/data/bitcoin-util-test.json || die + + sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev qt5 ' bitcoin-qt')/" \ + -i contrib/completions/bash/bitcoind.bash-completion || die +} + +src_configure() { + local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi + local myeconfargs=( + --disable-static + --${wallet}-wallet + $(use_with sqlite) + $(use_with berkdb bdb) + $(use_enable systemtap usdt) + $(use_with upnp miniupnpc) + $(use_with nat-pmp natpmp) + $(use_enable test tests) + --disable-bench + --disable-fuzz{,-binary} + $(use_with qrcode qrencode) + --disable-ccache + $(use_enable asm) + $(use_enable zeromq zmq) + $(use_enable man) + $(use_enable external-signer) + --with-utils + $(use_enable {bitcoin,util}-cli) + --enable-util-tx + --${wallet}-util-wallet + --disable-util-util + $(use_with libs) + $(use_with daemon) + $(use_with qt5 gui qt5) + $(use_with dbus qtdbus) + $(use_with system-leveldb) + $(use_with system-libsecp256k1) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + use external-signer && DOCS+=( doc/external-signer.md ) + use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md ) + use libs && DOCS+=( doc/shared-libraries.md ) + use systemtap && DOCS+=( doc/tracing.md ) + use zeromq && DOCS+=( doc/zmq.md ) + + default + + find "${ED}" -type f -name '*.la' -delete || die + ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die + + newbashcomp contrib/completions/bash/bitcoin-tx.bash-completion bitcoin-tx + use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash-completion bitcoin-cli + use daemon || use qt5 && newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind + + if use daemon ; then + insinto /etc/bitcoin + sed -ne 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ + share/examples/bitcoin.conf >"${ED}/etc/bitcoin/bitcoin.conf" || die + fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf + fperms 0660 /etc/bitcoin/bitcoin.conf + + newconfd contrib/init/bitcoind.openrcconf bitcoind + newinitd "${FILESDIR}/bitcoind.openrc" bitcoind + systemd_newunit contrib/init/bitcoind.service bitcoind.service + + keepdir /var/lib/bitcoind + fperms 0750 /var/lib/bitcoind + fowners bitcoin:bitcoin /var/lib/bitcoind + dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind + fi + + if use qt5 ; then + insinto /usr/share/icons/hicolor/scalable/apps + newins src/qt/res/src/bitcoin.svg bitcoin128.svg + + domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" + + if use kde ; then + insinto /usr/share/kservices5 + doins "${FILESDIR}/bitcoin-qt.protocol" + fi + fi + + if use examples ; then + docinto examples + dodoc -r contrib/{linearize,qos} + use zeromq && dodoc -r contrib/zmq + fi +} + +efmt() { + : ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}") +} + +pkg_preinst() { + if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + dosym -r /var/lib/bitcoin{d,/.bitcoin} + elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then + efmt ewarn <<-EOF + Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin, + a deprecated location. To perform an automated migration to + ${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances + that may be using the deprecated path, and then run: + + # emerge --config ${CATEGORY}/${PN} + EOF + insinto /var/lib/bitcoin + mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die + dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf + dosym -r /var/lib/bitcoin{/.bitcoin,d} + fi + fi + + if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then + dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol + fi +} + +pkg_postinst() { + # we don't use xdg.eclass because it adds unconditional IDEPENDs + if use qt5 ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi + + if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then + efmt -su elog <<-EOF + To have ${PN} automatically use Tor when it's running, be sure your \ + 'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \ + correctly, and: + - Using an init script: add the 'bitcoin' user to the 'tor' user group. + - Running bitcoind directly: add that user to the 'tor' user group. + EOF + fi +} + +pkg_postrm() { + if use qt5 ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_config() { + if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] && + [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] + then + in_use() { + : ${1:?} ; local each + if command -v fuser >/dev/null ; then + fuser "${@}" >/dev/null 2>&1 + elif command -v lsof >/dev/null ; then + for each ; do + lsof -- "${each}" && return + done >/dev/null 2>&1 + elif mountpoint -q /proc ; then + { find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} + + awk '{ print $6 }' /proc/[0-9]*/maps + } 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}") + else + return 13 + fi + } + ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use" + in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock} + case $? in + 0) + eend 1 + efmt eerror <<-EOF + ${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any + running bitcoind instances that may be using this data directory, and then + retry this migration. + EOF + die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + ;; + 13) + eend 1 + if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then + efmt eerror <<-EOF + Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use. + Do you have /proc mounted? To force the migration without checking, re-run + this command with BITCOIND_IS_NOT_RUNNING=1. + EOF + die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + fi + ;; + *) + eend 0 + ;; + esac + + # find all relative symlinks that point outside the data dir + local -A symlinks + cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die + local each ; while read -r -d '' each ; do + local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] && + target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] && + symlinks["${each}"]="${target}" + done < <(find -type l -print0) + + einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + rm -f -- "${EROOT}/var/lib/bitcoind" || die + mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} || + die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + + # fix up the relative symlinks + cd -- "${EROOT}/var/lib/bitcoind" || die + for each in "${!symlinks[@]}" ; do + ln -fnrs -- "${symlinks[${each}]}" "${each}" # keep going even if this fails + done + + einfo 'Creating a transitional symlink for your convenience.' + ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin} + einfo 'You may remove this link when you no longer need it.' + else + einfo 'Nothing to do.' + fi +} diff --git a/net-p2p/bitcoin-core/files/25.0-syslibs.patch b/net-p2p/bitcoin-core/files/25.0-syslibs.patch index 525ae129abbb..ec548f08b98c 100644 --- a/net-p2p/bitcoin-core/files/25.0-syslibs.patch +++ b/net-p2p/bitcoin-core/files/25.0-syslibs.patch @@ -1,4 +1,4 @@ -From b4cc8c4437eea107d2d821b1282051756c47a6b6 Mon Sep 17 00:00:00 2001 +From 7dea5ad88e709689e3a40f1de239e238749f9e55 Mon Sep 17 00:00:00 2001 From: Matt Whitlock Date: Sun, 17 Sep 2023 10:29:27 -0400 Subject: [PATCH] support linking against system-installed leveldb and @@ -113,7 +113,7 @@ index c6dc5a6875..3507a81b7a 100644 AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am -index 1d7004ac86..c7d6fdbc39 100644 +index 1d7004ac86..2fb8d3e2eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ check_PROGRAMS = @@ -148,11 +148,12 @@ index 1d7004ac86..c7d6fdbc39 100644 # Make is not made aware of per-object dependencies to avoid limiting building parallelization # But to build the less dependent modules first, we manually select their order here: -@@ -1105,7 +1111,12 @@ endif +@@ -1104,8 +1110,13 @@ endif + include Makefile.minisketch.include - include Makefile.crc32c.include +if EMBEDDED_LEVELDB + include Makefile.crc32c.include include Makefile.leveldb.include +else +LEVELDB_CPPFLAGS = $(leveldb_CFLAGS) diff --git a/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1 b/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1 index bcaff58d9fb9..b70476cc16e4 100644 --- a/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1 +++ b/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1 @@ -1,4 +1,4 @@ -/var/log/bitcoin/debug.log { +/var/log/bitcoind/debug.log { missingok weekly sharedscripts diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index 6922f21eaf22..5b5635d0fc91 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/Manifest @@ -11,5 +11,5 @@ DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa9 EBUILD bitcoin-qt-0.21.0-r1.ebuild 4979 BLAKE2B 6b942dc0957f5a32df13e0436753d0418866f13dd10d1115ec40a3b28e4bbe8ed0b874437ae02dfaae0331c1a1d85026f1ddc1d5e5a6d98807644d6f32318768 SHA512 cc27549fc91201d4a2f22affc1a24eb43517bdf1981f18980cfac36541121ebf099226e417f45b11ca30464d5df8f94d12f14dc99d785851e393b44c3d3a4e18 EBUILD bitcoin-qt-22.0-r1.ebuild 6261 BLAKE2B 094ffc3923770a3fdf5f2583d72250c7d25c3bb694adbe53fb1a1e58d75514c76c9030f7091efacd5df644875f18d8ddb3ef1089272de7c1f5379a26c15d1f15 SHA512 22b1fbcd2cfe33bf7b7399b841350d77f4935e302483184d512747ecba3291f0c92272e93ab325619d89c4d09e855ece81dd4cf713b4e569aed1a5a674cf04bb EBUILD bitcoin-qt-24.0.1.ebuild 3915 BLAKE2B 61d3da1b5d104ee035553f9c667008e876b01bb213d6fdda14126b8bcec79b7d04e7fdd8378294305004e032f5c605d014356f7dedfab316ee5655a4150da801 SHA512 36c1113ef55d415bfebae5381b9acc9a1312591fec8b31209f4675a8f371d017cada9bb7d962e07139ea7c18ec96aeb542a20e93d9e601b043f348456f031488 -EBUILD bitcoin-qt-25.0.ebuild 683 BLAKE2B 5fd6b98079f4e08fcd4a30f7b00fe8a695cda1c313657a6b050bd3f32412ddb9f792b8aa488e42a8f1fe5673e481cca125b29fd21d5e0b59c634ddfb4b6c1990 SHA512 0e5be0da5da363b5d19d92bb8e891fc2a663f27ba3d62e7167b162f7dba9fceb9fac1e0ba5de4c75caf98667549213f195feb726eefdfa0f12715396dcf1961e +EBUILD bitcoin-qt-25.1.ebuild 683 BLAKE2B 5fd6b98079f4e08fcd4a30f7b00fe8a695cda1c313657a6b050bd3f32412ddb9f792b8aa488e42a8f1fe5673e481cca125b29fd21d5e0b59c634ddfb4b6c1990 SHA512 0e5be0da5da363b5d19d92bb8e891fc2a663f27ba3d62e7167b162f7dba9fceb9fac1e0ba5de4c75caf98667549213f195feb726eefdfa0f12715396dcf1961e MISC metadata.xml 1434 BLAKE2B e6e1f0ffac2e6be3bc19fe8bb8e9b18b5b50da6255d70d92fdc28a6e040b54ed4d5b94643835043eb64eae0273111f73c30e93a6d9b7203368aeedb880961c8a SHA512 5e7f2f044b27e4ac21d1e18d177bb1bd493feaad5598ad44abed8a0053403565100877498da29aa4f35e59d570d2a499daea58285dd59f3e62eafba7ee3460e7 diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-25.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-25.0.ebuild deleted file mode 100644 index a879e99badc9..000000000000 --- a/net-p2p/bitcoin-qt/bitcoin-qt-25.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Transitional package for net-p2p/bitcoin-core[qt5]" -HOMEPAGE="https://bitcoincore.org/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+asm +berkdb dbus +external-signer kde nat-pmp +qrcode +sqlite systemtap test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~net-p2p/bitcoin-core-${PV}[qt5,asm=,berkdb=,dbus=,external-signer=,kde=,nat-pmp=,qrcode=,sqlite=,systemtap=,test=,upnp=,zeromq=] - wallet? ( || ( ~net-p2p/bitcoin-core-${PV}[berkdb] ~net-p2p/bitcoin-core-${PV}[sqlite] ) ) -" diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild new file mode 100644 index 000000000000..a879e99badc9 --- /dev/null +++ b/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Transitional package for net-p2p/bitcoin-core[qt5]" +HOMEPAGE="https://bitcoincore.org/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+asm +berkdb dbus +external-signer kde nat-pmp +qrcode +sqlite systemtap test upnp +wallet zeromq" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~net-p2p/bitcoin-core-${PV}[qt5,asm=,berkdb=,dbus=,external-signer=,kde=,nat-pmp=,qrcode=,sqlite=,systemtap=,test=,upnp=,zeromq=] + wallet? ( || ( ~net-p2p/bitcoin-core-${PV}[berkdb] ~net-p2p/bitcoin-core-${PV}[sqlite] ) ) +" diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 73d32f666c1d..ab9e8e732cc3 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -12,5 +12,5 @@ DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa9 EBUILD bitcoind-0.21.0-r1.ebuild 4890 BLAKE2B aeafd089052e3339e78258042454893e37b0fbf867453a99acd688019b58e2be5e3c7a256a0cab9bdacc72d09c985c6afad7d0d7628fa439c80154363e28a4c4 SHA512 2291bdb99d0747ca35dcd53dfea9007100e9c6a666d6a8b1b9193fdae47178c7d8e9715c445ed2e0c873b45ac66fa736169ed43dd3a7a37b3515d3dac2891498 EBUILD bitcoind-22.0-r1.ebuild 6173 BLAKE2B 212e5f1f4c6f06f4adc25f88df4bedf93e61bd123ce0b4648a7ddcfe30c1cd6ebd3554d56ee784a47d29e7314d1ae6cc84f1b7b71c7fe2f9d0ecf7e78f405961 SHA512 2551d976eaec4ccc48431f91b5854bf858794421a6f74f12e9a578065b3eb381ea2b7952f5a159d9280ed299f15edf7a373fecfb9825db7c222350fcdcc7b22d EBUILD bitcoind-24.0.1.ebuild 4078 BLAKE2B 5bed8c28092d9acada04ff5d543738cff11360c27e732c94dd5b3b4ecc664ad526c4ce43ac28191cef34208cc653404639ca4776512e30aa3f51ca2e26ced268 SHA512 bb8f5f00b88c7d7dff051b32ac16aaaef0bede28fe262dd8b62f88dd546df6bb74e2f8f80ce09ddea1d97c1af4caafcffd5b9ff31cfe5ad5bf1046fc28e353eb -EBUILD bitcoind-25.0.ebuild 672 BLAKE2B 3f576d9b537462ba60b763a0c51694185e450fa8859b8a28a230e133717ded34d2ccbe376811170dd8aad7af70114f04839508a2bd0dabec3a8c8615146e98c3 SHA512 591fc5368ffe6c84652d070ed2a14170cfa6f734ecdc6a02865323ff18c98490b4f58cca73cc3cb8fa650e259a266a40539e8e6a9aed3155858f117d6220e4c2 +EBUILD bitcoind-25.1.ebuild 672 BLAKE2B 3f576d9b537462ba60b763a0c51694185e450fa8859b8a28a230e133717ded34d2ccbe376811170dd8aad7af70114f04839508a2bd0dabec3a8c8615146e98c3 SHA512 591fc5368ffe6c84652d070ed2a14170cfa6f734ecdc6a02865323ff18c98490b4f58cca73cc3cb8fa650e259a266a40539e8e6a9aed3155858f117d6220e4c2 MISC metadata.xml 1352 BLAKE2B a924424d5811e88d1dbc6cff68289695e270854d8afb811c4d5d682fc893d2434d166f26c229e5f8ab62e4161944940ee6eb55aa3149b93d69f288a023aa6d3d SHA512 a024d33e339da9e75e10137568503187f186fc717d6bc1f170e478f06fb577340b36a7f13fea070ef98faa97c8bc52e4f60698df4a09b28050656ddd06d842fc diff --git a/net-p2p/bitcoind/bitcoind-25.0.ebuild b/net-p2p/bitcoind/bitcoind-25.0.ebuild deleted file mode 100644 index b0f60caef63e..000000000000 --- a/net-p2p/bitcoind/bitcoind-25.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Transitional package for net-p2p/bitcoin-core[daemon]" -HOMEPAGE="https://bitcoincore.org/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+asm +berkdb examples +external-signer nat-pmp +sqlite systemtap test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~net-p2p/bitcoin-core-${PV}[daemon,asm=,berkdb=,examples=,external-signer=,nat-pmp=,sqlite=,systemtap=,test=,upnp=,zeromq=] - wallet? ( || ( ~net-p2p/bitcoin-core-${PV}[berkdb] ~net-p2p/bitcoin-core-${PV}[sqlite] ) ) -" diff --git a/net-p2p/bitcoind/bitcoind-25.1.ebuild b/net-p2p/bitcoind/bitcoind-25.1.ebuild new file mode 100644 index 000000000000..b0f60caef63e --- /dev/null +++ b/net-p2p/bitcoind/bitcoind-25.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Transitional package for net-p2p/bitcoin-core[daemon]" +HOMEPAGE="https://bitcoincore.org/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+asm +berkdb examples +external-signer nat-pmp +sqlite systemtap test upnp +wallet zeromq" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~net-p2p/bitcoin-core-${PV}[daemon,asm=,berkdb=,examples=,external-signer=,nat-pmp=,sqlite=,systemtap=,test=,upnp=,zeromq=] + wallet? ( || ( ~net-p2p/bitcoin-core-${PV}[berkdb] ~net-p2p/bitcoin-core-${PV}[sqlite] ) ) +" diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 776ec7b01566..c1401f268886 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,10 +1,10 @@ AUX qbittorrent.confd 494 BLAKE2B 862037a6237dd0104ca0717d8cfe1cced3b0e5d15d2629e33a78bfd2ea963a47a344246a2cda085357103762427bc1142d26c53b2a3df11cee9196030ce74407 SHA512 685e65344ed313ec24b8fad48fc9b5fcfcf6ca460fd3ac30861f27e6773ce9d74d45c68b5b21c804c95f5c69fb7139d192113eddea3a8359d43e47f696662846 -AUX qbittorrent.initd 910 BLAKE2B e27d8542acd63291100ac0782f83c6f251d357ee22e81fd8069d246bef2d1f150b86a5ff5ab500db30a9d1dfcbb8833789d9bf22b3ec5af9494ef0e2a2ce4587 SHA512 4d9b70630352db12801facb49fc08bcb95968ccfcea983304cf0f442f9dccaedf2de6d9f9b7e0dfab9aec6a945df49929032d28e5c25c2ca9c17f9a6fed7695e +AUX qbittorrent.initd 911 BLAKE2B 6c776811d97d8eec38104e7fa4df6b3c80f1f50ea985c05e24034f636d73b9b0227ae34a6f4080bf25970cb0ee7ae4edd679bfb402c6d69eb59aa5b4f9c77f28 SHA512 1e1cd4d4163aeacf8c30fdd2b8842fd3565495d6ffa80189ad46a5e928c6bcb4eb30bf3c22fe14237f2e9e6b798680cab058d0a8bd7aa80e6e57a81f718b689c DIST qbittorrent-4.5.2.tar.gz 8890525 BLAKE2B 48585b703ce6edf862ea3c8cfad6cab2edcb65a138c6e8d232322b4f4fd682c87447ff11d29c04c26b5623e730ab9a1ce0496456b3ba6122f97913bd92b86790 SHA512 e900a1c5f0f70163463557aec3de0d31394fac56cfed91ea53ee5cf852cce4b2998bf79be60fc547c1c34a1658378f3ed9dbfb30aae5a772b85d819c7e7ce458 DIST qbittorrent-4.5.4.tar.gz 8791236 BLAKE2B 70b3194d6c4819655998406e0a13d22f3a5068e724048010daebd83d8b8db9e17daee943ca8dabaacd92a0fbc5249257de6d175b35287c748dc2d15395bd71fc SHA512 2e7988922137c9fade99e90236cc0c5b8b30f09021472f8ffc9048a7a2d989925eed7bfab4d79c93ca7d0f21acfde2e7feee5e6c43b557bf2c6f472fd52fbcea DIST qbittorrent-4.5.5.tar.gz 8802492 BLAKE2B 1d20d7900b5b65603c5cf13452fb5aebe396473290d4904641b78867c5345d783482c46edc7042a2e86e79afd790e8c470df62131595eba288f195cc5e716eec SHA512 8b5c2654b3bc03c0b4de77e8388ee543c3892ef9453749ea737aaee999a16d50bd1b30ebe0519a86d7ab8ffc6224d7d9cf678464aebf96433cd71dd57b46dd53 EBUILD qbittorrent-4.5.2-r1.ebuild 2193 BLAKE2B a1cca9de23750e3a0b3a724f7ba21b0b398a97202fc0a41fd8efb10039e5e4a67bf97c97d4662855672c85ec398718699c2befd953339dac42259a49142ba2a8 SHA512 2c06ef6f6c768ed51f769a367fee57c82948f7d09d578c0bd1408e4ac7a525b4ca003b0124d77b666014b483792084262bb7be5be905a4ef09285b3d59bdebae EBUILD qbittorrent-4.5.4.ebuild 2193 BLAKE2B a1cca9de23750e3a0b3a724f7ba21b0b398a97202fc0a41fd8efb10039e5e4a67bf97c97d4662855672c85ec398718699c2befd953339dac42259a49142ba2a8 SHA512 2c06ef6f6c768ed51f769a367fee57c82948f7d09d578c0bd1408e4ac7a525b4ca003b0124d77b666014b483792084262bb7be5be905a4ef09285b3d59bdebae -EBUILD qbittorrent-4.5.5.ebuild 2832 BLAKE2B 2d860392538a555d287637f6093bc0a63a9fd596015bccc99547ab0ce4dc7d3db0016e5481555dcf67c70ee220f17342d32ce2555dbf1c9430e969bc31aa9c3d SHA512 2f65b8783aa8e09f4610ec019b70a7b25daa5e49443e13936263e0687cfecb5790a4265ca8f119fa4df513caf7fa5c6941787bef5a2b809c2583425b5e398c04 +EBUILD qbittorrent-4.5.5-r1.ebuild 2832 BLAKE2B 2d860392538a555d287637f6093bc0a63a9fd596015bccc99547ab0ce4dc7d3db0016e5481555dcf67c70ee220f17342d32ce2555dbf1c9430e969bc31aa9c3d SHA512 2f65b8783aa8e09f4610ec019b70a7b25daa5e49443e13936263e0687cfecb5790a4265ca8f119fa4df513caf7fa5c6941787bef5a2b809c2583425b5e398c04 EBUILD qbittorrent-9999.ebuild 2832 BLAKE2B 2d860392538a555d287637f6093bc0a63a9fd596015bccc99547ab0ce4dc7d3db0016e5481555dcf67c70ee220f17342d32ce2555dbf1c9430e969bc31aa9c3d SHA512 2f65b8783aa8e09f4610ec019b70a7b25daa5e49443e13936263e0687cfecb5790a4265ca8f119fa4df513caf7fa5c6941787bef5a2b809c2583425b5e398c04 MISC metadata.xml 682 BLAKE2B b95ac37db808995fd7eb868d0e944d41c328fb084e9e2ac0d04a55ba6505cad9fb215922af491492b9caaaf66114330f71560f954dfc07e653b6490271aa3b1d SHA512 5b5752a6079f9919521c4e4f7af3ab5dbfddbb3b7d8f49a68513ebb2eb90b0170e3cc44fcf85d4f6d321294f2b9e9bae3f89ee7c17d1ca17fce11de912d867b9 diff --git a/net-p2p/qbittorrent/files/qbittorrent.initd b/net-p2p/qbittorrent/files/qbittorrent.initd index 7f800e640e76..a04de6aaafb9 100644 --- a/net-p2p/qbittorrent/files/qbittorrent.initd +++ b/net-p2p/qbittorrent/files/qbittorrent.initd @@ -14,7 +14,7 @@ command="/usr/bin/qbittorrent-nox" command_args="${QBITTORRENT_OPTS}" pidfile="/run/${RC_SVCNAME}.pid" command_background="yes" -command_user="${QBITTORRENT_USER}:${QBITTORRENT_USER}" +command_user="${QBITTORRENT_USER}:${QBITTORRENT_GROUP}" umask="${QBITTORRENT_UMASK}" start_stop_daemon_args="--ionice ${QBITTORRENT_IONICE} --nicelevel ${QBITTORRENT_NICE}" diff --git a/net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild new file mode 100644 index 000000000000..9ff0a380b472 --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-4.5.5-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo multibuild systemd xdg + +DESCRIPTION="BitTorrent client in C++ and Qt" +HOMEPAGE="https://www.qbittorrent.org" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git" + inherit git-r3 +else + SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/qBittorrent-release-${PV} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+dbus +gui qt6 test webui systemd" +RESTRICT="!test? ( test )" +REQUIRED_USE="|| ( gui webui )" + +RDEPEND=" + >=dev-libs/openssl-1.1.1:= + >=net-libs/libtorrent-rasterbar-1.2.18:= + >=sys-libs/zlib-1.2.11 + virtual/libiconv + gui? ( + dev-libs/geoip + !qt6? ( + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dbus? ( dev-qt/qtdbus:5 ) + ) + qt6? ( + dev-qt/qtbase:6[dbus?,gui,widgets] + dev-qt/qtsvg:6 + ) + ) + qt6? ( dev-qt/qtbase:6[network,ssl,sql,sqlite,xml(+)] ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtxml:5 + ) + acct-group/qbittorrent + acct-user/qbittorrent" +DEPEND=" + ${RDEPEND} + dev-libs/boost + test? ( + !qt6? ( dev-qt/qttest:5 ) + qt6? ( dev-qt/qtbase:6[test] ) + )" +BDEPEND=" + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) + virtual/pkgconfig" + +DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) + +src_prepare() { + MULTIBUILD_VARIANTS=() + use gui && MULTIBUILD_VARIANTS+=( gui ) + use webui && MULTIBUILD_VARIANTS+=( nogui ) + + cmake_src_prepare +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + # musl lacks execinfo.h + -DSTACKTRACE=$(usex !elibc_musl) + + # More verbose build logs are preferable for bug reports + -DVERBOSE_CONFIGURE=ON + + -DQT6=$(usex qt6) + + -DWEBUI=$(usex webui) + + -DTESTING=$(usex test) + ) + + if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then + # We do this in multibuild, see bug #839531 for why. + # Fedora has to do the same thing. + mycmakeargs+=( + -DGUI=ON + -DDBUS=$(usex dbus) + -DSYSTEMD=OFF + ) + else + mycmakeargs+=( + -DGUI=OFF + -DDBUS=OFF + ) + + use systemd && mycmakeargs+=( + # The systemd service calls qbittorrent-nox, which is only + # installed when GUI=OFF. + -DSYSTEMD=ON + -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" + ) + fi + + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_test() { + my_src_test() { + cd "${BUILD_DIR}"/test || die + edo ctest . + } + + multibuild_foreach_variant my_src_test +} + +src_install() { + multibuild_foreach_variant cmake_src_install + einstalldocs + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" +} diff --git a/net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild deleted file mode 100644 index 9ff0a380b472..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edo multibuild systemd xdg - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org" - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git" - inherit git-r3 -else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - S="${WORKDIR}"/qBittorrent-release-${PV} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus +gui qt6 test webui systemd" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( gui webui )" - -RDEPEND=" - >=dev-libs/openssl-1.1.1:= - >=net-libs/libtorrent-rasterbar-1.2.18:= - >=sys-libs/zlib-1.2.11 - virtual/libiconv - gui? ( - dev-libs/geoip - !qt6? ( - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dbus? ( dev-qt/qtdbus:5 ) - ) - qt6? ( - dev-qt/qtbase:6[dbus?,gui,widgets] - dev-qt/qtsvg:6 - ) - ) - qt6? ( dev-qt/qtbase:6[network,ssl,sql,sqlite,xml(+)] ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtxml:5 - ) - acct-group/qbittorrent - acct-user/qbittorrent" -DEPEND=" - ${RDEPEND} - dev-libs/boost - test? ( - !qt6? ( dev-qt/qttest:5 ) - qt6? ( dev-qt/qtbase:6[test] ) - )" -BDEPEND=" - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) - virtual/pkgconfig" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) - -src_prepare() { - MULTIBUILD_VARIANTS=() - use gui && MULTIBUILD_VARIANTS+=( gui ) - use webui && MULTIBUILD_VARIANTS+=( nogui ) - - cmake_src_prepare -} - -src_configure() { - my_src_configure() { - local mycmakeargs=( - # musl lacks execinfo.h - -DSTACKTRACE=$(usex !elibc_musl) - - # More verbose build logs are preferable for bug reports - -DVERBOSE_CONFIGURE=ON - - -DQT6=$(usex qt6) - - -DWEBUI=$(usex webui) - - -DTESTING=$(usex test) - ) - - if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then - # We do this in multibuild, see bug #839531 for why. - # Fedora has to do the same thing. - mycmakeargs+=( - -DGUI=ON - -DDBUS=$(usex dbus) - -DSYSTEMD=OFF - ) - else - mycmakeargs+=( - -DGUI=OFF - -DDBUS=OFF - ) - - use systemd && mycmakeargs+=( - # The systemd service calls qbittorrent-nox, which is only - # installed when GUI=OFF. - -DSYSTEMD=ON - -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" - ) - fi - - cmake_src_configure - } - - multibuild_foreach_variant my_src_configure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_test() { - my_src_test() { - cd "${BUILD_DIR}"/test || die - edo ctest . - } - - multibuild_foreach_variant my_src_test -} - -src_install() { - multibuild_foreach_variant cmake_src_install - einstalldocs - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} -- cgit v1.2.3