diff options
author | Dominik Stadler <centic@gentoo.org> | 2007-10-27 20:15:59 +0000 |
---|---|---|
committer | Dominik Stadler <centic@gentoo.org> | 2007-10-27 20:15:59 +0000 |
commit | 69ca9c897b1efd44e48acc6ae5d20b03458d40c2 (patch) | |
tree | c49d22db3acc8b491daa82e8555515882e4c755c | |
parent | variable quoting (diff) | |
download | gentoo-2-69ca9c897b1efd44e48acc6ae5d20b03458d40c2.tar.gz gentoo-2-69ca9c897b1efd44e48acc6ae5d20b03458d40c2.tar.bz2 gentoo-2-69ca9c897b1efd44e48acc6ae5d20b03458d40c2.zip |
Add 1.36, fixes Bug 196913, Fix repoman reports in 1.29.
(Portage version: 2.1.3.15)
-rw-r--r-- | media-gfx/asymptote/ChangeLog | 11 | ||||
-rw-r--r-- | media-gfx/asymptote/asymptote-1.29.ebuild | 10 | ||||
-rw-r--r-- | media-gfx/asymptote/asymptote-1.36.ebuild | 132 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch | 49 | ||||
-rw-r--r-- | media-gfx/asymptote/files/asymptote-1.36-makefile.patch | 65 | ||||
-rw-r--r-- | media-gfx/asymptote/files/digest-asymptote-1.36 | 3 |
6 files changed, 264 insertions, 6 deletions
diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog index 4e10e4668cac..5b60f2dc505d 100644 --- a/media-gfx/asymptote/ChangeLog +++ b/media-gfx/asymptote/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-gfx/asymptote # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.12 2007/10/07 09:14:00 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.13 2007/10/27 20:15:58 centic Exp $ + +*asymptote-1.36 (27 Oct 2007) + + 27 Oct 2007; Dominik Stadler <centic@gentoo.org> + +files/asymptote-1.36-configure-ac.patch, + +files/asymptote-1.36-makefile.patch, asymptote-1.29.ebuild, + +asymptote-1.36.ebuild: + Add 1.36, fixes Bug 196913 + Fix repoman reports in 1.29 *asymptote-1.33-r1 (07 Oct 2007) diff --git a/media-gfx/asymptote/asymptote-1.29.ebuild b/media-gfx/asymptote/asymptote-1.29.ebuild index 02d003306559..7837d6368360 100644 --- a/media-gfx/asymptote/asymptote-1.29.ebuild +++ b/media-gfx/asymptote/asymptote-1.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.29.ebuild,v 1.3 2007/08/28 21:13:22 centic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.29.ebuild,v 1.4 2007/10/27 20:15:58 centic Exp $ inherit eutils elisp-common @@ -55,10 +55,10 @@ pkg_setup() { src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # Fixing fftw and gsl enabling - epatch ${FILESDIR}/${P}-configure-ac.patch + epatch "${FILESDIR}/${P}-configure-ac.patch" einfo "Patching configure.ac" sed -i \ -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ @@ -67,7 +67,7 @@ src_unpack() { einfo "Building configure" WANT_AUTOCONF=2.5 autoconf - epatch ${FILESDIR}/${P}-makefile.patch + epatch "${FILESDIR}/${P}-makefile.patch" } src_compile() { @@ -94,7 +94,7 @@ src_install() { target="install" fi - make DESTDIR=${D} ${target} || die "make install failed" + make DESTDIR="${D}" ${target} || die "make install failed" dodoc BUGS ChangeLog README ReleaseNotes TODO diff --git a/media-gfx/asymptote/asymptote-1.36.ebuild b/media-gfx/asymptote/asymptote-1.36.ebuild new file mode 100644 index 000000000000..fe98f785c792 --- /dev/null +++ b/media-gfx/asymptote/asymptote-1.36.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.36.ebuild,v 1.1 2007/10/27 20:15:58 centic Exp $ + +inherit eutils elisp-common latex-package + +DESCRIPTION="A vector graphics language that provides a framework for technical drawing" +HOMEPAGE="http://asymptote.sourceforge.net/" +SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="boehm-gc doc fftw emacs gsl vim-syntax" + +RDEPEND=">=sys-libs/readline-4.3-r5 + >=sys-libs/ncurses-5.4-r5 + dev-libs/libsigsegv + boehm-gc? ( >=dev-libs/boehm-gc-7.0 ) + virtual/tetex + fftw? ( >=sci-libs/fftw-3.0.1 ) + emacs? ( virtual/emacs ) + gsl? ( sci-libs/gsl ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.5 + >=sys-devel/bison-1.875 + >=sys-devel/flex-2.5.4a-r5 + doc? ( >=media-gfx/imagemagick-6.1.3.2 + virtual/ghostscript + >=sys-apps/texinfo-4.7-r1 )" + +SITEFILE=64${PN}-gentoo.el + +pkg_setup() { + # checking if Boehm garbage collector was compiled with c++ support + if use boehm-gc ; then + if ! built_with_use dev-libs/boehm-gc nocxx ; then + einfo "dev-libs/boehm-gc has been compiled with nocxx use flag disabled" + else + echo + eerror "You have to rebuild dev-libs/boehm-gc enabling c++ support" + die + fi + fi + + if ! built_with_use dev-lang/python tk; then + eerror "Please reemerge dev-lang/python with 'tk' support or xasy will" + eerror "not work. In order to fix this, execute the following:" + eerror "echo \"dev-lang/python tk\" >> /etc/portage/package.use" + eerror "and reemerge dev-lang/python before emerging asymptote." + die "requires dev-lang/python with use-flag 'tk'!!" + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + + # Fixing fftw and gsl enabling + epatch "${FILESDIR}/${P}-configure-ac.patch" + einfo "Patching configure.ac" + sed -i \ + -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + configure.ac || die "sed configure.ac failed" + + einfo "Building configure" + WANT_AUTOCONF=2.5 autoconf + + epatch "${FILESDIR}/${P}-makefile.patch" +} + +src_compile() { + for dir in `find /var/cache/fonts -type d`; do addwrite ${dir}; done + + # for the CPPFLAGS see http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 + myconf="--with-latex=/usr/share/texmf/tex/latex --disable-gc-debug CPPFLAGS=-DHAVE_SYS_TYPES_H" + if use boehm-gc; then + myconf="${myconf} --enable-gc=system" + else + myconf="${myconf} --disable-gc" + fi + + econf ${myconf} $(use_with fftw) $(use_with gsl) || die "econf failed" + emake || die "emake failed" + + if use emacs ; then + elisp-compile base/*.el || die "elisp-compile failed" + fi +} + +src_install() { + for dir in `find /var/cache/fonts -type d`; do addwrite ${dir}; done + + if use doc; then + target="install-all" + else + target="install" + fi + + emake DESTDIR="${D}" ${target} || die "emake install failed" + + dodoc BUGS ChangeLog README ReleaseNotes TODO + + if use emacs ; then + elisp-install ${PN} base/*.el base/*.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/asy-ftd.vim" + fi +} + +pkg_postinst() { + latex-package_rehash + + elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' + + use emacs && elisp-site-regen +} + +pkg_postrm() { + latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch new file mode 100644 index 000000000000..cf4fc235481a --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-1.36-configure-ac.patch @@ -0,0 +1,49 @@ +--- configure.ac 2007-07-30 02:28:12.000000000 +1000 ++++ ../configure.ac.new 2007-08-19 09:19:39.000000000 +1000 +@@ -76,10 +76,16 @@ + fi + fi + +-AC_CHECK_HEADER(fftw3.h, +- AC_CHECK_LIB([fftw3], fftw_execute,, ++AC_ARG_WITH([fftw], ++ [ --with-fftw use fftw3], ++ [with_fftw=$withval], ++ [with_fftw="no"]) ++if test "$with_fftw" = "yes"; then ++AC_CHECK_HEADER([fftw3.h], ++ AC_CHECK_LIB([fftw3], [fftw_execute],, + AC_MSG_NOTICE([*** Could not find libfftw3: will compile without optional fast Fourier transforms. ***])), + AC_MSG_NOTICE([*** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***])) ++fi + + GCVERSION=gc-7.0 + +@@ -108,7 +114,8 @@ + then INCL="-I$prefix/include/gc" + else INCL="-I$ac_cv_use_gc/include/gc" + fi +- AC_CHECK_HEADER(gc.h, ++ ++ AC_CHECK_HEADER([gc/gc.h], + AC_CHECK_LIB([gc],[GC_malloc],[ + LIBS=$LIBS"-lgc " + # LIBS=$LIBS"-lgccpp -lgc " +@@ -183,11 +190,17 @@ + [Define if you have a working <rpc/rpc.h> header file])], + AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***])) + ++AC_ARG_WITH(gsl, ++ [ --with-gsl use gsl libraries], ++ [with_gsl=$withval], ++ [with_gsl="no"]) ++if test "$with_gsl" = "yes"; then + AC_CHECK_HEADER(gsl/gsl_sf.h, + AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1, + [Define to 1 if you have the 'gsl' library (-lgsl). ]) LIBS=$LIBS"-lgsl -lgslcblas "], + AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]), + AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***])) ++fi + + # Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_PID_T diff --git a/media-gfx/asymptote/files/asymptote-1.36-makefile.patch b/media-gfx/asymptote/files/asymptote-1.36-makefile.patch new file mode 100644 index 000000000000..d4d5b1a5cac4 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-1.36-makefile.patch @@ -0,0 +1,65 @@ +--- ../media-gfx/asymptote-1.33/work/asymptote-1.33/Makefile.in 2007-07-30 02:27:31.000000000 +1000 ++++ Makefile.in 2007-08-12 08:15:32.000000000 +1000 +@@ -49,7 +49,7 @@ + datadir = $(DESTDIR)@datadir@ + asydir = $(datadir)/asymptote + docdir = $(DESTDIR)@docdir@ +-exampledir = $(docdir)/examples ++exampledir = $(asydir)/examples + animationsdir = $(exampledir)/animations + latexdir = $(DESTDIR)@latexdir@ + INSTALL = @INSTALL@ +@@ -127,11 +127,9 @@ + doc/extra/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir) + ${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir) + -${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir) +- -if test -z "$(DESTDIR)"; then \ +- texhash; \ +- fi + +-install-doc: html ++ ++install-doc: + cd doc; $(MAKE) install-all + + install-man: man +--- ../media-gfx/asymptote-1.33/work/asymptote-1.33/doc/Makefile 2007-07-30 02:28:22.000000000 +1000 ++++ doc/Makefile 2007-08-12 08:21:29.000000000 +1000 +@@ -16,12 +16,12 @@ + + html: asymptote/index.html + +-man: $(DOCFILES) asy.1 ++man: $(MANFILES) asy.1 + + faq: + cd FAQ; $(MAKE) faq + +-doc: asymptote.dvi asymptote.info html man faq ++doc: $(DOCFILES) asymptote.info html man faq + + %.png: %.asy + $(ASY) -f png $< +@@ -84,15 +84,14 @@ + rm -f CAD.{aux,dvi,log,pdf,toc} + rm -rf asymptote + +-install: man faq +- cd FAQ; $(MAKE) install +- ${INSTALL} -d -m 755 $(docdir) $(mandir)/man1 +- ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) +- ${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1 ++install: man ++ ${INSTALL} -d -m 755 $(mandir)/man1 + +-install-all: doc install +- cd FAQ; $(MAKE) install-info +- ${INSTALL} -d -m 755 $(infodir) ++install-all: doc faq install ++ cd FAQ; $(MAKE) install-all ++ ${INSTALL} -d -m 755 $(infodir) $(docdir)/html/asymptote ++ ${INSTALL} -p -m 644 $(DOCFILES) $(docdir) ++ ${INSTALL} -p -m 644 asymptote/* $(docdir)/html/asymptote + ${INSTALL} -p -m 644 asymptote.info $(infodir) + -${INSTALL} -p -m 644 asymptote.info-* $(infodir) + -if test -z "$(DESTDIR)"; then \ diff --git a/media-gfx/asymptote/files/digest-asymptote-1.36 b/media-gfx/asymptote/files/digest-asymptote-1.36 new file mode 100644 index 000000000000..3196f6641c45 --- /dev/null +++ b/media-gfx/asymptote/files/digest-asymptote-1.36 @@ -0,0 +1,3 @@ +MD5 43b1ca519fe460f59278ffbc6a8962d0 asymptote-1.36.src.tgz 1015125 +RMD160 fb6f68e5015d0a89b1b9f5057645656d85a19e78 asymptote-1.36.src.tgz 1015125 +SHA256 c4ab5dd212274d6b0666c96df80f11250c97158488ec1d8e65b70eb152d9eb27 asymptote-1.36.src.tgz 1015125 |