Version bump thanks to Alexander Stein, fixes bug #278387.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 25 insertions, 179 deletions

diff --git a/app-text/kding/ChangeLog b/app-text/kding/ChangeLog
index 4e8f55be311e..8b4a22024e13 100644
--- a/app-text/kding/ChangeLog
+++ b/app-text/kding/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/kding
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kding/ChangeLog,v 1.8 2009/07/08 20:36:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kding/ChangeLog,v 1.9 2009/07/28 20:58:17 tgurr Exp $
+
+*kding-0.5 (28 Jul 2009)
+
+  28 Jul 2009; Timo Gurr <tgurr@gentoo.org> -kding-0.4.1.ebuild,
+  -files/kding-0.4.1-appsdir.patch, -files/kding-0.4.1-desktopentry.patch,
+  -files/kding-0.4.1-localization-de.patch, +kding-0.5.ebuild:
+  Version bump thanks to Alexander Stein, fixes bug #278387.
 
   08 Jul 2009; Markus Meier <maekke@gentoo.org> kding-0.4.3.ebuild:
   amd64 stable, bug #226699
diff --git a/app-text/kding/files/kding-0.4.1-appsdir.patch b/app-text/kding/files/kding-0.4.1-appsdir.patch
deleted file mode 100644
index df2ff5de5aaa..000000000000
--- a/app-text/kding/files/kding-0.4.1-appsdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur kding-0.4.1/acinclude.m4 kding-0.4.1.new/acinclude.m4
---- kding-0.4.1/acinclude.m4	2007-08-15 00:10:53.000000000 +0200
-+++ kding-0.4.1.new/acinclude.m4	2007-08-16 16:01:53.931649708 +0200
-@@ -431,7 +431,7 @@
-     kde_htmldir='\${datadir}/doc/HTML'
-   fi
-   if test -z "$kde_appsdir"; then
--    kde_appsdir='\${datadir}/applnk'
-+    kde_appsdir='\${datadir}/applications'
-   fi
-   if test -z "$kde_icondir"; then
-     kde_icondir='\${datadir}/icons'
-diff -Naur kding-0.4.1/admin/acinclude.m4.in kding-0.4.1.new/admin/acinclude.m4.in
---- kding-0.4.1/admin/acinclude.m4.in	2007-08-15 00:10:53.000000000 +0200
-+++ kding-0.4.1.new/admin/acinclude.m4.in	2007-08-16 16:02:25.633813343 +0200
-@@ -431,7 +431,7 @@
-     kde_htmldir='\${datadir}/doc/HTML'
-   fi
-   if test -z "$kde_appsdir"; then
--    kde_appsdir='\${datadir}/applnk'
-+    kde_appsdir='\${datadir}/applications'
-   fi
-   if test -z "$kde_icondir"; then
-     kde_icondir='\${datadir}/icons'
-diff -Naur kding-0.4.1/src/Makefile.am kding-0.4.1.new/src/Makefile.am
---- kding-0.4.1/src/Makefile.am	2007-08-15 00:10:53.000000000 +0200
-+++ kding-0.4.1.new/src/Makefile.am	2007-08-16 16:03:15.762165949 +0200
-@@ -30,7 +30,7 @@
- kde_kcfg_DATA = kding.kcfg
- 
- # this is where the desktop file will go 
--shelldesktopdir   = $(kde_appsdir)/Utilities
-+shelldesktopdir   = $(kde_appsdir)/kde
- shelldesktop_DATA = kding.desktop
- 
- # this is where the shell's XML-GUI resource file goes
-diff -Naur kding-0.4.1/src/Makefile.in kding-0.4.1.new/src/Makefile.in
---- kding-0.4.1/src/Makefile.in	2007-08-15 00:17:13.000000000 +0200
-+++ kding-0.4.1.new/src/Makefile.in	2007-08-16 16:03:48.074236540 +0200
-@@ -378,7 +378,7 @@
- kde_kcfg_DATA = kding.kcfg
- 
- # this is where the desktop file will go 
--shelldesktopdir = $(kde_appsdir)/Utilities
-+shelldesktopdir = $(kde_appsdir)/kde
- shelldesktop_DATA = kding.desktop
- 
- # this is where the shell's XML-GUI resource file goes
-
diff --git a/app-text/kding/files/kding-0.4.1-desktopentry.patch b/app-text/kding/files/kding-0.4.1-desktopentry.patch
deleted file mode 100644
index 7ceba8f72243..000000000000
--- a/app-text/kding/files/kding-0.4.1-desktopentry.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur kding-0.4.1/src/kding.desktop kding-0.4.1.new/src/kding.desktop
---- kding-0.4.1/src/kding.desktop       2007-09-09 17:30:04.000000000 +0200
-+++ kding-0.4.1.new/src/kding.desktop   2007-09-25 09:53:00.217229625 +0200
-@@ -1,5 +1,6 @@
- [Desktop Entry]
--Encoding=UTF-8
-+Version=1.0
-+Type=Application
- Name=KDing
- GenericName=German-English Translator
- GenericName[de]=Deutsch-Englisch Übersetzer
-@@ -7,4 +8,4 @@
- Comment[de]=Übersetzungsprogramm
- Exec=kding
- Icon=kding
--Type=Application
-+Categories=Qt;KDE;Office;TextTools;Dictionary;
diff --git a/app-text/kding/files/kding-0.4.1-localization-de.patch b/app-text/kding/files/kding-0.4.1-localization-de.patch
deleted file mode 100644
index f0b6270a8607..000000000000
--- a/app-text/kding/files/kding-0.4.1-localization-de.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur kding-0.4.1/po/de.po kding-0.4.1.new/po/de.po
---- kding-0.4.1/po/de.po	2007-09-09 17:31:16.000000000 +0200
-+++ kding-0.4.1.new/po/de.po	2007-09-25 09:59:33.538226041 +0200
-@@ -41,7 +41,7 @@
- 
- #: kdingsystray.cpp:47
- msgid "Translates the current content of the clipboard or selection"
--msgstr "Übersetzt den aktuellen Inhalt der Zwischenablage oder der Auswahl"
-+msgstr "Übersetzt den aktuellen Inhalt der Zwischenablage oder der Auswahl."
- 
- #: kdingsystray.cpp:49
- msgid "Open translation dialog"
-@@ -49,7 +49,7 @@
- 
- #: kdingsystray.cpp:50
- msgid "Opens a dialog where you can enter the word to be translated"
--msgstr "Öffnet einen Dialog, in dem man das zu übersetzende Wort eingeben kann"
-+msgstr "Öffnet einen Dialog, in dem man das zu übersetzende Wort eingeben kann."
- 
- #: kdingsystray.cpp:58
- msgid "&Translate"
-@@ -65,7 +65,7 @@
- 
- #: main.cpp:31
- msgid "Translate the given phrase"
--msgstr "Übersetzt den angegebenen Ausdruck"
-+msgstr "Übersetzt den angegebenen Ausdruck."
- 
- #: main.cpp:38
- msgid "KDE port of Ding, the DIctionary Nice Grep"
-@@ -86,7 +86,7 @@
- #: rc.cpp:6 rc.cpp:12
- #, no-c-format
- msgid "Enter the word or phrase you want to translate"
--msgstr "Geben sie das Wort oder den Ausdruck ein, den Sie übersetzen möchten"
-+msgstr "Geben Sie das Wort oder den Ausdruck ein, den Sie übersetzen möchten."
- 
- #. i18n: file ./translatedialogbase.ui line 102
- #: rc.cpp:9
-@@ -124,11 +124,11 @@
- 
- #: translatedialog.cpp:101
- msgid "Searching for '%1'"
--msgstr "Suche nach '%1'"
-+msgstr "Suche nach '%1'."
- 
- #: translatedialog.cpp:108
- msgid "Another search is currently running"
--msgstr "Es läuft bereits eine Suche"
-+msgstr "Es läuft bereits eine Suche."
- 
- #: translatedialog.cpp:162
- #, c-format
-@@ -136,8 +136,8 @@
- "_n: Found 1 match for '%1'\n"
- "Found %n matches for '%1'"
- msgstr ""
--"Einen passenden Eintrag gefunden für '%1'\n"
--"%n passende Einträge gefunden für '%1'"
-+"Einen passenden Eintrag gefunden für '%1'.\n"
-+"%n passende Einträge gefunden für '%1'."
- 
- #: translatedialog.cpp:203
- msgid ""
-
diff --git a/app-text/kding/kding-0.4.1.ebuild b/app-text/kding/kding-0.4.1.ebuild
deleted file mode 100644
index cbcf25a85ace..000000000000
--- a/app-text/kding/kding-0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kding/kding-0.4.1.ebuild,v 1.4 2009/06/14 09:52:05 scarabeus Exp $
-
-inherit eutils kde
-
-DESCRIPTION="KDing is a 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="3.5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-need-kde 3.5
-
-LANGS="de"
-LANGS_DOC="de en"
-
-for X in ${LANGS} ${LANGS_DOC} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_unpack() {
-	kde_src_unpack
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-desktopentry.patch"
-	epatch "${FILESDIR}/${P}-appsdir.patch"
-	epatch "${FILESDIR}/${P}-localization-de.patch"
-
-	local MAKE_LANGS
-	cd "${WORKDIR}/${P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"
-	done
-	sed -i -e "s:POFILES =.*:POFILES = ${MAKE_LANGS}:" Makefile.am
-
-	MAKE_LANGS=""
-	cd "${WORKDIR}/${P}/doc"
-	for X in ${LANGS_DOC} ; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}"
-	done
-	sed -i -e "s:SUBDIRS =.*:SUBDIRS = ${MAKE_LANGS}:" Makefile.am
-	rm -f "${S}"/configure
-}
diff --git a/app-text/kding/kding-0.5.ebuild b/app-text/kding/kding-0.5.ebuild
new file mode 100644
index 000000000000..2b77c8821f5d
--- /dev/null
+++ b/app-text/kding/kding-0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kding/kding-0.5.ebuild,v 1.1 2009/07/28 20:58:17 tgurr Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="de"
+inherit kde4-base
+
+DESCRIPTION="KDing is a 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"