From 87bc674b74be4ebb69e749ab1d5e46c26ba71f94 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Mon, 21 Oct 2024 15:58:52 +0500 Subject: [PATCH 01/22] dev-python/python-olm: drop unused test dep It it used only by benchmarks, which we disable. Signed-off-by: Anna (cybertailor) Vyalkova --- dev-python/python-olm/python-olm-3.2.16.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev-python/python-olm/python-olm-3.2.16.ebuild b/dev-python/python-olm/python-olm-3.2.16.ebuild index 420a8a3ee5..537f9a9bf3 100644 --- a/dev-python/python-olm/python-olm-3.2.16.ebuild +++ b/dev-python/python-olm/python-olm-3.2.16.ebuild @@ -22,9 +22,6 @@ RDEPEND=" ${DEPEND} dev-python/cffi[${PYTHON_USEDEP}] " -BDEPEND=" - test? ( dev-python/aspectlib[${PYTHON_USEDEP}] ) -" EPYTEST_DESELECT=( # disable benchmarks From 7dd29944a22906d9c61ef62f2eaa35395fb32592 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 21 Oct 2024 20:22:47 +0800 Subject: [PATCH 02/22] sci-electronics/kactus2: add 3.13.3 Signed-off-by: Huang Rui --- sci-electronics/kactus2/Manifest | 1 + sci-electronics/kactus2/kactus2-3.13.3.ebuild | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 sci-electronics/kactus2/kactus2-3.13.3.ebuild diff --git a/sci-electronics/kactus2/Manifest b/sci-electronics/kactus2/Manifest index 97d16a6b94..22761882f8 100644 --- a/sci-electronics/kactus2/Manifest +++ b/sci-electronics/kactus2/Manifest @@ -1,3 +1,4 @@ DIST kactus2-3.12.0.tar.gz 28154387 BLAKE2B c8e0a982343d3a34f9186bca1778b68b4dfdcd977488751f90d9d5372df96c4f7349c90e15203f66778ee1be399e9e2ddb5342dffe1025754e44604c77c16684 SHA512 d7cef803314262c9fb0b77db88b5d7935203e1484965f475e954bceb1bc56a31ee9867fe1d73959d62a8454238480226df8fbd2d487442bce44fe7476de6d5bb DIST kactus2-3.13.0.tar.gz 28682844 BLAKE2B 2dc6d6b1ed18d95cce38179c0538c4697c8b2f0de0984fedf0a0b757a7c6c9268e91b9cb09a99c2cdd1913344e928b8d3d665da292d7c47ddf983f92d28142f8 SHA512 750a318fa543f4feaf8176bc9b9bcf244ac3f97d130b6dbe5483e68e7ac30b146c5d9362cdebb4129b62a1fec89a4f3bcfb97822e45930ad05a699ab1ad2f8f5 DIST kactus2-3.13.1.tar.gz 28686011 BLAKE2B 2abe1d7f6abcfb97f41e293476c200e3d9ba31e32e2b34022d7bbb3007cd2a2c129c73b1414cc422fc7dbc6982636edcd4ad0dc89aff8d352b2e936583d08291 SHA512 9465da2448d54ae3c19aaf5d765b386dd997244ac8385c8e3fddde74807c30e37bdef4d7b56d1610c1c59a1ad10c7c13fe312b53b6263800c9142be7be558049 +DIST kactus2-3.13.3.tar.gz 18195852 BLAKE2B 259e3753c088bbb6e91bf53c66fd32d52de9fe4d8c66452f866803c2560a16495c79ac74e3d47211a729dbcef0eedca9405000a09e6c94398cbf7f6c7d71e225 SHA512 902d43896e68f8f153c46a1f7945007dd24a22159093ca775976688c1dea37520d0d2b2a760cdec02f0684dbe90eec879dffde5f747bd9de178c14a6ce263330 diff --git a/sci-electronics/kactus2/kactus2-3.13.3.ebuild b/sci-electronics/kactus2/kactus2-3.13.3.ebuild new file mode 100644 index 0000000000..9c8aa88661 --- /dev/null +++ b/sci-electronics/kactus2/kactus2-3.13.3.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{10..13} ) +inherit python-r1 qmake-utils xdg + +DESCRIPTION="A open source IP-XACT-based tool" +HOMEPAGE=" + https://research.tuni.fi/system-on-chip/tools/ + https://github.com/kactus2/kactus2dev +" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git" +else + SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}dev-${PV}" +fi + +LICENSE="GPL-2" +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml] + dev-qt/qtsvg:6 +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + dev-lang/swig + dev-qt/qttools:6[linguist,qdoc] +" + +src_prepare() { + default + # Fix QA pre-stripped warnings, bug 781674 + find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die + # Fix bug 854081 + python_setup + sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die +} + +src_configure() { + default + # Fix bug 854075 + # Fix bug 854078 + eqmake6 Kactus2_Solution.pro +} + +src_compile() { + default + python_compile() { + cp -TR "${S}/" "${BUILD_DIR}/" || die + # Fix bug 854081 + python_setup + sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die + export PYTHON_C_FLAGS="$(python_get_CFLAGS)" + export PYTHON_LIBS="$(python_get_LIBS)" + pushd "PythonAPI" || die + eqmake6 PREFIX="$(python_get_library_path)" + emake + rm _pythonAPI.so || die + cp libPythonAPI.so.1.0.0 _pythonAPI.so || die + popd + } + python_foreach_impl run_in_build_dir python_compile +} + +src_install() { + # Can't use default, set INSTALL_ROOT and workaround parallel install bug + emake -j1 INSTALL_ROOT="${D}" install + python_install() { + pushd "PythonAPI" || die + python_domodule _pythonAPI.so + python_domodule pythonAPI.py + popd + } + python_foreach_impl run_in_build_dir python_install +} From 083b6fc697789985b7928b71af5f94f2629e3609 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 21 Oct 2024 20:23:14 +0800 Subject: [PATCH 03/22] sci-electronics/kactus2: enable py3.13 Signed-off-by: Huang Rui --- sci-electronics/kactus2/kactus2-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild index 72f44b10d5..51b253c9d6 100644 --- a/sci-electronics/kactus2/kactus2-9999.ebuild +++ b/sci-electronics/kactus2/kactus2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-r1 qmake-utils xdg DESCRIPTION="A open source IP-XACT-based tool" From 0d1939c861632aad215f0a2de512059e1ad8b9fe Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Mon, 21 Oct 2024 20:26:36 +0800 Subject: [PATCH 04/22] sci-electronics/kactus2: drop 3.12.0, 3.13.0, 3.13.1 - Drop old eclass and patches, fix 9999 ebuild Signed-off-by: Huang Rui --- sci-electronics/kactus2/Manifest | 3 - .../files/kactus2-3.12.0-fix-createhelp.patch | 94 -------------- ...s2-3.12.0-fix-missing-qsharedpointer.patch | 117 ------------------ .../kactus2-3.13.0-fix-missing-qobject.patch | 45 ------- sci-electronics/kactus2/kactus2-3.12.0.ebuild | 93 -------------- sci-electronics/kactus2/kactus2-3.13.0.ebuild | 92 -------------- sci-electronics/kactus2/kactus2-3.13.1.ebuild | 88 ------------- sci-electronics/kactus2/kactus2-9999.ebuild | 5 - 8 files changed, 537 deletions(-) delete mode 100644 sci-electronics/kactus2/files/kactus2-3.12.0-fix-createhelp.patch delete mode 100644 sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch delete mode 100644 sci-electronics/kactus2/files/kactus2-3.13.0-fix-missing-qobject.patch delete mode 100644 sci-electronics/kactus2/kactus2-3.12.0.ebuild delete mode 100644 sci-electronics/kactus2/kactus2-3.13.0.ebuild delete mode 100644 sci-electronics/kactus2/kactus2-3.13.1.ebuild diff --git a/sci-electronics/kactus2/Manifest b/sci-electronics/kactus2/Manifest index 22761882f8..fb64f02a50 100644 --- a/sci-electronics/kactus2/Manifest +++ b/sci-electronics/kactus2/Manifest @@ -1,4 +1 @@ -DIST kactus2-3.12.0.tar.gz 28154387 BLAKE2B c8e0a982343d3a34f9186bca1778b68b4dfdcd977488751f90d9d5372df96c4f7349c90e15203f66778ee1be399e9e2ddb5342dffe1025754e44604c77c16684 SHA512 d7cef803314262c9fb0b77db88b5d7935203e1484965f475e954bceb1bc56a31ee9867fe1d73959d62a8454238480226df8fbd2d487442bce44fe7476de6d5bb -DIST kactus2-3.13.0.tar.gz 28682844 BLAKE2B 2dc6d6b1ed18d95cce38179c0538c4697c8b2f0de0984fedf0a0b757a7c6c9268e91b9cb09a99c2cdd1913344e928b8d3d665da292d7c47ddf983f92d28142f8 SHA512 750a318fa543f4feaf8176bc9b9bcf244ac3f97d130b6dbe5483e68e7ac30b146c5d9362cdebb4129b62a1fec89a4f3bcfb97822e45930ad05a699ab1ad2f8f5 -DIST kactus2-3.13.1.tar.gz 28686011 BLAKE2B 2abe1d7f6abcfb97f41e293476c200e3d9ba31e32e2b34022d7bbb3007cd2a2c129c73b1414cc422fc7dbc6982636edcd4ad0dc89aff8d352b2e936583d08291 SHA512 9465da2448d54ae3c19aaf5d765b386dd997244ac8385c8e3fddde74807c30e37bdef4d7b56d1610c1c59a1ad10c7c13fe312b53b6263800c9142be7be558049 DIST kactus2-3.13.3.tar.gz 18195852 BLAKE2B 259e3753c088bbb6e91bf53c66fd32d52de9fe4d8c66452f866803c2560a16495c79ac74e3d47211a729dbcef0eedca9405000a09e6c94398cbf7f6c7d71e225 SHA512 902d43896e68f8f153c46a1f7945007dd24a22159093ca775976688c1dea37520d0d2b2a760cdec02f0684dbe90eec879dffde5f747bd9de178c14a6ce263330 diff --git a/sci-electronics/kactus2/files/kactus2-3.12.0-fix-createhelp.patch b/sci-electronics/kactus2/files/kactus2-3.12.0-fix-createhelp.patch deleted file mode 100644 index 41e4bfc268..0000000000 --- a/sci-electronics/kactus2/files/kactus2-3.12.0-fix-createhelp.patch +++ /dev/null @@ -1,94 +0,0 @@ -From d3e5af0dba523303708d30ceb8cd8339eabd4320 Mon Sep 17 00:00:00 2001 -From: Huang Rui -Date: Tue, 17 Oct 2023 19:11:21 +0800 -Subject: [PATCH] [CORRECTIVE] fix build PATH bugs about QT - -- Path variables need to be enclosed in double quotes to prevent - accidents caused by spaces in the middle. -- createhelp also needs to do the same processing as configure -- Fixed build issues under gentoo and archlinux - -Signed-off-by: Huang Rui ---- - configure | 15 ++++++++++----- - createhelp | 25 ++++++++++++++++++++++++- - 2 files changed, 34 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure -index 82c7b9060..f74a23ee2 100755 ---- a/configure -+++ b/configure -@@ -20,27 +20,32 @@ print_success() { - } - - # Auto search QTBIN_PATH when empty and qmake already installed. --if [ -z ${QTBIN_PATH} ]; then -+if [ -z "${QTBIN_PATH}" ]; then - if command -v qmake6 >/dev/null 2>&1; then - # Default to qmake6, which will exist on some linux distributions. -- QTBIN_PATH=$(qmake6 -query QT_INSTALL_BINS)/ -+ QTBIN_PATH="$(qmake6 -query QT_INSTALL_BINS)/" -+ QTLIBEXEC_PATH="$(qmake6 -query QT_INSTALL_LIBEXECS)/" - elif command -v qmake >/dev/null 2>&1; then - # qmake exists on the vast majority of linux distributions. -- QTBIN_PATH=$(qmake -query QT_INSTALL_BINS)/ -+ QTBIN_PATH="$(qmake -query QT_INSTALL_BINS)/" -+ QTLIBEXEC_PATH="$(qmake -query QT_INSTALL_LIBEXECS)/" - fi - fi - - # Generate compressed help files. - echo "Generating compressed help files..." - if command -v ${QTBIN_PATH}qhelpgenerator >/dev/null 2>&1; then -- ${QTBIN_PATH}qhelpgenerator Help/kactus2help.qhcp -o Help/Kactus2Help.qhc -+ "${QTBIN_PATH}qhelpgenerator" Help/kactus2help.qhcp -o Help/Kactus2Help.qhc -+elif command -v ${QTLIBEXEC_PATH}qhelpgenerator >/dev/null 2>&1; then -+ # QT6 put qhelpgenerator at QTLIBEXEC_PATH -+ "${QTLIBEXEC_PATH}qhelpgenerator" Help/kactus2help.qhcp -o Help/Kactus2Help.qhc - else - echo "Qhelpgenerator not found. Please set variable QTBIN_PATH to Qt binary files." - fi - - if command -v ${QTBIN_PATH}qmake >/dev/null 2>&1; then - echo "Running qmake..." -- ${QTBIN_PATH}qmake Kactus2_Solution.pro -+ "${QTBIN_PATH}qmake" Kactus2_Solution.pro - print_success - else - echo "Qmake not found. Please set variable QTBIN_PATH to Qt binary files." -diff --git a/createhelp b/createhelp -index 72299e655..522378331 100755 ---- a/createhelp -+++ b/createhelp -@@ -1,7 +1,30 @@ - #!/bin/sh - -+# Change this to your Qt binaries directory. -+QTBIN_PATH="" -+ -+# Auto search QTBIN_PATH when empty and qmake already installed. -+if [ -z "${QTBIN_PATH}" ]; then -+ if command -v qmake6 >/dev/null 2>&1; then -+ # Default to qmake6, which will exist on some linux distributions. -+ QTBIN_PATH="$(qmake6 -query QT_INSTALL_BINS)/" -+ QTLIBEXEC_PATH="$(qmake6 -query QT_INSTALL_LIBEXECS)/" -+ elif command -v qmake >/dev/null 2>&1; then -+ # qmake exists on the vast majority of linux distributions. -+ QTBIN_PATH="$(qmake -query QT_INSTALL_BINS)/" -+ QTLIBEXEC_PATH="$(qmake -query QT_INSTALL_LIBEXECS)/" -+ fi -+fi -+ - if [ ! -f Help/Kactus2Help.qch ] || [ ! -f Help/Kactus2Help.qhc ]; then -- qhelpgenerator Help/kactus2help.qhp -o Help/Kactus2Help.qch -+ if command -v ${QTBIN_PATH}qhelpgenerator >/dev/null 2>&1; then -+ "${QTBIN_PATH}qhelpgenerator" Help/kactus2help.qhp -o Help/Kactus2Help.qch -+ elif command -v ${QTLIBEXEC_PATH}qhelpgenerator >/dev/null 2>&1; then -+ # QT6 put qhelpgenerator at QTLIBEXEC_PATH -+ "${QTLIBEXEC_PATH}qhelpgenerator" Help/kactus2help.qhp -o Help/Kactus2Help.qch -+ else -+ echo "Qhelpgenerator not found. Please set variable QTBIN_PATH to Qt binary files." -+ fi - fi - - rm -R -f executable/Help diff --git a/sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch b/sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch deleted file mode 100644 index ff271885f0..0000000000 --- a/sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 1fd0d3cc8a3530a04491e736a673b9fc5092daeb Mon Sep 17 00:00:00 2001 -From: Huang Rui -Date: Fri, 20 Oct 2023 23:41:51 +0800 -Subject: [PATCH] [CORRECTIVE] add missing include to fix - QT6.6.0 build - -- add missing #include to fix incomplete type about QSharedPointer - -Closes: https://github.com/kactus2/kactus2dev/issues/85 -Signed-off-by: Huang Rui ---- - editors/HWDesign/undoCommands/HWComponentAddCommand.h | 5 +++-- - .../SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h | 3 ++- - .../SystemDesign/UndoCommands/ComConnectionDeleteCommand.h | 3 ++- - editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h | 3 ++- - .../SystemDesign/UndoCommands/SystemComponentDeleteCommand.h | 3 ++- - editors/SystemDesign/UndoCommands/SystemDeleteCommands.h | 3 ++- - 6 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/editors/HWDesign/undoCommands/HWComponentAddCommand.h b/editors/HWDesign/undoCommands/HWComponentAddCommand.h -index fe53209d6..c131ada50 100644 ---- a/editors/HWDesign/undoCommands/HWComponentAddCommand.h -+++ b/editors/HWDesign/undoCommands/HWComponentAddCommand.h -@@ -12,10 +12,11 @@ - #ifndef HWCOMPONENTADDCOMMAND_H - #define HWCOMPONENTADDCOMMAND_H - --#include - #include --#include - #include -+#include -+#include -+#include - - class IGraphicsItemStack; - class ComponentItem; -diff --git a/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h b/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h -index 02aaea2c1..7173b9dd9 100644 ---- a/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h -+++ b/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h -@@ -12,9 +12,10 @@ - #ifndef APICONNECTIONDELETECOMMAND_H - #define APICONNECTIONDELETECOMMAND_H - --#include - #include - #include -+#include -+#include - - class ApiGraphicsConnection; - -diff --git a/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h b/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h -index 5e86dbdf1..e0676b2ca 100644 ---- a/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h -+++ b/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h -@@ -12,9 +12,10 @@ - #ifndef COMCONNECTIONDELETECOMMAND_H - #define COMCONNECTIONDELETECOMMAND_H - --#include - #include - #include -+#include -+#include - - class ComGraphicsConnection; - -diff --git a/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h b/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h -index d05d3750d..72a1128fd 100644 ---- a/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h -+++ b/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h -@@ -12,9 +12,10 @@ - #ifndef SWINTERFACEDELETECOMMAND_H - #define SWINTERFACEDELETECOMMAND_H - --#include - #include - #include -+#include -+#include - - class IGraphicsItemStack; - class SWInterfaceItem; -diff --git a/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h b/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h -index 36abdda6f..ecfcef7db 100644 ---- a/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h -+++ b/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h -@@ -12,9 +12,10 @@ - #ifndef SYSTEMCOMPONENTDELETECOMMAND_H - #define SYSTEMCOMPONENTDELETECOMMAND_H - --#include - #include - #include -+#include -+#include - - class ComponentItem; - class IGraphicsItemStack; -diff --git a/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h b/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h -index 7eb0ed694..a3c1748e6 100644 ---- a/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h -+++ b/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h -@@ -12,9 +12,10 @@ - #ifndef SYSTEMDELETECOMMANDS_H - #define SYSTEMDELETECOMMANDS_H - --#include - #include - #include -+#include -+#include - - class GraphicsConnection; - class GraphicsColumnLayout; diff --git a/sci-electronics/kactus2/files/kactus2-3.13.0-fix-missing-qobject.patch b/sci-electronics/kactus2/files/kactus2-3.13.0-fix-missing-qobject.patch deleted file mode 100644 index 7b95029ad1..0000000000 --- a/sci-electronics/kactus2/files/kactus2-3.13.0-fix-missing-qobject.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d69c10931e17655f6d159e58a910a91c7fcd0a63 Mon Sep 17 00:00:00 2001 -From: Huang Rui -Date: Sat, 9 Dec 2023 12:34:01 +0800 -Subject: [PATCH] [CORRECTIVE] Fix incomplete QObject type in - FieldReferenceValidator - -- Added missing #include in FieldReferenceValidator.h -- Resolves compilation errors due to incomplete type 'QObject' used - in nested name specifier in various validator components - -Signed-off-by: Huang Rui ---- - IPXACTmodels/Component/validators/FieldReferenceValidator.h | 2 ++ - IPXACTmodels/Component/validators/MemoryArrayValidator.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/IPXACTmodels/Component/validators/FieldReferenceValidator.h b/IPXACTmodels/Component/validators/FieldReferenceValidator.h -index 0beea5845..4cfcbcb8b 100644 ---- a/IPXACTmodels/Component/validators/FieldReferenceValidator.h -+++ b/IPXACTmodels/Component/validators/FieldReferenceValidator.h -@@ -16,6 +16,8 @@ - - #include - -+#include -+ - namespace FieldReferenceValidator - { - /*! -diff --git a/IPXACTmodels/Component/validators/MemoryArrayValidator.h b/IPXACTmodels/Component/validators/MemoryArrayValidator.h -index b0f3e492f..c8ddc249e 100644 ---- a/IPXACTmodels/Component/validators/MemoryArrayValidator.h -+++ b/IPXACTmodels/Component/validators/MemoryArrayValidator.h -@@ -16,6 +16,8 @@ - - #include - -+#include -+ - class MemoryArray; - - class IPXACTMODELS_EXPORT MemoryArrayValidator --- -2.43.0 - diff --git a/sci-electronics/kactus2/kactus2-3.12.0.ebuild b/sci-electronics/kactus2/kactus2-3.12.0.ebuild deleted file mode 100644 index 72f44b10d5..0000000000 --- a/sci-electronics/kactus2/kactus2-3.12.0.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..12} ) -inherit python-r1 qmake-utils xdg - -DESCRIPTION="A open source IP-XACT-based tool" -HOMEPAGE=" - https://research.tuni.fi/system-on-chip/tools/ - https://github.com/kactus2/kactus2dev -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git" -else - SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}dev-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml] - dev-qt/qtsvg:6 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - dev-lang/swig - dev-qt/qttools:6[linguist,qdoc] -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.12.0-fix-createhelp.patch - "${FILESDIR}"/${PN}-3.12.0-fix-missing-qsharedpointer.patch -) - -src_prepare() { - default - # Fix QA pre-stripped warnings, bug 781674 - find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die - # Fix bug 854081 - python_setup - sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die -} - -src_configure() { - default - # Fix bug 854075 - # Fix bug 854078 - eqmake6 Kactus2_Solution.pro -} - -src_compile() { - default - python_compile() { - cp -TR "${S}/" "${BUILD_DIR}/" || die - # Fix bug 854081 - python_setup - sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die - export PYTHON_C_FLAGS="$(python_get_CFLAGS)" - export PYTHON_LIBS="$(python_get_LIBS)" - pushd "PythonAPI" || die - eqmake6 PREFIX="$(python_get_library_path)" - emake - rm _pythonAPI.so || die - cp libPythonAPI.so.1.0.0 _pythonAPI.so || die - popd - } - python_foreach_impl run_in_build_dir python_compile -} - -src_install() { - # Can't use default, set INSTALL_ROOT and workaround parallel install bug - emake -j1 INSTALL_ROOT="${D}" install - python_install() { - pushd "PythonAPI" || die - python_domodule _pythonAPI.so - python_domodule pythonAPI.py - popd - } - python_foreach_impl run_in_build_dir python_install -} diff --git a/sci-electronics/kactus2/kactus2-3.13.0.ebuild b/sci-electronics/kactus2/kactus2-3.13.0.ebuild deleted file mode 100644 index e7cb96ea7e..0000000000 --- a/sci-electronics/kactus2/kactus2-3.13.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..12} ) -inherit python-r1 qmake-utils xdg - -DESCRIPTION="A open source IP-XACT-based tool" -HOMEPAGE=" - https://research.tuni.fi/system-on-chip/tools/ - https://github.com/kactus2/kactus2dev -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git" -else - SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}dev-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml] - dev-qt/qtsvg:6 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - dev-lang/swig - dev-qt/qttools:6[linguist,qdoc] -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.13.0-fix-missing-qobject.patch -) - -src_prepare() { - default - # Fix QA pre-stripped warnings, bug 781674 - find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die - # Fix bug 854081 - python_setup - sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die -} - -src_configure() { - default - # Fix bug 854075 - # Fix bug 854078 - eqmake6 Kactus2_Solution.pro -} - -src_compile() { - default - python_compile() { - cp -TR "${S}/" "${BUILD_DIR}/" || die - # Fix bug 854081 - python_setup - sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die - export PYTHON_C_FLAGS="$(python_get_CFLAGS)" - export PYTHON_LIBS="$(python_get_LIBS)" - pushd "PythonAPI" || die - eqmake6 PREFIX="$(python_get_library_path)" - emake - rm _pythonAPI.so || die - cp libPythonAPI.so.1.0.0 _pythonAPI.so || die - popd - } - python_foreach_impl run_in_build_dir python_compile -} - -src_install() { - # Can't use default, set INSTALL_ROOT and workaround parallel install bug - emake -j1 INSTALL_ROOT="${D}" install - python_install() { - pushd "PythonAPI" || die - python_domodule _pythonAPI.so - python_domodule pythonAPI.py - popd - } - python_foreach_impl run_in_build_dir python_install -} diff --git a/sci-electronics/kactus2/kactus2-3.13.1.ebuild b/sci-electronics/kactus2/kactus2-3.13.1.ebuild deleted file mode 100644 index b542e40348..0000000000 --- a/sci-electronics/kactus2/kactus2-3.13.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..12} ) -inherit python-r1 qmake-utils xdg - -DESCRIPTION="A open source IP-XACT-based tool" -HOMEPAGE=" - https://research.tuni.fi/system-on-chip/tools/ - https://github.com/kactus2/kactus2dev -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git" -else - SRC_URI="https://github.com/${PN}/${PN}dev/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}dev-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - dev-qt/qtbase:6=[cups,gui,network,opengl,widgets,xml] - dev-qt/qtsvg:6 -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - dev-lang/swig - dev-qt/qttools:6[linguist,qdoc] -" - -src_prepare() { - default - # Fix QA pre-stripped warnings, bug 781674 - find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die - # Fix bug 854081 - python_setup - sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die -} - -src_configure() { - default - # Fix bug 854075 - # Fix bug 854078 - eqmake6 Kactus2_Solution.pro -} - -src_compile() { - default - python_compile() { - cp -TR "${S}/" "${BUILD_DIR}/" || die - # Fix bug 854081 - python_setup - sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die - export PYTHON_C_FLAGS="$(python_get_CFLAGS)" - export PYTHON_LIBS="$(python_get_LIBS)" - pushd "PythonAPI" || die - eqmake6 PREFIX="$(python_get_library_path)" - emake - rm _pythonAPI.so || die - cp libPythonAPI.so.1.0.0 _pythonAPI.so || die - popd - } - python_foreach_impl run_in_build_dir python_compile -} - -src_install() { - # Can't use default, set INSTALL_ROOT and workaround parallel install bug - emake -j1 INSTALL_ROOT="${D}" install - python_install() { - pushd "PythonAPI" || die - python_domodule _pythonAPI.so - python_domodule pythonAPI.py - popd - } - python_foreach_impl run_in_build_dir python_install -} diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild index 51b253c9d6..9c8aa88661 100644 --- a/sci-electronics/kactus2/kactus2-9999.ebuild +++ b/sci-electronics/kactus2/kactus2-9999.ebuild @@ -40,11 +40,6 @@ BDEPEND=" dev-qt/qttools:6[linguist,qdoc] " -PATCHES=( - "${FILESDIR}"/${PN}-3.12.0-fix-createhelp.patch - "${FILESDIR}"/${PN}-3.12.0-fix-missing-qsharedpointer.patch -) - src_prepare() { default # Fix QA pre-stripped warnings, bug 781674 From 1ccc4a9eb88ebca535d7051c30b4dad890002ecc Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 10:20:33 -0400 Subject: [PATCH 05/22] Revert "games-action/blackvoxel: Patched makefile" This reverts commit a31478be4496ecabc9d9f198f2561f0bc0cfdb9e. Signed-off-by: Abdelrahman Sarhan --- games-action/blackvoxel/blackvoxel-2.50.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild index bb7e7e7fb2..1dd07da48a 100644 --- a/games-action/blackvoxel/blackvoxel-2.50.ebuild +++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild @@ -27,7 +27,6 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch - "${FILESDIR}"/${P}-makeopts.patch "${FILESDIR}"/${P}-savedir.patch "${FILESDIR}"/${P}-strict-aliasing.patch ) From 8675d719ae7a728954378db812cff78da45d8afa Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 10:21:11 -0400 Subject: [PATCH 06/22] games-action/blackvoxel: Added patch Signed-off-by: Abdelrahman Sarhan --- games-action/blackvoxel/blackvoxel-2.50.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild index 1dd07da48a..bb7e7e7fb2 100644 --- a/games-action/blackvoxel/blackvoxel-2.50.ebuild +++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild @@ -27,6 +27,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-makeopts.patch "${FILESDIR}"/${P}-savedir.patch "${FILESDIR}"/${P}-strict-aliasing.patch ) From 78ee2cb9ca141b7713ff61d6fb03b9d8b3e9bef4 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 21 Oct 2024 23:21:52 +0900 Subject: [PATCH 07/22] net-im/kaidan: treeclean Signed-off-by: Takuya Wakazono --- net-im/kaidan/Manifest | 1 - net-im/kaidan/kaidan-0.9.1.ebuild | 65 ------------------------------- net-im/kaidan/metadata.xml | 10 ----- profiles/package.mask | 7 ---- profiles/updates/2Q-2021 | 1 - 5 files changed, 84 deletions(-) delete mode 100644 net-im/kaidan/Manifest delete mode 100644 net-im/kaidan/kaidan-0.9.1.ebuild delete mode 100644 net-im/kaidan/metadata.xml diff --git a/net-im/kaidan/Manifest b/net-im/kaidan/Manifest deleted file mode 100644 index b0b162e059..0000000000 --- a/net-im/kaidan/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kaidan-0.9.1.tar.xz 692464 BLAKE2B e99906afb03a27404ca456abda6d4b61e9b8010544f6ec267c8891d747386ecbe42c0642b48c7029fdee4923039292e224e0e3f09b23c8905ffe25681c4639f4 SHA512 256daeb94f4275377e1ef0919eb43660dd76064c414f1ac5570fac33632f853977997c52a504d5dace188f560feac93ea88ae1bb796e2bf6a96bafa4be387cbb diff --git a/net-im/kaidan/kaidan-0.9.1.ebuild b/net-im/kaidan/kaidan-0.9.1.ebuild deleted file mode 100644 index 70f10e542f..0000000000 --- a/net-im/kaidan/kaidan-0.9.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.67.0 -QTMIN=5.15.0 -inherit ecm - -DESCRIPTION="User-friendly and modern chat app for every device" -HOMEPAGE="https://www.kaidan.im" -SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" - -LICENSE="Apache-2.0 CC-BY-SA-4.0 GPL-3+ GPL-3-with-openssl-exception MIT" -SLOT="5" -KEYWORDS="~amd64" -IUSE="kde nls" - -DEPEND=" - >=dev-libs/kirigami-addons-0.7:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtlocation-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtpositioning-${QTMIN}:5[qml] - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - media-libs/kquickimageeditor:5 - media-libs/zxing-cpp:= - >=net-libs/qxmpp-1.5.0[omemo] - kde? ( >=kde-frameworks/knotifications-${KFMIN}:5 ) -" -RDEPEND="${DEPEND}" -BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DUSE_KNOTIFICATIONS=$(usex kde) - - # compile QML at build time - -DQUICK_COMPILER=ON - ) - ecm_src_configure -} - -src_test() { - local myctestargs=( - # needs network - -E PublicGroupChatTest - ) - ecm_src_test -} diff --git a/net-im/kaidan/metadata.xml b/net-im/kaidan/metadata.xml deleted file mode 100644 index a91bef8ae1..0000000000 --- a/net-im/kaidan/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - KDE/kaidan - https://invent.kde.org/network/kaidan/-/raw/master/NEWS - https://invent.kde.org/network/kaidan/issues - - - diff --git a/profiles/package.mask b/profiles/package.mask index 8dd8d2e43b..35a9ab2ebe 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -129,13 +129,6 @@ app-misc/tai app-admin/customrescuecd-x86 sys-boot/customrescuecd-x86-grub -# Takuya Wakazono (2024-09-21) -# Depends on media-libs/kquickimageeditor:5, which has been dropped -# from ::gentoo. Upstream has an open issue for Qt6, but it won't be -# ported anytime soon. -# Removal on 2024-10-21. -net-im/kaidan - # Julien Roy (2024-03-21) # sys-libs/libucontext is masked in ::gentoo sys-libs/gcompat diff --git a/profiles/updates/2Q-2021 b/profiles/updates/2Q-2021 index 99ad030579..ed1ec88fef 100644 --- a/profiles/updates/2Q-2021 +++ b/profiles/updates/2Q-2021 @@ -5,6 +5,5 @@ slotmove games-action/minecraft-launcher 2 0 slotmove games-action/minecraft-launcher 1 legacy move net-im/catgirl net-irc/catgirl move net-im/srain net-irc/srain -move kde-apps/kaidan net-im/kaidan move dev-python/geographiclib sci-geosciences/GeographicLib move x11-terms/terminus-bin x11-terms/tabby-bin From a854f1b7b93e9ec63d2da4d213d765a9569d120c Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 21 Oct 2024 23:21:52 +0900 Subject: [PATCH 08/22] gui-apps/paperde: fix BDEPEND and broken includes Closes: https://bugs.gentoo.org/860003 Signed-off-by: Takuya Wakazono --- .../paperde-0.1.1_p20210426-fix-deps.patch | 63 +++++++++++++++++++ .../paperde/paperde-0.1.1_p20210426.ebuild | 13 ++-- 2 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch diff --git a/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch b/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch new file mode 100644 index 0000000000..929ff75775 --- /dev/null +++ b/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch @@ -0,0 +1,63 @@ +Explicitly add missing Qt5Netowrk deps. +Fixes: +In file included from /var/tmp/portage/gui-apps/paperde-0.1.1_p20210426/work/paperde-15018307192107e2915671d412f3fc900ac5af4b/papershell/main.cpp:34: +/usr/include/cprime/capplication.h:39:10: fatal error: QLocalServer: No such file or directory + 39 | #include + | ^~~~~~~~~~~~~~ +--- a/papershell/CMakeLists.txt ++++ b/papershell/CMakeLists.txt +@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON ) + + find_package( Qt5Core REQUIRED ) + find_package( Qt5Gui REQUIRED ) ++find_package( Qt5Network REQUIRED ) + find_package( Qt5Widgets REQUIRED ) + find_package( Qt5DBus REQUIRED ) + find_package( dbusmenu-qt5 REQUIRED ) +@@ -121,7 +122,7 @@ set ( RESOURCES + add_executable( papershell ${SOURCES} ${HEADERS} ${UIS} ${RESOURCES} ) + target_link_libraries( + papershell +- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus # Qt5 Libs ++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::DBus # Qt5 Libs + dbusmenu-qt5 # DBusMenu Qt5 for tray menu + cprime-widgets cprime-gui cprime-core # CuboCore Libs + paperdegui paperdecore paperdewl # PaperDE Libs +--- a/sessionmanager/CMakeLists.txt ++++ b/sessionmanager/CMakeLists.txt +@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON ) + + find_package( Qt5Core REQUIRED ) + find_package( Qt5DBus REQUIRED ) ++find_package( Qt5Network REQUIRED ) + + set( HEADERS + sessionmgr.h +@@ -38,7 +39,7 @@ set( SOURCES + ) + + add_executable( papersessionmanager ${SOURCES} ${HEADERS} ) +-target_link_libraries( papersessionmanager Qt5::Core Qt5::DBus cprime-core csys paperdecore ) ++target_link_libraries( papersessionmanager Qt5::Core Qt5::DBus Qt5::Network cprime-core csys paperdecore ) + + install( TARGETS papersessionmanager DESTINATION bin ) + install( FILES paperdesktop.desktop DESTINATION share/wayland-sessions/ ) +--- a/settings/CMakeLists.txt ++++ b/settings/CMakeLists.txt +@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON ) + + find_package( Qt5Core REQUIRED ) + find_package( Qt5Gui REQUIRED ) ++find_package( Qt5Network REQUIRED ) + find_package( Qt5Widgets REQUIRED ) + find_package( Qt5UiTools REQUIRED ) + +@@ -50,7 +51,7 @@ set ( RESOURCES + add_executable( papersettings ${SOURCES} ${HEADERS} ${UIS} ${RESOURCES} ) + target_link_libraries( + papersettings +- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::UiTools ++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::UiTools + cprime-widgets cprime-core + paperdegui paperdecore paperdewl + ) diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild index 612f3e01a2..498832fd3b 100644 --- a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild +++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg @@ -22,6 +22,7 @@ LICENSE="GPL-3" SLOT="0" BDEPEND=" + dev-qt/qtwaylandscanner:5 kde-frameworks/extra-cmake-modules " DEPEND=" @@ -30,6 +31,7 @@ DEPEND=" dev-libs/wayland-protocols dev-qt/designer:5 dev-qt/qtcore:5 + dev-qt/qtdbus:5 dev-qt/qtgui:5[wayland,X] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 @@ -45,10 +47,9 @@ RDEPEND=" x11-misc/qt5ct " -src_prepare() { - cmake_src_prepare - xdg_src_prepare -} +PATCHES=( + "${FILESDIR}/${P}-fix-deps.patch" +) src_configure() { local mycmakeargs=( From 5b24cdb22c1d6d5b459779c3676df4a26f70d5a0 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 21 Oct 2024 23:21:52 +0900 Subject: [PATCH 09/22] gui-apps/paperde: drop 9999 This is severely outdated and does not build. Signed-off-by: Takuya Wakazono --- gui-apps/paperde/paperde-9999.ebuild | 60 ---------------------------- 1 file changed, 60 deletions(-) delete mode 100644 gui-apps/paperde/paperde-9999.ebuild diff --git a/gui-apps/paperde/paperde-9999.ebuild b/gui-apps/paperde/paperde-9999.ebuild deleted file mode 100644 index 7df837787e..0000000000 --- a/gui-apps/paperde/paperde-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" -HOMEPAGE="https://gitlab.com/cubocore/paper/paperde" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git" -else - # _alpha -> -alpha - MY_PV="${PV/_/-}" - SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}-v${MY_PV}" -fi - -LICENSE="GPL-3" -SLOT="0" - -BDEPEND=" - kde-frameworks/extra-cmake-modules -" -DEPEND=" - dev-libs/libdbusmenu-qt - dev-libs/wayland - dev-libs/wayland-protocols - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[wayland,X] - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5[X] - gui-libs/libcprime - gui-libs/libcsys -" -RDEPEND=" - ${DEPEND} - gui-libs/wlroots - gui-wm/wayfire[X] - sys-apps/xdg-desktop-portal - x11-misc/qt5ct -" - -src_prepare() { - cmake_src_prepare - xdg_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde" - -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde" - ) - cmake_src_configure -} From e099b6c7c14663020698fbc39c617239ed37ca6e Mon Sep 17 00:00:00 2001 From: Ivan Lloro Date: Mon, 21 Oct 2024 17:18:07 +0200 Subject: [PATCH 10/22] dev-python/mpxj: Version update Signed-off-by: Ivan Lloro --- dev-python/mpxj/Manifest | 2 +- dev-python/mpxj/{mpxj-13.3.0.ebuild => mpxj-13.5.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev-python/mpxj/{mpxj-13.3.0.ebuild => mpxj-13.5.0.ebuild} (100%) diff --git a/dev-python/mpxj/Manifest b/dev-python/mpxj/Manifest index e120425036..6feebfec76 100644 --- a/dev-python/mpxj/Manifest +++ b/dev-python/mpxj/Manifest @@ -1 +1 @@ -DIST mpxj-13.3.0-py3-none-any.whl 26155845 BLAKE2B 641216f2306808a5ca70a6304101091de1b8c257fca78d1cc7fcc9186b42d2bf2107094791ab765e3034358cb23e1b72973c4f0aeceb51dce7b7e32a48fa17f7 SHA512 4763cd2fc34fccfc9a1af068e0f9fa49c61055b9049a60178a0ef3b5c4320f15b7f2a791ea4dc5e47296c52a715a61ea97574b8f15a6ddde9676ec3474bcf795 +DIST mpxj-13.5.0-py3-none-any.whl 26172447 BLAKE2B 4e7b5b482972197dba717a06320a5bf2c4ab4ebe89ed29b1b9fd83724af71b4e3dbe49c19050099d7273d8d4d8fcfb5d361f7d2d5cd5e01c60720b416f628949 SHA512 dd423cd45d92a1275b5cd89d81d3f61349238065d17ce507e5e52b8eb507542e195d0d73f5b48964b0300874481184785cb7c403c614c22f429d61d3a8df7ed3 diff --git a/dev-python/mpxj/mpxj-13.3.0.ebuild b/dev-python/mpxj/mpxj-13.5.0.ebuild similarity index 100% rename from dev-python/mpxj/mpxj-13.3.0.ebuild rename to dev-python/mpxj/mpxj-13.5.0.ebuild From 9511ecb61def8583b4ecf91b4ef33956dd0b19e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= Date: Mon, 21 Oct 2024 16:41:37 +0100 Subject: [PATCH 11/22] x11-drivers/xf86-input-xppen: add missing RDEPENDs * improve ebuild in some areas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/941930 Signed-off-by: Gonçalo Negrier Duarte --- ...3.4.9.ebuild => xf86-input-xppen-3.4.9-r1.ebuild} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) rename x11-drivers/xf86-input-xppen/{xf86-input-xppen-3.4.9.ebuild => xf86-input-xppen-3.4.9-r1.ebuild} (88%) diff --git a/x11-drivers/xf86-input-xppen/xf86-input-xppen-3.4.9.ebuild b/x11-drivers/xf86-input-xppen/xf86-input-xppen-3.4.9-r1.ebuild similarity index 88% rename from x11-drivers/xf86-input-xppen/xf86-input-xppen-3.4.9.ebuild rename to x11-drivers/xf86-input-xppen/xf86-input-xppen-3.4.9-r1.ebuild index 7dba6e4535..6741e4723f 100644 --- a/x11-drivers/xf86-input-xppen/xf86-input-xppen-3.4.9.ebuild +++ b/x11-drivers/xf86-input-xppen/xf86-input-xppen-3.4.9-r1.ebuild @@ -3,8 +3,8 @@ EAPI=8 -#240607 - +# This date info can be find in the download page of the driver +# You can use any tablet page since the driver is the same to all M_PV=3.4.9 P_YEAR=24 P_MONTH=06 @@ -35,6 +35,8 @@ RDEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-libs/icu + dev-libs/libusb + x11-libs/libxcb virtual/libudev:=" DEPEND="${RDEPEND}" @@ -64,12 +66,12 @@ src_install() { # Remove pre-compiled libaries (use system ones) # Might be reverted if system ones dont work - rm -r "${S}/App/usr/lib/pentablet/lib" "${S}/App/usr/lib/pentablet/platform" - rm "${S}/App/usr/lib/pentablet/PenTablet.sh" + rm -r "${S}/App/usr/lib/pentablet/lib" "${S}/App/usr/lib/pentablet/platforms" || die + rm "${S}/App/usr/lib/pentablet/PenTablet.sh" || die # Install Application folder dodir "${app_root%/*}" - cp -r "${S}/App/usr/lib/pentablet/" "${app_dest}" + cp -r "${S}/App/usr/lib/pentablet/" "${app_dest}" || die # Install udev rule udev_dorules "${S}/App/lib/udev/rules.d/10-xp-pen.rules" From 37432fa0182129180bd122f31b85df320b5fa7d7 Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 18:06:21 -0400 Subject: [PATCH 12/22] games-action/blackvoxel:-Werror=strict-aliasing & makeopts patch fix Closes: https://bugs.gentoo.org/862780 Signed-off-by: Abdelrahman Sarhan --- games-action/blackvoxel/blackvoxel-2.50.ebuild | 2 +- ...ing.patch => blackvoxel-2.50-backported-ltofix.patch} | 0 .../blackvoxel/files/blackvoxel-2.50-makeopts.patch | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename games-action/blackvoxel/files/{blackvoxel-2.50-strict-aliasing.patch => blackvoxel-2.50-backported-ltofix.patch} (100%) diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild b/games-action/blackvoxel/blackvoxel-2.50.ebuild index bb7e7e7fb2..16a1521934 100644 --- a/games-action/blackvoxel/blackvoxel-2.50.ebuild +++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild @@ -29,7 +29,7 @@ PATCHES=( "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-makeopts.patch "${FILESDIR}"/${P}-savedir.patch - "${FILESDIR}"/${P}-strict-aliasing.patch + "${FILESDIR}"/${P}-backported-ltofix.patch #For ver. 2.50 Remove for next ver. ) src_compile() { diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-strict-aliasing.patch b/games-action/blackvoxel/files/blackvoxel-2.50-backported-ltofix.patch similarity index 100% rename from games-action/blackvoxel/files/blackvoxel-2.50-strict-aliasing.patch rename to games-action/blackvoxel/files/blackvoxel-2.50-backported-ltofix.patch diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch b/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch index 05a14881c2..078d3ce642 100644 --- a/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch +++ b/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch @@ -1,14 +1,15 @@ ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,9 @@ +--- a/Makefile 2024-10-21 17:33:29.782931946 -0400 ++++ b/Makefile 2024-10-21 17:35:55.202026636 -0400 +@@ -64,8 +64,10 @@ KERNELNAME =$(shell uname -s) ifeq ($(KERNELNAME),Linux) - CXXFLAGS+= -O3 -c -fmessage-length=0 +- LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib + UCXXFLAGS:= $(shell emerge --info | grep -w CXXFLAGS=".*" | cut -d '"' -f2) + CXXFLAGS+= $(UCXXFLAGS) -c -fmessage-length=0 + ULDFLAGS:= $(shell emerge --info | grep -w LDFLAGS=".*" | cut -d '"' -f2) + LDFLAGS+= $(ULDFLAGS) -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib -- LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib else ifeq ($(KERNELNAME), FreeBSD) # To be done... + CXXFLAGS+= -O3 -c -fmessage-length=0 From 9509ee4372b9fb25e5e1b6496417526beea18d0a Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 18:28:41 -0400 Subject: [PATCH 13/22] games-action/blackvoxel: update Manifest Signed-off-by: Abdelrahman Sarhan --- games-action/blackvoxel/Manifest | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest index 71958ecdbe..35cacd10fb 100644 --- a/games-action/blackvoxel/Manifest +++ b/games-action/blackvoxel/Manifest @@ -1 +1,8 @@ +AUX blackvoxel-2.50-backported-ltofix.patch 633 BLAKE2B ef49a7e3312f07e378394430bd7e223d71bc0f0369aece7ff58b8c4bc6bfcaf43df8d730394cc0e518303eb852f4d5ea0190e65f835ed5f4ad266b4739bde859 SHA512 5cdb7947f0304518da4cd945406233844fb2f2af78afc278452455588aebff2cfc789837d0ecc24d67eb7fea8c16f17d5b5c15fca025a0f16129fce82a1d25b9 +AUX blackvoxel-2.50-makefile.patch 4450 BLAKE2B e541c45640209b14c3c2fe94e1d6a4beee13c90afeffda9289046005ff26f9f81dfa9021b7661f2ceb207ba26059674ccd109ef3a65b342c81f0668c5bf9a982 SHA512 9728a3794c71fb368f89a81c135cf8bd7c2217db0d67adb8e4c2b0b0147fce6ae68cc81692334e5d27fcea62ef033e336ea158028d7a291d59d6bb184e8887f7 +AUX blackvoxel-2.50-makeopts.patch 724 BLAKE2B aa32baea0b56a38546703755c34913c69b2406f596139738f3994a64f876d9736dc350118584c8ecfcc7a7072142032348a4af5dc03f2ff6d383d46722259103 SHA512 353bd0af1c8d2e48d40d13cd3ec1fa60793c893a3a23733005660b710b21749a07656a3cd5f5b7d39a395d0585aca1a16ef442801a2ae8bed6859c850dbbcc3d +AUX blackvoxel-2.50-savedir.patch 998 BLAKE2B 1783071acc5f6e5923488646cc8d6c1c59f5c14966e0f1a3585643a03200570af130ded334338c5a5ec56fe45c44fe888b2c73467497da9d7f72b5384d11d51a SHA512 c882b7f9682ae3bfd6367cf20b55434b1630c594ea1cd159795a6081ecd5f531426a7f10b29da09e80234e4c7967a294fe4c50a0981a4cc7cfee22322e284f5d DIST blackvoxel-2.50.tar.bz2 20766720 BLAKE2B 879b1cadeec85f6a38cfeca422c416bed844907dc45757cd66669fe9a2d78628cc07db14571e2c4afa3236cc3e69e86b36f48814c2dfb2b0d9698255949fd4cf SHA512 76b22288f280360926110f0d09a778246970f94a466447f892574057aabe1c068854c2e1131baa3f9b5a0edf183679717eb4794af42672701146b185b610332c +EBUILD blackvoxel-2.50.ebuild 1206 BLAKE2B c618ddc4c033abc2000d6f5a2028ce6faac1e4968df6dc661fb555adbfbe92f2f1e6c2930a76d0f521da060b8e3bf1660b9af617133aba8f138c4ba670cfdf36 SHA512 c36dc858388e9f3a7c68f103af0f8346e0435a74ef67ca6386bd422c7409769996407382f85f39fa2fe1b0834aa62a92a7f87ad13b4731d87a26228af706bb6b +EBUILD blackvoxel-9999.ebuild 1384 BLAKE2B 16ae46db1234d43fcbfdc38d4019930de5ad55ab5d079e0db8b4b1521138d594b0bb5afbabae83a81cb9c0c9f4c70f7f43cd9590747fe0a45c9557517ab15bfd SHA512 bc03319ee3d2f277c7a3bc337d3eef7f5180edc4db026a151bc09762f3637b4ebe64debee5b1e6d2f201952f55553ebb00469be1b7628531cbf506de6603ce65 +MISC metadata.xml 246 BLAKE2B ca228a3cf1b8a3048b8ce2151a2589315f5389e40845623590293093951f4c715be95fc8ee1338cc439ff52467363a746534762827859019796c438739b5d235 SHA512 03b7026500bbcef8d8d1c6361e24eebf85a3a95a85667afb0e3414e47aff3264fe33d868921731bfd4b50ab13e309988541104439b39e963c27b09ceb3cdbcd2 From 00ce0389c33ac4d93fe0036f350ad34acb7aff90 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Tue, 22 Oct 2024 03:28:59 +0500 Subject: [PATCH 14/22] dev-nim/nimbus: update SRC_URI Switch to snapshots from sr.ht because cgit archives are not reliable. Closes: https://bugs.gentoo.org/935350 Signed-off-by: Anna (cybertailor) Vyalkova --- dev-nim/nimbus/Manifest | 2 +- dev-nim/nimbus/nimbus-1.1.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-nim/nimbus/Manifest b/dev-nim/nimbus/Manifest index 9334047811..d42b88db48 100644 --- a/dev-nim/nimbus/Manifest +++ b/dev-nim/nimbus/Manifest @@ -1 +1 @@ -DIST nimbus-1.1.3.tar.xz 28336 BLAKE2B 86ed5129de463748de56438a65ba003416920968ceb92fecadc94895040d09a5901bedd650143f29d3c27d310872ccffb7a5731e9775210774179c7f86306752 SHA512 8416473df6b16ee76a8c9ca6be78f268f4d4c6f575e2479c92374fc260d502aaad82abd74bc6a89b1e8c5bbe42d22ac43081ac732437787ad530a6fb0a7216af +DIST nimbus-1.1.3.srht.tar.gz 32459 BLAKE2B e7de2627699631a9c991ee7a43219b2f1e09c3c6ea7ca76ace8eccf80b193f13a61498bd459c7a0168b1d48d23c8fa9e4a522abd848529919ac6b1b60f6c51ba SHA512 c84bde0538d65106542a351a6c19429dd6cf5c226edddfdb5423e018877a375257ef5897d1766a9c65a9e80984499af084e3aa42b71edc95ec296ee4412814ae diff --git a/dev-nim/nimbus/nimbus-1.1.3.ebuild b/dev-nim/nimbus/nimbus-1.1.3.ebuild index 75bbe66a0c..966088aea1 100644 --- a/dev-nim/nimbus/nimbus-1.1.3.ebuild +++ b/dev-nim/nimbus/nimbus-1.1.3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=" https://nimbus.sysrq.in/ https://git.sysrq.in/nimbus/about/ " -SRC_URI="https://git.sysrq.in/${PN}/snapshot/${P}.tar.xz" +SRC_URI="https://git.sr.ht/~cyber/${PN}/archive/${PV}.tar.gz -> ${P}.srht.tar.gz" LICENSE="Apache-2.0 BSD" SLOT="0" From 13220c67ab8fe3a4740c1fb9b3c8d52d5ee36edb Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 18:36:17 -0400 Subject: [PATCH 15/22] games-action/blackvoxel: update Manifest Signed-off-by: Abdelrahman Sarhan --- games-action/blackvoxel/Manifest | 7 ------- 1 file changed, 7 deletions(-) diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest index 35cacd10fb..71958ecdbe 100644 --- a/games-action/blackvoxel/Manifest +++ b/games-action/blackvoxel/Manifest @@ -1,8 +1 @@ -AUX blackvoxel-2.50-backported-ltofix.patch 633 BLAKE2B ef49a7e3312f07e378394430bd7e223d71bc0f0369aece7ff58b8c4bc6bfcaf43df8d730394cc0e518303eb852f4d5ea0190e65f835ed5f4ad266b4739bde859 SHA512 5cdb7947f0304518da4cd945406233844fb2f2af78afc278452455588aebff2cfc789837d0ecc24d67eb7fea8c16f17d5b5c15fca025a0f16129fce82a1d25b9 -AUX blackvoxel-2.50-makefile.patch 4450 BLAKE2B e541c45640209b14c3c2fe94e1d6a4beee13c90afeffda9289046005ff26f9f81dfa9021b7661f2ceb207ba26059674ccd109ef3a65b342c81f0668c5bf9a982 SHA512 9728a3794c71fb368f89a81c135cf8bd7c2217db0d67adb8e4c2b0b0147fce6ae68cc81692334e5d27fcea62ef033e336ea158028d7a291d59d6bb184e8887f7 -AUX blackvoxel-2.50-makeopts.patch 724 BLAKE2B aa32baea0b56a38546703755c34913c69b2406f596139738f3994a64f876d9736dc350118584c8ecfcc7a7072142032348a4af5dc03f2ff6d383d46722259103 SHA512 353bd0af1c8d2e48d40d13cd3ec1fa60793c893a3a23733005660b710b21749a07656a3cd5f5b7d39a395d0585aca1a16ef442801a2ae8bed6859c850dbbcc3d -AUX blackvoxel-2.50-savedir.patch 998 BLAKE2B 1783071acc5f6e5923488646cc8d6c1c59f5c14966e0f1a3585643a03200570af130ded334338c5a5ec56fe45c44fe888b2c73467497da9d7f72b5384d11d51a SHA512 c882b7f9682ae3bfd6367cf20b55434b1630c594ea1cd159795a6081ecd5f531426a7f10b29da09e80234e4c7967a294fe4c50a0981a4cc7cfee22322e284f5d DIST blackvoxel-2.50.tar.bz2 20766720 BLAKE2B 879b1cadeec85f6a38cfeca422c416bed844907dc45757cd66669fe9a2d78628cc07db14571e2c4afa3236cc3e69e86b36f48814c2dfb2b0d9698255949fd4cf SHA512 76b22288f280360926110f0d09a778246970f94a466447f892574057aabe1c068854c2e1131baa3f9b5a0edf183679717eb4794af42672701146b185b610332c -EBUILD blackvoxel-2.50.ebuild 1206 BLAKE2B c618ddc4c033abc2000d6f5a2028ce6faac1e4968df6dc661fb555adbfbe92f2f1e6c2930a76d0f521da060b8e3bf1660b9af617133aba8f138c4ba670cfdf36 SHA512 c36dc858388e9f3a7c68f103af0f8346e0435a74ef67ca6386bd422c7409769996407382f85f39fa2fe1b0834aa62a92a7f87ad13b4731d87a26228af706bb6b -EBUILD blackvoxel-9999.ebuild 1384 BLAKE2B 16ae46db1234d43fcbfdc38d4019930de5ad55ab5d079e0db8b4b1521138d594b0bb5afbabae83a81cb9c0c9f4c70f7f43cd9590747fe0a45c9557517ab15bfd SHA512 bc03319ee3d2f277c7a3bc337d3eef7f5180edc4db026a151bc09762f3637b4ebe64debee5b1e6d2f201952f55553ebb00469be1b7628531cbf506de6603ce65 -MISC metadata.xml 246 BLAKE2B ca228a3cf1b8a3048b8ce2151a2589315f5389e40845623590293093951f4c715be95fc8ee1338cc439ff52467363a746534762827859019796c438739b5d235 SHA512 03b7026500bbcef8d8d1c6361e24eebf85a3a95a85667afb0e3414e47aff3264fe33d868921731bfd4b50ab13e309988541104439b39e963c27b09ceb3cdbcd2 From 2aee9b2b00201ad5cd25b44e803e1d93c63c86ed Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 19:40:28 -0400 Subject: [PATCH 16/22] games-fps/crispy-doom: Fixed configure.ac overwriting CFLAGS and LDFLAGS Signed-off-by: Abdelrahman Sarhan --- games-fps/crispy-doom/crispy-doom-5.12.0.ebuild | 4 ++++ games-fps/crispy-doom/crispy-doom-6.0.ebuild | 4 ++++ .../files/crispy-doom-5.12.0-makeopts.patch | 15 +++++++++++++++ .../files/crispy-doom-6.0-makeopts.patch | 15 +++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch create mode 100644 games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch diff --git a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild index 60823967d7..61c3883e02 100644 --- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild +++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild @@ -50,6 +50,10 @@ src_prepare() { eautoreconf } +PATCHES=( + "${FILESDIR}"/${P}-makeopts.patch +) + src_configure() { econf \ --enable-bash-completion \ diff --git a/games-fps/crispy-doom/crispy-doom-6.0.ebuild b/games-fps/crispy-doom/crispy-doom-6.0.ebuild index f4dfd01919..ede240fb3d 100644 --- a/games-fps/crispy-doom/crispy-doom-6.0.ebuild +++ b/games-fps/crispy-doom/crispy-doom-6.0.ebuild @@ -43,6 +43,10 @@ DOCS=( "README.Strife.md" ) +PATCHES=( + "${FILESDIR}"/"${P}"-makeopts.patch +) + src_prepare() { default diff --git a/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch b/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch new file mode 100644 index 0000000000..876ab18981 --- /dev/null +++ b/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch @@ -0,0 +1,15 @@ +--- a/configure.ac 2024-10-21 18:54:07.483980753 -0400 ++++ b/configure.ac 2024-10-21 18:54:52.224330577 -0400 +@@ -166,8 +166,10 @@ + + # TODO: We currently link everything against libraries that don't need it. + # Use the specific library CFLAGS/LIBS variables instead of setting them here. +-CFLAGS="$CFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${LIBZ_CFLAGS:-}" +-LDFLAGS="$LDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${LIBZ_LIBS:-}" ++UCFLAGS:=$(shell emerge --info | grep CFLAGS=".*" | cut -d'"' -f2) ++ULDFLAGS:=$(shell emerge --info | grep LDFLAGS=".*" | cut -d'"' -f2) ++CFLAGS+="$UCFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${LIBZ_CFLAGS:-}" ++LDFLAGS+="$ULDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${LIBZ_LIBS:-}" + case "$host" in + *-*-mingw* | *-*-cygwin* | *-*-msvc* ) + LDFLAGS="$LDFLAGS -lwinmm" diff --git a/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch b/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch new file mode 100644 index 0000000000..4e4d72d3fc --- /dev/null +++ b/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch @@ -0,0 +1,15 @@ +--- a/configure.ac 2023-03-31 16:42:24.000000000 -0400 ++++ b/configure.ac 2024-10-21 19:11:20.577093421 -0400 +@@ -184,8 +184,10 @@ + + # TODO: We currently link everything against libraries that don't need it. + # Use the specific library CFLAGS/LIBS variables instead of setting them here. +-CFLAGS="$CFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${FLUIDSYNTH_CFLAGS:-} ${LIBZ_CFLAGS:-}" +-LDFLAGS="$LDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${FLUIDSYNTH_LIBS:-} ${LIBZ_LIBS:-}" ++UCFLAGS:=$(shell emerge --info | grep CFLAGS=".*" | cut -d'"' -f2) ++ULDFLAGS:=$(shell emerge --info | grep LDFLAGS=".*" | cut -d'"' -f2) ++CFLAGS+="$UCFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${LIBZ_CFLAGS:-}" ++LDFLAGS+="$ULDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${LIBZ_LIBS:-}" + case "$host" in + *-*-mingw* | *-*-cygwin* | *-*-msvc* ) + LDFLAGS="$LDFLAGS -lwinmm" From 032de1d69e9e92dc40945a3289926dd5caa263d4 Mon Sep 17 00:00:00 2001 From: Abdelrahman Sarhan Date: Mon, 21 Oct 2024 20:10:30 -0400 Subject: [PATCH 17/22] games-puzzle/blockout: Fixed formatting. Signed-off-by: Abdelrahman Sarhan --- games-puzzle/blockout/blockout-2.5.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/games-puzzle/blockout/blockout-2.5.ebuild b/games-puzzle/blockout/blockout-2.5.ebuild index 4b8657a697..f904cdac13 100644 --- a/games-puzzle/blockout/blockout-2.5.ebuild +++ b/games-puzzle/blockout/blockout-2.5.ebuild @@ -27,14 +27,15 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/blockout-2.5-blockout-makefile.patch" - "${FILESDIR}/blockout-2.5-image-makefile.patch" - "${FILESDIR}/blockout-2.5-datadir.patch" + "${FILESDIR}/${P}-blockout-makefile.patch" + "${FILESDIR}/${P}-image-makefile.patch" + "${FILESDIR}/${P}-datadir.patch" ) src_prepare() { default } + src_compile() { GAME_DATADIR="/usr/share/${PN}" emake -C ImageLib/src From 3a5cf790f94dfba5fcadea5fc96b0d461a9eccde Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Tue, 22 Oct 2024 09:29:23 +0900 Subject: [PATCH 18/22] dev-util/rye: add 0.42.0, drop 0.41.0 Signed-off-by: Daichi Yamamoto --- dev-util/rye/Manifest | 2 +- dev-util/rye/{rye-0.41.0.ebuild => rye-0.42.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev-util/rye/{rye-0.41.0.ebuild => rye-0.42.0.ebuild} (100%) diff --git a/dev-util/rye/Manifest b/dev-util/rye/Manifest index 38350330ca..c423669642 100644 --- a/dev-util/rye/Manifest +++ b/dev-util/rye/Manifest @@ -186,7 +186,7 @@ DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d23 DIST rustls-0.23.12.crate 438443 BLAKE2B 638ed38c62f807d1a28cd880a8664e09e0ef25ef038f93c6b8f5512e1864d60f2bc8a83e00907f9ee36e543bbbd9e5b6f5a0ff7fb57770619864298d32c31bd7 SHA512 49b7fb3dc02e9ded96718d064a121629dffeded6affbe8dd8a41283be62c99244b23208205a1821d83b557200b017d26589d4f42a0048b2cbd70156dcbbb8b94 DIST rustls-pki-types-1.7.0.crate 29555 BLAKE2B 9da5d853671e2e33f46434509e7c83edf487a6a940e1bc8937c3ed7900cac590674bf2c5a5edac6055a2bdf763b132d4624a8c51caf0250d5055ce5e8f4bc5eb SHA512 5502795aebd7058084d0e30d6c09befc4182493113207f539a8d42006d4189158e9028245aa627d6943a88514b6292fbd56b5ea1abef8c83a429bf6d641f6f11 DIST rustls-webpki-0.102.6.crate 201331 BLAKE2B 9802401ac0134a4c6b2ae7d72ad73126dfb271458a9ced5128c4fe7919ec64b5d68be13b5abf9ca9f666052c462bac112c321cca3b54c1b615224fcabb1bca3a SHA512 83ed70c4ca8e0714b363bf76c04281fafac08788bb5f283b87c21eb6d5b3bbb9ebd21a62dd9e1eea89d41f1557f953486e1160c5e7eb02b693bec3745a9603c5 -DIST rye-0.41.0.tar.gz 1473968 BLAKE2B 0e86f96367d2f2b9a0291f1e3412b7f7eaa5dc7ac0e0f752ffa8b2846f44dc5512a109d6a385e24b5b2a032395ab27ce33d10f330b8887fdf32d07689a6e54e5 SHA512 5aca2fa25a843d2577b70c16456bbe6e8caccd3a170951b0d76cf1b5155e6084113ac360304c27e7ed4931abe9279e1e9b09c69d52b2ef2a40cc598b73f90de9 +DIST rye-0.42.0.tar.gz 1474955 BLAKE2B 56cd08c169a46d81f9bf79648e0c3130d5cda84999ef2b01a13d60536fe4d8fa14c33e1c81cb887432104d36df09aae9d68ff716ccfae85b53cc70d3c6c83bb3 SHA512 d9b725ac8338e86d5b2d0930cd7b477a9b69029f1eb736d01b9d391f5090ccdf7214d552cffcbffb72bef458bddfa46553d2c00454a61754a957b78aad809423 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c diff --git a/dev-util/rye/rye-0.41.0.ebuild b/dev-util/rye/rye-0.42.0.ebuild similarity index 100% rename from dev-util/rye/rye-0.41.0.ebuild rename to dev-util/rye/rye-0.42.0.ebuild From bd033c7cc236474073fe6bdf41d10acba1e2d2ca Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 22 Oct 2024 11:23:29 +0200 Subject: [PATCH 19/22] app-admin/customrescuecd-x86: treeclean Signed-off-by: David Roman --- app-admin/customrescuecd-x86/Manifest | 1 - .../customrescuecd-x86-0.4.1.ebuild | 55 ------------------- app-admin/customrescuecd-x86/metadata.xml | 12 ---- profiles/package.mask | 1 - 4 files changed, 69 deletions(-) delete mode 100644 app-admin/customrescuecd-x86/Manifest delete mode 100644 app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild delete mode 100644 app-admin/customrescuecd-x86/metadata.xml diff --git a/app-admin/customrescuecd-x86/Manifest b/app-admin/customrescuecd-x86/Manifest deleted file mode 100644 index c9378b19ca..0000000000 --- a/app-admin/customrescuecd-x86/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST CUSTOMRESCUECD-x86-0.4.1.iso 1322811392 BLAKE2B bd63d40baf6426ed525c13e91ce65469f8f2a263072003c4dc1adea1ca75f894d2517c94063488fa75e1fa6012202ddbbf5281378c17a26edad683ce49996391 SHA512 46f1a2f20697b666fc4506abb405a8ebf58b63a83c5faacfc70e352c9eb9cd4a75ca742ac0011119e8baadd6fb467cfb306d8009994dbf2879a45486ccfe57bc diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild deleted file mode 100644 index 94a7a231e9..0000000000 --- a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="CUSTOMRESCUECD-x86" -DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo" -HOMEPAGE="https://sourceforge.net/projects/customrescuecd/" -SRC_URI="https://downloads.sourceforge.net/customrescuecd/"${MY_P}"-"${PV}".iso" - -S=${WORKDIR} - -LICENSE="GPL-3" -SLOT="${PV}" -KEYWORDS="~x86" -RESTRICT="bindist mirror" - -src_unpack() { :; } - -src_install() { - insinto "/usr/share/${PN%-*}" - doins "${DISTDIR}/${MY_P}-${PV}.iso" -} - -pkg_postinst() { - local f=${EROOT}/usr/share/${PN%-*}/${PN}-newest.iso - - # no version newer than ours? we're the newest! - if ! has_version ">${CATEGORY}/${PF}"; then - ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die - fi -} - -pkg_postrm() { - local f=${EROOT}/usr/share/${PN%-*}/${PN}-newest.iso - - # if there is no version newer than ours installed - if ! has_version ">${CATEGORY}/${PF}"; then - # and we are truly and completely uninstalled... - if [[ ! ${REPLACED_BY_VERSION} ]]; then - # then find an older version to set the symlink to - local newest_version=$(best_version "<${CATEGORY}/${PF}") - - if [[ ${newest_version} ]]; then - # update the symlink - ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die - else - # last version removed? clean up the symlink - rm -v "${f}" || die - # and the parent directory - rmdir "${f%/*}" || die - fi - fi - fi -} diff --git a/app-admin/customrescuecd-x86/metadata.xml b/app-admin/customrescuecd-x86/metadata.xml deleted file mode 100644 index 3b9d7aaabf..0000000000 --- a/app-admin/customrescuecd-x86/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - andrea.postiglione@gmail.com - Andrea Postiglione - - - - customrescuecd - - diff --git a/profiles/package.mask b/profiles/package.mask index 35a9ab2ebe..b03ed62e7f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -126,7 +126,6 @@ app-misc/tai # David Roman (2024-09-21) # Dead SRC_URI for two years # Removal on 2024-10-21 -app-admin/customrescuecd-x86 sys-boot/customrescuecd-x86-grub # Julien Roy (2024-03-21) From 6f72cc958469f746756f894ba6f74ac5fe5b13ba Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 22 Oct 2024 11:24:12 +0200 Subject: [PATCH 20/22] sys-boot/customrescuecd-x86-grub: treeclean Signed-off-by: David Roman --- profiles/package.mask | 5 --- .../customrescuecd-x86-grub-0.1.ebuild | 30 ------------- .../files/customrescuecd.default | 7 --- .../files/customrescuecd.grub | 43 ------------------- sys-boot/customrescuecd-x86-grub/metadata.xml | 15 ------- 5 files changed, 100 deletions(-) delete mode 100644 sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild delete mode 100644 sys-boot/customrescuecd-x86-grub/files/customrescuecd.default delete mode 100644 sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub delete mode 100644 sys-boot/customrescuecd-x86-grub/metadata.xml diff --git a/profiles/package.mask b/profiles/package.mask index b03ed62e7f..0f930ecc63 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -123,11 +123,6 @@ mail-client/heirloom-mailx # Removal on 2024-10-21 app-misc/tai -# David Roman (2024-09-21) -# Dead SRC_URI for two years -# Removal on 2024-10-21 -sys-boot/customrescuecd-x86-grub - # Julien Roy (2024-03-21) # sys-libs/libucontext is masked in ::gentoo sys-libs/gcompat diff --git a/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild b/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild deleted file mode 100644 index 2b35cd8356..0000000000 --- a/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Grub menu entries for the .iso image of customrescuecd" -HOMEPAGE="https://sourceforge.net/projects/customrescuecd/" - -S="${WORKDIR}" - -LICENSE="GPL-2" -SLOT=0 -KEYWORDS="~x86" - -RDEPEND="app-admin/customrescuecd-x86 - sys-boot/grub" - -src_install() { - exeinto /etc/grub.d - newexe "${FILESDIR}"/customrescuecd.grub 39_customrescuecd - - insinto /etc/default - newins "${FILESDIR}"/customrescuecd.default customrescuecd -} - -pkg_postinst() { - elog "To add the menu entries for customrescuecd to grub, you should now run" - elog " grub-mkconfig -o /boot/grub/grub.cfg" - elog "You can set custom bootoptions in /etc/default/customrescuecd" -} diff --git a/sys-boot/customrescuecd-x86-grub/files/customrescuecd.default b/sys-boot/customrescuecd-x86-grub/files/customrescuecd.default deleted file mode 100644 index ce093e352f..0000000000 --- a/sys-boot/customrescuecd-x86-grub/files/customrescuecd.default +++ /dev/null @@ -1,7 +0,0 @@ -Here you can set custom bootoptions for the CustomRescueCD -# -# You can add for example in a space separated list: -# copytoram: causes the iso file to be fully loaded into memory -# this requires 1.5G of memory to cache everything -# -CRCD_BOOTOPTIONS="" diff --git a/sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub b/sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub deleted file mode 100644 index 31294388be..0000000000 --- a/sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -. /usr/share/grub/grub-mkconfig_lib - -if [ -r /etc/default/customrescuecd ] ; then - . /etc/default/customrescuecd -fi - -# srcd = path of newest link to iso of customrescuecd, created by the ebuild -# of customrescuecd-x86 - -crcd="/usr/share/systemrescuecd/systemrescuecd-x86-newest.iso" - -longname="CustomRescueCD" -bootops=")" - -if [ ! -z "${CRCD_BOOTOPTIONS}" ]; then - bootops=" with bootoptions)" -fi - -if [ -f "${crcd}" ]; then - - device=$(${grub_probe} --target=device "${crcd}") - path=$(make_system_path_relative_to_its_root "${crcd}") - grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab) - - gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2 - onstr=$(gettext_printf "(on %s)" "${device}") - - cat << EOF -submenu "${longname}" --class submenu { - menuentry "${longname} (32bit standard${bootops}" --class rescue { -${grub_string} - set isofile=${path} - loopback loop \${isofile} - linux (loop)/boot/x86/customrescue32 ${CRCD_BOOTOPTIONS} customisobasedir=customresccd customisolabel=CRC32 vga=791 net.ifnames=0 - } -} -EOF - -fi diff --git a/sys-boot/customrescuecd-x86-grub/metadata.xml b/sys-boot/customrescuecd-x86-grub/metadata.xml deleted file mode 100644 index e8f15959ab..0000000000 --- a/sys-boot/customrescuecd-x86-grub/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - andrea.postiglione@gmail.com - Andrea Postiglione - - - This package adds menu entries in GRUB for the CustomRescueCD. You can - add custom bootoptions for CustomRescueCD in a special config file. - - - customrescuecd - - From 53e73bf207fdf2c9db7d8d051e433e1b50b9dc29 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 22 Oct 2024 11:25:45 +0200 Subject: [PATCH 21/22] app-misc/tai: treeclean Signed-off-by: David Roman --- app-misc/tai/Manifest | 39 --------------------- app-misc/tai/metadata.xml | 16 --------- app-misc/tai/tai-0.0.8.ebuild | 64 ----------------------------------- profiles/package.mask | 5 --- 4 files changed, 124 deletions(-) delete mode 100644 app-misc/tai/Manifest delete mode 100644 app-misc/tai/metadata.xml delete mode 100644 app-misc/tai/tai-0.0.8.ebuild diff --git a/app-misc/tai/Manifest b/app-misc/tai/Manifest deleted file mode 100644 index f960e85250..0000000000 --- a/app-misc/tai/Manifest +++ /dev/null @@ -1,39 +0,0 @@ -DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 -DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 -DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b -DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 -DIST bytemuck-1.7.2.crate 27489 BLAKE2B 2541a7561eb34351f58266451a020858d8ac1ad30ecb95b97d576e72532cae37ef0b747e2259aaf6052b65f951586425044f824a00dfabf54bba9462edf94c2a SHA512 fae361f5abe67215a7591d421a0b713b77b437123c56e21dd00421e95ab86d9dd9b0bf1daa6623b833ea65681fbeeb58f6feab9d323964304a3250f24df1ace2 -DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa -DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201 -DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e -DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b -DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4 -DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064 -DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f -DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2 -DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf -DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f -DIST gif-0.11.2.crate 34068 BLAKE2B 607b96e55a606137f25fe2bcbae52f3a708d7507de8c0b1e3546644f6ba94210571b32d2029f9ddc32ecff755f6869be7fff286b2c8539bf44062174a7bfb16b SHA512 02f2bacda1e4f43ddbb4f7c6843478056ff01cb815a7c8f9c4d14618781bbafe113cacb812c3788454e8a4241efd6a90792a00cfe84c334349331258bbec71d7 -DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b03e5f41b5cb9aa29ad2269cb7e9891b7377ef7ff53200959317bd38b24e823ebe5c2125677ef2588eec81ae8 SHA512 4eb07fd698c2d902979ab06ae0baef4a53db74da78493c45f0c32d5903c5399cb8a1a25a2e89bf504ffb612e8153eaba4ae41df3d17f02c27e7991fdca518f63 -DIST jpeg-decoder-0.1.22.crate 228366 BLAKE2B 97dee932aae8d7d08ceaf37c9659d52a93be7c964468087aa39377fb2657c64cf8fe20516337cbe5fe0452c3686e9d1b7cd6c0932bf1ca6562358fd4a8cd69be SHA512 3edf415eb11909b7b16755f54c6a5b082200f81e6ce5dede413e41be221c8be5c14035a171fa1c21771c8d11f30cd990f57e6e98e3204e34e3f0e7ca2c3e38b4 -DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.100.crate 528168 BLAKE2B 6dc25b31bf98fe1d131dec95aa63d6a3def163ffc09cce41e85ae2432e8ebcaa02fdde5ec05a94fbd324fd87eae9042d76961c4fa2050f6fb7c2e443840468ad SHA512 a0382df08ec54c87db442e80899d28c7efafa2b137bc88bfec6a9f209d1d980e6f9f17caab03d5a89f24709bfe716dd4eeee1a4700ac76584b7b9596f65a2313 -DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d -DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e -DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f -DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771 -DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e -DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837 -DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e -DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f -DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee -DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9 -DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78 -DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33 -DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST tai-0.0.8.tar.gz 6551727 BLAKE2B 132f4fd27674f2c05d6fd52582fd8d0223e3a8c70447980380d7c2b8ba16a1a996f5fccb4efc3eda30a776c90e8e96836e496dddd915925276f8ff1d1743c698 SHA512 a3a303f2a557a3e5d8e72593636356291f2d927743d46881bf66172ced155cf685e9050b136768bc76dd95f473ee2514d4cf3807e43f2831bda533a99fa7610b -DIST tiff-0.6.1.crate 1399263 BLAKE2B 4a0bec5d2f2d254505c3492e519c584e2f80f77a6429f44da36862b5d9fc1ef9f7396689005b136c92f6786ac64f9418ca7bbf49f36afdf3f10e8d2c77cf0f51 SHA512 ece5aaef610e0a7bcdea8c40571d497cd3ec79931e25129060b4f51cb40a28ef03fc131494bc841fa5b08eaa49a5acbc9332553cbc542019f1ec5eb5945d3538 -DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0 -DIST weezl-0.1.5.crate 34944 BLAKE2B 57db23ed5d92b658a3ace462194763756a3ec3caa530296efc3255ae1d14f36ccfb4841d2417028ef57f093eadfa19b157f9cdc29d37b2f72fb661578cc7e907 SHA512 1fe4352dc8c773ac1297ba23ca3236dece6cec44887116afb1b3760dd0cf3ffcf5faae3aa98814775fddc38032c97c26a14684b47e7aa9deaecafe8c908e0735 diff --git a/app-misc/tai/metadata.xml b/app-misc/tai/metadata.xml deleted file mode 100644 index 075b6ecd45..0000000000 --- a/app-misc/tai/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - mustafasalih1991@gmail.com - Mustafa Salih - - - Terminal Ascii Images is a simple tool written in Rust,it's main use - to convert images and animations to text based arts in the terminal. - - - https://github.com/MustafaSalih1993/tai/issues - mustafasalih1993/tai - - diff --git a/app-misc/tai/tai-0.0.8.ebuild b/app-misc/tai/tai-0.0.8.ebuild deleted file mode 100644 index 47e939c0c1..0000000000 --- a/app-misc/tai/tai-0.0.8.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Autogenerated by pycargoebuild 0.13.2 - -EAPI=8 - -CRATES=" - adler32@1.2.0 - adler@1.0.2 - autocfg@1.0.1 - bitflags@1.3.2 - bytemuck@1.7.2 - byteorder@1.4.3 - cfg-if@1.0.0 - color_quant@1.1.0 - crc32fast@1.2.1 - crossbeam-channel@0.5.1 - crossbeam-deque@0.8.1 - crossbeam-epoch@0.9.5 - crossbeam-utils@0.8.5 - deflate@0.8.6 - either@1.6.1 - getopts@0.2.21 - gif@0.11.2 - hermit-abi@0.1.19 - image@0.23.14 - jpeg-decoder@0.1.22 - lazy_static@1.4.0 - libc@0.2.100 - memoffset@0.6.4 - miniz_oxide@0.3.7 - miniz_oxide@0.4.4 - num-integer@0.1.44 - num-iter@0.1.42 - num-rational@0.3.2 - num-traits@0.2.14 - num_cpus@1.13.0 - png@0.16.8 - rayon-core@1.9.1 - rayon@1.5.1 - scoped_threadpool@0.1.9 - scopeguard@1.1.0 - tiff@0.6.1 - unicode-width@0.1.8 - weezl@0.1.5 -" - -inherit cargo - -DESCRIPTION="tai (Terminal Ascii Images) tool to convert images to ascii" -HOMEPAGE="https://github.com/MustafaSalih1993/tai" -SRC_URI=" - https://www.github.com/MustafaSalih1993/tai/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${CARGO_CRATE_URIS} -" - -LICENSE="MIT" -# Dependent crate licenses -LICENSE+=" MIT ZLIB" -SLOT="0" -KEYWORDS="~amd64" - -QA_FLAGS_IGNORED="usr/bin/tai" diff --git a/profiles/package.mask b/profiles/package.mask index 0f930ecc63..37ed793cb1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -118,11 +118,6 @@ net-im/ruqola # Removal on 2024-10-21 mail-client/heirloom-mailx -# David Roman (2024-09-21) -# Dead SRC_URI and HOMEPAGE. Project doesn't seems to exist anymore -# Removal on 2024-10-21 -app-misc/tai - # Julien Roy (2024-03-21) # sys-libs/libucontext is masked in ::gentoo sys-libs/gcompat From 4331750130792e20b169ff289ca48449b10ccfd0 Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 22 Oct 2024 11:27:41 +0200 Subject: [PATCH 22/22] mail-client/heirloom-mailx: treeclean Closes: https://bugs.gentoo.org/901281 Closes: https://bugs.gentoo.org/816783 Closes: https://bugs.gentoo.org/785409 Closes: https://bugs.gentoo.org/782964 Signed-off-by: David Roman --- mail-client/heirloom-mailx/Manifest | 1 - .../heirloom-mailx-12.5-enable-ldflags.patch | 12 - .../files/heirloom-mailx-12.5-fixes-1.patch | 232 ------------------ .../heirloom-mailx/heirloom-mailx-12.5.ebuild | 42 ---- mail-client/heirloom-mailx/metadata.xml | 8 - profiles/package.mask | 5 - 6 files changed, 300 deletions(-) delete mode 100644 mail-client/heirloom-mailx/Manifest delete mode 100644 mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch delete mode 100644 mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch delete mode 100644 mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild delete mode 100644 mail-client/heirloom-mailx/metadata.xml diff --git a/mail-client/heirloom-mailx/Manifest b/mail-client/heirloom-mailx/Manifest deleted file mode 100644 index f70413e5a7..0000000000 --- a/mail-client/heirloom-mailx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST heirloom-mailx_12.5.orig.tar.gz 324085 BLAKE2B 8f3b7177d9db8bb399f9e3e8d51258d93ea6ea9556f514c9107b0733f2f999ec9c685107c8a11717526051c242d5f20d4b6fc1a572175539874904cb31fcc452 SHA512 eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f diff --git a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch deleted file mode 100644 index 8313a7fb33..0000000000 --- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-enable-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --color -Naur heirloom-mailx-12.5/Makefile heirloom-mailx-12.5-patch/Makefile ---- heirloom-mailx-12.5/Makefile 2011-04-26 23:23:22.000000000 +0200 -+++ heirloom-mailx-12.5-patch/Makefile 2021-08-08 21:58:46.965043853 +0200 -@@ -25,7 +25,7 @@ - # displayed correctly. - #CFLAGS = - #CPPFLAGS = --#LDFLAGS = -+LDFLAGS = - #WARN = -Wall -Wno-parentheses -Werror - - # Some RedHat versions need INCLUDES = -I/usr/kerberos/include to compile diff --git a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch b/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch deleted file mode 100644 index fa6d511973..0000000000 --- a/mail-client/heirloom-mailx/files/heirloom-mailx-12.5-fixes-1.patch +++ /dev/null @@ -1,232 +0,0 @@ -Submitted By: Ken Moffat -Date: 2014-12-27 -Initial Package Version: 12.5 -Upstream Status: Unknown -Origin: Changes to remove SSL2 found at debian, remainder from redhat. -Description: Removes support for SSL2 (openssl no longer supports it) -and fixes CVE-2004-2771 [sic] and CVE-2014-7844. - -diff -Naur heirloom-mailx-12.5/extern.h heirloom-mailx-12.5-patched/extern.h ---- heirloom-mailx-12.5/extern.h 2011-04-26 22:23:22.000000000 +0100 -+++ heirloom-mailx-12.5-patched/extern.h 2014-12-27 01:26:59.654169487 +0000 -@@ -396,7 +396,7 @@ - int is_fileaddr(char *name); - struct name *usermap(struct name *names); - struct name *cat(struct name *n1, struct name *n2); --char **unpack(struct name *np); -+char **unpack(struct name *smopts, struct name *np); - struct name *elide(struct name *names); - int count(struct name *np); - struct name *delete_alternates(struct name *np); -diff -Naur heirloom-mailx-12.5/fio.c heirloom-mailx-12.5-patched/fio.c ---- heirloom-mailx-12.5/fio.c 2011-04-26 22:23:22.000000000 +0100 -+++ heirloom-mailx-12.5-patched/fio.c 2014-12-27 01:27:15.634561413 +0000 -@@ -43,12 +43,15 @@ - #endif /* not lint */ - - #include "rcv.h" -+ -+#ifndef HAVE_WORDEXP -+#error wordexp support is required -+#endif -+ - #include - #include - #include --#ifdef HAVE_WORDEXP - #include --#endif /* HAVE_WORDEXP */ - #include - - #if defined (USE_NSS) -@@ -481,7 +484,6 @@ - static char * - globname(char *name) - { --#ifdef HAVE_WORDEXP - wordexp_t we; - char *cp; - sigset_t nset; -@@ -495,7 +497,7 @@ - sigemptyset(&nset); - sigaddset(&nset, SIGCHLD); - sigprocmask(SIG_BLOCK, &nset, NULL); -- i = wordexp(name, &we, 0); -+ i = wordexp(name, &we, WRDE_NOCMD); - sigprocmask(SIG_UNBLOCK, &nset, NULL); - switch (i) { - case 0: -@@ -527,65 +529,6 @@ - } - wordfree(&we); - return cp; --#else /* !HAVE_WORDEXP */ -- char xname[PATHSIZE]; -- char cmdbuf[PATHSIZE]; /* also used for file names */ -- int pid, l; -- char *cp, *shell; -- int pivec[2]; -- extern int wait_status; -- struct stat sbuf; -- -- if (pipe(pivec) < 0) { -- perror("pipe"); -- return name; -- } -- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name); -- if ((shell = value("SHELL")) == NULL) -- shell = SHELL; -- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL); -- if (pid < 0) { -- close(pivec[0]); -- close(pivec[1]); -- return NULL; -- } -- close(pivec[1]); --again: -- l = read(pivec[0], xname, sizeof xname); -- if (l < 0) { -- if (errno == EINTR) -- goto again; -- perror("read"); -- close(pivec[0]); -- return NULL; -- } -- close(pivec[0]); -- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) { -- fprintf(stderr, catgets(catd, CATSET, 81, -- "\"%s\": Expansion failed.\n"), name); -- return NULL; -- } -- if (l == 0) { -- fprintf(stderr, catgets(catd, CATSET, 82, -- "\"%s\": No match.\n"), name); -- return NULL; -- } -- if (l == sizeof xname) { -- fprintf(stderr, catgets(catd, CATSET, 83, -- "\"%s\": Expansion buffer overflow.\n"), name); -- return NULL; -- } -- xname[l] = 0; -- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--) -- ; -- cp[1] = '\0'; -- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) { -- fprintf(stderr, catgets(catd, CATSET, 84, -- "\"%s\": Ambiguous.\n"), name); -- return NULL; -- } -- return savestr(xname); --#endif /* !HAVE_WORDEXP */ - } - - /* -diff -Naur heirloom-mailx-12.5/mailx.1 heirloom-mailx-12.5-patched/mailx.1 ---- heirloom-mailx-12.5/mailx.1 2011-04-26 22:23:22.000000000 +0100 -+++ heirloom-mailx-12.5-patched/mailx.1 2014-12-27 01:26:53.838026857 +0000 -@@ -656,6 +656,14 @@ - will have the system wide alias expanded - as all mail goes through sendmail. - .SS "Recipient address specifications" -+If the -+.I expandaddr -+option is not set (the default), recipient addresses must be names of -+local mailboxes or Internet mail addresses. -+.PP -+If the -+.I expandaddr -+option is set, the following rules apply: - When an address is used to name a recipient - (in any of To, Cc, or Bcc), - names of local mail folders -@@ -2391,6 +2399,12 @@ - If this option is set, - \fImailx\fR starts even with an empty mailbox. - .TP -+.B expandaddr -+Causes -+.I mailx -+to expand message recipient addresses, as explained in the section, -+Recipient address specifications. -+.TP - .B flipr - Exchanges the - .I Respond -@@ -3575,7 +3589,7 @@ - .TP - .B ssl-method - Selects a SSL/TLS protocol version; --valid values are `ssl2', `ssl3', and `tls1'. -+valid values are `ssl3', and `tls1'. - If unset, the method is selected automatically, - if possible. - .TP -diff -Naur heirloom-mailx-12.5/names.c heirloom-mailx-12.5-patched/names.c ---- heirloom-mailx-12.5/names.c 2011-04-26 22:23:22.000000000 +0100 -+++ heirloom-mailx-12.5-patched/names.c 2014-12-27 01:26:59.654169487 +0000 -@@ -268,6 +268,9 @@ - FILE *fout, *fin; - int ispipe; - -+ if (value("expandaddr") == NULL) -+ return names; -+ - top = names; - np = names; - time(&now); -@@ -546,7 +549,7 @@ - * Return an error if the name list won't fit. - */ - char ** --unpack(struct name *np) -+unpack(struct name *smopts, struct name *np) - { - char **ap, **top; - struct name *n; -@@ -561,7 +564,7 @@ - * the terminating 0 pointer. Additional spots may be needed - * to pass along -f to the host mailer. - */ -- extra = 2; -+ extra = 3 + count(smopts); - extra++; - metoo = value("metoo") != NULL; - if (metoo) -@@ -578,6 +581,10 @@ - *ap++ = "-m"; - if (verbose) - *ap++ = "-v"; -+ for (; smopts != NULL; smopts = smopts->n_flink) -+ if ((smopts->n_type & GDEL) == 0) -+ *ap++ = smopts->n_name; -+ *ap++ = "--"; - for (; n != NULL; n = n->n_flink) - if ((n->n_type & GDEL) == 0) - *ap++ = n->n_name; -diff -Naur heirloom-mailx-12.5/openssl.c heirloom-mailx-12.5-patched/openssl.c ---- heirloom-mailx-12.5/openssl.c 2011-04-26 22:23:22.000000000 +0100 -+++ heirloom-mailx-12.5-patched/openssl.c 2014-12-27 01:26:34.385549867 +0000 -@@ -216,9 +216,7 @@ - - cp = ssl_method_string(uhp); - if (cp != NULL) { -- if (equal(cp, "ssl2")) -- method = SSLv2_client_method(); -- else if (equal(cp, "ssl3")) -+ if (equal(cp, "ssl3")) - method = SSLv3_client_method(); - else if (equal(cp, "tls1")) - method = TLSv1_client_method(); -diff -Naur heirloom-mailx-12.5/sendout.c heirloom-mailx-12.5-patched/sendout.c ---- heirloom-mailx-12.5/sendout.c 2011-04-26 22:23:22.000000000 +0100 -+++ heirloom-mailx-12.5-patched/sendout.c 2014-12-27 01:26:59.654169487 +0000 -@@ -835,7 +835,7 @@ - #endif /* HAVE_SOCKETS */ - - if ((smtp = value("smtp")) == NULL) { -- args = unpack(cat(mailargs, to)); -+ args = unpack(mailargs, to); - if (debug || value("debug")) { - printf(catgets(catd, CATSET, 181, - "Sendmail arguments:")); diff --git a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild deleted file mode 100644 index 236b33190d..0000000000 --- a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2001-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="The mailx utility from CentOS" -HOMEPAGE="https://www.debian.org/" -SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}_${PVR}.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/${PN}/${PN}_${PVR}.orig.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="net-libs/liblockfile - dev-libs/libbsd - sys-libs/binutils-libs - virtual/mta - mail-client/mailx-support - dev-libs/openssl" - -RDEPEND="${DEPEND} - !virtual/mailx - !mail-client/nail - !net-mail/mailutils - !mail-client/mailx" - -src_prepare() { - eapply -p1 "${FILESDIR}/${PN}-${PVR}-fixes-1.patch" - eapply -p1 "${FILESDIR}/${PN}-${PVR}-enable-ldflags.patch" - eapply_user -} - -src_compile(){ - sed 's@ - - - - y0rune@aol.com - Marcin Woźniak - - diff --git a/profiles/package.mask b/profiles/package.mask index 37ed793cb1..0ea08a6a9d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -113,11 +113,6 @@ sys-firmware/pinephone-firmware # Removal on 2024-10-22. net-im/ruqola -# David Roman (2024-09-21) -# Dead SRC_URI. Not much maintained downstream -# Removal on 2024-10-21 -mail-client/heirloom-mailx - # Julien Roy (2024-03-21) # sys-libs/libucontext is masked in ::gentoo sys-libs/gcompat