[gentoo-commits] proj/kde-sunset:master commit in: kde-misc/kdiff3/

[gentoo-commits] proj/kde-sunset:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit:     fee11ad48376b892973f1570fa422f0fc5562733
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 01:23:08 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 01:23:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=fee11ad4

kde-misc/kdiff3: Import 0.9.98-r1 from before slot 4 removal

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 48 +++++++++++++++++++++++++++++++++
 kde-misc/kdiff3/metadata.xml            |  6 -----
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
new file mode 100644
index 00000000..99c8b0b0
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt/KDE based frontend to diff3"
+HOMEPAGE="http://kdiff3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE="qt5"
+
+DEPEND="
+	!qt5? ( dev-qt/qtcore:4
+		dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5 )
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# adapt to Gentoo paths
+	sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
+		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, -i src-QT4/kdiff3.pro || die
+}
+
+src_configure() {
+	if ! use qt5; then
+		eqmake4 "${S}"/src-QT4/kdiff3.pro
+	else
+		eqmake5 "${S}"/src-QT4/kdiff3.pro
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}

diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index dc4c89a3..7a38bb90 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -2,10 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<maintainer>
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<use>
-	</use>
 </pkgmetadata>

[gentoo-commits] proj/kde-sunset:master commit in: kde-misc/kdiff3/

[Andreas Sturmlechner]

commit:     8998ea26279a59fea3d28fee95c1d2af5dbced70
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 23:02:13 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 23:02:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=8998ea26

kde-misc/kdiff3: Drop IUSE=qt5, a weird option for SLOT=4

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 99c8b0b0..0d8efd8f 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
 DESCRIPTION="Qt/KDE based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
+HOMEPAGE="https://apps.kde.org/en/kdiff3"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="qt5"
+IUSE=""
 
 DEPEND="
-	!qt5? ( dev-qt/qtcore:4
-		dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5 )
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
 "
 RDEPEND="${DEPEND}
 	sys-apps/diffutils
@@ -36,11 +32,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if ! use qt5; then
-		eqmake4 "${S}"/src-QT4/kdiff3.pro
-	else
-		eqmake5 "${S}"/src-QT4/kdiff3.pro
-	fi
+	eqmake4 src-QT4/kdiff3.pro
 }
 
 src_install() {