From 3b466ae9f15a33737b6ac2d2738a43978d6f06c0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:33:16 +0200 Subject: [PATCH 1/9] app-crypt/libmd: Sync with Gentoo It's from Gentoo commit ab05255b246cfca95025d9f966e62028f4242dea. --- ...sion-script-linker-support-detection.patch | 38 +++++++++++++++++++ .../app-crypt/libmd/libmd-1.0.4.ebuild | 17 +++++++-- .../app-crypt/libmd/libmd-9999.ebuild | 27 ------------- .../app-crypt/libmd/metadata.xml | 8 +++- 4 files changed, 59 insertions(+), 31 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch new file mode 100644 index 0000000000..bcee3a0661 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/files/libmd-1.0.4-fix-version-script-linker-support-detection.patch @@ -0,0 +1,38 @@ +From e408786075b9540f76783f5c3ce87f6d1ece13cf Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Sun, 12 Feb 2023 23:55:09 +0100 +Subject: [PATCH] build: Fix version script linker support detection + +When the linker uses --no-undefined-version either specified by the user +or as the default behavior (such as with newer clang >= 16 releases), a missing symbol definition will cause a linker error if that symbol is +listed in the version script. + + +Bug: https://bugs.gentoo.org/894010 +Upstream issue: https://gitlab.freedesktop.org/libbsd/libmd/-/issues/1 +Upstream commit: https://gitlab.freedesktop.org/libbsd/libmd/-/commit/e408786075b9540f76783f5c3ce87f6d1ece13cf + +--- + m4/libmd-linker.m4 | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/m4/libmd-linker.m4 b/m4/libmd-linker.m4 +index 7d1236a..3d6edcd 100644 +--- a/m4/libmd-linker.m4 ++++ b/m4/libmd-linker.m4 +@@ -8,7 +8,11 @@ AC_DEFUN([LIBMD_LINKER_VERSION_SCRIPT], [ + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" + AC_LINK_IFELSE([ +- AC_LANG_PROGRAM([], []) ++ AC_LANG_PROGRAM([[ ++extern int symbol(void); ++int symbol(void) { return 0; } ++]], [[ ++]]) + ], [ + libmd_cv_version_script=yes + ], [ +-- +GitLab + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild index ec9a537d5a..1cae95fb39 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-1.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="Message Digest functions from BSD systems" HOMEPAGE="https://www.hadrons.org/software/libmd/" @@ -11,7 +11,18 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz" LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${FILESDIR}/${P}-fix-version-script-linker-support-detection.patch" +) + +src_prepare() { + default + + # Drop on next release, only needed for lld patch + eautoreconf +} multilib_src_configure() { ECONF_SOURCE="${S}" econf diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild deleted file mode 100644 index b28c93edaf..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/libmd-9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools multilib-minimal git-r3 - -DESCRIPTION="Message Digest functions from BSD systems" -HOMEPAGE="https://www.hadrons.org/software/libmd/" -EGIT_REPO_URI="https://git.hadrons.org/git/libmd.git" - -LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )" -SLOT="0" - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf -} - -multilib_src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml index 85e4ed814f..0c7ca90940 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libmd/metadata.xml @@ -1,5 +1,11 @@ - + + base-system@gentoo.org + Gentoo Base System + + + libbsd/libmd + From b5a13a9ba50afa34798342ed605fe9f8482fe794 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:33:34 +0200 Subject: [PATCH 2/9] app-crypt/pinentry: Sync with Gentoo It's from Gentoo commit 6008e86d6768480e3743fb43beb19bf3fc8d3e1c. --- .../app-crypt/pinentry/Manifest | 4 +- .../files/pinentry-0.8.2-ncurses.patch | 25 ----- ...-make-icon-work-under-Plasma-Wayland.patch | 52 ---------- .../app-crypt/pinentry/metadata.xml | 4 - .../pinentry/pinentry-1.1.1-r1.ebuild | 90 ----------------- .../app-crypt/pinentry/pinentry-1.2.0.ebuild | 90 ----------------- .../pinentry/pinentry-1.2.1-r1.ebuild | 98 +++++++++++++++++++ 7 files changed, 100 insertions(+), 263 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest index c80daad0ad..b18692ca58 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest @@ -1,2 +1,2 @@ -DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12 -DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63 +DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6 +DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch deleted file mode 100644 index 3bb92c63d0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sun, 5 May 2013 02:23:08 +0300 -Subject: [PATCH] ncurses: link with optional tinfo - ---- - m4/curses.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/m4/curses.m4 b/m4/curses.m4 -index 3a01881..ffb6bd1 100644 ---- a/m4/curses.m4 -+++ b/m4/curses.m4 -@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [ - have_ncursesw=no - fi - if test "$LIBNCURSES"; then -+ AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow", -+ AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo")) - # Use ncurses header files instead of the ordinary ones, if possible; - # is there a better way of doing this, that avoids looking in specific - # directories? --- -1.8.1.5 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch deleted file mode 100644 index 646df19637..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7218becac7132c2508d4e8f42c693d69c406795a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= -Date: Wed, 7 Mar 2018 15:14:22 +0100 -Subject: [PATCH] Make pinentry-qt icon work under Plasma Wayland. - ---- - qt/Makefile.am | 2 ++ - qt/main.cpp | 2 ++ - qt/org.gnupg.pinentry-qt.desktop | 5 +++++ - 3 files changed, 9 insertions(+) - create mode 100644 qt/org.gnupg.pinentry-qt.desktop - -diff --git a/qt/Makefile.am b/qt/Makefile.am -index 698005e..bbf39d1 100644 ---- a/qt/Makefile.am -+++ b/qt/Makefile.am -@@ -24,6 +24,8 @@ bin_PROGRAMS = pinentry-qt - - EXTRA_DIST = document-encrypt.png pinentry.qrc - -+desktopdir = $(datadir)/applications -+dist_desktop_DATA = org.gnupg.pinentry-qt.desktop - - if FALLBACK_CURSES - ncurses_include = $(NCURSES_INCLUDE) -diff --git a/qt/main.cpp b/qt/main.cpp -index fe88d26..b767cb4 100644 ---- a/qt/main.cpp -+++ b/qt/main.cpp -@@ -372,6 +372,8 @@ main(int argc, char *argv[]) - i = argc; - app = new QApplication(i, new_argv); - app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png"))); -+ app->setOrganizationDomain(QStringLiteral("gnupg.org")); -+ app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt")); - } - - pinentry_parse_opts(argc, argv); -diff --git a/qt/org.gnupg.pinentry-qt.desktop b/qt/org.gnupg.pinentry-qt.desktop -new file mode 100644 -index 0000000..0ac89aa ---- /dev/null -+++ b/qt/org.gnupg.pinentry-qt.desktop -@@ -0,0 +1,5 @@ -+[Desktop Entry] -+Type=Application -+Name=Pinentry dialog -+Icon=document-encrypt -+NoDisplay=true --- -2.16.1 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml index 6d11bc523c..1ef405d63d 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/metadata.xml @@ -1,10 +1,6 @@ - - zlogene@gentoo.org - Mikle Kolyada - base-system@gentoo.org Gentoo Base System diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild deleted file mode 100644 index 90e78ab842..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.1-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps efl emacs gnome-keyring gtk ncurses qt5" - -DEPEND=" - >=app-eselect/eselect-pinentry-0.7.2 - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - efl? ( dev-libs/efl[X] ) - gnome-keyring? ( app-crypt/libsecret ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -RDEPEND="${DEPEND} - gtk? ( app-crypt/gcr[gtk] ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - "${FILESDIR}/${PN}-1.0.0-AR.patch" -) - -src_prepare() { - default - unset FLTK_CONFIG - eautoreconf -} - -src_configure() { - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - $(use_enable efl pinentry-efl) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gtk pinentry-gnome3) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable qt5 pinentry-qt) \ - $(use_with caps libcap) \ - --enable-pinentry-tty \ - --disable-pinentry-fltk \ - --disable-pinentry-gtk2 \ - MOC="$(qt5_get_bindir)"/moc \ - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \ - LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -src_install() { - default - rm "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5 -} - -pkg_postinst() { - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.0.ebuild deleted file mode 100644 index 90e78ab842..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps efl emacs gnome-keyring gtk ncurses qt5" - -DEPEND=" - >=app-eselect/eselect-pinentry-0.7.2 - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - efl? ( dev-libs/efl[X] ) - gnome-keyring? ( app-crypt/libsecret ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -RDEPEND="${DEPEND} - gtk? ( app-crypt/gcr[gtk] ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - "${FILESDIR}/${PN}-1.0.0-AR.patch" -) - -src_prepare() { - default - unset FLTK_CONFIG - eautoreconf -} - -src_configure() { - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - $(use_enable efl pinentry-efl) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gtk pinentry-gnome3) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable qt5 pinentry-qt) \ - $(use_with caps libcap) \ - --enable-pinentry-tty \ - --disable-pinentry-fltk \ - --disable-pinentry-gtk2 \ - MOC="$(qt5_get_bindir)"/moc \ - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \ - LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \ - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') -} - -src_install() { - default - rm "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5 -} - -pkg_postinst() { - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild new file mode 100644 index 0000000000..ee27968fb8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc +inherit autotools qmake-utils verify-sig + +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="https://gnupg.org/aegypten2" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps efl emacs gnome-keyring gtk ncurses qt5" + +DEPEND=" + >=dev-libs/libassuan-2.1 + >=dev-libs/libgcrypt-1.6.3 + >=dev-libs/libgpg-error-1.17 + efl? ( dev-libs/efl[X] ) + gnome-keyring? ( app-crypt/libsecret ) + ncurses? ( sys-libs/ncurses:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND=" + ${DEPEND} + gtk? ( app-crypt/gcr:0[gtk] ) +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" +IDEPEND=">=app-eselect/eselect-pinentry-0.7.2" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-AR.patch" +) + +src_prepare() { + default + + unset FLTK_CONFIG + + eautoreconf +} + +src_configure() { + export PATH="$(qt5_get_bindir):${PATH}" + export QTLIB="$(qt5_get_libdir)" + + local myeconfargs=( + $(use_enable efl pinentry-efl) + $(use_enable emacs pinentry-emacs) + $(use_enable gnome-keyring libsecret) + $(use_enable gtk pinentry-gnome3) + $(use_enable ncurses fallback-curses) + $(use_enable ncurses pinentry-curses) + $(use_enable qt5 pinentry-qt) + + --enable-pinentry-tty + --disable-pinentry-fltk + --disable-pinentry-gtk2 + + MOC="$(qt5_get_bindir)"/moc + GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config + LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config + + $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm "${ED}"/usr/bin/pinentry || die + + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5 +} + +pkg_postinst() { + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} From 51578cabf823185cc1c31cedbc5c74e106b99d36 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:34:08 +0200 Subject: [PATCH 3/9] app-editors/nano: Sync with Gentoo It's from Gentoo commit 77ff03474aca79fbd510d686707bc98c051101d1. --- .../portage-stable/app-editors/nano/Manifest | 5 +- .../app-editors/nano/files/gentoo.nanorc-r1 | 98 ++++++++++++++++ .../app-editors/nano/metadata.xml | 46 ++++---- .../nano/{nano-5.9.ebuild => nano-6.4.ebuild} | 49 ++++++-- .../app-editors/nano/nano-7.1.ebuild | 111 ++++++++++++++++++ .../{nano-5.8-r2.ebuild => nano-7.2.ebuild} | 55 ++++++--- .../app-editors/nano/nano-9999.ebuild | 53 ++++++--- 7 files changed, 346 insertions(+), 71 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 rename sdk_container/src/third_party/portage-stable/app-editors/nano/{nano-5.9.ebuild => nano-6.4.ebuild} (65%) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.1.ebuild rename sdk_container/src/third_party/portage-stable/app-editors/nano/{nano-5.8-r2.ebuild => nano-7.2.ebuild} (61%) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest index 8b3194b5ca..3ae9428c36 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest @@ -1,2 +1,3 @@ -DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f -DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d +DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b +DIST nano-7.1.tar.xz 1605272 BLAKE2B cc606a04b34e723da01326d617b50f79711d0b35034b3e75f410fa7e277ba3eddbb1a408a80255533d2fa953f23fee745979363d5621b63a79bd89b29d8d528e SHA512 e3226df636d3ae1d94e2907ce8bbdb8de69eb45afd02fb1c83e275a1dcc288081809041adbfdade35a580bcb9f9632d21a45d764b43d22b3e4cfd87c7757c4e0 +DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 b/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 new file mode 100644 index 0000000000..b6b04800eb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 @@ -0,0 +1,98 @@ +## Syntax highlighting for Gentoo ebuilds/eclasses, +## and (further down) for Portage control files. + +syntax ebuild "\.e(build|class)$" +comment "#" + +linter bash -n + +## All the standard portage functions: +color brightgreen "(^|\" +color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>" +color brightgreen "\" +## Bash-related syntax: +color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>" +color green "\<(declare|eval|exec|export|let|local)\>" +color green "[][{}():;|`$<>!=&\]" +color green "-[defhnrsuwxzL]\>" +color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" + +## Variables... official portage ones in red, all others in bright red: +color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*" +color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" +color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>" +color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>" +color red "\<(T|TMPDIR|HOME)\>" +color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>" +color red "\" +color red "\" +color red "\<(PATCHES|(HTML_)?DOCS)\>" "\" "\" "\" "\" +color red "\" + +## Portage commands: +color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*" +color brightblue "\" +color brightblue "\" "\" +color brightblue "\" "\" "\" "\" +color brightblue "\" "\" +color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>" +color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>" +color brightblue "\" "\" +color brightblue "\" "\" +color brightblue "\<(doc|ins|exe)?into\>" "\" "\<(exe|ins|dir)opts\>" +color brightblue "\" +### common eclasses +color brightblue "\" +### flag-o-matic.eclass, toolchain-funcs.eclass +color brightblue "\<(all-flag-vars)\>" +color brightblue "\<(filter-(flags|lfs-flags|lto|mfpmath))\>" +color brightblue "\" +color brightblue "\" +color brightblue "\" "\" +color brightblue "\" +color brightblue "\<(append-atomic-flags|no-as-needed|raw-ldflags|append-libs|replace-sparc64-flags|get-flag|strip-unsupported-flags)\>" +color brightblue "\" +color brightblue "\" +color brightblue "\" +color brightblue "\" +color brightblue "\" +color brightblue "\<(clang|gcc)-(fullversion|(major-|minor|micro-)version)\>" +### debugging +color brightblue "\" + +## Common commands used in ebuilds: +color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>" +## Comments (doesn't work that well): +color yellow "(^|[[:space:]])#.*" +## Strings (doesn't work that well): +color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'" +## Trailing space is bad! +color ,green "[[:space:]]+$" +## Mixed whitespace is also bad. +color ,green " " + + +syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$" +comment "#" + +## Base text: +color green ".+" +## Likely version and slot numbers: +color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)" +color magenta ":[^[:space:]]+([[:space:]]|$)" +## Use flags (must come after version/slot): +color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+" +color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+" +## Accepted arches: +color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" +color white "[[:space:]][*~-]?\*" +## Categories: +color cyan "^[[:space:]]*[^/]*/" +## Masking regulators: +color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)" +## Comments: +color yellow "#.*" +## Trailing space is bad! +color ,green "[[:space:]]+$" +## Mixed whitespace is also bad. +color ,green " " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/metadata.xml b/sdk_container/src/third_party/portage-stable/app-editors/nano/metadata.xml index 6ec35ae205..f0ba3c2c58 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/metadata.xml @@ -1,11 +1,11 @@ - - polynomial-c@gentoo.org - Lars Wendler - - + + base-system@gentoo.org + Gentoo Base System + + GNU nano - an enhanced clone of the Pico text editor. The nano project was started because of a few "problems" with the @@ -21,22 +21,22 @@ require a command line flag. Yuck. nano aims to solve these problems by emulating the functionality of Pico as closely as possible while addressing the problems above and perhaps providing other extra functionality. - - - Enable justify/unjustify functions for text formatting. - - Enable debug messages and assert warnings. Note that these will all be sent - straight to stderr rather than some logging facility. - - - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting - - - Disable all fancy features, including ones that otherwise have a dedicated - USE flag (such as spelling). - - - Enable this if /bin and /usr/bin are separate directories - - + + + Enable justify/unjustify functions for text formatting. + + Enable debug messages and assert warnings. Note that these will all be sent + straight to stderr rather than some logging facility. + + + Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting + + + Disable all fancy features, including ones that otherwise have a dedicated + USE flag (such as spelling). + + + Enable this if /bin and /usr/bin are separate directories + + diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-5.9.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-6.4.ebuild similarity index 65% rename from sdk_container/src/third_party/portage-stable/app-editors/nano/nano-5.9.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/nano/nano-6.4.ebuild index 188b7842b1..e6c3f4ce90 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-5.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-6.4.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit git-r3 autotools + inherit autotools git-r3 else MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" -LICENSE="GPL-3" +LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" @@ -24,10 +25,13 @@ LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -39,14 +43,16 @@ REQUIRED_USE=" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - local myconf=( + + local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -60,12 +66,14 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - econf "${myconf[@]}" + + econf "${myconfargs[@]}" } src_install() { default - # don't use "${ED}" here or things break (#654534) + + # Don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -73,6 +81,7 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc + if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -84,7 +93,21 @@ src_install() { local rcdir="/usr/share/nano" mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die rmdir "${ED}"${rcdir}/extra || die + + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc fi use split-usr && dosym ../../bin/nano /usr/bin/nano } + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return + + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.1.ebuild new file mode 100644 index 0000000000..1cc0796fdf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" + inherit autotools git-r3 +else + MY_P="${PN}-${PV/_}" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" + +LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" +SLOT="0" +IUSE="debug justify magic minimal ncurses nls +spell static unicode" + +LIB_DEPEND=" + >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] + sys-libs/ncurses:=[static-libs(+)] + magic? ( sys-apps/file[static-libs(+)] ) + nls? ( virtual/libintl ) +" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +REQUIRED_USE=" + magic? ( !minimal ) +" + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + + local myconfargs=( + --bindir="${EPREFIX}"/bin + --htmldir=/trash + $(use_enable !minimal color) + $(use_enable !minimal multibuffer) + $(use_enable !minimal nanorc) + $(use_enable magic libmagic) + $(use_enable spell speller) + $(use_enable justify) + $(use_enable debug) + $(use_enable nls) + $(use_enable unicode utf8) + $(use_enable minimal tiny) + ) + + econf "${myconfargs[@]}" +} + +src_install() { + default + + # Don't use "${ED}" here or things break (#654534) + rm -r "${D}"/trash || die + + dodoc doc/sample.nanorc + docinto html + dodoc doc/faq.html + insinto /etc + newins doc/sample.nanorc nanorc + + if ! use minimal ; then + # Enable colorization by default. + sed -i \ + -e '/^# include /s:# *::' \ + "${ED}"/etc/nanorc || die + + # Since nano-5.0 these are no longer being "enabled" by default + # (bug #736848) + local rcdir="/usr/share/nano" + mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die + rmdir "${ED}"${rcdir}/extra || die + + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc + fi +} + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return + + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-5.8-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild similarity index 61% rename from sdk_container/src/third_party/portage-stable/app-editors/nano/nano-5.8-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild index 64cdf0ed0e..9c1f9193b9 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-5.8-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit git-r3 autotools + inherit autotools git-r3 else MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" -LICENSE="GPL-3" +LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell static unicode" LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -39,14 +43,16 @@ REQUIRED_USE=" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - local myconf=( + + local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -60,12 +66,14 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - econf "${myconf[@]}" + + econf "${myconfargs[@]}" } src_install() { default - # don't use "${ED}" here or things break (#654534) + + # Don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -73,6 +81,7 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc + if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -84,7 +93,19 @@ src_install() { local rcdir="/usr/share/nano" mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die rmdir "${ED}"${rcdir}/extra || die - fi - use split-usr && dosym ../../bin/nano /usr/bin/nano + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc + fi +} + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return + + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi } diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild index 188b7842b1..1cc0796fdf 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit git-r3 autotools + inherit autotools git-r3 else MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" -LICENSE="GPL-3" +LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell static unicode" LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -39,14 +43,16 @@ REQUIRED_USE=" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - local myconf=( + + local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -60,12 +66,14 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - econf "${myconf[@]}" + + econf "${myconfargs[@]}" } src_install() { default - # don't use "${ED}" here or things break (#654534) + + # Don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -73,6 +81,7 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc + if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -84,7 +93,19 @@ src_install() { local rcdir="/usr/share/nano" mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die rmdir "${ED}"${rcdir}/extra || die - fi - use split-usr && dosym ../../bin/nano /usr/bin/nano + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc + fi +} + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return + + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi } From 276c2643169fc3215e0b638f3bf5b6b97c187464 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:34:42 +0200 Subject: [PATCH 4/9] app-misc/c_rehash: Sync with Gentoo It's from Gentoo commit 118a9ac89b872bab2127bb9704ab81c2d1ff9347. --- .../portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild index 1aecc57e19..a1e262077a 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ S="${WORKDIR}" LICENSE="openssl" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="! Date: Thu, 4 May 2023 16:35:58 +0200 Subject: [PATCH 5/9] app-misc/editor-wrapper: Sync with Gentoo It's from Gentoo commit 2e20a1bb7a796a6fc35d7bf8a580e7ceb97f688d. --- .../app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild index 39f32a9835..295071bbb5 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S="${WORKDIR}" From 4630cf83f73ebe941914f9f5849bfcc82d440318 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:36:21 +0200 Subject: [PATCH 6/9] app-portage/elt-patches: Sync with Gentoo It's from Gentoo commit ef119c1cd4899004a2eaee36f831600cb7b74693. --- .../app-portage/elt-patches/elt-patches-20220831.ebuild | 4 ++-- .../app-portage/elt-patches/elt-patches-20221210.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild index 2e87d726f4..892c4ce4bd 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.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 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="sys-apps/gentoo-functions" BDEPEND="app-arch/xz-utils" diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild index e9ea9fdac8..892c4ce4bd 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.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 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="sys-apps/gentoo-functions" BDEPEND="app-arch/xz-utils" From 7f912c337645999c82d29c756b7a804c526f052e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 May 2023 16:36:40 +0200 Subject: [PATCH 7/9] app-text/manpager: Sync with Gentoo It's from Gentoo commit c2fcf05a5cae7570813bfa2891b10b100ad24a3b. --- .../portage-stable/app-text/manpager/manpager-1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild index 49301d4d54..feb8ab432d 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S=${WORKDIR} From c708687b8c8c2b3fd0b4b48a79356a2991023b0d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Mar 2023 10:45:59 +0100 Subject: [PATCH 8/9] .github: Add updated packages to the list --- .github/workflows/portage-stable-packages-list | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 953015be7f..249b0bc1b6 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -85,8 +85,11 @@ app-arch/zstd app-cdr/cdrtools app-crypt/adcli +app-crypt/libmd app-crypt/mit-krb5 +app-crypt/pinentry +app-editors/nano app-editors/vim app-editors/vim-core @@ -96,6 +99,10 @@ app-emulation/qemu-guest-agent app-eselect/eselect-iptables app-eselect/eselect-lua +app-misc/c_rehash +app-misc/editor-wrapper + +app-portage/elt-patches app-portage/portage-utils app-shells/bash-completion @@ -105,6 +112,7 @@ app-text/build-docbook-catalog app-text/docbook-xml-dtd app-text/docbook-xsl-ns-stylesheets app-text/docbook-xsl-stylesheets +app-text/manpager app-text/sgml-common dev-db/sqlite From 03b117022101aaf41311cb8b1e6fd6f8cbc8acad Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Mar 2023 10:42:18 +0100 Subject: [PATCH 9/9] changelog: Add an entry --- changelog/updates/2023-03-23-sys-packages-app-glob.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelog/updates/2023-03-23-sys-packages-app-glob.md diff --git a/changelog/updates/2023-03-23-sys-packages-app-glob.md b/changelog/updates/2023-03-23-sys-packages-app-glob.md new file mode 100644 index 0000000000..2d0ac9c89a --- /dev/null +++ b/changelog/updates/2023-03-23-sys-packages-app-glob.md @@ -0,0 +1,2 @@ +- pinentry ([1.2.1](https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=blob;f=NEWS;h=c080b34e57d01a6ccca9d2996d7096c42b1a3f84;hb=8ab1682e80a2b4185ee9ef66cbb44340245966fc)) +- SDK: nano ([7.2](https://git.savannah.gnu.org/cgit/nano.git/tree/NEWS?h=v7.2))