gentoo auto-resync : 19:11:2024 - 03:03:00

9 files changed, 6 insertions, 627 deletions

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 73cc7a0398f6..e625dd023672 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,13 +1,6 @@
 AUX qwt-5.2.3_p20210828-install-headers.patch 777 BLAKE2B e57833f3b77afcb0afa4b66d545e420b56f99d5f9a328eea7e029da0af7d445fee560c481c35fca00e8ee1c44b38485d5fe957a6013b88ee2ff8edd46335327a SHA512 999a2ef2059e2d78e0b37447e356ebd62a4b89bf59979ef526c7ef853cd6d75a639b6d4a1eb238de8f745e0295568be417f443d65ad983e880144875fb5b8c66
-AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201
-AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
-DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
 DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62
-DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
 DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d
-EBUILD qwt-5.2.3_p20210211.ebuild 2319 BLAKE2B b6062a5d1d7e0c4a42e6cac9ee80a0610a4e3ad4b0868f9806138f8d408c513abf5ae7ef5ecbfbde38b1e9398519ffc8bed798e6db7dfb2374e33c257fb337cc SHA512 2882706eb496ca52501c23d7da465122c4338648e6ef1b72ec202430b7437497568b1ba3e44b812a6ecc2048e00cc060640eaf88d7e8e4c138cfe48e0c0d7916
-EBUILD qwt-5.2.3_p20210828.ebuild 1298 BLAKE2B 950eb35cb193908ff6217d20275b21fa1e6ea45a20bf1f778fbeeae79bca9095f0e30ef289aebf5751b8f85fb7a9f2f6c66261f3424a00813c8ad56f9317d4c2 SHA512 28772fa4df3afaaffe9848a3178a36f7e9f46b6d140c02b8d5711a650f03cca0b69df8bb4156b52cdf50073cb6be5af7e39c834560115a368900a696cc3197af
-EBUILD qwt-6.1.5.ebuild 3207 BLAKE2B b2193f4722d6efd38cd0f4f79d7a43699ed14fa6bb22afdafb530c9a94e728183c88ce8c88cecb77024d01e0c1745d5dd7e792ebcd663888858865eac187ff59 SHA512 68a1b2ecb6cb79dda131717b23484cf85e4ead185bfc888fe0f992f14aaeed9a6ffbf0df562642e5aff39095383339114f4b49b008c98d0bb8aa5fea7536af68
-EBUILD qwt-6.2.0-r1.ebuild 3161 BLAKE2B 02a3817453b33dc76b563778c40f7cd6f24284e848c0bf0a6050f25b956ca53cbbb54847d471c6f028f4214db8bff799ff27edd233f98e586934d2e3dc6a5208 SHA512 4ac4b5c210444d93e5305dbffd89d50bb99938ac97694f295924a4ae5e9114e57d77cce38988bf7c83cf2f7ad59eddafadcc252ebaf169bb92bf8fa13c29968a
-EBUILD qwt-6.2.0-r3.ebuild 4237 BLAKE2B 9b765908125319eee6fd3c695bb8731ca13d758d0021dd49826293b3da30e856f1774a6d2fc08c0694091804925d1da6644212c548201c535a6d1d13276cdb21 SHA512 f98ae2bc2eea1224a4486671a66bb5fad0ea85daefdd10d8bb6413e9a73bdcd6b4d4e9f7123719ff0cc7a5e469cd867a0f744f32700beaa823d91125505d2058
-MISC metadata.xml 991 BLAKE2B 4f669bab45796e2bdeb95201f6f376ca4ba38f9143c5d5528532bfce996bc943b890d3838ea527bf5d58eb1e4af6cc3d7e3ab0360379aab394fec954ccda3498 SHA512 5343aaa93b8a882d8a2d98e060916a0683454e7f5d39e3d7d080aadc5a2bf45eb227c90009f6f2c9dbdb08664389166404ffdd8590fdd0a085c6769e3763306e
+EBUILD qwt-5.2.3_p20210828.ebuild 1298 BLAKE2B 183f99cdfb374e1546bb34bf63e6106ca4a1997b6d65e1a52c19488c4d0149757fdb68212f448cac6764faccdda4dab6233d75a47f91f88c2366f8fa0a324512 SHA512 3cbfec2c03536099cdd0928b59ad61b3a8e7c2068ecb2a7ad7d3e2ed3f6156c104101db8fc58ce3f5ebc9889d6c133484f8f260cac5fc71d958bd4aed29f1143
+EBUILD qwt-6.2.0-r3.ebuild 4237 BLAKE2B 348ac8b601cd7b359c87a1d5fd57fa6089e146be6dbdd10deeb4ccea66e21dab3609751f871f081c48e642d21835434613bc6fa465226de0e936b7c4e2907e30 SHA512 bd41493eba391fb40ef05a0c4aa12baaf179c284065214009af13abd993c8dea022cd5ba2aa326fe9125e90663dbce489419aaaafcd050c31c9ff943bc4447bd
+MISC metadata.xml 907 BLAKE2B 8d266b1f57bc3190aaa31b66008a7369b5839fd6afd7ba1397590d94b69ce86275f88616c94467229ee9274ba249c3c70dee28ad20c62d3746a2e7855849ab6b SHA512 23fb86847b6d9da0948ad7a1cc4c458da890eab2f1ca1a7ff1dc922b1e482c0de6c20c3787cb74e3ec22062be55febebd69dc307b95186af722e9c2d8c93b132
diff --git a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
deleted file mode 100644
index a225350990a0..000000000000
--- a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- qwt-6.0.2-orig/textengines/mathml/qwt_mml_document.cpp	2012-12-01 00:22:46.752106265 +1100
-+++ qwt-6.0.2/textengines/mathml/qwt_mml_document.cpp	2013-01-31 14:29:30.590197611 +1100
-@@ -4421,7 +4421,10 @@
-         if ( ok )
-             return value;
-         else
--            qWarning( "Could not convert %s to form", value_str.toLatin1().data() );
-+        {
-+            QByteArray value_str_ba = value_str.toLatin1();
-+            qWarning( "Could not convert %s to form", value_str_ba.data() );
-+        }
- 
-     }
- 
-@@ -4658,7 +4661,10 @@
-                 continue;
-             }
-             else
--                qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value.toLatin1().data() );
-+            {
-+                QByteArray value_ba = value.toLatin1();
-+                qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value_ba.data() );
-+            }
-         }
- 
-         // Relatively sized column, but we failed to parse the factor. Treat is like an auto
-@@ -5167,7 +5173,8 @@
-     double factor = factor_str.toFloat( &float_ok );
-     if ( !float_ok || factor < 0 )
-     {
--        qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
-+        QByteArray value_ba = value.toLatin1();
-+        qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
-         return 0;
-     }
- 
-@@ -5196,7 +5203,8 @@
-         unit_size = QwtMmlNode::interpretSpacing( "1" + pseudo_unit, &unit_ok );
-         if ( !unit_ok )
-         {
--            qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
-             return 0;
-         }
-     }
-@@ -5368,7 +5376,8 @@
-             return ( int )( em * factor );
-         else
-         {
--            qWarning( "interpretSpacing(): could not parse \"%sem\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretSpacing(): could not parse \"%sem\"", value_ba.data() );
-             if ( ok != 0 )
-                 *ok = false;
-             return 0;
-@@ -5384,7 +5393,8 @@
-             return ( int )( ex * factor );
-         else
-         {
--            qWarning( "interpretSpacing(): could not parse \"%sex\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretSpacing(): could not parse \"%sex\"", value_ba.data() );
-             if ( ok != 0 )
-                 *ok = false;
-             return 0;
-@@ -5406,7 +5416,8 @@
-         }
-         else
-         {
--            qWarning( "interpretSpacing(): could not parse \"%scm\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretSpacing(): could not parse \"%scm\"", value_ba.data() );
-             if ( ok != 0 )
-                 *ok = false;
-             return 0;
-@@ -5428,7 +5439,8 @@
-         }
-         else
-         {
--            qWarning( "interpretSpacing(): could not parse \"%smm\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretSpacing(): could not parse \"%smm\"", value_ba.data() );
-             if ( ok != 0 )
-                 *ok = false;
-             return 0;
-@@ -5450,7 +5462,8 @@
-         }
-         else
-         {
--            qWarning( "interpretSpacing(): could not parse \"%sin\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretSpacing(): could not parse \"%sin\"", value_ba.data() );
-             if ( ok != 0 )
-                 *ok = false;
-             return 0;
-@@ -5466,7 +5479,8 @@
-             return i;
-         else
-         {
--            qWarning( "interpretSpacing(): could not parse \"%spx\"", value.toLatin1().data() );
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretSpacing(): could not parse \"%spx\"", value_ba.data() );
-             if ( ok != 0 )
-                 *ok = false;
-             return 0;
-@@ -5478,7 +5492,8 @@
-     if ( float_ok && i >= 0 )
-         return i;
- 
--    qWarning( "interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretSpacing(): could not parse \"%s\"", value_ba.data() );
-     if ( ok != 0 )
-         *ok = false;
-     return 0;
-@@ -5503,7 +5518,8 @@
-         return ( int )( base * factor / 100.0 );
-     }
- 
--    qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value_ba.data() );
-     if ( ok != 0 )
-         *ok = false;
-     return 0;
-@@ -5528,7 +5544,8 @@
-         return pt_size;
-     }
- 
--    qWarning( "interpretPointSize(): could not parse \"%spt\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretPointSize(): could not parse \"%spt\"", value_ba.data() );
-     if ( ok != 0 )
-         *ok = false;
-     return 0;
-@@ -5737,7 +5754,8 @@
- */
- static const QwtMmlOperSpec *searchOperSpecData( const QString &name )
- {
--    const char *name_latin1 = name.toLatin1().data();
-+    QByteArray name_latin1_ba = name.toLatin1();
-+    const char *name_latin1 = name_latin1_ba.data();
- 
-     // binary search
-     // establish invariant g_oper_spec_data[begin].name < name < g_oper_spec_data[end].name
-@@ -5789,7 +5807,8 @@
-         if ( spec == 0 )
-             continue;
- 
--        const char *name_latin1 = name.toLatin1().data();
-+        QByteArray name_ba = name.toLatin1();
-+        const char *name_latin1 = name_ba.data();
- 
-         // backtrack to the first instance of name
-         while ( spec > g_oper_spec_data && qstrcmp( ( spec - 1 )->name, name_latin1 ) == 0 )
-@@ -5918,7 +5937,8 @@
-     if ( ok != 0 )
-         *ok = false;
- 
--    qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value_ba.data() );
- 
-     return QwtMml::NormalMV;
- }
-@@ -5938,7 +5958,8 @@
-     if ( ok != 0 )
-         *ok = false;
- 
--    qWarning( "interpretForm(): could not parse value \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretForm(): could not parse value \"%s\"", value_ba.data() );
-     return QwtMml::InfixForm;
- }
- 
-@@ -5959,7 +5980,8 @@
-     if ( ok != 0 )
-         *ok = false;
- 
--    qWarning( "interpretColAlign(): could not parse value \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretColAlign(): could not parse value \"%s\"", value_ba.data() );
-     return QwtMml::ColAlignCenter;
- }
- 
-@@ -5984,7 +6006,8 @@
-     if ( ok != 0 )
-         *ok = false;
- 
--    qWarning( "interpretRowAlign(): could not parse value \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretRowAlign(): could not parse value \"%s\"", value_ba.data() );
-     return QwtMml::RowAlignAxis;
- }
- 
-@@ -6018,7 +6041,8 @@
-     if ( ok != 0 )
-         *ok = false;
- 
--    qWarning( "interpretFrameType(): could not parse value \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretFrameType(): could not parse value \"%s\"", value_ba.data() );
-     return QwtMml::FrameNone;
- }
- 
-@@ -6030,7 +6054,8 @@
-     QStringList l = value_list.split( ' ' );
-     if ( l.count() != 2 )
-     {
--        qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list.toLatin1().data() );
-+        QByteArray value_list_ba = value_list.toLatin1();
-+        qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list_ba.data() );
-         if ( ok != 0 )
-             *ok = false;
-         return QwtMml::FrameSpacing( ( int )( 0.4 * em ), ( int )( 0.5 * ex ) );
-@@ -6089,7 +6114,10 @@
-         else if ( value == "bold" )
-             fn.setBold( true );
-         else
--            qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value.toLatin1().data() );
-+        {
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value_ba.data() );
-+        }
-     }
- 
-     if ( font_attr.contains( "fontstyle" ) )
-@@ -6100,7 +6128,10 @@
-         else if ( value == "italic" )
-             fn.setItalic( true );
-         else
--            qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value.toLatin1().data() );
-+        {
-+            QByteArray value_ba = value.toLatin1();
-+            qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value_ba.data() );
-+        }
-     }
- 
-     if ( font_attr.contains( "fontfamily" ) )
-@@ -6150,7 +6181,8 @@
- 
-     if ( ok != 0 )
-         *ok = false;
--    qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value.toLatin1().data() );
-+    QByteArray value_ba = value.toLatin1();
-+    qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value_ba.data() );
-     return fn;
- }
- 
diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
deleted file mode 100644
index f00ea604f5f4..000000000000
--- a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- textengines/mathml/mathml.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
-index 7032366..b1372f7 100644
---- a/textengines/mathml/mathml.pro
-+++ b/textengines/mathml/mathml.pro
-@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) {
- 
-     # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
-     # with including pri files: better don't use it
-+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
- 
-     greaterThan(QT_MAJOR_VERSION, 4) {
- 
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 4ae06e042f79..ff542ee0b955 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -14,7 +14,6 @@
   </longdescription>
   <use>
     <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
-    <flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
     <flag name="polar">Install the QwtPolar headers</flag>
   </use>
   <upstream>
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
deleted file mode 100644
index aa64d85aa9c9..000000000000
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-COMMIT="2a9f1ae2f394abf3a000906b507a0d925b1e4b25"
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
-SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="qwt"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-SLOT="5"
-IUSE="designer examples"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtsvg:5
-	designer? ( dev-qt/designer:5 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
-
-src_prepare() {
-	default
-	sed -e "/QwtVersion/s:5.2.2.:${PV/_*}:g" -i ${PN}.prf || die
-
-	cat > qwtconfig.pri <<-EOF || die
-		target.path = "${EPREFIX}/usr/$(get_libdir)"
-		headers.path = "${EPREFIX}/usr/include/qwt5"
-		doc.path = "${EPREFIX}/usr/share/doc/${PF}"
-		CONFIG += qt warn_on thread release
-		CONFIG += QwtDll QwtPlot QwtWidgets QwtSVGItem
-		VERSION = ${PV/_*}
-		QWT_VERSION = ${PV/_*}
-	EOF
-	use designer && echo "CONFIG += QwtDesigner" >> qwtconfig.pri
-	# Fails to compile with MathML enabled
-	#use mathml && echo "CONFIG += QwtMathML" >> qwtconfig.pri
-
-	cat >> qwtconfig.pri <<-EOF || die
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
-	EOF
-	sed -i -e 's/headers doc/headers/' src/src.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-}
-
-src_install () {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	doman doc/man/*/*
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF || die
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt5"
-			LIBS        += -lqwt
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}5
-		doins -r examples
-	fi
-
-	# avoid file conflict with qwt:6
-	# https://github.com/gbm19/qwt5-qt5/issues/2
-	pushd "${ED}/usr/share/man/man3/" || die
-		for f in *; do
-			mv ${f} ${f//.3/.5qt5.3} || die
-		done
-	popd || die
-}
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index 054f0a455778..aba2296dc521 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,8 +21,8 @@ SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.t
 S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
 
 LICENSE="qwt"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 SLOT="5"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
 IUSE="designer examples"
 
 DEPEND="
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
deleted file mode 100644
index 2a371e6e9b17..000000000000
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="6/1.5"
-IUSE="designer doc examples mathml opengl svg"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	opengl? (
-		dev-qt/qtopengl:5
-		virtual/opengl
-	)
-	svg? ( dev-qt/qtsvg:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES-6.1 README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
-	"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
-)
-
-src_prepare() {
-	default
-
-	cat > qwtconfig.pri <<-EOF || die
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
-		VERSION = ${PV/_*}
-		QWT_VERSION = ${PV/_*}
-	EOF
-
-	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
-	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
-	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	cat > qwtbuild.pri <<-EOF || die
-		QWT_CONFIG += qt warn_on thread release no_keywords
-	EOF
-
-	echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-
-	cat >> qwtconfig.pri <<-EOF || die
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
-	EOF
-	sed \
-		-e 's/target doc/target/' \
-		-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
-		-e "/^TARGET/s:qwt):qwt6-qt5):g" \
-		-i src/src.pro || die
-
-	sed \
-		-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
-		-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
-		-i qwt.prf designer/designer.pro examples/examples.pri \
-		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	cd examples || die
-	eqmake5 examples.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	if use mathml; then
-		sed \
-			-e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
-			-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
-	fi
-
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	einstalldocs
-
-	mkdir -p "${ED}"/usr/share/man/ || die
-	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
-		rmdir "${ED}"/usr/share/doc/${PF}/man || die
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF || die
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.2.0-r1.ebuild b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
deleted file mode 100644
index b521e25db7b9..000000000000
--- a/x11-libs/qwt/qwt-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="doc"
-DOCS_CONFIG_NAME="Doxyfile"
-DOCS_DEPEND="media-gfx/graphviz"
-
-inherit qmake-utils docs
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="6/2.0"
-IUSE="designer doc examples opengl svg"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	opengl? (
-		dev-qt/qtopengl:5
-		virtual/opengl
-	)
-	svg? ( dev-qt/qtsvg:5 )
-"
-RDEPEND="${DEPEND}"
-
-# tests require package to be already installed
-RESTRICT="test"
-
-DOCS=( CHANGES-6.2 README )
-
-src_prepare() {
-	default
-
-	cat > qwtconfig.pri <<-EOF || die
-		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
-		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
-		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
-		VER_MAJ = $(ver_cut 1)
-		VER_MIN = $(ver_cut 2)
-		VER_PAT = $(ver_cut 3)
-		VERSION = ${PV/_*}
-		QWT_VER_MAJ = $(ver_cut 1)
-		QWT_VER_MIN = $(ver_cut 2)
-		QWT_VER_PAT = $(ver_cut 3)
-		QWT_VERSION = ${PV/_*}
-	EOF
-
-	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
-	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
-	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
-	cat > qwtbuild.pri <<-EOF || die
-		QWT_CONFIG += qt warn_on thread release no_keywords
-		DEFINES += QWT_MOC_INCLUDE=1
-	EOF
-
-	echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-
-	cat >> qwtconfig.pri <<-EOF || die
-		QWT_INSTALL_PLUGINS   = "${EPREFIX}$(qt5_get_plugindir)/designer"
-		QWT_INSTALL_FEATURES  = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
-	EOF
-	sed \
-		-e 's/target doc/target/' \
-		-e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
-		-e "/^TARGET/s:qwt):qwt6-qt5):g" \
-		-e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so:g" \
-		-i src/src.pro || die
-
-	sed \
-		-e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
-		-e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
-		-i qwt.prf designer/designer.pro examples/examples.pri || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	# need doxyfilter.sh in PATH
-	PATH="${PATH}:${S}/doc/" docs_compile
-}
-
-src_test() {
-	cd tests || die
-	eqmake5 tests.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	mkdir -p "${ED}"/usr/share/man/ || die
-	mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
-		rmdir "${ED}"/usr/share/doc/${PF}/man || die
-
-	if use examples; then
-		# don't build examples - fix the qt files to build once installed
-		cat > examples/examples.pri <<-EOF || die
-			include( qwtconfig.pri )
-			TEMPLATE     = app
-			MOC_DIR      = moc
-			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
-			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
-			LIBS        += -lqwt6
-		EOF
-		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
-		cp *.pri examples/ || die
-		insinto /usr/share/${PN}6
-		doins -r examples
-	fi
-}
diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
index d8f403b3a93e..f0c77426cc17 100644
--- a/x11-libs/qwt/qwt-6.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -15,8 +15,8 @@ HOMEPAGE="https://qwt.sourceforge.io/"
 SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="qwt"
-KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="6/2.0"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc examples opengl polar +qt5 qt6 svg"
 REQUIRED_USE="|| ( qt5 qt6 )"