[gentoo-commits] proj/kde-sunset:master commit in: app-text/kding/, app-text/kding/files/

[gentoo-commits] proj/kde-sunset:master commit in: app-text/kding/, app-text/kding/files/

[Andreas Sturmlechner]

commit:     6fa105359b7dcc1be4aaaa030b5ea9c1a6142607
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 00:51:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 00:51:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6fa10535

app-text/kding: Import 0.6-r3 from before last-rites

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

 app-text/kding/files/kding-0.6-cmake.patch |  8 ++++++
 app-text/kding/files/kding-0.6-dtd.patch   | 20 +++++++++++++++
 app-text/kding/kding-0.6-r3.ebuild         | 40 ++++++++++++++++++++++++++++++
 app-text/kding/metadata.xml                |  4 ---
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/app-text/kding/files/kding-0.6-cmake.patch b/app-text/kding/files/kding-0.6-cmake.patch
new file mode 100644
index 00000000..bd6929ac
--- /dev/null
+++ b/app-text/kding/files/kding-0.6-cmake.patch
@@ -0,0 +1,8 @@
+diff -Naur kding-0.6.orig/CMakeLists.txt kding-0.6/CMakeLists.txt
+--- kding-0.6.orig/CMakeLists.txt	2009-09-20 14:09:48.000000000 +0200
++++ kding-0.6/CMakeLists.txt	2016-05-26 19:03:47.146777630 +0200
+@@ -1,3 +1,4 @@
++cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ project(kding)
+ 
+ find_package(KDE4 REQUIRED)

diff --git a/app-text/kding/files/kding-0.6-dtd.patch b/app-text/kding/files/kding-0.6-dtd.patch
new file mode 100644
index 00000000..f039b40f
--- /dev/null
+++ b/app-text/kding/files/kding-0.6-dtd.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/338466
+
+--- a/doc/de/index.docbook
++++ b/doc/de/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+     <!ENTITY kding "<application>KDing</application>">
+     <!ENTITY kappname "&kding;"><!-- Do *not* replace kappname-->
+     <!ENTITY % addindex "IGNORE">
+--- a/doc/en/index.docbook
++++ b/doc/en/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+     <!ENTITY kding "<application>KDing</application>">
+     <!ENTITY kappname "&kding;"><!-- Do *not* replace kappname-->
+     <!ENTITY % addindex "IGNORE">

diff --git a/app-text/kding/kding-0.6-r3.ebuild b/app-text/kding/kding-0.6-r3.ebuild
new file mode 100644
index 00000000..3b3fa6c9
--- /dev/null
+++ b/app-text/kding/kding-0.6-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="de"
+inherit kde4-base
+
+DESCRIPTION="KDE port of Ding, a dictionary lookup program"
+HOMEPAGE="http://www.rexi.org/software/kding/"
+SRC_URI="http://www.rexi.org/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="media-libs/libpng:0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dtd.patch"
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+src_prepare() {
+	sed -e "/Encoding=UTF-8/d" \
+		-i resources/kding.desktop || die "fixing .desktop file failed"
+
+	kde4-base_src_prepare
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# bug 510510
+	pngfix -q --out=out.png "${ED}/usr/share/icons/hicolor/22x22/apps/kding.png"
+	mv -f out.png "${ED}/usr/share/icons/hicolor/22x22/apps/kding.png" \
+	|| die "fixing broken png file failed"
+}

diff --git a/app-text/kding/metadata.xml b/app-text/kding/metadata.xml
index 38121bff..49883424 100644
--- a/app-text/kding/metadata.xml
+++ b/app-text/kding/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<maintainer>
-		<email>tgurr@gentoo.org</email>
-		<name>Timo Gurr</name>
-	</maintainer>
 	<longdescription lang="en">
 		KDing is a KDE port of Ding, a dictionary lookup program. It is
 		a simple program sitting in KDE's system tray that can translate