Add patch to fix saving in kpovmodeler.

(Portage version: 2.0.51.22-r3)

8 files changed, 124 insertions, 2 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 5c16152a20ad..b50f6230d685 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.206 2005/12/10 18:22:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.207 2005/12/11 09:55:51 greg_g Exp $
+
+*kdegraphics-3.5.0-r3 (11 Dec 2005)
+
+  11 Dec 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.5.0-kpovmodeler.patch, +kdegraphics-3.5.0-r3.ebuild:
+  Add patch to fix saving in kpovmodeler.
 
   10 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
   kdegraphics-3.4.3-r2.ebuild:
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r3 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r3
new file mode 100644
index 000000000000..44e671a5ef99
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r3
@@ -0,0 +1 @@
+MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.5.0-kpovmodeler.patch b/kde-base/kdegraphics/files/kdegraphics-3.5.0-kpovmodeler.patch
new file mode 100644
index 000000000000..bf31eac7c151
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-3.5.0-kpovmodeler.patch
@@ -0,0 +1,12 @@
+diff -Nur kdegraphics-3.5.0.orig/kpovmodeler/pmshell.cpp kdegraphics-3.5.0/kpovmodeler/pmshell.cpp
+--- kdegraphics-3.5.0.orig/kpovmodeler/pmshell.cpp	2005-09-10 10:18:54.000000000 +0200
++++ kdegraphics-3.5.0/kpovmodeler/pmshell.cpp	2005-12-11 09:35:08.000000000 +0100
+@@ -641,7 +641,7 @@
+ 
+ bool PMShell::overwriteURL( const KURL& u )
+ {
+-   int query = KMessageBox::Yes;
++   int query = KMessageBox::Continue;
+ 
+    if( u.isLocalFile( ) )
+    {
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild
new file mode 100644
index 000000000000..b67a430ef9c6
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild,v 1.1 2005/12/11 09:55:51 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gphoto2 imlib openexr opengl pdflib povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	gphoto2? ( media-libs/libgphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	media-libs/libart_lgpl
+	media-libs/lcms
+	dev-libs/fribidi
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	openexr? ( >=media-libs/openexr-1.2 )
+	povray? ( media-gfx/povray
+		  virtual/opengl )
+	pdflib? ( >=app-text/poppler-0.3.1 )"
+
+RDEPEND="${DEPEND}
+	tetex? (
+	|| ( >=app-text/tetex-2
+	     app-text/ptex
+	     app-text/cstetex
+	     app-text/dvipdfm ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/post-3.5.0-kdegraphics-CAN-2005-3193.diff ${FILESDIR}/kpdf-3.5.0-splitter-io.patch"
+
+# Fix saving in kpovmodeler (kde bug 116895). Applied for 3.5.1.
+PATCHES="${PATCHES} ${FILESDIR}/kdegraphics-3.5.0-kpovmodeler.patch"
+
+pkg_setup() {
+	if ! built_with_use virtual/ghostscript X; then
+		eerror "This package requires virtual/ghostscript compiled with X11 support."
+		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
+		die "Please reemerge virtual/ghostscript with USE=\"X\"."
+	fi
+	if use pdflib && ! built_with_use app-text/poppler qt; then
+		eerror "This package requires app-text/poppler compiled with Qt support."
+		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
+		die "Please reemerge app-text/poppler with USE=\"qt\"."
+	fi
+}
+
+src_compile() {
+	local myconf="$(use_with openexr) $(use_with pdflib poppler)
+	              $(use_with gphoto2 kamera)"
+
+	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
+	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+
+	kde_src_compile
+}
diff --git a/kde-base/kpovmodeler/ChangeLog b/kde-base/kpovmodeler/ChangeLog
index db081d68d014..b86ea837ffa3 100644
--- a/kde-base/kpovmodeler/ChangeLog
+++ b/kde-base/kpovmodeler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kpovmodeler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/ChangeLog,v 1.32 2005/12/10 22:26:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/ChangeLog,v 1.33 2005/12/11 09:56:53 greg_g Exp $
+
+*kpovmodeler-3.5.0-r1 (11 Dec 2005)
+
+  11 Dec 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.5.0-kpovmodeler.patch, +kpovmodeler-3.5.0-r1.ebuild:
+  Add patch to fix saving in kpovmodeler.
 
   10 Dec 2005; Bryan Østergaard <kloeri@gentoo.org
   kpovmodeler-3.4.3.ebuild:
diff --git a/kde-base/kpovmodeler/files/digest-kpovmodeler-3.5.0-r1 b/kde-base/kpovmodeler/files/digest-kpovmodeler-3.5.0-r1
new file mode 100644
index 000000000000..44e671a5ef99
--- /dev/null
+++ b/kde-base/kpovmodeler/files/digest-kpovmodeler-3.5.0-r1
@@ -0,0 +1 @@
+MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kpovmodeler/files/kdegraphics-3.5.0-kpovmodeler.patch b/kde-base/kpovmodeler/files/kdegraphics-3.5.0-kpovmodeler.patch
new file mode 100644
index 000000000000..bf31eac7c151
--- /dev/null
+++ b/kde-base/kpovmodeler/files/kdegraphics-3.5.0-kpovmodeler.patch
@@ -0,0 +1,12 @@
+diff -Nur kdegraphics-3.5.0.orig/kpovmodeler/pmshell.cpp kdegraphics-3.5.0/kpovmodeler/pmshell.cpp
+--- kdegraphics-3.5.0.orig/kpovmodeler/pmshell.cpp	2005-09-10 10:18:54.000000000 +0200
++++ kdegraphics-3.5.0/kpovmodeler/pmshell.cpp	2005-12-11 09:35:08.000000000 +0100
+@@ -641,7 +641,7 @@
+ 
+ bool PMShell::overwriteURL( const KURL& u )
+ {
+-   int query = KMessageBox::Yes;
++   int query = KMessageBox::Continue;
+ 
+    if( u.isLocalFile( ) )
+    {
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.5.0-r1.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..07029d1f5f86
--- /dev/null
+++ b/kde-base/kpovmodeler/kpovmodeler-3.5.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.5.0-r1.ebuild,v 1.1 2005/12/11 09:56:53 greg_g Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE: Modeler for POV-Ray Scenes"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+IUSE=""
+DEPEND="virtual/opengl
+	>=media-libs/freetype-2"
+RDEPEND="${DEPEND}
+	media-gfx/povray"
+
+# Fix saving in kpovmodeler (kde bug 116895). Applied for 3.5.1.
+PATCHES="${FILESDIR}/kdegraphics-3.5.0-kpovmodeler.patch"