amd64/x86 stable wrt #226695

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

5 files changed, 13 insertions, 103 deletions

diff --git a/app-office/kletterwizard/ChangeLog b/app-office/kletterwizard/ChangeLog
index e6e572334344..ef8de8a9629d 100644
--- a/app-office/kletterwizard/ChangeLog
+++ b/app-office/kletterwizard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kletterwizard
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.29 2009/04/30 17:54:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.30 2009/10/19 15:05:24 ssuominen Exp $
+
+  19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/kletterwizard-0.9.6-gentoo.diff, -kletterwizard-0.9.7.ebuild,
+  -files/kletterwizard-0.9.7-gcc-4.1.patch, kletterwizard-0.9.8.ebuild:
+  amd64/x86 stable wrt #226695
 
   30 Apr 2009; Alexis Ballier <aballier@gentoo.org>
   kletterwizard-0.9.8.ebuild:
diff --git a/app-office/kletterwizard/files/kletterwizard-0.9.6-gentoo.diff b/app-office/kletterwizard/files/kletterwizard-0.9.6-gentoo.diff
deleted file mode 100644
index bcf3e9dad6f8..000000000000
--- a/app-office/kletterwizard/files/kletterwizard-0.9.6-gentoo.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- klw-latex/Makefile.orig	2004-07-25 15:51:58.775033528 -0400
-+++ klw-latex/Makefile	2004-07-25 15:52:15.329516864 -0400
-@@ -431,7 +431,6 @@
- 	-mkdir -p ${DOSSIER}/tex/latex/klw/
- 	cp klw.cls ${DOSSIER}/tex/latex/klw/
- 	cp rechnung.sty ${DOSSIER}/tex/latex/klw/
--	texhash
- 
- uninstall :
- 	-rm -rf ${DOSSIER}/tex/latex/klw
---- klw-latex/Makefile.am.orig	2004-07-25 15:51:43.225397432 -0400
-+++ klw-latex/Makefile.am	2004-07-25 15:52:24.384140352 -0400
-@@ -9,7 +9,6 @@
- 	-mkdir -p ${DOSSIER}/tex/latex/klw/
- 	cp klw.cls ${DOSSIER}/tex/latex/klw/
- 	cp rechnung.sty ${DOSSIER}/tex/latex/klw/
--	texhash
- 
- 
- uninstall :
---- klw-latex/Makefile.in.orig	2004-07-25 14:01:55.131939872 -0400
-+++ klw-latex/Makefile.in	2004-07-25 15:51:30.433342120 -0400
-@@ -244,7 +244,7 @@
- localstatedir = @localstatedir@
- mandir = @mandir@
- oldincludedir = @oldincludedir@
--prefix = @prefix@
-+prefix = ${DESTDIR}/@prefix@
- program_transform_name = @program_transform_name@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
-@@ -263,7 +263,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--DOSSIER = @texmfpath@
-+DOSSIER = ${DESTDIR}/@texmfpath@
- subdir = klw-latex
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-@@ -431,7 +431,6 @@
- 	-mkdir -p ${DOSSIER}/tex/latex/klw/
- 	cp klw.cls ${DOSSIER}/tex/latex/klw/
- 	cp rechnung.sty ${DOSSIER}/tex/latex/klw/
--	texhash
- 
- uninstall :
- 	-rm -rf ${DOSSIER}/tex/latex/klw
diff --git a/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch b/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch
deleted file mode 100644
index a7aba56b9d1a..000000000000
--- a/app-office/kletterwizard/files/kletterwizard-0.9.7-gcc-4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/klwletter.cpp.orig	2006-11-25 19:35:14.000000000 +0000
-+++ src/klwletter.cpp	2006-11-25 19:35:31.000000000 +0000
-@@ -228,7 +228,7 @@
- {
-     KProcess *proc = new KProcess;
-     *proc << klwSettings::latex();
--    *proc << " \\nonstopmode\\input\{" << letterTexfile->name() << "\}";
-+    *proc << " \\nonstopmode\\input{" << letterTexfile->name() << "}";
-     proc->setWorkingDirectory(letterTmpDir->name());
-     connect(proc,SIGNAL(processExited(KProcess* )),this,SLOT(letterBuildPS()));
-     proc->start();
diff --git a/app-office/kletterwizard/kletterwizard-0.9.7.ebuild b/app-office/kletterwizard/kletterwizard-0.9.7.ebuild
deleted file mode 100644
index e8abc282d406..000000000000
--- a/app-office/kletterwizard/kletterwizard-0.9.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.7.ebuild,v 1.8 2008/09/03 11:34:07 opfer Exp $
-
-inherit kde
-
-DESCRIPTION="KLetterWizard is a KDE application which simplifies letter writing and produces output via LaTeX."
-HOMEPAGE="http://www.kluenter.de/klw.html"
-SRC_URI="http://www.kluenter.de/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="kdeenablefinal"
-
-DEPEND="virtual/latex-base
-	|| ( =kde-base/kghostview-3.5* =kde-base/kdegraphics-3.5* )"
-RDEPEND="${DEPEND}"
-
-need-kde 3.4
-
-src_unpack() {
-	kde_src_unpack
-	epatch "${FILESDIR}/${PN}-0.9.6-gentoo.diff"
-	epatch "${FILESDIR}/${P}-gcc-4.1.patch"
-}
-
-src_compile() {
-	myconf="--with-texmf-path=/usr/share/texmf"
-	kde_src_compile
-}
-
-pkg_postinst() {
-	einfo "Running texhash to complete install..."
-	texhash
-}
diff --git a/app-office/kletterwizard/kletterwizard-0.9.8.ebuild b/app-office/kletterwizard/kletterwizard-0.9.8.ebuild
index f985c79ab734..ae24bc149c2b 100644
--- a/app-office/kletterwizard/kletterwizard-0.9.8.ebuild
+++ b/app-office/kletterwizard/kletterwizard-0.9.8.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.8.ebuild,v 1.10 2009/04/30 17:54:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.8.ebuild,v 1.11 2009/10/19 15:05:24 ssuominen Exp $
 
 inherit kde
 
 DESCRIPTION="KLetterWizard is a KDE application which simplifies letter writing and produces output via LaTeX."
 HOMEPAGE="http://www.kluenter.de/klw"
 SRC_URI="http://www.kluenter.de/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="kdeenablefinal"
 
 DEPEND="virtual/latex-base
-	|| ( =kde-base/kghostview-3.5* =kde-base/kdegraphics-3.5* )"
+	=kde-base/kghostview-3.5*"
 RDEPEND="${DEPEND}
 	|| ( >=dev-texlive/texlive-latexextra-2008 dev-tex/latex-unicode )"
 
-need-kde 3.4
+need-kde 3.5
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	kde_src_unpack
-	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_compile() {