Added a patch for bug #49263 and corrected the header.

4 files changed, 64 insertions, 6 deletions

diff --git a/media-gfx/gnuplot/ChangeLog b/media-gfx/gnuplot/ChangeLog
index 13ed2c8f9d0d..6fee15154ea5 100644
--- a/media-gfx/gnuplot/ChangeLog
+++ b/media-gfx/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gnuplot
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.21 2004/05/04 23:33:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.22 2004/05/05 09:25:13 phosphan Exp $
+
+  05 May 2004; Patrick Kursawe <phosphan@gentoo.org> gnuplot-4.0.ebuild,
+  files/header-order.patch:
+  Added a patch for bug #49263 and corrected the header.
 
   05 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnuplot-3.8j.ebuild:
   Stable on alpha.
diff --git a/media-gfx/gnuplot/Manifest b/media-gfx/gnuplot/Manifest
index e434179852fd..051a6bbb366e 100644
--- a/media-gfx/gnuplot/Manifest
+++ b/media-gfx/gnuplot/Manifest
@@ -1,9 +1,10 @@
+MD5 a23c60fdafd8402d71b5a82d8a6e1e17 gnuplot-4.0.ebuild 2586
+MD5 7afe79c8a75e26908208231e5b73da0d gnuplot-3.8j.ebuild 2025
 MD5 f38a51b410daedd92961561c04307b74 gnuplot-3.8j-r1.ebuild 2150
-MD5 5a3ec31be79c93af586ce99f9eaac9c6 gnuplot-4.0.ebuild 2377
+MD5 b13378c34fd407fe79246bf1e029f593 ChangeLog 3547
 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
-MD5 7afe79c8a75e26908208231e5b73da0d gnuplot-3.8j.ebuild 2025
-MD5 721d01076a12446bd0c50a7af1c3cdfb ChangeLog 3386
-MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329
-MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0 66
 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j 67
+MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
+MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0 66
 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j-r1 67
+MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329
diff --git a/media-gfx/gnuplot/files/header-order.patch b/media-gfx/gnuplot/files/header-order.patch
new file mode 100644
index 000000000000..82ba590fcb2b
--- /dev/null
+++ b/media-gfx/gnuplot/files/header-order.patch
@@ -0,0 +1,44 @@
+--- src/term.h	2004-04-13 19:24:02.000000000 +0200
++++ src/term.h.new	2004-05-05 11:16:41.216200736 +0200
+@@ -270,6 +270,20 @@
+ /****************************************************************************/
+ /* These terminals can be used on any system */
+ 
++/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */
++/* There are 2 flavors of PNG support                                        */
++/* If you are using an old version of libgd in order to get true GIF support */
++/* then the best we can do is use a separate poor-quality PNG driver png.trm */
++/* But if you are using a newer libgd then it provides full blown support    */
++/* for both PNG and JPEG in term/gd.trm                                      */
++#ifdef HAVE_LIBPNG
++# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG)
++#  include "gd.trm"
++# else
++#  include "png.trm"
++# endif
++#endif
++
+ #ifdef X11
+ # include "x11.trm"		/* X Window System */
+ # include "xlib.trm"		/* dumps x11 commands to gpoutfile */
+@@ -351,20 +365,6 @@
+ # include "pdf.trm"
+ #endif
+ 
+-/* NOTE THAT PNG AND JPEG SUPPORT REQUIRE SEPARATE LIBRARIES */
+-/* There are 2 flavors of PNG support                                        */
+-/* If you are using an old version of libgd in order to get true GIF support */
+-/* then the best we can do is use a separate poor-quality PNG driver png.trm */
+-/* But if you are using a newer libgd then it provides full blown support    */
+-/* for both PNG and JPEG in term/gd.trm                                      */
+-#ifdef HAVE_LIBPNG
+-# if defined(HAVE_GD_PNG) || defined(HAVE_GD_JPEG)
+-#  include "gd.trm"
+-# else
+-#  include "png.trm"
+-# endif
+-#endif
+-
+ /* postscript */
+ #include "post.trm"
+ 
diff --git a/media-gfx/gnuplot/gnuplot-4.0.ebuild b/media-gfx/gnuplot/gnuplot-4.0.ebuild
index dabe32deb8b3..db54bb78cfa0 100644
--- a/media-gfx/gnuplot/gnuplot-4.0.ebuild
+++ b/media-gfx/gnuplot/gnuplot-4.0.ebuild
@@ -1,5 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0.ebuild,v 1.2 2004/05/05 09:25:13 phosphan Exp $
+
+inherit eutils
 
 MY_P="${P}.0"
 S=${WORKDIR}/${MY_P}
@@ -24,6 +27,12 @@ DEPEND="
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/header-order.patch
+}
+
 src_compile() {
 	local myconf