mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-17 19:13:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2024-02-27 06:48:16 +00:00
parent a914ae1282 960abdf6fa
commit 965d5f9986
14 changed files with 140 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild
View File

@@ -50,10 +50,11 @@ src_prepare() {
}
src_compile() {
pushd apps/cli
pushd apps/cli || die
PKG_CACHE_PATH="${WORKDIR}"/.pkg-cache npm --verbose --offline run dist:lin \
|| die "Build failed! Try prebuilt from upstream ${CATEGORY}/${PN}-bin"
./dist/linux/bw completion --shell zsh > bw.zsh
./dist/linux/bw completion --shell zsh > bw.zsh || die
popd || die
}
src_install() {

20
app-admin/vaultwarden/vaultwarden-1.30.3.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
inherit cargo check-reqs systemd tmpfiles
inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
@@ -53,6 +53,16 @@ PATCHES=(
CHECKREQS_MEMORY=3G
CHECKREQS_DISK_BUILD=2G
DOC_CONTENTS="\n
Configuration file: /etc/${PN}.env\n
Data directory: /var/lib/${PN}\n
\n
MySQL & PostgreSQL users must set DATABASE_URL in config\n
\n
Default server: http://0.0.0.0:8000\n
Admin interface: http://0.0.0.0:8000/admin
"
src_unpack() {
if [[ ${PV} == 9999* ]]; then
# clone vaultwarden
@@ -96,17 +106,15 @@ src_install() {
newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
insinto /etc
newins .env.template "${PN}".env
dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
keepdir /var/lib/"${PN}"
readme.gentoo_create_doc
einstalldocs
dodoc -r ../"${PN}".wiki/*
}
pkg_postinst() {
tmpfiles_process "${PN}".conf
elog "Configuration file: /etc/${PN}.env"
elog "Data directory: /var/lib/${PN}"
use mysql || use postgres && elog "User must set DATABASE_URL in config "
elog "Default server: http://127.0.0.1:8000"
elog "Admin interface: http://127.0.0.1:8000/admin"
readme.gentoo_print_elog
}

20
app-admin/vaultwarden/vaultwarden-9999.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
inherit cargo check-reqs systemd tmpfiles
inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
@@ -53,6 +53,16 @@ PATCHES=(
CHECKREQS_MEMORY=3G
CHECKREQS_DISK_BUILD=2G
DOC_CONTENTS="\n
Configuration file: /etc/${PN}.env\n
Data directory: /var/lib/${PN}\n
\n
MySQL & PostgreSQL users must set DATABASE_URL in config\n
\n
Default server: http://0.0.0.0:8000\n
Admin interface: http://0.0.0.0:8000/admin
"
src_unpack() {
if [[ ${PV} == 9999* ]]; then
# clone vaultwarden
@@ -96,17 +106,15 @@ src_install() {
newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
insinto /etc
newins .env.template "${PN}".env
dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
keepdir /var/lib/"${PN}"
readme.gentoo_create_doc
einstalldocs
dodoc -r ../"${PN}".wiki/*
}
pkg_postinst() {
tmpfiles_process "${PN}".conf
elog "Configuration file: /etc/${PN}.env"
elog "Data directory: /var/lib/${PN}"
use mysql || use postgres && elog "User must set DATABASE_URL in config "
elog "Default server: http://127.0.0.1:8000"
elog "Admin interface: http://127.0.0.1:8000/admin"
readme.gentoo_print_elog
}

54
app-arch/7zip/7zip-23.01.ebuild
View File

@@ -1,26 +1,39 @@
# Copyright 2023 Gentoo Authors
# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit edos2unix toolchain-funcs
inherit edos2unix toolchain-funcs flag-o-matic
NO_DOT_PV=$(ver_rs 1- '')
DESCRIPTION="A free file archiver for extremely high compression"
HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/"
SRC_URI="https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download -> ${PN}-${PV}.tar.xz"
LICENSE="LGPL-2 BSD"
SRC_URI="
https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download -> ${PN}-${PV}.tar.xz
https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz/download -> ${PN}-${PV}-linux.tar.xz
"
LICENSE="LGPL-2 BSD rar? ( unRAR )"
IUSE="asm"
IUSE="uasm jwasm rar"
REQUIRED_USE="?? ( uasm jwasm )"
SLOT="0"
KEYWORDS="~amd64"
S="${WORKDIR}/CPP/7zip/"
DOCS=( readme.txt History.txt License.txt )
HTML_DOCS=( MANUAL )
RESTRICT="mirror"
RDEPEND=""
DEPEND="${RDEPEND}"
BDEPEND="asm? ( dev-lang/jwasm )"
BDEPEND="
uasm? ( dev-lang/uasm )
jwasm? ( dev-lang/jwasm )
"
# TODO(NRK): also build and install the library
# TODO(NRK): make it so this package can be used as a drop-in replacement
# for app-arch/p7zip ??
pkg_setup() {
# instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
@@ -36,7 +49,7 @@ pkg_setup() {
else
die "Unsupported compiler: $(tc-getCC)"
fi
if use asm ; then
if use jwasm || use uasm ; then
mfile="${mfile}_x64"
bdir="${bdir}_x64"
fi
@@ -56,16 +69,35 @@ src_prepare() {
src_compile() {
pushd "./Bundles/Alone2" || die "Unable to switch directory"
export G_CC=$(tc-getCC)
export G_CXX=$(tc-getCXX)
append-ldflags -Wl,-z,noexecstack
export G_CFLAGS=${CFLAGS}
export G_CXXFLAGS=${CXXFLAGS}
export G_LDFLAGS=${LDFLAGS}
# USE_JWASM=1 - if asm: use JWasm assembler instead of Asmc (not a gentoo package)
emake DISABLE_RAR=1 USE_JWASM=1 --file "../../${mfile}"
local args=(
-f "../../${mfile}"
CC=$(tc-getCC)
CXX=$(tc-getCXX)
)
# NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
# whether it's defined or not. so in case user has `rar` enabled
# DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
if ! use rar; then
# disables non-free rar code but allows listing and extracting
# non-compressed rar archives
args+=(DISABLE_RAR_COMPRESS=1)
fi
if use jwasm; then
args+=(USE_JWASM=1)
elif use uasm; then
args+=(MY_ASM=uasm)
fi
emake ${args[@]}
popd > /dev/null || die "Unable to switch directory"
}
src_install() {
dobin "./Bundles/Alone2/b/${bdir}/7zz"
pushd "${WORKDIR}" || die "Unable to switch directory"
einstalldocs
}

1
app-arch/7zip/Manifest
View File

@@ -1 +1,2 @@
DIST 7zip-23.01-linux.tar.xz 1527700 BLAKE2B 35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e SHA512 d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e
DIST 7zip-23.01.tar.xz 1378588 BLAKE2B 348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd SHA512 e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986

45
app-arch/7zip/files/7zip-23.01-respect-build-env.patch
View File

@@ -51,48 +51,3 @@ Bug: https://bugs.gentoo.org/913189
endif
LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
--- a/var_clang.mak
+++ b/var_clang.mak
@@ -6,6 +6,6 @@ IS_ARM64=
CROSS_COMPILE=
MY_ARCH=
USE_ASM=
-CC=$(CROSS_COMPILE)clang
-CXX=$(CROSS_COMPILE)clang++
+CC=$(G_CC)
+CXX=$(G_CXX)
USE_CLANG=1
--- a/var_clang_x64.mak
+++ b/var_clang_x64.mak
@@ -6,7 +6,7 @@ IS_ARM64=
CROSS_COMPILE=
MY_ARCH=
USE_ASM=1
-CC=$(CROSS_COMPILE)clang
-CXX=$(CROSS_COMPILE)clang++
+CC=$(G_CC)
+CXX=$(G_CXX)
USE_CLANG=1
--- a/var_gcc.mak
+++ b/var_gcc.mak
@@ -6,7 +6,7 @@ IS_ARM64=
CROSS_COMPILE=
MY_ARCH=
USE_ASM=
-CC=$(CROSS_COMPILE)gcc
-CXX=$(CROSS_COMPILE)g++
+CC=$(G_CC)
+CXX=$(G_CXX)
# -march=armv8-a+crc+crypto
--- a/var_gcc_x64.mak
+++ b/var_gcc_x64.mak
@@ -6,5 +6,5 @@ IS_ARM64=
CROSS_COMPILE=
MY_ARCH=
USE_ASM=1
-CC=$(CROSS_COMPILE)gcc
-CXX=$(CROSS_COMPILE)g++
+CC=$(G_CC)
+CXX=$(G_CXX)

11
app-arch/7zip/metadata.xml
View File

@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
<flag name="asm">Use <pkg>dev-lang/jwasm</pkg> to include optimized code</flag>
</use>
<maintainer type="person">
<email>m@matous.dev</email>
<name>Martin Matouš</name>
</maintainer>
<maintainer type="person">
<email>nrk@disroot.org</email>
</maintainer>
<use>
<flag name="rar">Enable support for non-free rar decoder</flag>
<flag name="uasm">Use <pkg>dev-lang/uasm</pkg> to include optimized code</flag>
<flag name="jwasm">Use <pkg>dev-lang/jwasm</pkg> to include optimized code (doesn't support AES)</flag>
</use>
<upstream>
<maintainer>
<name>Igor Pavlov</name>

4
app-text/md4c/md4c-0.5.2.ebuild
View File

@@ -7,8 +7,8 @@ inherit cmake
# TODO(NRK):
# - enable tests
# - useflag to not build md2html tool
# - useflag for static lib (?)
# - move this under dev-libs or maybe split the md2html tool into it's own package (??)
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -25,6 +25,7 @@ HOMEPAGE="https://github.com/mity/md4c"
LICENSE="MIT"
SLOT="0"
IUSE="+md2html"
src_prepare() {
cmake_src_prepare
@@ -34,6 +35,7 @@ src_configure() {
mycmakeargs=(
-DCMAKE_BUILD_TYPE=Release
-DBUILD_SHARED_LIBS=ON
-DBUILD_MD2HTML_EXECUTABLE=$(usex md2html ON OFF)
)
cmake_src_configure

3
app-text/md4c/metadata.xml
View File

@@ -4,6 +4,9 @@
<maintainer type="person">
<email>nrk@disroot.org</email>
</maintainer>
<use>
<flag name="md2html">Build the md2html cli tool</flag>
</use>
<upstream>
<remote-id type="github">mity/md4c</remote-id>
</upstream>

1
dev-lang/uasm/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST uasm-2.56.2.tar.gz 1243830 BLAKE2B dcc0948d92cdd5972a6698e721a6ccc6a54926ef94778438cf9a88a6e41ebc652d5230003f689d4278bd1e48959dd04595c602427287a48c551d7b847be665f0 SHA512 1f6c1037909d012f3293985c4e0516f4b61497de23cac6bbb58db735efb512599c0bba5d60d8ce999e6afc57e44484a094bf10f0ee185a51afd826f5541c9337

10
dev-lang/uasm/metadata.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nrk@disroot.org</email>
</maintainer>
<upstream>
<remote-id type="github">Terraspace/UASM</remote-id>
</upstream>
</pkgmetadata>

36
dev-lang/uasm/uasm-2.56.2.ebuild Normal file
View File

@@ -0,0 +1,36 @@
# Copyright 2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit toolchain-funcs flag-o-matic
DESCRIPTION="UASM is a free MASM-compatible assembler"
HOMEPAGE="https://www.terraspace.co.uk/uasm.html"
SRC_URI="https://github.com/Terraspace/UASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Watcom-1.0"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND=""
DEPEND=""
BDEPEND=""
S="${WORKDIR}/UASM-${PV}"
src_prepare() {
default
# don't strip binary
sed -i gccLinux64.mak -e 's/ -s / /g' || die
}
src_compile() {
append-cflags -fcommon # Bug: https://github.com/Terraspace/UASM/issues/143
emake -f gccLinux64.mak CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
src_install() {
dobin GccUnixR/uasm
dodoc *.txt Doc/*.txt
}

2
dev-util/rye/Manifest
View File

@@ -183,7 +183,7 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78
DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
DIST rustls-0.21.10.crate 284920 BLAKE2B eb4628b6e0384fa7cbb5468c75c11512eb111a8a7dc7c655c6ac6beac72fc3025b1a590324ec3275ba66b632dab14dd78da4d62c1c66b2c2502099ad153900f5 SHA512 3bfcd137e6d4d86c716e8afe75450a39ca055d44557fd1a8d4b6ad4d7c58e2d5fb86ba92c3825a667c9daf5bd7a89a779ffcf8c23d6cd0af05ad47ad437da139
DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68
DIST rye-0.26.0.tar.gz 1448145 BLAKE2B 92e8e8aa762338ee9bc0e1db1818ef44a7622873625267b9f118ca0fd307c6083c05dca9b16c11dce130559cb469ae1d2f134a6c786b9280a467550b7b2ca47a SHA512 93372c884e0fcbc9f8d8f390582c878375652ba6adea82299160923c9e54f79c3dfa0cfe8803d3f8746ee882a28c3b18091f9c870c0c5daee17b9881784375a1
DIST rye-0.27.0.tar.gz 1454277 BLAKE2B 938243028695b290933526e484bcc170b4a7aa1977ab0e8007611d6955fd47be736f43f912cfea4db4352912c24c201cfda71563fac416a1de830c1c51ba7225 SHA512 c6785d34ff1193856186b8a50f2908900691e44243182cc325eecc5b3a3b890a6eba27208b8d6bc48d77a894110540f4bab6b47d563de9c8b0205e3234b591b9
DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c

4
dev-util/rye/rye-0.26.0.ebuild → dev-util/rye/rye-0.27.0.ebuild
View File

@@ -314,7 +314,7 @@ inherit cargo
DESCRIPTION="An Experimental Package Management Solution for Python"
HOMEPAGE="https://rye-up.com"
SRC_URI="
https://github.com/mitsuhiko/rye/archive/${PV}.tar.gz -> ${P}.tar.gz
https://github.com/astral-sh/rye/archive/${PV}.tar.gz -> ${P}.tar.gz
${CARGO_CRATE_URIS}
"
@@ -336,6 +336,7 @@ src_test() {
--skip test_add_and_sync_no_auto_sync
--skip test_add_autosync
--skip test_add_flask
--skip test_add_flask_wrong_venv_exported
--skip test_add_from_find_links
--skip test_basic_tool_behavior
--skip test_config_empty
@@ -344,6 +345,7 @@ src_test() {
--skip test_config_show_path
--skip test_config_show_path_and_any_action
--skip test_empty_sync
--skip test_fetch
--skip test_init_default
--skip test_init_lib
--skip test_init_script