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

Package-Manager: portage-2.1.4.4

4 files changed, 52 insertions, 7 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/Manifest b/sci-visualization/gnuplot/Manifest
index 573ba103b953..c0c3fec36d43 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 SHA1 dc566b4c6406c135e2505132fca598ea52da7b24 SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3
 AUX gnuplot-4.2.2-disable_texi_generation.patch 646 RMD160 ac2ed0785f72a6cc96ec10685f116a631ed80b78 SHA1 4d162a108fa2429d7aea49a416babc9b01124297 SHA256 922441e35ad4daefad70e3e2f7f1fe15b96f97d0b281f005eb70cd3130ad8f68
+AUX gnuplot-4.2.3-app-defaults.patch 1129 RMD160 72d9c4275012b227941beba1f9032df8a089c38b SHA1 b81575cd60656d587021ef2b92742342411da00b SHA256 f70abcc81c47613e6fbee2cc1d0962f12dde56392a3023c55eac1103b7143d12
 DIST gnuplot-4.2.2.tar.gz 2832174 RMD160 7364d283718d89c05652d7c25a841154caa2efd8 SHA1 991db8024f04e8cad300804bc2661e358fdcf348 SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91
 DIST gnuplot-4.2.3.tar.gz 2840611 RMD160 b4692db884c9da2f0d160f33f53c3d2aba65f36e SHA1 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491 SHA256 4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
 EBUILD gnuplot-4.2.2-r1.ebuild 5158 RMD160 442c819f61991a8a8cbdd75580f0e5f104a3eca5 SHA1 2bd01833889569b706829e8135f351753d42765f SHA256 fbde8c23eef98d14346526b9275da2f0c530d4866676a234c29f384d6435c37a
-EBUILD gnuplot-4.2.3.ebuild 5170 RMD160 bb05c6646762b7fc51508f3b74abdd4b7d218efb SHA1 aa4735301325af7019fcc801e83a28f35e3cbfc6 SHA256 84a77672792e691b783ea09a2f0eab20085562e4aa5af30ab4878fb3d710ec3b
-MISC ChangeLog 17094 RMD160 14f30abb8a1727d2c73725860de6d73dd438d4b3 SHA1 1af37e937454cdf63d13220a6b253e1f7260f238 SHA256 6262634b4a2ca188f2aede53da90b4c71c177786e2e7b47a119dbfb42ee6b291
+EBUILD gnuplot-4.2.3-r1.ebuild 5386 RMD160 0e2d4a62e0d872466d83073e66dc5bd881d9f067 SHA1 453eab96e756a84e6e3c81ad17ea0eeb3a3f1e99 SHA256 7712428f513bb7abf07a97804ebe2e2409e2ee93f741f0b3a948278372016fd2
+MISC ChangeLog 17369 RMD160 9f854b4dcdfab85d2b6a17f1eca9348dedbc7d10 SHA1 87ce07a91695be584d91f95ad0daa86ae0938b1d SHA256 9efc6f30343309aabf308edddd4be4421b3a7e00b861c248f975d09bf7a98f31
 MISC metadata.xml 217 RMD160 638a2f8a6696aef0ba64892bf3cd428a888546a3 SHA1 695d81d47b7947c020b99d5df45ad09930645c0a SHA256 28facc7a36b103a2edeb955f3dde1230ae5d5c8d02b786e1b39141b8c7341d9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgQfBYACgkQNQqtfCuFneOWLgCgj7Y0+t89D7flwia8BXoAsDTZ
-bp8An1FsBnPGbDEQG0m5MgHa4+L0UhnI
-=2/1K
+iEYEARECAAYFAkgWYQoACgkQNQqtfCuFnePtUwCgnCTCqiL5AwloGoRIHxDrINK4
+nwUAoI+ZKPrZaG1kN2Pc2yiVFaaHEYF7
+=KZgI
 -----END PGP SIGNATURE-----
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() {