summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin32052 -> 32060 bytes
-rw-r--r--app-admin/authbind/Manifest2
-rw-r--r--app-admin/authbind/authbind-2.1.3.ebuild53
-rw-r--r--app-admin/awscli/Manifest14
-rw-r--r--app-admin/awscli/awscli-1.32.84.ebuild90
-rw-r--r--app-admin/awscli/awscli-1.32.88.ebuild2
-rw-r--r--app-admin/awscli/awscli-1.32.95.ebuild90
-rw-r--r--app-admin/awscli/awscli-1.32.96.ebuild90
-rw-r--r--app-admin/awscli/awscli-1.32.97.ebuild90
-rw-r--r--app-admin/awscli/awscli-1.32.98.ebuild (renamed from app-admin/awscli/awscli-1.32.94.ebuild)0
-rw-r--r--app-admin/conky/Manifest3
-rw-r--r--app-admin/conky/conky-1.20.2-r1.ebuild244
-rw-r--r--app-admin/conky/metadata.xml1
13 files changed, 306 insertions, 373 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b62f7e3d4753..ed1a25eb16c1 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
index fbd6d21916c2..e4ba9dc91cc8 100644
--- a/app-admin/authbind/Manifest
+++ b/app-admin/authbind/Manifest
@@ -1,4 +1,6 @@
AUX authbind-2.1.2-respect-flags.patch 812 BLAKE2B 44a82a62bee8bbc8d3ebb67cf7d618850690293c76ff9a0c0f70f0067fe646673adfc6932dd8972c41d81f51bfe7833593348971fb069652d920ec92f1039dfd SHA512 ec6fa58a06180f70d30abed32f0cfe94ec582dc9b286580ece222db99b1c7f936665567b918648efdc79e3e0c8b69a60043ed72c5f77479a2be2c5dd55c7b8e1
DIST authbind_2.1.2.tar.gz 15279 BLAKE2B 5f9a31c9f51c307e9ad85bf14b436e1780d0c7dc5655ad3882e9596927862be0684d0a4a43c7d2e98a0d6a0d4c2552aaaf954ce32d3e9202bf5593ce501b5962 SHA512 85020af9703f8f39194a7719c50a51d75344db9ea99ecbc83c3c6bff0852ab1ea1cbd0b9bff6a2345e08a7bef9732e36890f33af08929e36dae8215dd070cc4d
+DIST authbind_2.1.3.tar.gz 15215 BLAKE2B c74b7caf27b6a26cf924084fe79dff1ccf429d2a0e9773690407b5f40b07589841b857fe8fda50c1251825fbabf9054c54ab79dea38026bbae770a47a774610b SHA512 357c8f5c5ad446e75a597d5bc5bb5af7db17de771643a39976b5ac1425f03bf44f322c8dd07b0e1b04a0bf78d5000841b4866e0d0945584689e99291156dfac1
EBUILD authbind-2.1.2.ebuild 1246 BLAKE2B 17ce0aeeb46523aa0539a2df109c3ae3c613d00ace4fd3e171d92e7197ebea4da76bec2fa4413fa1d533438a8aee31fa71aa418986fb2f777a363f5099c97e98 SHA512 d27ceceb08c2f3f046a6e3d808924a51fccd2bbb1a1b4c7a94b954360113dd85203cbb6f5f6ab0f88113fc58c2f7b962e6d2be23d82a96c58d7c56210ad70ddd
+EBUILD authbind-2.1.3.ebuild 1245 BLAKE2B c08894d398bf34a07e964d313310a4c0f6a75aff0fc5c0d765893bca0d9d326762cf6c40f3152c68cf0490883cf8ab56119e015e8d28612f42adf46b7fe87e21 SHA512 e6ad4c20af593d5f4d095c883503dc486ba9ad58cfd8b21964508486ef4af94847eade681084be6830a8a8028fd07de01f30a4722dac269b0171619b996e3afa
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-admin/authbind/authbind-2.1.3.ebuild b/app-admin/authbind/authbind-2.1.3.ebuild
new file mode 100644
index 000000000000..7df60af86ca9
--- /dev/null
+++ b/app-admin/authbind/authbind-2.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Bind sockets to privileged ports without root"
+HOMEPAGE="https://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+S="${WORKDIR}/work"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-alternatives/awk"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.2-respect-flags.patch"
+)
+
+src_configure() {
+ tc-export CC LD
+
+ sed -i \
+ -e "s|^prefix=.*|prefix=/usr|" \
+ -e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \
+ -e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \
+ -e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \
+ Makefile || die "sed failed"
+
+ sed -i \
+ -e 's|/usr/lib|/usr/libexec|' \
+ authbind-helper.8 || die "sed failed"
+}
+
+src_install() {
+ dobin authbind
+ doman authbind.1 authbind-helper.8
+
+ local major=$(awk -F= '/MAJOR=/ { print $2 }' Makefile || die)
+ ln -s libauthbind.so.* libauthbind.so.${major} || die
+ dolib.so libauthbind.so*
+
+ exeinto /usr/libexec/authbind
+ exeopts -m4755
+ doexe helper
+
+ keepdir /etc/authbind/by{addr,port,uid}
+
+ dodoc debian/changelog
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 26929aa5e161..5f6de65805af 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
-DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1
DIST aws-cli-1.32.88.gh.tar.gz 2693435 BLAKE2B 043f4eb08711760b7f8e15a5eba879524788cb65823215ed9d1c8ee5337a085ab6975dfc1c90aea29b7137f050a6d4f201eba57e8c8c83c09625401d8075eb6c SHA512 cb0ed179b9549d988e19963607fe28ca6fb02c92280c451c8651a8149d60a929158f9ae04a1c764540648b8b42417e908cb956fe71ce787c4b788f83cc2ef488
DIST aws-cli-1.32.93.gh.tar.gz 2695489 BLAKE2B d2f81786d4db158a13ec50ed833668db26bde00cc1e4f5254aa127aba82113074abafa996f525b5f7cd215fd51639481a01a49c425bb4c01e990261529f06082 SHA512 e03892ef522fa43442d1b053d0bf8dbd6c892d94398934c4af58e81153c2759f7e55a289457bb3e5b46f2f01697642498fdd6d51cdc18ad8b6c0f6a31d7c606a
-DIST aws-cli-1.32.94.gh.tar.gz 2696222 BLAKE2B 275464cb94d3282141209aa1ba90bd5a4a69f128f55cf222f60e8b964126d8bbc63c5313034496b18bb2db7c9ccba2ac199345e3f93e8597feded89a05f59df5 SHA512 a4fb1667d9161ffab2165502bc89a93667f83bcdae778daf42b4675b9345d0a497f5b36c40cf758613e8e4443173d4d358d39e6e30196c9f5a6b8a102d45c366
-DIST aws-cli-1.32.95.gh.tar.gz 2699193 BLAKE2B d50c00be87343f80be4342f6f1ef6ac611c6c7c37d72e369b87aff0d38ed763451a3de54a7d4013632f47cebd688b76b9103e85a20e58e01cd5ee66e7eabeb20 SHA512 0ec08479e9ef3b0eb231438c59379beb2d6a8bdca52a375bc5ba386d2bde3062093bb592bbf843d2be80658d9d88d4ae71ffa372db1261d6f6f16cd17c196ddc
-DIST aws-cli-1.32.96.gh.tar.gz 2699395 BLAKE2B 7d778ad8886b8416e3c99a639d2923fedfe4154d19e3d8c064f8261f99e586f79a10a174a731ba647c51805baf9f135ea71f6ef766de791bae18b83b80294a74 SHA512 2f02afea5a04960b94101596b55ddd8461344e2d6ac8e5023c05363f052e32ec2076727e080c1cbad8c37c90266ec57572cc41809993b6b4f5fa81c909cb75aa
-DIST aws-cli-1.32.97.gh.tar.gz 2700062 BLAKE2B f4150f20534782d000e7f936e9ebc723daebf1b41182ec4a3ec56b44a2df547b6af5e42164554742a821b29d30beb4a8b2ba0100ccb51f8074550efaf01f0818 SHA512 710e4fece1511f80da33b7d6a06534a1c2e5c986d7cb0426f4cc84a74885a9700502ed97d512c6287b4b0def76e44c0d36425a78c17fcdb8ee59df9340633d16
-EBUILD awscli-1.32.84.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
-EBUILD awscli-1.32.88.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+DIST aws-cli-1.32.98.gh.tar.gz 2723261 BLAKE2B f854a78226a9480d2966e0dcc817e372de96f32723c28bd7189ed484ab24e8fa9f33a018b1b3193d1a5be82e1ad2b69b2d0d6642f004aa6fd601a68862cbbbdc SHA512 989ad96da152423001832a502935ed64a92ef61ba63f9f413fa07e84910d2aa905056bbfcf49202508d6d0a910b4a2969da27e736857e918077693909e4ca0ea
+EBUILD awscli-1.32.88.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
EBUILD awscli-1.32.93.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.94.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.95.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.96.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.97.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.98.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.84.ebuild b/app-admin/awscli/awscli-1.32.84.ebuild
deleted file mode 100644
index b7c9ceb6d88f..000000000000
--- a/app-admin/awscli/awscli-1.32.84.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local serial_tests=(
- tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
- tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
- tests/unit/customizations/test_sessionmanager.py
- tests/unit/test_compat.py::TestIgnoreUserSignals
- tests/unit/test_help.py
- tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
- )
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
- local EPYTEST_DESELECT=( "${serial_tests[@]}" )
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit}
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.32.88.ebuild b/app-admin/awscli/awscli-1.32.88.ebuild
index 4a677affdbc4..b7c9ceb6d88f 100644
--- a/app-admin/awscli/awscli-1.32.88.ebuild
+++ b/app-admin/awscli/awscli-1.32.88.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
# botocore is x.(y+2).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.32.95.ebuild b/app-admin/awscli/awscli-1.32.95.ebuild
deleted file mode 100644
index 4a677affdbc4..000000000000
--- a/app-admin/awscli/awscli-1.32.95.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local serial_tests=(
- tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
- tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
- tests/unit/customizations/test_sessionmanager.py
- tests/unit/test_compat.py::TestIgnoreUserSignals
- tests/unit/test_help.py
- tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
- )
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
- local EPYTEST_DESELECT=( "${serial_tests[@]}" )
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit}
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.32.96.ebuild b/app-admin/awscli/awscli-1.32.96.ebuild
deleted file mode 100644
index 4a677affdbc4..000000000000
--- a/app-admin/awscli/awscli-1.32.96.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local serial_tests=(
- tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
- tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
- tests/unit/customizations/test_sessionmanager.py
- tests/unit/test_compat.py::TestIgnoreUserSignals
- tests/unit/test_help.py
- tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
- )
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
- local EPYTEST_DESELECT=( "${serial_tests[@]}" )
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit}
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.32.97.ebuild b/app-admin/awscli/awscli-1.32.97.ebuild
deleted file mode 100644
index 4a677affdbc4..000000000000
--- a/app-admin/awscli/awscli-1.32.97.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- !app-admin/awscli-bin
-"
-BDEPEND="
- test? (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local serial_tests=(
- tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
- tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
- tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
- tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
- tests/unit/customizations/test_sessionmanager.py
- tests/unit/test_compat.py::TestIgnoreUserSignals
- tests/unit/test_help.py
- tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
- )
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
- local EPYTEST_DESELECT=( "${serial_tests[@]}" )
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit}
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.32.94.ebuild b/app-admin/awscli/awscli-1.32.98.ebuild
index 4a677affdbc4..4a677affdbc4 100644
--- a/app-admin/awscli/awscli-1.32.94.ebuild
+++ b/app-admin/awscli/awscli-1.32.98.ebuild
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index c31f6732e93e..56228ad40320 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,6 @@
DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
DIST conky-1.20.2.tar.gz 1837320 BLAKE2B 41aaa384366ee9229ec4e7df97f37a8c62fff4dd864b3f8f8d3d40c57e87646ee8309c3d1fb68c7d7f8ed802c7ce49a57bbe0c01d32eaacfe84fddbd65b81007 SHA512 b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618
EBUILD conky-1.19.8.ebuild 5805 BLAKE2B c56ad10b94d3fee046a955a7a25d7d1ed71d089c2a935af6260d3c64e3181a8db74b5fbb0a27983a542896816a1150a33bb74797c3a87842efc829b26603ff1f SHA512 8f8cafd306f8ac7deb5d63c924f7eddcb2a76582ece7a7d83355422ecbaf09e57cc214241445fe79d84b4da96f04d9344f05cce192f451a9bb732e64c5575efa
+EBUILD conky-1.20.2-r1.ebuild 5995 BLAKE2B b82b95e5ec969b9ad844d3470b4bd8763e78c03c01d93ccc301a967897ec1cfa21732fa85b59f6803d5f948881c7260da192ac529688930a63c33f7515bf9fdc SHA512 c89bd339bbd166a04a29f16384a41fe0528cad7b27e82dde3250bcbb441061877ce98168ba22f7cc5c4cb1678bbe5a2f219ab6cccc9fd60b428aaaebf204edc7
EBUILD conky-1.20.2.ebuild 5809 BLAKE2B 616f9cf91272e3a704f3ee9474cb148a2b3b1226ae1e837d16071112b199afe4fe3746c01310b18472be861c2e0c24f4db23d5de2d0b9c7d70fd46ac4bda9674 SHA512 a1b6b42f304a7787d0ae5c11134a792f3a7deb62efa222ba5c020d1e36172cc25b84579e19e4bc462d7c4ab13344f164b5c9bfe67036968329d699dfac7959ca
-MISC metadata.xml 2408 BLAKE2B 744eae0e271850f1e2e43b7905c6c916bc8ae2d3853489056c84d8b99e72a599895910095a7e838281deffa0316d21a490715ec0b9ef092f6b4987c7d796ce21 SHA512 286613fba3bfbbaed9db8033d71bce06ee6a9884472042a8a8b2fc30ebcb07277c98c368e7971e68c40d7c3c4f7eb86fc3ee1e3dc41bfb97e3fbe7bd6093a297
+MISC metadata.xml 2504 BLAKE2B 64776b9337c836b0a5463e7b0857a5f0bb81c742867ac34701cd49e9edeb08854c34e8dc50757de6df59ee7a5f85d8c80a158a6a8c8eec20a4e3d23f9f7d7a62 SHA512 499f432fd332b882f27da281f72b7e0f3fb166ba9a4b20f300e5f81769df95607fb018333bdd698a4fc96b17bc8cde501267c4abdcec45d50f40de513e72c0f1
diff --git a/app-admin/conky/conky-1.20.2-r1.ebuild b/app-admin/conky/conky-1.20.2-r1.ebuild
new file mode 100644
index 000000000000..f134905d992c
--- /dev/null
+++ b/app-admin/conky/conky-1.20.2-r1.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10,11,12} )
+
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
+ intel-backlight iostats irc lua-cairo lua-cairo-xlib lua-imlib lua-rsvg
+ math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd test
+ thinkpad truetype wayland webserver wifi X xinerama xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+# which creates debug symbols and enables "-DBUILD_TESTS" which also
+# results in conky_core debug library getting installed
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ ical? ( dev-libs/libical:= )
+ iconv? ( virtual/libiconv )
+ imlib? ( >=media-libs/imlib2-1.11.0[X] )
+ irc? ( net-libs/libircclient )
+ lua-cairo? ( x11-libs/cairo[X?] )
+ lua-cairo-xlib? ( x11-libs/cairo[X] )
+ lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
+ lua-rsvg? ( gnome-base/librsvg )
+ mysql? ( dev-db/mysql-connector-c )
+ ncurses? ( sys-libs/ncurses:= )
+ nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+ pulseaudio? ( media-libs/libpulse )
+ rss? (
+ dev-libs/libxml2
+ dev-libs/glib:2
+ )
+ systemd? ( sys-apps/systemd )
+ truetype? (
+ x11-libs/libXft
+ >=media-libs/freetype-2
+ )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/pango
+ )
+ wifi? ( net-wireless/wireless-tools )
+ webserver? ( net-libs/libmicrohttpd:= )
+ X? (
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libX11
+ )
+ xinerama? ( x11-libs/libXinerama )
+ xmms2? ( media-sound/xmms2 )
+ ${LUA_DEPS}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ apcupsd? ( sys-power/apcupsd )
+ cmus? ( media-sound/cmus )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? (
+ dev-cpp/catch
+ )
+ wayland? (
+ dev-libs/wayland-protocols
+ )
+"
+BDEPEND="
+ doc? (
+ virtual/pandoc
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ )
+ extras? (
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ )
+ wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+ use doc || use extras || return 0
+ python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
+ imlib? ( X )
+ lua-cairo? ( || ( X wayland ) bundled-toluapp )
+ lua-cairo-xlib? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( || ( X wayland ) bundled-toluapp )
+ nvidia? ( X )
+ rss? ( curl )
+ truetype? ( X )
+ xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
+
+There are pretty html docs available at https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ lua-single_pkg_setup
+ if use doc || use extras; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # pin lua 5.4
+ sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+ cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+ cmake_src_prepare
+ xdg_environment_reset
+}
+
+src_configure() {
+ local mycmakeargs=()
+
+ if use X; then
+ mycmakeargs+=(
+ -DOWN_WINDOW=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XFIXES=yes
+ -DBUILD_ARGB=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DBUILD_XINPUT=yes
+ -DBUILD_MOUSE_EVENTS=yes
+ -DBUILD_X11=yes
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_X11=no
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_DOCS=$(usex doc)
+ -DBUILD_EXTRAS=$(usex extras)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_I18N=yes
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_IPV6=yes
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_OLD_CONFIG=yes
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_TESTS=$(usex test)
+ -DBUILD_WAYLAND=$(usex wayland)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_XINERAMA=$(usex xinerama)
+ -DBUILD_XMMS2=$(usex xmms2)
+ -DDOC_PATH=/usr/share/doc/${PF}
+ -DMAINTAINER_MODE=no
+ -DRELEASE=yes
+ )
+
+ if use doc || use extras; then
+ mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use extras; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+ insinto /usr/share/nano/
+ doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ xdg_pkg_postinst
+}
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 7a0ba1bcf7e0..9f9d203f58f1 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -24,6 +24,7 @@
<flag name="iostats">Enable support for per-task I/O statistics</flag>
<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
<flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
+ <flag name="lua-cairo-xlib">Enable support for Cairo and Xlib interoperability for Lua</flag>
<flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag>
<flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
<flag name="math">Enable support for glibc's libm math library</flag>