From aaf08f58199d07f4fb17b78f749e3318c17092e9 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 24 Dec 2024 11:03:37 +0100
Subject: [PATCH] libkomparediff2, revbump, drop older recipe (#11524)

---
 .../libkomparediff2-24.05.0.recipe            | 105 ------------------
 ....recipe => libkomparediff2-24.12.0.recipe} |   9 +-
 2 files changed, 3 insertions(+), 111 deletions(-)
 delete mode 100644 kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe
 rename kde-apps/libkomparediff2/{libkomparediff2_6-24.12.0.recipe => libkomparediff2-24.12.0.recipe} (91%)

diff --git a/kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe b/kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe
deleted file mode 100644
index c03c17015..000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-24.05.0.recipe
+++ /dev/null
@@ -1,105 +0,0 @@
-SUMMARY="Library to compare files and strings"
-DESCRIPTION="This package contains a library used to compare files and \
-strings, and is used in Kompare and KDevelop.
-
-This package is part of the KDE Software Development Kit module."
-HOMEPAGE="https://invent.kde.org/sdk/libkomparediff2/"
-COPYRIGHT="2010-2024 KDE Organisation"
-LICENSE="GNU LGPL v2"
-REVISION="1"
-SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/libkomparediff2-$portVersion.tar.xz"
-CHECKSUM_SHA256="22ba287702dc448b3c9f457ab60c6e4cbf68fb541cd83a67bd287aa05732300e"
-SOURCE_DIR="libkomparediff2-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-libVersion="5.4.0"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-
-PROVIDES="
-	libkomparediff2$secondaryArchSuffix = $portVersion
-	lib:libkomparediff2$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
-	lib:libKF5Codecs$secondaryArchSuffix
-	lib:libKF5ConfigCore$secondaryArchSuffix
-	lib:libKF5ConfigWidgets$secondaryArchSuffix
-	lib:libKF5CoreAddons$secondaryArchSuffix
-	lib:libKF5I18n$secondaryArchSuffix
-	lib:libKF5KIOCore$secondaryArchSuffix
-	lib:libKF5Service$secondaryArchSuffix
-	lib:libKF5WidgetsAddons$secondaryArchSuffix
-	lib:libKF5WindowSystem$secondaryArchSuffix
-	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libkomparediff2${secondaryArchSuffix}_devel = $portVersion
-	devel:libkomparediff2$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES_devel="
-	libkomparediff2$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
-	devel:libKF5Bookmarks$secondaryArchSuffix
-	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5Completion$secondaryArchSuffix
-	devel:libKF5ConfigCore$secondaryArchSuffix
-	devel:libKF5ConfigWidgets$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
-	devel:libKF5I18n$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
-	devel:libKF5JobWidgets$secondaryArchSuffix
-	devel:libKF5KIOCore$secondaryArchSuffix
-	devel:libKF5Service$secondaryArchSuffix
-	devel:libKF5Solid$secondaryArchSuffix
-	devel:libKF5WidgetsAddons$secondaryArchSuffix
-	devel:libKF5WindowSystem$secondaryArchSuffix
-	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Xml$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:g++$secondaryArchSuffix
-	cmd:make
-	cmd:python3
-	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
-	"
-
-BUILD()
-{
-	cmake -Bbuild -S. $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-	make -C build $jobArgs
-}
-
-INSTALL()
-{
-	make -C build install
-
-	prepareInstalledDevelLib \
-		libkomparediff2
-
-	packageEntries devel \
-		$libDir/cmake \
-		$developDir
-}
-
-TEST()
-{
-	make -C build test
-}
diff --git a/kde-apps/libkomparediff2/libkomparediff2_6-24.12.0.recipe b/kde-apps/libkomparediff2/libkomparediff2-24.12.0.recipe
similarity index 91%
rename from kde-apps/libkomparediff2/libkomparediff2_6-24.12.0.recipe
rename to kde-apps/libkomparediff2/libkomparediff2-24.12.0.recipe
index 9eb4b9ffc..c3c01c5de 100644
--- a/kde-apps/libkomparediff2/libkomparediff2_6-24.12.0.recipe
+++ b/kde-apps/libkomparediff2/libkomparediff2-24.12.0.recipe
@@ -18,7 +18,7 @@ libVersion="6.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	libkomparediff2_6$secondaryArchSuffix = $portVersion
+	libkomparediff2$secondaryArchSuffix = $portVersion
 	lib:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -42,14 +42,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libkomparediff2_6${secondaryArchSuffix}_devel = $portVersion
+	libkomparediff2${secondaryArchSuffix}_devel = $portVersion
 	devel:libkomparediff2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libkomparediff2_6$secondaryArchSuffix == $portVersion base
-	"
-CONFLICTS_devel="
-	libkomparediff2$secondaryArchSuffix
+	libkomparediff2$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="