gentoo auto-resync : 29:03:2025 - 00:32:15

6 files changed, 125 insertions, 4 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d4dd3b681631..13c78dbc5602 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index 3d3d05aeed51..5513f0adaf9c 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,3 +1,7 @@
+AUX libQGLViewer-2.9.1-fix_designer_plugin.patch 464 BLAKE2B 3c785d3be1fbdea81850cf6badb47a952974682d18f9415a11a1e6ee24c02077ffcedfdd2267bce704ec69613fa5e1cb7d159211870173b5d7d27fa6830537ba SHA512 12bc374d0924afad101c8cd5e39d7d7898540035067cfe5be867f4649ba9587fb5380bd35bf17f4c3990a7606c124359380cfb32151d4c86398313a03cbbe23a
+AUX libQGLViewer-2.9.1-rm_rpath.patch 495 BLAKE2B 6abcaae58368cf65a57b406aef97c2385fc881f6b7d90991d9f5f933e295d6b08a0c517297e6204e610ca88bd757c0cb9c439187c59c9944739584d9da4e99e8 SHA512 8d7245a3a923548792127be54c0febc623b37fe9e8605d784cef4c5f9317f1e4b05315301d49d7e6d9f70928ee341b2b2066d4112c961117ad8b06a26f2333cb
 DIST libQGLViewer-2.7.2.tar.gz 3135146 BLAKE2B a46df06a135821fcb7895d4d037ee422cd9041695c57601cb7dccad3e1c4905ccbcacad91e47a79aa4adc85550db572adbb2311b1254d8779aba12d8fb36b255 SHA512 888695e413aa42b62d029efd1313f8aa101b4529f51edcea6416b58f6281715f8cdf27289d8f60cf1b0cdceba204e43e8477d30166350f8d3e090e6a93d8d595
-EBUILD libQGLViewer-2.7.2.ebuild 1285 BLAKE2B 06005ae54ef4375ee390449745fed5eb312ffd21b7a3aa593fd3f0c0369d660e0dfd9c85c15c4d50bf981fba22053d11b5aa7efbc1c091a71411420b35e750e3 SHA512 73c35b848d1e0a2c8dbb14c17b6c6eff3d3c07507617bfd3165fc36df2e6ac33c226778dbf815f989739e4c620421b6bd3fd0d2d1b72e7a8b8e5a5cc1f66b060
+DIST libQGLViewer-2.9.1.tar.gz 2499763 BLAKE2B 19717964c0edf9f816e550b4dd6daf5040cca72a20525db78dd3e3c1a84fe8730a3f74f4b3065be0d4d905c10577f2948e993696427cdcc2f4add9f497eb0d86 SHA512 09bfc5c0f07e51625a9af0094b83f40f84ead55a67c6e492c9702521f58c6b461bc840382fb73b64d16ad71a0a2a75d04aa12a77a78ced0a19e0e784e8d36bd7
+EBUILD libQGLViewer-2.7.2.ebuild 1352 BLAKE2B 140b8afa918e4a419cc3d3ca28b09f914c2ce2dc2d1f9241374c397a3fe40a380a4828c8aa4d46ac41f81c85ef756ce661a2017f88918a23da27bb65428e4690 SHA512 ff750fe25e985330a83d39a00e90da0b6c90c977eed91dc4f388ce8e22a2735ecc74c16110dd4e91167ff2a9992a01990bf969b0bdb4f430a8d34d0b3beae4de
+EBUILD libQGLViewer-2.9.1.ebuild 1778 BLAKE2B d6561510cd1be65c0cdab0638632d701d87efc9cffb6da25423a9111ea076e4c3eebd8e77790228fb055cacdee7641b4bd947964b3b32d13cfb9f83b47e6a386 SHA512 3ab675f0709ba63e86c247792b9cb875695e08235249eb2da3f52b3f908dd4678c00c2361db27d0e4f40f532ef37700ede02ffa6f65711bf000fc5322df55e68
 MISC metadata.xml 433 BLAKE2B e9474eaf87637f5881165a58fb1f423f068dc9598629ae2e3f7d7a9a00fc0d7d3bd13aa30a96b77480c845d488eae83f257b578122a74312839c21031c973015 SHA512 d2c7395c92737f39275ef972d10d61285cfe8ddf25eff1a363a5d433d0e7ef457c18da1a837e269c7ccc1c975f9eacaec0acb266f95704190ce9441cf15d9754
diff --git a/x11-libs/libQGLViewer/files/libQGLViewer-2.9.1-fix_designer_plugin.patch b/x11-libs/libQGLViewer/files/libQGLViewer-2.9.1-fix_designer_plugin.patch
new file mode 100644
index 000000000000..534a08f2977f
--- /dev/null
+++ b/x11-libs/libQGLViewer/files/libQGLViewer-2.9.1-fix_designer_plugin.patch
@@ -0,0 +1,14 @@
+Set compat Qt6
+diff --git a/designerPlugin/designerPlugin.pro b/designerPlugin/designerPlugin.pro
+index 0bc3714..e8e2fec 100644
+--- a/designerPlugin/designerPlugin.pro
++++ b/designerPlugin/designerPlugin.pro
+@@ -26,7 +26,7 @@ INSTALLS += target
+ HEADERS = qglviewerPlugin.h
+ SOURCES = qglviewerPlugin.cpp
+ 
+-equals (QT_MAJOR_VERSION, 5) {
++greaterThan (QT_MAJOR_VERSION, 5) {
+   QT *= designer
+   CONFIG *= release
+   OTHER_FILES += designerplugindescription.json
diff --git a/x11-libs/libQGLViewer/files/libQGLViewer-2.9.1-rm_rpath.patch b/x11-libs/libQGLViewer/files/libQGLViewer-2.9.1-rm_rpath.patch
new file mode 100644
index 000000000000..ac99d89ed551
--- /dev/null
+++ b/x11-libs/libQGLViewer/files/libQGLViewer-2.9.1-rm_rpath.patch
@@ -0,0 +1,18 @@
+rm rpath
+diff --git a/examples/examples.pri b/examples/examples.pri
+index 5b0a6d0..6dfefb7 100644
+--- a/examples/examples.pri
++++ b/examples/examples.pri
+@@ -66,12 +66,6 @@ unix {
+                     LIB_NAME = QGLViewer-qt6
+                 }
+             }
+-
+-			isEmpty(QMAKE_LFLAGS_RPATH) {
+-				!plugin:QMAKE_LFLAGS += -Wl,-rpath,$${LIB_DIR_ABSOLUTE_PATH}
+-			} else {
+-				!plugin:QMAKE_RPATHDIR *= $${LIB_DIR_ABSOLUTE_PATH}
+-			}
+ 			LIBS *= -L$${LIB_DIR} -l$${LIB_NAME}
+ 		}
+ 	} else {
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
index ac6ea56e5114..321284bc48db 100644
--- a/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit flag-o-matic qmake-utils
 
 DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
-HOMEPAGE="http://www.libqglviewer.com"
-SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+HOMEPAGE="https://github.com/GillesDebunne/libQGLViewer"
+SRC_URI="https://github.com/GillesDebunne/libQGLViewer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/qt5"
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.9.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.9.1.ebuild
new file mode 100644
index 000000000000..0c3c69d45c9a
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.9.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake qmake-utils
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="https://github.com/GillesDebunne/libQGLViewer"
+SRC_URI="https://github.com/GillesDebunne/libQGLViewer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,opengl,widgets,xml]
+	virtual/glu
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	designer? ( dev-qt/qttools[designer] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.1-fix_designer_plugin.patch
+	"${FILESDIR}"/${PN}-2.9.1-rm_rpath.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# copy srcdir to use as docdir after
+	if use examples; then
+		cp -R "${S}"/examples "${S}"/examples-src || die
+	fi
+}
+
+src_configure() {
+	cmake_src_configure
+
+	if use designer; then
+		pushd designerPlugin || die
+			eqmake6 designerPlugin.pro \
+				LIB_NAME="QGLViewer" \
+				LIBS="-L${BUILD_DIR}" \
+				NO_QT_VERSION_SUFFIX="yes"
+		popd || die
+	fi
+
+	if use examples; then
+		pushd examples || die
+			eqmake6 examples.pro \
+				LIB_NAME="QGLViewer" \
+				LIBS="-L${BUILD_DIR}" \
+				NO_QT_VERSION_SUFFIX="yes"
+		popd || die
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use designer && emake -C designerPlugin
+
+	use examples && emake -C examples
+}
+
+src_install() {
+	local HTML_DOCS=( doc )
+
+	use designer && emake -C designerPlugin INSTALL_ROOT="${D}" install
+
+	if use examples; then
+		exeinto /usr/share/${PN}/examples/bin
+		doexe $(find "${S}"/examples -type f -executable ! -name '*.vcproj' ! -name 'make*')
+
+		docinto examples
+		dodoc -r "${S}"/examples-src/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	cmake_src_install
+}