From b0bab803d2f1c96af5760374e2684f9a85591916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Oct 2022 01:11:51 +0100 Subject: gentoo auto-resync : 02:10:2022 - 01:11:51 --- www-client/Manifest.gz | Bin 6208 -> 6204 bytes www-client/epiphany/Manifest | 4 +- www-client/epiphany/epiphany-42.3.ebuild | 86 -------------- www-client/epiphany/epiphany-42.4-r1.ebuild | 86 ++++++++++++++ www-client/epiphany/epiphany-42.4.ebuild | 86 -------------- www-client/links/Manifest | 2 + www-client/links/links-2.28.ebuild | 177 ++++++++++++++++++++++++++++ www-client/surf/Manifest | 4 +- www-client/surf/surf-2.1-r1.ebuild | 98 --------------- www-client/surf/surf-2.1-r2.ebuild | 98 +++++++++++++++ www-client/surf/surf-9999.ebuild | 2 +- 11 files changed, 367 insertions(+), 276 deletions(-) delete mode 100644 www-client/epiphany/epiphany-42.3.ebuild create mode 100644 www-client/epiphany/epiphany-42.4-r1.ebuild delete mode 100644 www-client/epiphany/epiphany-42.4.ebuild create mode 100644 www-client/links/links-2.28.ebuild delete mode 100644 www-client/surf/surf-2.1-r1.ebuild create mode 100644 www-client/surf/surf-2.1-r2.ebuild (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index 477534692edf..237a047efb55 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index e511b97dc4a5..f635a718b18b 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,6 +1,4 @@ AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a -DIST epiphany-42.3.tar.xz 6106824 BLAKE2B 97dc47e0df026210c8c81966ae02a2916d6a738b291261894b3c3bc9a21073e547de1dab00a64e378fb049eec6fbbb15346eb7489f6100f79ab2a4e3309f3366 SHA512 3bdbbbf97e80fcd55780312b9ee5c631e0a9ce8cfb27c4cb202cc5db56579d4aeb098781c4853464f9c22faacdaf75a960b10d8b878139ad24c42728529a4364 DIST epiphany-42.4.tar.xz 6107820 BLAKE2B 7ab18ac6d8eceb3577ef53c761e26a64291219311f2d6d82ed13ce6746767b83124faf28c9627056938351a05e5d6aff50eb95eb4dec10ce8847123fb5775b36 SHA512 55153078bc460cc5a0bc17bb8d12fd5ed6495cd2415e128ec0b4917b07a4d2fe1fb74e871c033aaef43c89c125d79ad37e99ea2fa2ada07fbcdf09603129ae47 -EBUILD epiphany-42.3.ebuild 1941 BLAKE2B 03a18d1284669dc7f25361764f4c6b97edc5f0badb8c48672e560b84d64e057df81122d8723388eda7696c810ff8debce60d389ecb68e0d70f6fbbe0d766ae09 SHA512 b717707a86e5c2c8e2d63daf6ce9b768f27b81f6510caacdf25cd88ced2bb3b816849abfc2b80d737aa7cf97c56440476601e0bc723ff5110185d9a99699dc1c -EBUILD epiphany-42.4.ebuild 1981 BLAKE2B da579084a17fbe797a0bd23fc60ba24fa266df059e7d09811f2804ef343ee9092a629fe71c06b3073436a395ab6cec823beda67bdde2128583e7afd6af18d900 SHA512 5f6785de7c31b045f74da152226b139b7451767ddc4230cab3933912cc68333e4ad0050d2d439923f64b57ac5e6056865d07651dc50c09487ccb489d42fa55f4 +EBUILD epiphany-42.4-r1.ebuild 1982 BLAKE2B 5a6ffb9f5ca95ad91091c99683313ce4f8145037d008efb06282987a0c55fd9d1948ab72fd06d4bec774f932ff7cca5ea772a0732a67f18af40a4ee4e04d8c08 SHA512 8f0350fb915168f45fcc80846cc7e621cb827a8d86bde482831b8a5a97267cbf5e1991c5cf1a2feb37ad5ba7edb53c40ed7a93f583f4c84c9a64cf280167b15b MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/www-client/epiphany/epiphany-42.3.ebuild b/www-client/epiphany/epiphany-42.3.ebuild deleted file mode 100644 index e88f8c52fdd6..000000000000 --- a/www-client/epiphany/epiphany-42.3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg virtualx - -DESCRIPTION="GNOME webbrowser based on Webkit" -HOMEPAGE="https://wiki.gnome.org/Apps/Web" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.67.4:2 - >=x11-libs/gtk+-3.24.0:3 - >=dev-libs/nettle-3.4:= - >=net-libs/webkit-gtk-2.33.2:4= - >=x11-libs/cairo-1.2 - >=app-crypt/gcr-3.5.5:=[gtk] - >=x11-libs/gdk-pixbuf-2.36.5:2 - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.35 - >=dev-libs/json-glib-1.6 - app-arch/libarchive:= - >=dev-libs/libdazzle-3.37.1 - >=gui-libs/libhandy-1.5.0:1= - >=app-crypt/libsecret-0.19 - >=net-libs/libsoup-2.48.0:2.4 - >=dev-libs/libxml2-2.6.12:2 - >=dev-db/sqlite-3.22:3 - dev-libs/gmp:0= -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme -" -# appstream-glib needed for appdata.xml gettext translation -BDEPEND=" - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) - "${FILESDIR}"/var-tmp-tests.patch -) - -src_configure() { - local emesonargs=( - -Ddeveloper_mode=false - -Dlibportal=disabled - # maybe enable later if network-sandbox is off, but in 3.32.4 the network test - # is commented out upstream anyway - -Dnetwork_tests=disabled - -Dtech_preview=false - $(meson_feature test unit_tests) - -Dsoup2=enabled - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk:4[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/www-client/epiphany/epiphany-42.4-r1.ebuild b/www-client/epiphany/epiphany-42.4-r1.ebuild new file mode 100644 index 000000000000..311a5be8c69d --- /dev/null +++ b/www-client/epiphany/epiphany-42.4-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg virtualx + +DESCRIPTION="GNOME webbrowser based on Webkit" +HOMEPAGE="https://wiki.gnome.org/Apps/Web https://gitlab.gnome.org/GNOME/epiphany" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" + +DEPEND=" + >=dev-libs/glib-2.67.4:2 + >=x11-libs/gtk+-3.24.0:3 + >=dev-libs/nettle-3.4:= + >=net-libs/webkit-gtk-2.33.2:4= + >=x11-libs/cairo-1.2 + >=app-crypt/gcr-3.5.5:0=[gtk] + >=x11-libs/gdk-pixbuf-2.36.5:2 + gnome-base/gsettings-desktop-schemas + >=app-text/iso-codes-0.35 + >=dev-libs/json-glib-1.6 + app-arch/libarchive:= + >=dev-libs/libdazzle-3.37.1 + >=gui-libs/libhandy-1.5.0:1= + >=app-crypt/libsecret-0.19 + >=net-libs/libsoup-2.48.0:2.4 + >=dev-libs/libxml2-2.6.12:2 + >=dev-db/sqlite-3.22:3 + dev-libs/gmp:0= +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme +" +# appstream-glib needed for appdata.xml gettext translation +BDEPEND=" + dev-libs/appstream-glib + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +PATCHES=( + # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) + "${FILESDIR}"/var-tmp-tests.patch +) + +src_configure() { + local emesonargs=( + -Ddeveloper_mode=false + -Dlibportal=disabled + # maybe enable later if network-sandbox is off, but in 3.32.4 the network test + # is commented out upstream anyway + -Dnetwork_tests=disabled + -Dtech_preview=false + $(meson_feature test unit_tests) + -Dsoup2=enabled + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if ! has_version net-libs/webkit-gtk:4[jpeg2k]; then + ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." + ewarn "Various image galleries/managers may be broken." + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/www-client/epiphany/epiphany-42.4.ebuild b/www-client/epiphany/epiphany-42.4.ebuild deleted file mode 100644 index 5eb5a539d329..000000000000 --- a/www-client/epiphany/epiphany-42.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson xdg virtualx - -DESCRIPTION="GNOME webbrowser based on Webkit" -HOMEPAGE="https://wiki.gnome.org/Apps/Web https://gitlab.gnome.org/GNOME/epiphany" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.67.4:2 - >=x11-libs/gtk+-3.24.0:3 - >=dev-libs/nettle-3.4:= - >=net-libs/webkit-gtk-2.33.2:4= - >=x11-libs/cairo-1.2 - >=app-crypt/gcr-3.5.5:=[gtk] - >=x11-libs/gdk-pixbuf-2.36.5:2 - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.35 - >=dev-libs/json-glib-1.6 - app-arch/libarchive:= - >=dev-libs/libdazzle-3.37.1 - >=gui-libs/libhandy-1.5.0:1= - >=app-crypt/libsecret-0.19 - >=net-libs/libsoup-2.48.0:2.4 - >=dev-libs/libxml2-2.6.12:2 - >=dev-db/sqlite-3.22:3 - dev-libs/gmp:0= -" -RDEPEND="${DEPEND} - x11-themes/adwaita-icon-theme -" -# appstream-glib needed for appdata.xml gettext translation -BDEPEND=" - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR) - "${FILESDIR}"/var-tmp-tests.patch -) - -src_configure() { - local emesonargs=( - -Ddeveloper_mode=false - -Dlibportal=disabled - # maybe enable later if network-sandbox is off, but in 3.32.4 the network test - # is commented out upstream anyway - -Dnetwork_tests=disabled - -Dtech_preview=false - $(meson_feature test unit_tests) - -Dsoup2=enabled - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk:4[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/www-client/links/Manifest b/www-client/links/Manifest index f70f3559b8d6..c2bc783fec0f 100644 --- a/www-client/links/Manifest +++ b/www-client/links/Manifest @@ -1,5 +1,7 @@ DIST links-2.26.tar.bz2 6508447 BLAKE2B e0bf5ac4e05a8e14ae7342aed7bb7ac0f5f6c2d9e23adda221cc3ba73f39020c95cef90d10d5c9d0697797683ff1edf1ed55a4d8aca0930b2eb01b547a21bf00 SHA512 b732f88ae0e9f63f577fc3041058c56b43ffec3b797328453d0770e326010b05fcc04128287ef35b0d189bd0768446057d8773e10f8e0a76bab72fb252cdd530 DIST links-2.27.tar.bz2 6510121 BLAKE2B c7326147c583ad380f1b528a216ecf056a40a2939b290d69061682aa9f397ab3eabb71691cb68efcd0739b67acbe1f38f95a8a347d5045efe671eacfd0e5c40a SHA512 8b46472184f2eab1aeca5de9b957a87f475f5acd9801260678b07475cf36afb1a9602e67ef39ad59da90d2d6cee235521db95d93349fd9bd6cee667eab2e5d32 +DIST links-2.28.tar.bz2 6512800 BLAKE2B 2ff210dd7ab92ab2f6280f5ef2d2e9873d377a646a9e2ac32a770f467c3c76edcddac628c1f36a12cdb01c2f26ed408b7460e6e85be00c40d53ec668da622786 SHA512 090bc770f78f8b57358ac0c6f31ad12f3d5f4eb9bbf74913ac8fa254e5ed63ec289c8a7990879983ace7427e20fb2de1271820f025b630c5a0ca599cf697b754 EBUILD links-2.26-r1.ebuild 3552 BLAKE2B 41a6b252f696efd996771500133bce15e50bdb2727e954672ce450268a71fc100a5fe15f61c444df686d80b16c300d099e281e0f7341a17e8721b3818090f767 SHA512 206178c756db79668c9cba4e7107014a2f98b3c57c87b2ca6a48b8ccb136be3aa06e9ea6c3c3da1a8274056d9106298f6de6fc5205e3373e2bc9b606c6a0043c EBUILD links-2.27.ebuild 3553 BLAKE2B 6fa2d82eb2fd7281a42517a713b8268a92dc9bd60f37f01924adee1b15711ebde2e3a1f1b1268b5cfc7a60bfc74e52488106e3e6db0110c98f2af9deac20ecdd SHA512 159d65284d005ff96758e30c66b079d2da8809f6d07ec4f88244b0c32a59c60c4172ea664220721db008d1b1d17375fc017f220d5f4828e1a68cb66c2fb60927 +EBUILD links-2.28.ebuild 3560 BLAKE2B 19a6720ac267ee91584f11ac17e8126de4a05224e5d1cdcfac4204a5121ba60a44ab299fdc67722a4eb3e311e72dfcf8577f053e616f0a0775105fb0539c0120 SHA512 9a53cbc43159c9d256ca194585d0a93bf9eea880c077e9a8fefa87deacb8134adbcb5fc190f8b2c492b2fcd744a0c290d7309fc7daf50db2d065f64e92b32cdf MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b diff --git a/www-client/links/links-2.28.ebuild b/www-client/links/links-2.28.ebuild new file mode 100644 index 000000000000..037b3c189417 --- /dev/null +++ b/www-client/links/links-2.28.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop toolchain-funcs xdg-utils + +DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode" +HOMEPAGE="http://links.twibright.com/" +SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd" + +GRAPHICS_DEPEND="media-libs/libpng:0=" + +RDEPEND=" + dev-libs/libbsd + brotli? ( + app-arch/brotli + ) + bzip2? ( + app-arch/bzip2 + ) + fbcon? ( + ${GRAPHICS_DEPEND} + ) + freetype? ( + media-libs/fontconfig + media-libs/freetype + ) + gpm? ( + sys-libs/gpm + ) + jpeg? ( + media-libs/libjpeg-turbo:= + ) + libevent? ( + dev-libs/libevent:0= + ) + livecd? ( + ${GRAPHICS_DEPEND} + sys-libs/gpm + media-libs/libjpeg-turbo:= + ) + lzip? ( + app-arch/lzip + ) + lzma? ( + app-arch/xz-utils + ) + ssl? ( + dev-libs/openssl:0= + ) + svga? ( + ${GRAPHICS_DEPEND} + media-libs/svgalib + ) + tiff? ( + media-libs/tiff:0 + ) + webp? ( + media-libs/libwebp:= + ) + X? ( + ${GRAPHICS_DEPEND} + x11-libs/libXext + ) + zlib? ( + sys-libs/zlib + ) + zstd? ( + app-arch/zstd + )" + +DEPEND="${RDEPEND} + fbcon? ( virtual/os-headers ) + livecd? ( virtual/os-headers )" + +BDEPEND="virtual/pkgconfig" + +IDEPEND="X? ( dev-util/desktop-file-utils )" + +REQUIRED_USE="!livecd? ( fbcon? ( gpm ) ) + svga? ( suid )" + +DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES ) + +src_prepare() { + use X && xdg_environment_reset + + if use unicode; then + pushd intl > /dev/null || die + ./gen-intl || die + ./synclang || die + popd > /dev/null || die + fi + + # error: conditional "am__fastdepCXX" was never defined (for eautoreconf) + sed -i \ + -e '/AC_PROG_CXX/s:dnl ::' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ + configure.in || die #467020 + + # Upstream configure produced by broken autoconf-2.13. This also fixes + # toolchain detection. + mv configure.in configure.ac || die + + default + eautoreconf #131440 and #103483#c23 +} + +src_configure() { + local myconf + + if use livecd; then + export ac_cv_lib_gpm_Gpm_Open=yes + myconf+=' --with-fb --with-libjpeg' + else + export ac_cv_lib_gpm_Gpm_Open=$(usex gpm) + fi + + if use X || use fbcon || use svga || use livecd; then + myconf+=' --enable-graphics' + fi + + tc-export PKG_CONFIG + + econf \ + --without-directfb \ + --without-librsvg \ + $(use_with brotli) \ + $(use_with bzip2) \ + $(use_with fbcon fb) \ + $(use_with freetype) \ + $(use_with ipv6) \ + $(use_with jpeg libjpeg) \ + $(use_with libevent) \ + $(use_with lzip) \ + $(use_with lzma) \ + $(use_with ssl) \ + $(use_with svga svgalib) \ + $(use_with tiff libtiff) \ + $(use_with webp libwebp) \ + $(use_with X x) \ + $(use_with zlib) \ + $(use_with zstd) \ + ${myconf} +} + +src_install() { + HTML_DOCS="doc/links_cal/*" + default + + if use X; then + newicon Links_logo.png links.png + make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser' + local d="${ED}"/usr/share/applications + echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die + if use ssl; then + sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \ + "${d}"/*.desktop || die + fi + fi + + use suid && fperms 4755 /usr/bin/links +} + +pkg_postinst() { + use X && xdg_desktop_database_update +} + +pkg_postrm() { + use X && xdg_desktop_database_update +} diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest index c7638e7350d3..fcdb26044719 100644 --- a/www-client/surf/Manifest +++ b/www-client/surf/Manifest @@ -1,5 +1,5 @@ AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3cda8c4a386f8f4a4e5a40ce40c82736b33619f14c770031366aecfb0df4404982b834df8013845ff3f392de SHA512 2dbcdbbc869780a5b265dd909164e9764771e9a6c20664927f7df358daaadc83f65a915aabe65559756f6fedfcebad5496433ecb555ed0de55ced988102681ef DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12 -EBUILD surf-2.1-r1.ebuild 1857 BLAKE2B 92174b32642399668222b500bd7f0707c042ebf79de8d77f87974164e1b8fc365e53dea2fe79e1807e4b8809b8e7a1cacce9c6cc06abe4e445f826286d8bc992 SHA512 c9c7331f7b300d55c72c8ac5c881bf94f57caba1b955b9280f5cb1e54a538f03940218737dbcbbe4f3360124d963ac277a1631225fc8e9ac68afc00e4e43103d -EBUILD surf-9999.ebuild 1864 BLAKE2B 59409f41e8fba963be2b9e81971650584c8382bdfb47c4ce853ebda1f8930856959ac899803cb12836bde4ad308bf33a80b6df3af79467d56a2a264e40ece0b6 SHA512 4331f998ba9ae3c89b2893f3541134af1ac6d3cd97816a4826470cddddd927312b78a2f7cd8e18c3bf8b900105289d6b9274e0c662d37b0585a2ceaf606af132 +EBUILD surf-2.1-r2.ebuild 1860 BLAKE2B e73a7c72d77b0ccf545b2a9f899d0000f7603dfd7154350cb6bd322d1a482f9505a48102281b74b8545664108b86fc502bb29ced6171d07e90a840b2033551bb SHA512 d8736706f594bf11919d65b920dfa6d6587a1a060f4d3229b68d8b8e0a1411669e381edef0b773a17d5df3dee80306d990bf32b7bf78a0499fc2b543fc93deea +EBUILD surf-9999.ebuild 1867 BLAKE2B 3957a728ca83500bd52c474716676f63a054b3692b3bda7806bc9883b316a04e3ba70d174e3a10eef002912a21371bf0463515c9363d95c7f3b3e450ec520d64 SHA512 29cda207b25e0da38f01af55f84e611d16a222aadc802cbae8d26d1d76d01fb1fe05f11a00ba244d28b5ddd91718d4baa6c57aedec53b687c067202e60d40402 MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08 diff --git a/www-client/surf/surf-2.1-r1.ebuild b/www-client/surf/surf-2.1-r1.ebuild deleted file mode 100644 index 8b3a6d1ad9fc..000000000000 --- a/www-client/surf/surf-2.1-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop savedconfig toolchain-funcs xdg - -DESCRIPTION="A simple web browser based on WebKit/GTK+" -HOMEPAGE="https://surf.suckless.org/" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.suckless.org/surf" - EGIT_BRANCH="surf-webkit2" -else - SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~riscv x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="tabbed" - -DEPEND=" - app-crypt/gcr[gtk] - dev-libs/glib:2 - net-libs/webkit-gtk:4 - x11-libs/gtk+:3 - x11-libs/libX11 -" -RDEPEND="${DEPEND} - !sci-chemistry/surf - !savedconfig? ( - net-misc/curl - x11-apps/xprop - x11-misc/dmenu - x11-terms/st - ) - tabbed? ( x11-misc/tabbed ) -" -BDEPEND=" - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -pkg_setup() { - if ! use savedconfig; then - elog "The default config.h assumes you have" - elog " net-misc/curl" - elog " x11-terms/st" - elog "installed to support the download function." - elog "Without those, downloads will fail (gracefully)." - elog "You can fix this by:" - elog "1) Installing these packages, or" - elog "2) Setting USE=savedconfig and changing config.h accordingly." - fi -} - -src_prepare() { - default - - restore_config config.h - - tc-export CC PKG_CONFIG -} - -src_install() { - default - - if use tabbed; then - dobin surf-open.sh - fi - - save_config config.h - - newicon "${S}/${PN}.png" "${PN}.png" - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" - make_desktop_entry \ - "surf %u" \ - "Surf" \ - "surf" \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=surf" -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/www-client/surf/surf-2.1-r2.ebuild b/www-client/surf/surf-2.1-r2.ebuild new file mode 100644 index 000000000000..796e5b7dcbb9 --- /dev/null +++ b/www-client/surf/surf-2.1-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop savedconfig toolchain-funcs xdg + +DESCRIPTION="A simple web browser based on WebKit/GTK+" +HOMEPAGE="https://surf.suckless.org/" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.suckless.org/surf" + EGIT_BRANCH="surf-webkit2" +else + SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" + KEYWORDS="amd64 ~riscv x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="tabbed" + +DEPEND=" + app-crypt/gcr:0=[gtk] + dev-libs/glib:2 + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 + x11-libs/libX11 +" +RDEPEND="${DEPEND} + !sci-chemistry/surf + !savedconfig? ( + net-misc/curl + x11-apps/xprop + x11-misc/dmenu + x11-terms/st + ) + tabbed? ( x11-misc/tabbed ) +" +BDEPEND=" + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +pkg_setup() { + if ! use savedconfig; then + elog "The default config.h assumes you have" + elog " net-misc/curl" + elog " x11-terms/st" + elog "installed to support the download function." + elog "Without those, downloads will fail (gracefully)." + elog "You can fix this by:" + elog "1) Installing these packages, or" + elog "2) Setting USE=savedconfig and changing config.h accordingly." + fi +} + +src_prepare() { + default + + restore_config config.h + + tc-export CC PKG_CONFIG +} + +src_install() { + default + + if use tabbed; then + dobin surf-open.sh + fi + + save_config config.h + + newicon "${S}/${PN}.png" "${PN}.png" + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" + make_desktop_entry \ + "surf %u" \ + "Surf" \ + "surf" \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=surf" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild index 236324b24ec6..1bcbc4596bdd 100644 --- a/www-client/surf/surf-9999.ebuild +++ b/www-client/surf/surf-9999.ebuild @@ -22,7 +22,7 @@ SLOT="0" IUSE="tabbed" DEPEND=" - app-crypt/gcr[gtk] + app-crypt/gcr:0=[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 -- cgit v1.2.3