gentoo auto-resync : 31:03:2025 - 01:33:08

10 files changed, 75 insertions, 310 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 61f37c449004..a59a3d67cb7a 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index e6486bc9dc09..80216af348bc 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,5 @@
 DIST frescobaldi-3.3.0.tar.gz 9196964 BLAKE2B 52e0c39e3a9fd70f5e450dd45cd0c0c0683b8c0af243d568e765f351500da138c0e527a579245c3d72e628d6a940003c62e1d70b6cff8ecb55d7214b7def8093 SHA512 0dc851cb2ab001f366d20d3c27159087a643cbb5661cc7388b9ec5209c03d4d47dc9114f378dab0562a1a4cb84c2a67eddd8b1981ceaa057e5ac79f8c277ad05
-EBUILD frescobaldi-3.3.0.ebuild 935 BLAKE2B fa6fd6b562360a69882bf6d8a4df081e378079f2fd4c7ad0d6ab2746a5984d955553801ccb05de0b14b9d86cd8ddd44d88079f206a7b8a9efb5d031aad967724 SHA512 9b6510cf70692abb8babda27569dd765a0f7a21d7ef9a95629e43dc4501ed97b6b400de685e058520a60598cf58b2d84d580e3d94d6d3c423c704524858d68c7
-MISC metadata.xml 438 BLAKE2B d6f42ae0b227211e9000c25a1eb3e371881df6c663891549abd7d878d7cfbf7a9a0e514d2f6b01530667667d4a4c55e7801c3ce5fddc7a13f3ad4448813ff898 SHA512 e94573420812bfbca28fe96cc047eb270ddae4f526fd0d1932893bb06ed3c22de1a76d81ca210cca6cbf7b76ab2ddb74b887a122ea54a92f9b05d1b581165ed9
+DIST frescobaldi-4.0.0.tar.gz 8647722 BLAKE2B d37fc55e7519cfbe2235736f0411461261936df34a454f318a9c26917546b6c39bfddf81c4fe521b1891192257ba14f7f7f159641e19993a056ea09121464739 SHA512 551d3681f0b80ef10cbc5ef33fcf61152a7063eb0bed46386711fcc424d9ecce28d6c11dd0a368d5a479bd4b92fb5e93d8de49545063a5d7175625fc37bcbf01
+EBUILD frescobaldi-3.3.0-r1.ebuild 942 BLAKE2B 036cf239cc6ef9f1ebdb5e6d716e3132efa7dda9c62973004d92179c47611ac2b75ba628ac242ed67c8bcaa582882d459c92f43afeedd696a9a22974d1769f87 SHA512 b7f59f8c97d94bda022334a2b11ef279a07f11fee4c171a15e88496fae4ec8e960b2027af3436f3c5e35d40c39a67444f89317fee08050754e9e6233e897ab75
+EBUILD frescobaldi-4.0.0.ebuild 1874 BLAKE2B c6743ce40654cbb9a7807cbff12b9dc010540dad488636731254ae603dae55d62521c44e8d12b70333516eb9cfd58900e1cc7c50647f7cc36e91293e87311ffe SHA512 443436030e7757cfbd18516dec8611d5b73edbb1a1beb8b79a8baeeb79913d67786dae9b8c6db93e5dfc4fb5a0217b30e3f724a5b773fa47416287419a0cec0a
+MISC metadata.xml 342 BLAKE2B 39146459578b0071408ae4ca7d8b327ac1dfcf06164935189d3f73685e9f1d5b41045e9fcb75401a4fec978c4c1304fb54269fe66d1774de957fef8444ccb255 SHA512 02e1b02918069d22268a5908a65a638eebc229968ef91ea562b1e863633c2432f7dfd9af1a227d2a961a7b9afc7d64bffa68251e84b13853d3834feda2031d27
diff --git a/media-sound/frescobaldi/frescobaldi-3.3.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.3.0-r1.ebuild
index cdc94e7c869c..5b96405240f3 100644
--- a/media-sound/frescobaldi/frescobaldi-3.3.0.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ DEPEND="
 	dev-python/pyqtwebengine[${PYTHON_USEDEP}]
 	dev-python/python-ly[${PYTHON_USEDEP}]
 	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
-	dev-python/qpageview[${PYTHON_USEDEP}]
+	<dev-python/qpageview-1.0.0[${PYTHON_USEDEP}]
 	media-sound/lilypond"
 RDEPEND="${DEPEND}
 	x11-themes/tango-icon-theme
diff --git a/media-sound/frescobaldi/frescobaldi-4.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-4.0.0.ebuild
new file mode 100644
index 000000000000..9ba380ed7786
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-4.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit desktop distutils-r1 xdg
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="https://frescobaldi.org/"
+SRC_URI="
+	https://github.com/frescobaldi/frescobaldi/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pyqt6-webengine[widgets,${PYTHON_USEDEP}]
+		dev-python/pyqt6[gui,network,printsupport,svg,webchannel,widgets,${PYTHON_USEDEP}]
+		dev-python/python-ly[${PYTHON_USEDEP}]
+		>=dev-python/qpageview-1.0.0[${PYTHON_USEDEP}]
+	')
+	media-libs/portmidi
+	media-sound/lilypond
+	x11-themes/tango-icon-theme
+"
+BDEPEND="
+	sys-devel/gettext
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# INSTALL.md suggests that we can do this to use tango-icon-theme
+	rm -r frescobaldi/icons/Tango || die
+
+	# formerly these commands used a Makefile, but they've been moved to
+	# tox.ini and do not really want to depend on tox just for this
+	"${EPYTHON}" i18n/mo-gen.py || die
+	msgfmt --desktop -d i18n/frescobaldi \
+		--template linux/org.frescobaldi.Frescobaldi.desktop.in \
+		-o linux/org.frescobaldi.Frescobaldi.desktop || die
+	msgfmt --xml -d i18n/frescobaldi \
+		--template linux/org.frescobaldi.Frescobaldi.metainfo.xml.in \
+		-o linux/org.frescobaldi.Frescobaldi.metainfo.xml || die
+}
+
+src_install() {
+	# messy workaround for https://github.com/frescobaldi/frescobaldi/issues/1898
+	python_domodule frescobaldi
+
+	distutils-r1_src_install
+
+	dodoc CHANGELOG.md
+	doman frescobaldi.1
+
+	domenu linux/org.frescobaldi.Frescobaldi.desktop
+	doicon frescobaldi/icons/org.frescobaldi.Frescobaldi.svg
+
+	insinto /usr/share/metainfo
+	doins linux/org.frescobaldi.Frescobaldi.metainfo.xml
+}
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
index e70342c0f856..4a89d4a2b6d0 100644
--- a/media-sound/frescobaldi/metadata.xml
+++ b/media-sound/frescobaldi/metadata.xml
@@ -5,12 +5,7 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-<!--
-	<use>
-		<flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
-	</use>
--->
 	<upstream>
-		<remote-id type="github">wbsoft/frescobaldi</remote-id>
+		<remote-id type="github">frescobaldi/frescobaldi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
deleted file mode 100644
index c6e1bb881c50..000000000000
--- a/media-sound/qtscrobbler/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX qtscrobbler-0.11_pre20130123-qt5.11.patch 697 BLAKE2B d60d5da77ab0a30d9ad89d24a10882ce91c85bf9959e5be6019c69b0db95c60d2e6d1c2cbf5a1fdd5494236ce5d78d9b5a5a05b9bea264db750c0f570cda85d0 SHA512 2edf71e6397dfdbb1aaeb38bca5b6a3b2a097b1a25038f62d1052cb5258cf94b12c26181fea76c64506ed60bfdeaa4968429836eb47e874aec273cdb480689ce
-AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
-DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1302 BLAKE2B 6267c31a06da179f7451816c300c823f77f108ae0b8c091f89dcea8f9ab2d2dcd2cc5d1617144af0182ec76ae23c2edcc66cb4d1dd18c273093627dafa86a5f9 SHA512 0f37c626871479ec245b676125b1c7d83aa3b47d3bd0f19970a6954f6b7d39695cbe9e3a1c2df8f9f4822d652527636cf07787c485f698690a79adba8b987f1e
-MISC metadata.xml 341 BLAKE2B 691487e77a389ce70ba49db73cfbccce357a1759e747c6902f8850fa3e2b4d630d6a4800a7346662b82ff9cd55303eaae8a519e52dbf9170d6d7e9e611713e09 SHA512 be5a62962317f826126534601a36dab7aff68bfe3459ee7f24e550b06f4ff1fd6cf96e1b77a6b6ae430e4f0dec7214fefa3a61ed0387350f33fca0394f5964ed
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
deleted file mode 100644
index 33781a4ee82f..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 11d70c80a634aaf1606a435688dddbc3db36b7ff Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 14 Jul 2018 15:35:25 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/qt/src/qtscrob.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qt/src/qtscrob.cpp b/src/qt/src/qtscrob.cpp
-index 5b7a561..c6084e3 100644
---- a/src/qt/src/qtscrob.cpp
-+++ b/src/qt/src/qtscrob.cpp
-@@ -17,6 +17,7 @@
-  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-  ***************************************************************************/
- 
-+#include <QHeaderView>
- #include <QtGui>
- #include <QTime>
- #include "qtscrob.h"
--- 
-2.18.0
-
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.patch
deleted file mode 100644
index 910471aca6c0..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.11_pre20130123-qt5.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-Origin: other, https://sourceforge.net/p/qtscrob/patches/15/
-Bug: https://sourceforge.net/p/qtscrob/patches/15/
-Bug-Debian: https://bugs.debian.org/875156
-Description: Port to Qt5
-
---- a/src/lib/gettrackinfo.cpp
-+++ b/src/lib/gettrackinfo.cpp
-@@ -58,7 +58,7 @@
-     data += "&track=" + QUrl::toPercentEncoding(track_info.title);
-     data += "&autocorrect=1";
-     time.restart();
--    manager->post(request, QByteArray(data.toAscii()));
-+    manager->post(request, QByteArray(data.toLatin1()));
- }
- 
- void GetTrackInfo::run()
---- a/src/lib/lib.pro
-+++ b/src/lib/lib.pro
-@@ -13,7 +13,8 @@
- QT += core \
-     network \
-     xml \
--    sql
-+    sql \
-+    widgets
- 
- QT -= gui
- LANGUAGE = C++
---- a/src/lib/parse-log.cpp
-+++ b/src/lib/parse-log.cpp
-@@ -153,9 +153,9 @@
-                 //right number of tabs in the line
-                 scrob_entry temp_entry;
- 
--                temp_entry.artist = QString::fromUtf8(log_entry[0].toAscii());
--                temp_entry.album = QString::fromUtf8(log_entry[1].toAscii());
--                temp_entry.title = QString::fromUtf8(log_entry[2].toAscii());
-+                temp_entry.artist = QString::fromUtf8(log_entry[0].toLatin1());
-+                temp_entry.album = QString::fromUtf8(log_entry[1].toLatin1());
-+                temp_entry.title = QString::fromUtf8(log_entry[2].toLatin1());
-                 temp_entry.tracknum = log_entry[3].toInt();
-                 temp_entry.length = log_entry[4].toInt();
-                 temp_entry.played = log_entry[5][0];
---- a/src/lib/submit.cpp
-+++ b/src/lib/submit.cpp
-@@ -151,7 +151,7 @@
-     submit_handshake.setHeader(QNetworkRequest::ContentTypeHeader,
-                                "application/x-www-form-urlencoded");
- 
--    QByteArray submit_data = QByteArray(data.toAscii());
-+    QByteArray submit_data = QByteArray(data.toLatin1());
-     nr_submit = nam_submit->post(submit_handshake, submit_data);
- }
- 
-@@ -251,7 +251,7 @@
-     QString time_str = QString::number(QDateTime::currentDateTime().toTime_t());
- 
-     QCryptographicHash auth_hash(QCryptographicHash::Md5);
--    auth_hash.addData(QString(context.password_hash + time_str).toAscii());
-+    auth_hash.addData(QString(context.password_hash + time_str).toLatin1());
-     QString auth = QString(auth_hash.result().toHex());
- 
-     QUrl url_handshake = QString( "http://%1/?hs=true&p=%2&c=%3&v=%4&u=%5&t=%6&a=%7" )
---- a/src/lib/submit.h
-+++ b/src/lib/submit.h
-@@ -20,7 +20,6 @@
- #define SUBMIT_H
- 
- #include <QtCore>
--#include <QHttp>
- #include <QNetworkAccessManager>
- #include <QNetworkProxy>
- #include <QNetworkReply>
---- a/src/qt/qt.pro
-+++ b/src/qt/qt.pro
-@@ -34,6 +34,7 @@
- TEMPLATE = app
- TARGET = qtscrob
- QT += gui
-+QT += widgets
- LANGUAGE = C++
- INCLUDEPATH += . \
-     src \
---- a/src/qt/src/about.h
-+++ b/src/qt/src/about.h
-@@ -22,6 +22,7 @@
- #include "ui_aboutWin.h"
- #include <QApplication>
- #include <QtGui>
-+#include <QLabel>
- 
- class QTScrob;
- 
---- a/src/qt/src/console.h
-+++ b/src/qt/src/console.h
-@@ -22,6 +22,11 @@
- #include <QTimer>
- #include <QApplication>
- #include <QtGui>
-+#include <QLabel> 
-+#include <QTextEdit>
-+#include <QDialog>
-+#include <QComboBox>
-+#include <QPushButton>
- 
- class QTScrob;
- class QTimer;
---- a/src/qt/src/help.h
-+++ b/src/qt/src/help.h
-@@ -21,6 +21,9 @@
- 
- #include <QApplication>
- #include <QtGui>
-+#include <QLabel> 
-+#include <QDialog>
-+#include <QTextEdit>
- 
- class QTScrob;
- 
---- a/src/qt/src/progress.h
-+++ b/src/qt/src/progress.h
-@@ -21,6 +21,13 @@
- 
- #include <QApplication>
- #include <QtGui>
-+#include <QLabel>
-+#include <QWidget>
-+#include <QProgressBar>
-+#include <QDialog>
-+#include <QFormLayout>
-+#include <QVBoxLayout>
-+#include <QPushButton>
- 
- class QTScrob;
- 
---- a/src/qt/src/qtscrob.cpp
-+++ b/src/qt/src/qtscrob.cpp
-@@ -41,7 +41,7 @@
- 	logTable->setHorizontalHeaderLabels(tableLabels);
- 	logTable->setAlternatingRowColors(true);
- 	logTable->setSelectionBehavior(QAbstractItemView::SelectRows);
--	logTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
-+	logTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-     logTable->installEventFilter(this);
- 
-     recalc_timestamp = scrob->get_gmt();
-@@ -600,7 +600,7 @@
- 		case 5:
- 			if (!logTable->item(r, c)->text().isEmpty())
- 			{
--				char rating = logTable->item(r, c)->text().toAscii().data()[0];
-+				char rating = logTable->item(r, c)->text().toLatin1().data()[0];
- 				if ('L' == rating || 'S' == rating)
- 					tmp.played = rating;
- 			}
---- a/src/qt/src/qtscrob.h
-+++ b/src/qt/src/qtscrob.h
-@@ -23,12 +23,20 @@
- #include <QtGui>
- #include <QApplication>
- #include <QMainWindow>
-+#include <QTableWidget>
-+#include <QMenu>
-+#include <QMenuBar>
-+#include <QStatusBar>
-+#include <QFile>
-+#include <QFileDialog>
-+#include <QTextEdit>
- #include <QMessageBox>
- #include <QByteArray>
- #include <QtDebug>
- #include <QSettings>
- #include <QDateTimeEdit>
- #include <QLabel>
-+#include <QWidget>
- #include "libscrobble.h"
- #include "common.h"
- #include "missingtimeprogress.h"
---- a/src/qtscrob.pro
-+++ b/src/qtscrob.pro
-@@ -1,4 +1,4 @@
--VER = $$find(QT_VERSION, ^4\\.[6-9]+.*)
-+VER = $$find(QT_VERSION, ^4\\.[6-9]+.*|^5)
- isEmpty(VER) {
-     message("Qt >= 4.6 required!")
-     !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION])
-@@ -17,6 +17,7 @@
- system($$QMAKE_LUPDATE -silent language/language.pro)
- system($$QMAKE_LRELEASE -silent language/language.pro)
- 
-+QT += widgets
- TEMPLATE=subdirs
- SUBDIRS=lib qt cli
- CONFIG += ordered
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
deleted file mode 100644
index 3f08f4b22c06..000000000000
--- a/media-sound/qtscrobbler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">qtscrob</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
deleted file mode 100644
index e599a6fea17d..000000000000
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT=33ed278b9b543554fd6a556fd391eb4c78faab07
-MY_PN=qtscrob
-MY_P=${MY_PN}-${PV}
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Updates last.fm profiles using information from supported portable music players"
-HOMEPAGE="http://qtscrob.sourceforge.net/"
-SRC_URI="https://sourceforge.net/code-snapshots/git/q/qt/${MY_PN}/code.git/${MY_PN}-code-${COMMIT}.zip -> ${P}.zip"
-S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	media-libs/libmtp:=
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt5.patch
-	"${FILESDIR}"/${P}-qt5.11.patch
-)
-
-src_configure() {
-	pushd src >/dev/null
-	eqmake5 ${MY_PN}.pro
-	popd >/dev/null
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	newbin src/cli/scrobbler qtscrobbler-cli
-
-	newbin src/qt/qtscrob qtscrobbler
-	newicon src/qt/resources/icons/256x256/qtscrob.png qtscrobbler.png
-	make_desktop_entry qtscrobbler QtScrobbler
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}