diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-02-21 17:29:42 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-02-21 17:29:42 +0000 |
commit | bb6e946a7a0efeb1d0303298b251ebe1ab04711c (patch) | |
tree | 59babcfeeee707f915cdd5c6405526a5e45b8286 | |
parent | version bump, drop myself from metadata.xml (diff) | |
download | gentoo-2-bb6e946a7a0efeb1d0303298b251ebe1ab04711c.tar.gz gentoo-2-bb6e946a7a0efeb1d0303298b251ebe1ab04711c.tar.bz2 gentoo-2-bb6e946a7a0efeb1d0303298b251ebe1ab04711c.zip |
Depend on slot 2 of gtk+. Remove old.
(Portage version: 2.1.9.40/cvs/Linux x86_64)
-rw-r--r-- | sci-visualization/gnuplot/ChangeLog | 6 | ||||
-rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild | 6 | ||||
-rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.2.6.ebuild | 208 | ||||
-rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.4.0.ebuild | 213 | ||||
-rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.4.2.ebuild | 6 |
5 files changed, 11 insertions, 428 deletions
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index c8ca3df9038e..aeed3fa81349 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-visualization/gnuplot # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.145 2011/01/21 17:01:50 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.146 2011/02/21 17:29:42 ulm Exp $ + + 21 Feb 2011; Ulrich Mueller <ulm@gentoo.org> -gnuplot-4.2.6.ebuild, + gnuplot-4.2.6-r1.ebuild, -gnuplot-4.4.0.ebuild, gnuplot-4.4.2.ebuild: + Depend on slot 2 of gtk+. Remove old. 21 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> gnuplot-4.4.2.ebuild: ppc64 stable wrt #342167 diff --git a/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild index 885d36a69ae1..a2ee0bd45e72 100644 --- a/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.3 2010/03/07 20:02:31 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.4 2011/02/21 17:29:42 ulm Exp $ EAPI=2 @@ -35,7 +35,7 @@ RDEPEND=" wxwidgets? ( x11-libs/wxGTK:2.8[X] >=x11-libs/cairo-0.9 >=x11-libs/pango-1.10.3 - >=x11-libs/gtk+-2.8 )" + >=x11-libs/gtk+-2.8:2 )" DEPEND="${RDEPEND} dev-util/pkgconfig doc? ( virtual/latex-base diff --git a/sci-visualization/gnuplot/gnuplot-4.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6.ebuild deleted file mode 100644 index 0a871f187845..000000000000 --- a/sci-visualization/gnuplot/gnuplot-4.2.6.ebuild +++ /dev/null @@ -1,208 +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.6.ebuild,v 1.11 2009/12/31 17:43:49 ranger Exp $ - -EAPI=2 - -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/${PN}-4.2.5-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 - app-text/ghostscript-gpl ) - 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[X] - >=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" - -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}"/${PN}-4.2.5-lua-term.patch #233475 - epatch "${FILESDIR}"/${PN}-4.2.5-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 - - if use wxwidgets; then - WX_GTK_VER="2.8" - 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))" - 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 - # Avoid sandbox violation in epstopdf/ghostscript - addpredict /var/cache/fontconfig - 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 - if use gd; then - echo - einfo "For font support in png/jpeg/gif output, you may have to" - einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment" - einfo "variables. See the FAQ file in /usr/share/doc/${PF}/" - einfo "for more information." - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - use latex && texmf-update -} diff --git a/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild deleted file mode 100644 index e89230db29c0..000000000000 --- a/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.2 2010/06/15 15:48:53 jlec Exp $ - -EAPI="3" - -inherit 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 GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs" - -RESTRICT="wxwidgets? ( test )" - -RDEPEND="!app-emacs/gnuplot-mode - cairo? ( x11-libs/cairo - x11-libs/pango - >=x11-libs/gtk+-2.8 ) - emacs? ( virtual/emacs ) - gd? ( media-libs/gd[png] ) - ggi? ( media-libs/libggi ) - latex? ( virtual/latex-base - lua? ( dev-tex/pgf - >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) - lua? ( dev-lang/lua ) - pdf? ( media-libs/pdflib ) - plotutils? ( media-libs/plotutils ) - readline? ( sys-libs/readline ) - svga? ( media-libs/svgalib ) - wxwidgets? ( x11-libs/wxGTK:2.8[X] - x11-libs/cairo - x11-libs/pango - >=x11-libs/gtk+-2.8 ) - X? ( x11-libs/libXaw ) - xemacs? ( app-editors/xemacs - app-xemacs/xemacs-base - app-xemacs/texinfo )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( virtual/latex-base - app-text/ghostscript-gpl )" - -S="${WORKDIR}/${MY_P}" -GP_VERSION="${PV%.*}" -E_SITEFILE="50${PN}-gentoo.el" -TEXMF="${EPREFIX}/usr/share/texmf-site" - -src_prepare() { - # Add special version identification as required by provision 2 - # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die -} - -src_configure() { - if ! use latex; then - sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die - fi - - if use wxwidgets; then - WX_GTK_VER="2.8" - need-wxwidgets unicode - fi - - local myconf - myconf="${myconf} --without-lisp-files" - myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}" - myconf="${myconf} $(use_with cairo)" - myconf="${myconf} $(use_with doc tutorial)" - myconf="${myconf} $(use_with gd)" - myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))" - myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))" - myconf="${myconf} $(use_with lua)" - myconf="${myconf} $(use_with pdf pdf "${EPREFIX}"/usr/$(get_libdir))" - myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))" - myconf="${myconf} $(use_with svga linux-vga)" - myconf="${myconf} $(use_enable thin-splines)" - myconf="${myconf} $(use_enable wxwidgets)" - myconf="${myconf} $(use_with X x)" - use readline \ - && myconf="${myconf} --with-readline=gnu" \ - || myconf="${myconf} --with-readline=builtin" - - econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/" - - if use xemacs; then - einfo "Configuring gnuplot-mode for XEmacs ..." - use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs - cd "${S}/lisp-xemacs" - econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs - fi - - if use emacs; then - einfo "Configuring gnuplot-mode for GNU Emacs ..." - cd "${S}/lisp" - econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs - fi -} - -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 xemacs; then - cd "${S}/lisp-xemacs" - emake || die - fi - - if use emacs; then - cd "${S}/lisp" - emake || die - fi - - if use doc; then - # Avoid sandbox violation in epstopdf/ghostscript - addpredict /var/cache/fontconfig - cd "${S}/docs" - emake pdf || die - cd "${S}/tutorial" - emake pdf || die - - if use emacs || use xemacs; then - cd "${S}/lisp" - emake pdf || die - fi - fi -} - -src_install () { - emake DESTDIR="${D}" install || die - - if use xemacs; then - cd "${S}/lisp-xemacs" - emake DESTDIR="${D}" install || die - fi - - if use emacs; then - cd "${S}/lisp" - emake DESTDIR="${D}" install || die - # info-look* is included with >=emacs-21 - rm -f "${ED}${SITELISP}/${PN}"/info-look* - - # Gentoo emacs site-lisp configuration - echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE} - sed '/^;; move/,+3 d' dotemacs >> ${E_SITEFILE} || die - elisp-site-file-install ${E_SITEFILE} || die - fi - - cd "${S}" - dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO - newdoc term/PostScript/README README-ps - newdoc term/js/README README-js - use lua && newdoc term/lua/README README-lua - - if use doc; then - # Demo files - insinto /usr/share/${PN}/${GP_VERSION} - doins -r demo || die - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile* - rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary* - # Manual - dodoc docs/gnuplot.pdf - # Tutorial - dodoc tutorial/{tutorial.dvi,tutorial.pdf} - # FAQ - dodoc FAQ.pdf - # Documentation for making PostScript files - docinto psdoc - dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} - fi - - if use emacs || use xemacs; then - docinto emacs - dodoc lisp/ChangeLog lisp/README - use doc && dodoc lisp/gpelcard.pdf - 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 - if use gd; then - echo - einfo "For font support in png/jpeg/gif output, you may have to" - einfo "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment" - einfo "variables. See the FAQ file in /usr/share/doc/${PF}/" - einfo "for more information." - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - use latex && texmf-update -} diff --git a/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild index 1621e960e2d2..5af221e73170 100644 --- a/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.8 2011/01/21 17:01:50 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.9 2011/02/21 17:29:42 ulm Exp $ EAPI=3 @@ -21,7 +21,7 @@ RESTRICT="wxwidgets? ( test )" RDEPEND="!app-emacs/gnuplot-mode cairo? ( x11-libs/cairo x11-libs/pango - >=x11-libs/gtk+-2.8 ) + >=x11-libs/gtk+-2.8:2 ) emacs? ( virtual/emacs ) gd? ( media-libs/gd[png] ) ggi? ( media-libs/libggi ) @@ -36,7 +36,7 @@ RDEPEND="!app-emacs/gnuplot-mode wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango - >=x11-libs/gtk+-2.8 ) + >=x11-libs/gtk+-2.8:2 ) X? ( x11-libs/libXaw ) xemacs? ( app-editors/xemacs app-xemacs/xemacs-base |