use dobin instead of exeinto /usr/bin/ && doexe; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index fad223acceb9a979695dc55cd9e06a3104807897..55915a386aebc5e2d4ece1362abdcf0c70d9f083 100644 (file)
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.111 2015/01/11 16:27:22 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.112 2015/03/21 17:11:55 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -asymptote-2.27.ebuild,
+  asymptote-2.21.ebuild, asymptote-2.32.ebuild, metadata.xml:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
   11 Jan 2015; Andrey Grozin <grozin@gentoo.org> asymptote-2.32.ebuild,
   +files/asymptote-2.32-ghostscript-9.15.patch:

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index c306bbb57081374f8ac1ec65d179d401017a604c..1629fb39110c243d4192edd13bec93f8d58f6358 100644 (file)
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 64asymptote-gentoo.el 337 SHA256 28dde57a1b6b39e583739c387eaef205dc16eea97c5980fddd2e3d0dd7023ed3 SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86 WHIRLPOOL 895352207681d02e67a81bbb7b35ee22730eaf14d385e5b634a8a939cc187d14fc72fd9ce7146c7a4e10a9b66835b11b1e64f20e9e3a10dab7004f6e0284b3a4
 AUX asy-ftd.vim 60 SHA256 c766fccb0e3e43a6fb78eaa56cf6c45398d48b08566ea4794726f4a6ae3c9dc1 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd WHIRLPOOL 5cf295a065ef2b1fd3ffae13cf60b76f31b62835ac24c580ba31e2c7159d65cb763809c1c3536b67d8ae5e70062bbe312c2f216cf8ac3717dd83d8064d1b7401
@@ -14,29 +14,27 @@ AUX asymptote-2.32-ghostscript-9.15.patch 906 SHA256 d2cb6119969ed17f07b09a5a348
 AUX asymptote-2.32-info.patch 436 SHA256 ff2cac5daac0c4efa5d2375cd440791d2843590d07f39e3808b034732e8a49ee SHA512 55283a8103625f1aee32ed3b8b235ff4af6350a2879a9c1289779a9a37ab0d76446dd3b17b731e9e1b8d1bb1c5e37c6c738eb193f00df89ef22b08b084e2ae36 WHIRLPOOL d5b2d599e033eab06e1d96d697f83a1f86e637dc2b613a1ba0ad7b7f2cc3b107cecddf8703c1f4c9fcfae76046806bbdec617dde2acbf02f4474bfd964a0b3cc
 AUX asymptote-2.32-xdg-utils.patch 744 SHA256 c86323f54b475641e62047605ada38c7749a60990fde1a81b589f74a9f9c02d0 SHA512 972be61509145f61537a0b8eab79a7f3b5f866e790bf9b18066235c906ed29621cd32dd0d894458221f3fb2c28ab67199139ba7f8e4753d2b20d5f1f07435b9b WHIRLPOOL 249514ce515990dec942a241a2cdd0269bef07f651a4b1c08c7440eaf7bb7e40d417f9b4629d7fe8ba4cf1514c718c4ed78a3ada61762121c41b49687fffcd46
 DIST asymptote-2.21.src.tgz 1797507 SHA256 5fe6cfa880a9dba36105d45e5c2bcd0491240da760d455997656dd6e3b90931e SHA512 10341674f0b88611a341d2cb8abd1dfaec1d2711111bb66fb3cd00442427b432107c6c6deeec548b4c7cf114b77a764f0efe627bf421f990e64626d3bb60a91a WHIRLPOOL d30d88eac92e1e4ea411a54e0bd0149d5146db484113cbbc990cbb5250ef46fac804668929f652fddfc87a094f150692abb5f0f2b2719801fe424eb6e31f4d77
-DIST asymptote-2.27.src.tgz 1788470 SHA256 9fd799527760cfcbba996b8a5f62ab1e24c24f835ddfbbf10c29a5151fc1c1bf SHA512 fd89218138c9994976c911cf910855a90bd11cbe1f5287546fe697a5d44bdcf9c0ce0f3c631ce6d3101f702fec743c66445947954b5c9371a37ae0811ba0d1db WHIRLPOOL 357bb428fdf9dab3070c5b07afd46aac27a1c1d091d78c702314578c7b1190b2fd150e7bd7375e656377de7f2fbb786ba4ec04dbfc35e494e77d1deb2ea8445e
 DIST asymptote-2.32.src.tgz 1794495 SHA256 2035035e02774598312d5588da2685d20fb85a378ea2bbe48b825c5442b18fa5 SHA512 a0663f1768cb4340bb6e9224d4fbc6e2f8b41501b1f59793d84db2e0f99b9ff071d3dd8fa5c4715c1874f8ef1af713a54b27de37ff40d8ca042f0f48579a57f9 WHIRLPOOL 38a8aaa581acb07bcc7ac0c802222501acf77abaf609d5ae758d9b5668ac6b8b1343640259cc3948e62a39862404709ddb64b4bbd11bcf20dbb7ce29d4fc25d1
-EBUILD asymptote-2.21.ebuild 4718 SHA256 062948a7fd81cf3b39376470a52050cd14326ac2b8f2818cb3458e0cb280845e SHA512 dc48e90f5f2462118d754f54034fd893c252ba4e413a3701dea22a8c7566fb5d42d06bdb22e315e97d83f2d18507850ab9ae4612165ca6e611531e1e44b42eb1 WHIRLPOOL 1b88b87d8392634897bc7e838de49d0944d2dcb44ca7377bc096a1394a4d48d4ad06ac983dc272e5683df7affb43c8271873b3ce20e3ef110c6d1b4d98180fc6
-EBUILD asymptote-2.27.ebuild 4734 SHA256 c5d39fac07f5f25ea7da9594a34b6a8b2792682fccb55fc31c636cc6f40bbd43 SHA512 e8b3b850370cbdd6ebcfde5b583b4b97bba962aae197000cb02a95253e84be417c86a7206a34c69aa8958f797fc2159bb29621ce285f4c3e241b9a204d56f0a8 WHIRLPOOL 9cdea0d0fe157c33eaf95b1965db40c698c292c8f8bfdf89d6aa03b0b17db0c38673d4b81f907d2500092a95fa91e237abe88549d4be148199dcc99a802b7e4d
-EBUILD asymptote-2.32.ebuild 4839 SHA256 a9b97180124f0babd3868992799905b7458d8a7443109b36046dc671174851f8 SHA512 a6e4bcba138bc8580d8e36276e73bc78fd3908b94f9e48a3583f86659f7b45f6e1d4c1c3b013c698accc8f4673dfdd1aedbec22056829861a4e236f7481fb74b WHIRLPOOL e58270ce647772c7eebece359d0f757bd19c80613e5e1b49eb10a9b53159e688338794b90c324abf2a227fbe649cf0e99a56171fa18fdbe1eb3e25981b5cb14c
-MISC ChangeLog 31153 SHA256 ebb2e889259c75d8ad72d0625a64c2be5005ebe9f3a2f8277b46821a7e43940b SHA512 fb9adeb8aa352f7fb6a3abf364d10d252744a4846952bbb39c029521b6836f804e73f40ab64806299fcf4c9d44978a1e8d35a2480ac0639b01c00fc2ce954d40 WHIRLPOOL 1f13642c60f5ae539f287948be888f05d90a1f44168ee7cc5102961b8748b1712ce341951d81f777da8d11f6142405a4d22e72df0a5cee1fe4056193f0e21b36
-MISC metadata.xml 937 SHA256 ba41eca26b5042f8bb6bbc8245c4a830ec5f7b3a5f47bfb19127c3a8b59780d4 SHA512 02addb8715de66c81cabdc0cd716133d1ff5a7acefd79dc8ddf832a616ed86765624ad6f01b1429a74d04304d8990f90b2a25ef235999dd6f6abe55e64c1fac0 WHIRLPOOL d0ae7ddbae673380fc7c118a2c19b2d61da2ae5191093cae9ff43605a5f599c9ff1ac4debb5f5e5dbff25e76ca31d2ef5a7bd506bda1a2439b62ec2d48002cea
+EBUILD asymptote-2.21.ebuild 4775 SHA256 4a31c9448fbb276dde5d8935300c9f3f2ffb51a233f7a2683e7b0b5f35471513 SHA512 c83519a857ebb7d4152d711c07c3ac68aaf219a2137d6a39848364ce12eb074c629cf710b729d41cc0689502749ac31498724b164382741f13e1b97a76c96c8b WHIRLPOOL d3a3d2b9b525a3c5cdbece4b4020c28b1194c7e4cc1a7dc20d33733ded07fa91a3c11b9da34227681d1b41cd806fbe3a8bb41d6b0ea88dc5f7b03bd5474b2357
+EBUILD asymptote-2.32.ebuild 4808 SHA256 8d4b2b82620de7c03d4e715ec52afd61e7d40dc503efd1bceab3dc01a43d7e67 SHA512 6606ded9a2eb46938ca83190cbd34a2a67f1aad74be7355eccba1ac13b6fd2ae4896c78ecb85e09c82c314289d942abc70a03f4f8c355d113d368d4443414748 WHIRLPOOL 3b94a14668ece03eb6b7ac34a6dc1edb901f6ef0b2c42de3aa21473f6f3b268cb67c6feb5ddbbfdfaf899d0e8f88e614ec3620c0549edfcd437a51bd1c385d6f
+MISC ChangeLog 31345 SHA256 d8ac4e20f284e917db6fd098648757c19bb67c04036d706d848d799ebc7497c2 SHA512 a10cd2714c8efb07b2d7ef9538951faace408525becbd7b203fa36241c24475cc6d8714f8246a813be4cceca48c71de421aaebd336c1f349bf648d7d176b5908 WHIRLPOOL 67ed17ab8d83fac0512dda190408d7f25ec4789be94d687849e04fbde69f45614b886e4dfc9b89e8e04b2839bfb110d6f2a5cfdb9053ada736fde780b8477fe5
+MISC metadata.xml 953 SHA256 b646c41a6244b1f3815f05343f05ce8481232d061e62d9e30f923c4495cceff4 SHA512 06578585d88b2cae81cf7023410fc090bbe70109e77d0a710771dd6ac84613186b8c0f40e13febb778528316ab65baeb096f4f9555b59140a08654eb5a7b119d WHIRLPOOL d3992d21363b21f2400bb5a5cf12407db808da7b669de31ea873552263346f083899cf9cb53c45ee53ef3916d5d992739e073241f9df9059cf6c8f6f2f6e3a52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUsqJMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2Maw0P/Altvgu1DEHuF/bsWNDmVA22
-0PGHNj0MoHe+r5ght2b+Wj/jnjASXYeK6TnHn0DcodtvZDnAclTd02BMC72AYTGK
-3barT4bA83NixnRZUjaCwKcc9Ed+CrlQjWR45YPhALe2UzBhBuYsbLyw9VtnJSLt
-XxUxOp+cfSGDylaIHWIE44dmtqTfKsSiYcZ43GSDID42Wgi4dMzzEa9tl2aIxEF2
-VxLUG5FyeQVNRlm6Id1UeKQNspMS2CO567vTJfxqlW6cmUtb39Qf285gL/Yc1Zh7
-VFDN7TrJ2ZeXiETQsRimrVS7cWZ5OhaAUOkeC7OXtEwUOdQkQhHWqZjuZgbv4ilC
-5w2Ykf8lx1F90rurMRW2jOt2pmqysQ4Q0cMorTc8ITkbpIrPnh3DvRJJ0eUIbI/H
-8K7XGFlBKbL5xpx8RA/Do3VEd+rJCwGGtu7iSaBkMv1JiQULIham1wBLfj27y7/3
-m7QCLXoASufdnUQbXuhwLs43fccwVB0BFSrfL/zQJ5EZxykPeui1XIEN5+0Cmn5l
-/O1DzpXjXE/Os8Sx2mDf74SVaoio3XpU/tLid4qoaq9rMhokrxPWQh/R7GWWvLf1
-ZUs7YLbnpaKGCDbnu5A3ov6T+KJQLYIwYOxEeL5nYpHnJ2uCGHW6QsOA+WMHksH1
-uxM+UU4e+I3zckdqsYYA
-=0q8Y
+iQJ8BAEBCgBmBQJVDaaMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirLCAP+wbg61aS4aV1Q2o0Iho6/9xz
+OH95c9ek5RsEFAWXA/Tso116tO2w+kqkctc68qvVEUqW7eTZxRAbi/dSrfF4RO/w
+VJh4xksz5j97i0zcCiH7dW7SPi6Tk50S1ilevb4jEtZH7c3uOm8bI4utlkDRoIqF
+6HwyID0+YLJmGoU+hoF7yCVZsL8httKwPMY/LKSuySqVWkGjh7gWMomsLvQOHR5X
+/aXVxyNBD9QtDyzs4w9Jsqc4qvorwz8gCH4ap3qU+rVLDjE1dpagSof+1dhY2C1A
+Jxb0cGjzrBLzShzPhp1XwhaLC0uMgf19Kn8v4cXAyWr25Y8YBTz1EsIgg5EIAwT3
+d6hTUjFofUeuxhzrRtphWUJoQElHGZ78iMWdiD6CK5qoa9WUGDYbRqb+hYdCmCFg
+W/XB8Kfq8msArGvndEVL0yiB8XhirSebWxRLaFKCztQyllgUttbKcfmtDWQiyDxe
+M/Lb5Ws46DUpdBRFud3MLjxf7FHHZKiFmUprhgTpTntD9ylThT5E+gqKbt7mD0zC
+DwZtJ0hv2oKwf9M1agNf9xsokbsEhuAX7vjnQBUAN7upyHG6PDKRrG7UZbOWpnWx
+YMBwR5cnzV+6iGtwswm7wxU0jg4clOjnzTSr4VbwsfMU5bHm8lK1iBa/p7hsgP/w
+l43ngngeK62JfrzjF6Wk
+=pMvb
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/asymptote/asymptote-2.21.ebuild b/media-gfx/asymptote/asymptote-2.21.ebuild
index 5fd78b3c5ab4398f17d6635eb93199f99602eb5c..9c45f6dea2b2008f47bfd782db29a08bf8a825f4 100644 (file)
--- a/media-gfx/asymptote/asymptote-2.21.ebuild
+++ b/media-gfx/asymptote/asymptote-2.21.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.21.ebuild,v 1.3 2013/02/14 18:42:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.21.ebuild,v 1.4 2015/03/21 17:11:55 jlec Exp $
 
 EAPI=4
+
 SUPPORT_PYTHON_ABIS=1
 PYTHON_DEPEND="python? 2"
 RESTRICT_PYTHON_ABIS="3.*"
+
 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-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
+
 REQUIRED_USE="offscreen? ( opengl )"
 
-RDEPEND=">=sys-libs/readline-4.3-r5
+RDEPEND="
+       >=sys-libs/readline-4.3-r5:0
        >=sys-libs/ncurses-5.4-r5
        imagemagick? ( media-gfx/imagemagick[png] )
        opengl? ( >=media-libs/mesa-8 )
@@ -56,7 +61,8 @@ src_prepare() {
 src_configure() {
        # for the CPPFLAGS see
        # http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-       econf CPPFLAGS=-DHAVE_SYS_TYPES_H \
+       econf \
+               CPPFLAGS=-DHAVE_SYS_TYPES_H \
                CFLAGS="${CXXFLAGS}" \
                --disable-gc-debug \
                $(use_enable boehm-gc gc system) \
@@ -70,15 +76,15 @@ src_configure() {
 src_compile() {
        emake
 
-       cd doc
+       cd doc || die
        emake asy.1
        if use doc; then
                # info
                einfo "Making info"
                emake ${PN}.info
-               cd FAQ
+               cd FAQ || die
                emake
-               cd ..
+               cd .. || die
                # pdf
                einfo "Making pdf docs"
                export VARTEXFONTS="${T}"/fonts
@@ -86,7 +92,7 @@ src_compile() {
                emake -j1 asymptote.pdf
                emake CAD.pdf
        fi
-       cd ..
+       cd .. || die
 
        if use emacs; then
                einfo "Compiling emacs lisp files"
@@ -96,8 +102,7 @@ src_compile() {
 
 src_install() {
        # the program
-       exeinto /usr/bin
-       doexe asy
+       dobin asy
 
        # .asy files
        insinto /usr/share/${PN}
@@ -111,7 +116,7 @@ src_install() {
        if use X; then
                exeinto /usr/share/${PN}/GUI
                doexe GUI/xasy.py
-               rm GUI/xasy.py
+               rm GUI/xasy.py || die
                insinto /usr/share/${PN}/GUI
                doins GUI/*.py
                dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
@@ -121,29 +126,29 @@ src_install() {
        # examples
        if use examples; then
                insinto /usr/share/${PN}/examples
-               doins examples/*.asy \
+               doins \
+                       examples/*.asy \
                        examples/*.eps \
                        doc/*.asy \
                        doc/*.csv \
                        doc/*.dat \
                        doc/extra/*.asy
-               if use X; then
-                       doins GUI/*.asy
-               fi
+               use X && doins GUI/*.asy
+
                insinto /usr/share/${PN}/examples/animations
                doins examples/animations/*.asy
        fi
 
        # LaTeX style
        if use latex; then
-               cd doc
+               cd doc || die
                insinto "${TEXMF}"/tex/latex/${PN}
                doins ${PN}.sty asycolors.sty
                if use examples; then
                        insinto /usr/share/${PN}/examples
                        doins latexusage.tex
                fi
-               cd ..
+               cd .. || die
        fi
 
        # asymptote.py
@@ -171,14 +176,14 @@ src_install() {
 
        # extra documentation
        if use doc; then
-               cd doc
+               cd doc || die
                doinfo ${PN}.info*
-               cd FAQ
+               cd FAQ || die
                dodoc asy-faq.ascii
                doinfo asy-faq.info
                insinto /usr/share/doc/${PF}/html/FAQ
                doins asy-faq.html/*
-               cd ..
+               cd .. || die
                insinto /usr/share/doc/${PF}
                doins ${PN}.pdf CAD.pdf
        fi

diff --git a/media-gfx/asymptote/asymptote-2.27.ebuild b/media-gfx/asymptote/asymptote-2.27.ebuild
deleted file mode 100644 (file)
index f663af7..0000000
--- a/media-gfx/asymptote/asymptote-2.27.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.27.ebuild,v 1.1 2014/05/05 10:28:41 grozin Exp $
-
-EAPI=4
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
-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-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
-REQUIRED_USE="offscreen? ( opengl )"
-
-RDEPEND=">=sys-libs/readline-4.3-r5
-       >=sys-libs/ncurses-5.4-r5
-       imagemagick? ( media-gfx/imagemagick[png] )
-       opengl? ( >=media-libs/mesa-8 )
-       offscreen? ( media-libs/mesa[osmesa] )
-       svg? ( app-text/dvisvgm )
-       sigsegv? ( dev-libs/libsigsegv )
-       boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-       fftw? ( >=sci-libs/fftw-3.0.1 )
-       gsl? ( sci-libs/gsl )
-       X? ( x11-misc/xdg-utils dev-lang/python virtual/python-imaging[tk] )
-       latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 )
-       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] )"
-
-TEXMF=/usr/share/texmf-site
-
-src_prepare() {
-       # Fixing sigsegv enabling
-       epatch "${FILESDIR}/${P}-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"
-
-       # Bug #322473
-       epatch "${FILESDIR}/${P}-info.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 \
-               CFLAGS="${CXXFLAGS}" \
-               --disable-gc-debug \
-               $(use_enable boehm-gc gc system) \
-               $(use_enable fftw) \
-               $(use_enable gsl) \
-               $(use_enable opengl gl) \
-               $(use_enable offscreen) \
-               $(use_with sigsegv)
-}
-
-src_compile() {
-       emake
-
-       cd doc
-       emake asy.1
-       if use doc; then
-               # info
-               einfo "Making info"
-               emake ${PN}.info
-               cd FAQ
-               emake
-               cd ..
-               # pdf
-               einfo "Making pdf docs"
-               export VARTEXFONTS="${T}"/fonts
-               # see bug #260606
-               emake -j1 asymptote.pdf
-               emake CAD.pdf
-       fi
-       cd ..
-
-       if use emacs; then
-               einfo "Compiling emacs lisp files"
-               elisp-compile base/*.el
-       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
-               exeinto /usr/share/${PN}/GUI
-               doexe GUI/xasy.py
-               rm GUI/xasy.py
-               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
-               if use X; then
-                       doins GUI/*.asy
-               fi
-               insinto /usr/share/${PN}/examples/animations
-               doins examples/animations/*.asy
-       fi
-
-       # LaTeX style
-       if use latex; then
-               cd doc
-               insinto "${TEXMF}"/tex/latex/${PN}
-               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_install() {
-                       insinto "$(python_get_sitedir)"
-                       doins base/${PN}.py
-               }
-               python_execute_function python_install
-       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*
-               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() {
-       use python && python_mod_optimize ${PN}.py
-       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 python && python_mod_cleanup ${PN}.py
-       use latex && latex-package_rehash
-       use emacs && elisp-site-regen
-}

diff --git a/media-gfx/asymptote/asymptote-2.32.ebuild b/media-gfx/asymptote/asymptote-2.32.ebuild
index ad51ddd7c88dc78637632b2b408a84349f584d10..5a8930b548b60ae8ca1ae0e0b85eed1dcacb7982 100644 (file)
--- a/media-gfx/asymptote/asymptote-2.32.ebuild
+++ b/media-gfx/asymptote/asymptote-2.32.ebuild
@@ -1,22 +1,29 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.32.ebuild,v 1.3 2015/01/11 16:27:22 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.32.ebuild,v 1.4 2015/03/21 17:11:55 jlec Exp $
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
-inherit eutils autotools elisp-common latex-package multilib python-single-r1
+
+inherit autotools elisp-common eutils latex-package multilib python-single-r1
 
 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-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
-REQUIRED_USE="offscreen? ( opengl )"
 
-RDEPEND=">=sys-libs/readline-4.3-r5
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       offscreen? ( opengl )"
+
+RDEPEND="
        >=sys-libs/ncurses-5.4-r5
+       >=sys-libs/readline-4.3-r5:0=
        imagemagick? ( media-gfx/imagemagick[png] )
        opengl? ( >=media-libs/mesa-8 )
        offscreen? ( media-libs/mesa[osmesa] )
@@ -26,12 +33,24 @@ RDEPEND=">=sys-libs/readline-4.3-r5
        fftw? ( >=sci-libs/fftw-3.0.1 )
        gsl? ( sci-libs/gsl )
        python? ( ${PYTHON_DEPS} )
-       X? ( x11-misc/xdg-utils ${PYTHON_DEPS} virtual/python-imaging[tk,${PYTHON_USEDEP}] )
-       latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 )
+       X? (
+               ${PYTHON_DEPS}
+               x11-misc/xdg-utils
+               virtual/python-imaging[tk,${PYTHON_USEDEP}]
+               )
+       latex? (
+               virtual/latex-base
+               >=dev-texlive/texlive-latexextra-2013
+               )
        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] )"
+       doc? (
+               dev-lang/perl
+               media-gfx/imagemagick[png]
+               virtual/texi2dvi
+               virtual/latex-base
+               )"
 
 TEXMF=/usr/share/texmf-site
 
@@ -62,7 +81,8 @@ src_prepare() {
 src_configure() {
        # for the CPPFLAGS see
        # http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-       econf CPPFLAGS=-DHAVE_SYS_TYPES_H \
+       econf \
+               CPPFLAGS=-DHAVE_SYS_TYPES_H \
                CFLAGS="${CXXFLAGS}" \
                --disable-gc-debug \
                $(use_enable boehm-gc gc system) \
@@ -74,17 +94,17 @@ src_configure() {
 }
 
 src_compile() {
-       emake
+       default
 
-       cd doc
+       cd doc || die
        emake asy.1
        if use doc; then
                # info
                einfo "Making info"
                emake ${PN}.info
-               cd FAQ
+               cd FAQ || die
                emake
-               cd ..
+               cd .. || die
                # pdf
                einfo "Making pdf docs"
                export VARTEXFONTS="${T}"/fonts
@@ -92,7 +112,7 @@ src_compile() {
                emake -j1 asymptote.pdf
                emake CAD.pdf
        fi
-       cd ..
+       cd .. || die
 
        if use emacs; then
                einfo "Compiling emacs lisp files"
@@ -102,8 +122,7 @@ src_compile() {
 
 src_install() {
        # the program
-       exeinto /usr/bin
-       doexe asy
+       dobin asy
 
        # .asy files
        insinto /usr/share/${PN}
@@ -115,10 +134,8 @@ src_install() {
 
        # X GUI
        if use X; then
-               insinto /usr/share/${PN}/GUI
-               doins GUI/*.py
-               chmod 755 "${ED}"usr/share/${PN}/GUI/xasy.py
-               python_fix_shebang "${ED}"usr/share/${PN}/GUI
+               python_scriptinto /usr/share/${PN}/GUI
+               python_doscript GUI/*.py
                dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
                doman doc/xasy.1x
        fi
@@ -126,36 +143,33 @@ src_install() {
        # examples
        if use examples; then
                insinto /usr/share/${PN}/examples
-               doins examples/*.asy \
+               doins \
+                       examples/*.asy \
                        examples/*.eps \
                        doc/*.asy \
                        doc/*.csv \
                        doc/*.dat \
                        doc/extra/*.asy
-               if use X; then
-                       doins GUI/*.asy
-               fi
+               use X && doins GUI/*.asy
+
                insinto /usr/share/${PN}/examples/animations
                doins examples/animations/*.asy
        fi
 
        # LaTeX style
        if use latex; then
-               cd doc
+               cd doc || die
                insinto "${TEXMF}"/tex/latex/${PN}
                doins ${PN}.sty asycolors.sty
                if use examples; then
                        insinto /usr/share/${PN}/examples
                        doins latexusage.tex
                fi
-               cd ..
+               cd .. || die
        fi
 
        # asymptote.py
-       if use python; then
-               python_moduleinto "$(python_get_sitedir)"
-               python_domodule base/${PN}.py
-       fi
+       use python && python_domodule base/${PN}.py
 
        # emacs mode
        if use emacs; then
@@ -173,14 +187,14 @@ src_install() {
 
        # extra documentation
        if use doc; then
-               cd doc
+               cd doc || die
                doinfo ${PN}.info*
-               cd FAQ
+               cd FAQ || die
                dodoc asy-faq.ascii
                doinfo asy-faq.info
                insinto /usr/share/doc/${PF}/html/FAQ
                doins asy-faq.html/*
-               cd ..
+               cd .. || die
                insinto /usr/share/doc/${PF}
                doins ${PN}.pdf CAD.pdf
        fi

diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index 95f7e2748c23aa8feff11292c29fa61d44787b81..9a6ef06855221be6332206aacd08c03f9f68346c 100644 (file)
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>sci</herd>
-       <maintainer>
-               <email>grozin@gentoo.org</email>
-               <name>Andrey Grozin</name>
-       </maintainer>
-       <longdescription lang="en">
+  <herd>sci</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
                Asymptote is a powerful descriptive vector graphics language that
                provides a natural coordinate-based framework for technical drawing.
                Labels and equations are typeset with LaTeX, for high-quality PostScript
@@ -15,15 +15,15 @@
                A major advantage of Asymptote over other graphics packages is that it
                is a programming language, as opposed to just a graphics program.
        </longdescription>
-       <use>
-               <flag name='boehm-gc'>
+  <use>
+    <flag name="boehm-gc">
                        Enables using the Boehm-Demers-Weiser conservative garbage collector
                </flag>
-               <flag name='sigsegv'>
+    <flag name="sigsegv">
                        Enables using <pkg>dev-libs/libsigsegv</pkg>
                </flag>
-               <flag name='offscreen'>
+    <flag name="offscreen">
                        Enables off-screen rendering
                </flag>
-       </use>
+  </use>
 </pkgmetadata>