From: Dominik Stadler Date: Sun, 29 Apr 2007 18:08:16 +0000 (+0000) Subject: Update to 1.26, mark 1.21 stable on x86. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25403b102dd1ede1806baa3fdea5b1d2c624b405;p=gentoo.git Update to 1.26, mark 1.21 stable on x86. Package-Manager: portage-2.1.2.3 --- diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog index e12e2b11a95b..64a13c699b00 100644 --- a/media-gfx/asymptote/ChangeLog +++ b/media-gfx/asymptote/ChangeLog @@ -1,17 +1,30 @@ # 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.6 2007/04/10 10:29:30 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.7 2007/04/29 18:08:16 centic Exp $ + + 29 Apr 2007; Dominik Stadler + +files/asymptote-1.26-configure-ac.patch, + +files/asymptote-1.26-makefile.patch, asymptote-1.21.ebuild, + +asymptote-1.26.ebuild: + Mark 1.21 stable on x86 + +*asymptote-1.26 (27 Apr 2007) + + 27 Apr 2007; Dominik Stadler + +files/asymptote-1.26-configure-ac.patch, + +files/asymptote-1.26-makefile.patch, +asymptote-1.26.ebuild: + Add latest version 1.26 10 Apr 2007; Marcus D. Hanwell asymptote-1.21.ebuild: Marked ~amd64. +*asymptote-1.21 (03 Mar 2007) + 03 Mar 2007; Dominik Stadler +files/asymptote-1.21-configure-ac.patch, +files/asymptote-1.21-makefile.patch, +asymptote-1.21.ebuild: Bump to version 1.21 -*asymptote-1.21 (03 Mar 2007) - 02 Mar 2007; Dominik Stadler +files/64asy-gentoo.el, asymptote-1.20.ebuild: Add missing file 64asy-gentoo.el, add check for tk in python, add workaround diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 72b88b2eb40b..be3299b33075 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 64asy-gentoo.el 168 RMD160 ce644cf20e9d57918cb0f983a2e6fed729132664 SHA1 4f935343e996ce19696e979609e0873326aa5c0e SHA256 336e53de3b83eaad0c8c1c9151cb34c78a236e7aac55e1a85d72428d47970e58 MD5 d279cb94daf6c88f7044b516cfac852b files/64asy-gentoo.el 168 RMD160 ce644cf20e9d57918cb0f983a2e6fed729132664 files/64asy-gentoo.el 168 @@ -21,20 +18,33 @@ AUX asymptote-1.21-makefile.patch 1951 RMD160 998a1a7b2bacce3e828153663878621f04 MD5 c54984c03cd5f4d204d78179007b837b files/asymptote-1.21-makefile.patch 1951 RMD160 998a1a7b2bacce3e828153663878621f04808ac5 files/asymptote-1.21-makefile.patch 1951 SHA256 6bc3bdf255c04dbd326cc424727d3e726ac1fc19f993fde10eb551957a61ba8f files/asymptote-1.21-makefile.patch 1951 +AUX asymptote-1.26-configure-ac.patch 1464 RMD160 d5911368b0aeab3095d67c8ef0e2163dda770380 SHA1 95de9f9d0547765384b4ab71a177010c80f8a257 SHA256 a066fba6e575dc017458e346da5dd455c333604e724669c2d6ac4fdb3f685581 +MD5 b1d338fe8044f892da1a806feeb1de66 files/asymptote-1.26-configure-ac.patch 1464 +RMD160 d5911368b0aeab3095d67c8ef0e2163dda770380 files/asymptote-1.26-configure-ac.patch 1464 +SHA256 a066fba6e575dc017458e346da5dd455c333604e724669c2d6ac4fdb3f685581 files/asymptote-1.26-configure-ac.patch 1464 +AUX asymptote-1.26-makefile.patch 1951 RMD160 998a1a7b2bacce3e828153663878621f04808ac5 SHA1 18b59161c4a2c41029622dc7ef99104823a392e9 SHA256 6bc3bdf255c04dbd326cc424727d3e726ac1fc19f993fde10eb551957a61ba8f +MD5 c54984c03cd5f4d204d78179007b837b files/asymptote-1.26-makefile.patch 1951 +RMD160 998a1a7b2bacce3e828153663878621f04808ac5 files/asymptote-1.26-makefile.patch 1951 +SHA256 6bc3bdf255c04dbd326cc424727d3e726ac1fc19f993fde10eb551957a61ba8f files/asymptote-1.26-makefile.patch 1951 DIST asymptote-1.20.tar.gz 937426 RMD160 9b51fbc66152e4ec89a53e8e3743cf68f3a2d868 SHA1 78608d9de339feeb7366b6258552155ecbbc73e5 SHA256 860e7b28c3bace3786e7dace9b458437eddb78382fc13e943bf6ff42c06ca2ca DIST asymptote-1.21.tar.gz 969726 RMD160 0b669ea9b6afb657199c9243534710079fd34f27 SHA1 9498324035e20d7d5eb445842da5a6351bd27fed SHA256 d07cb00bd7a7df1430d4e133d38d3d41917e0c24cd651c7799546543de96619b +DIST asymptote-1.26.src.tgz 930703 RMD160 5c791beea7819c10b1b38af564e6bfbb73ce2964 SHA1 9503721850d7007496765201c1e938808d377e21 SHA256 727d3f6f3ce21d68d19177ddfaddccbef84a8c2fe3c79ec476b8cc2e5b7d1e80 EBUILD asymptote-1.20.ebuild 3404 RMD160 304e19853f2f20b7ed34ba162e0b178f449e8523 SHA1 bb3f4cda40934bed10a809aa66fc0ff6ad546440 SHA256 ff1ba75e8daf28ff32fb6a7ab2133062b41912dee3e0c56d7390e9ef808a49ef MD5 ac10fe19254cb806eafa057d5ee3a07a asymptote-1.20.ebuild 3404 RMD160 304e19853f2f20b7ed34ba162e0b178f449e8523 asymptote-1.20.ebuild 3404 SHA256 ff1ba75e8daf28ff32fb6a7ab2133062b41912dee3e0c56d7390e9ef808a49ef asymptote-1.20.ebuild 3404 -EBUILD asymptote-1.21.ebuild 3410 RMD160 83077d858f716e4da9619345f439092706595104 SHA1 89da0bdff6cd1f4a8f209f63e9c9bbdc52104c8f SHA256 036f60f7713385755072f4d96440cff339a86afca64f3c102a1fbe0105412353 -MD5 f49a03b7f953c7aa61799c4ed2c70d73 asymptote-1.21.ebuild 3410 -RMD160 83077d858f716e4da9619345f439092706595104 asymptote-1.21.ebuild 3410 -SHA256 036f60f7713385755072f4d96440cff339a86afca64f3c102a1fbe0105412353 asymptote-1.21.ebuild 3410 -MISC ChangeLog 1375 RMD160 4a0cf7da7b787094424df9a2879eb5488c6df26b SHA1 5ae9cbb4c3e8614bbc3353561d0eb788dff3aa80 SHA256 3451dc718c9ca1c13ce7c9da5e9a99a82de376e63a2dd8b8a1080ecd6e180858 -MD5 ac160681ccd657dad14cfccd17ed4ce9 ChangeLog 1375 -RMD160 4a0cf7da7b787094424df9a2879eb5488c6df26b ChangeLog 1375 -SHA256 3451dc718c9ca1c13ce7c9da5e9a99a82de376e63a2dd8b8a1080ecd6e180858 ChangeLog 1375 +EBUILD asymptote-1.21.ebuild 3410 RMD160 0275ed88ebb413b9948c3dba0c27ad461e9f706b SHA1 70c037f7c1b3e33b2475cadd9ea12ae3d6dbd52d SHA256 32c84a18bfb795701e6ba42df8ab0a0aa62c07afe1481fe067489ca754be2031 +MD5 ba9876965552ad21d96dccc9dfe22509 asymptote-1.21.ebuild 3410 +RMD160 0275ed88ebb413b9948c3dba0c27ad461e9f706b asymptote-1.21.ebuild 3410 +SHA256 32c84a18bfb795701e6ba42df8ab0a0aa62c07afe1481fe067489ca754be2031 asymptote-1.21.ebuild 3410 +EBUILD asymptote-1.26.ebuild 3412 RMD160 969d82e20863602c82e6870133d91dc36f72338c SHA1 06078a3ad5f3cfd3c4edd574d1e3eda3057ffc87 SHA256 a6cf764c7cbe5fc6d1e636466850230ed76f08fc9fb19a141817dc31686df052 +MD5 01ee7787aa7b69f15e2e3fd7a96f96ba asymptote-1.26.ebuild 3412 +RMD160 969d82e20863602c82e6870133d91dc36f72338c asymptote-1.26.ebuild 3412 +SHA256 a6cf764c7cbe5fc6d1e636466850230ed76f08fc9fb19a141817dc31686df052 asymptote-1.26.ebuild 3412 +MISC ChangeLog 1804 RMD160 6814e39ab96cd8c389de4d7097600fcb94320ebe SHA1 b373f09c36fff3418ab7f38d355f808c2c54225a SHA256 c427955931e0b4c4bbd7aa63dca64060792f23822c7510b88411fd27a0f91818 +MD5 bebba11ed3bada6e6ab9406bd409518c ChangeLog 1804 +RMD160 6814e39ab96cd8c389de4d7097600fcb94320ebe ChangeLog 1804 +SHA256 c427955931e0b4c4bbd7aa63dca64060792f23822c7510b88411fd27a0f91818 ChangeLog 1804 MISC metadata.xml 683 RMD160 5e6874dc58a60453426c9442cfa0a71950363247 SHA1 4efe58b121bd6003ea233cf585556f1c15d55b45 SHA256 1846addfcf39add4671318cc114b66017d8ea9d944f2ff0b0e590970c52e8394 MD5 80c00e59c5b5ce93eddc10f4bb686ae4 metadata.xml 683 RMD160 5e6874dc58a60453426c9442cfa0a71950363247 metadata.xml 683 @@ -45,10 +55,6 @@ SHA256 5ef30e37cf5a49a9cad8db7793e3f6203ccc667cc93ba09a7d88d17307f3d005 files/di MD5 f1621223329d5426a4718b2c3b7ddabd files/digest-asymptote-1.21 244 RMD160 e78bea9258c6b9675ff05adef240805d57518254 files/digest-asymptote-1.21 244 SHA256 b42554a0fc668fdb3a275ea3c5973351245de80297b74c23654ebbd29d1b3566 files/digest-asymptote-1.21 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGG2cVntT9W3vfTuoRAhjcAJ0WZS6g4hDeH6j7CyIcYHFRczMMlACfUA2l -2zNR5uRNMADVOId0eWi2+dY= -=cGfc ------END PGP SIGNATURE----- +MD5 8327b5ef3651d9bfe78311c65b042e7e files/digest-asymptote-1.26 247 +RMD160 77d3bdc9f8f4c335c3d3c0ff8f676c3abd063ff3 files/digest-asymptote-1.26 247 +SHA256 1ff209c79dd3162dac1fa24a2b3d296d7198f8a04f563f7991a4709fa700f9ea files/digest-asymptote-1.26 247 diff --git a/media-gfx/asymptote/asymptote-1.21.ebuild b/media-gfx/asymptote/asymptote-1.21.ebuild index 611e5b99fb33..c79eeff03290 100644 --- a/media-gfx/asymptote/asymptote-1.21.ebuild +++ b/media-gfx/asymptote/asymptote-1.21.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.21.ebuild,v 1.2 2007/04/10 10:29:30 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.21.ebuild,v 1.3 2007/04/29 18:08:16 centic Exp $ inherit eutils elisp-common @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="boehm-gc doc fftw emacs gsl vim-syntax" diff --git a/media-gfx/asymptote/asymptote-1.26.ebuild b/media-gfx/asymptote/asymptote-1.26.ebuild new file mode 100644 index 000000000000..8d752b43c54b --- /dev/null +++ b/media-gfx/asymptote/asymptote-1.26.ebuild @@ -0,0 +1,127 @@ +# 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.26.ebuild,v 1.1 2007/04/29 18:08:16 centic Exp $ + +inherit eutils elisp-common + +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-6.7 ) + virtual/tetex + fftw? ( >=sci-libs/fftw-3.0.1 ) + emacs? ( virtual/emacs ) + gsl? ( sci-libs/gsl ) + vim-syntax? ( app-editors/vim )" +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 )" + +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" +} + +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 + + make DESTDIR=${D} ${target} || die "make install failed" + + dodoc BUGS ChangeLog README ReleaseNotes TODO + + if use emacs ; then + elisp-site-file-install base/asy-mode.el + elisp-site-file-install "${FILESDIR}"/64asy-gentoo.el + fi + + if use vim-syntax ; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + fi +} + +pkg_postinst() { + einfo 'Updating TeX tree...' + texhash &> /dev/null + + einfo 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + einfo 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' + + use emacs && elisp-site-regen +} + +pkg_postrm() { + einfo 'Updating TeX tree...' + texhash &> /dev/null + + [ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen +} diff --git a/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch new file mode 100644 index 000000000000..c6b495e25e75 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch @@ -0,0 +1,37 @@ +--- configure.ac 2007-01-31 00:09:02.000000000 +0100 ++++ configure.ac_new 2007-01-31 00:45:53.000000000 +0100 +@@ -66,10 +66,16 @@ + AC_PROG_MAKE_SET + AC_PROG_YACC + ++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=6.8 + +@@ -152,11 +158,17 @@ + [Define if you have a working 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.26-makefile.patch b/media-gfx/asymptote/files/asymptote-1.26-makefile.patch new file mode 100644 index 000000000000..4bb2db0f55b2 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-1.26-makefile.patch @@ -0,0 +1,61 @@ +--- Makefile.in 2006-12-29 06:16:42.000000000 +0100 ++++ ../asymptote-1.20_new/Makefile.in 2007-02-02 22:21:54.000000000 +0100 +@@ -44,7 +44,7 @@ + datadir = $(DESTDIR)@datadir@ + asydir = $(datadir)/asymptote + docdir = $(DESTDIR)@docdir@ +-exampledir = $(docdir)/examples ++exampledir = $(asydir)/examples + animationsdir = $(exampledir)/animations + latexdir = $(DESTDIR)@latexdir@ + INSTALL = @INSTALL@ +@@ -116,11 +116,8 @@ + doc/*.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: doc ++install-doc: + cd doc; $(MAKE) install-all + + install-man: man +--- doc/Makefile 2007-02-02 20:17:18.000000000 +0100 ++++ ../asymptote-1.20_new/doc/Makefile 2007-02-02 21:26:45.000000000 +0100 +@@ -4,9 +4,9 @@ + ASY = ../asy -dir ../base + DOCFILES = asymptote.pdf CAD.pdf PDFAnim_temp_Guide.pdf + +-doc: asymptote.dvi asymptote.info html man ++doc: $(DOCFILES) asymptote.info html man + +-man: asymptote.pdf CAD.pdf PDFAnim_temp_Guide.pdf asy.1 ++man: $(MANFILES) + + faq: + cd FAQ; $(MAKE) faq +@@ -71,15 +71,15 @@ + 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: man ++ ${INSTALL} -d -m 755 $(mandir)/man1 + ${INSTALL} -p -m 644 $(MANFILES) $(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) + -if test -z "$(DESTDIR)"; then \ + install-info --infodir=$(infodir) asymptote.info; \ diff --git a/media-gfx/asymptote/files/digest-asymptote-1.26 b/media-gfx/asymptote/files/digest-asymptote-1.26 new file mode 100644 index 000000000000..eda60b10365a --- /dev/null +++ b/media-gfx/asymptote/files/digest-asymptote-1.26 @@ -0,0 +1,3 @@ +MD5 08ffbcf8ddf17644a408a86c8d2f0354 asymptote-1.26.src.tgz 930703 +RMD160 5c791beea7819c10b1b38af564e6bfbb73ce2964 asymptote-1.26.src.tgz 930703 +SHA256 727d3f6f3ce21d68d19177ddfaddccbef84a8c2fe3c79ec476b8cc2e5b7d1e80 asymptote-1.26.src.tgz 930703