From 0d64e4aba03bad82adf8ae589fd10b9c219b92aa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 May 2023 11:48:47 +0100 Subject: gentoo auto-resync : 12:05:2023 - 11:48:47 --- net-misc/Manifest.gz | Bin 53954 -> 53956 bytes net-misc/turbovnc/Manifest | 5 +- net-misc/turbovnc/turbovnc-3.0.2.ebuild | 136 -------------------------------- net-misc/turbovnc/turbovnc-3.0.3.ebuild | 3 + net-misc/ytfzf/Manifest | 4 +- net-misc/ytfzf/metadata.xml | 3 +- net-misc/ytfzf/ytfzf-2.6.0.ebuild | 58 ++++++++++++++ 7 files changed, 67 insertions(+), 142 deletions(-) delete mode 100644 net-misc/turbovnc/turbovnc-3.0.2.ebuild create mode 100644 net-misc/ytfzf/ytfzf-2.6.0.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 373674b886e2..89a6f2b59923 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 28c16a4561af..5ae6967b5120 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,8 +1,5 @@ AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517 -DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 -DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 -EBUILD turbovnc-3.0.2.ebuild 2998 BLAKE2B 568f6a2dd2392158fd1a2a9a402fe8d6913e6d4ecaa02e9b20caee02d3e088d71ee0982c38fbf701cb9bc423867cba4ebfdfe214437aa9608263933ba2ecdff3 SHA512 53836490d66875436733ec641cbb4b09d0baed77d0113e56e01dab704bf593c55352376e55224925fef9043b1411bf3d8d5ddbcbee8f3cc2e510232fc93c21af -EBUILD turbovnc-3.0.3.ebuild 2998 BLAKE2B 568f6a2dd2392158fd1a2a9a402fe8d6913e6d4ecaa02e9b20caee02d3e088d71ee0982c38fbf701cb9bc423867cba4ebfdfe214437aa9608263933ba2ecdff3 SHA512 53836490d66875436733ec641cbb4b09d0baed77d0113e56e01dab704bf593c55352376e55224925fef9043b1411bf3d8d5ddbcbee8f3cc2e510232fc93c21af +EBUILD turbovnc-3.0.3.ebuild 3068 BLAKE2B 2095075516bf15e83ec1fb807399a60bca497f88d0bcf5438707d9520a340655ac488c66cc830d8574286b6f41d83f7f2f5d4d9f0c705bfd61bbd91c6ab16143 SHA512 8d2ef334a653b3f86c36b095252860ff5a58f2bf614d94fa34378e221abcd53305b6757ce50528719184c1b3308e1dd2ecc7c425f5b2f748065e047652f0ea00 MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild deleted file mode 100644 index abebac6c9c50..000000000000 --- a/net-misc/turbovnc/turbovnc-3.0.2.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_OPT_USE=viewer -inherit cmake desktop java-pkg-opt-2 verify-sig - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/" -SRC_URI=" - https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz - verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+server +ssl +viewer" -REQUIRED_USE="|| ( server viewer )" - -COMMON_DEPEND=" - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-misc/xkeyboard-config - server? ( - media-libs/libjpeg-turbo:= - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/pixman - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc[server] - ) - viewer? ( - media-libs/libjpeg-turbo:=[java] - x11-libs/libXi - !net-misc/tigervnc[viewer(+)] - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp - viewer? ( >=virtual/jre-1.8:* ) -" - -# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 -# but cmake will look for them, so add them here -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans - viewer? ( >=virtual/jdk-1.8:* ) - server? ( - app-arch/bzip2 - media-libs/freetype - x11-libs/libfontenc - ) -" - -BDEPEND=" - verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) -" - -PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc - -pkg_pretend() { - if use ssl && ! use server; then - einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" - fi -} - -src_prepare() { - use viewer && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_BUILDVIEWER=$(usex viewer) - -DTVNC_BUILDHELPER=$(usex viewer) - -DTVNC_BUILDSERVER=$(usex server) - -DTVNC_BUILDWEBSERVER=$(usex server) - ) - - if use server ; then - mycmakeargs+=( - -DTVNC_SYSTEMLIBS=ON - -DTVNC_SYSTEMX11=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - if use ssl ; then - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS=OpenSSL - -DTVNC_DLOPENSSL=OFF - ) - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - fi - - if use viewer ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use viewer ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - # Conflicts with x11-base/xorg-server - find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die - - einstalldocs -} diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild index abebac6c9c50..7cd8e44d220b 100644 --- a/net-misc/turbovnc/turbovnc-3.0.3.ebuild +++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild @@ -70,6 +70,9 @@ PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vgl-turbovnc.asc +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + pkg_pretend() { if use ssl && ! use server; then einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest index 81866a507e96..3a6f04b2cbcf 100644 --- a/net-misc/ytfzf/Manifest +++ b/net-misc/ytfzf/Manifest @@ -1,3 +1,5 @@ DIST ytfzf-2.5.5.tar.gz 3278740 BLAKE2B e80ee83cbd80fd3d53dd4e3f9aca4fed71b6bbebc6b0f0d8c85263efa4dfd184e45998719df966279365378669624119035f069c4d2b2d5f820e5304bd36604d SHA512 811fbc1de1b23bddd988c74212f0d6b314e5a7998ebc06e0481d42a5e6afa530f10a0e749a293a76799eff1fc380ebd54210f5e152c6d8ab07fd39327544c9d7 +DIST ytfzf-2.6.0.tar.gz 3277853 BLAKE2B f99de6c473ee728d42290a647df9e0404dea92854203f306401d916e920814517dee3ddde8c8ff06cb7ff29f5a9b8f438867a1d9bc02aa6e208d030ad8b786a7 SHA512 fb9a1bd161a735a9c464948d6ba3664982eadd25456d5d565c57e478574949324dbf556620fb837c00bc4946c65336ec895f7c59e1169631effadf70085773c4 EBUILD ytfzf-2.5.5.ebuild 1317 BLAKE2B a0de447cc088afd0fcbe686fa2b378917b69854ef45bff7f858ea99b700903bdfd656bf1ea260908cedf817950598175aa185ad9b44bdc4b659415e618736aef SHA512 01a0ee642b1a8fffc57916af82017bf3fac94e4e299f1c0ebe3084dfcc1e97debe1977943694502c341948e4fcbbf3501b94c255058af382cfd52463e905b409 -MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884 +EBUILD ytfzf-2.6.0.ebuild 1382 BLAKE2B 07b63da6140d69bda5dbdd48c0e76a01ec5d1836df916afbace44d58b48aaf0e957e85717fc25a6205edf26d02cf5733b5b85b153593d2778d23546ea2f60657 SHA512 b335f566f276973488950b0d3a0fb5728beac06759269f728ebb16505a4c20ac454da84aec3a9c105f52f4868bde8a7e32cfcdbefc5e26e03de387d79a916306 +MISC metadata.xml 650 BLAKE2B cef000d14639ebedc5583c42fc5ec8ea62307702ee1ca01272356a4aea375a464d0c0a24bedff98e38e16133161d09864e4c4875e7ecbad96b1611aebe0924e5 SHA512 61b25935bb80c572023948e49bfd3c8bf7551e94f0cc36592049f03498557c165f3c64815c41067ae85823254e578134770a235072254fd9e2e7ad06956c9b2f diff --git a/net-misc/ytfzf/metadata.xml b/net-misc/ytfzf/metadata.xml index b6a91b9d9370..153b2385848c 100644 --- a/net-misc/ytfzf/metadata.xml +++ b/net-misc/ytfzf/metadata.xml @@ -7,7 +7,8 @@ - Skip app-shells/fzf and media-video/mpv dependencies (requires custom settings) + Skip all optional dependencies (may no longer work out-of-the-box and require custom setting up) + Pull media-gfx/ueberzugpp or media-gfx/ueberzug for viewing thumbnails (default method when using -t) pystardust/ytfzf diff --git a/net-misc/ytfzf/ytfzf-2.6.0.ebuild b/net-misc/ytfzf/ytfzf-2.6.0.ebuild new file mode 100644 index 000000000000..62121ae8df88 --- /dev/null +++ b/net-misc/ytfzf/ytfzf-2.6.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="Posix script to find and watch youtube videos from the terminal" +HOMEPAGE="https://github.com/pystardust/ytfzf/" +SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="minimal +thumbnails" + +RDEPEND=" + app-misc/jq + net-misc/curl[ssl] + app-alternatives/awk + !minimal? ( + app-shells/fzf + media-video/mpv[lua] + net-misc/yt-dlp + thumbnails? ( + || ( + media-gfx/ueberzugpp + media-gfx/ueberzug + ) + ) + )" + +src_compile() { :; } + +src_install() { + local emakeargs=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} + ) + + emake "${emakeargs[@]}" addons doc install + einstalldocs + + rm -r "${ED}"/usr/share/licenses || die +} + +pkg_postinst() { + optfeature "external menu support" x11-misc/dmenu + optfeature "desktop notifications" x11-libs/libnotify + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "Note that ${PN} supports many methods to display menus/thumbnails." + elog "This ebuild primarily covers defaults and major features, additional" + elog "dependencies may be needed for others. Set USE=minimal if want full" + elog "control over optional dependencies (e.g. fzf is optional if use dmenu)." + fi +} -- cgit v1.2.3