Dependencies corrected, less documentation is produced with USE=-doc. Closing bugs #238108, #238121, #239063.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-tuxonice-r1 i686

5 files changed, 302 insertions, 13 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 5755d8dfe083..f7343b44e1e8 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.20 2008/09/04 07:52:46 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.21 2008/10/07 06:14:53 grozin Exp $
+
+*asymptote-1.43-r1 (07 Oct 2008)
+
+  07 Oct 2008; Andrey Grozin <grozin@gentoo.org>
+  +files/asymptote-1.43-r1-configure-ac.patch, +asymptote-1.43-r1.ebuild:
+  Dependencies corrected, less documentation is produced with USE=-doc.
+  Closing bugs #238108, #238121, #239063.
 
   04 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   asymptote-1.29.ebuild, asymptote-1.41.ebuild:
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 6a6faeeb5752..bbfd4543ef8d 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
 AUX 64asymptote-gentoo.el 337 RMD160 423330249638e628cb0f7d0b8196042a34cffa03 SHA1 0ab1578ba7989941567f3f855481b8e9805420c2 SHA256 28dde57a1b6b39e583739c387eaef205dc16eea97c5980fddd2e3d0dd7023ed3
 AUX asy-ftd.vim 60 RMD160 a08d3dbd7535d3de0897dd73b00f8866a72db731 SHA1 426086e8ed8d9f45518df1380ab62703cd5f1e0d SHA256 c766fccb0e3e43a6fb78eaa56cf6c45398d48b08566ea4794726f4a6ae3c9dc1
@@ -14,19 +11,14 @@ AUX asymptote-1.41-configure-ac.patch 1710 RMD160 66d13274afd490b1b89608739572b2
 AUX asymptote-1.41-makefile.patch 1863 RMD160 8fc8ce5426f972cfe556139e278f9b1493410bda SHA1 00204b46d5d55cefa3319f0d6a4bf6a4e61b758e SHA256 ccc4cc5fde6cca905cf1dad5ff229240c1c7cddf233802b6d2150ff14241d072
 AUX asymptote-1.41-xdg-utils.patch 670 RMD160 547cc51966119ced3f0455519285556332b7e2ab SHA1 7fb8d7df077ea7f832d1a24b86917cc430c5f266 SHA256 d7c98af5e06bb10ae1872d371c8508d24d30994d365b1cc0be06785cbabffb39
 AUX asymptote-1.43-configure-ac.patch 1663 RMD160 9efb5fc074dee95b9c2fb12e603662445fbfed87 SHA1 75279eb6f6d56816b3a3085022832c5925819373 SHA256 788bb48c9764a8aee40099a1edfdd5935f50e68025b63dba50c02b5a37045373
+AUX asymptote-1.43-r1-configure-ac.patch 2201 RMD160 2e928662225e132c413fcde41a20ca40a0b21e23 SHA1 7568a2b310fbd766818909f6023b0e5e0a0ca63b SHA256 66fc1a998a550977c6fdada6f43a30df7080132e2b9a915974afb696b317ef55
 AUX asymptote-1.43-xdg-utils.patch 670 RMD160 cba5d67c5f0c1c11ce8e0fa87b9580e20ec6df8c SHA1 97c400dfec31c733a10b01d7327b7bf720b21fe7 SHA256 760cf4f49d9a42a66145f9cd8a929fd29fdc0fd3d29ade1fe9bc36c9e6106ad1
 DIST asymptote-1.29.src.tgz 933266 RMD160 013a5f8f706159ea564811cd044a12fe4b6e58da SHA1 366a42e95796fe88863a2d82624e25630be8619e SHA256 2b4eea7b3a016295b4543e3d3c9fca80fa278fc2fb7824306130a2c37e602366
 DIST asymptote-1.41.src.tgz 1052162 RMD160 802a0eeccab4fc172e606edc30ff0608ff9992bc SHA1 4519abce41ca350abc0c9c04d2d569700f823f02 SHA256 5d0db1c0f993670570cff6223f5f40e81ee49423986b3805f48c1c579273f267
 DIST asymptote-1.43.src.tgz 1070973 RMD160 f83223f953032695b6dc45f483d0ad14c9e62349 SHA1 07b98fb4bba37cfebcc9fe926f5f767ed6de7787 SHA256 df010dca6cb0090cf677c45f89fa415c0c0aba8518fbbd3ae4839e597fa8ed74
 EBUILD asymptote-1.29.ebuild 3491 RMD160 b14992d5aeeedd20f699c1c0c3aaa419bc2c3930 SHA1 bd68cb47a22ac889c9c25527dcff8a9ed8d615c4 SHA256 fd4f867553841368d2e2b19e623e796f89574ab2473efd0f23bfb5386db671cc
 EBUILD asymptote-1.41.ebuild 3670 RMD160 4bdf9aa06153b55a7b86c0f8de5b5ae71cb6d150 SHA1 bd0f33a2efd7f82204676f671fc70e83efd64740 SHA256 6c036d5a5731603aace392b05fc01607ac0b3896d4f6269790ddcebfc8ec645d
+EBUILD asymptote-1.43-r1.ebuild 5839 RMD160 4c78efaae1d77704e22dbaa0091b3757ab1f0fce SHA1 c45f31177b84d9f55dce780b02d45dab5dc0c9c8 SHA256 33f6cca9c5c16bf806cfd3a000cef79f0bf3fb1c5a90a5615228a397da5aed53
 EBUILD asymptote-1.43.ebuild 6269 RMD160 8427bf833a5272e900e478f651557634b889206f SHA1 c6599863bde6558b482ddb0d3f7b1c9385818c59 SHA256 7434906c1cc68619f522a0554c840513b88844897922b007883de7dc62226bd6
-MISC ChangeLog 5051 RMD160 e857d65c904061b6900e226277aa01f3865e630c SHA1 cbe9333da86d264c88d4bdeb6a318564a95cba6a SHA256 f2dbb553420cbd945c5e793476c03c4775161e924ece4221d250d713a1a78de5
-MISC metadata.xml 787 RMD160 49837625b27fb22e65db99aa428655d97d87861a SHA1 8dbc3b506622e8ccb6006c082d0eef3f5b1ca55e SHA256 2e98414c1419bd1a378ac19ff9489c51e976e61486524a7a062452863618364e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki/k/4ACgkQNQqtfCuFnePTeQCeJiSAMCXAtFJtCu9HGqWlx8PV
-BqoAn10w8zhVgDzXd/fvGUDZ4FWDmXkL
-=0b2J
------END PGP SIGNATURE-----
+MISC ChangeLog 5324 RMD160 d34cbe734989dcbc26e86e20827dd53f219f7373 SHA1 8a319e3f249b1abd12ec270b830a9b992353df76 SHA256 3964497d0c297b1b7b90fcbceedd556e0259561ca14ac4d3a917e81af991e84c
+MISC metadata.xml 869 RMD160 4719ac66d805256a91cf9c311ea75e6d53db256e SHA1 f00600bb09e08fd31ba4fa15414bd3d578a4f136 SHA256 41c4190d40edabcbed20b712c8dca48783e336c7cd14bff51015966b263865b5
diff --git a/media-gfx/asymptote/asymptote-1.43-r1.ebuild b/media-gfx/asymptote/asymptote-1.43-r1.ebuild
new file mode 100644
index 000000000000..4c073ef05135
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-1.43-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.43-r1.ebuild,v 1.1 2008/10/07 06:14:53 grozin Exp $
+EAPI=2
+inherit eutils autotools elisp-common latex-package multilib python
+
+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 emacs examples fftw gsl +imagemagick latex python sigsegv vim-syntax X"
+
+RDEPEND=">=sys-libs/readline-4.3-r5
+	>=sys-libs/ncurses-5.4-r5
+	imagemagick? ( media-gfx/imagemagick[png] )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[-nocxx] )
+	fftw? ( >=sci-libs/fftw-3.0.1 )
+	gsl? ( sci-libs/gsl )
+	X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] )
+	python? ( dev-lang/python )
+	latex? ( virtual/latex-base )
+	emacs? ( virtual/emacs )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] )"
+
+pkg_setup() {
+	if use latex; then
+		# Calculating ASY_TEXMFDIR
+		local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)"
+		local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"
+
+		if [ -z "${TEXMFPATH}" ]; then
+			eerror "You haven't defined the TEXMFSITE variable in your TeX config."
+			eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}"
+			die "Define TEXMFSITE in TeX configuration!"
+		else
+			# go through the colon separated list of directories
+			# (maybe only one) provided in the variable
+			# TEXMFPATH (generated from TEXMFSITE from TeX's config)
+			# and choose only the first entry.
+			# All entries are separated by colons, even when defined
+			# with semi-colons, kpsewhich changes
+			# the output to a generic format, so IFS has to be redefined.
+			local IFS="${IFS}:"
+
+			for strippedpath in ${TEXMFPATH}; do
+				if [ -d ${strippedpath} ]; then
+					ASY_TEXMFDIR="${strippedpath}"
+					break
+				fi
+			done
+
+			# verify if an existing path was chosen to prevent from
+			# installing into the wrong directory
+			if [ -z ${ASY_TEXMFDIR} ]; then
+				eerror "TEXMFSITE does not contain any existing directory."
+				eerror "Please define an existing directory in your TeX config file"
+				eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories"
+				die "TEXMFSITE variable did not contain an existing directory"
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	# Fixing fftwl, gsl, sigsegv enabling
+	epatch "${FILESDIR}/${PF}-configure-ac.patch"
+	einfo "Patching configure.ac"
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	# Changing pdf, ps, image viewers to xdg-open
+	epatch "${FILESDIR}/${P}-xdg-utils.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		--disable-gc-debug \
+		$(use_enable boehm-gc gc system) \
+		$(use_with fftw) \
+		$(use_with gsl) \
+		$(use_with sigsegv)
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	cd doc
+	emake asy.1 || die "emake asy.1 failed"
+	if use doc; then
+		# info
+		einfo "Making info"
+		emake ${PN}.info || die "emake ${PN}.info failed"
+		# html
+		einfo "Making html docs"
+		emake ${PN}/index.html
+		einfo "Making FAQ"
+		cd FAQ
+		emake
+		cd ..
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		emake asymptote.pdf
+		emake CAD.pdf
+	fi
+	cd ..
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	# the program
+	exeinto /usr/bin
+	doexe asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins base/*.asy
+
+	# documentation
+	dodoc BUGS ChangeLog README ReleaseNotes TODO
+	doman doc/asy.1
+
+	# X GUI
+	if use X; then
+		insinto /usr/share/${PN}/GUI
+		doins GUI/*.py
+		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins examples/*.asy \
+			examples/*.eps \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/extra/*.asy
+		insinto /usr/share/${PN}/examples/animations
+		doins examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc
+		insinto "${ASY_TEXMFDIR}"/tex/latex
+		doins ${PN}.sty asycolors.sty
+		if use examples; then
+			insinto /usr/share/${PN}/examples
+			doins latexusage.tex
+		fi
+		cd ..
+	fi
+
+	# asymptote.py
+	if use python; then
+		python_version
+		insinto /usr/$(get_libdir)/python${PYVER}/site-packages
+		doins base/${PN}.py
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	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
+
+	# extra documentation
+	if use doc; then
+		cd doc
+		doinfo ${PN}.info*
+		dohtml ${PN}/*
+		cd FAQ
+		dodoc asy-faq.ascii
+		doinfo asy-faq.info
+		insinto /usr/share/doc/${PF}/html/FAQ
+		doins asy-faq.html/*
+		cd ..
+		insinto /usr/share/doc/${PF}
+		doins ${PN}.pdf CAD.pdf
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_version
+		python_mod_compile \
+			/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}.py
+	fi
+
+	use latex && latex-package_rehash
+
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup
+}
diff --git a/media-gfx/asymptote/files/asymptote-1.43-r1-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.43-r1-configure-ac.patch
new file mode 100644
index 000000000000..8d9ba5dc1cab
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-1.43-r1-configure-ac.patch
@@ -0,0 +1,59 @@
+diff -U2 -r asymptote-1.43.orig/configure.ac asymptote-1.43/configure.ac
+--- asymptote-1.43.orig/configure.ac	2008-06-12 14:42:50.000000000 +0700
++++ asymptote-1.43/configure.ac	2008-10-03 20:15:51.000000000 +0700
+@@ -77,8 +77,14 @@
+ 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.1
+@@ -117,5 +123,5 @@
+       CPPFLAGS_SAVE=$CPPFLAGS
+       CPPFLAGS=$CPPFLAGS" $INCL"
+-      AC_CHECK_HEADER(gc.h,
++      AC_CHECK_HEADER([gc/gc.h],
+ 	AC_CHECK_LIB([gc],[GC_malloc],[
+ 	  LIBS=$LIBS"-lgc "
+@@ -182,5 +188,14 @@
+ 			 AC_CHECK_LIB([curses], [setupterm]))
+ AC_CHECK_LIB([m], [sqrt])
+-AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
++
++AC_ARG_WITH(sigsegv,
++           [  --with-sigsegv          use libsigsegv],
++           [with_sigsegv=$withval],
++           [with_sigsegv="no"])
++if test "$with_sigsegv" = "yes"; then
++AC_CHECK_HEADER(sigsegv.h,
++   AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]),
++   AC_MSG_NOTICE([*** Header file sigsegv.h not found ***]))
++fi
+ 
+ AC_CHECK_LIB([readline], [rl_completion_matches],,
+@@ -198,4 +213,9 @@
+    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,
+@@ -203,4 +223,5 @@
+            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
+ 
+ TRIANGLE=Delaunay
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index b60d13756716..31fd956a8cc7 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -19,5 +19,8 @@
 		<flag name='boehm-gc'>
 			Enables using the Boehm-Demers-Weiser conservative garbage collector
 		</flag>
+		<flag name='sigsegv'>
+			Enables using <pkg>dev-libs/libsigsegv</pkg>
+		</flag>
 	</use>
 </pkgmetadata>