[gentoo-commits] repo/gentoo:master commit in: app-text/cb2bib/, app-text/cb2bib/files/

[gentoo-commits] repo/gentoo:master commit in: app-text/cb2bib/, app-text/cb2bib/files/

[Andreas Sturmlechner]

commit:     4cc0170e0d596a3e71d443076e9018b74f8719ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  3 19:41:35 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  3 19:52:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc0170e

app-text/cb2bib: add 2.0.2, EAPI 7 -> 8, unbundle qtsingleapplication

- Drop dev-qt/qtwebengine - thx to Pere Constans for making me aware of the
  option and low impact on feature loss.
- Use optfeature instead of elog messages.

Closes: https://bugs.gentoo.org/489152
Bug: https://bugs.gentoo.org/953061
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/cb2bib/Manifest                           |  1 +
 app-text/cb2bib/cb2bib-2.0.2.ebuild                | 57 ++++++++++++++++++++++
 app-text/cb2bib/files/cb2bib-2.0.2-qmake.patch     | 49 +++++++++++++++++++
 ...cb2bib-2.0.2-unbundle-qtsingleapplication.patch | 27 ++++++++++
 4 files changed, 134 insertions(+)

diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 94794685346a..f1a59fae60a2 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1 +1,2 @@
 DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
+DIST cb2bib-2.0.2.tar.gz 1366292 BLAKE2B 7d2657103cf6aeedf343111794b613c037fae3ca3cf57c52d9eb25470142a87ec2f39927673ed5662809f1caf861e29ef011d1563ee18b0a05aac1909d577e9d SHA512 cb367fc043b837e131559832ad36b0fa3a5c619d1694d2a08e6086d4c48ae1d06171b46b4992154ce185322e29389a261092ea1b17ea90c02e58df9cf171d9c1

diff --git a/app-text/cb2bib/cb2bib-2.0.2.ebuild b/app-text/cb2bib/cb2bib-2.0.2.ebuild
new file mode 100644
index 000000000000..ae177e4bfebd
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-2.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature qmake-utils xdg
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="https://www.molspaces.com/cb2bib/"
+SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+# build system supports lzo, lzsse, qt_zlib, avx2, but too painful to expose
+
+DEPEND="
+	app-arch/lz4:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsingleapplication
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS CHANGELOG COPYRIGHT )
+
+PATCHES=(
+	"${FILESDIR}/${P}-qmake.patch" # bug 953061
+	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" # bug 489152
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	# bug #709940, still needed as of 2.0.2
+	emake -j1
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "displaying mathematical notation" "media-fonts/jsmath"
+	optfeature "proper UTF-8 metadata writing in PDF text strings" "media-libs/exiftool"
+	optfeature "BibTeX file correctness checks and nice printing via bib2pdf shell script" "virtual/latex-base"
+	optfeature_header "Install additional packages for optional import data formats:"
+	optfeature "PDF files" "app-text/poppler[utils]"
+	optfeature "DVI files" "app-text/dvipdfm"
+	optfeature "ISI files, endnote format" "app-text/bibutils"
+}

diff --git a/app-text/cb2bib/files/cb2bib-2.0.2-qmake.patch b/app-text/cb2bib/files/cb2bib-2.0.2-qmake.patch
new file mode 100644
index 000000000000..f589cd928a06
--- /dev/null
+++ b/app-text/cb2bib/files/cb2bib-2.0.2-qmake.patch
@@ -0,0 +1,49 @@
+From 5703387d1a720eb8b02e9e1c35e7d06158df9167 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 3 Apr 2025 21:38:10 +0200
+Subject: [PATCH] Disable qtwebkit, qtwebengine, installation of
+ AUTHORS/COPYRIGHT/LICENSE/CHANGELOG files
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/src.pro | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index c5f1523..b19104c 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -130,10 +130,10 @@ LIBS += -lc2b
+ QMAKE_LIBDIR += .
+ INCLUDEPATH += c2b .
+ 
+-qtHaveModule(webkitwidgets){
++false{
+     CONFIG += use_webkit
+ } else {
+-qtHaveModule(webenginewidgets){
++false{
+     CONFIG += use_webengine
+ }}
+ CONFIG(use_webkit) {
+@@ -203,7 +203,7 @@ desktop.files += ../c2bscripts/cb2bib.desktop ../c2bscripts/c2bciter.desktop ../
+ desktop.path = /usr/share/applications
+ icons.files += ../src/icons/cb2bib.png
+ icons.path = /usr/share/pixmaps
+-cb2bibdata.files += ../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG ../data ../c2btools ../testPDFImport
++cb2bibdata.files +=  ../data ../c2btools ../testPDFImport
+ cb2bibdata.path = /usr/share/cb2bib
+ cb2bibdoc.files += ../doc/cb2bib_user_manual.pdf
+ cb2bibdoc.path = /usr/share/cb2bib/doc
+@@ -217,7 +217,7 @@ INSTALLS += target script cb2bibdata
+ target.path = /Applications
+ script.files += ../c2bscripts/c2bimport ../c2bscripts/c2bciter
+ script.path = /Applications
+-cb2bibdata.files += ../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG ../data ../doc ../c2btools ../testPDFImport
++cb2bibdata.files +=  ../data ../doc ../c2btools ../testPDFImport
+ cb2bibdata.path = Contents/Resources
+ QMAKE_BUNDLE_DATA += script cb2bibdata
+ #   Set this directory if third party tools, like pdftotext are packaged
+-- 
+2.49.0
+

diff --git a/app-text/cb2bib/files/cb2bib-2.0.2-unbundle-qtsingleapplication.patch b/app-text/cb2bib/files/cb2bib-2.0.2-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..3aa85f8c422a
--- /dev/null
+++ b/app-text/cb2bib/files/cb2bib-2.0.2-unbundle-qtsingleapplication.patch
@@ -0,0 +1,27 @@
+From 2716710a85806c8fa88e6555a4d833b149bc2718 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 3 Apr 2025 21:43:11 +0200
+Subject: [PATCH] Unbundle qtsingleapplication
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/src.pro | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index b19104c..d65e904 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -120,8 +120,7 @@ SOURCES += bookmarkPlugin.cpp \
+            findDialog.cpp \
+            main.cpp
+ 
+-HEADERS += $$files(qtsingleapplication/src/*.h)
+-SOURCES += $$files(qtsingleapplication/src/*.cpp)
++CONFIG += qtsingleapplication
+ 
+ TEMPLATE = app
+ QT += widgets network
+-- 
+2.49.0
+