Remove old.

(Portage version: 2.2_rc42/cvs/Linux i686)

4 files changed, 6 insertions, 459 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index a18507e829cb..4c748f9f9976 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.121 2009/10/01 20:04:09 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.122 2009/10/02 00:27:47 ulm Exp $
+
+  02 Oct 2009; Ulrich Mueller <ulm@gentoo.org>
+  -files/gnuplot-4.2.0-libggi.patch, -gnuplot-4.2.3-r2.ebuild,
+  -gnuplot-4.2.5.ebuild:
+  Remove old.
 
   01 Oct 2009; Steve Dibb <beandog@gentoo.org> gnuplot-4.2.5-r1.ebuild:
   amd64 stable, bug 282642
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.0-libggi.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.0-libggi.patch
deleted file mode 100644
index 94b0beecdebf..000000000000
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.0-libggi.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- gnuplot-4.2.0/term/ggi.trm.orig	2007-06-27 14:37:05.000000000 +0900
-+++ gnuplot-4.2.0/term/ggi.trm	2007-06-27 14:53:54.000000000 +0900
-@@ -116,9 +116,9 @@
- } GGI_vertex_t;
- 
- TERM_PUBLIC long int GGI_SetTime(const struct timeval* current);
--TERM_PUBLIC int GGI_from_keysym __PROTO((uint32 keysym));
--TERM_PUBLIC int GGI_from_button __PROTO((uint32 button));
--TERM_PUBLIC int GGI_y __PROTO((sint32 y));
-+TERM_PUBLIC int GGI_from_keysym __PROTO((uint32_t keysym));
-+TERM_PUBLIC int GGI_from_button __PROTO((uint32_t button));
-+TERM_PUBLIC int GGI_y __PROTO((int32_t y));
- TERM_PUBLIC int GGI_dispatch_event __PROTO((const ggi_event* event));
- TERM_PUBLIC int GGI_eventually_update_modifiers __PROTO((const ggi_event* event, const int add));
- TERM_PUBLIC int GGI_waitforinput __PROTO((void));
-@@ -134,13 +134,13 @@
- TERM_PUBLIC void GGI_save_puts __PROTO((GGI_vertex_t* v, const int tag));
- TERM_PUBLIC void GGI_set_vertex __PROTO((GGI_vertex_t* v, const int x, const int y, const char* str, const int tag));
- TERM_PUBLIC void GGI_abort_zooming __PROTO((void));
--TERM_PUBLIC void GGI_put_tmptext __PROTO((int, const char str[]));
--TERM_PUBLIC void GGI_relative __PROTO((int r[2]));
-+TERM_PUBLIC void GGI_put_tmptext __PROTO((int, const char *str));
-+TERM_PUBLIC void GGI_relative __PROTO((int *r));
- TERM_PUBLIC void GGI_clear_hline __PROTO((int x1, int x2, int y));
- TERM_PUBLIC void GGI_clear_vline __PROTO((int y1, int y2, int x));
- TERM_PUBLIC void GGI_draw_hline __PROTO((int x1, int x2, int y));
- TERM_PUBLIC void GGI_draw_vline __PROTO((int y1, int y2, int x));
--TERM_PUBLIC void GGI_set_clipboard __PROTO((const char[]));
-+TERM_PUBLIC void GGI_set_clipboard __PROTO((const char *s));
- #endif /* USE_MOUSE */
- 
- TERM_PUBLIC int GGI_make_palette __PROTO((t_sm_palette*));
-@@ -645,7 +645,7 @@
- 
- /* translate ggi keysym to gnuplot keysym */
- TERM_PUBLIC int
--GGI_from_keysym(uint32 keysym)
-+GGI_from_keysym(uint32_t keysym)
- {
-     switch (keysym) {
- 	case GIIUC_BackSpace:
-@@ -811,7 +811,7 @@
- }
- 
- TERM_PUBLIC int
--GGI_from_button(uint32 button)
-+GGI_from_button(uint32_t button)
- {
-     switch (button) {
-     case GII_PBUTTON_LEFT:
-@@ -827,7 +827,7 @@
- }
- 
- TERM_PUBLIC int
--GGI_y(sint32 y)
-+GGI_y(int32_t y)
- {
-     return GGIymax - y;
- }
-@@ -1363,7 +1363,7 @@
- }
- 
- TERM_PUBLIC void
--GGI_set_clipboard(const char s[])
-+GGI_set_clipboard(const char *s)
- {
-     /* XXX: not implemented */
-     (void) s;			/* avoid -Wunused */
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild
deleted file mode 100644
index d4c139648779..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.14 2009/08/01 12:08:20 bicatali Exp $
-
-inherit autotools elisp-common eutils 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 latex pdf plotutils readline svga wxwidgets X xemacs"
-RESTRICT="wxwidgets? ( test )"
-
-RDEPEND="
-	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/latex-base
-		virtual/ghostscript )
-	latex? ( virtual/latex-base )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( =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=50${PN}-gentoo.el
-TEXMF=/usr/share/texmf-site
-
-latex_rehash() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version 'app-text/texlive'; then
-		texmf-update
-	else
-		texconfig rehash
-	fi
-}
-
-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}"
-	# not sane enough for upstream, but we will keep it
-	epatch "${FILESDIR}"/${PN}-4.2.0-libggi.patch
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
-	epatch "${FILESDIR}"/${P}-app-defaults.patch #219323
-	epatch "${FILESDIR}"/${P}-disable-texhash.patch #201871
-
-	eautoreconf
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# See bug #156427.
-	if use latex ; then
-		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
-			share/LaTeX/Makefile.in || die
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
-	fi
-
-	if use wxwidgets ; 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 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
-
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=emacs
-	EMACS=${TEMACS} econf ${myconf} || die
-	emake || die
-
-	if use doc ; then
-		cd docs
-		emake pdf || die
-		cd ../tutorial
-		emake pdf || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
-		emake DESTDIR="${D}" install || die
-		emake 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/lib/xemacs/site-packages/${PN}" || die
-		emake DESTDIR="${D}" install || 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
-
-	if ! use X; then
-		# see bug 194527
-		rm -rf "${D}/usr/$(get_libdir)/X11"
-	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
-	use latex && latex_rehash
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && latex_rehash
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
deleted file mode 100644
index adc5864446df..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild,v 1.13 2009/08/01 12:08:20 bicatali Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit autotools elisp-common eutils 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
-	mirror://gentoo/${P}-lua-term.patch.bz2"
-
-LICENSE="gnuplot"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="doc emacs gd ggi latex lua pdf plotutils readline svga wxwidgets X xemacs"
-RESTRICT="wxwidgets? ( test )"
-
-RDEPEND="
-	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	lua? ( >=dev-lang/lua-5.1 )
-	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2[png] )
-	doc? ( virtual/latex-base
-		virtual/ghostscript )
-	latex? ( virtual/latex-base
-		lua? ( dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( =x11-libs/wxGTK-2.8*
-		>=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="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
-
-pkg_setup() {
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
-	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch #219323
-	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
-	epatch "${WORKDIR}"/${P}-lua-term.patch #233475
-	epatch "${FILESDIR}"/${P}-configure-pkgconfig.patch #233475 c9
-	# Add Gentoo version identification since the licence requires it
-	epatch "${FILESDIR}"/${PN}-gentoo-version.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	# See bug #156427.
-	if use latex ; then
-		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
-			share/LaTeX/Makefile.in || die
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
-	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 wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with lua)"
-	myconf="${myconf} $(use_with doc tutorial)"
-
-	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"
-
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=emacs
-
-	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
-	EMACS=${TEMACS} \
-		econf ${myconf} || die
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# 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
-
-	emake || die
-
-	if use doc ; then
-		cd docs
-		emake pdf || die
-		cd ../tutorial
-		emake pdf || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
-		emake DESTDIR="${D}" install || die
-		emake clean
-		cd ..
-
-		# Gentoo emacs site-lisp configuration
-		echo -e "\n;;; ${PN} site-lisp configuration\n" > ${E_SITEFILE}
-		echo -e "(add-to-list 'load-path \"@SITELISP@\")\n" >> ${E_SITEFILE}
-		sed '/^;; move/,+3 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/lib/xemacs/site-packages/${PN}" || die
-		emake DESTDIR="${D}" install || die
-		cd ..
-	fi
-
-	if use latex && use lua; then
-		# install style file in an (additional) place where TeX can find it
-		insinto "${TEXMF}/tex/latex/${PN}"
-		doins term/lua/gnuplot-lua-tikz.sty || die
-	fi
-
-	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* \
-		TODO VERSION
-	use lua && newdoc term/lua/README README-lua
-
-	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
-
-	if ! use X; then
-		# see bug 194527
-		rm -rf "${D}/usr/$(get_libdir)/X11"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-
-	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
-	use latex && texmf-update
-}