From d6a033a8e47d1c031c84d876f37f972d4d11479b Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 16:51:50 +1300 Subject: [PATCH 1/8] media-video/jellyfin-mpv-shim: move app-arch/unzip to bdepend Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild | 2 +- media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild b/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild index 13ac4d7ce5..255aaf8da7 100644 --- a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild +++ b/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.0.ebuild @@ -26,7 +26,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" DEPEND=" - app-arch/unzip $(python_gen_cond_dep ' dev-python/python-mpv[${PYTHON_USEDEP}] dev-python/jellyfin-apiclient-python[${PYTHON_USEDEP}] @@ -47,6 +46,7 @@ RDEPEND=" dev-python/werkzeug[${PYTHON_USEDEP}] ') " +BDEPEND="app-arch/unzip" src_install() { distutils-r1_src_install diff --git a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild b/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild index 13ac4d7ce5..255aaf8da7 100644 --- a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild +++ b/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-1.8.1.ebuild @@ -26,7 +26,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" DEPEND=" - app-arch/unzip $(python_gen_cond_dep ' dev-python/python-mpv[${PYTHON_USEDEP}] dev-python/jellyfin-apiclient-python[${PYTHON_USEDEP}] @@ -47,6 +46,7 @@ RDEPEND=" dev-python/werkzeug[${PYTHON_USEDEP}] ') " +BDEPEND="app-arch/unzip" src_install() { distutils-r1_src_install From 6d827547f7ea8dc12308edd30dc99cdd53f948c4 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 21:28:49 +1300 Subject: [PATCH 2/8] net-p2p/monero: remove hw-wallet use flag Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-p2p/monero/Manifest | 1 - net-p2p/monero/metadata.xml | 4 ---- net-p2p/monero/monero-0.17.1.7.ebuild | 13 ++----------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index 8dc5d5af31..d313f0a4dc 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,4 +1,3 @@ DIST monero-0.17.1.7.tar.gz 10598750 BLAKE2B 03a80f3c38bc1b643d8d9ddba4ee1de59e0f4c6d66cfc5dcb700d19659a5cb66add4fcf1320c1ed2b7dfa15fdfe9548eb758e67661832f9da7bd0e173b5a0ae1 SHA512 b049a738eb5752a620fc19dfafd5e2996d3f33d89737774264a5ef69b7fcfcd9fe852b89e35187486f48fdc8bb73c2010a1917d1ed7fcb4f1f87b18a6bb4c2d5 DIST monero-randomx-0.17.1.7.tar.gz 163581 BLAKE2B d1a4021a652c95d0af9c6bf2fdab2470641206e908778daafa2640e986d5635bdddfa39f44a6a9542d0c17284cf0551eac3be68a24176f1ba7106611517a080f SHA512 626cc83aa22015049c82811be5d66e96f3d14a413d9cb3eee3c28464fbdef71889b97a6385f24c7cac5fc5a9cada197ba887ae2c0782cec0d3e29debad0f3e91 DIST monero-supercop-0.17.1.7.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 -DIST monero-trezor-common-0.17.1.7.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf diff --git a/net-p2p/monero/metadata.xml b/net-p2p/monero/metadata.xml index b865c6e7bc..d4e9938708 100644 --- a/net-p2p/monero/metadata.xml +++ b/net-p2p/monero/metadata.xml @@ -14,10 +14,6 @@ Build the Monero daemon used to connect to the P2P network. - - Enable if you want to use a hardware wallet like a Trezor or - Ledger. - Build tools used to manipulate the blockchain as it is stored on disk. diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild index 63a2009b45..11f61385f3 100644 --- a/net-p2p/monero/monero-0.17.1.7.ebuild +++ b/net-p2p/monero/monero-0.17.1.7.ebuild @@ -7,7 +7,6 @@ inherit cmake systemd MY_RANDOMX_REV="5ce5f4906c1eb166be980f6d83cc80f4112ffc2a" MY_SUPERCOP_REV="633500ad8c8759995049ccd022107d1fa8a1bbc9" -MY_TREZORCOMMON_REV="bff7fdfe436c727982cc553bdfb29a9021b423b0" DESCRIPTION="The secure, private, untraceable cryptocurrency" HOMEPAGE="https://github.com/monero-project/monero" @@ -15,13 +14,12 @@ SRC_URI=" https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/tevador/RandomX/archive/${MY_RANDOMX_REV}.tar.gz -> ${PN}-randomx-${PV}.tar.gz https://github.com/monero-project/supercop/archive/${MY_SUPERCOP_REV}.tar.gz -> ${PN}-supercop-${PV}.tar.gz - hw-wallet? ( https://github.com/trezor/trezor-common/archive/${MY_TREZORCOMMON_REV}.tar.gz -> ${PN}-trezor-common-${PV}.tar.gz ) " LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+daemon hw-wallet libressl readline tools +wallet-cli +wallet-rpc" +IUSE="+daemon libressl readline tools +wallet-cli +wallet-rpc" REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )" DEPEND=" @@ -33,11 +31,6 @@ DEPEND=" net-dns/unbound:=[threads] net-libs/czmq:= net-libs/miniupnpc - hw-wallet? ( - dev-libs/hidapi - dev-libs/protobuf:= - virtual/libusb:1 - ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) readline? ( sys-libs/readline:0= ) @@ -52,7 +45,6 @@ src_unpack() { rmdir "${S}"/external/{randomx,supercop,trezor-common} || die mv "${WORKDIR}"/RandomX-${MY_RANDOMX_REV} "${S}"/external/randomx || die mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die - use hw-wallet && (mv "${WORKDIR}"/trezor-common-${MY_TREZORCOMMON_REV} "${S}"/external/trezor-common || die) } src_prepare() { @@ -67,11 +59,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - # Monero's liblmdb conflicts with the system liblmdb :( -DBUILD_SHARED_LIBS=OFF -DMANUAL_SUBMODULES=ON -DMONERO_PARALLEL_LINK_JOBS=1 - -DUSE_DEVICE_TREZOR=$(usex hw-wallet 1 0) + -DUSE_DEVICE_TREZOR=OFF ) cmake_src_configure From 3afa4a0563b4b66245a6bd1e259abe78343a96f9 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 21:29:47 +1300 Subject: [PATCH 3/8] net-p2p/monero: use +tools by default Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-p2p/monero/monero-0.17.1.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild index 11f61385f3..0a67ec2bac 100644 --- a/net-p2p/monero/monero-0.17.1.7.ebuild +++ b/net-p2p/monero/monero-0.17.1.7.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+daemon libressl readline tools +wallet-cli +wallet-rpc" +IUSE="+daemon libressl readline +tools +wallet-cli +wallet-rpc" REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )" DEPEND=" From e512c8358da0d2bd9150ead9c2bb2ead3258726b Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 21:43:38 +1300 Subject: [PATCH 4/8] dev-libs/randomx: new package 1.1.8 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- dev-libs/randomx/Manifest | 1 + dev-libs/randomx/metadata.xml | 8 ++++++++ dev-libs/randomx/randomx-1.1.8.ebuild | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 dev-libs/randomx/Manifest create mode 100644 dev-libs/randomx/metadata.xml create mode 100644 dev-libs/randomx/randomx-1.1.8.ebuild diff --git a/dev-libs/randomx/Manifest b/dev-libs/randomx/Manifest new file mode 100644 index 0000000000..5821b398ef --- /dev/null +++ b/dev-libs/randomx/Manifest @@ -0,0 +1 @@ +DIST randomx-1.1.8.tar.gz 163477 BLAKE2B 482f38a7e9f7b03ec5bd40ff923a1a1e575ed0c30431dcbecfe1072cdb10ccc93b61cf9d2177f4549e284125e17386e0314cb39734b22dc150193bd5d28bb813 SHA512 f41f13ba7b979a969e9d60e6c44cf289802e7459d6d817a64377428c3e833ea2f71a8a1e6559682ecc0ec2a33f958bb5b727d7faa28cb6ff69a524d713969bce diff --git a/dev-libs/randomx/metadata.xml b/dev-libs/randomx/metadata.xml new file mode 100644 index 0000000000..55a6008ad3 --- /dev/null +++ b/dev-libs/randomx/metadata.xml @@ -0,0 +1,8 @@ + + + + + telans@posteo.de + Theo Anderson + + diff --git a/dev-libs/randomx/randomx-1.1.8.ebuild b/dev-libs/randomx/randomx-1.1.8.ebuild new file mode 100644 index 0000000000..0a1174e36b --- /dev/null +++ b/dev-libs/randomx/randomx-1.1.8.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +DESCRIPTION="Proof of work algorithm based on random code execution" +HOMEPAGE="https://github.com/tevador/RandomX" +SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +S="${WORKDIR}"/RandomX-${PV} + +src_configure() { + append-ldflags -Wl,-z,noexecstack + cmake_src_configure +} \ No newline at end of file From 00a28a99118c3b55b79df6a2b3a150647b45c79f Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 21:58:32 +1300 Subject: [PATCH 5/8] net-p2p/monero: use dev-libs/randomx instead of bundled Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-p2p/monero/Manifest | 1 - net-p2p/monero/monero-0.17.1.7.ebuild | 29 +++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index d313f0a4dc..b470757526 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,3 +1,2 @@ DIST monero-0.17.1.7.tar.gz 10598750 BLAKE2B 03a80f3c38bc1b643d8d9ddba4ee1de59e0f4c6d66cfc5dcb700d19659a5cb66add4fcf1320c1ed2b7dfa15fdfe9548eb758e67661832f9da7bd0e173b5a0ae1 SHA512 b049a738eb5752a620fc19dfafd5e2996d3f33d89737774264a5ef69b7fcfcd9fe852b89e35187486f48fdc8bb73c2010a1917d1ed7fcb4f1f87b18a6bb4c2d5 -DIST monero-randomx-0.17.1.7.tar.gz 163581 BLAKE2B d1a4021a652c95d0af9c6bf2fdab2470641206e908778daafa2640e986d5635bdddfa39f44a6a9542d0c17284cf0551eac3be68a24176f1ba7106611517a080f SHA512 626cc83aa22015049c82811be5d66e96f3d14a413d9cb3eee3c28464fbdef71889b97a6385f24c7cac5fc5a9cada197ba887ae2c0782cec0d3e29debad0f3e91 DIST monero-supercop-0.17.1.7.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild index 0a67ec2bac..a790abc716 100644 --- a/net-p2p/monero/monero-0.17.1.7.ebuild +++ b/net-p2p/monero/monero-0.17.1.7.ebuild @@ -12,7 +12,6 @@ DESCRIPTION="The secure, private, untraceable cryptocurrency" HOMEPAGE="https://github.com/monero-project/monero" SRC_URI=" https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/tevador/RandomX/archive/${MY_RANDOMX_REV}.tar.gz -> ${PN}-randomx-${PV}.tar.gz https://github.com/monero-project/supercop/archive/${MY_SUPERCOP_REV}.tar.gz -> ${PN}-supercop-${PV}.tar.gz " @@ -27,6 +26,7 @@ DEPEND=" acct-user/monero dev-libs/boost:=[nls,threads] dev-libs/libsodium:= + dev-libs/randomx dev-libs/rapidjson net-dns/unbound:=[threads] net-libs/czmq:= @@ -42,8 +42,7 @@ PATCHES=("${FILESDIR}/${P}-linkjobs.patch") src_unpack() { unpack ${A} - rmdir "${S}"/external/{randomx,supercop,trezor-common} || die - mv "${WORKDIR}"/RandomX-${MY_RANDOMX_REV} "${S}"/external/randomx || die + rmdir "${S}"/external/supercop || die mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die } @@ -54,11 +53,13 @@ src_prepare() { sed -e 's/UPNP_LIBRARIES "libminiupnpc-static/UPNP_LIBRARIES "miniupnpc'/ \ -e '/libminiupnpc-static/d' \ -e '/\/miniupnpc/d' \ + -e '/randomx/d' \ -i external/CMakeLists.txt || die } src_configure() { local mycmakeargs=( + # TODO: Update CMake to install built libraries (help wanted) -DBUILD_SHARED_LIBS=OFF -DMANUAL_SUBMODULES=ON -DMONERO_PARALLEL_LINK_JOBS=1 @@ -78,6 +79,8 @@ src_compile() { } src_install() { + einstalldocs + # Install all binaries. find "${BUILD_DIR}/bin/" -type f -executable -print0 | while IFS= read -r -d '' line; do @@ -112,15 +115,15 @@ src_install() { pkg_postinst() { if use daemon; then - einfo "Start the Monero P2P daemon as a system service with" - einfo "'rc-service monerod start'. Enable it at startup with" - einfo "'rc-update add monerod default'." - einfo - einfo "Run monerod status as any user to get sync status and other stats." - einfo - einfo "The Monero blockchain can take up a lot of space (80 GiB) and is stored" - einfo "in /var/lib/monero by default. You may want to enable pruning by adding" - einfo "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain" - einfo "or move the data directory to another disk." + elog "Start the Monero P2P daemon as a system service with" + elog "'rc-service monerod start'. Enable it at startup with" + elog "'rc-update add monerod default'." + elog + elog "Run monerod status as any user to get sync status and other stats." + elog + elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored" + elog "in /var/lib/monero by default. You may want to enable pruning by adding" + elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain" + elog "or move the data directory to another disk." fi } From 2da8d6995d236631e673366a83bf61e676c95469 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 23:30:16 +1300 Subject: [PATCH 6/8] dev-libs/supercop: new package snapshot 20200827 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- dev-libs/supercop/Manifest | 1 + dev-libs/supercop/metadata.xml | 8 ++++++ dev-libs/supercop/supercop-0_p20200827.ebuild | 25 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 dev-libs/supercop/Manifest create mode 100644 dev-libs/supercop/metadata.xml create mode 100644 dev-libs/supercop/supercop-0_p20200827.ebuild diff --git a/dev-libs/supercop/Manifest b/dev-libs/supercop/Manifest new file mode 100644 index 0000000000..bb3b5dd6fb --- /dev/null +++ b/dev-libs/supercop/Manifest @@ -0,0 +1 @@ +DIST supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 diff --git a/dev-libs/supercop/metadata.xml b/dev-libs/supercop/metadata.xml new file mode 100644 index 0000000000..55a6008ad3 --- /dev/null +++ b/dev-libs/supercop/metadata.xml @@ -0,0 +1,8 @@ + + + + + telans@posteo.de + Theo Anderson + + diff --git a/dev-libs/supercop/supercop-0_p20200827.ebuild b/dev-libs/supercop/supercop-0_p20200827.ebuild new file mode 100644 index 0000000000..b9eca72050 --- /dev/null +++ b/dev-libs/supercop/supercop-0_p20200827.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +MY_REV="633500ad8c8759995049ccd022107d1fa8a1bbc9" + +DESCRIPTION="Fast cryyptographic operations for Monero wallets" +HOMEPAGE="https://github.com/monero-project/supercop" +SRC_URI="https://github.com/monero-project/supercop/archive/${MY_REV}.tar.gz -> ${PN}-${MY_REV}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +DEPEND="dev-lang/nasm" + +S="${WORKDIR}"/${PN}-${MY_REV} + +src_configure() { + append-ldflags -Wl,-z,noexecstack + cmake_src_configure +} From 7240540fcbd9e5fabb9d985264b9335540569251 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 23:34:46 +1300 Subject: [PATCH 7/8] net-p2p/monero: use dev-libs/supercop instead of bundled Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-p2p/monero/Manifest | 1 - ...onero-0.17.1.7-unbundle-dependencies.patch | 112 ++++++++++++++++++ net-p2p/monero/monero-0.17.1.7.ebuild | 34 ++---- 3 files changed, 120 insertions(+), 27 deletions(-) create mode 100644 net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index b470757526..28600df918 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,2 +1 @@ DIST monero-0.17.1.7.tar.gz 10598750 BLAKE2B 03a80f3c38bc1b643d8d9ddba4ee1de59e0f4c6d66cfc5dcb700d19659a5cb66add4fcf1320c1ed2b7dfa15fdfe9548eb758e67661832f9da7bd0e173b5a0ae1 SHA512 b049a738eb5752a620fc19dfafd5e2996d3f33d89737774264a5ef69b7fcfcd9fe852b89e35187486f48fdc8bb73c2010a1917d1ed7fcb4f1f87b18a6bb4c2d5 -DIST monero-supercop-0.17.1.7.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 diff --git a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch new file mode 100644 index 0000000000..ea7f804996 --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch @@ -0,0 +1,112 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 41f82e26c..3eb2b2e78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -312,7 +312,7 @@ endif() + # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*") + # set(BSDI TRUE) + +-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include) ++include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external ) + + if(APPLE) + include_directories(SYSTEM /usr/include/malloc) +@@ -995,7 +995,6 @@ if(SODIUM_LIBRARY) + set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}") + endif() + +-include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion + add_subdirectory(contrib) + add_subdirectory(src) + +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index a8916a7d0..05ab35c82 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -37,19 +37,7 @@ + + find_package(Miniupnpc REQUIRED) + +-message(STATUS "Using in-tree miniupnpc") +-add_subdirectory(miniupnp/miniupnpc) +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() +-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") +-endif() +- +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE) + + find_package(Unbound) + +@@ -81,4 +69,3 @@ endif() + add_subdirectory(db_drivers) + add_subdirectory(easylogging++) + add_subdirectory(qrcodegen) +-add_subdirectory(randomx EXCLUDE_FROM_ALL) +diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt +index 3b33fe90a..ba354a0e8 100644 +--- a/src/crypto/CMakeLists.txt ++++ b/src/crypto/CMakeLists.txt +@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S) + endif() + + include_directories(${RANDOMX_INCLUDE}) ++include_directories(SYSTEM /usr/include/monero) + + set(crypto_headers) + +@@ -116,6 +117,3 @@ endif() + + # cheat because cmake and ccache hate each other + set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C) +- +-# Must be done last, because it references libraries in this directory +-add_subdirectory(wallet) +diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h +index a4c5d5a07..5c6b96cd8 100644 +--- a/src/crypto/wallet/crypto.h ++++ b/src/crypto/wallet/crypto.h +@@ -29,7 +29,6 @@ + #pragma once + + #include +-#include "crypto/wallet/ops.h" + + namespace crypto { + namespace wallet { +diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt +index ff2afba4b..26b0f4523 100644 +--- a/src/device/CMakeLists.txt ++++ b/src/device/CMakeLists.txt +@@ -72,7 +72,7 @@ target_link_libraries(device + ${HIDAPI_LIBRARIES} + cncrypto + ringct_basic +- wallet-crypto ++ monero-crypto + ${OPENSSL_CRYPTO_LIBRARIES} + ${Boost_SERIALIZATION_LIBRARY} + PRIVATE +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index 65db2615c..3ace310f6 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -60,9 +60,9 @@ + #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" + +-#include +-#include +-#include ++#include ++#include ++#include + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild index a790abc716..5cfdcb4d40 100644 --- a/net-p2p/monero/monero-0.17.1.7.ebuild +++ b/net-p2p/monero/monero-0.17.1.7.ebuild @@ -5,21 +5,16 @@ EAPI=7 inherit cmake systemd -MY_RANDOMX_REV="5ce5f4906c1eb166be980f6d83cc80f4112ffc2a" -MY_SUPERCOP_REV="633500ad8c8759995049ccd022107d1fa8a1bbc9" - DESCRIPTION="The secure, private, untraceable cryptocurrency" HOMEPAGE="https://github.com/monero-project/monero" -SRC_URI=" - https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/monero-project/supercop/archive/${MY_SUPERCOP_REV}.tar.gz -> ${PN}-supercop-${PV}.tar.gz -" +SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="+daemon libressl readline +tools +wallet-cli +wallet-rpc" REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )" +RESTRICT="test" DEPEND=" acct-group/monero @@ -28,6 +23,7 @@ DEPEND=" dev-libs/libsodium:= dev-libs/randomx dev-libs/rapidjson + dev-libs/supercop net-dns/unbound:=[threads] net-libs/czmq:= net-libs/miniupnpc @@ -38,24 +34,10 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=("${FILESDIR}/${P}-linkjobs.patch") - -src_unpack() { - unpack ${A} - rmdir "${S}"/external/supercop || die - mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die -} - -src_prepare() { - cmake_src_prepare - - sed -i 's:miniupnp/::' src/p2p/net_node.inl || die - sed -e 's/UPNP_LIBRARIES "libminiupnpc-static/UPNP_LIBRARIES "miniupnpc'/ \ - -e '/libminiupnpc-static/d' \ - -e '/\/miniupnpc/d' \ - -e '/randomx/d' \ - -i external/CMakeLists.txt || die -} +PATCHES=( + "${FILESDIR}/${P}-linkjobs.patch" + "${FILESDIR}/${P}-unbundle-dependencies.patch" +) src_configure() { local mycmakeargs=( From 140b869e70b6dc6fd9630a31ad2a727642a8a1e5 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Tue, 29 Dec 2020 23:40:14 +1300 Subject: [PATCH 8/8] */*: use .tar.gz instead of .zip where applicable Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- dev-python/hypercorn/Manifest | 2 +- dev-python/hypercorn/hypercorn-0.11.1.ebuild | 7 ++++--- sys-kernel/tirdad/Manifest | 2 +- sys-kernel/tirdad/tirdad-0_p20200926.ebuild | 13 ++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest index 18c829f015..0641d40acc 100644 --- a/dev-python/hypercorn/Manifest +++ b/dev-python/hypercorn/Manifest @@ -1 +1 @@ -DIST hypercorn-0.11.1.zip 189203 BLAKE2B c11a2a221fb6b5a02e96b0f463e33583389c4ab31503572f85f140d6b2d8bf58854441b31599861b648fb0b089bb7d46ec3fa7f972de963d2a2ef28a1da48e84 SHA512 7e7e1980bb82e64154f97059c90d1b429c3f18b8e40b51c2821ddf4e838dd7d95de66e83a09afd52abc8ba2758e1f43831af61c7ad79d829c9409ab6cee4d410 +DIST hypercorn-0.11.1.tar.gz 148921 BLAKE2B 6fb35ee4a3da6a5a348dc5d923a79f8536b557ae91e9cb2c2c75a4f70bfb970562d80714b600463b5012ebf0b3859e7628b50d2fa992ba256958b13c17b99278 SHA512 6ea9ae3df1f268f2032de06fc392b98c8dc6df16fa7bc49956592de5a45eb991de5af4a8ac7612f932eab29633d4708a5cef34440b0b2be528478e4326e62b1b diff --git a/dev-python/hypercorn/hypercorn-0.11.1.ebuild b/dev-python/hypercorn/hypercorn-0.11.1.ebuild index 01813d36dc..34846977b8 100644 --- a/dev-python/hypercorn/hypercorn-0.11.1.ebuild +++ b/dev-python/hypercorn/hypercorn-0.11.1.ebuild @@ -21,11 +21,12 @@ HOMEPAGE=" https://github.com/pgjones/hypercorn https://pypi.org/project/Hypercorn " -SRC_URI="https://github.com/pgjones/hypercorn/archive/${PV}.zip -> ${P}.zip" +SRC_URI="https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz -> ${P}.tar.gz" + LICENSE="MIT" -KEYWORDS="~amd64 ~x86" SLOT="0" -RESTRICT="" +KEYWORDS="~amd64 ~x86" + RDEPEND=" dev-python/h11[${PYTHON_USEDEP}] >=dev-python/hyper-h2-3.1.0[${PYTHON_USEDEP}] diff --git a/sys-kernel/tirdad/Manifest b/sys-kernel/tirdad/Manifest index 64592ddfbe..15daaa3183 100644 --- a/sys-kernel/tirdad/Manifest +++ b/sys-kernel/tirdad/Manifest @@ -1 +1 @@ -DIST tirdad-0_p20200926.zip 16985 BLAKE2B c0b8e289e6731ca86d1c29dce256468d634167bde9196f620a037cccb4737788b54dd6544c79ecff6c61dd4f4c62920a541e1dbe8db301c948b7923ae82be393 SHA512 4bff32fd61712bb48cb9f723193f3f7f9a35c7cd537ff2b0736f7b0169e74016d69479e24464084e19a749ce67b33278421b9b2a80c007cf53f6836e3126427d +DIST tirdad-0_p20200926.tar.gz 15656 BLAKE2B 02c628f8d4c9f539cfaf2e7e6a6cc3323169c785f7854b9ac283c59ca95b84fd5361948815d5aa400886b118b8dbd6b0be9b5d1ddd1433ecf56a9fc1137d8b38 SHA512 db6aef5225a2651600f93700e7b858957a20ada3d3d55c19124f2a149b20e270d10ead959580dff9031b346f8c35f9fab3cf21db74afb47937dd977e35d13156 diff --git a/sys-kernel/tirdad/tirdad-0_p20200926.ebuild b/sys-kernel/tirdad/tirdad-0_p20200926.ebuild index bf5b6956ef..1723d04f51 100644 --- a/sys-kernel/tirdad/tirdad-0_p20200926.ebuild +++ b/sys-kernel/tirdad/tirdad-0_p20200926.ebuild @@ -2,21 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit linux-mod -COMMIT="9a0e137ae05dd1aa05c20750975598e4dac77dbf" + +MY_REV="9a0e137ae05dd1aa05c20750975598e4dac77dbf" + DESCRIPTION="kernel module for random ISN generation" HOMEPAGE="https://github.com/0xsirus/tirdad" -SRC_URI="https://github.com/0xsirus/tirdad/archive/${COMMIT}.zip -> ${P}.zip" +SRC_URI="https://github.com/0xsirus/tirdad/archive/${MY_REV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="app-arch/unzip" -S="${WORKDIR}/${PN}-${COMMIT}" +S="${WORKDIR}/${PN}-${MY_REV}" MODULE_NAMES="tirdad(misc:${S}:${S}/module)" BUILD_TARGETS="all"