gentoo auto-resync : 28:01:2025 - 22:42:58

4 files changed, 445 insertions, 0 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e2597f93a00c..6ec61cb46a8b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index eddd02ed156d..c8a283bd562a 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,7 +1,10 @@
+AUX qhexedit2-0.8.10-pyqt6.patch 12362 BLAKE2B 46b791a131e28778895dd1b39d1cf0254a513242fb28a01deb2602528eeaadafd9178f436e69c6add414ed83e93a1abcf8250aa14489fd61c082ffa3d9365eda SHA512 649b7241e9dff03ca24361473c318f41f92ed19cf9187ebb11ac64133c630ec52ee1772bf3a8bde448da8169cb909483c170c93f78ccfaed5a106fa2e97d3d0e
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 AUX qhexedit2-0.8.6-sip.patch 1134 BLAKE2B a64403e077b388f7c95ec5feada3d07e7e027732cd03ae9703fba43bcbc96bb434ea6bf2b8050620404fc7129850fe6affa5bed44a8b22000f7adee782f5683f SHA512 23143fbc94ec2eab8c89b41ff1e1a7e432828881c337e3cd56c3f84ed9639f1c2aea76c4826ac318956cc672d4b770d22613f45c6f4473bf25ad2469b680a71b
 AUX qhexedit2-0.8.6-sip5.patch 2295 BLAKE2B 8a689da202adf6169ed34eb7c7fc0c824451f05f5030fa457a7bdef4ec079c8df7b688a91855d7fc98b96f9e112c98e1805233af19b42fbd570eab6ed3fafa33 SHA512 0bc8a18085e9f928026ae852820b5a2cd6f8bea56f6193359d05c439fea3eb71a6baf3cf529d5f8ea95b6d0a1c28a460dedf1430e06f56486be108402c213daf
 AUX qhexedit2-0.8.9-fix-crash.patch 1437 BLAKE2B 8a58e4dc74de1fb5120ea7fc53df92f07d38023dede7bd4e778c7ad1de22ac981269d28fc80c1c61b7a1e448a812b4452b5a9494d486b71ff07e2e1cd07ffa24 SHA512 e8abff741616cbaf842942ff426b7ce6e43e88cd42f5c3ad282b7654ba727cacb2d3eb197656769ff1b9ff9a819a7ef61df594a686b2b339f0b67c8cfc8b55df
+DIST qhexedit2-0.8.10.tar.gz 353275 BLAKE2B 475d718f5ed05bbfded5b38f42672decff09310b27964d9c1680212302ef8cd1a9cedadf9860cc5200bae78e7ac66d5cbd14ac139d91ed025b8228bd7836947f SHA512 e245bea0f2edca69b821f6fcb64114f7307b536e1eaf15b3a05e4f50b7ea2038b64b4d3a3a1f1f56b76b0b570aae21ee3cc1497e2d43d5fd145029fe565c1c58
 DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
+EBUILD qhexedit2-0.8.10.ebuild 2035 BLAKE2B 486ceb951889a7fa4c823fc3ac27004e1856ed3b27907a0692292d025117c7a295019a2c1294be6f574f80576d9286804dfc3476a0244f6f2112fe8b643d92af SHA512 1252c8bd71914f27b7e2642df1ffa913f7e4827a489350277672beb622dc37f9519db03873a0bdcbd7516187889635f4f998cd49a8e6426e0de8944e82d250ff
 EBUILD qhexedit2-0.8.9_p20210525-r3.ebuild 2391 BLAKE2B 4fac665bc28b4e3eb78b51064e12d97f1f00a5d15d0371bce6d628da51a77d3755cfbe04d93dd3698901bb87fd5e7c65a2f88e0193f70eb04afa132bd8a27afe SHA512 8224a7ab6d842447e478db2e67e29ca84888194833b1773067d692e4cce630bc77ac607957cac6b17777807f437b5e4440edbde6f20f480bc88fe16980783b2b
 MISC metadata.xml 877 BLAKE2B f7343c25b4643b468d75938b4af93a8e52e10ebb1bc774c3caada33d202d0ea938789bc9400584fc78098b05c7a029c9be781f37302ac8edf7cae40659f6d9a9 SHA512 897f7435ec755c6689192e762172fc02a10ea043d7ba2662eb88dd7db4856dbe82e95c3b7fed890ee6dd2f8b11a3dd77e25af4ec56b69cb7191c5805b31371b3
diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.10-pyqt6.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.10-pyqt6.patch
new file mode 100644
index 000000000000..295e4bf59a90
--- /dev/null
+++ b/app-editors/qhexedit2/files/qhexedit2-0.8.10-pyqt6.patch
@@ -0,0 +1,344 @@
+From 628d28efb12eb68747b9ee5a15cb14301dbf1c75 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Thu, 23 Jan 2025 23:06:14 +0800
+Subject: [PATCH] Add PyQt6 support with backward compatibility
+
+- Implement Qt version checks in C++ for Q_UNREACHABLE compatibility
+- Add dynamic PyQt version detection (4/5/6) in build system
+- Bump pyproject.toml version to 0.8.10 and update documentation examples
+- Fix missing include `<optional>` in `example/main.cpp
+- Fix unix install path allows users to specify environment var in qmake
+
+Closes: https://github.com/Simsys/qhexedit2/issues/154
+Closes: https://github.com/Simsys/qhexedit2/issues/155
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ example/main.cpp                   | 18 ++++++--
+ project.py                         | 27 +++++++++--
+ pyproject.toml                     |  4 +-
+ python/python3_pyqt6/mainwindow.py | 23 ++++++++++
+ readme.md                          |  8 ++--
+ setup.py                           | 72 ++++++++++++++++++++++--------
+ src/qhexedit.pro                   |  8 +++-
+ src/qhexedit.sip                   |  2 +
+ 8 files changed, 129 insertions(+), 33 deletions(-)
+ create mode 100644 python/python3_pyqt6/mainwindow.py
+
+diff --git a/example/main.cpp b/example/main.cpp
+index e09f89192707..76a5ecf74ca8 100644
+--- a/example/main.cpp
++++ b/example/main.cpp
+@@ -1,9 +1,10 @@
++#include <optional>
+ #include <QApplication>
+-#include <QIcon>
+ #include <QCommandLineParser>
+-#include <QTranslator>
+-#include <QLocale>
+ #include <QFile>
++#include <QIcon>
++#include <QLocale>
++#include <QTranslator>
+ 
+ #include "mainwindow.h"
+ 
+@@ -87,11 +88,20 @@ int main(int argc, char *argv[])
+ 
+         case Status::VersionRequested:
+             parser.showVersion();
++#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+             Q_UNREACHABLE_RETURN(0);
+-
++#else
++            Q_UNREACHABLE();
++            return 0;
++#endif
+         case Status::HelpRequested:
+             parser.showHelp();
++#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+             Q_UNREACHABLE_RETURN(0);
++#else
++            Q_UNREACHABLE();
++            return 0;
++#endif
+     }
+ 
+     if (query.hasFile)
+diff --git a/project.py b/project.py
+index c9ee67f7788b..807e92ac7a9e 100644
+--- a/project.py
++++ b/project.py
+@@ -4,8 +4,23 @@ import os
+ from os.path import abspath, join
+ from sipbuild import Option
+ from pyqtbuild import PyQtBindings, PyQtProject
+-import PyQt5
+ 
++try:
++    import PyQt6
++    PyQt_Version = 'PyQt6'
++except ImportError:
++    try:
++        import PyQt5
++        PyQt_Version = 'PyQt5'
++    except ImportError:
++        try:
++            import PyQt4
++            PyQt_Version = 'PyQt4'
++        except ImportError:
++            PyQt_Version = None
++
++if PyQt_Version is None:
++    raise ImportError("No compatible PyQt version (PyQt4, PyQt5, or PyQt6) found.")
+ 
+ class QHexEditProject(PyQtProject):
+     """The QHexEdit Project class."""
+@@ -15,9 +30,15 @@ class QHexEditProject(PyQtProject):
+         self.bindings_factories = [QHexEditBindings]
+ 
+     def update(self, tool):
+-        """Allows SIP to find PyQt5 .sip files."""
++        """Allows SIP to find PyQt .sip files."""
+         super().update(tool)
+-        self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings'))
++        if PyQt_Version == 'PyQt6':
++            self.sip_include_dirs.append(join(PyQt6.__path__[0], 'bindings'))
++        elif PyQt_Version == 'PyQt5':
++            self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings'))
++        else:
++            # unexpected and not supported here
++            raise ValueError(f"Unsupported PyQt version: {PyQt_Version}.")
+ 
+ 
+ class QHexEditBindings(PyQtBindings):
+diff --git a/pyproject.toml b/pyproject.toml
+index b5edaa495c31..3724f89027e6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,10 +1,10 @@
+ [build-system]
+-requires = ["sip >=5", "PyQt-builder", "PyQt5"]
++requires = ["sip >=5", "PyQt-builder", "PyQt6"]
+ build-backend = "sipbuild.api"
+ 
+ [tool.sip.metadata]
+ name = "QHexEdit"
+-version = "0.8.9"
++version = "0.8.10"
+ 
+ [tools.sip]
+ abi-version = "12.8"
+diff --git a/python/python3_pyqt6/mainwindow.py b/python/python3_pyqt6/mainwindow.py
+new file mode 100644
+index 000000000000..b816a3103f81
+--- /dev/null
++++ b/python/python3_pyqt6/mainwindow.py
+@@ -0,0 +1,23 @@
++import sys
++from PyQt6 import QtWidgets
++from qhexedit import QHexEdit
++
++
++class HexEdit(QHexEdit):
++
++    def __init__(self, fileName=None):
++        super(HexEdit, self).__init__()
++        file = open(fileName, 'rb')
++        data = file.read()
++        self.setData(data)
++        self.setReadOnly(False)
++
++
++if __name__ == '__main__':
++    app = QtWidgets.QApplication(sys.argv)
++    mainWin = HexEdit('mainwindow.py')
++    mainWin.resize(600, 400)
++    mainWin.move(300, 300)
++    mainWin.show()
++    sys.exit(app.exec_())
++
+diff --git a/readme.md b/readme.md
+index 0a75a9c8752b..ebd138a650b4 100644
+--- a/readme.md
++++ b/readme.md
+@@ -3,7 +3,7 @@ QHexEdit2
+ ![Application QHexEdit2 in Action](http://simsys.github.io/qhexedit.png)
+ 
+ 
+-QHexEdit is a hex editor widget written in C++ for the Qt (Qt4, Qt5) framework. It is a simple editor for binary data, just like QPlainTextEdit is for text data. There are sip configuration files included, so it is easy to create bindings for PyQt and you can use this widget also in python 2 and 3.
++QHexEdit is a hex editor widget written in C++ for the Qt (Qt4, Qt5, Qt6) framework. It is a simple editor for binary data, just like QPlainTextEdit is for text data. There are sip configuration files included, so it is easy to create bindings for PyQt and you can use this widget also in python 2 and 3.
+ 
+ QHexEdit takes the data of a QByteArray (setData()) and shows it. You can use the mouse or the keyboard to navigate inside the widget. If you hit the keys (0..9, a..f) you will change the data. Changed data is highlighted and can be accessed via data().
+ 
+@@ -16,7 +16,7 @@ QHexEdit comes with undo/redo functionality. All changes can be undone, by press
+ QHexEdit is based on QIODevice, that's why QHexEdit can handle big amounts of data. The size of edited data can be more then two gigabytes without any restrictions.
+ 
+ ## Using QHexEdit
+-You can read the documentation of the project [here](http://simsys.github.io/). You find in the sources a [C++ example](https://github.com/Simsys/qhexedit2/tree/master/example), that shows how tu use the QHexedit widget. There is also a [python example](https://github.com/Simsys/qhexedit2/tree/master/python/python3_pyqt5) available.
++You can read the documentation of the project [here](http://simsys.github.io/). You find in the sources a [C++ example](https://github.com/Simsys/qhexedit2/tree/master/example), that shows how tu use the QHexedit widget. There is also a [python example](https://github.com/Simsys/qhexedit2/tree/master/python/python3_pyqt6) available.
+ 
+ ## Contributing to QHexEdit
+ We love to receive contributions. You can submit bug reports [here](https://github.com/Simsys/qhexedit2/issues). If you are a developer, you can pick up a work item and start to realize super exciting features or fix bugs. We also like to receive enhancement proposals or translation support.
+@@ -25,8 +25,8 @@ We love to receive contributions. You can submit bug reports [here](https://gith
+ ```
+ Copyright (C) 2015-2016 Winfried Simon
+ 
+-This software may be used under the terms of the GNU Lesser General 
+-Public License version 2.1 as published by the Free Software Foundation 
++This software may be used under the terms of the GNU Lesser General
++Public License version 2.1 as published by the Free Software Foundation
+ and appearing in the file license.txt included in the packaging of this file.
+ 
+ This program is distributed in the hope that it will be useful,
+diff --git a/setup.py b/setup.py
+index 1906a07261f6..89622e8c3b8a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -8,23 +8,48 @@ import subprocess
+ import sipdistutils
+ import sipconfig
+ 
++try:
++    import PyQt6
++    PyQt_Version = 'PyQt6'
++except ImportError:
++    try:
++        import PyQt5
++        PyQt_Version = 'PyQt5'
++    except ImportError:
++        try:
++            import PyQt4
++            PyQt_Version = 'PyQt4'
++        except ImportError:
++            PyQt_Version = None
++
++if PyQt_Version is None:
++    raise ImportError("No compatible PyQt version (PyQt4, PyQt5, or PyQt6) found.")
++
+ cfg = sipconfig.Configuration()
+ pyqt_sip_dir = cfg.default_sip_dir
+-for p in (os.path.join(pyqt_sip_dir, "PyQt5"),
+-          os.path.join(pyqt_sip_dir, "PyQt5-3"),
+-          os.path.join(pyqt_sip_dir, "PyQt4"),
+-          pyqt_sip_dir,
+-          os.path.join(cfg.default_mod_dir, "PyQt5", "bindings")):
+-    if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
+-        pyqt_sip_dir = p
+-        break
+ 
+-try:
+-    import PyQt5
+-    PyQt_Version = 'PyQt5'
+-except:
+-    PyQt_Version = 'PyQt4'
++if PyQt_Version == 'PyQt6':
++    search_paths = [
++        os.path.join(pyqt_sip_dir, "PyQt6"),
++        os.path.join(cfg.default_mod_dir, "PyQt6", "bindings"),
++        pyqt_sip_dir,
++    ]
++elif PyQt_Version == 'PyQt5':
++    search_paths = [
++        os.path.join(pyqt_sip_dir, "PyQt5"),
++        os.path.join(pyqt_sip_dir, "PyQt5-3"),
++        os.path.join(cfg.default_mod_dir, "PyQt5", "bindings"),
++        pyqt_sip_dir,
++    ]
++else:
++    search_paths = [
++        os.path.join(pyqt_sip_dir, "PyQt4"),
++        pyqt_sip_dir,
++    ]
+ 
++for p in search_paths:
++    if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
++        pyqt_sip_dir = p
+ 
+ include_dirs = ['src']
+ 
+@@ -45,7 +70,9 @@ class build_pyqt_ext(sipdistutils.build_ext):
+         self.required = False
+ 
+     def finalize_options(self):
+-        if PyQt_Version == 'PyQt5':
++        if PyQt_Version == 'PyQt6':
++            from PyQt6.QtCore import PYQT_CONFIGURATION
++        elif PyQt_Version == 'PyQt5':
+             from PyQt5.QtCore import PYQT_CONFIGURATION
+         else:
+             from PyQt4.QtCore import PYQT_CONFIGURATION
+@@ -94,7 +121,9 @@ class build_pyqt_ext(sipdistutils.build_ext):
+ 
+ 
+ # Used Qt libs
+-if PyQt_Version == 'PyQt5':
++if PyQt_Version == 'PyQt6':
++    qt_libs = ["QtCore", "QtGui", "QtWidgets"]
++elif PyQt_Version == 'PyQt5':
+     qt_libs = ["QtCore", "QtGui", "QtWidgets"]
+ else:
+     qt_libs = ["QtCore", "QtGui"]
+@@ -105,8 +134,13 @@ if cfg.qt_framework:
+         include_dirs += [os.path.join(cfg.qt_lib_dir,
+                                       lib + ".framework", "Headers")]
+ else:
+-    if PyQt_Version == 'PyQt5':
+-        for qt_inc_dir in ('/usr/include/qt', '/usr/include/x86_64-linux-gnu/qt5'):
++    if PyQt_Version == 'PyQt6':
++        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt6', '/usr/include/x86_64-linux-gnu/qt6'):
++            include_dirs.append(qt_inc_dir)
++            include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
++        libraries = ["Qt6" + lib[2:] for lib in qt_libs]
++    elif PyQt_Version == 'PyQt5':
++        for qt_inc_dir in ('/usr/include/qt', '/usr/include/qt5', '/usr/include/x86_64-linux-gnu/qt5'):
+             include_dirs.append(qt_inc_dir)
+             include_dirs += [os.path.join(qt_inc_dir, lib) for lib in qt_libs]
+         libraries = ["Qt5" + lib[2:] for lib in qt_libs]
+@@ -122,7 +156,7 @@ dirname = os.path.dirname(__file__)
+ 
+ setup(
+     name='QHexEdit',
+-    version='0.8.9',
++    version='0.8.10',
+     ext_modules=[
+         Extension(
+             "qhexedit",
+@@ -135,4 +169,4 @@ setup(
+     ],
+     cmdclass={"build_ext": build_pyqt_ext},
+ )
+-            
++
+diff --git a/src/qhexedit.pro b/src/qhexedit.pro
+index 2a940163d0e6..39e400a17c19 100644
+--- a/src/qhexedit.pro
++++ b/src/qhexedit.pro
+@@ -23,5 +23,11 @@ Release:TARGET = qhexedit
+ Debug:TARGET = qhexeditd
+ 
+ 
+-unix:DESTDIR = /usr/lib
++unix {
++    # Allows users to specify parameters when running qmake
++    QHEXEDIT_DESTDIR = $$(QHEXEDIT_DESTDIR)
++    isEmpty(QHEXEDIT_DESTDIR): QHEXEDIT_DESTDIR = $$[QT_INSTALL_LIBS]
++    target.path = $$QHEXEDIT_DESTDIR
++    INSTALLS += target
++}
+ win32:DESTDIR = ../lib
+diff --git a/src/qhexedit.sip b/src/qhexedit.sip
+index a7ef4e75db5d..c76fa088867e 100644
+--- a/src/qhexedit.sip
++++ b/src/qhexedit.sip
+@@ -3,6 +3,8 @@
+ %Import QtCore/QtCoremod.sip
+ %Import QtGui/QtGuimod.sip
+ 
++%Timeline {Qt_4_0_0 Qt_5_0_0 Qt_6_0_0}
++
+ %If (Qt_5_0_0 -)
+ %Import QtWidgets/QtWidgetsmod.sip
+ %End
+-- 
+2.48.1
+
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.10.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.10.ebuild
new file mode 100644
index 000000000000..8bccefc0be85
--- /dev/null
+++ b/app-editors/qhexedit2/qhexedit2-0.8.10.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2025 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
+
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/Simsys/qhexedit2/"
+SRC_URI="https://github.com/Simsys/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc +gui python"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.10-pyqt6.patch"
+)
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	media-libs/libglvnd
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pyqt6-6.8.0[gui,widgets,${PYTHON_USEDEP}]
+			>=dev-python/pyqt6-sip-13.5:=[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-python/pyqt-builder-1.10[${PYTHON_USEDEP}]
+			>=dev-python/sip-5:=[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+src_configure() {
+	QHEXEDIT_DESTDIR="${S}" eqmake6 src/qhexedit.pro
+
+	if use gui; then
+		pushd example || die "can't pushd example"
+		eqmake6 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	emake
+	use gui && emake -C example
+	if use python; then
+		export PATH="$(qt6_get_bindir):${PATH}"
+		python_build() {
+			pushd "${S}" || die
+			sip-build || die
+			popd || die
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_test() {
+	pushd test || die "can't pushd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake6 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	doheader src/*.h
+	dolib.so libqhexedit.so*
+	if use python; then
+		python_install() {
+			pushd "${S}"/build || die
+			emake INSTALL_ROOT="${D}" install
+			popd || die
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+	if use gui; then
+		dobin example/qhexedit
+		insinto /usr/share/${PN}/
+		doins example/translations/*.qm
+	fi
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}