clean up; fix Emacs and Vim support (bugs 191008 and 193402); do some quoting; use latex_rehash from latex-package

(Portage version: 2.1.3.9)

17 files changed, 47 insertions, 702 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 5a50cecc0230..4e10e4668cac 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,20 @@
 # 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.11 2007/08/28 21:13:22 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.12 2007/10/07 09:14:00 opfer Exp $
+
+*asymptote-1.33-r1 (07 Oct 2007)
+
+  07 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/asymptote-1.20-configure-ac.patch,
+  -files/asymptote-1.20-makefile.patch,
+  -files/asymptote-1.21-configure-ac.patch,
+  -files/asymptote-1.21-makefile.patch,
+  -files/asymptote-1.26-configure-ac.patch,
+  -files/asymptote-1.26-makefile.patch, +files/64asymptote-gentoo.el,
+  +files/asy-ftd.vim, -asymptote-1.20.ebuild, -asymptote-1.21.ebuild,
+  -asymptote-1.26.ebuild, -asymptote-1.33.ebuild, +asymptote-1.33-r1.ebuild:
+  clean up; fix Emacs and Vim support (bugs 191008 and 193402); do some
+  quoting; use latex_rehash from latex-package
 
 *asymptote-1.33 (28 Aug 2007)
 
diff --git a/media-gfx/asymptote/asymptote-1.20.ebuild b/media-gfx/asymptote/asymptote-1.20.ebuild
deleted file mode 100644
index dff7d77a537b..000000000000
--- a/media-gfx/asymptote/asymptote-1.20.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.20.ebuild,v 1.4 2007/04/30 21:14:19 genone 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}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~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
-
-	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() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
-
-	[ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-1.21.ebuild b/media-gfx/asymptote/asymptote-1.21.ebuild
deleted file mode 100644
index 93ae2cb136fc..000000000000
--- a/media-gfx/asymptote/asymptote-1.21.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.4 2007/04/30 21:14:19 genone 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}.tar.gz"
-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
-
-	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() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
-
-	[ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-1.26.ebuild b/media-gfx/asymptote/asymptote-1.26.ebuild
deleted file mode 100644
index 644786c893ec..000000000000
--- a/media-gfx/asymptote/asymptote-1.26.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.3 2007/08/03 06:50:43 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
-
-	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() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
-
-	[ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-1.33.ebuild b/media-gfx/asymptote/asymptote-1.33-r1.ebuild
index 84d99ce2dc24..7d36233b1447 100644
--- a/media-gfx/asymptote/asymptote-1.33.ebuild
+++ b/media-gfx/asymptote/asymptote-1.33-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.33.ebuild,v 1.1 2007/08/28 21:13:22 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.33-r1.ebuild,v 1.1 2007/10/07 09:14:00 opfer Exp $
 
-inherit eutils elisp-common
+inherit eutils elisp-common latex-package
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net"
+HOMEPAGE="http://asymptote.sourceforge.net/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 LICENSE="GPL-2"
 
@@ -22,7 +22,7 @@ RDEPEND=">=sys-libs/readline-4.3-r5
 	fftw? ( >=sci-libs/fftw-3.0.1 )
 	emacs? ( virtual/emacs )
 	gsl? ( sci-libs/gsl )
-	vim-syntax? ( app-editors/vim )"
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.5
 	>=sys-devel/bison-1.875
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 		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
@@ -55,10 +57,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 +69,7 @@ src_unpack() {
 	einfo "Building configure"
 	WANT_AUTOCONF=2.5 autoconf
 
-	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
 src_compile() {
@@ -83,6 +85,10 @@ src_compile() {
 
 	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() {
@@ -94,25 +100,25 @@ src_install() {
 		target="install"
 	fi
 
-	make DESTDIR=${D} ${target} || die "make install failed"
+	emake DESTDIR="${D}" ${target} || die "emake install failed"
 
 	dodoc BUGS ChangeLog README ReleaseNotes TODO
 
 	if use emacs ; then
-		elisp-site-file-install base/asy-mode.el
-		elisp-site-file-install base/asy-keywords.el
-		elisp-site-file-install "${FILESDIR}"/64asy-gentoo.el
+		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() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
+	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'
@@ -121,8 +127,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
-
-	[ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen
+	latex-package_rehash
+	use emacs && elisp-site-regen
 }
diff --git a/media-gfx/asymptote/files/64asymptote-gentoo.el b/media-gfx/asymptote/files/64asymptote-gentoo.el
new file mode 100644
index 000000000000..57cd48d04a64
--- /dev/null
+++ b/media-gfx/asymptote/files/64asymptote-gentoo.el
@@ -0,0 +1,9 @@
+
+;; site-init for media-gfx/asymptote
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'asy-mode "asy-mode" "Asymptote major mode." t)
+(autoload 'lasy-mode "asy-mode" "Hybrid Asymptote/Latex major mode." t)
+(autoload 'asy-insinuate-latex "asy-mode" "Asymptote insinuate LaTeX." t)
+(add-to-list 'auto-mode-alist '("\\.asy$" . asy-mode))
diff --git a/media-gfx/asymptote/files/asy-ftd.vim b/media-gfx/asymptote/files/asy-ftd.vim
new file mode 100644
index 000000000000..0f5e3957900a
--- /dev/null
+++ b/media-gfx/asymptote/files/asy-ftd.vim
@@ -0,0 +1,2 @@
+au BufNewFile,BufRead *.asy     setf asy
+filetype plugin on
diff --git a/media-gfx/asymptote/files/asymptote-1.20-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.20-configure-ac.patch
deleted file mode 100644
index c6b495e25e75..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.20-configure-ac.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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 <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.20-makefile.patch b/media-gfx/asymptote/files/asymptote-1.20-makefile.patch
deleted file mode 100644
index 4bb2db0f55b2..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.20-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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/asymptote-1.21-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.21-configure-ac.patch
deleted file mode 100644
index c6b495e25e75..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.21-configure-ac.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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 <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.21-makefile.patch b/media-gfx/asymptote/files/asymptote-1.21-makefile.patch
deleted file mode 100644
index 4bb2db0f55b2..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.21-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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/asymptote-1.26-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch
deleted file mode 100644
index c6b495e25e75..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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 <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.26-makefile.patch b/media-gfx/asymptote/files/asymptote-1.26-makefile.patch
deleted file mode 100644
index 4bb2db0f55b2..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.26-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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.20 b/media-gfx/asymptote/files/digest-asymptote-1.20
deleted file mode 100644
index 1586964562f2..000000000000
--- a/media-gfx/asymptote/files/digest-asymptote-1.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e705a3418395d26318509aaa8191076 asymptote-1.20.tar.gz 937426
-RMD160 9b51fbc66152e4ec89a53e8e3743cf68f3a2d868 asymptote-1.20.tar.gz 937426
-SHA256 860e7b28c3bace3786e7dace9b458437eddb78382fc13e943bf6ff42c06ca2ca asymptote-1.20.tar.gz 937426
diff --git a/media-gfx/asymptote/files/digest-asymptote-1.21 b/media-gfx/asymptote/files/digest-asymptote-1.21
deleted file mode 100644
index 56e282845773..000000000000
--- a/media-gfx/asymptote/files/digest-asymptote-1.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b1ce37bca1449492a85303eb45e5b13b asymptote-1.21.tar.gz 969726
-RMD160 0b669ea9b6afb657199c9243534710079fd34f27 asymptote-1.21.tar.gz 969726
-SHA256 d07cb00bd7a7df1430d4e133d38d3d41917e0c24cd651c7799546543de96619b asymptote-1.21.tar.gz 969726
diff --git a/media-gfx/asymptote/files/digest-asymptote-1.26 b/media-gfx/asymptote/files/digest-asymptote-1.26
deleted file mode 100644
index eda60b10365a..000000000000
--- a/media-gfx/asymptote/files/digest-asymptote-1.26
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08ffbcf8ddf17644a408a86c8d2f0354 asymptote-1.26.src.tgz 930703
-RMD160 5c791beea7819c10b1b38af564e6bfbb73ce2964 asymptote-1.26.src.tgz 930703
-SHA256 727d3f6f3ce21d68d19177ddfaddccbef84a8c2fe3c79ec476b8cc2e5b7d1e80 asymptote-1.26.src.tgz 930703
diff --git a/media-gfx/asymptote/files/digest-asymptote-1.33 b/media-gfx/asymptote/files/digest-asymptote-1.33-r1
index d2933540e3f0..d2933540e3f0 100644
--- a/media-gfx/asymptote/files/digest-asymptote-1.33
+++ b/media-gfx/asymptote/files/digest-asymptote-1.33-r1