From 533ce9c954925ca2a6bccd1f52f266e81e61a678 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Oct 2022 15:55:57 +0100 Subject: gentoo auto-resync : 26:10:2022 - 15:55:57 --- app-admin/Manifest.gz | Bin 32907 -> 32903 bytes app-admin/conky/Manifest | 4 +- app-admin/conky/conky-1.15.0.ebuild | 185 +++++++++++++++++++++ app-admin/conky/metadata.xml | 1 + app-admin/keepassxc/Manifest | 5 +- .../keepassxc/files/keepassxc-2.7.3-tests.patch | 14 ++ app-admin/keepassxc/keepassxc-2.7.3.ebuild | 101 +++++++++++ app-admin/keepassxc/keepassxc-9999.ebuild | 5 +- 8 files changed, 311 insertions(+), 4 deletions(-) create mode 100644 app-admin/conky/conky-1.15.0.ebuild create mode 100644 app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch create mode 100644 app-admin/keepassxc/keepassxc-2.7.3.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 06994dcdd9a8..d87e2f7ee457 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index d74fa58c4847..0485e927eb19 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,5 +1,7 @@ DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f SHA512 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516 +DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841 EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5 EBUILD conky-1.13.1.ebuild 4794 BLAKE2B 34c39bd8ba19b88db1b70d79f50ca71eb9329b7abedd2dd1268d9eaf2bf671a5c7ffdd76793ac5b43bc968cc853e54471df3c4a74cb66cd43fed17fe22644212 SHA512 fbb21ea3bef9cde56bce4d47517550df02ab8a8879dda7ce7127f412852dcaffaaab2a61794e9f3a9ff78ec4a197be209413a56b0f8f3a19255a0955c224a63d -MISC metadata.xml 2469 BLAKE2B fb62625e8125ba31a3c6800befd22973f6b4d0b007f49aaa20ef55fd9a7cc5551bdd1554f4afeb749d263b062388aa5a058c3be7025c8727c008e80e360623c4 SHA512 c0daa5a1a24556a59940849478505fadc8ea5195623f9ca57e45943265c0f35117170bd2b9ddcfa9e0edae9a8084a53219a535db8b2ffdd9ba15c0c0ea853860 +EBUILD conky-1.15.0.ebuild 4483 BLAKE2B 14069f7478e7555bf1f139c5ecfcf1612591d6edec55c14d96b4484286a7ca6a68f59220ba734423cb9409201e7de7dda047ddffcdcd22d9623e9b9b5354d5b7 SHA512 c2c54ff512fbf714d7f6681ba7ed998ac9317e819c44b69b859588929afb3a9d1cc62907890f708eeb79fcf8b89fa5573aade87420d26020ec6a6d5866458021 +MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48 diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild new file mode 100644 index 000000000000..e52453f698b0 --- /dev/null +++ b/app-admin/conky/conky-1.15.0.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-3 ) + +inherit cmake linux-info lua-single 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 ~arm64 ~x86" +IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib + intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd + mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype + webserver wifi X xinerama xmms2" + +COMMON_DEPEND=" + cmus? ( media-sound/cmus ) + curl? ( net-misc/curl ) + ical? ( dev-libs/libical:= ) + iconv? ( virtual/libiconv ) + imlib? ( media-libs/imlib2[X] ) + irc? ( net-libs/libircclient ) + lua-cairo? ( x11-libs/cairo[X] ) + lua-imlib? ( media-libs/imlib2[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 net-misc/curl dev-libs/glib:2 ) + systemd? ( sys-apps/systemd ) + truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) + wifi? ( net-wireless/wireless-tools ) + webserver? ( net-libs/libmicrohttpd ) + X? ( + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXext + ) + xinerama? ( x11-libs/libXinerama ) + xmms2? ( media-sound/xmms2 ) + ${LUA_DEPS} +" +RDEPEND=" + ${COMMON_DEPEND} + apcupsd? ( sys-power/apcupsd ) + hddtemp? ( app-admin/hddtemp ) + moc? ( media-sound/moc ) + extras? ( + app-editors/nano + || ( app-editors/vim app-editors/gvim ) + ) +" +DEPEND=" + ${COMMON_DEPEND} + doc? ( virtual/pandoc dev-python/pyyaml ) + extras? ( virtual/pandoc ) +" + +REQUIRED_USE=" + imlib? ( X ) + lua-cairo? ( X bundled-toluapp ) + lua-imlib? ( X bundled-toluapp ) + lua-rsvg? ( X bundled-toluapp ) + nvidia? ( X ) + truetype? ( X ) + xinerama? ( X ) +" + +CONFIG_CHECK="~IPV6" + +DOCS=( README.md AUTHORS ) + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="You can find sample configurations at ${ROOT}/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 +} + +src_prepare() { + cmake_src_prepare + + xdg_environment_reset +} + +src_configure() { + local mycmakeargs + + if use X; then + mycmakeargs=( + -DBUILD_ARGB=yes + -DBUILD_X11=yes + -DBUILD_XDAMAGE=yes + -DBUILD_XDBE=yes + -DBUILD_XSHAPE=yes + -DOWN_WINDOW=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_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_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 + ) + + 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 adb290e7c2fd..41e021e389b6 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -18,6 +18,7 @@ Enable support for sys-power/apcupsd Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags Enable monitoring of music played by media-sound/cmus + Enable syntax highlighting for app-editors/nanoand app-editors/vim Enable support for events from iCalendar (RFC 5545) files using dev-libs/libical Enable support for Intel backlight Enable support for per-task I/O statistics diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index f1e8c4457350..7c61467a8f54 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,4 +1,7 @@ +AUX keepassxc-2.7.3-tests.patch 396 BLAKE2B 998b55785d7b43dfc00ed96548a31816440c49c4241ac702e479127c714d67a6d8980c90bd3775f3a650adcfe10ebbacb3373073f0da28a28464ef6246dee722 SHA512 8948d78c55b2ccad43e1155535b2c7cc980bc05bb01b9e4d732de63946d03f3b2d49bb7cd6ce77f76f8e1192e47d712f3e12bab352138f5ef3ecdc22a41f17bb DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9 +DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842 EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f2452a2dbd75ee8bb807b4921b2a0aa1519aecd31a21a6caa8c4c7b6295cd87bf66f9c01d50c4c98425728429287aeb SHA512 e90e777e8c8ea57551af72b11d82fa5e4fa6bcbe4bb424e0de39b99dddbd8d21b80e5cd1c49c12485da414e3670145144f31a6aa77b0ff163bcccbdb08e23207 -EBUILD keepassxc-9999.ebuild 2438 BLAKE2B 2bf06c3ed5101ca38de87175dc988ac374d94f7948971e1d363131d8b8517989d6620379ecf48b3edfc2c1d8ea6c1bf7ee413d34bdeb663be610bdd2bfb6f9b1 SHA512 1cc3f836db20dfbcbd4f7cabf45a93001a8ab4ca6bd86f0eca633172942cc76d744b5bcb2f691e6eae25a8f7c72d2744c07545e38d77f177d32ec41eb26d5c7f +EBUILD keepassxc-2.7.3.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca +EBUILD keepassxc-9999.ebuild 2484 BLAKE2B e01ba45106ef10b452c746cb31b82359aebc7e0149574c39202ac34ceeb28a0f5dfcdaec363f07af580e89bafb6fd2000d20a37f835050538c26bc84eb3b774b SHA512 bca31898fdf2b92c2728f2c4023702268d797993acee7ed7517b051b43f22a3c6e46d1775b2fa5ff2835f4906a16868cfb7977eaa3247ddbaa27263df592793e MISC metadata.xml 1028 BLAKE2B bc89e683ead8dfcedd9c1794c35df27ca535b69ce0036641d71c7df8a2db70060adc0d34a007c9da69765dea4fbfe5df5349d880197e2cbdb7f6c5347baed78f SHA512 abe1527cdd2c26b8f64d6b7e8651325146ffbbd53dc9cf273599901e9e9ac31bd43f2c85d8aad1067ccf807cbcad3d921d76df3666b8983eafe69589c7bd0647 diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch new file mode 100644 index 000000000000..52ca2b7eb610 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch @@ -0,0 +1,14 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 776c40d9..477bf179 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER) + LIBS ${TEST_LIBRARIES}) + endif() + +-add_unit_test(NAME testcli SOURCES TestCli.cpp +- LIBS testsupport cli ${TEST_LIBRARIES}) +- + if(WITH_GUI_TESTS) + add_subdirectory(gui) + endif(WITH_GUI_TESTS) diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.3.ebuild new file mode 100644 index 000000000000..eced3151172f --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.3.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org/ + https://github.com/keepassxreboot/keepassxc/" + +if [[ "${PV}" != *9999 ]] ; then + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + fi +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" + [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="X autotype browser doc keeshare +network test yubikey" + +RESTRICT="!test? ( test )" +REQUIRED_USE="autotype? ( X )" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/botan:2= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/qrencode:= + sys-libs/readline:0= + sys-libs/zlib:= + X? ( dev-qt/qtx11extras:5 ) + autotype? ( + x11-libs/libX11 + x11-libs/libXtst + ) + keeshare? ( sys-libs/zlib:=[minizip] ) + yubikey? ( + dev-libs/libusb:1 + sys-apps/pcsc-lite + ) +" +DEPEND="${RDEPEND} + dev-qt/qttest:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 + doc? ( dev-ruby/asciidoctor ) +" + +PATCHES=( "${FILESDIR}"/${P}-tests.patch ) + +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then + printf '%s' "${PV}" > .version || die + fi + + cmake_src_prepare +} + +src_configure() { + # https://github.com/keepassxreboot/keepassxc/issues/5801 + filter-flags -flto* + + local mycmakeargs=( + # Gentoo users enable ccache via e.g. FEATURES=ccache or + # other means. We don't want the build system to enable it for us. + -DWITH_CCACHE=OFF + -DWITH_GUI_TESTS=OFF + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_DOCS="$(usex doc)" + -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_FDOSECRETS=ON + -DWITH_XC_KEESHARE="$(usex keeshare)" + -DWITH_XC_NETWORKING="$(usex network)" + -DWITH_XC_SSHAGENT=ON + -DWITH_XC_UPDATECHECK=OFF + -DWITH_XC_YUBIKEY="$(usex yubikey)" + -DWITH_XC_X11="$(usex X)" + ) + if [[ "${PV}" == *_beta* ]] ; then + mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + fi + cmake_src_configure +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 985aebc0d678..0e1b46d2f295 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -6,7 +6,8 @@ EAPI=8 inherit cmake flag-o-matic xdg DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org" +HOMEPAGE="https://keepassxc.org/ + https://github.com/keepassxreboot/keepassxc/" if [[ "${PV}" != *9999 ]] ; then if [[ "${PV}" == *_beta* ]] ; then @@ -67,7 +68,7 @@ src_prepare() { printf '%s' "${PV}" > .version || die fi - cmake_src_prepare + cmake_src_prepare } src_configure() { -- cgit v1.2.3