Install resource file into non-deprecated location, patch provided by ulm in bug 219323

(Portage version: 2.1.4.4)

3 files changed, 46 insertions, 2 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index f450f75d9d33..c5a59a5b2d41 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.69 2008/04/24 12:24:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.70 2008/04/28 23:42:54 opfer Exp $
+
+*gnuplot-4.2.3-r1 (28 Apr 2008)
+
+  28 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/gnuplot-4.2.3-app-defaults.patch, -gnuplot-4.2.3.ebuild,
+  +gnuplot-4.2.3-r1.ebuild:
+  Install resource file into non-deprecated location, patch provided by ulm in
+  bug 219323
 
   24 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
   -files/gnuplot-4.0-filled-arrow.patch, -files/gnuplot-4.0-libggi.patch,
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
new file mode 100644
index 000000000000..4000c4418d85
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
@@ -0,0 +1,33 @@
+--- gnuplot-4.2.3-orig/share/Makefile.am	2008-03-05 04:38:59.000000000 +0100
++++ gnuplot-4.2.3/share/Makefile.am	2008-04-26 11:44:59.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ SUBDIRS = LaTeX
+ 
+-appdefaultdir = $(libdir)/X11/app-defaults
++appdefaultdir = /etc/X11/app-defaults
+ 
+ APPDEFAULTFILES = Gnuplot
+ 
+--- gnuplot-4.2.3-orig/share/Makefile.in	2008-03-08 21:06:28.000000000 +0100
++++ gnuplot-4.2.3/share/Makefile.in	2008-04-26 11:45:11.000000000 +0200
+@@ -190,7 +190,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ EXTRA_DIST = Gnuplot.app-defaults
+ SUBDIRS = LaTeX
+-appdefaultdir = $(libdir)/X11/app-defaults
++appdefaultdir = /etc/X11/app-defaults
+ APPDEFAULTFILES = Gnuplot
+ appdefault_DATA = $(APPDEFAULTFILES)
+ CLEANFILES = $(APPDEFAULTFILES)
+--- gnuplot-4.2.3-orig/src/gplt_x11.c	2007-12-10 00:55:27.000000000 +0100
++++ gnuplot-4.2.3/src/gplt_x11.c	2008-04-26 11:45:18.000000000 +0200
+@@ -4787,7 +4787,7 @@
+ */
+ #define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
+ 
+-#define AppDefDir "/usr/lib/X11/app-defaults"
++#define AppDefDir "/etc/X11/app-defaults"
+ #ifndef MAXHOSTNAMELEN
+ #define MAXHOSTNAMELEN 64
+ #endif
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.3.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild
index 7215f3fdc480..7d01ca5816db 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.3.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.3.ebuild,v 1.1 2008/04/24 12:19:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild,v 1.1 2008/04/28 23:42:54 opfer Exp $
 
 inherit eutils elisp-common multilib wxwidgets
 
@@ -63,6 +63,9 @@ src_unpack() {
 	# Texinfo source is already shipped, so separate preparation not needed
 	# and error-prone, see bug 194216
 	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
+	# Don't store resource files in deprecated location, reported upstream:
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
+	epatch "${FILESDIR}"/${P}-app-defaults.patch
 }
 
 src_compile() {