From 356956cfaa500a89e912c1067cea9d948d26e0b9 Mon Sep 17 00:00:00 2001 From: layman Date: Fri, 30 Jun 2023 09:15:31 +0200 Subject: [PATCH] Updates --- app-emulation/amitools/Manifest | 3 +- app-emulation/amitools/amitools-9999.ebuild | 4 +- mail-client/claws-mail/Manifest | 5 - mail-client/claws-mail/claws-mail-9999.ebuild | 217 ------------------ ...aws-mail-3.15.0-old_profile_segfault.patch | 80 ------- ...claws-mail-3.17.4-libetpan_pkgconfig.patch | 97 -------- .../claws-mail-3.17.5-enchant-2_default.patch | 46 ---- mail-client/claws-mail/metadata.xml | 42 ---- net-im/discord-bin/Manifest | 3 - net-im/discord/Manifest | 3 + .../discord-0.0.27.ebuild} | 44 +--- net-im/{discord-bin => discord}/metadata.xml | 7 +- 12 files changed, 21 insertions(+), 530 deletions(-) delete mode 100644 mail-client/claws-mail/Manifest delete mode 100644 mail-client/claws-mail/claws-mail-9999.ebuild delete mode 100644 mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch delete mode 100644 mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch delete mode 100644 mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch delete mode 100644 mail-client/claws-mail/metadata.xml delete mode 100644 net-im/discord-bin/Manifest create mode 100644 net-im/discord/Manifest rename net-im/{discord-bin/discord-bin-0.0.24.ebuild => discord/discord-0.0.27.ebuild} (73%) rename net-im/{discord-bin => discord}/metadata.xml (76%) diff --git a/app-emulation/amitools/Manifest b/app-emulation/amitools/Manifest index 2419f87..9fe8eba 100644 --- a/app-emulation/amitools/Manifest +++ b/app-emulation/amitools/Manifest @@ -1,2 +1 @@ -EBUILD amitools-9999.ebuild 577 BLAKE2B a23a84013463c154b97aab5eda52bc8b44f72c22b393f16a312288046826c03f515d817cc92635fdb41ffd435b6ac9abf2d16523becbfb381a4166dfb565e7b5 SHA512 6c41884228896514555129998bbbfdd736cc84b1fad4c3cb7adf7163547266d30919a14bc76654ce4a693db08aa3d9cfc9e2e7a38ccbca19e431a1a69a9543f1 -MISC amitools-9999.ebuildx 572 BLAKE2B 370f2b0d4ee04efc498f535a2b848590709c15f65b6ca8fd44d80bdc453ee7a6516f1791e7ebff47a60dd4ce37da912872e67b52990a9b57a3e6fae4cfbdfba1 SHA512 e6fc6913b111369535069a0d3ec0368c3bb55b110249cefafa0cd589a09c3c293fce264bc51d6f6e8c1615dc0e709b8c215f6979801a523329a7379c73235c35 +EBUILD amitools-9999.ebuild 579 BLAKE2B 642d9b0ed69b3135c21edbcfcdf53c310d5127bb69233965a26c28e46bbac1ea4a84a0e45f18b90fd43153f330227aeeb2431fd89d9410dc8b552741651f0162 SHA512 d18425b5bf2e0821419d3a714749dc0d3afc21af05a70492f8808206681609269a315b87d21c5b46cefffa4f0d056567d24fc99b336c3d4f8bceefd87ad35db7 diff --git a/app-emulation/amitools/amitools-9999.ebuild b/app-emulation/amitools/amitools-9999.ebuild index 64b171d..e07553d 100644 --- a/app-emulation/amitools/amitools-9999.ebuild +++ b/app-emulation/amitools/amitools-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{9,10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 git-r3 diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest deleted file mode 100644 index 7b2c472..0000000 --- a/mail-client/claws-mail/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 BLAKE2B 64b98598814de6ac03894a7750a1da40edda7b8468c32b87f74c83f1fd6027c51d1804a95570909525630b7aff6f1eac81c1d8ad55f87538f32f03bac85aad83 SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b -AUX claws-mail-3.17.4-libetpan_pkgconfig.patch 4483 BLAKE2B b28520c658214e9f6ad4bd0d48835e29f8b37aa7b3915add2d71b8ee7dc3366c38db1de9272dfe8e48588cebf748e6c844f04bc721fe577f66288b849e5c7054 SHA512 39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2 -AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05 -EBUILD claws-mail-9999.ebuild 5705 BLAKE2B c454da6739ab329ebf4c92bae0ed03f16f443a81905d9bf55a9c685119f41d82bb396270cf4565f318be498655b29d8180f349d01215e7c8b39aa73a88cbfd0c SHA512 322b808005153d7e2a0a10b8d12e13f88570eb98ba944d8224b3e7d8de579dd536987dc7ac62264f260ba6a1ad24ee28970aefb90d7472bfe540c7acb839fd22 -MISC metadata.xml 1661 BLAKE2B ce48032773773b29728b3a6a177c43572e4c6df0f50df4e17935df77a317f1107527a82fd576765fca018edd73bb31e165029258e49640ed84ff9061f6f1a53f SHA512 5e297601a56a53db9e2463da1e785b0d8e7a358b9df68689c1a3da4efc5d3ffccc92af7ee2202d67e4c6226b298bb562fa0f590fd36a425749e21b1c15516076 diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild deleted file mode 100644 index 9da3d5d..0000000 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit autotools desktop python-any-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git" - EGIT_BRANCH="master" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" -REQUIRED_USE=" - appindicator? ( notification ) - libcanberra? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - smime? ( pgp ) -" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - sys-libs/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - archive? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - dillo? ( www-client/dillo ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7:= ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10 - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk3] ) - libnotify? ( x11-libs/libnotify ) - ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0:= ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0:= ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-2.0.0:2= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-util/valgrind ) - webkit? ( net-libs/webkit-gtk:4 ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - ${PYTHON_DEPS} - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" -) - -src_prepare() { - xdg_src_prepare - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-generic-umpc - --disable-jpilot #735118 - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable dillo dillo-plugin) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(use_enable pgp pgpcore-plugin) - $(use_enable pgp pgpinline-plugin) - $(use_enable pgp pgpmime-plugin) - --disable-python-plugin - $(use_enable rss rssyl-plugin) - $(use_enable session libsm) - $(use_enable sieve managesieve-plugin) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable webkit fancy-plugin) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - find "${ED}"/usr/lib*/claws-mail/plugins/ \ - \( -name "*.a" -o -name ".la" \) -delete || die -} - -pkg_postinst() { - ewarn "When upgrading from version 3.x please re-load any plugin you use" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch deleted file mode 100644 index b19bf8f..0000000 --- a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: Ricardo Mones -Date: Wed, 9 Aug 2017 14:48:38 +0000 (+0200) -Subject: Fix bug #3855: segfault at startup with old profile and IMAP account -X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=667c9d3eaf0487193cc7873e6d3a63959a03d7f9;hp=63677adb68c57479f6bc7534cfbf2f234b1f4fb1 - -Fix bug #3855: segfault at startup with old profile and IMAP account - -Revert "Remove duplicated code and include". - -This reverts commit 300f811f3bbf10455ca55d9b01da6705dd1e07bb. ---- - -diff --git a/src/imap.c b/src/imap.c -index 0e1e777..25bb283 100644 ---- a/src/imap.c -+++ b/src/imap.c -@@ -77,6 +77,8 @@ typedef struct _IMAPSession IMAPSession; - typedef struct _IMAPNameSpace IMAPNameSpace; - typedef struct _IMAPFolderItem IMAPFolderItem; - -+#include "prefs_account.h" -+ - #define IMAP_FOLDER(obj) ((IMAPFolder *)obj) - #define IMAP_FOLDER_ITEM(obj) ((IMAPFolderItem *)obj) - #define IMAP_SESSION(obj) ((IMAPSession *)obj) -@@ -425,6 +427,7 @@ static gint imap_get_flags (Folder *folder, - FolderItem *item, - MsgInfoList *msglist, - GHashTable *msgflags); -+static gchar *imap_folder_get_path (Folder *folder); - static gchar *imap_item_get_path (Folder *folder, - FolderItem *item); - static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item); -@@ -3042,6 +3045,35 @@ static FolderItem *imap_create_special_folder(Folder *folder, - return new_item; - } - -+static gchar *imap_folder_get_path(Folder *folder) -+{ -+ gchar *folder_path; -+ -+ g_return_val_if_fail(folder != NULL, NULL); -+ g_return_val_if_fail(folder->account != NULL, NULL); -+ -+#ifdef G_OS_WIN32 -+ gchar *sanitized_dirname = g_strdup(folder->account->recv_server); -+ g_strdelimit(sanitized_dirname, ":", ','); -+#endif -+ -+ folder_path = g_strconcat(get_imap_cache_dir(), -+ G_DIR_SEPARATOR_S, -+#ifdef G_OS_WIN32 -+ sanitized_dirname, -+#else -+ folder->account->recv_server, -+#endif -+ G_DIR_SEPARATOR_S, -+ folder->account->userid, -+ NULL); -+ -+#ifdef G_OS_WIN32 -+ g_free(sanitized_dirname); -+#endif -+ return folder_path; -+} -+ - #ifdef G_OS_WIN32 - static gchar *imap_encode_unsafe_chars(const gchar *str) - { -@@ -3078,9 +3110,8 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item) - gchar *item_path = NULL; - - g_return_val_if_fail(folder != NULL, NULL); -- g_return_val_if_fail(folder->account != NULL, NULL); - g_return_val_if_fail(item != NULL, NULL); -- folder_path = prefs_account_cache_dir(folder->account, FALSE); -+ folder_path = imap_folder_get_path(folder); - - g_return_val_if_fail(folder_path != NULL, NULL); - diff --git a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch b/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch deleted file mode 100644 index 572380d..0000000 --- a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 412a3f014..6a80c2a92 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -908,38 +908,62 @@ fi - dnl Libetpan - AC_MSG_CHECKING([whether to use libetpan]) - if test x"$enable_libetpan" = xyes; then -- AC_MSG_RESULT(yes) -- libetpan_result=no -- AC_PATH_PROG(libetpanconfig, [libetpan-config]) -- if test "x$libetpanconfig" != "x"; then -- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`" -- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) -- if test "x$libetpan_result" = "xyes"; then -- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) -- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`" -- AC_TRY_LINK([#include ], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) -- AC_MSG_RESULT([$libetpan_result]) -- fi -- fi -- if test "x$libetpan_result" = "xyes"; then -- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" -- LIBETPAN_LIBS="`$libetpanconfig --libs`" -- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` -- if test "$LIBETPAN_VERSION" -lt "57"; then -- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) -- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) -+ AC_MSG_RESULT(yes) -+ -+ libetpan_config=no -+ libetpan_result=no -+ libetpan_versiontype=0 -+ -+ # since 1.9.4, libetpan uses pkg-config -+ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4], -+ [ -+ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` -+ libetpan_config=yes -+ ], -+ [ -+ # before 1.9.4, libetpan uses its own libetpan-config script -+ AC_PATH_PROG(libetpanconfig, [libetpan-config]) -+ if test "x$libetpanconfig" != "x"; then -+ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" -+ LIBETPAN_LIBS="`$libetpanconfig --libs`" -+ # support libetpan version like x.x and x.x.x -+ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c` -+ if test $libetpan_versiontype -eq 1; then -+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` -+ else -+ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` -+ fi -+ libetpan_config=yes -+ fi -+ ]) -+ if test "x$libetpan_config" = "xyes"; then -+ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS" -+ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) -+ if test "x$libetpan_result" = "xyes"; then -+ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) -+ LIBS="$LIBS $LIBETPAN_LIBS" -+ AC_TRY_LINK([#include ], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) -+ AC_MSG_RESULT([$libetpan_result]) -+ fi -+ fi -+ if test "x$libetpan_result" = "xyes"; then -+ if test $libetpan_versiontype -eq 1; then -+ if test "$LIBETPAN_VERSION" -lt "57"; then -+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) -+ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) - AC_MSG_ERROR([libetpan 0.57 not found]) -- fi -- AC_SUBST(LIBETPAN_FLAGS) -- AC_SUBST(LIBETPAN_LIBS) -- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.) -- else -- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) -- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) -- AC_MSG_ERROR([libetpan 0.57 not found]) -- fi -+ fi -+ fi -+ AC_SUBST(LIBETPAN_FLAGS) -+ AC_SUBST(LIBETPAN_LIBS) -+ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.) -+ else -+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) -+ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) -+ AC_MSG_ERROR([libetpan 0.57 not found]) -+ fi - else -- AC_MSG_RESULT(no) -+ AC_MSG_RESULT(no) - fi - AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes") - diff --git a/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch b/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch deleted file mode 100644 index c9c9bd4..0000000 --- a/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 826770e2dae8646a613dbe07685be68b4dc83b62 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Mon, 9 Mar 2020 15:21:55 +0100 -Subject: [PATCH] Only check for enchant-2 - -Signed-off-by: Lars Wendler ---- - configure.ac | 18 +++++------------- - 1 file changed, 5 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8ab413657..e1159d45e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -591,23 +591,15 @@ dnl enchant is used for spell checking - AC_MSG_CHECKING([whether to use enchant]) - AC_MSG_RESULT($enable_enchant) - if test $enable_enchant = yes; then -- PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0, -+ PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 2.0.0, - [ -- AC_DEFINE(USE_ENCHANT, 1, enchant) -- echo "Building with enchant" -+ AC_DEFINE(USE_ENCHANT, 1, enchant-2) -+ echo "Building with enchant-2" - enable_enchant=yes - ], - [ -- PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 2.0.0, -- [ -- AC_DEFINE(USE_ENCHANT, 1, enchant-2) -- echo "Building with enchant-2" -- enable_enchant=yes -- ], -- [ -- echo "Building without enchant-notification" -- enable_enchant=no -- ]) -+ echo "Building without enchant-notification" -+ enable_enchant=no - ]) - AC_SUBST(ENCHANT_CFLAGS) - AC_SUBST(ENCHANT_LIBS) --- -2.25.1 - diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml deleted file mode 100644 index 9766136..0000000 --- a/mail-client/claws-mail/metadata.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - polynomial-c@gentoo.org - Lars Wendler - - - net-mail@gentoo.org - Net-Mail - - - Enable archiving plugin - Enable dillo html viewer plugin - Enable plugin for access to Google - data providers - Build support for GTK+3 - Enable PGP support - Enable plugin for spam - reporting to various services - Build mail-filter/bogofilter - plugin - Enable sound notification in connection - with USE=notification - Enable notification through - DBUS in connection with USE=notification - Enable notification on the - desktop in connection with USE=notification - Notification for new mail in - different way, see also USE flags libcanberra, - libindicate and libnotify - Build plugin for sieve filter support - Build plugin for S/MIME support - Build mail-filter/spamassassin - plugin - Add support for memory debugging - using valgrind - - - sylpheed-claws - - diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest deleted file mode 100644 index 9a781ff..0000000 --- a/net-im/discord-bin/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST discord-0.0.24.tar.gz 77551317 BLAKE2B 2a0ff44eac145aeadeeebe21ac03a756e5e088cc130ccfcb6a6a7b8040bf7507de49b788047e04cc6c9b1fb799ada6fc0b47a1804c5c910bbf4db362e1b5cb6e SHA512 9e1aa15bc1b1d8ebd2819ba88e7c012c47966d7f150264e732c849d4f15023729f8de4e5a5eb999603fa6102a02313dbf7d178b33cfacca58018dcd214ed4e40 -EBUILD discord-bin-0.0.24.ebuild 3815 BLAKE2B f80d35014beec420549387e8816846018e76c405208eca94b00321488c08e40e5d77c2023a7eef9964a2de947233be48633cebe62c134b960c347ce8e2edf005 SHA512 ea6e13c461190262108c9e2c974b1dd6da814bdb198791996d94aa821b31054c0fb42b80d0aa68e18da98b9901e82bdab5da7c219c46c1c0a9a7bb1dbdef898e -MISC metadata.xml 521 BLAKE2B d35802fb6784e2029bd0478c24ec5d4c43f7183c4c94c3aea0c7c3e172855d1f4fe1ee5e163b7d5d1b41d2cdcf9bc5b9ecc56e4556e2ab8ffdc5503f19f0ee87 SHA512 3d0e4099b7881affc0a6e6cc6bb13d68a83df833db8def22d60d441f27ad576f88651f6f4133b82146e9e346cc646c2d347c517ec5e90d01118e1a1f9d2bdfa1 diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest new file mode 100644 index 0000000..32983f3 --- /dev/null +++ b/net-im/discord/Manifest @@ -0,0 +1,3 @@ +DIST discord-0.0.27.tar.gz 92317071 BLAKE2B 5328abd5f6aba87c73ee26cc6387dd9af7745c003e67b70e168153a959f5f582d118d38ce0b45ff4a9165ff1423708b05d468824c880e4685755df41ceadd5e1 SHA512 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f +EBUILD discord-0.0.27.ebuild 3250 BLAKE2B 37ff53dcd821c1f9cb669bec81388632891027e0d0d60c74bc67c47d4eb28e660672ae6263bf1b64ed2b4bd88776eee0a37d02e12633ad55d09563b82c92006b SHA512 586d23a2b9d1decbf644d89d94829c935ed6e7de90fd0be31182f1d2c04e2dd9f50b0ce7c5164fa82ec83df56e84ea6b08a7b8e79d43b9bd0d0316ee02251331 +MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665 diff --git a/net-im/discord-bin/discord-bin-0.0.24.ebuild b/net-im/discord/discord-0.0.27.ebuild similarity index 73% rename from net-im/discord-bin/discord-bin-0.0.24.ebuild rename to net-im/discord/discord-0.0.27.ebuild index e006e6c..db19d1e 100644 --- a/net-im/discord-bin/discord-bin-0.0.24.ebuild +++ b/net-im/discord/discord-0.0.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,6 +6,7 @@ EAPI=8 MY_PN="${PN/-bin/}" MY_PV="${PV/-r*/}" +CHROMIUM_VERSION="102" CHROMIUM_LANGS=" am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv @@ -22,13 +23,10 @@ LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="amd64" RESTRICT="bindist mirror strip test" -IUSE="+seccomp system-ffmpeg" +IUSE="+seccomp" RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib:2 @@ -56,24 +54,11 @@ RDEPEND=" x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango - system-ffmpeg? ( media-video/ffmpeg[chromium] ) " DESTDIR="/opt/${MY_PN}" -QA_PREBUILT=" - ${DESTDIR#/}/${MY_PN^} - ${DESTDIR#/}/chrome-sandbox - ${DESTDIR#/}/libffmpeg.so - ${DESTDIR#/}/libvk_swiftshader.so - ${DESTDIR#/}/libvulkan.so - ${DESTDIR#/}/libEGL.so - ${DESTDIR#/}/libGLESv2.so - ${DESTDIR#/}/libVkICD_mock_icd.so - ${DESTDIR#/}/swiftshader/libEGL.so - ${DESTDIR#/}/swiftshader/libGLESv2.so - ${DESTDIR#/}/swiftshader/libvk_swiftshader.so -" +QA_PREBUILT="*" CONFIG_CHECK="~USER_NS" @@ -106,11 +91,6 @@ src_prepare() { "${MY_PN}.desktop" || die "sed failed for seccomp" fi - # USE system-ffmpeg - if use system-ffmpeg; then - rm libffmpeg.so || die - elog "Using system ffmpeg. This is experimental and may lead to crashes." - fi } src_install() { @@ -121,24 +101,22 @@ src_install() { exeinto "${DESTDIR}" - doexe "${MY_PN^}" chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so - - if use system-ffmpeg; then - dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "${DESTDIR}/libffmpeg.so" || die - else - doexe libffmpeg.so - fi + doexe "${MY_PN^}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so insinto "${DESTDIR}" doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin insopts -m0755 - doins -r locales resources swiftshader + doins -r locales resources # Chrome-sandbox requires the setuid bit to be specifically set. # see https://github.com/electron/electron/issues/17972 fowners root "${DESTDIR}/chrome-sandbox" fperms 4711 "${DESTDIR}/chrome-sandbox" + # Crashpad is included in the package once in a while and when it does, it must be installed. + # See #903616 and #890595 + [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler + dosym "${DESTDIR}/${MY_PN^}" "/usr/bin/${MY_PN}" } diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord/metadata.xml similarity index 76% rename from net-im/discord-bin/metadata.xml rename to net-im/discord/metadata.xml index 9388cb8..f5ecac7 100644 --- a/net-im/discord-bin/metadata.xml +++ b/net-im/discord/metadata.xml @@ -9,7 +9,8 @@ proxy-maint@gentoo.org Proxy Maintainers - - Use the system-wide media-video/ffmpeg instead of bundled - + + sarnex@gentoo.org + Nick Sarnie +