fix png support and use get_libdir to install correctly on multilib installations

Package-Manager: portage-2.1.2.12

4 files changed, 190 insertions, 5 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 08d725dee72b..614eb78446e4 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.30 2007/07/24 20:08:57 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.31 2007/08/21 08:25:53 opfer Exp $
+
+*gnuplot-4.2.0-r2 (21 Aug 2007)
+
+  21 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  +gnuplot-4.2.0-r2.ebuild:
+  fix png support and use get_libdir to install correctly on multilib
+  installations
 
   24 Jul 2007; Joe Peterson <lavajoe@gentoo.org> gnuplot-4.2.0-r1.ebuild:
   Add ~x86-fbsd keyword
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 4c5a7b39f626..066289b7ad21 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -32,14 +32,18 @@ EBUILD gnuplot-4.2.0-r1.ebuild 4899 RMD160 2018a971f30c049e061e3926b04924d60c510
 MD5 d8ee455e2b1ec9e79ff0763c1256f31b gnuplot-4.2.0-r1.ebuild 4899
 RMD160 2018a971f30c049e061e3926b04924d60c5104e8 gnuplot-4.2.0-r1.ebuild 4899
 SHA256 2a9ce3c2b23fcffabafb2cfd33a5705947d6a0b71b6778cb82a8a1ddd4131a22 gnuplot-4.2.0-r1.ebuild 4899
+EBUILD gnuplot-4.2.0-r2.ebuild 4877 RMD160 52e00c605b662b08c8ef3e4d26fe7f5510ff703b SHA1 5427809d2072ae301d776f265c96377d2e2ed420 SHA256 574cd7a1b1324e5f442c2be93ba9a39b5d5a42f112033d91377bbda372f42d63
+MD5 8b4075d98b70c5ed10f98814434e8099 gnuplot-4.2.0-r2.ebuild 4877
+RMD160 52e00c605b662b08c8ef3e4d26fe7f5510ff703b gnuplot-4.2.0-r2.ebuild 4877
+SHA256 574cd7a1b1324e5f442c2be93ba9a39b5d5a42f112033d91377bbda372f42d63 gnuplot-4.2.0-r2.ebuild 4877
 EBUILD gnuplot-4.2.0.ebuild 4872 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027 SHA1 29f49d28e0769a7493e97bbe696166acaac74afa SHA256 4144265d3b9f1cb4feb71bb3a0a5ecd040644ef2bcedec97677f539053191e9f
 MD5 835e17f9207a07b51deab21e7bbc756d gnuplot-4.2.0.ebuild 4872
 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027 gnuplot-4.2.0.ebuild 4872
 SHA256 4144265d3b9f1cb4feb71bb3a0a5ecd040644ef2bcedec97677f539053191e9f gnuplot-4.2.0.ebuild 4872
-MISC ChangeLog 10963 RMD160 3a96291669bccc96f97b14a0cfc1c06b3f24ced8 SHA1 93b38462c09719e4d29c3a5e84964b970d61654c SHA256 8e16766404fbbc1825365f3a71a6e1308a5c1fb53d28c096f304c15a83dce120
-MD5 304b385956760ecbe958baacb52eb1fa ChangeLog 10963
-RMD160 3a96291669bccc96f97b14a0cfc1c06b3f24ced8 ChangeLog 10963
-SHA256 8e16766404fbbc1825365f3a71a6e1308a5c1fb53d28c096f304c15a83dce120 ChangeLog 10963
+MISC ChangeLog 11164 RMD160 ab37b16d5fa268b0ea3d700f0c7e7de015204caa SHA1 34425608a66e019d31ee2f11c05de6742f748f89 SHA256 5b710ba5bc922eaa4bf422f772126b1cebfdfcf7557530caad9761413f548203
+MD5 387b8efa1d7374bc4e62465f6cc66e65 ChangeLog 11164
+RMD160 ab37b16d5fa268b0ea3d700f0c7e7de015204caa ChangeLog 11164
+SHA256 5b710ba5bc922eaa4bf422f772126b1cebfdfcf7557530caad9761413f548203 ChangeLog 11164
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
@@ -56,3 +60,6 @@ SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/di
 MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0-r1 244
 RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0-r1 244
 SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0-r1 244
+MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0-r2 244
+RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0-r2 244
+SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0-r2 244
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r2 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r2
new file mode 100644
index 000000000000..b03e262c595c
--- /dev/null
+++ b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r2
@@ -0,0 +1,3 @@
+MD5 f688a578ddb4c376fd7d91ce444a0745 gnuplot-4.2.0.tar.gz 2836649
+RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c gnuplot-4.2.0.tar.gz 2836649
+SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9 gnuplot-4.2.0.tar.gz 2836649
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..e4793b4bfa50
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild,v 1.1 2007/08/21 08:25:53 opfer Exp $
+
+inherit eutils elisp-common multilib wxwidgets
+
+MY_P="${P/_/.}"
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+
+LICENSE="gnuplot"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc emacs gd ggi tetex pdf plotutils readline svga wxwindows X xemacs"
+
+RDEPEND="
+	xemacs? ( virtual/xemacs )
+	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
+	pdf? ( media-libs/pdflib )
+	ggi? ( media-libs/libggi )
+	gd? ( >=media-libs/gd-2 )
+	doc? ( virtual/tetex )
+	tetex? ( virtual/tetex )
+	X? ( x11-libs/libXaw )
+	svga? ( media-libs/svgalib )
+	readline? ( >=sys-libs/readline-4.2 )
+	plotutils? ( media-libs/plotutils )
+	wxwindows? ( =x11-libs/wxGTK-2.6*
+		>=x11-libs/cairo-0.9
+		>=x11-libs/pango-1.10.3
+		>=x11-libs/gtk+-2.8 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+E_SITEFILE="50gnuplot-gentoo.el"
+
+pkg_setup() {
+	if use gd && ! built_with_use media-libs/gd png; then
+		eerror "media-libs/gd needs to be built with PNG support"
+		die "please rebuilt media-libs/gd with USE=png"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libggi.patch
+}
+
+src_compile() {
+	# See bug #156427.
+	if use tetex ; then
+		sed -i \
+			-e 's/TEXMFLOCAL/TEXTMFSITE/g' share/Makefile.in || die "sed failed"
+	else
+		sed -i \
+			-e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || die "sed failed"
+	fi
+
+	if use wxwindows ; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode
+	fi
+
+	local myconf="--with-gihdir=/usr/share/${PN}/gih"
+
+	myconf="${myconf} $(use_with X x)"
+	myconf="${myconf} $(use_with svga linux-vga)"
+	myconf="${myconf} $(use_with gd)"
+	myconf="${myconf} $(use_enable wxwindows wxwidgets)"
+	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
+
+	use ggi \
+		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
+		--with-xmi=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --without-ggi"
+
+	use readline \
+		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
+		|| myconf="${myconf} --with-readline"
+
+	myconf="${myconf} --without-lisp-files"
+
+	# This is a hack to avoid sandbox violations when using the Linux console.
+	# Creating the DVI and PDF tutorials require /dev/svga to build the
+	# example plots.
+	addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+
+	if use doc ; then
+		cd docs
+		make pdf || die "pdf doc creation failed"
+		cd ../tutorial
+		make pdf || die "pdf tutorial failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use emacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for GNU Emacs..."
+		EMACS="emacs" econf --with-lispdir="/usr/share/emacs/site-lisp/${PN}" || die "econf Emacs files faild"
+		make DESTDIR="${D}" install || die "make install Emacs files failed"
+		make clean
+		cd ..
+
+		# Gentoo emacs site-lisp configuration
+		string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
+		echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
+		sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
+		elisp-site-file-install ${E_SITEFILE}
+	fi
+
+	if use xemacs; then
+		cd lisp
+		einfo "Configuring gnuplot-mode for XEmacs..."
+		EMACS="xemacs" econf --with-lispdir="/usr/$(get_libdir)/xemacs/site-packages/${PN}" || die
+		make DESTDIR="${D}" install || {
+			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
+			ewarn "I need xemacs-base to be installed before I can compile"
+			ewarn "the gnuplot-mode lisp files for xemacs successfully."
+			ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
+			ewarn "has been successfuly emerged."
+			die
+			}
+		cd ..
+	fi
+
+	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
+
+	if use doc; then
+		# Demo files
+		insinto /usr/share/${PN}/demo
+		doins demo/*
+		# Manual
+		insinto /usr/share/doc/${PF}/manual
+		doins docs/gnuplot.pdf
+		# Tutorial
+		insinto /usr/share/doc/${PF}/tutorial
+		doins tutorial/{tutorial.dvi,tutorial.pdf}
+		# Documentation for making PostScript files
+		insinto /usr/share/doc/${PF}/psdoc
+		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use svga ; then
+		einfo "In order to enable ordinary users to use SVGA console graphics"
+		einfo "gnuplot needs to be set up as setuid root.  Please note that"
+		einfo "this is usually considered to be a security hazard."
+		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}