diff options
247 files changed, 4284 insertions, 3096 deletions
diff --git a/app-doc/gromacs-manual/ChangeLog b/app-doc/gromacs-manual/ChangeLog new file mode 100644 index 000000000..db0912d58 --- /dev/null +++ b/app-doc/gromacs-manual/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for app-doc/gromacs-manual +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*gromacs-manual-9999 (26 Aug 2010) + + 26 Aug 2010; Christoph Junghans <kleiner_otti@gmx.de> + +gromacs-manual-9999.ebuild, +metadata.xml: + initial commit + diff --git a/app-doc/gromacs-manual/Manifest b/app-doc/gromacs-manual/Manifest new file mode 100644 index 000000000..56e8a8f57 --- /dev/null +++ b/app-doc/gromacs-manual/Manifest @@ -0,0 +1,13 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +EBUILD gromacs-manual-9999.ebuild 1372 RMD160 a2c15a849f25e0916ec9ff6106778eff3cee3495 SHA1 2d698d9ab625255a212d90dce1937e8dae9a79c1 SHA256 27df6c3abe02f7e13480fa532979059f88157ced6089d2e666d1a96f29923d0c +MISC ChangeLog 279 RMD160 b790db407a33641064eeac7d30894f3398f31ed2 SHA1 85ff23743c7ea190900db5bd44b585507664c6cf SHA256 f977bc1ead52fce5bdf1c76fdd1dc965051d4e32eb6999ee3ed514550bbed043 +MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkx220EACgkQy0OE/ans1/lxCwCfQ9uE7aY8VYZnH8Pi+L+cEBIh +cnoAn02LJJ5tMqu8bSvDreXzm0+V5edI +=eTm8 +-----END PGP SIGNATURE----- diff --git a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild new file mode 100644 index 000000000..4e5e067ab --- /dev/null +++ b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +EGIT_REPO_URI="git://git.gromacs.org/manual" +EGIT_BRANCH="master" + +inherit git + +DESCRIPTION="Manual for gromacs" +HOMEPAGE="http://www.gromacs.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +DEPEND="=sci-chemistry/gromacs-${PV} + dev-texlive/texlive-latex + sys-apps/coreutils + app-shells/tcsh" + +RDEPEND="" + +src_compile() { + local progs + ./mkmdp /usr/share/doc/gromacs-${PV}/html || die "mkmdp failed" + progs=$(sed -e '/luck/d' /usr/share/gromacs/programs.list | tr '\n' ' ') || \ + die "sed of programs.list failed" + echo "Building manpages for ${progs}" + sed -e "s@^set PROGRAMS.*@set PROGRAMS = '${progs}'@" mkman > mkman.gentoo || \ + die "sed of mkman failed" + cmp -s mkman mkman.gentoo && die "sed of mkman.gentoo failed" + chmod 755 ./mkman.gentoo || die "chmod of mkman.gentoo failed" + ./mkman.gentoo /usr/bin || die "mkman failed" + cp /usr/share/gromacs/programs.txt . || die "cp of programs.txt failed" + ./mk_proglist || die "mk_proglist failed" + g_options -man tex || die "g_options failed" + mv g_options.tex options.tex || die "mv of options.tex failed" + make pdf +} + +src_install() { + docinto /usr/share/doc/gromacs-${PV} + newdoc gromacs.pdf manual-${PV}.pdf +} diff --git a/sci-electronics/linsmith/metadata.xml b/app-doc/gromacs-manual/metadata.xml index 99e9ad009..9ac9ffdb3 100644 --- a/sci-electronics/linsmith/metadata.xml +++ b/app-doc/gromacs-manual/metadata.xml @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci-electronics</herd> -<maintainer> - <email>tomjbe@gentoo.org</email> - <name>Thomas Beierlein</name> -</maintainer> +<herd>sci-chemistry</herd> </pkgmetadata> - diff --git a/app-portage/g-octave/ChangeLog b/app-portage/g-octave/ChangeLog index 799242507..dd1ca618d 100644 --- a/app-portage/g-octave/ChangeLog +++ b/app-portage/g-octave/ChangeLog @@ -2,6 +2,20 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Aug 2010; Rafael Goncalves Martins <rafael@rafaelmartins.eng.br> + g-octave-9999.ebuild: + Updated the live ebuild. Added the USE flag 'doc'. + +*g-octave-0.4 (04 Aug 2010) + + 04 Aug 2010; Rafael Goncalves Martins <rafael@rafaelmartins.eng.br> + -g-octave-0.3.ebuild, +g-octave-0.4.ebuild, metadata.xml: + Version bump. + + 01 Aug 2010; Rafael Goncalves Martins <rafael@rafaelmartins.eng.br> + g-octave-9999.ebuild: + Removed the svn dependency from the live ebuild + 14 Jul 2010; Rafael Goncalves Martins <rafael@rafaelmartins.eng.br> g-octave-9999.ebuild: Updated the live ebuild to work with py3k. diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest index 02b4ab1d6..3062dd57d 100644 --- a/app-portage/g-octave/Manifest +++ b/app-portage/g-octave/Manifest @@ -1,7 +1,6 @@ -DIST g-octave-0.3.tar.gz 52270 RMD160 0a0f9786526dccab740557c881986a7b06d905d5 SHA1 ea2b40b5eb060ab6a845751f951ac826ddbcd7e6 SHA256 ec533ad529c8bc785132fbf25b72b081b1a81068e95c93cabd1d5ec82bd877cc -DIST info-1278111487-1.json 1530 RMD160 1108da31ceda6394af5aceb43679c58b9a28a60a SHA1 b6788e2d1e7c553ca6bb836a57cc5b05f485f621 SHA256 18faad69984ebc16b6ff0b22efc9e6c06d44e047c847c7543f3e8fba186ad3eb -DIST octave-forge-1278111487.db.tar.gz 13425 RMD160 7a8e13df0de7ac9ca2af3f4a3f46e4bc01b97e3d SHA1 2d7ca14c17e69ed521bc952552333cc37eabe359 SHA256 5a86ea263b8c57422c1d7fd57a2ddc63683dc942e716687e0c5f9acbd385968f -EBUILD g-octave-0.3.ebuild 2304 RMD160 e05a1b924ea8168d5b087fb7cbd0a6ca68324835 SHA1 4008cc40e25c53dbc36396a401c4403e230fa687 SHA256 969a4f9c88388f3a4912eec158f7bf88ed9f0df589e462484e0290cda6d5c982 -EBUILD g-octave-9999.ebuild 1070 RMD160 14f02adb4266fbd9bf8fca75b383f7ce26cf1616 SHA1 ec8cf444aea8bf15e2b063e1dda6c63ff3b6a964 SHA256 535f7b149916838e90ecc65b28a488f77eef8250f02c2650cf13a87fc298109d -MISC ChangeLog 2105 RMD160 813ddeee32a78cd74ab7f1907a09841de122b37b SHA1 f03b8a02f4010f159e1b8185105956e208d73e49 SHA256 b14d7bc3c67c92460e680f8d2b95a19ba594a6bdb0d4b66e27a65fa33b533048 -MISC metadata.xml 889 RMD160 6cd8b7a8e3d52a6b6d2f4f702987838424d93fa2 SHA1 c385586c3896eef73bca782bcd2b5d198fd096da SHA256 7e04a432c79a3db31fc33cce53e5ef102ce421f2264470de709a2bcc498c5a6e +DIST g-octave-0.4-db.tar.gz 18820 RMD160 2048d91cf87a8712d4a47a3b034861d51af3d944 SHA1 63b551dadc9962713633b972131015e02d797ae4 SHA256 503619abefa07822bdea5f43068217949f54a98cdd5ddf220f97ac3de21877a6 +DIST g-octave-0.4.tar.gz 52853 RMD160 04daf2b8734a212bb711f275fbbe856a5f3dfea7 SHA1 0bf57bbb35302769df8e76452b810a82916b2791 SHA256 980b3d96cb4d3d5376c85c3c06da9be15d3efffd431a3ed7f994793c11d66ad0 +EBUILD g-octave-0.4.ebuild 2098 RMD160 16c43b0e47199b5f85cf48053ea3e4965574d339 SHA1 0d3255a48878bf5ffda9103666b105396dda2678 SHA256 088eafcf6a53ad4abe6b640817a30e5c2cadbd60551848d265c6410a3f3db398 +EBUILD g-octave-9999.ebuild 984 RMD160 290f07010bd57a680483e5aad6492b8967fe63ff SHA1 ff7ff4537c7d2a291b60766530168b31982fa786 SHA256 558d441ef1fe6481317648ef4071dbc264b0d6c94ccbcbaa286a3100cb2d2c74 +MISC ChangeLog 2574 RMD160 106b35c241056f24fcbc403db2af1b50db148610 SHA1 1d8decb42d928a9485460211ae24d9af405ac7f4 SHA256 dbc954f4abb571b7f6699dc709788d06a0321cc16aaf338d51ac10a9a5755187 +MISC metadata.xml 755 RMD160 c95cb26b5d1414bdc32e75426611fa2958b0ad0a SHA1 ede641c7cd18ad0f7956a81eaaab2e763f8197ba SHA256 cb005e8d8ce6bf8bad8e99edb3344916d0d5e61dbf736eed57b2c033dce1530f diff --git a/app-portage/g-octave/g-octave-0.3.ebuild b/app-portage/g-octave/g-octave-0.3.ebuild deleted file mode 100644 index 8ba64fe5b..000000000 --- a/app-portage/g-octave/g-octave-0.3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit distutils - -MY_PV="1278111487" -INFO_REV="1" -#PATCHES_REV="1" - -DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge" -HOMEPAGE="http://g-octave.rafaelmartins.eng.br/" - -SRC_URI="http://soc.dev.gentoo.org/~rafaelmartins/g-octave/releases/${P}.tar.gz - http://soc.dev.gentoo.org/~rafaelmartins/g-octave/db/octave-forge-${MY_PV}.db.tar.gz - http://soc.dev.gentoo.org/~rafaelmartins/g-octave/db/info-${MY_PV}-${INFO_REV}.json" - #http://soc.dev.gentoo.org/~rafaelmartins/g-octave/db/patches-${MY_PV}-${PATCHES_REV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="svn test" - -DEPEND="( >=dev-lang/python-2.6 <dev-lang/python-3 )" -RDEPEND="${DEPEND} - svn? ( dev-python/pysvn ) - || ( >=sys-apps/portage-2.1.7[-python3] <sys-apps/portage-2.1.7 )" - -PYTHON_MODNAME="g_octave" - -src_unpack() { - unpack ${P}.tar.gz -} - -src_prepare() { - distutils_src_prepare - sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \ - || die 'failed to patch the g-octave main script' - if ! use svn; then - rm -rf g_octave/svn/ || die 'failed to remove the Subversion stuff.' - sed -i -e '/g_octave.svn/d' -e '/pysvn/d' setup.py \ - || die 'failed to remove the SVN stuff from setup.py' - fi -} - -src_install() { - distutils_src_install - dohtml ${PN}.html - doman ${PN}.1 -} - -src_test() { - PYTHONPATH=. scripts/run_tests.py || die "test failed." -} - -pkg_postinst() { - distutils_pkg_postinst - elog - elog 'To be able to use g-octave with the shipped package database, please' - elog 'edit your configuration file, clean your db directory and run:' - elog " emerge --config =${PF}" - elog - elog 'Please install the package manager that you want to use before run g-octave' - elog -} - -pkg_config() { - local db="$(g-octave --config db)" - mkdir -p "${db}" - elog "Copying g-octave database files to: ${db}" - cp "${DISTDIR}/octave-forge-${MY_PV}.db.tar.gz" "${db}/" \ - || die "failed to copy octave-forge-${MY_PV}.db.tar.gz" - cp "${DISTDIR}/info-${MY_PV}-${INFO_REV}.json" "${db}/" \ - || die "failed to copy info-${MY_PV}-${INFO_REV}.json" - #cp "${DISTDIR}/patches-${MY_P}-${PATCHES_REV}.tar.gz" "${db}/" \ - # || die "failed to copy patches-${MY_P}-${PATCHES_REV}.tar.gz" -} diff --git a/app-portage/g-octave/g-octave-0.4.ebuild b/app-portage/g-octave/g-octave-0.4.ebuild new file mode 100644 index 000000000..ada8432d9 --- /dev/null +++ b/app-portage/g-octave/g-octave-0.4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="*:2.6" + +DB_COMMIT="cd6b664df376d50455efc19ad23a1463484f81f7" +DB_COMMIT_ID="cd6b664" +DB_DIR="rafaelmartins-${PN}-db-${DB_COMMIT_ID}" + +inherit distutils + +DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge" +HOMEPAGE="http://www.g-octave.org/" + +SRC_URI="http://www.g-octave.org/releases/${P}.tar.gz + http://github.com/rafaelmartins/${PN}-db/tarball/${DB_COMMIT} -> ${PF}-db.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +DEPEND="doc? ( >=dev-python/sphinx-1.0 )" +RDEPEND="sys-apps/portage" + +PYTHON_MODNAME="g_octave" + +src_prepare() { + distutils_src_prepare + sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \ + || die 'failed to patch the g-octave main script' +} + +src_compile() { + distutils_src_compile + if use doc; then + emake -C docs html + fi +} + +src_install() { + distutils_src_install + dohtml ${PN}.html + doman ${PN}.1 + if use doc; then + mv docs/_build/{html,sphinx} + dohtml -r docs/_build/sphinx + fi +} + +src_test() { + testing() { + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" \ + scripts/run_tests.py || die 'test failed.' + } + python_execute_function testing +} + +pkg_postinst() { + distutils_pkg_postinst + elog + elog 'To be able to use g-octave with the shipped package database, please' + elog 'edit your configuration file, clean your db directory and run:' + elog " emerge --config =${PF}" + elog + elog "If you are upgrading from =${PN}-0.3, please read this:" + elog 'http://doc.g-octave.org/0.4/upgrading/#from-0-3-to-0-4' + elog + elog 'Please install the package manager that you want to use before run g-octave' + elog +} + +pkg_config() { + local db="$(g-octave --config db)" + mkdir -p "${db}" + einfo "Extracting g-octave database files to: ${db}" + tar -xzf "${DISTDIR}/${PF}-db.tar.gz" -C "${db}" || die 'tar failed.' + rm -rf "${db}"/{patches,octave-forge,info.json,timestamp} + mv -f "${db}/${DB_DIR}"/* ${db} || die 'mv failed.' + rm -rf "${db}/${DB_DIR}" +} diff --git a/app-portage/g-octave/g-octave-9999.ebuild b/app-portage/g-octave/g-octave-9999.ebuild index 4b0e35b3f..7bec90ae5 100644 --- a/app-portage/g-octave/g-octave-9999.ebuild +++ b/app-portage/g-octave/g-octave-9999.ebuild @@ -10,35 +10,37 @@ PYTHON_DEPEND="*:2.6" inherit distutils git DESCRIPTION="A tool that generates and installs ebuilds for Octave-Forge" -HOMEPAGE="http://g-octave.rafaelmartins.eng.br/" +HOMEPAGE="http://www.g-octave.org/" EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/g-octave.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="svn test" +IUSE="doc test" -DEPEND=">=dev-python/docutils-0.6" -RDEPEND="sys-apps/portage - svn? ( dev-python/pysvn )" +DEPEND=">=dev-python/docutils-0.6 + doc? ( >=dev-python/sphinx-1.0 )" +RDEPEND="sys-apps/portage" S="${WORKDIR}/${PN}" PYTHON_MODNAME="g_octave" -src_prepare() { - if ! use svn; then - rm -rf g_octave/svn/ || die 'failed to remove the Subversion stuff.' - sed -i -e '/g_octave.svn/d' -e '/pysvn/d' setup.py \ - || die 'failed to remove the SVN stuff from setup.py' +src_compile() { + distutils_src_compile + if use doc; then + emake -C docs html fi - distutils_src_prepare } src_install() { distutils_src_install dohtml ${PN}.html doman ${PN}.1 + if use doc; then + mv docs/_build/{html,sphinx} + dohtml -r docs/_build/sphinx + fi } src_test() { diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml index 101f90d23..bfc62e668 100644 --- a/app-portage/g-octave/metadata.xml +++ b/app-portage/g-octave/metadata.xml @@ -14,11 +14,5 @@ handle patches to the packages automatically. The command line interface tries to be very similar to the interface of the emerge tool. </longdescription> - <use> - <flag name="svn"> - Adds support to the installation of packages from the octave-forge - SVN repository. - </flag> - </use> </pkgmetadata> diff --git a/dev-python/asciitable/ChangeLog b/dev-python/asciitable/ChangeLog deleted file mode 100644 index 45794cfe1..000000000 --- a/dev-python/asciitable/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -# ChangeLog for dev-python/asciitable -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*asciitable-0.2.5 (15 Jul 2010) - - 15 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> - +asciitable-0.2.5.ebuild, +metadata.xml: - Initial import - diff --git a/dev-python/asciitable/Manifest b/dev-python/asciitable/Manifest deleted file mode 100644 index eb1257c38..000000000 --- a/dev-python/asciitable/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST asciitable-0.2.5.tar.gz 77066 RMD160 16a3f19804c3a859eac35bf7286f355afb309612 SHA1 7a323b2a7a5b148a03f964928a0ad910904b600a SHA256 b0fe75ce830615370d317c8e8ff3ffbcd2565631b2281c1840422233108866f5 -EBUILD asciitable-0.2.5.ebuild 522 RMD160 b3445252baad7c9c3854bfdb2097578bdbec39d2 SHA1 978e859a304c23ca5e9cf28b4fc42990a604ed17 SHA256 7e2518036bc1863b56438bfe647ea7a6c72236e1adb70b15c78dff90f20ff655 -MISC ChangeLog 271 RMD160 fb19e178666e17f29b1a482a2009647224cb88cc SHA1 0c31723ef20654f16fe1a0ccae9f6763ae8388ef SHA256 6ffd6f6376e9fe70376eb0476471513dbc1af9d987823010964105707050d765 -MISC metadata.xml 344 RMD160 819138087a2356c600babd2b7207e6ecfbe2d459 SHA1 04cd9faecc04a3034f9349080addb1445f23a180 SHA256 c4e20d37e9bbb6d6d52eddcb4bc696cc7d91cce1c90e84efad9608346412d955 diff --git a/dev-python/asciitable/asciitable-0.2.5.ebuild b/dev-python/asciitable/asciitable-0.2.5.ebuild deleted file mode 100644 index 448c92b13..000000000 --- a/dev-python/asciitable/asciitable-0.2.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -DISTUTILS_SRC_TEST="nosetests" - -inherit distutils - -DESCRIPTION="An extensible ASCII table reader" -HOMEPAGE="http://cxc.harvard.edu/contrib/asciitable/" -SRC_URI="${HOMEPAGE}/downloads/${P}.tar.gz" - -IUSE="test" -SLOT="0" -KEYWORDS="~amd64 ~x86" -LICENSE="GPL-2" - -RDEPEND="dev-python/numpy" -DEPEND="test? ( dev-python/numpy )" - -RESTRICT_PYTHON_ABIS="3.*" diff --git a/dev-python/atpy/ChangeLog b/dev-python/atpy/ChangeLog deleted file mode 100644 index 5acde39f3..000000000 --- a/dev-python/atpy/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -# ChangeLog for dev-python/atpy -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 25 Jun 2010; Justin Lecher <jlec@gentoo.org> atpy-0.9.2.ebuild: - Fix PYTHON ABI Stuff - -*atpy-0.9.2 (12 Feb 2010) - - 12 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> -atpy-0.9.1.ebuild, - +atpy-0.9.2.ebuild: - Bump - -*atpy-0.9.1 (08 Oct 2009) - - 08 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> -atpy-0.9.0.ebuild, - +atpy-0.9.1.ebuild, metadata.xml: - Version bump - -*atpy-0.9.0 (21 Jul 2009) - - 21 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +atpy-0.9.0.ebuild, - +metadata.xml: - Initial import - diff --git a/dev-python/atpy/Manifest b/dev-python/atpy/Manifest deleted file mode 100644 index 80e94441c..000000000 --- a/dev-python/atpy/Manifest +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST ATpy-0.9.2.tar.gz 476454 RMD160 d609498e30058cdb840c96fc28a272e3797cc1f5 SHA1 b4a42f4ec3bfd75fe4d4d3f77bdf5d75baa30d77 SHA256 d295050286e73188e51d9ce58c776cede6131357836ac4f34e3f61eeeeb29c78 -EBUILD atpy-0.9.2.ebuild 783 RMD160 fddae7f6d86c000a1b42b07880a21ce0b60108b8 SHA1 25753e9adf3f2fb57fe91456d36447eb71ee1c18 SHA256 2bf9c4c0eedf32fac2ac3d07447fbe9997def4ca507c682a46876ce85337596e -MISC ChangeLog 629 RMD160 299fa3e1490c24c9fde7908a9bfdf70d59b0149b SHA1 bac2774362c09fd45bc7828bf3b262ed5e5232e1 SHA256 bced6984a398d779669778bae68ae2248c8b5c31bb97d93b9fcaed9591b23995 -MISC metadata.xml 990 RMD160 a2d6e525f6ac1f63f58cd6aea51e15e27e3bb393 SHA1 efafdba2cbb91071dc99e510c43e2fc9f9c83d08 SHA256 b848a506f5c41178669501433f524e28a6975fecbbb0e82b425f5e48486624c4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwlAu8ACgkQgAnW8HDreRaawQCgrmhkuTN9ND7buHnxFVqmn+Ut -2xcAnRbYs4cwpLEkk6y3RuV9boJijM15 -=tVRr ------END PGP SIGNATURE----- diff --git a/dev-python/atpy/atpy-0.9.2.ebuild b/dev-python/atpy/atpy-0.9.2.ebuild deleted file mode 100644 index 51bc1d296..000000000 --- a/dev-python/atpy/atpy-0.9.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -#DISTUTILS_SRC_TEST="test/test.py" -MYPN=ATpy -MYP="${MYPN}-${PV}" - -DESCRIPTION="Astronomical tables support Python" -HOMEPAGE="http://atpy.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz" - -RDEPEND=">=dev-python/numpy-1.3 - fits? ( >=dev-python/pyfits-2.1 ) - mysql? ( dev-python/mysql-python ) - postgres? ( dev-db/pygresql ) - sqlite? ( dev-python/pysqlite ) - votable? ( >=dev-python/vo-0.3 )" - -RESTRICT_PYTHON_ABIS="2.[45]" - -DEPEND=">=dev-python/numpy-1.3" - -IUSE="+fits mysql postgres sqlite +votable" -SLOT="0" -KEYWORDS="~amd64 ~x86" -LICENSE="GPL-3" - -S="${WORKDIR}/${MYP}" - diff --git a/dev-python/atpy/metadata.xml b/dev-python/atpy/metadata.xml deleted file mode 100644 index 173cba328..000000000 --- a/dev-python/atpy/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>python</herd> -<longdescription lang="en"> - Astronomical Tables in Python (ATpy) is a high-level package - providing a way to manipulate tables of astronomical data in a - uniform way. A table is defined by any number of columns of data, - each characterized by a column name, unit, null value, and - description (the last three being optional), and can be supplemented - with metadata in the form of keywords or comments. ATpy can be used - to manipulate single tables as well as sets of tables. Table formats - supported are FITS, VO, IPAC. Database supported are SQLite, MySQL - and PostgreSQL. -</longdescription> -<use> - <flag name="fits"> - Enable support for reading and FITS with <pkg>dev-python/pyfits</pkg>. - </flag> - <flag name="votable"> - Enable support for reading and VOTABLE with <pkg>dev-python/vo</pkg>. - </flag> -</use> -</pkgmetadata> diff --git a/dev-python/coords/ChangeLog b/dev-python/coords/ChangeLog index d4cd87b64..407b4fcf5 100644 --- a/dev-python/coords/ChangeLog +++ b/dev-python/coords/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> coords-0.37.ebuild: + Update HOMEPAGE + 26 Jun 2010; Justin Lecher <jlec@gentoo.org> coords-0.37.ebuild: Python ABI fixes diff --git a/dev-python/coords/Manifest b/dev-python/coords/Manifest index a56ac52b3..d3311e41c 100644 --- a/dev-python/coords/Manifest +++ b/dev-python/coords/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST coords-0.37.tar.gz 736179 RMD160 bb273716fd4bd3f5df7558f5cdb19dde732ee5c3 SHA1 8de4563e2d2b43d9c1b308f6dad0dd702e795a1a SHA256 67ce4316e37a75b83a459e1103b497149d4fec9388ac042f756338fff1fc22b3 -EBUILD coords-0.37.ebuild 706 RMD160 df1ffb01a580cf1d9931c5d6c0bd1a79e21d3652 SHA1 0344656f871ea7bff7370418fdea2621b00dad6b SHA256 581e8339ec72a0aa0adb59560071df5312673ad4d0d806c293b0f71560399f5b -MISC ChangeLog 359 RMD160 efeb556373596ba58b3372aa9d354ecf3ccc42eb SHA1 dcc02d88f31a10f8ff519d3142db76d8ac10ea3a SHA256 655ea742f837dd995415cc7f063f94d306ee6eddb8af14729523f8769f48e3c3 +EBUILD coords-0.37.ebuild 732 RMD160 47ed82801c1e54e345569f91527cbe0c4bba64c8 SHA1 990ea06892abc56288bafa10bb52b06ff5fc4342 SHA256 dec8506cae9475b7c6a5da1a212c565236b32d16c86345e96aa5819bb9f9595f +MISC ChangeLog 452 RMD160 feb9c139f994b5f5d2c7316ba608fa0f534c69cc SHA1 a4b5581598bde4379ad11bc9cf35da7bf08a1dfe SHA256 2ef0866cdd059917470fb2594869853831a7c27b435b656e69cb6053281fd418 MISC metadata.xml 312 RMD160 7e25d9a79b5ac6608509dd864444389325afb97c SHA1 354d91501ec2dbe63d85231f0863133697a0d752 SHA256 2e5632eaa0d493cbfaa1b36feea250483ae9ea51eb4607a89c50feb134e7a1e3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwlt0IACgkQgAnW8HDreRa6QACgxaBlJk91ISRemNzO8HQpW8aE -rogAmwdwFFkZ3PDKyesBWjfhOPWrAe09 -=X+OJ ------END PGP SIGNATURE----- diff --git a/dev-python/coords/coords-0.37.ebuild b/dev-python/coords/coords-0.37.ebuild index 1fb64919d..c1dd7fcbb 100644 --- a/dev-python/coords/coords-0.37.ebuild +++ b/dev-python/coords/coords-0.37.ebuild @@ -10,7 +10,7 @@ SUPPORT_PYTHON_ABIS="1" inherit distutils DESCRIPTION="managing astronomical coordinate systems" -HOMEPAGE="https://www.stsci.edu/trac/ssb/astrolib/wiki" +HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib" SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz" LICENSE="AURA" diff --git a/dev-python/cosmolopy/ChangeLog b/dev-python/cosmolopy/ChangeLog new file mode 100644 index 000000000..568b512f1 --- /dev/null +++ b/dev-python/cosmolopy/ChangeLog @@ -0,0 +1,18 @@ +# ChangeLog for dev-python/cosmolopy +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*cosmolopy-0.1.003 (03 Aug 2010) + + 03 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> + -cosmolopy-0.1.001.ebuild, -files/cosmolopy-0.1.001-qa.patch, + +cosmolopy-0.1.003.ebuild: + Version bump + +*cosmolopy-0.1.001 (03 Aug 2010) + + 03 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> + +cosmolopy-0.1.001.ebuild, +files/cosmolopy-0.1.001-qa.patch, + +metadata.xml: + Initial import + diff --git a/dev-python/cosmolopy/Manifest b/dev-python/cosmolopy/Manifest new file mode 100644 index 000000000..de363eff9 --- /dev/null +++ b/dev-python/cosmolopy/Manifest @@ -0,0 +1,4 @@ +DIST CosmoloPy-0.1.003.tar.gz 37378 RMD160 43faad4f3a14a172df41317e48b3520fdd7e489d SHA1 a24505d9cf10e4773d8cc6a33c8fb98a85d188ed SHA256 39681ee7445f13a23600eddb843f31798d2d704ce71479f7a48abee86849821d +EBUILD cosmolopy-0.1.003.ebuild 1000 RMD160 3db296b933c95095dfb415f9c9e061dcc1c4c124 SHA1 135dc252acd92a0ce303f6bc5d4967f6aea7fce2 SHA256 71c2448603426a3583fb54ba7a9bc00dcea29a9e6718033cae6223993a499f40 +MISC ChangeLog 505 RMD160 ad2e3796b34b8342a3ebedca2f71eaeb40d4b2e0 SHA1 fed037fe84448319e59323be9137a020420a169b SHA256 7f70d3bc3a7ea16f8e00f9130cdd1c21cb299b9065ce97f08b886127d6aa9c43 +MISC metadata.xml 291 RMD160 e19cf9719dd6cf55b8e98a1d2864741b4a9c6750 SHA1 f45485ec8094bf322f111d06aa7e3691eeb0ed18 SHA256 8b76631f33b4c4c91f51dc677621fe27b872f35975508fb97211a92fe7996240 diff --git a/dev-python/cosmolopy/cosmolopy-0.1.003.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.003.ebuild new file mode 100644 index 000000000..f035e8b45 --- /dev/null +++ b/dev-python/cosmolopy/cosmolopy-0.1.003.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils + +MY_PN=CosmoloPy +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Cosmology routines built on NumPy/SciPy" +HOMEPAGE="http://roban.github.com/CosmoloPy/ http://pypi.python.org/pypi/CosmoloPy" +SRC_URI="http://pypi.python.org/packages/source/C/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +DEPEND="dev-python/nose + dev-lang/swig + doc? ( dev-python/epydoc )" +RDEPEND="sci-libs/scipy" + +RESTRICT_PYTHON_ABIS="3.*" + +S=${WORKDIR}/${MY_P} + +src_install() { + distutils_src_install + if use doc; then + einfo "Generation of documentation" + epydoc -n "CosmoloPy - Cosmology routines built on NumPy/SciPy" \ + --exclude='cosmolopy.EH._power' --exclude='cosmolopy.EH.power' \ + --no-private --no-frames --html --docformat restructuredtext \ + cosmolopy/ -o docAPI/ || die + dohtml -r docAPI/* + fi +} diff --git a/dev-python/asciitable/metadata.xml b/dev-python/cosmolopy/metadata.xml index 1c5d08015..3530ee915 100644 --- a/dev-python/asciitable/metadata.xml +++ b/dev-python/cosmolopy/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> +<herd>python</herd> <herd>sci</herd> <longdescription lang="en"> - asciitable is a Python module that can read a wide range of ASCII table formats used in astronomy, via a built-in extension reader class. + CosmoloPy is a package of cosmology routines built on NumPy/SciPy. </longdescription> </pkgmetadata> diff --git a/dev-python/pysparse/ChangeLog b/dev-python/pysparse/ChangeLog index 888375fa2..7b5fae0e3 100644 --- a/dev-python/pysparse/ChangeLog +++ b/dev-python/pysparse/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pysparse-1.1.1 (20 Jul 2010) + + 20 Jul 2010; Justin Lecher <jlec@gentoo.org> pysparse-1.1.ebuild, + +pysparse-1.1.1.ebuild, +files/pysparse-1.1.1-setup.patch, + +files/pysparse-1.1.1-superlu3.patch: + Version bump, fixed umfpack version to <=5.4.0, reported by Philippe + BAUCOUR + 26 Jun 2010; Justin Lecher <jlec@gentoo.org> pysparse-1.1.ebuild: Python ABI fixes diff --git a/dev-python/pysparse/Manifest b/dev-python/pysparse/Manifest index add98c3db..6c895da1c 100644 --- a/dev-python/pysparse/Manifest +++ b/dev-python/pysparse/Manifest @@ -3,14 +3,18 @@ Hash: SHA1 AUX pysparse-1.1-setup.patch 2381 RMD160 a84e1241efbe0014840605b1c5ab333b0a4cbd18 SHA1 dd8313d77c2380ae37f912d7633291506376c643 SHA256 40b93ba2cd1fd831b7e070e394c586f2dfdba7a003cfa61b1f31ee4bcce51e8a AUX pysparse-1.1-superlu3.patch 582 RMD160 deefb6dd861bd6e5f47235957fd42f08d2fcc5a7 SHA1 7becc23f6f18030cc3e27d35d0d64aa503131373 SHA256 1998983f7815d7365ce3ccc4b0c0282f52303cc6f1c88809c480adefb3abde60 +AUX pysparse-1.1.1-setup.patch 2130 RMD160 ee4753118ccccdf49955afa8636d1c4da1395b69 SHA1 9f61a09ab655b20cd8fd29fe6b760dbdc35bd709 SHA256 0de42dab36c45620480e298f04bc188417a77e977d3ee96af95e51e7baa1b57c +AUX pysparse-1.1.1-superlu3.patch 676 RMD160 6bd222e588cae9006130faa8ae3a35a526aa02f7 SHA1 38c143388368bf6d66edfd391a93cbf46cd612ee SHA256 fdc79e6b20d7ad2a8a7adb4afda287741f38d19b1560d48b3c5fe46543cf6f9f +DIST pysparse-1.1.1.tar.gz 913261 RMD160 0848e7f061d0d2571bbad3e4fd2b4e0f070b961a SHA1 dca36520f39551781bcaeac8c1bbc6d3baefa57a SHA256 e02d248efedd051181a49f8aee487e576554a6c973578ca665d31947b35c3a4a DIST pysparse-1.1.tar.gz 912439 RMD160 81bccdde11c072565808eeade5995d03dd8a7010 SHA1 55e935e6b9c089e3740bd11494ed6bf451e56c84 SHA256 45bedbc2f6b42e8dd52d3768ff72bcf8e75690a2e6026e99c28cf9b7ffb90245 -EBUILD pysparse-1.1.ebuild 1026 RMD160 74f2ddf2b3e802be962b7d634e0fa6e24181ea84 SHA1 2fbfcafce70736ad64ce5cdbf14971e25b034d2c SHA256 d41e05261fc0cb9260acabb7f0662d4eeee9559948ab7e464d7a55c8608bad6b -MISC ChangeLog 420 RMD160 50d6326492cd75988de99ff7374a72fc9f50e068 SHA1 47f069659d50afa6c5f94eecc32c4ae2fbf13ec5 SHA256 7076d09c26aca930a6f4f091b326a028e4be798bc55db4ba4b1d3f93959e7c14 +EBUILD pysparse-1.1.1.ebuild 1034 RMD160 ca6058352a658cb1976a1e802db59feff90a8795 SHA1 de6147d791038239fb1914a50abac278c129185b SHA256 09494573f8bea16fc2f72e2ef8dc8d7af4748572b096e7eadc83ca06daccc86b +EBUILD pysparse-1.1.ebuild 1034 RMD160 ca6058352a658cb1976a1e802db59feff90a8795 SHA1 de6147d791038239fb1914a50abac278c129185b SHA256 09494573f8bea16fc2f72e2ef8dc8d7af4748572b096e7eadc83ca06daccc86b +MISC ChangeLog 702 RMD160 b1cc7389830c216e1815d4f615f426763cf66fd7 SHA1 71d10fad220237a8ffa00f1b07ead1a0048cc9f1 SHA256 f94c49b5e9b2336992c454c3366346dad743829b1c09bb6c93587acdc130a4ec MISC metadata.xml 688 RMD160 8bcfeb01519e4c09c9aa70864e048b958bed8492 SHA1 f75eb679581e0c30aa7b5bd9512df5ad1116698b SHA256 5fa0b1954a6457c6005201c7cd811b57ff1fe4081cd26f1cc176100a3eb2ce1f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwl+A4ACgkQgAnW8HDreRZZCwCcCAj/cLDQ3pTs/15bzmHC5LfX -zxsAnif+ueRD0tK0VKyX1lsIDhTi+gPA -=h+Kx +iEYEARECAAYFAkxFzAgACgkQgAnW8HDreRbUGACgl1+/KNPbzaZ75T8DxwCsJXL3 +iN4AoIYezcZ0rFxZTKI18oBaYBwJtd62 +=d8C5 -----END PGP SIGNATURE----- diff --git a/dev-python/pysparse/files/pysparse-1.1.1-setup.patch b/dev-python/pysparse/files/pysparse-1.1.1-setup.patch new file mode 100644 index 000000000..3d944a3ec --- /dev/null +++ b/dev-python/pysparse/files/pysparse-1.1.1-setup.patch @@ -0,0 +1,56 @@ +diff --git a/setup.py b/setup.py +index 1b1ee1d..cdb9ddf 100644 +--- a/setup.py ++++ b/setup.py +@@ -19,40 +19,40 @@ linky=[] + compily=[] + + # Specify whether to link against user's SuperLU library +-use_users_superlu = False #True ++use_users_superlu = True + umfpack_defs = [('DINT', 1), ('NBLAS', 1)] # No BLAS. Ok if using your system's BLAS. + #umfpack_defs = [('DINT', 1), ('CBLAS', 1)] # with atlas c-blas (http://math-atlas.sf.net) + + if use_users_superlu: + # Specify location of include files +- superlu_include_dirs = ['/Users/dpo/local/linalg/SuperLU/SuperLU_3.1/SRC'] ++ superlu_include_dirs = ['/usr/include/superlu'] + # AND specify ONE of the following: + # 1) Location of source files (overrides linking with existing library) +- superlu_src_dir = '/Users/dpo/local/linalg/SuperLU/SuperLU_3.1/SRC' ++ superlu_src_dir = '' + # 2) Location of precompiled library + superlu_lib_dir = [''] +- superlu_libraries = [''] ++ superlu_libraries = ['superlu'] + + # Specify whether to link against user's UMFPACK library +-use_users_umfpack = False #True ++use_users_umfpack = True + if use_users_umfpack: + # Specify location of include files +- umfpack_include_dirs = ['/Users/dpo/local/linalg/UMFPACK/UMFPACK/Include'] ++ umfpack_include_dirs = [''] + # AND specify ONE of the following: + # 1) Location of source files (overrides linking with existing library) +- umfpack_src_dir = '/Users/dpo/local/linalg/UMFPACK/UMFPACK/Source' ++ umfpack_src_dir = '' + # 2) Location of precompiled library + umfpack_lib_dir = [''] +- umfpack_libraries = [''] ++ umfpack_libraries = ['umfpack'] + + # Do the same for AMD +- amd_include_dirs = ['/Users/dpo/local/linalg/UMFPACK/AMD/Include'] ++ amd_include_dirs = [''] + # AND specify ONE of the following: + # 1) Location of source files (overrides linking with existing library) +- amd_src_dir = '/Users/dpo/local/linalg/UMFPACK/AMD/Source' ++ amd_src_dir = '' + # 2) Location of precompiled library + amd_lib_dir = [''] +- amd_libraries = [''] ++ amd_libraries = ['amd'] + + else: + umfpack_libraries = [] diff --git a/dev-python/pysparse/files/pysparse-1.1.1-superlu3.patch b/dev-python/pysparse/files/pysparse-1.1.1-superlu3.patch new file mode 100644 index 000000000..fa01d7388 --- /dev/null +++ b/dev-python/pysparse/files/pysparse-1.1.1-superlu3.patch @@ -0,0 +1,13 @@ +diff --git a/Src/superlu3module.c b/Src/superlu3module.c +index 810191b..a74edfb 100644 +--- a/Src/superlu3module.c ++++ b/Src/superlu3module.c +@@ -267,7 +267,7 @@ static PyObject *newSuperLUObject(int n, CSRMatObject *matrix, PyObject *issym, + //printf("Factorizing with drop_tol = %g\n", drop_tol); + /* Perform factorization (perm_c and perm_r are swapped because our matrix + * is stored in compressed-row format and not in compressed-column format! */ +- dgstrf(&self->options, &AC, drop_tol, relax, panel_size, ++ dgstrf(&self->options, &AC, relax, panel_size, + etree, NULL, 0, self->perm_c, self->perm_r, + &self->L, &self->U, &self->stat, &info); + diff --git a/dev-python/pysparse/pysparse-1.1.1.ebuild b/dev-python/pysparse/pysparse-1.1.1.ebuild new file mode 100644 index 000000000..877eb00e6 --- /dev/null +++ b/dev-python/pysparse/pysparse-1.1.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils eutils + +DESCRIPTION="Sparse linear algebra extension for Python" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="http://pysparse.sourceforge.net/" + +IUSE="doc examples" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="BSD" + +RDEPEND=" + dev-python/numpy + sci-libs/superlu + <=sci-libs/umfpack-5.4.0" +DEPEND="${DEPEND}" + +RESTRICT_PYTHON_ABIS="3.*" + +src_prepare() { + epatch "${FILESDIR}"/${P}-setup.patch + epatch "${FILESDIR}"/${P}-superlu3.patch +} + +src_test() { + testing() { + for t in Test/test{Umfpack,Superlu}.py; do + PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" ${t} + done + } + python_execute_function testing +} + +src_install() { + distutils_src_install + if use doc; then + insinto /usr/share/doc/${PF} + doins Doc/*.pdf || die + fi + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins Examples/* || die + fi +} diff --git a/dev-python/pysparse/pysparse-1.1.ebuild b/dev-python/pysparse/pysparse-1.1.ebuild index a698d074b..877eb00e6 100644 --- a/dev-python/pysparse/pysparse-1.1.ebuild +++ b/dev-python/pysparse/pysparse-1.1.ebuild @@ -21,7 +21,7 @@ LICENSE="BSD" RDEPEND=" dev-python/numpy sci-libs/superlu - sci-libs/umfpack" + <=sci-libs/umfpack-5.4.0" DEPEND="${DEPEND}" RESTRICT_PYTHON_ABIS="3.*" diff --git a/dev-python/pywcs/ChangeLog b/dev-python/pywcs/ChangeLog index 5115353a3..3816fb544 100644 --- a/dev-python/pywcs/ChangeLog +++ b/dev-python/pywcs/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pywcs-1.9 (17 Aug 2010) + + 17 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> -pywcs-1.8.1.ebuild, + -files/pywcs-1.8.1-wcslib.patch, +pywcs-1.9.ebuild, + +files/pywcs-1.9-wcslib.patch: + Version bump + + 17 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> pywcs-1.8.1.ebuild: + Update HOMEPAGE + 27 Jun 2010; Justin Lecher <jlec@gentoo.org> -pywcs-1.5.1.ebuild, -pywcs-1.7.ebuild: Removed old diff --git a/dev-python/pywcs/Manifest b/dev-python/pywcs/Manifest index f0817f485..514caa60e 100644 --- a/dev-python/pywcs/Manifest +++ b/dev-python/pywcs/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX pywcs-1.8.1-wcslib.patch 3849 RMD160 1e1eda65d42836893c8a073bafa2ccaf15f236e2 SHA1 6371e75548963d6b92bb67584350760c1b733531 SHA256 9a588537d9caa354fbca5a26ea50d5d8e2244f06bd60a620b5571bef2adef02a -DIST pywcs-1.8.1-4.4.4.tar.gz 2010226 RMD160 288135458de2a3c1cc142a5c44cb4fcdfa931291 SHA1 512f3c8776b8ff34e0d39d0f60bb4e073bacf830 SHA256 907a6d852393056e8532be63bd1e14eec32d80a919b08d6d4837613620409662 -EBUILD pywcs-1.8.1.ebuild 943 RMD160 fae66ce4c1f4010493a247dbb1c5a45ac79900a6 SHA1 3bcdcee3a43a1b314fe9884c892f48f3452e7564 SHA256 6894b263109c0df9cec5533ad69c2e8c017a69d83b0efbd763e3767105f08f52 -MISC ChangeLog 883 RMD160 d34f0aa31946927ae7bfa421eda424dfc49306fe SHA1 ba6993140e20cb24822b2b80b19effaa52e5c880 SHA256 45d5a984d52cdf8be5f7051d5a7d70de863431aa58e4c2d2bf1985c834cb7c8b +AUX pywcs-1.9-wcslib.patch 3950 RMD160 f0811c8c77097021449e3e8e4c537dba33703862 SHA1 b1e312de9d5e0712f780fee3144beb70085c9867 SHA256 c523d9642300977dd1e69e5185ca176f799caa143eaa79fabb48c453667e9231 +DIST pywcs-1.9-4.4.4.tar.gz 1971894 RMD160 56ec95409e5cf7a836f14f922ee2a0b9df11a290 SHA1 5edb4628ac97f2c3801487c44b6bd186309bf5ba SHA256 b7e6d61280f62228c249e3ebf5799fe012d37a32df4e15eb3bb9d2b23f37f30d +EBUILD pywcs-1.9.ebuild 973 RMD160 60ec8cdd11e989fba545e5445992cfe8e85bac78 SHA1 146a121b1bab0676d5762b02bb92d478b215b03a SHA256 1dc8728e507d3a1d55bafcf222c1e1eac481c17a4f7bd46e8dc665b622ae064d +MISC ChangeLog 1180 RMD160 a7e3d49fa9cd4852f5e5d5d3f6aebdf23dfc4756 SHA1 f2857a937b03cb61d31238ad74668e7832d3e7e0 SHA256 55b720247969c890bf90d6e546a81b694cdde9c6eee54b7c5e3e72555b3e37ae MISC metadata.xml 374 RMD160 751b95b8cb2d0fa8194e7388b51f5785b4f16d0f SHA1 32790eaab968b07b66c22157f42138b1f56911e6 SHA256 5fe68de0cf26109619592c99a227ee9f4b54f2a18e4c9f95206a63c8275c1b60 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwnWI0ACgkQgAnW8HDreRaFqgCggFAhwJtEGBWv2LJODi0OT+BS -UdIAn1QBbfjUosy8kMTBxabQ+U2aOvin -=xhMc ------END PGP SIGNATURE----- diff --git a/dev-python/pywcs/files/pywcs-1.8.1-wcslib.patch b/dev-python/pywcs/files/pywcs-1.9-wcslib.patch index 16d790bcd..1ce9cf59a 100644 --- a/dev-python/pywcs/files/pywcs-1.8.1-wcslib.patch +++ b/dev-python/pywcs/files/pywcs-1.9-wcslib.patch @@ -1,6 +1,6 @@ ---- defsetup.py.orig 2010-04-24 11:27:55.655012084 +0200 -+++ defsetup.py 2010-04-24 12:00:52.393014990 +0200 -@@ -38,70 +38,26 @@ +--- defsetup.py.orig 2010-07-21 16:01:17.000000000 +0200 ++++ defsetup.py 2010-08-17 17:20:16.761079432 +0200 +@@ -38,71 +38,26 @@ ###################################################################### # WCSLIB @@ -8,6 +8,7 @@ -WCSLIB = "wcslib-%s" % WCSVERSION # Path to wcslib -WCSLIBC = join(WCSLIB, "C") # Path to wcslib source files -WCSFILES = [ # List of wcslib files to compile +- 'flexed/wcsbth.c', - 'flexed/wcspih.c', - 'flexed/wcsulex.c', - 'flexed/wcsutrn.c', @@ -55,12 +56,12 @@ - raise ValueError() +def pkgconfig(*packages, **kw): + flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} -+ arg = "--libs --cflags --modversion %s" % ' '.join(packages) ++ arg = "--libs --cflags --modversion %s" % ' '.join(packages) + for token in Popen(["pkg-config "+ arg],stdout=PIPE, shell=True).communicate()[0].split(): -+ if(match("[0-9]",token)): -+ kw.setdefault("version",[]).append(token) -+ else: -+ kw.setdefault(flag_map.get(token[:2]), []).append(token[2:]) ++ if(match("[0-9]",token)): ++ kw.setdefault("version",[]).append(token) ++ else: ++ kw.setdefault(flag_map.get(token[:2]), []).append(token[2:]) + return kw - except ValueError: @@ -84,7 +85,7 @@ ###################################################################### # GENERATE DOCSTRINGS IN C -@@ -190,7 +146,8 @@ +@@ -191,7 +146,8 @@ ###################################################################### # DISTUTILS SETUP @@ -94,7 +95,7 @@ define_macros = [('ECHO', None), ('WCSTRIG_MACRO', None), ('PYWCS_BUILD', None), -@@ -233,13 +190,8 @@ +@@ -234,13 +190,8 @@ PYWCS_EXTENSIONS = [ Extension('pywcs._pywcs', @@ -110,11 +111,11 @@ define_macros=define_macros, undef_macros=undef_macros, extra_compile_args=extra_compile_args, -@@ -259,7 +211,6 @@ +@@ -260,7 +211,6 @@ 'ext_modules' : PYWCS_EXTENSIONS, 'data_files' : [ ( 'pywcs/include', ['src/*.h']), - ( 'pywcs/include/wcslib', [ WCSLIBC + '/*.h'] ), ], + 'package_dir' : {pkg[0]: 'lib', pkg[1]: 'test'}, } - diff --git a/dev-python/pywcs/pywcs-1.8.1.ebuild b/dev-python/pywcs/pywcs-1.9.ebuild index ae1827b0b..72f0edbd2 100644 --- a/dev-python/pywcs/pywcs-1.8.1.ebuild +++ b/dev-python/pywcs/pywcs-1.9.ebuild @@ -13,7 +13,7 @@ WCS_V=4.4.4 MYP="${P}-${WCS_V}" DESCRIPTION="Python routines for handling the FITS World Coordinate System" -HOMEPAGE="https://www.stsci.edu/trac/ssb/astrolib/" +HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib" SRC_URI="http://stsdas.stsci.edu/astrolib/${MYP}.tar.gz" IUSE="" diff --git a/dev-python/vo/ChangeLog b/dev-python/vo/ChangeLog deleted file mode 100644 index 43204bbe7..000000000 --- a/dev-python/vo/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -# ChangeLog for dev-python/vo -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*vo-0.6 (21 Jul 2010) - - 21 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> +vo-0.6.ebuild, - +files/vo-0.6-expat.patch: - Version bump - - 26 Jun 2010; Justin Lecher <jlec@gentoo.org> vo-0.5.ebuild: - Python ABI fixes - - 28 Apr 2010; Kacper Kowalik <xarthisius.kk@gmail.com> vo-0.5.ebuild, - +files/vo-0.5-assertion_fix.patch, +files/vo-0.5-skiptests.patch: - Skipping failing tests, fixing assertion. - - 28 Apr 2010; Kacper Kowalik <xarthisius.kk@gmail.com> -files/vo-0.3.1-docs.patch, - vo-0.5.ebuild, +files/vo-0.5-docs.patch, +files/vo-0.5-expat.patch: - Removing doc USE flags, since they're no longer building, adding missing - test dependencies, using new style for Python. - -*vo-0.5 (12 Feb 2010) - - 12 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> -vo-0.4.ebuild, - +vo-0.5.ebuild: - Bump - -*vo-0.4 (08 Oct 2009) - - 08 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> -vo-0.3.1.ebuild, - +vo-0.4.ebuild: - Version bump - -*vo-0.3.1 (21 Jul 2009) - - 21 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +vo-0.3.1.ebuild, - +files/vo-0.3.1-docs.patch, +metadata.xml: - Initial import - diff --git a/dev-python/vo/Manifest b/dev-python/vo/Manifest deleted file mode 100644 index 84d3b6852..000000000 --- a/dev-python/vo/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX vo-0.5-assertion_fix.patch 3918 RMD160 a16f3290652e3d35ec367f5a236d2e2381a9994c SHA1 292f510bd4d42aff8adf550ee6bf46b7f2a4c373 SHA256 a0ab5521f8838a50e8ce3e736f539ed3056502c67dc16e5ae82772cf1194e9bb -AUX vo-0.5-docs.patch 787 RMD160 981357589fae22befc08a215390bb81b94964423 SHA1 4057e7deacc726130048720b635cdd427f992f53 SHA256 0e0d32d6856193cfea4f547a04893ccac8520fe4872bbd92d6f6848a5ba71db4 -AUX vo-0.5-expat.patch 516 RMD160 96fd104bafa9fba2d4203aec9aaf9d6031752e42 SHA1 72559f15da814b84a43627a89fee8f1cabfb8df3 SHA256 8767dd8efa403f003307d9fb8d60440b850e2a2dc7d4aff43105bc7f5867b488 -AUX vo-0.5-skiptests.patch 2052 RMD160 91ccc4db98a6bfcbf9ecd42fb3366fc2c1074783 SHA1 6498fe9ca58f535b2574131b270cb00fe8e88467 SHA256 d4a60c5f523eca1f749edc4a2ed05a43613965f19257deeeb9d78ef102a863bb -AUX vo-0.6-expat.patch 526 RMD160 5adddfb1109f09a27aca102e765602f86e3b12b6 SHA1 fed5e4d69a2acb4789f2216e496e4ffa247fb4b3 SHA256 9aff0a54c97212ad9762cac66b8a285aa77513e59b07998993aef2ad871f55b4 -DIST vo-0.5.tar.gz 4495975 RMD160 25bac3958ac8a8e8268ae94ab0dbe32b8df9a30e SHA1 7f9a9fde36df868a1ed96c29d59cee92ea1b5d4a SHA256 e3c97a7b329dadac346682c235deb7b60739055f58835536eeee8c034a9d074a -DIST vo-0.6.tar.gz 4582969 RMD160 1b7e17aab4d0c8c5da48896a2681658f94bc1d28 SHA1 6aab86ef9f6ae799419535f980ec7333a2b1e287 SHA256 ce218dd55b0a3ab6476f49afa4abfa1aa71394de59d33681c86afa3b3beb931e -EBUILD vo-0.5.ebuild 872 RMD160 0db9f94f78f27c1bb687a1d19b5c7339442e0b89 SHA1 72fc98490be62403a3ab2d8fcce1c40571c78fda SHA256 86a415b2c21d2d2c460c7abbd0842b0a5833045cb80836b5b6da3cfbf5d1ec58 -EBUILD vo-0.6.ebuild 761 RMD160 bf594e5be7ee0d67b350b34112bf809f757c06f1 SHA1 32b69ba4873fd177f5df178e34a17480f6f09c6c SHA256 a3c8c0d69f705b597d74f41af7f402992265b3573927d4554713428c4f60de63 -MISC ChangeLog 1209 RMD160 1fa06583589149edf704b2173e4a9aa72a9609f8 SHA1 693e12c462e7734693f5765b413a971af3861618 SHA256 741bdb7d55b3d5cb09f9a4424f07ee20fb2e0f1766578f0fdaca712a23e0c87b -MISC metadata.xml 478 RMD160 a115ae6d3b7da632887d7443ee1a85b6ae9b322a SHA1 e42c2e82e7fa028662ef7cb77691ba2ab0c1c9a4 SHA256 d68f25e4c06961ecaa6d08df19e1cf671a592c5f1de97fb1cd780f6722cf793f diff --git a/dev-python/vo/files/vo-0.5-assertion_fix.patch b/dev-python/vo/files/vo-0.5-assertion_fix.patch deleted file mode 100644 index ce092752e..000000000 --- a/dev-python/vo/files/vo-0.5-assertion_fix.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- vo/tree.py -+++ vo/tree.py -@@ -295,7 +295,7 @@ - """) - - def _set_content_role(self, content_role): -- assert (content_role in (None, 'query', 'hints', 'doc', 'location'), -+ assert (content_role in (None, 'query', 'hints', 'doc', 'location')), ( - "content-role attribute invalid.") - self._content_role = content_role - def _del_content_role(self): self._content_role = None -@@ -363,7 +363,7 @@ - """) - - def _set_name(self, name): -- assert (name is not None, -+ assert (name is not None), ( - "'name' attribute required for 'INFO' elements") - xmlutil.check_token(name, 'name', self._config, self._pos) - self._name = name -@@ -374,7 +374,7 @@ - """) - - def _set_value(self, value): -- assert (value is not None, -+ assert (value is not None), ( - "'value' attribute required for 'INFO' elements") - check_string(value, 'value', self._config, self._pos) - self._value = value -@@ -562,17 +562,17 @@ - for start, tag, data, pos in iterator: - if start: - if tag == 'MIN': -- assert ('value' in data, -+ assert ('value' in data),( - 'MIN must have value attribute') - self.min = self._field.converter.parse(data['value'])[0] - self.min_inclusive = data.get('inclusive', 'yes') - elif tag == 'MAX': -- assert ('value' in data, -+ assert ('value' in data),( - 'MAX must have value attribute') - self.max = self._field.converter.parse(data['value'])[0] - self.max_inclusive = data.get('inclusive', 'yes') - elif tag == 'OPTION': -- assert ('value' in data, -+ assert ('value' in data),( - 'OPTION must have value attribute') - xmlutil.check_token(data.get('name'), 'name', config, pos) - self.options.append( -@@ -771,10 +771,10 @@ - """) - - def _set_datatype(self, datatype): -- assert (datatype is not None, -+ assert (datatype is not None),( - "'datatype' attribute required for '%s' elements" % - self._element_name) -- assert (datatype in converters.converter_mapping, -+ assert (datatype in converters.converter_mapping),( - "Invalid datatype attribute '%s'" % datatype) - self._datatype = datatype - datatype = property( -@@ -793,7 +793,7 @@ - """) - - def _set_precision(self, precision): -- assert (precision is None or re.match("^[FE]?[0-9]+$", precision), -+ assert (precision is None or re.match("^[FE]?[0-9]+$", precision)), ( - "precision '%s' is invalid" % precision) - self._precision = precision - def _del_precision(self): self._precision = None -@@ -873,7 +873,7 @@ - - def _set_arraysize(self, arraysize): - assert (arraysize is None or -- re.match("^([0-9]+x)*[0-9]*[*]?(s\W)?$", arraysize), -+ re.match("^([0-9]+x)*[0-9]*[*]?(s\W)?$", arraysize)), ( - 'arraysize attribute is invalid') - self._arraysize = arraysize - def _del_arraysize(self): self._arraysize = None -@@ -1053,7 +1053,7 @@ - def _set_system(self, system): - assert (system in ('eq_FK4', 'eq_FK5', 'ICRS', 'ecl_FK4', 'ecl_FK5', - 'galactic', 'supergalactic', 'xy', 'barycentric', -- 'geo_app'), -+ 'geo_app')),( - "Invalid system attribute '%s'" % system) - self._system = system - def _del_system(self): self._system = None diff --git a/dev-python/vo/files/vo-0.5-docs.patch b/dev-python/vo/files/vo-0.5-docs.patch deleted file mode 100644 index 0bb09121c..000000000 --- a/dev-python/vo/files/vo-0.5-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- doc/Makefile -+++ doc/Makefile -@@ -20,6 +20,7 @@ - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" -+ @echo " pdf to make a PDF file from LaTeX" - @echo " changes to make an overview over all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - -@@ -61,6 +62,10 @@ - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." - -+pdf: latex -+ $(MAKE) -C build/latex all-pdf -+ @echo "Build finished; the PDF file is in build/latex." -+ - changes: - mkdir -p build/changes build/doctrees - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes diff --git a/dev-python/vo/files/vo-0.5-expat.patch b/dev-python/vo/files/vo-0.5-expat.patch deleted file mode 100644 index 7bbd7a84a..000000000 --- a/dev-python/vo/files/vo-0.5-expat.patch +++ /dev/null @@ -1,23 +0,0 @@ -Using system expat - -Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> - ---- setup.py -+++ setup.py -@@ -13,14 +13,9 @@ - - iterparse_ext = Extension( - "vo.iterparser", -- ["src/iterparse.c", -- "src/expat/xmlparse.c", -- "src/expat/xmlrole.c", -- "src/expat/xmltok.c", -- "src/expat/xmltok_impl.c", -- "src/expat/xmltok_ns.c"], -+ ["src/iterparse.c",], - define_macros=defines, -- include_dirs=["src", "src/expat"]) -+ libraries=["expat"]) - - setup(name="vo", - version="0.5", diff --git a/dev-python/vo/files/vo-0.5-skiptests.patch b/dev-python/vo/files/vo-0.5-skiptests.patch deleted file mode 100644 index bbdac7838..000000000 --- a/dev-python/vo/files/vo-0.5-skiptests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- test/test.py.orig 2010-04-28 17:52:30.663209813 +0200 -+++ test/test.py 2010-04-28 17:54:42.978225374 +0200 -@@ -11,7 +11,7 @@ - import sys - - from numpy.testing import assert_array_equal, assert_raises --from numpy.testing.decorators import knownfailureif -+from numpy.testing.decorators import skipif - import numpy as np - - from vo.table import parse -@@ -26,6 +26,7 @@ - sts = os.waitpid(p.pid, 0) - assert sts[1] == 0 - -+@skipif(1,"Fails on Gentoo, reported upstream...") - def test_regression(): - # Read the VOTABLE - votable = parse("regression.xml", pedantic=False) -@@ -329,7 +330,7 @@ - assert issubclass(a0.dtype.type, np.bool_) - assert_array_equal(a0, b0) - -- @knownfailureif(numpy_has_complex_bug) -+ @skipif(numpy_has_complex_bug,"Known failure...") - def test_floatComplex(self): - assert issubclass(self.array['floatComplex'].dtype.type, - np.complex64) -@@ -338,7 +339,7 @@ - assert_array_equal(self.mask['floatComplex'], - [True, False, False, True, True]) - -- @knownfailureif(numpy_has_complex_bug) -+ @skipif(numpy_has_complex_bug,"Known failure...") - def test_doubleComplex(self): - assert issubclass(self.array['doubleComplex'].dtype.type, - np.complex128) -@@ -347,7 +348,7 @@ - assert_array_equal(self.mask['doubleComplex'], - [True, False, False, True, True]) - -- @knownfailureif(numpy_has_complex_bug) -+ @skipif(numpy_has_complex_bug,"Known failure...") - def test_doubleComplexArray(self): - assert issubclass(self.array['doubleComplexArray'].dtype.type, - np.object_) -@@ -440,7 +441,7 @@ - self.table = parse("test_through_tabledata.xml", pedantic=False).get_first_table() - self.array = self.table.array - self.mask = self.table.mask -- -+ @skipif(1,"Fails on Gentoo, reported upstream...") - def test_schema(self): - validate_schema("test_through_tabledata.xml") - diff --git a/dev-python/vo/files/vo-0.6-expat.patch b/dev-python/vo/files/vo-0.6-expat.patch deleted file mode 100644 index 24157f390..000000000 --- a/dev-python/vo/files/vo-0.6-expat.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- defsetup.py.orig 2010-07-21 17:35:59.000000000 +0100 -+++ defsetup.py 2010-07-21 17:37:06.000000000 +0100 -@@ -17,14 +17,9 @@ - - iterparse_ext = Extension( - "vo.iterparser", -- ["src/iterparse.c", -- "src/expat/xmlparse.c", -- "src/expat/xmlrole.c", -- "src/expat/xmltok.c", -- "src/expat/xmltok_impl.c" -- ], -+ ["src/iterparse.c"], - define_macros=defines, -- include_dirs=["src", "src/expat"]) -+ libraries=["expat"]) - - pkg = ['vo', 'vo.tests'] - # Python < 2.6 doesn't have the json module diff --git a/dev-python/vo/metadata.xml b/dev-python/vo/metadata.xml deleted file mode 100644 index b0bd8b61e..000000000 --- a/dev-python/vo/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci</herd> -<longdescription lang="en"> - vo.table is a Python package to read and write astronomical VOTable - files into Numpy record arrays. - vo.table supports the VOTable Format Definition Version 1.1. Some - flexibility is provided to support the 1.0 draft version and other - non-standard usage in the wild. -</longdescription> -</pkgmetadata> diff --git a/dev-python/vo/vo-0.5.ebuild b/dev-python/vo/vo-0.5.ebuild deleted file mode 100644 index c79ff4cca..000000000 --- a/dev-python/vo/vo-0.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -PYTHON_DEPEND="2:2.6" - -inherit distutils eutils - -DESCRIPTION="Python module to read VOTABLE into a Numpy recarray" -HOMEPAGE="https://www.stsci.edu/trac/ssb/astrolib/" -SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz" - -IUSE="test" -SLOT="0" -KEYWORDS="~amd64 ~x86" -LICENSE="AURA" - -DEPEND="${RDEPEND} - test? ( dev-python/nose )" -RDEPEND="dev-libs/expat" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-docs.patch - epatch "${FILESDIR}"/${P}-assertion_fix.patch - epatch "${FILESDIR}"/${P}-expat.patch - use test && epatch "${FILESDIR}"/${P}-skiptests.patch -} - -#FIX ME: docs are no longer built (missing stsci_sphinxext ) - -src_test() { - cd test - PYTHONPATH=$(dir -d ../build/lib.*) nosetests -v || die -} diff --git a/dev-python/vo/vo-0.6.ebuild b/dev-python/vo/vo-0.6.ebuild deleted file mode 100644 index 3fa4e72a0..000000000 --- a/dev-python/vo/vo-0.6.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -#PYTHON_DEPEND="2:2.6" -SUPPORT_PYTHON_ABIS="1" -DISTUTILS_SRC_TEST="nosetests" - -inherit distutils eutils - -DESCRIPTION="Python module to read VOTABLE into a Numpy recarray" -HOMEPAGE="https://www.stsci.edu/trac/ssb/astrolib/" -SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz" - -IUSE="examples" -SLOT="0" -KEYWORDS="~amd64 ~x86" -LICENSE="AURA" - -RDEPEND="dev-libs/expat" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-expat.patch -} - -#FIXME: tests are buggy, sphinx misses stsci_sphinx.conf - -src_install() { - distutils_src_install - if use examples; then - insinto /usr/share/doc/${PF}/ - doins -r examples || die - fi -} diff --git a/dev-tex/revtex/ChangeLog b/dev-tex/revtex/ChangeLog index fffa19a40..4e1df8d52 100644 --- a/dev-tex/revtex/ChangeLog +++ b/dev-tex/revtex/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*revtex-4.1_p2 (12 Sep 2010) + + 12 Sep 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + -revtex-4.1-r1.ebuild, +revtex-4.1_p2.ebuild: + Upstream bumped the patchlevel without renaming the file... + 04 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> revtex-4.1-r1.ebuild: Needs a newer natbib than in texlive 2009... diff --git a/dev-tex/revtex/Manifest b/dev-tex/revtex/Manifest index 6811a1471..fc3dff0b5 100644 --- a/dev-tex/revtex/Manifest +++ b/dev-tex/revtex/Manifest @@ -1,24 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST revtex4-1.zip 4176287 RMD160 46f5396326b031ef402bd43accc6f55bed76ee98 SHA1 d809113c0ca34444912f5b25e2669c305cb68f8e SHA256 afc24b94b8b63a92b9cbfe9274a0d9d0a56c876654a4fcbfe0b2930af2405f36 -EBUILD revtex-4.1-r1.ebuild 895 RMD160 2d933af40a47b4b929b3a70c08a17865d7dd5c76 SHA1 9bcbbf291c2ac2f1065f8bf5ed140b4b10b91c8f SHA256 f9df4e5c512a8e6db363e5d455a8eba25dffc4d7859844cf202f5fe2aa99ac86 -MISC ChangeLog 792 RMD160 5a1534c5f98e6e983f628f938d8db740caeccc9f SHA1 e215c80edd4b4d317a892280d22d2dfc88b1918f SHA256 ec3e5f2ee33a602d28dd0cdaeb62a20e12e10c328f3f35a48ef0152e82608144 +DIST revtex-4.1_p2.zip 4168885 RMD160 1d8af9f6eea403b38545f02cabdec617acea7077 SHA1 37898398833c90eda53281b2f79b393bbff30dd1 SHA256 64b5b8cf97df6a8ff6c24adcd827cf4028d5b984cebc84f06e4b9d1f7f99a08a +EBUILD revtex-4.1_p2.ebuild 907 RMD160 1e12ede0fbae16a470be327236362825e9dceb39 SHA1 bd7406ac17265e3d12f4a5a482c92bcebebf4402 SHA256 654f3dcc76700e3877b52981a3310c960174dd67ccdf6527a09c0e984254b2e3 +MISC ChangeLog 999 RMD160 98babb49392d0b55fffad2b1a23a717a8a6ad4d6 SHA1 79a1653d90c0d25976b302094b76476361ccdb0c SHA256 fa27035ff111468b31fb82ae14fb96fcdff91f6698587c64116bd2552f5c4da0 MISC metadata.xml 214 RMD160 cabb09000042fe3b1454314084641c11357b927c SHA1 d2ea40fe07be6934cad37639893856d132c6aa46 SHA256 820247bead859cdf4b61e7e1d7540b29c080f9d078ee425c41d0074873e58b07 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iQIcBAEBAgAGBQJMMMO3AAoJENwGBM22xffeiGIP/3gO2KA0im/3RguOVlJeFLX4 -f6VIlkTsVKClh3NyBjzIFFCwz/DlWKlEDoBRgcPTFJoDUaUt11xSKunnas0h1s2y -qOy0CwQ1DslauVpXpR3MFAQzCTHA5nVQoo/q/t46A7wWjZuasGVKcIdymAWYe19t -12txH50ufA743PeO8nV2vrTc1tmeScXp/igSyyeXrKR5qmzc5ltKGPDATMr96bRq -eztbAbQjsxQmNAGoWGlpxPb1kPw8oqM4nh55Tfo+VBYz71CrUxEmKResqvujYZhr -um4oh9nc1nRF8dFbJdEDHLisqN46BaKogEEIXlJukTqpk6nxnLCEN06HcSsITXzG -TM91cn7Y1Llt3kkufEHNZQeFiXr7J2wCTPH6I1JqFf7ub286/JH+g+59EVr3R6ww -EQ9Z9c7fpdbqIXDFRm68zFnIlwJrvtjWyrZyICzAKebyQ6UL0iv4glkb6lL/eKgB -pQ1ZMpZX7TfoTuPR1yro2HT4jXzOklnHPnk5l0MMLgY21lL+LJlyQb2FRRMfVOlZ -/Eesr3fLHmQrwbFsqsYn+0QiPjX7/unCkFu9t/52ebkPyjNRAt8XJrnzvJlfAjBZ -nKPjRdAVulCod+J0jS4a1759gPh69KLH/dYgP6JwOv5HTA99H+Ih+ntv3KnKQ8ct -ws8qfdANpaJqShUD+P4v -=bF7M ------END PGP SIGNATURE----- diff --git a/dev-tex/revtex/revtex-4.1-r1.ebuild b/dev-tex/revtex/revtex-4.1_p2.ebuild index f53c351df..737134392 100644 --- a/dev-tex/revtex/revtex-4.1-r1.ebuild +++ b/dev-tex/revtex/revtex-4.1_p2.ebuild @@ -6,12 +6,12 @@ EAPI=2 inherit versionator latex-package -MY_P="${PN}$(replace_version_separator 1 -)" +MY_P="${PN}$(version_format_string '$1-$2')" DESCRIPTION="LaTeX2e macros for journals of the American Physical Society and the American Institute of Physics" HOMEPAGE="http://authors.aps.org/revtex4/" -SRC_URI="http://authors.aps.org/revtex4/${MY_P}.zip" +SRC_URI="http://authors.aps.org/revtex4/${MY_P}.zip -> ${P}.zip" LICENSE="LPPL-1.3c" SLOT="0" diff --git a/dev-vcs/mercurial-server/Manifest b/dev-vcs/mercurial-server/Manifest index e40a59145..970a64d3e 100644 --- a/dev-vcs/mercurial-server/Manifest +++ b/dev-vcs/mercurial-server/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 AUX mercurial-server-0.9-docbook-path.patch 1038 RMD160 41262720f38576b47bdbb8a22097f54ddaa57c25 SHA1 52bc6cfd6fb1ff125b65f1a4a58e4b672ab3895e SHA256 7f443fe6f54fd62db06c93ae8340cda2e1e39052f0121cdf13fa68aa11630c7e DIST mercurial-server_1.0.1.tar.gz 20302 RMD160 e6ba21bca38f4b9cb48229fe000779dcf9b39072 SHA1 9f9b5b4a6f2a0cbbae8374db744350561618ff8d SHA256 6d67b8584730883c83972d35cf77bd1b45e7d2222458c5c3ac4ae94b3ec8f1ee -EBUILD mercurial-server-1.0.1.ebuild 2333 RMD160 bf8d9463239e38d3d3012979458034817352cae4 SHA1 cf7d74fac9737d1a7166b9fcbeceda769511baa1 SHA256 90e5a9bff96e65bc3136d156d11290efa473494c1592a05345ae068a219504f9 +EBUILD mercurial-server-1.0.1.ebuild 2340 RMD160 9c09d4231596dda0d0f3da4a185bad60da9fb7f4 SHA1 4297d65aeba9fb24a9c4b416980010c46e7b3129 SHA256 3e5e72c0a313cce8e2c1769d4946b6cb2352b6ead3dc4055ac9228bf1705765c MISC ChangeLog 1527 RMD160 b6e5b207408f32ae09cd6cae9fd3be2015ccf9cc SHA1 04e0f5252694ed5a685901c59f4af2cbd216b63c SHA256 35d8bd707a9eb39cb7072d6563b072f38fc5f5c4d2324bfd0b6d653aa9eb0e9d MISC metadata.xml 220 RMD160 fd3dba7eeac39bb91e6658be7d4d846249c1c329 SHA1 0aafe188f55c4c22697755bea33de012cccf3f49 SHA256 0b5c322d93461039b700509ae2671b429f0637f66596c61e48ebba9e365c9f92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkwnjEUACgkQgAnW8HDreRbI0QCg0d/neVHR+cXuUmYpneSd0lYS -EuIAoI2QvQ6Mq57WT9NngIU8VOsCz8l0 -=jNzi +iEYEARECAAYFAkyHoRMACgkQy0OE/ans1/lWKACffX6Y88R4CaZLUFDSKHXH6fUc +sekAnRk6otKGQLN7gaoujJYBfVEtXWXd +=Fm5N -----END PGP SIGNATURE----- diff --git a/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild b/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild index fa4b18f45..457fb68dc 100644 --- a/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild +++ b/dev-vcs/mercurial-server/mercurial-server-1.0.1.ebuild @@ -45,11 +45,11 @@ pkg_postinst() { #Parts could be done automatically, but maybe there is a user hg elog "This seem to be a first time install, things you may want to do" elog "-Add your public ssh key to root key folder" - elog " sudo cp ~/.ssh/id_rsa.pub ${EROOT}etc/mercurial-server/keys/root/\${USER}" + elog " su -c \"cp ~/.ssh/id_rsa.pub ${EROOT}etc/mercurial-server/keys/root/\${USER}\"" elog "-Create hgadmin repo" - elog " sudo -H -u hg ${EROOT}usr/share/mercurial-server/init/hginit ${EROOT}usr/share/mercurial-server" + elog " su - hg -c \"${EROOT}usr/share/mercurial-server/init/hginit ${EROOT}usr/share/mercurial-server\"" elog "-Init hg's ssh authorized_keys file" - elog " sudo -H -u hg ${EROOT}usr/share/mercurial-server/refresh-auth" + elog " su - hg -c \"${EROOT}usr/share/mercurial-server/refresh-auth\"" elog "-Clone hgadmin repo" elog " hg clone ssh://hg@localhost/hgadmin hgadmin" elog "-Start administration" diff --git a/profiles/package.mask b/profiles/package.mask index 01847c291..8daad400c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -35,12 +35,13 @@ # mask live ebuild =sci-chemistry/burrow-owl-9999_pre15 -# Christoph Junghans (ottxor) (11 May 09) +# Christoph Junghans (ottxor) (31 Jul 10) # kleiner_otti@gmx.de # mask live ebuilds -=sci-chemistry/gromacs-3.3.9999 =sci-chemistry/gromacs-4.0.9999 +=sci-chemistry/gromacs-4.5.9999 =sci-chemistry/gromacs-9999 +=app-doc/gromacs-manual-9999 # Christoph Junghans (ottxor) (23 Jan 10) # kleiner_otti@gmx.de diff --git a/sci-biology/clover/ChangeLog b/sci-biology/clover/ChangeLog index e674a07ff..18775e4df 100644 --- a/sci-biology/clover/ChangeLog +++ b/sci-biology/clover/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*clover-2010.02.19 (23 Aug 2010) + + 23 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + -clover-2006.07.17.ebuild, +clover-2010.02.19.ebuild: + Trivial version bump. Thanks to Martin Mokrejš. + 23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> clover-2006.07.17.ebuild: QA fixes diff --git a/sci-biology/clover/Manifest b/sci-biology/clover/Manifest index d658ba711..74679997b 100644 --- a/sci-biology/clover/Manifest +++ b/sci-biology/clover/Manifest @@ -1,25 +1,45 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST clover-2006-07-17.tar.gz 15610 RMD160 e7f5c2b53afef2df292f9274b2a1ce2c1fbbc0c3 SHA1 f80b528ceb9833d0465b1196ae793c5364a87109 SHA256 e7b5b9fa8a341d49d9cf79a6d03ef0677a493f0c34a9a2f466a864575af91cb9 +- -----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST clover-2010-02-19.tar.gz 15641 RMD160 aeeefc128976ce299e5ad65129cc0891104f0348 SHA1 ad30ac6440c6abfe53876ccc94149eec34e16b2f SHA256 f6de99b9ce5676af8b4179e12c4701f81f0b17ac5dadacfe7affa38ad2a585f5 DIST jaspar2005core 14913 RMD160 6fe43472cc1a2e0389ad9290801db56488773d3e SHA1 be8cdff62cf35f430c0c17f53564529b08000c9c SHA256 498a560c67411789106b50ccdfd9bc41f571d77c2fe9bfba7e95128c0a122fe4 -EBUILD clover-2006.07.17.ebuild 1061 RMD160 ec7fa1cd4f84cb40d5933d85738f3b77f8a2e6a5 SHA1 aec028481c6a717bcebf2bb08920f4fd50f9141a SHA256 9c8f8ef50cfc305d9f04d4964aa0f95a7434b877073fdda269eda2d969c7e0b8 -MISC ChangeLog 462 RMD160 9a83f0f8bc51fa93082a177a268b47119d372c98 SHA1 a26e3d0ca1f7b877ff9e9c7de2d0bc741aea2405 SHA256 1e523b7619dee6b47152a3f31799e1becc6942e2c408d608fc37337d5f82049f +EBUILD clover-2010.02.19.ebuild 1068 RMD160 ee85f019c8e3914d41e7a902f1afd1b250c22b7f SHA1 056c74812ac0ee941c6975c706ad3e94c177a8ad SHA256 d13347e138e155e7d12588dfd15457510d2d8caecdf5f7bb26c82408572467f1 +MISC ChangeLog 670 RMD160 76fec21f730ded591f166b128cee5ad87730e387 SHA1 45db195b3b23a9f0da9dc81a33a8f23303770faa SHA256 446dad253d4a186f03678f0aef1d9b6f0c683bb7390814c1c7b27ed7c829a2f4 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 +- -----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQIcBAEBAgAGBQJMcsvnAAoJENwGBM22xffeL5sP/jDmo45oY5thDk+pt3owS+GP +jX5BnheYpo1yRarTGbkYHflROiV5tuXMv/lKj6WFft/OlVIZfVyx0lpcie+OAppQ +b3c3MOUOWRTQz4MYBZ/HbagJ3ArVWHfw3BArSI24lcsGfeMTxQt0E2TyCNNOnmO3 +HAR+KxaKKjdz3lKWPg1fVqbDYt+T6fhWtG8BcTONAzB72y78qYG7twKiO52AcWSp +sEGyK7RlPqduJmeX2yyzJQcQRnI1kq7/FjVuzcw470BXQe4S1MGlPvKim8QLyoti +1jh2Vt9hiSb4NLmothqEFs4dUwXOrclPzia1DfNJynCBFrhj3h/Qk4f+rIHLtp3I +IhiRLHEawZzJNdeUfMwDCY6IuwWi7H9gLpVeJSiYIN47baCuUVjQDZ0NTa0/wuHU +9IGyjn2XZGGzs9r/dJu3MVN8FJz/V+lmXKJQ/QPVJIjLosFM7yJBaeaPHKrAFlnV +u6rRkDzIgyoqLxdSUdMHxIDSgKoI5NvnA02dnCK/I2ANM/18ku1UoyKK1N8LJcTD +n8bAU4rWCt7+w+D1ltHeDvOa8eALT1aGGbqzJeAgtOZxp3USWwWj0wDG4vPb/SeO +VTaNV1OprAZ8eC3uV806RaXRXHAqvBkcyBJdle38RQOuBw4bJ3PkXQv3JON/WcSI +rZgPMzMkbwCkKnq9Ppro +=7fhm +- -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBAgAGBQJMImxbAAoJENwGBM22xffeAqAP/0LkqrhCByaHJ5upxMJ0pBhI -GIR+GJ2S78rZOIaaHIPVgaApGXeIfv2/KusYh3G5229a71NUhFxc5gcktb6ivaX2 -B0CoxtSro5P8SLm/jt7QMFcWTP4M2kzCg8nCeOrHam9mJ63OkCfV6tG/+gVehUUx -OpqXAh48HgLQPq022lrKu4GbHyQcoRfcKhJkgRp7M/W+9c0urASWmmIpw4wM4MYn -bZAOXVA/QMrBAtkjicJIioCypdlA/v6RLD1tU/Omv4E8PEXB4Wjx0ZuAoqojyD8Y -ctRMVZ8apI4aHLb1u8oET3vMZirLKBVzbGoQVrNTw7h8GhgOI86I6fut4dxG98VE -0FSm6Yd87gZOGrprVfM11jX9ELJp6MCrV2c2OgaIzSp8R9qgeF3ifbJwgXILpnCp -EhQJFAwgQZGZMIw68Yutbsn6h/3EQUJlz0XzTv697NtFe1pe+BM3hJPKoHqyY0kJ -aAJoRYLSKPboEcMujAZo8YXc77SGBLubWYioouZjrtItDpZgCgvHIzqN7OiCTqeL -Sg/I4cpeEK1cMeu6OryAyxpvqSTWrgJ+5vdxOPoF+GaKeLVe8Ehrwg5f9SXYhQO1 -J7XdLeJZqHnXm4GNRYbzJXvhgdiSi7JQvyG1V15T62rkLXt3Zpv16J+bmnnbDQuM -Mp9pj+gQZ7kX41hQHuGn -=DKtw +iQIcBAEBAgAGBQJMcswRAAoJENwGBM22xffei/0P/14eh/3mDWL54PJMGPc38Wnv +nl7rJDdeZJf2LdjhgRGS7a1VoP34Jmg+TFwA1LHNhqEcuxQV7z4oQGi/HLHYI5i9 +64r1+agm+RIk9+VhGgf/r22y5v6ZwqzBN+SxC29mHvSJuwbjw+jHvJdqzhKSDkvd +caiFdE1oYwhGQ1qXiBrElTZkfprpaNwjwYRSOkyefj5P+FV7PFK3tzVsTq7m79Ab +pNHyIc9zTYI2YhyQ9v3jFJhGJsDb9JqoEwqYHLtPda+b7/ekpv4frLBgNSajKJeu +lHR6eVS4tA0WcCVnUHjCPAOJisCtOLQcao1c5ViftpvfofNs+BHtvmlBm7moPCvv +sAB8JVbzBIZ4rcFwy/7mjYe7MZ1MsmiLZR2D3X71K0LmRp5UgjjaJjczTUQ0Fqtg +9WbJOiDR7IPfxjhmfAZK4aeSnXD+rVjZ+MPOGRUuD2zplj9NuQK3PTgndCdI1Yo8 +jGSTkRNa5Civ4c2FEQW4UlCrKB+u35+ocyZsPniFkdP0hlN66eHfsOxIE562qaFU +GkSvN4HWiW5yS4fdEcGh8EM/ojUnRQN/2T9flkA+JHdhAy/+6+ilVv10pVlJ0Ala +af+rxjDbkPaeo+8kBYQvhSChVv84gQOBj72KSziBTmSgDWYXs4BFXPj3Pmx7Bwcr ++MSjiUj5Bhc185SjfZOA +=T+d9 -----END PGP SIGNATURE----- diff --git a/sci-biology/clover/clover-2006.07.17.ebuild b/sci-biology/clover/clover-2010.02.19.ebuild index 401aff4db..f14b70a16 100644 --- a/sci-biology/clover/clover-2006.07.17.ebuild +++ b/sci-biology/clover/clover-2010.02.19.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://zlab.bu.edu/~mfrith/downloads/${PN}-${MY_PV}.tar.gz http://zlab. LICENSE="as-is" SLOT="0" IUSE="" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" DEPEND="" RDEPEND="" diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest new file mode 100644 index 000000000..872d0931b --- /dev/null +++ b/sci-chemistry/avogadro/Manifest @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +EBUILD avogadro-9999.ebuild 1154 RMD160 72ab78f9f875fc54aded8d3453328f4c8f0f9619 SHA1 26434ea38782a15b42ff6d4eb6685f04795e1b63 SHA256 7cecb5f75ae42d570d7ba84a07f82e459e9e4ede4ba09bf233280caf7cc2b466 +MISC metadata.xml 600 RMD160 d3559123f9438a9d0a49783ebb38027f91492e8d SHA1 f0dc9728b4196c6b09e8a0c4fdb02cd9f692cda4 SHA256 298cc4b9c2fc652f167bf9ae6e9faec1cfd1aa41a276295f4d1a6814912b58af +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQIcBAEBCAAGBQJMZFVlAAoJEOf+E+/4L5Lm6rYP+wUOHui2111YdWps3HF3Mdz+ +RGxA2I0wqbJNcsIoRocZNkp+TMMFYmgHrAR0p5gnr8r+/OpJ38blUYNCThczFF8O +Ww7qdHXsClWaj2vpxa3H2VVBq+n6ATng/1nprYF20Wz1ZFEz92MFc442Re1Kahzp +V4SANjdBjnxHdVZDa2qJ794kLuFyVl5EDAkx+dwhgmMX2i5tk9VOkj90HzbrRU2r +GK3rbD8S5Vp9FeAhEUXiXkf+RRcAariT1qNJbWX2r0d2x2RecJlzLYIRNcYhLdYf +wXncmu5eGnSSW6kcNZG1yVxPd2CccrNN0M8JWC3QEz7bkjk4qmAdUU5UNOCBLKRh +b9b1jrjF2wygetICqCvKnbwfc49fIVCAWRD+nQJTapUG12ih3umoja2+i/PwOnUC +faEWkAhwlUcaYSjONKup4lTGstwGFp9PbdjgHp+1wCwZIeTI+Bzr4yVTi05IDGNC +gAnKtqE+V9CduKF5AsfGUAIm/XY6G0uYUz/H2L/vVQr482GUgEkSQfcAwe2jIMhw +Zx5QixSFbH6aQVsUZV1+1kjNlDwDk0oyD/WUFutiZ43JuQxwLa/CjPV+eKRmydAN +JHrxUkL8edv44hhAp+432ww64jxz6ApOKFaSBH58qkKB3HPdHO1SUSnw04LhVXV0 +U9n5Dy9vbd/imgrKczbR +=q3nR +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/avogadro/avogadro-9999.ebuild b/sci-chemistry/avogadro/avogadro-9999.ebuild new file mode 100644 index 000000000..a69d3b534 --- /dev/null +++ b/sci-chemistry/avogadro/avogadro-9999.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.1.ebuild,v 1.1 2010/05/21 15:33:28 jlec Exp $ + +EAPI="3" + +PYTHON_DEPEND="python? 2:2.5" + +inherit cmake-utils eutils python git + +DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" +HOMEPAGE="http://avogadro.sourceforge.net/" +EGIT_REPO_URI="git://github.com/cryos/avogadro.git" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="+glsl python" + +RDEPEND=">=sci-chemistry/openbabel-2.2.3 + >=x11-libs/qt-gui-4.5.3:4 + >=x11-libs/qt-opengl-4.5.3:4 + x11-libs/gl2ps + glsl? ( >=media-libs/glew-1.5.0 ) + python? ( + >=dev-libs/boost-1.35 + >=dev-libs/boost-1.35.0-r5[python] + dev-python/numpy + dev-python/sip + )" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-2.0.9 + >=dev-util/cmake-2.6.2" + +pkg_setup() { + python_set_active_version 2 +} + +src_configure() { + local mycmakeargs + mycmakeargs="${mycmakeargs} + -DENABLE_THREADGL=FALSE + -DENABLE_RPATH=OFF + -DENABLE_UPDATE_CHECKER=OFF + $(cmake-utils_use_enable glsl GLSL) + $(cmake-utils_use_enable python PYTHON)" + + cmake-utils_src_configure +} diff --git a/sci-chemistry/avogadro/metadata.xml b/sci-chemistry/avogadro/metadata.xml new file mode 100644 index 000000000..4f8df4c8f --- /dev/null +++ b/sci-chemistry/avogadro/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sci-chemistry</herd> + <maintainer> + <email>cryos@gentoo.org</email> + </maintainer> + <longdescription> + Avogadro is an advanced molecular editor designed for cross-platform use in + computational chemistry, molecular modeling, bioinformatics, materials + science, and related areas. It offers flexible rendering and a powerful + plugin architecture. + </longdescription> + <use> + <flag name="glsl">Enable glsl features via GLEW.</flag> + </use> +</pkgmetadata> diff --git a/sci-chemistry/bist/ChangeLog b/sci-chemistry/bist/ChangeLog new file mode 100644 index 000000000..543e6afd1 --- /dev/null +++ b/sci-chemistry/bist/ChangeLog @@ -0,0 +1,30 @@ +# ChangeLog for sci-chemistry/bist +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 22 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + Moved from sunrise to sci overlay. + + 25 Sep 2009; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + +bist-0.5.1-r1.ebuild, +files/bist-0.5.1-bracket.patch, + -files/wrap_bracket_dialog-amd64.patch, -bist-0.5.1.ebuild, + +files/bist-0.5.1-install.patch: + Fixed installation of plugins, help files, molecule library, + internationalization, man page, desktop file, and icon. + + 21 Sep 2009; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + -bist-0.4.7.ebuild, +bist-0.5.1.ebuild: + Version bump and upgrade of the ebuild to EAPI=2 + + 20 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + bist-0.4.7.ebuild: + Drop dependency on gcc + + 06 Oct 2008; Tomáš Chvátal <tomas.chvatal@gmail.com> bist-0.4.7.ebuild: + Fix Depend/Rdepend issue about gcc + + 30 Sep 2008; Giuseppe Marco Randazzo <gmrandazzo@gmail.com> + +files/wrap_bracket_dialog-amd64.patch, +bist-0.4.7.ebuild, +metadata.xml: + New Ebuild sci-chemistry/bist for bug 239172 thanks to Giuseppe Marco + Randazzo aka zeld + diff --git a/sci-chemistry/bist/Manifest b/sci-chemistry/bist/Manifest new file mode 100644 index 000000000..a5ff6b6ec --- /dev/null +++ b/sci-chemistry/bist/Manifest @@ -0,0 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX bist-0.5.1-bracket.patch 379 RMD160 4d9d835a8c189862ec53f069862069a005b4c4ff SHA1 7c6ec5afb2bf2f1d6bc4ed931c5dbf03fe2abb98 SHA256 3fd94f204a237d3b00c2fd86b45259f65ac31606ebfe7ab076c3e24f8f855671 +AUX bist-0.5.1-install.patch 4074 RMD160 35136ca7aa40e34c543efae3def45ced6d9d2886 SHA1 fc69c1a111ca724409674a35b40d7bc342b99388 SHA256 b94add3bed813222d29f4156668668c3296f6d817eb8f097709fcabd37d5ae67 +DIST bist-0.5.1.tar.gz 766731 RMD160 a848cf778c9096239ca964dce352eeeab1ee4dc2 SHA1 22fd8186ef3a4fcc2776a3cf5b57ca78bfb4ab69 SHA256 78809230e2bcfffefaf8f95d85740d94cf2d10b4dd0d746f28cf1e82e4fc6cd5 +EBUILD bist-0.5.1-r1.ebuild 694 RMD160 a2b89ddcb1739df0f8ba9ecbfb437604f43fdb52 SHA1 dbfc9b9482d687ffbd7d86afc912f11585140621 SHA256 2d1a05d6bc8ad7e62b1e6cdde75d006cbc12d7aa2595c9ad4d3668833af6fd61 +MISC ChangeLog 1179 RMD160 09e71b55f8d994d4fec7f640cacf6ca8cdf25c79 SHA1 d60db59280ec2d855eb0888cfd772ed3ff641e4e SHA256 da7f51562f12111b0f707b85d39178c35191fe0f79e28c3facada9b4f3c99185 +MISC metadata.xml 1221 RMD160 a53092870d168cb265d2eef41a1556975b161846 SHA1 4c7dd7b7dfc788161a06815502785e1b6f2d9f7a SHA256 3469c6fb0fedd54e56f8961a7e1b6fc6aa23a6ace1d18b89a4a87ef2748fe164 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQIcBAEBAgAGBQJMcZKVAAoJENwGBM22xffewB0P/izoz6rzjRp8dCZxrEohD7RX +u4h+HIdY4+xD7HNa9AoJC9hO48YKmZ+ggH/pWIM9UtHmbZIlhRgFsV1wQlyP6V/o +mS1mNuguTFI9v6B3KM8syL7nNPvtTfBXExgOouBjnLExtGG2B5+2crnGGKY5NW/K +xkGI9gRpt1jgUjjY74zkF+4YEeKPKd1M9CRr9VwMfn+gRQExxYY4v4R0579fqBux +OdL221kqIV59KpDWmaqiXDssEAjZzk+vefrvqkyhL4ZCPRLuO8suYU/m43zMb0lF +vMV7v/peLkcPAJ2bHSfwg+q5R6A4NC8Kj1QQ6Xbxk00nkwh7fOG8xt1k1hojwX91 +h7E/9IqhGkIZCEHsw/mzerrUnetGeScCOdrIuJkXoSdSRx6XiF4ZyV53z4kGNVe7 +AkMZm6GOsqJIkuDBlAmcEd2uJNwTKNEeFYK7Wj+5NjMa1hOZ+FzwrBGAei97JYPT +2ns5NtO/3Ki/k1PaM8FsPYgQ/AlFNC8mtztmpJQzB6lQP7OTsYXD9n0/uyLlVknF +BOBuJIzBPLN1RIRpGgUYiXuAi1+5TSBRQ4G7NVjYCMisr6CuUBew31vgB4XG4iVL +591gXUo+2pcBckbaiZ5s+dVfhpb6vQImD+MiEiiT5Aw53o+OpHUCFeb1ICh9zPQg +SzreZ34Qu9hpvMdBBp6P +=8rwF +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/bist/bist-0.5.1-r1.ebuild b/sci-chemistry/bist/bist-0.5.1-r1.ebuild new file mode 100644 index 000000000..2a31a618c --- /dev/null +++ b/sci-chemistry/bist/bist-0.5.1-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils base + +DESCRIPTION="Bist, the chemical drawing tool" +HOMEPAGE="http://www.autistici.org/interzona/index.php?mod=03_Bist" +SRC_URI="http://www.autistici.org/interzona/ftrack.php?url=sections/06_Download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="net-misc/curl + dev-libs/expat + >=x11-libs/fltk-1.1.7:1.1 + sci-libs/gsl + >=sci-chemistry/openbabel-2.2.0 + >=media-libs/plotutils-2.5" + +DEPEND="${RDEPEND}" + +src_prepare() { + use amd64 && epatch "${FILESDIR}/${P}-bracket.patch" + epatch "${FILESDIR}/${P}-install.patch" +} diff --git a/sci-chemistry/bist/files/bist-0.5.1-bracket.patch b/sci-chemistry/bist/files/bist-0.5.1-bracket.patch new file mode 100644 index 000000000..86a587e6a --- /dev/null +++ b/sci-chemistry/bist/files/bist-0.5.1-bracket.patch @@ -0,0 +1,11 @@ +--- pluginclude/wrap_bracket_dialog.hpp.orig 2008-09-30 10:45:56.000000000 +0200 ++++ pluginclude/wrap_bracket_dialog.hpp 2008-09-30 10:46:07.000000000 +0200 +@@ -10,7 +10,7 @@ + #if SIZEOF_INT_P == 8 + #define WRAP_BRACKET_SIZE_USER_DATA_MENU long int + #else +-#define WRAP_BRACKET_SIZE_USER_DATA_MENU unsigned int ++#define WRAP_BRACKET_SIZE_USER_DATA_MENU unsigned long + #endif + + diff --git a/sci-chemistry/bist/files/bist-0.5.1-install.patch b/sci-chemistry/bist/files/bist-0.5.1-install.patch new file mode 100644 index 000000000..b349b0d5b --- /dev/null +++ b/sci-chemistry/bist/files/bist-0.5.1-install.patch @@ -0,0 +1,80 @@ +diff -r -u bist-0.5.1.orig/Makefile.in bist-0.5.1/Makefile.in +--- bist-0.5.1.orig/Makefile.in 2009-04-04 12:04:44.000000000 +0200 ++++ bist-0.5.1/Makefile.in 2009-09-23 23:59:37.000000000 +0200 +@@ -16,12 +16,7 @@ + + SRC_DIR =./src/ + INC_DIR=./include/ +-LIB_DIR=@LIB_DIR_CONFIG_PATH@ +-LIB_DIR_DEBIAN=@LIB_DIR_CONFIG@ +- +-ifneq ($(strip ${exec_prefix}),) +-LIB_DIR=${LIB_DIR_DEBIAN} +-endif ++LIB_DIR=@libdir@ + + + +@@ -186,33 +181,29 @@ + rm -f *.o + rm -f plugin/*.so + install: +- install -D -o root -g root -m 0755 -s $(ELF) $(prefix)/bin/$(ELF) +- install -D -o root -g root -m 0644 bist.png $(prefix)/share/pixmap/bist.png +- install -D -o root -g root -m 0644 bist.desktop $(prefix)/share/applications/bist.desktop ++ install -D -o root -g root -m 0755 -s $(ELF) $(DESTDIR)/$(prefix)/bin/$(ELF) ++ install -D -o root -g root -m 0644 bist.png $(DESTDIR)/$(prefix)/share/pixmaps/bist.png ++ install -D -o root -g root -m 0644 bist.desktop $(DESTDIR)/$(prefix)/share/applications/bist.desktop + find rings -type d -exec install -D -o root \ +- -g root -m 0755 -d $(prefix)/share/$(ELF)-$(VERSION)/\{\} \; ++ -g root -m 0755 -d $(DESTDIR)/$(prefix)/share/$(ELF)-$(VERSION)/\{\} \; + find rings ! -type d -exec install -D -o root -g root \ +- -m 0644 \{\} $(prefix)/share/$(ELF)-$(VERSION)/\{\} \; +- install -D -o root -g root -m 0755 -d $(prefix)/share/doc/$(ELF)-$(VERSION) +- install -D -o root -g root -m 0644 doc/*.* $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- install -D -o root -g root -m 0644 TODO $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- install -D -o root -g root -m 0644 BUGS $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- install -D -o root -g root -m 0644 README $(prefix)/share/doc/$(ELF)-$(VERSION)/ +- ./mkinstalldirs $(LIB_DIR)/$(ELF)-$(VERSION)/plugin +- install -D -o root -g root -m 0644 plugin/*.so $(LIB_DIR)/$(ELF)-$(VERSION)/plugin/ +- ./mkinstalldirs $(prefix)/share/locale/$(ELF)-$(VERSION) +- cp -R po/* $(prefix)/share/locale/$(ELF)-$(VERSION)/ +- ./mkinstalldirs $(prefix)/share/man/man1/ ++ -m 0644 \{\} $(DESTDIR)/$(prefix)/share/$(ELF)-$(VERSION)/\{\} \; ++ install -D -o root -g root -m 0755 -d $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION) ++ install -D -o root -g root -m 0644 doc/*.* $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ install -D -o root -g root -m 0644 TODO $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ install -D -o root -g root -m 0644 BUGS $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ install -D -o root -g root -m 0644 README $(DESTDIR)/$(prefix)/share/doc/$(ELF)-$(VERSION)/ ++ ./mkinstalldirs $(DESTDIR)/$(LIB_DIR)/$(ELF)-$(VERSION)/plugin ++ install -D -o root -g root -m 0644 plugin/*.so $(DESTDIR)/$(LIB_DIR)/$(ELF)-$(VERSION)/plugin/ ++ ./mkinstalldirs $(DESTDIR)/$(prefix)/share/locale ++ find po -name "*.po" -exec rm -v \{\} \; ++ rm -v po/LINGUAS po/bist.pot ++ cp -R po/* $(DESTDIR)/$(prefix)/share/locale/ ++ ./mkinstalldirs $(DESTDIR)/$(prefix)/share/man/man1/ + gzip -c --best ./doc/man/$(ELF).1 > ./doc/man/$(ELF).1.gz +- install -D -o root -g root -m 0644 ./doc/man/$(ELF).1.gz $(prefix)/share/man/man1/ ++ install -D -o root -g root -m 0644 ./doc/man/$(ELF).1.gz $(DESTDIR)/$(prefix)/share/man/man1/ + rm -f ./doc/man/$(ELF).1.gz + +-uninstall: +- rm -Rf $(prefix)/bin/$(ELF)-$(VERSION) +- rm -Rf $(prefix)/share/$(ELF)-$(VERSION) +- rm -Rf $(prefix)/share/doc/$(ELF)-$(VERSION) +- rm -Rf $(LIB_DIR)/$(ELF)-$(VERSION)/ +- rm -f $(prefix)/share/man/man1/$(ELF).1.gz + dist: distclean + ./rmcvs.py + cd .. ; tar -c $(ELF) | gzip --best > $(TARNAME)-$(VERSION).tar.gz +diff -r -u bist-0.5.1.orig/include/config_path.h.in bist-0.5.1/include/config_path.h.in +--- bist-0.5.1.orig/include/config_path.h.in 2009-04-04 12:04:42.000000000 +0200 ++++ bist-0.5.1/include/config_path.h.in 2009-09-23 23:29:35.000000000 +0200 +@@ -12,6 +12,6 @@ + #define VERSION "@VERSION@" + + #define PLUGIN_PATH_HOME "/.bist/plugin/" +-#define PLUGIN_PATH_SHARED "@LIB_DIR_CONFIG_PATH@/@ELF@-@VERSION@/plugin/" ++#define PLUGIN_PATH_SHARED "@libdir@/@ELF@-@VERSION@/plugin/" + + #define ELF_ABS_PATH "@prefix@/bin/@ELF@" diff --git a/sci-chemistry/bist/metadata.xml b/sci-chemistry/bist/metadata.xml new file mode 100644 index 000000000..d6a2d376f --- /dev/null +++ b/sci-chemistry/bist/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer> +<longdescription> +Bist stands for bidimensional structures (in italian it sounds like "beast" in english ) and is a chemical drawing tool. It is focused on organic chemistry but it may be useful also for chemists or teacher as well. +Bist support many of the formalism used to describe molecoles structures like single bond, double bond, stereospecific bond, charges, resonance arrows, lone pairs etc... +It can export both postscript and png formats. +This version is now integrated with openbabel API so virtually all the formats this library can accept should be a valid input for bist too. +Currently portability is not my goal so only GNU/Linux platform is supported. However any effort in this direction is appreciated so feel free to ask me about any porting question. Please remember that bist is actually in a beta stage of development so i strongly suggest you to not using it except for testing or hacking purpose. Bist is free software released under GNU GPL version 3 +</longdescription> +</pkgmetadata> diff --git a/sci-chemistry/dssp2pdb/ChangeLog b/sci-chemistry/dssp2pdb/ChangeLog index 5447ee59c..372996faa 100644 --- a/sci-chemistry/dssp2pdb/ChangeLog +++ b/sci-chemistry/dssp2pdb/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jul 2010; Justin Lecher <jlec@gentoo.org> dssp2pdb-0.03.ebuild: + Keyworded for *-linux prefix + *dssp2pdb-0.03 (15 Jan 2010) 15 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net> diff --git a/sci-chemistry/dssp2pdb/Manifest b/sci-chemistry/dssp2pdb/Manifest deleted file mode 100644 index cafafcdb4..000000000 --- a/sci-chemistry/dssp2pdb/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST dssp2pdb-0.03.tar 10240 RMD160 eab385645aec1016045ea536ff4805423b90687e SHA1 e950f5c2e2cac69e58af7d6cf41b025b4faf61bd SHA256 4ec79fdd7223a6125d5ab221438ca9d9747e293c37bcfc5b67981e678280ec61 -EBUILD dssp2pdb-0.03.ebuild 447 RMD160 fe1dd4311c6d7debe5d2037824aeba1eb1d8e7d2 SHA1 4cf28851ac38eb83af0c63f8526bd91859074ede SHA256 e34f83d7fe93e2d5831af04abf1d38990fd67c159b6e110b6bc1a2dc6a8bbe62 -MISC ChangeLog 268 RMD160 afc894ff81f91a1411c68d79c6e57ba7f75a50a8 SHA1 ee02dfcbc82cd317d5908e184ed7d42081305bbe SHA256 d429a365a74a50dc80ffa34bb8fd7c99b11ee28b43c1efd76e14e1dd1bb2d4c6 -MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index 7726449b3..f8aa6364f 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,33 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*gromacs-4.5.1 (02 Sep 2010) + + 02 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de> + -gromacs-4.5_beta3.ebuild, +gromacs-4.5.1.ebuild: + version bump + +*gromacs-4.5_beta3 (11 Aug 2010) + + 11 Aug 2010; Alexey Shvetsov <alexxy@gentoo.org> gromacs-4.0.9999.ebuild, + -gromacs-4.5_beta2.ebuild, +gromacs-4.5_beta3.ebuild, + gromacs-4.5.9999.ebuild, gromacs-9999.ebuild: + Add epatch_user + +*gromacs-4.5_beta2 (02 Aug 2010) + + 02 Aug 2010; Christoph Junghans <kleiner_otti@gmx.de> + -gromacs-4.5_beta1.ebuild, +gromacs-4.5_beta2.ebuild, + gromacs-4.5.9999.ebuild, gromacs-9999.ebuild: + Version bump + new manual + +*gromacs-4.5.9999 (31 Jul 2010) +*gromacs-4.5_beta1 (31 Jul 2010) + + 31 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de> + +gromacs-4.5_beta1.ebuild, +gromacs-4.5.9999.ebuild, gromacs-9999.ebuild: + Version bump + 24 Jul 2010; Alexey Shvetsov <alexxy@gentoo.org> gromacs-9999.ebuild: ffamber officialy shipped with gromacs from now on diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest index 8e5c23b01..ae8bee182 100644 --- a/sci-chemistry/gromacs/Manifest +++ b/sci-chemistry/gromacs/Manifest @@ -3,15 +3,19 @@ Hash: SHA1 DIST ffamber_v4.0-doc.tar.gz 7915520 RMD160 aeadb18bd88bcd9e6fc45af22af15c51e32c66a3 SHA1 8d4969fa7eec660b41f769874be9698980b49ed0 SHA256 0b3395570dfe9bf808a297fcb120e1f525f38a91791fbafe6e444d542d7754aa DIST gmxtest-4.0.4.tgz 14845017 RMD160 c7c583415438bdef4c9996da9064254e9460cf16 SHA1 998179aa2bfbc4f80514f10ed774762f85c854c3 SHA256 6a7f787f4bb7cbecb688115ff0854a5ffd2ef33487d7bce4b031e63848b6f361 +DIST gromacs-4.5.1.tar.gz 10300446 RMD160 b28973526859359c84ba5d4fe2a5018b158f932b SHA1 4352565278e39fb619208950780d8cb0b470a200 SHA256 c565e469d2ee495fe67b227179af1740a49ef78321978417cd818b6d4bdae233 DIST manual-4.0.pdf 2135100 RMD160 b963642f8e1433f11328c3d0c4b1645c9de506da SHA1 8ae951ee15b2a7dc626331fce36511bc8766144c SHA256 646f810477eee2d710de6019c52056550413d0ba77baf9680195c835ddafe80a -EBUILD gromacs-4.0.9999.ebuild 9240 RMD160 8d6f31dcde6297f7d06f410b5d9ee5c321cf3824 SHA1 7ecc1f13330ef172b23a0b36f9047fa38451fc3d SHA256 ed0c4fe69bfa803cb73be3d14a73c6affaa8e175e5b58405dc8f9fa706546eee -EBUILD gromacs-9999.ebuild 7119 RMD160 06ffdd882fce711e9c3d170d5880993ec62d643f SHA1 83748e3e65eae35a9d9a763444bce097a9b4e9f1 SHA256 6d75d252800b4ab6aea4e2c82b52378a17a66f898d9222b86aa3d687966d67d0 -MISC ChangeLog 4834 RMD160 f8297200737f6b7dd99104d683d671333e52bf4e SHA1 09c76f712a052115f22a38769ac745b775662bce SHA256 de84d0da3b17eae88b6d527ea05b59f686029ff36004528fc9dbfc0ef2923913 +DIST manual-4.5-beta2.pdf 2317594 RMD160 3936ca2ec810ae2e74c57f19a993fda8152bedcd SHA1 d995be380e6453056330c5f5bfed95fbf4cb554f SHA256 fdeb0cd0be5244cdfddc17a643199ddf043e0a9d37811998300df86541483c61 +EBUILD gromacs-4.0.9999.ebuild 9253 RMD160 b1d0cc7e6e51a718fd01d72947b3e2e22059a0d2 SHA1 888c75e12238560e741bc9e2a4198cfee2ab3701 SHA256 3da8f43fd21df44375cf03b1fe46c594aa51c2f72307c4a9eec9747330d54a8d +EBUILD gromacs-4.5.1.ebuild 7428 RMD160 a2205a735fa14d34a98bc88ee2dbf20153966c2e SHA1 8a927e5217eaf9c57c25bcefe8a315600c4d261e SHA256 9264000e86e930d26e38ab53d460754ff461965de1817c3b2c6c70d6414a9124 +EBUILD gromacs-4.5.9999.ebuild 7467 RMD160 84ca2c188addeb9823b6c5da01138c14b85f4277 SHA1 6f713d3d098b6b49bb3769f3c5bb835d1c4b8bb9 SHA256 aedbbe05bf932418e237c1ac5f9a77c03559eafdf60f0cecc082ce6834f07878 +EBUILD gromacs-9999.ebuild 7851 RMD160 a92cfefd23992e1e49e72b0d7e850ecc7715bcd4 SHA1 7d9bea15ca33e677e5c461dbb3627112522d7e5f SHA256 c0a561f207198a58a8f6d507ba943a10af40b4a6f01c5f230a86d05db528c582 +MISC ChangeLog 5658 RMD160 b18635eae8b4777ab5a73f443200500508b1e72c SHA1 e0b8a4d90a4aee0a0956817f9df077766a5b8601 SHA256 94464b430f371acb24ca4efc7776d5a7dc745af98a6260cec74e1542a40e123c MISC metadata.xml 643 RMD160 e9ffc42d792f15f3d4438a0de225277ec4814041 SHA1 c83fd4a32d896b7a2586667bc684d46f9daf8693 SHA256 177885ec674e8630a9c9451a0e0a35fc83615b39b387a67002e27f1b0d6b19b2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkxMnFQACgkQy0OE/ans1/l7dwCfZFEwQj4Re6jIV5haPvomLdtO -PWkAn3KMtVvQyrfIJBM9tuzTnM7FIOAI -=lqsP +iEYEARECAAYFAkyAClwACgkQy0OE/ans1/n//wCeMK0y3ywpEF+cOLLHnka7Yobr +4REAn2C1rQTSt/9IBgSzgfxV0Vu19uFS +=5ItK -----END PGP SIGNATURE----- diff --git a/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild index 86bf31062..3c02f87a5 100644 --- a/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-4.0.9999.ebuild @@ -69,6 +69,7 @@ src_prepare() { sed -e "s:+0f:-f:" -i share/tutor/gmxdemo/demo \ || die "Failed to fixup demo script." + epatch_user eautoreconf GMX_DIRS="" use single-precision && GMX_DIRS+=" single" diff --git a/sci-chemistry/gromacs/gromacs-4.5.1.ebuild b/sci-chemistry/gromacs/gromacs-4.5.1.ebuild new file mode 100644 index 000000000..f210a8dc0 --- /dev/null +++ b/sci-chemistry/gromacs/gromacs-4.5.1.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +LIBTOOLIZE="true" +TEST_PV="4.0.4" +MANUAL_PV="4.5-beta2" + +inherit autotools bash-completion eutils fortran multilib toolchain-funcs + +DESCRIPTION="The ultimate molecular dynamics simulation package" +HOMEPAGE="http://www.gromacs.org/" +SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz + test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-${TEST_PV}.tgz ) + doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${MANUAL_PV}.pdf )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="X blas dmalloc doc -double-precision +fftw fkernels +gsl lapack +mpi +single-precision static static-libs test +threads +xml zsh-completion" + +DEPEND="app-shells/tcsh + X? ( x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE ) + dmalloc? ( dev-libs/dmalloc ) + blas? ( virtual/blas ) + fftw? ( sci-libs/fftw:3.0 ) + gsl? ( sci-libs/gsl ) + lapack? ( virtual/lapack ) + mpi? ( virtual/mpi ) + xml? ( dev-libs/libxml2 )" + +RDEPEND="${DEPEND}" + +RESTRICT="test" + +QA_EXECSTACK="usr/lib/libgmx.so.* + usr/lib/libgmx_d.so.*" + +use static && QA_EXECSTACK="$QA_EXECSTACK usr/bin/*" + +pkg_setup() { + if use fkernels; then + FORTRAN="g77 gfortran ifc" + fortran_pkg_setup + else + FORTRANC="" + fi +} + +src_prepare() { + + ( use single-precision || use double-precision ) || \ + die "Nothing to compile, enable single-precision and/or double-precision" + + if use mpi && use threads; then + elog "mdrun uses only threads OR mpi, and gromacs favours the" + elog "use of mpi over threads, so a mpi-version of mdrun will" + elog "be compiled. If you want to run mdrun on shared memory" + elog "machines only, you can safely disable mpi" + fi + + if use static; then + use X && die "You cannot compile a static version with X support, disable X or static" + use xml && die "You cannot compile a static version with xml support + (see bug #306479), disable xml or static" + fi + epatch_user + eautoreconf + GMX_DIRS="" + use single-precision && GMX_DIRS+=" single" + use double-precision && GMX_DIRS+=" double" + for x in ${GMX_DIRS}; do + mkdir "${S}-${x}" || die + use test && cp -r "${WORKDIR}"/gmxtest "${S}-${x}" + use mpi || continue + mkdir "${S}-${x}_mpi" || die + done +} + +src_configure() { + local myconf + local myconfsingle + local myconfdouble + local suffixdouble + + #leave all assembly options enabled mdrun is smart enough to deside itself + #there so no gentoo on bluegene! + myconf="${myconf} --disable-bluegene" + + #from gromacs configure + if ! use fftw; then + ewarn "WARNING: The built-in FFTPACK routines are slow." + ewarn "Are you sure you don\'t want to use FFTW?" + ewarn "It is free and much faster..." + fi + + if [[ $(gcc-version) == "4.1" ]]; then + eerror "gcc 4.1 is not supported by gromacs" + eerror "please run test suite" + die + fi + + #note for gentoo-PREFIX on apple: use --enable-apple-64bit + + #fortran will gone in gromacs 4.1 anyway + #note for gentoo-PREFIX on aix, fortran (xlf) is still much faster + if use fkernels; then + ewarn "Fortran kernels are usually not faster than C kernels and assembly" + ewarn "I hope, you know what are you doing..." + myconf="${myconf} --enable-fortran" + else + myconf="${myconf} --disable-fortran" + fi + + # if we need external blas + if use blas; then + export LIBS="${LIBS} -lblas" + myconf="${myconf} $(use_with blas external-blas)" + fi + + # if we need external lapack + if use lapack; then + export LIBS="${LIBS} -llapack" + myconf="${myconf} $(use_with lapack external-lapack)" + fi + + # by default its better to have dynamicaly linked binaries + if use static; then + #gmx build static libs by default + myconf="${myconf} --disable-shared $(use_enable static all-static)" + else + myconf="${myconf} --disable-all-static --enable-shared $(use_enable static-libs static)" + fi + + myconf="--datadir="${EPREFIX}"/usr/share \ + --bindir="${EPREFIX}"/usr/bin \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --docdir="${EPREFIX}"/usr/share/doc/"${PF}" \ + $(use_with dmalloc) \ + $(use_with fftw fft fftw3) \ + $(use_with gsl) \ + $(use_with X x) \ + $(use_with xml) \ + $(use_enable threads) \ + ${myconf}" + + #if we build single and double - double is suffixed + if ( use double-precision && use single-precision ); then + suffixdouble="_d" + else + suffixdouble="" + fi + + if use double-precision ; then + #from gromacs manual + elog + elog "For most simulations single precision is accurate enough. In some" + elog "cases double precision is required to get reasonable results:" + elog + elog "-normal mode analysis, for the conjugate gradient or l-bfgs minimization" + elog " and the calculation and diagonalization of the Hessian " + elog "-calculation of the constraint force between two large groups of atoms" + elog "-energy conservation: this can only be done without temperature coupling and" + elog " without cutoffs" + elog + fi + + if use mpi ; then + elog "You have enabled mpi, only mdrun will make use of mpi, that is why" + elog "we configure/compile gromacs twice (with and without mpi) and only" + elog "install mdrun with mpi support. In addtion you will get libgmx and" + elog "libmd with and without mpi support." + fi + + myconfdouble="${myconf} --enable-double --program-suffix='${suffixdouble}'" + myconfsingle="${myconf} --enable-float --program-suffix=''" + for x in ${GMX_DIRS}; do + einfo "Configuring for ${x} precision" + cd "${S}-${x}" + local p=myconf${x} + ECONF_SOURCE="${S}" econf ${!p} --disable-mpi CC="$(tc-getCC)" F77="${FORTRANC}" + use mpi || continue + cd "${S}-${x}_mpi" + ECONF_SOURCE="${S}" econf ${!p} --enable-mpi CC="$(tc-getCC)" F77="${FORTRANC}" + done +} + +src_compile() { + for x in ${GMX_DIRS}; do + cd "${S}-${x}" + einfo "Compiling for ${x} precision" + emake || die "emake for ${x} precision failed" + use mpi || continue + cd "${S}-${x}_mpi" + emake mdrun || die "emake mdrun for ${x} precision failed" + done +} + +src_test() { + for x in ${GMX_DIRS}; do + local oldpath="${PATH}" + export PATH="${S}-${x}/src/kernel:${S}-{x}/src/tools:${PATH}" + cd "${S}-${x}" + emake -j1 tests || die "${x} Precision test failed" + export PATH="${oldpath}" + done +} + +src_install() { + for x in ${GMX_DIRS}; do + cd "${S}-${x}" + emake DESTDIR="${D}" install || die "emake install for ${x} failed" + use mpi || continue + cd "${S}-${x}_mpi" + emake DESTDIR="${D}" install-mdrun || die "emake install-mdrun for ${x} failed" + done + + sed -n -e '/^GMXBIN/,/^GMXDATA/p' "${ED}"/usr/bin/GMXRC.bash > "${T}/80gromacs" + doenvd "${T}/80gromacs" + rm -f "${ED}"/usr/bin/GMXRC* + + dobashcompletion "${ED}"/usr/bin/completion.bash ${PN} + if use zsh-completion ; then + insinto /usr/share/zsh/site-functions + newins "${ED}"/usr/bin/completion.zsh _${PN} + fi + rm -f "${ED}"/usr/bin/completion.* + + # Fix typos in a couple of files. + sed -e "s:+0f:-f:" -i "${ED}"usr/share/gromacs/tutor/gmxdemo/demo \ + || die "Failed to fixup demo script." + + cd "${S}" + dodoc AUTHORS INSTALL README + if use doc; then + dodoc "${DISTDIR}/manual-${MANUAL_PV}.pdf" + dohtml -r "${ED}usr/share/gromacs/html/" + fi + rm -rf "${ED}usr/share/gromacs/html/" +} + +pkg_postinst() { + env-update && source /etc/profile + elog + elog "Please read and cite:" + elog "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). " + elog "http://dx.doi.org/10.1021/ct700301q" + elog + bash-completion_pkg_postinst + elog + elog $(g_luck) + elog "For more Gromacs cool quotes (gcq) add luck to your .bashrc" + elog +} diff --git a/sci-chemistry/gromacs/gromacs-4.5.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.5.9999.ebuild new file mode 100644 index 000000000..fac433946 --- /dev/null +++ b/sci-chemistry/gromacs/gromacs-4.5.9999.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +LIBTOOLIZE="true" +TEST_PV="4.0.4" +MANUAL_PV="4.5-beta2" + +EGIT_REPO_URI="git://git.gromacs.org/gromacs" +EGIT_BRANCH="release-4-5-patches" + +inherit autotools bash-completion eutils fortran git multilib toolchain-funcs + +DESCRIPTION="The ultimate molecular dynamics simulation package" +HOMEPAGE="http://www.gromacs.org/" +SRC_URI="test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-${TEST_PV}.tgz ) + doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${MANUAL_PV}.pdf )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="X blas dmalloc doc -double-precision +fftw fkernels +gsl lapack +mpi +single-precision static static-libs test +threads +xml zsh-completion" + +DEPEND="app-shells/tcsh + X? ( x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE ) + dmalloc? ( dev-libs/dmalloc ) + blas? ( virtual/blas ) + fftw? ( sci-libs/fftw:3.0 ) + gsl? ( sci-libs/gsl ) + lapack? ( virtual/lapack ) + mpi? ( virtual/mpi ) + xml? ( dev-libs/libxml2 )" + +RDEPEND="${DEPEND}" + +RESTRICT="test" + +QA_EXECSTACK="usr/lib/libgmx.so.* + usr/lib/libgmx_d.so.*" + +use static && QA_EXECSTACK="$QA_EXECSTACK usr/bin/*" + +pkg_setup() { + if use fkernels; then + FORTRAN="g77 gfortran ifc" + fortran_pkg_setup + else + FORTRANC="" + fi +} + +src_prepare() { + + ( use single-precision || use double-precision ) || \ + die "Nothing to compile, enable single-precision and/or double-precision" + + if use mpi && use threads; then + elog "mdrun uses only threads OR mpi, and gromacs favours the" + elog "use of mpi over threads, so a mpi-version of mdrun will" + elog "be compiled. If you want to run mdrun on shared memory" + elog "machines only, you can safely disable mpi" + fi + + if use static; then + use X && die "You cannot compile a static version with X support, disable X or static" + use xml && die "You cannot compile a static version with xml support + (see bug #306479), disable xml or static" + fi + epatch_user + eautoreconf + GMX_DIRS="" + use single-precision && GMX_DIRS+=" single" + use double-precision && GMX_DIRS+=" double" + for x in ${GMX_DIRS}; do + mkdir "${S}-${x}" || die + use test && cp -r "${WORKDIR}"/gmxtest "${S}-${x}" + use mpi || continue + mkdir "${S}-${x}_mpi" || die + done +} + +src_configure() { + local myconf + local myconfsingle + local myconfdouble + local suffixdouble + + #leave all assembly options enabled mdrun is smart enough to deside itself + #there so no gentoo on bluegene! + myconf="${myconf} --disable-bluegene" + + #from gromacs configure + if ! use fftw; then + ewarn "WARNING: The built-in FFTPACK routines are slow." + ewarn "Are you sure you don\'t want to use FFTW?" + ewarn "It is free and much faster..." + fi + + if [[ $(gcc-version) == "4.1" ]]; then + eerror "gcc 4.1 is not supported by gromacs" + eerror "please run test suite" + die + fi + + #note for gentoo-PREFIX on apple: use --enable-apple-64bit + + #fortran will gone in gromacs 4.1 anyway + #note for gentoo-PREFIX on aix, fortran (xlf) is still much faster + if use fkernels; then + ewarn "Fortran kernels are usually not faster than C kernels and assembly" + ewarn "I hope, you know what are you doing..." + myconf="${myconf} --enable-fortran" + else + myconf="${myconf} --disable-fortran" + fi + + # if we need external blas + if use blas; then + export LIBS="${LIBS} -lblas" + myconf="${myconf} $(use_with blas external-blas)" + fi + + # if we need external lapack + if use lapack; then + export LIBS="${LIBS} -llapack" + myconf="${myconf} $(use_with lapack external-lapack)" + fi + + # by default its better to have dynamicaly linked binaries + if use static; then + #gmx build static libs by default + myconf="${myconf} --disable-shared $(use_enable static all-static)" + else + myconf="${myconf} --disable-all-static --enable-shared $(use_enable static-libs static)" + fi + + myconf="--datadir="${EPREFIX}"/usr/share \ + --bindir="${EPREFIX}"/usr/bin \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --docdir="${EPREFIX}"/usr/share/doc/"${PF}" \ + $(use_with dmalloc) \ + $(use_with fftw fft fftw3) \ + $(use_with gsl) \ + $(use_with X x) \ + $(use_with xml) \ + $(use_enable threads) \ + ${myconf}" + + #if we build single and double - double is suffixed + if ( use double-precision && use single-precision ); then + suffixdouble="_d" + else + suffixdouble="" + fi + + if use double-precision ; then + #from gromacs manual + elog + elog "For most simulations single precision is accurate enough. In some" + elog "cases double precision is required to get reasonable results:" + elog + elog "-normal mode analysis, for the conjugate gradient or l-bfgs minimization" + elog " and the calculation and diagonalization of the Hessian " + elog "-calculation of the constraint force between two large groups of atoms" + elog "-energy conservation: this can only be done without temperature coupling and" + elog " without cutoffs" + elog + fi + + if use mpi ; then + elog "You have enabled mpi, only mdrun will make use of mpi, that is why" + elog "we configure/compile gromacs twice (with and without mpi) and only" + elog "install mdrun with mpi support. In addtion you will get libgmx and" + elog "libmd with and without mpi support." + fi + + myconfdouble="${myconf} --enable-double --program-suffix='${suffixdouble}'" + myconfsingle="${myconf} --enable-float --program-suffix=''" + for x in ${GMX_DIRS}; do + einfo "Configuring for ${x} precision" + cd "${S}-${x}" + local p=myconf${x} + ECONF_SOURCE="${S}" econf ${!p} --disable-mpi CC="$(tc-getCC)" F77="${FORTRANC}" + use mpi || continue + cd "${S}-${x}_mpi" + ECONF_SOURCE="${S}" econf ${!p} --enable-mpi CC="$(tc-getCC)" F77="${FORTRANC}" + done +} + +src_compile() { + for x in ${GMX_DIRS}; do + cd "${S}-${x}" + einfo "Compiling for ${x} precision" + emake || die "emake for ${x} precision failed" + use mpi || continue + cd "${S}-${x}_mpi" + emake mdrun || die "emake mdrun for ${x} precision failed" + done +} + +src_test() { + for x in ${GMX_DIRS}; do + local oldpath="${PATH}" + export PATH="${S}-${x}/src/kernel:${S}-{x}/src/tools:${PATH}" + cd "${S}-${x}" + emake -j1 tests || die "${x} Precision test failed" + export PATH="${oldpath}" + done +} + +src_install() { + for x in ${GMX_DIRS}; do + cd "${S}-${x}" + emake DESTDIR="${D}" install || die "emake install for ${x} failed" + use mpi || continue + cd "${S}-${x}_mpi" + emake DESTDIR="${D}" install-mdrun || die "emake install-mdrun for ${x} failed" + done + + sed -n -e '/^GMXBIN/,/^GMXDATA/p' "${ED}"/usr/bin/GMXRC.bash > "${T}/80gromacs" + doenvd "${T}/80gromacs" + rm -f "${ED}"/usr/bin/GMXRC* + + dobashcompletion "${ED}"/usr/bin/completion.bash ${PN} + if use zsh-completion ; then + insinto /usr/share/zsh/site-functions + newins "${ED}"/usr/bin/completion.zsh _${PN} + fi + rm -f "${ED}"/usr/bin/completion.* + + # Fix typos in a couple of files. + sed -e "s:+0f:-f:" -i "${ED}"usr/share/gromacs/tutor/gmxdemo/demo \ + || die "Failed to fixup demo script." + + cd "${S}" + dodoc AUTHORS INSTALL README + if use doc; then + dodoc "${DISTDIR}/manual-${MANUAL_PV}.pdf" + dohtml -r "${ED}usr/share/gromacs/html/" + fi + rm -rf "${ED}usr/share/gromacs/html/" +} + +pkg_postinst() { + env-update && source /etc/profile + elog + elog "Please read and cite:" + elog "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). " + elog "http://dx.doi.org/10.1021/ct700301q" + elog + bash-completion_pkg_postinst + elog + elog $(g_luck) + elog "For more Gromacs cool quotes (gcq) add luck to your .bashrc" + elog +} diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild index 0dcac3d92..07aae9e98 100644 --- a/sci-chemistry/gromacs/gromacs-9999.ebuild +++ b/sci-chemistry/gromacs/gromacs-9999.ebuild @@ -14,8 +14,7 @@ inherit autotools bash-completion eutils fortran git multilib toolchain-funcs DESCRIPTION="The ultimate molecular dynamics simulation package" HOMEPAGE="http://www.gromacs.org/" -SRC_URI="test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-${TEST_PV}.tgz ) - doc? ( ftp://ftp.gromacs.org/pub/manual/manual-4.0.pdf )" +SRC_URI="test? ( ftp://ftp.gromacs.org/pub/tests/gmxtest-${TEST_PV}.tgz )" LICENSE="GPL-2" SLOT="0" @@ -58,12 +57,19 @@ src_prepare() { ( use single-precision || use double-precision ) || \ die "Nothing to compile, enable single-precision and/or double-precision" + if use mpi && use threads; then + elog "mdrun uses only threads OR mpi, and gromacs favours the" + elog "use of mpi over threads, so a mpi-version of mdrun will" + elog "be compiled. If you want to run mdrun on shared memory" + elog "machines only, you can safely disable mpi" + fi + if use static; then use X && die "You cannot compile a static version with X support, disable X or static" use xml && die "You cannot compile a static version with xml support (see bug #306479), disable xml or static" fi - + epatch_user eautoreconf GMX_DIRS="" use single-precision && GMX_DIRS+=" single" @@ -189,6 +195,11 @@ src_compile() { cd "${S}-${x}" einfo "Compiling for ${x} precision" emake || die "emake for ${x} precision failed" + if use doc && [ -z "$OPTDIR" ]; then + cd src/contrib + emake options || die "emake options failed" + OPTDIR="${PWD}" + fi use mpi || continue cd "${S}-${x}_mpi" emake mdrun || die "emake mdrun for ${x} precision failed" @@ -230,10 +241,16 @@ src_install() { || die "Failed to fixup demo script." cd "${S}" - dodoc AUTHORS INSTALL README + dodoc AUTHORS INSTALL* README* if use doc; then - dodoc "${DISTDIR}/manual-4.0.pdf" dohtml -r "${ED}usr/share/gromacs/html/" + insinto /usr/share/gromacs + doins "admin/programs.txt" + ls -1 "${ED}"/usr/bin | sed -e '/_d$/d' > "${T}"/programs.list + doins "${T}"/programs.list + cd "${OPTDIR}" || die "cd "${OPTDIR}" failed" + ../../libtool --mode=install cp options "${ED}"/usr/bin/g_options \ + || die "install of g_options failed" fi rm -rf "${ED}usr/share/gromacs/html/" } @@ -250,4 +267,7 @@ pkg_postinst() { elog $(g_luck) elog "For more Gromacs cool quotes (gcq) add luck to your .bashrc" elog + if use doc; then + elog "Live Gromacs manual is available from app-doc/gromacs-manual" + fi } diff --git a/sci-chemistry/mgltools/ChangeLog b/sci-chemistry/mgltools/ChangeLog index b94dfa41f..3816d10ba 100644 --- a/sci-chemistry/mgltools/ChangeLog +++ b/sci-chemistry/mgltools/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-chemistry/mgltools -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Aug 2010; Justin Lecher <jlec@gentoo.org> mgltools-1.5.4.ebuild: + Fixed SRC_URI + 19 May 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> mgltools-1.5.4.ebuild: need tk USE for imaging diff --git a/sci-chemistry/mgltools/Manifest b/sci-chemistry/mgltools/Manifest index 6fb3c143c..d23c15413 100644 --- a/sci-chemistry/mgltools/Manifest +++ b/sci-chemistry/mgltools/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST mgltools_source_1.5.4.tar.gz 21591865 RMD160 faa158477c4e9156ee5fd23b89251e5bedbd689d SHA1 3b3056a75cd944a4aa46771e09916a4e85052b88 SHA256 d0c614e167512bd19127c741cb2d9860443c097f7ccf0bbe244c0b155e59a9c2 -EBUILD mgltools-1.5.4.ebuild 1070 RMD160 9f71733be0d49be5247778b956d136cfe3eaff73 SHA1 954c8f667b4a9d32fb97db95a241d3ae1a2fca81 SHA256 c7779b3a7db2a343736c0ec51c7275560934e49dc7c8684e5570d4b1cc984fd2 -MISC ChangeLog 380 RMD160 c7912b316aa056d9c3ef732b2c94391c55af791b SHA1 b90e7d041a5829efacdb7ae6a07468bcac612012 SHA256 543a5a53dc925fc084b08158a41d514fe34daabc31467e58b4ce28975a1d7b08 +EBUILD mgltools-1.5.4.ebuild 1208 RMD160 4fbbfe07816b55b301c1121f5800ee1a03e95480 SHA1 6fd0902f8f321dbe7b832b4d12387a3c4c0916f8 SHA256 ba88ee81ed57aaf9033665f6f9670a4d6bc7a8655cb35490e478cff42abf0378 +MISC ChangeLog 467 RMD160 16cd2904439e08b4184b7203c81b419e7e29148e SHA1 f3b6e7c86c213574e574f9c1c959e5edeccee489 SHA256 1eec2123df8f76340db18a927b6faa385a11eb7675002b33e936a3184594400a MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkx7+cMACgkQgAnW8HDreRZ5vwCdHl28txiWlkozGbyQreBL9tY/ +VLMAoMDt+eKnMLkZdUaTpxpB67MhoEy+ +=LpO+ +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/mgltools/mgltools-1.5.4.ebuild b/sci-chemistry/mgltools/mgltools-1.5.4.ebuild index b61f846c1..0024777b3 100644 --- a/sci-chemistry/mgltools/mgltools-1.5.4.ebuild +++ b/sci-chemistry/mgltools/mgltools-1.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -11,7 +11,10 @@ PLUGINS="autodocktools bhtree cmolkit dejavu geomutils gle mglutil molkit networ DESCRIPTION="Software to visualization and analysis of molecular structures" HOMEPAGE="http://mgltools.scripps.edu/" #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz" -SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz" +SRC_URI=" + http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz + http://91.191.147.225/~jlec/distfiles/mgltools_source_${PV}.tar.gz + http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz" LICENSE="MGLTOOLS" SLOT="0" diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog index d31d54cae..277e5c70a 100644 --- a/sci-chemistry/nmrpipe/ChangeLog +++ b/sci-chemistry/nmrpipe/ChangeLog @@ -2,6 +2,37 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*nmrpipe-5.4.2010.250.17.50-r1 (13 Sep 2010) + + 13 Sep 2010; Justin Lecher <jlec@gentoo.org> + -nmrpipe-5.4.2010.250.17.50.ebuild, +nmrpipe-5.4.2010.250.17.50-r1.ebuild: + Some scripts are in the wrong place + +*nmrpipe-5.4.2010.250.17.50 (10 Sep 2010) + + 10 Sep 2010; Justin Lecher <jlec@gentoo.org> + -files/5.4.2010.221.16.40-lib.patch, -nmrpipe-5.4.2010.221.16.40.ebuild, + +files/5.4.2010.250.17.50-lib.patch, +nmrpipe-5.4.2010.250.17.50.ebuild: + Version Bump + +*nmrpipe-5.4.2010.221.16.40 (04 Sep 2010) + + 04 Sep 2010; Justin Lecher <jlec@gentoo.org> + -files/5.0.2010.190.16.49-lib.patch, -nmrpipe-5.0.2010.190.16.49.ebuild, + +files/5.4.2010.221.16.40-lib.patch, +nmrpipe-5.4.2010.221.16.40.ebuild: + Version Bump + + 04 Sep 2010; Justin Lecher <jlec@gentoo.org> + -files/5.0.2010.176.15.02-lib.patch, +files/5.0.2010.190.16.49-lib.patch, + files/env-nmrpipe-new, metadata.xml: + Fixed patch + +*nmrpipe-5.0.2010.190.16.49 (12 Jul 2010) + + 12 Jul 2010; Justin Lecher <jlec@gentoo.org> + -nmrpipe-5.0.2010.176.15.02.ebuild, +nmrpipe-5.0.2010.190.16.49.ebuild: + Version BUmp + *nmrpipe-5.0.2010.176.15.02 (28 Jun 2010) 28 Jun 2010; Justin Lecher <jlec@gentoo.org> diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest index 914a431e3..e4540b32c 100644 --- a/sci-chemistry/nmrpipe/Manifest +++ b/sci-chemistry/nmrpipe/Manifest @@ -1,22 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 5.0.2010.176.15.02-lib.patch 997 RMD160 09e9dbed8e1e2e4964bdf381a15b556d0ea9f3bb SHA1 881a3554f21fb23973e0b8a31b59cff495f5edbb SHA256 011aea3e38ef3eb650be7b5d6274913bbb4f5367838f4bb86f97556ad247b57f +AUX 5.4.2010.250.17.50-lib.patch 997 RMD160 09e9dbed8e1e2e4964bdf381a15b556d0ea9f3bb SHA1 881a3554f21fb23973e0b8a31b59cff495f5edbb SHA256 011aea3e38ef3eb650be7b5d6274913bbb4f5367838f4bb86f97556ad247b57f AUX env-nmrpipe-new 597 RMD160 6948506b9106af33ecd1d7aefce5bb1b9a1f3e1d SHA1 df74a34eab52ed3b4007cf2a33a8b2ccacf50938 SHA256 9cdf0ebfb771c04ff8e38b94ad29cd18e349f76ee6604e07d4b7567621c6be46 -DIST NMRPipeX.tZ 123739972 RMD160 5005df92b9a0c1b07ca0fcdad88f0e4cfa189702 SHA1 546f989dd79ff971e2c4c9fa4cd043825c9708a5 SHA256 99cd8fe1b53724c536651ddda66a2f00720b9fea4e08c48bc5d24128ee860c05 +DIST NMRPipeX.tZ 117311973 RMD160 b169778c5aed623f9216ba7e1f81eb433043c91b SHA1 74644f328e775bd26281e46a6841e8479d76178d SHA256 a8d852da6debe608d702468b1b67a810e505b2e67cf7a793ac4ac9c802420477 DIST acme.tar.Z 11681951 RMD160 fdcf35fab1b63ddda55288b1b2ed0f82c8299bef SHA1 5093f92a4d7e4173bc056b6b1922a6da8e6bbf0c SHA256 5713452a1461e636f0de48e5ce3476fc0ae60b3f78a0288744f45e455f3445d9 -DIST binval.com 3654 RMD160 60f7b8e13ef48dc22822beb2fd107beac25db300 SHA1 fdd8d2a2b9b6f57ad9d2ebac84b15e428478d261 SHA256 0ab49d267a3b947f31024e3eae281101b7002a64a801b36f1671bd79e8ef5a9d -DIST dyn.tZ 137459867 RMD160 e2656774981984c0a08d826ae1a8f15593612bb5 SHA1 3d0ec4b2eee9c9a167fc65cd16427db032f4340a SHA256 b8502141482b522e3ed5c92e2cf3e3572630fd876751b6e3dffe743039704c0f +DIST binval.com 3807 RMD160 263195035981216833da16afa4dcea568ba06303 SHA1 d90062ee85c77157e421fd684e32d59a3118c6f9 SHA256 349a6b3b3bac0f82d645a44ee6073b95b9ad9573c548367a3528d32cf0c5694e +DIST dyn.tZ 137796769 RMD160 9d492341eb6e27cf8864e13751bc2fa3defebd98 SHA1 4b14503e147342a9ce8090e65a57e561a9e8539a SHA256 de369b4eefd9f8a00a8e75ab9eea3c369b40eabbef3833fb5460e4d0a3dca52a DIST install.com 36561 RMD160 7a7cae57e470f5637106a895d1a2ace486bb33a9 SHA1 2c296e0aadb14735253891f2cf5a451b98638581 SHA256 af5977a3c165d5552f5fad43a9cd9e303adc72b85011e284e28cc2cdd04bd160 -DIST talos.tZ 36993914 RMD160 4823f0d0357cd93ac326b3912adab82a76a16f90 SHA1 9b3966bd619275ed97d17d9bbc862246aae01641 SHA256 bb130df152e445d7713809e724018c92a46bf1950cfd10c68072af515bbdbebf +DIST talos.tZ 37070217 RMD160 4a33a947fbcfa21b9f9c47ed51b0737e7c14ad01 SHA1 ae1865e1b56cb73fd4821b000af3773920d9b5d6 SHA256 3a8a5e18ee08bb99134fa2259825c606cdd9ff459c12772d8d4d6cbbcc44feda DIST valpha_all.tar 699166720 RMD160 75ebf0a84524212cd25d62ba33f6a5edca05dd20 SHA1 a8be07ac97a826e44ed240946217a50fd3e8ba1e SHA256 3f2ff243e1d0e2508f20ec1ab6108eb986bcc1bc4c9ec79b4ff8ce6584805b0a -EBUILD nmrpipe-5.0.2010.176.15.02.ebuild 4719 RMD160 26662a5dd8124fdd97390d66db513e6f486d241c SHA1 153e8996bd65294b7ea7c94b410eec38600ce093 SHA256 c969db73a557ec5343767834f061582cab94e9e7ab32dfcc849750e43ef410dd -MISC ChangeLog 6106 RMD160 6f246c7ebb3fc5c8f0ddadf4dca030f294f00618 SHA1 ff5b749c9735a199fddcb38d93295a35de98f8b9 SHA256 b45799c353cfded59ad1371e1629d3345152c75a196be79c4ea312d0f91bc043 -MISC metadata.xml 263 RMD160 6a7463bafc4f1e7df75d12fc57c693ad582d58fa SHA1 e38c1eecffc0f52395d69359a9e3dd1114bcf550 SHA256 31cd25872ef5bc46e50dd04eb523bd093d07797f39b072177df59690a4fc07a3 +EBUILD nmrpipe-5.4.2010.250.17.50-r1.ebuild 4785 RMD160 15247937be92830e8cb1df188a1c9d868eb9d6af SHA1 a947c8302dddaded500709e5d03a83fd8a40d304 SHA256 ea59dabd1479e8252247f873cdbadc815c9412adb27887bce949a58c41681895 +MISC ChangeLog 7184 RMD160 a46414ded0a64b7f7302ab2f7871ab0c6fc4807b SHA1 50b24e22e94f2cfe276aff3e478b80495b1651df SHA256 c396b1dc45320013f7850e8820f1ee93b70195c22f245e68a9d6c5e8d7d87b0c +MISC metadata.xml 249 RMD160 789eca813b850a4619f671586826b824098ec47b SHA1 554c0cc8335f6d6410f6f504bf032a7c6de36c89 SHA256 c3f71fe107b700acc3c21923ed360604cfd47ac3181d9ed7605a0472250a8064 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkwoXDYACgkQgAnW8HDreRbKYwCfYntP/MCjQWbLph/IlvmmCPB6 -m/sAoKe72JwsoYwO1ATMRe2/kpk0ylrv -=Ot0w +iEYEARECAAYFAkyN/JIACgkQgAnW8HDreRaxvACgqFHdaAwBJRshfl2nRAP//9Cp +rPoAn3Izb6zm7bDQLayqpzf/30BRGol2 +=hnNS -----END PGP SIGNATURE----- diff --git a/sci-chemistry/nmrpipe/files/5.0.2010.176.15.02-lib.patch b/sci-chemistry/nmrpipe/files/5.4.2010.250.17.50-lib.patch index 91abd611d..91abd611d 100644 --- a/sci-chemistry/nmrpipe/files/5.0.2010.176.15.02-lib.patch +++ b/sci-chemistry/nmrpipe/files/5.4.2010.250.17.50-lib.patch diff --git a/sci-chemistry/nmrpipe/metadata.xml b/sci-chemistry/nmrpipe/metadata.xml index 27e626a3f..8487320ca 100644 --- a/sci-chemistry/nmrpipe/metadata.xml +++ b/sci-chemistry/nmrpipe/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>maintainer-wanted</herd> + <herd>sci</herd> <maintainer> <email>jlec@gentoo.org</email> <name>Justin Lecher</name> diff --git a/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.176.15.02.ebuild b/sci-chemistry/nmrpipe/nmrpipe-5.4.2010.250.17.50-r1.ebuild index 9a382d6a5..137a90d75 100644 --- a/sci-chemistry/nmrpipe/nmrpipe-5.0.2010.176.15.02.ebuild +++ b/sci-chemistry/nmrpipe/nmrpipe-5.4.2010.250.17.50-r1.ebuild @@ -139,6 +139,9 @@ src_install() { > env-${PN}-new newenvd env-${PN}-new 40${PN} || die "Failed to install env file." + # Some scripts are on the wrong place + cp -vf nmrtxt/*.com com/ + insinto ${NMRBASE} doins -r * || die "Failed to install application." diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog index cd9e2567d..419cb6887 100644 --- a/sci-chemistry/simpson/ChangeLog +++ b/sci-chemistry/simpson/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*simpson-3.0.1 (11 Aug 2010) + + 11 Aug 2010; Justin Lecher <jlec@gentoo.org> -files/2.0.0-gentoo.patch, + +simpson-3.0.1.ebuild, +files/3.0.1-gentoo.patch, +files/3.0.1-type.patch, + -simpson-2.0.0.ebuild: + Version Bump, removed old + *simpson-2.0.0 (11 May 2010) 11 May 2010; Justin Lecher <jlec@gentoo.org> +files/2.0.0-gentoo.patch, diff --git a/sci-chemistry/simpson/Manifest b/sci-chemistry/simpson/Manifest index dae36803c..54e47234e 100644 --- a/sci-chemistry/simpson/Manifest +++ b/sci-chemistry/simpson/Manifest @@ -1,15 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 2.0.0-gentoo.patch 20488 RMD160 e35672edc19cad1d51842c03dedbed25bfda3a15 SHA1 0ca15aa3af0f4aec6a19e02bd0932b5e8d5e4146 SHA256 15253e209c6772986f93259546341ec768c7602693fc49224008a859bdf4dc2f -DIST simpson-2.0.0.tar.gz 1152963 RMD160 c7dd798880b8e77544d015a31ddf1d49f19ace6c SHA1 d81836ff80f10cfe1631cc285a63b95092fddda6 SHA256 8a2af8f51e85dcd3eeb958624edfae10608fd4973b27613ffad69beab6abbde7 -EBUILD simpson-2.0.0.ebuild 977 RMD160 fcb53f922a773d4ac337fd396eea394004e792c6 SHA1 383fdd63ec1558e27cf6f60e1ecd2675bfc6ec20 SHA256 21b30f17e3957d11db24bd756935cc5500039ac702ac42e364de5e1a717916f9 -MISC ChangeLog 282 RMD160 da4ff8b8d9d90674382d3d9a3e38c735935a8ed9 SHA1 e41dac2c6c4de9ff56d580b6a5d73c3b1af93340 SHA256 42ffb9faeab125d13249811343b99b05fa52505b2b058802fea681f8ea8c9cc5 +AUX 3.0.1-gentoo.patch 716 RMD160 9c90f3c9deee8a0ff1f583a34fcc1bd3d55fdbbf SHA1 472288c2c041d66aed13212958a765325d5e735f SHA256 cc85cdd872b7f60288037ada586f8373b0b2f6c7dfa9af122d0143c489dbb4df +AUX 3.0.1-type.patch 2600 RMD160 97b061cfa1a1fd5b3ebc9c7d597135122b552b2d SHA1 6c79eb9e92d40524e326263e218f5d90580753df SHA256 c079575af39c32cd58223be2356b9bed56ad5eb8a75900d06571ee0d2beddc81 +DIST simpson-source-3.0.1.tgz 383619 RMD160 8d596831d5f413cd5c18a984b965e8171a5b5da7 SHA1 7d9f219da1c146642e80350d8ea54570a462118a SHA256 77c5946b4a02b4e743b11dae4514935a2a66f4ed12e700845ccb49ee4c56ed17 +EBUILD simpson-3.0.1.ebuild 925 RMD160 4d98d3513874ea1b978468b6e42102854dbc9a7b SHA1 ff9c6f9174540c466af15a4dd5157f6d5ad9336e SHA256 1bb187ce58c62c396d7a1c85dd5d70d171e5be1422cdfcf22af5a97e1d93712a +MISC ChangeLog 517 RMD160 d2c39cd8046975fcaf4167659d243df463a5be09 SHA1 f53468c963b83ecb04fd6fa86e1854971e86758a SHA256 0e1a8417d6604617b5fd703b01fec2781c52094aebc730d90b7263c3457b2c1a MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvpMmUACgkQgAnW8HDreRZjDwCgjgSaSiGgeABI2gN1foqCcy6J -q+4Ani3Q6KcITpgp9TT+c1B7yfpogKQF -=y6+x +iEYEARECAAYFAkxjCPoACgkQgAnW8HDreRbejQCcCMTqtWKthtiNMJSFQXF0e2p9 +8GwAoISRI98e2unpNdlapfEkhFPA4sOu +=+Sl7 -----END PGP SIGNATURE----- diff --git a/sci-chemistry/simpson/files/2.0.0-gentoo.patch b/sci-chemistry/simpson/files/2.0.0-gentoo.patch deleted file mode 100644 index c61fe4342..000000000 --- a/sci-chemistry/simpson/files/2.0.0-gentoo.patch +++ /dev/null @@ -1,761 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index b4cee2c..ee97cc6 100755 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - EXTRA_DIST = autogen.sh div.m4 - --SUBDIRS = f2c $(SUBDIR_ADD) simpson cryst -+SUBDIRS = $(SUBDIR_ADD) simpson cryst - - bindist: bindistdir - -chmod -R a+r $(BINDISTDIR) -diff --git a/config.h.in b/config.h.in -index b1e9a27..d078f0b 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -24,6 +24,12 @@ - /* Disable networking */ - #undef DISABLE_NETWORK - -+/* #undef ENABLE_MINUIT */ -+#undef ENABLE_MINUIT -+ -+/* #undef ENABLE_SIMMOL */ -+#undef ENABLE_SIMMOL -+ - /* Compile with Tk support */ - #undef ENABLE_TK - -@@ -33,6 +39,12 @@ - /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ - #undef HAVE_DOPRNT - -+/* #undef HAVE_F_EXIT */ -+#undef HAVE_F_EXIT -+ -+/* #undef HAVE_GETLINE */ -+#undef HAVE_GETLINE -+ - /* Define to 1 if you have the <inttypes.h> header file. */ - #undef HAVE_INTTYPES_H - -@@ -66,6 +78,9 @@ - /* Define to 1 if you have the <memory.h> header file. */ - #undef HAVE_MEMORY_H - -+/* #undef HAVE_POW_DI */ -+#undef HAVE_POW_DI -+ - /* Define to 1 if you have the <stdint.h> header file. */ - #undef HAVE_STDINT_H - -@@ -105,9 +120,15 @@ - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT - -+/* #undef PACKAGE_DATA_DIR */ -+#undef PACKAGE_DATA_DIR -+ - /* Define to the full name of this package. */ - #undef PACKAGE_NAME - -+/* #undef PACKAGE_SOURCE_DIR */ -+#undef PACKAGE_SOURCE_DIR -+ - /* Define to the full name and version of this package. */ - #undef PACKAGE_STRING - -@@ -120,15 +141,27 @@ - /* Make the code multithreaded */ - #undef PARALLEL - -+/* #undef PIVOT_PHASE */ -+#undef PIVOT_PHASE -+ - /* Define as the return type of signal handlers (`int' or `void'). */ - #undef RETSIGTYPE - --/* Enable serverlogging */ -+/* #undef REVERSEBYTES */ -+#undef REVERSEBYTES -+ -+/* #undef SECURE_SERVER */ -+#undef SECURE_SERVER -+ -+/* #undef SERVER_LOGGING */ - #undef SERVER_LOGGING - - /* Define to 1 if you have the ANSI C header files. */ - #undef STDC_HEADERS - -+/* #undef USEPORT64 */ -+#undef USEPORT64 -+ - /* Version number of package */ - #undef VERSION - -diff --git a/configure.in b/configure.in -index dfc3817..a86da05 100755 ---- a/configure.in -+++ b/configure.in -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(configure.in,minuit/minuit/minuit/d506cm.inc) - AM_INIT_AUTOMAKE(simpson,2.0.0) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - builtin(include,div.m4) - dnl Checks for host-type. -@@ -10,7 +10,7 @@ BINDISTDIR=simpson-$VERSION-$host - AC_SUBST(BINDISTDIR) - - dnl Checks for programs. --AC_ISC_POSIX -+AC_SEARCH_LIBS([strerror],[cposix]) - AC_PROG_CC - AC_PROG_CXX - AM_PROG_LIBTOOL -@@ -21,7 +21,7 @@ AC_HEADER_STDC - AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_PROG_LN_S --AC_PROG_RANLIB -+#AC_PROG_RANLIB - AC_CHECK_PROGS(TAR, gtar tar) - AC_CHECK_PROGS(F77, g77 f77) - -@@ -30,17 +30,17 @@ AC_CHECK_LIB(m, sqrt) - AC_CHECK_LIB(g2c, log, have_g2c=1, have_g2c=0) - if test "$have_g2c" = 1; then - LIBG2C=-lg2c -- AC_CHECK_LIB(g2c, pow_di, AC_DEFINE(HAVE_POW_DI)) -+ AC_CHECK_LIB(g2c, pow_di, AC_DEFINE([HAVE_POW_DI],,[#undef HAVE_POW_DI])) - fi - AC_CHECK_LIB(f2c, log, have_f2c=1, have_f2c=0) - if test "$have_f2c" = 1; then - LIBG2C=-lf2c -- AC_CHECK_LIB(f2c, pow_di, AC_DEFINE(HAVE_POW_DI)) -+ AC_CHECK_LIB(f2c, pow_di, AC_DEFINE([HAVE_POW_DI],,[#undef HAVE_POW_DI])) - fi - AC_CHECK_LIB(gfortran, log, have_gfortran=1, have_gfortran=0) - if test "$have_gfortran" = 1; then - LIBG2C=-lgfortran -- AC_CHECK_LIB(gfortran, pow_di, AC_DEFINE(HAVE_POW_DI)) -+ AC_CHECK_LIB(gfortran, pow_di, AC_DEFINE([HAVE_POW_DI],,[#undef HAVE_POW_DI])) - fi - AC_SUBST(LIBG2C) - AC_CHECK_LIB(g2c, main) -@@ -61,14 +61,14 @@ AC_SUBST(LIB_SOCKET) - - - LIBLAPACK="" --AC_CHECK_LIB(lapack, zgeev, have_lapack=1, have_lapack=0) -+AC_CHECK_LIB(lapack, zgeev_, have_lapack=1, have_lapack=0) - if test "$have_lapack" = 1; then - LIBLAPACK=-llapack - fi - AC_SUBST(LIBLAPACK) - - LIBBLAS= --AC_CHECK_LIB(blas, cscal, have_blas=1, have_blas=0) -+AC_CHECK_LIB(blas, cscal_, have_blas=1, have_blas=0) - if test "$have_blas" = 1; then - LIBBLAS=-lblas - fi -@@ -85,7 +85,7 @@ if test "$have_fexit" = 0; then - AC_CHECK_LIB(gfortran, f_exit, have_fexit=1, have_fexit=0) - fi - if test "$have_fexit" = 1; then -- AC_DEFINE(HAVE_F_EXIT) -+ AC_DEFINE(HAVE_F_EXIT,,[#undef HAVE_F_EXIT]) - fi - - AC_CHECK_LIB(g2c, pow_di, have_powdi=1, have_powdi=0) -@@ -96,11 +96,11 @@ if test "$have_powdi" = 0; then - AC_CHECK_LIB(gfortran, pow_di, have_powdi=1, have_powdi=0) - fi - if test "$have_fexit" = 1; then -- AC_DEFINE(HAVE_F_EXIT) -+ AC_DEFINE([HAVE_F_EXIT],,[#undef HAVE_F_EXIT]) - fi - - dnl Checks for header files. --#AC_STDC_HEADERS -+#AC_HEADER_STDC - #AC_CHECK_HEADERS(malloc.h) - - dnl Checks for typedefs, structures, and compiler characteristics. -@@ -113,7 +113,7 @@ dnl Checks for library functions. - AC_TYPE_SIGNAL - AC_FUNC_VPRINTF - AC_CHECK_FUNCS(strstr strtod strtol) --AC_CHECK_FUNC(getline, AC_DEFINE(HAVE_GETLINE)) -+AC_CHECK_FUNC(getline, AC_DEFINE([HAVE_GETLINE],,[#undef HAVE_GETLINE])) - - dnl Use -Wall if we have gcc. - changequote(,)dnl -@@ -124,7 +124,13 @@ if test "x$GCC" = "xyes"; then - esac - fi - changequote([,])dnl --AC_CYGWIN -+ -+AC_CANONICAL_HOST -+case $host_os in -+ *cygwin* ) CYGWIN=yes;; -+ * ) CYGWIN=no;; -+esac -+ - AC_OBJEXT - AC_EXEEXT - -@@ -133,14 +139,14 @@ SC_PATH_TCLCONFIG - SC_LOAD_TCLCONFIG - SC_PUBLIC_TCL_HEADERS - --AC_ARG_WITH(tklib, [ --with-tklib Build with Tk support], enable_tk="no", enable_tk="yes") -+AC_ARG_ENABLE([tklib], AS_HELP_STRING([--enable-tklib],[Build with Tk support])) - --if test x$enable_tk = xyes; then -+AS_IF([test "x$enable_tklib" = "xyes"], [ - AC_DEFINE([ENABLE_TK], 1, [Compile with Tk support]) - SC_PATH_TKCONFIG - SC_LOAD_TKCONFIG - SC_PUBLIC_TK_HEADERS --fi -+]) - - SUBDIR_ADD="" - -@@ -186,51 +192,42 @@ fi - AC_ARG_ENABLE(serverlog, [ --enable-serverlog Enable server logging], enable_serverlog="yes", enable_serverlog="no") - - if test x"${enable_serverlog}" = xyes; then -- AC_DEFINE([SERVER_LOGGING], 1, [Enable serverlogging]) -+ AC_DEFINE([SERVER_LOGGING], 1, [#undef SERVER_LOGGING]) - fi - - --AC_ARG_ENABLE(parallel, [ --enable-parallel Create multithreaded code], enable_parallel="yes", enable_parallel="no") -+AC_ARG_ENABLE([parallel], AS_HELP_STRING([--enable-parallel],[Create multithreaded code])) - --if test x"${enable_parallel}" = xyes; then -+AS_IF([test "x$enable_parallel" = "xyes"], [ - AC_DEFINE([PARALLEL], 1, [Make the code multithreaded]) --fi -+]) - - - - --AC_ARG_WITH(simplot,[ --without-simplot Do not compile the SIMPLOT program], simplot="no", simplot="yes") -+AC_ARG_ENABLE([simplot], AS_HELP_STRING([--enable-simplot],[Do not compile the SIMPLOT program])) - --if test x$simplot = xyes; then -+AS_IF([test "x$enable_simplot" = "xyes"], [ - -- AM_PATH_GTK(1.2.0, , -- if test x"${ac_cv_cygwin}" = x"yes" ; then -- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path? -- -- Optionally use './configure --without-simplot' and compile simplot -- manually with the makefile 'simplot/Makefile.win32' configured properly. -- ) -- else -- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?) -- fi -- ) -+ PKG_PROG_PKG_CONFIG -+ PKG_CHECK_MODULES([GTK], [gtk+]) - dnl Set PACKAGE_DATA_DIR in config.h. - if test "x${datadir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then -- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}") -+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}",[#undef PACKAGE_DATA_DIR]) - else -- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}") -+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}",[#undef PACKAGE_DATA_DIR]) - fi - else -- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") -+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}",[#undef PACKAGE_DATA_DIR]) - fi - - dnl Set PACKAGE_SOURCE_DIR in config.h. - packagesrcdir=`cd $srcdir && pwd` -- AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") -+ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}",[#undef PACKAGE_SOURCE_DIR]) - - SUBDIR_ADD="${SUBDIR_ADD} simplot" --fi -+]) - - if test -z "$TARGET"; then - test -f ./config.guess && TARGET=`sh ./config.guess` 2>/dev/null -@@ -241,17 +238,26 @@ else - your target specification; this may cause problems later on...) - fi - --case $TARGET in -+AC_CANONICAL_HOST -+case $host in - mips-dec-*) REVERSEBYTES="yes";; - i386-*) REVERSEBYTES="yes";; - i486-*) REVERSEBYTES="yes";; - i586-*) REVERSEBYTES="yes";; - i686-*) REVERSEBYTES="yes";; -+x86_64-*) REVERSEBYTES="yes"; USEPORT64="yes";; - *) REVERSEBYTES="no";; - esac -+ -+echo "host is $host" - echo "Reverse byte order...$REVERSEBYTES" -+ - if test x$REVERSEBYTES = xyes; then -- AC_DEFINE_UNQUOTED(REVERSEBYTES, 1) -+ AC_DEFINE_UNQUOTED([REVERSEBYTES], 1,[#undef REVERSEBYTES]) -+fi -+# if building on 64bits architecture then change the default port to 3264 -+if test x$USEPORT64 = xyes; then -+ AC_DEFINE([USEPORT64], 1,[#undef USEPORT64]) - fi - - -@@ -268,7 +274,7 @@ if test x$minuit = xyes; then - AC_MSG_WARN(You must have a Fortran compiler to compile minuit) - fi - SUBDIR_ADD="${SUBDIR_ADD} minuit" -- AC_DEFINE_UNQUOTED(ENABLE_MINUIT, 1) -+ AC_DEFINE_UNQUOTED([ENABLE_MINUIT], 1, [#undef ENABLE_MINUIT ]) - MINUIT_LIB="../minuit/minuit/code/libminuit.a" - fi - -@@ -276,19 +282,20 @@ AC_ARG_WITH(simmol, [ --without-simmol Build with simmol], enable_sim - - if test x$enable_simmol = xyes; then - SUBDIR_ADD="${SUBDIR_ADD} simmol" -- AC_DEFINE_UNQUOTED(ENABLE_SIMMOL,1) -+ AC_DEFINE_UNQUOTED(ENABLE_SIMMOL,1,[#undef ENABLE_SIMMOL]) - fi -+AM_CONDITIONAL([ENABLE_SIMBIO], [test x$enable_simmol = xyes]) - - AC_ARG_WITH(secureserver, [ --without-secureserver Do not overrule dangerous tcl-commands], secure="no", secure="yes") - - if test x$secure = xyes; then -- AC_DEFINE_UNQUOTED(SECURE_SERVER, 1) -+ AC_DEFINE_UNQUOTED(SECURE_SERVER, 1,[#undef SECURE_SERVER]) - fi - - AC_ARG_WITH(pivotphasing, [ --with-pivotphasing Enable vnmr pivot phasing], pivot="yes", pivot="no") - - if test x$pivot = xyes; then -- AC_DEFINE_UNQUOTED(PIVOT_PHASE, 1) -+ AC_DEFINE_UNQUOTED(PIVOT_PHASE, 1,[#undef PIVOT_PHASE]) - fi - - AC_SUBST(SUBDIR_ADD) -@@ -296,9 +303,8 @@ AC_SUBST(MINUIT_LIB) - AC_SUBST(GD_LIB) - AC_SUBST(BUILDLIBSIMPSON) - --AC_OUTPUT([Makefile -+AC_CONFIG_FILES([Makefile - cryst/Makefile -- f2c/Makefile - simpson/Makefile - simplot/Makefile - simmol/Makefile -@@ -309,5 +315,6 @@ AC_OUTPUT([Makefile - gd1.4/Makefile - vnmrtools/Makefile - ]) -+AC_OUTPUT - - -diff --git a/simmol/Makefile.am b/simmol/Makefile.am -index 4d61920..632feba 100644 ---- a/simmol/Makefile.am -+++ b/simmol/Makefile.am -@@ -1,7 +1,7 @@ - INCLUDES = $(TCL_INCLUDES) -I../minuit - LIBS = $(TCL_LIBS) --CFLAGS=-g -O2 -Wall -DNO_CONST --CXXFLAGS=-g -O0 -Wall -DNO_CONST -+AM_CFLAGS=-g -O2 -Wall -DNO_CONST -+AM_CXXFLAGS=-g -O0 -Wall -DNO_CONST - bin_PROGRAMS = simmol - noinst_LIBRARIES = libsimmol.a - -diff --git a/simmol/backbone.cc b/simmol/backbone.cc -index 88261e0..c3cf714 100644 ---- a/simmol/backbone.cc -+++ b/simmol/backbone.cc -@@ -23,10 +23,10 @@ - #include <fstream> - #include <math.h> - #include <stdlib.h> --#include <fstream.h> - #include <ctype.h> - #include "euler.h" - #include "molecule.h" -+using namespace std; - - /* The distances in atomtype.h must be multiplied with 0.004 - to be converted to Aangstroems */ -diff --git a/simmol/commands.cc b/simmol/commands.cc -index 8650e1e..d6d3a18 100644 ---- a/simmol/commands.cc -+++ b/simmol/commands.cc -@@ -31,6 +31,7 @@ - #include "descriptor.h" - #include "vector3.h" - #include "molecule.h" -+using namespace std; - - - int tclMload(ClientData data,Tcl_Interp* interp,int argc, char *argv[]) -diff --git a/simmol/complx.h b/simmol/complx.h -index 631ab10..09a5450 100644 ---- a/simmol/complx.h -+++ b/simmol/complx.h -@@ -24,7 +24,8 @@ - #define __COMPLX_H - - #include <math.h> --#include <iostream.h> -+#include <iostream> -+using namespace std; - - #ifdef DEFINE_MATHCONST - #define M_E 2.7182818284590452354 -diff --git a/simmol/descriptor.cc b/simmol/descriptor.cc -index 468be77..8e315b4 100644 ---- a/simmol/descriptor.cc -+++ b/simmol/descriptor.cc -@@ -21,9 +21,10 @@ - Descriptor is the internal list of allocated molecules. - */ - --#include <iostream.h> -+#include <iostream> - #include <stdlib.h> - #include "descriptor.h" -+using namespace std; - - Descriptor desc; - -diff --git a/simmol/elements.cc b/simmol/elements.cc -index 817212f..ca321ba 100644 ---- a/simmol/elements.cc -+++ b/simmol/elements.cc -@@ -19,7 +19,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - #include <iomanip> --#include <iostream.h> -+#include <iostream> - #include <math.h> - #include <ctype.h> - #include <stdlib.h> -@@ -29,6 +29,7 @@ - #include "elements.h" - #include "tensors.h" - #include "jcouplings.h" -+using namespace std; - - - int Atom::getsecondary_structuretype() -@@ -94,7 +95,7 @@ Atom::Atom(const vector<double>& p) : plane(0) - - ostream& operator << (ostream& out, const Atom& atom) - { -- char *p; -+ const char *p; - static int atomno = 1; - int flags; - -diff --git a/simmol/geomview.cc b/simmol/geomview.cc -index e0e8eef..831d316 100644 ---- a/simmol/geomview.cc -+++ b/simmol/geomview.cc -@@ -20,12 +20,13 @@ - - */ - --#include <iostream.h> -+#include <iostream> - #include <stdlib.h> - #include <math.h> - #include <ctype.h> - #include "euler.h" - #include "geomview.h" -+using namespace std; - - const char *Geomview_begin = - "(backcolor \"World\" 1.000000 1.000000 1.000000)\n" -diff --git a/simmol/geomview.h b/simmol/geomview.h -index a08d65a..8f78659 100644 ---- a/simmol/geomview.h -+++ b/simmol/geomview.h -@@ -34,8 +34,9 @@ - #include "container.h" - #endif - --#include <iostream.h> --#include <fstream.h> -+#include <iostream> -+#include <fstream> -+using namespace std; - - /* Writes a OOGL object to a file - -diff --git a/simmol/libsimmol.cc b/simmol/libsimmol.cc -index e11bd90..84cf942 100644 ---- a/simmol/libsimmol.cc -+++ b/simmol/libsimmol.cc -@@ -20,12 +20,13 @@ - - */ - --#include <iostream.h> -+#include "config.h" -+#include <iostream> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <tcl.h> --#include "config.h" -+using namespace std; - - extern void RegisterCommands_commands(Tcl_Interp* interp); - extern void RegisterCommands_primitives(Tcl_Interp* interp); -diff --git a/simmol/main.cc b/simmol/main.cc -index 0e0c615..f7f724f 100644 ---- a/simmol/main.cc -+++ b/simmol/main.cc -@@ -20,12 +20,13 @@ - - */ - --#include <iostream.h> -+#include "config.h" -+#include <iostream> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <tcl.h> --#include "config.h" -+using namespace std; - - extern void RegisterCommands_commands(Tcl_Interp* interp); - extern void RegisterCommands_primitives(Tcl_Interp* interp); -diff --git a/simmol/make.cc b/simmol/make.cc -index 3e94d66..c3c4bd2 100644 ---- a/simmol/make.cc -+++ b/simmol/make.cc -@@ -19,12 +19,11 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include <iomanip.h> -+#include <iomanip> - #include <strstream> - #include <fstream> - #include <math.h> - #include <stdlib.h> --#include <fstream.h> - #include <ctype.h> - #include <tcl.h> - #include <string.h> -@@ -35,6 +34,7 @@ - #include "tensors.h" - #include "jcouplings.h" - -+using namespace std; - - #define Cos(a) cos((a)*M_PI/360.0) - #define Sin(a) sin((a)*M_PI/360.0) -diff --git a/simmol/matrix.h b/simmol/matrix.h -index a997a61..a58fc56 100644 ---- a/simmol/matrix.h -+++ b/simmol/matrix.h -@@ -23,8 +23,10 @@ - #ifndef __MATRIX_H - #define __MATRIX_H - --#include <iostream.h> -+#include <iostream> -+#include <stdlib.h> - #include <memory.h> -+using namespace std; - - - template <class T> class matrix { -diff --git a/simmol/molecule.cc b/simmol/molecule.cc -index 0500162..c75ad52 100644 ---- a/simmol/molecule.cc -+++ b/simmol/molecule.cc -@@ -19,12 +19,11 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include <iomanip.h> -+#include <iomanip> - #include <strstream> - #include <fstream> - #include <math.h> - #include <stdlib.h> --#include <fstream.h> - #include <ctype.h> - #include <tcl.h> - #include <string.h> -@@ -34,6 +33,7 @@ - #include "descriptor.h" - #include "tensors.h" - #include "jcouplings.h" -+using namespace std; - - - #define Cos(a) cos((a)*M_PI/360.0) -diff --git a/simmol/primitives.cc b/simmol/primitives.cc -index 195af7f..df876a5 100644 ---- a/simmol/primitives.cc -+++ b/simmol/primitives.cc -@@ -28,6 +28,7 @@ - #include "vector3.h" - #include "euler.h" - #include "matrix.h" -+using namespace std; - - #define TYPE_FLOAT 3 - #define TYPE_VECTOR 1 -diff --git a/simmol/spinsys.cc b/simmol/spinsys.cc -index f811b24..06b4c75 100644 ---- a/simmol/spinsys.cc -+++ b/simmol/spinsys.cc -@@ -24,12 +24,13 @@ - */ - - #include <stdlib.h> --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+#include <iomanip> - #include <string.h> - #include <stdio.h> - #include <assert.h> - #include "spinsys.h" -+using namespace std; - - Hash::Hash(int _nlist=101) : nlist(_nlist), curr(0), nnames(0) - { -diff --git a/simmol/spinsys.h b/simmol/spinsys.h -index d863af0..4dcea0a 100644 ---- a/simmol/spinsys.h -+++ b/simmol/spinsys.h -@@ -26,8 +26,9 @@ - #ifndef __SPINSYS_H - #define __SPINSYS_H - --#include <iostream.h> -+#include <iostream> - #include <stdio.h> -+using namespace std; - - #include "atomtype.h" - const int MAX_NUC_LEN = 16; -diff --git a/simmol/vector3.cc b/simmol/vector3.cc -index f13c5ea..0376e90 100644 ---- a/simmol/vector3.cc -+++ b/simmol/vector3.cc -@@ -20,10 +20,11 @@ - - */ - --#include <iostream.h> -+#include <iostream> - #include <stdlib.h> - #include <math.h> - #include "vector3.h" -+using namespace std; - - double norm(const vector<double>& v) - { -diff --git a/simplot/Makefile.am b/simplot/Makefile.am -index a36f260..4b34100 100644 ---- a/simplot/Makefile.am -+++ b/simplot/Makefile.am -@@ -1,6 +1,6 @@ - INCLUDES = @GTK_CFLAGS@ -I../simpson - --CFLAGS=@CFLAGS_STATIC@ @CFLAGS@ -+AM_CFLAGS=@CFLAGS_STATIC@ @CFLAGS@ - LIBS=@LIBS@ @LIBS_STATIC@ $(BZLIB) - - EXTRA_DIST = simplot.glade Makefile.win32 Makefile.osx -diff --git a/simpson/Makefile.am b/simpson/Makefile.am -index b19a781..c4caed9 100644 ---- a/simpson/Makefile.am -+++ b/simpson/Makefile.am -@@ -1,8 +1,8 @@ --INCLUDES = -I../f2c $(TCL_INCLUDES) -I../minuit -+INCLUDES = -I${incudedir}/f2c $(TCL_INCLUDES) -I../minuit - TCLSRC=csafit.tcl ftools.tcl main.tcl misc.tcl simpson.tcl rfshapes.tcl - simbio_TCLSRC=csafit.tcl ftools.tcl misc.tcl simpson.tcl rfshapes.tcl simbio_main.tcl - --CFLAGS=@CFLAGS@ -DNO_CONST -+AM_CFLAGS=@CFLAGS@ -DNO_CONST - LIBS=@LIBS@ $(LIB_SOCKET) $(LIBLAPACK) $(LIBBLAS) - - EXTRA_LTLIBRARIES=libsimpson.la -@@ -52,18 +52,18 @@ simbio_SOURCES = cm.h defs.h ham.h matrix.h sim.h cryst.h tclcmd.h \ - atom.h rfshapes.h rfshapes.c OCroutines.h OCroutines.c rfprof.c - - simpson_LDADD = $(GD_LIB) $(LIBG2C) \ -- ../f2c/libf2c.a $(TCL_LIB_SPEC) $(MINUIT_LIB) -lm -+ -lf2c $(TCL_LIB_SPEC) $(MINUIT_LIB) -lm - - simbio_LIBS = @LIBS@ @LIBS_STATIC@ - simbio_LDADD = $(GD_LIB) \ -- ../f2c/libf2c.a $(TCL_LIB_SPEC) $(MINUIT_LIB) \ -+ -lf2c $(TCL_LIB_SPEC) $(MINUIT_LIB) \ - ../simmol/libsimmol.a -lm $(TK_LIB_SPEC) $(OPENGL_LIB) $(LIBG2C) - - libsimpson_la_SOURCES = $(simpson_SOURCES) - libsimpson_la_CFLAGS = -DLIBSIMPSON - libsimpson_la_LDFLAGS = -release $(VERSION) --libsimpson_la_LIBADD = ../gd1.4/libgd.a \ -- ../f2c/libf2c.a ../minuit/minuit/code/libminuit.a -+libsimpson_la_LIBADD = $(GD_LIB) \ -+ -lf2c -lminuit - - simdps_SOURCES = simdps.c simdpstcl.c - simdps_LDADD = $(TCL_LIB_SPEC) -lm -diff --git a/simpson/simpson.c b/simpson/simpson.c -index e613806..c9975d9 100644 ---- a/simpson/simpson.c -+++ b/simpson/simpson.c -@@ -85,7 +85,11 @@ void putbits(char *bits,int e) - - #ifndef DISABLE_NETWORK - -+#ifdef USEPORT64 -+#define DEFAULT_PORT 3264 -+#else - #define DEFAULT_PORT 3265 -+#endif - #define SIMPSON_ID 15273 - - #ifndef STDIN_FILENO -diff --git a/vnmrtools/Makefile.am b/vnmrtools/Makefile.am -index 79bb7c5..61084aa 100644 ---- a/vnmrtools/Makefile.am -+++ b/vnmrtools/Makefile.am -@@ -1,4 +1,4 @@ --EXTRA_DIST = README.vnmrtools create2d create2dph rt2d rt2dph savefid savespe -+EXTRA_DIST = create2d create2dph rt2d rt2dph savefid savespe - LIBS= @LIBS@ -lm - bin_SCRIPTS = create2d create2dph rt2d rt2dph savefid savespe README.vnmrtools - diff --git a/sci-chemistry/simpson/files/3.0.1-gentoo.patch b/sci-chemistry/simpson/files/3.0.1-gentoo.patch new file mode 100644 index 000000000..61d170f89 --- /dev/null +++ b/sci-chemistry/simpson/files/3.0.1-gentoo.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile b/Makefile +index c5f6fcf..25e328f 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,8 +7,9 @@ C_OBJS = *.o + #INCLUDES = -IC:/Tcl/include -I../CBLAS/src + #LIBRARIES = -lm *.dll + # LINUX: +-INCLUDES = -I/usr/include/tcl8.5 +-LIBRARIES = -lm -lgslcblas -llapack -ltcl8.5 ++INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ ++BLASLIBS = `pkg-config --libs cblas lapack` ++LIBRARIES = -lm ${BLASLIBS} -ltcl + + FLAGS = -c -O3 + CC = gcc +@@ -16,9 +17,9 @@ RM = rm + TAR = tar + + simpson: $(C_OBJS) +- $(CC) $(LIBRARIES) $(C_OBJS) -o simpson ++ $(CC) $(LDFLAGS) -o simpson $(C_OBJS) $(LIBRARIES) + $(C_OBJS): +- $(CC) $(FLAGS) $(INCLUDES) *.c ++ $(CC) $(CFLAGS) $(INCLUDES) -c *.c + clean: + $(RM) -f *.o simpson + dist: diff --git a/sci-chemistry/simpson/files/3.0.1-type.patch b/sci-chemistry/simpson/files/3.0.1-type.patch new file mode 100644 index 000000000..3f6cc7023 --- /dev/null +++ b/sci-chemistry/simpson/files/3.0.1-type.patch @@ -0,0 +1,110 @@ +diff --git a/OCroutines.c b/OCroutines.c +index eef6849..60ef56c 100644 +--- a/OCroutines.c ++++ b/OCroutines.c +@@ -11,6 +11,7 @@ + #include "iodata.h" + #include "tclutil.h" + #include "B0inhom.h" ++#include "defs_blas_lapack.h" + + /* global variable holding all OC parameters */ + OCoptPars OCpar; +diff --git a/contour.c b/contour.c +index ec5a223..87ae8ee 100644 +--- a/contour.c ++++ b/contour.c +@@ -242,7 +242,8 @@ DEFINE_CMD(FContour) + double lowcolor[3], highcolor[3], xmin, xmax, ymin, ymax; + double *levels, x1, y1, x2, y2, cl, r1, r2, fmax; + double *xpos, *ypos, **z, iratio, jratio, nlowcolor[3], nhighcolor[3]; +- char outputfile[256], **av; ++ char outputfile[256]; ++ const char **av; + FILE *file; + FD *fdp; + Point *p, **pp; +diff --git a/ftools.c b/ftools.c +index 682e475..3c150d6 100644 +--- a/ftools.c ++++ b/ftools.c +@@ -1434,7 +1434,8 @@ int tclFRms(ClientData data,Tcl_Interp* interp,int argc, char *argv[]) + double2 *vec,*vec2; + double v1,v2; + int part; +- char **par,**par2,*range; ++ char *range; ++ const char **par,**par2; + int i,i1,i2,npar,npar2; + double sumrms,sumint; + +diff --git a/ham.c b/ham.c +index 5be9dd1..5d36bdc 100644 +--- a/ham.c ++++ b/ham.c +@@ -34,6 +34,7 @@ + #include "cm_new.h" + #include "ham.h" + #include "defs.h" ++#include "defs_blas_lapack.h" + + /* + Allocation strategy: +diff --git a/matrix_new.c b/matrix_new.c +index c0aaad2..2f3f370 100644 +--- a/matrix_new.c ++++ b/matrix_new.c +@@ -24,6 +24,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <string.h> + #include "complx.h" + #include "matrix_new.h" + +diff --git a/new_direct.c b/new_direct.c +index 24502f2..cc5fd68 100644 +--- a/new_direct.c ++++ b/new_direct.c +@@ -1,4 +1,5 @@ + #include "new_direct.h" ++#include "defs_blas_lapack.h" + + /* make visible global variable pulse */ + extern Pulse* puls; +diff --git a/pulse.c b/pulse.c +index f40787c..335d225 100644 +--- a/pulse.c ++++ b/pulse.c +@@ -43,6 +43,7 @@ + #include "OCroutines.h" + #include "B0inhom.h" + #include "relax.h" ++#include "defs_blas_lapack.h" + + /* + tpropstart_usec : the time when the propagator was reset last time +diff --git a/wigner.c b/wigner.c +index bacf4b8..1644aaf 100644 +--- a/wigner.c ++++ b/wigner.c +@@ -27,6 +27,7 @@ + #include <math.h> + #include "complx.h" + #include <stdio.h> ++#include <stdlib.h> + #include "defs.h" + #include "matrix_new.h" + //#include "defs_blas_lapack.h" +diff --git a/zte.c b/zte.c +index 77dcb87..6025fa4 100644 +--- a/zte.c ++++ b/zte.c +@@ -2,6 +2,7 @@ + #include <stdlib.h> + #include "cm_new.h" + #include "pulse.h" ++#include "tclutil.h" + + typedef struct _ZTEstruct { + mv_complx *rho0, *sigma; diff --git a/sci-chemistry/simpson/simpson-2.0.0.ebuild b/sci-chemistry/simpson/simpson-3.0.1.ebuild index 9ad3fb6b1..16c6ee870 100644 --- a/sci-chemistry/simpson/simpson-2.0.0.ebuild +++ b/sci-chemistry/simpson/simpson-3.0.1.ebuild @@ -4,11 +4,11 @@ EAPI="3" -inherit autotools eutils +inherit autotools eutils prefix DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" -SRC_URI="http://bionmr.chem.au.dk/download/${PN}/${PV}/${P}.tar.gz" +SRC_URI="http://www.bionmr.chem.au.dk/download/${PN}/3.0/${PN}-source-${PV}.tgz" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" @@ -23,22 +23,22 @@ RDEPEND=" tk? ( dev-lang/tk )" DEPEND="${RDEPEND}" +S="${WORKDIR}"/${PN}-source-${PV} + src_prepare() { - rm -rf f2c missing + edos2unix Makefile epatch "${FILESDIR}"/${PV}-gentoo.patch - eautoreconf + epatch "${FILESDIR}"/${PV}-type.patch + eprefixify Makefile } -src_configure(){ -# Broken -# $(use_enable threads parallel) \ - econf \ - --disable-parallel \ - $(use_enable tk tklib) \ - $(use_enable gtk simplot) +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + || die } src_install() { - emake DESTDIR="${D}" install || die - dodoc vnmrtools/README.vnmrtools NEWS README TODO AUTHORS || die + dobin ${PN} || die } diff --git a/sci-electronics/linsmith/ChangeLog b/sci-electronics/linsmith/ChangeLog deleted file mode 100644 index 663d19211..000000000 --- a/sci-electronics/linsmith/ChangeLog +++ /dev/null @@ -1,64 +0,0 @@ -# ChangeLog for sci-electronics/linsmith -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 04 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> metadata.xml: - Dropped Lucas from maintainership on his request. Taking it over - -*linsmith-0.99.12 (23 Oct 2009) - - 23 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> - +files/0.99.12-configure.in.patch, +linsmith-0.99.12.ebuild: - Version bump - -*linsmith-0.99.11 (23 Oct 2009) - - 23 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> - -linsmith-0.99.1.ebuild, +linsmith-0.99.11.ebuild: - version bump - patch supllied by TomJBE - -*linsmith-0.99.1 (15 Jul 2006) - - 15 Jul 2006; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.99.1.ebuild: - Version bump. Removed previous versions. - -*linsmith-0.9.8 (06 Jul 2006) - - 06 Jul 2006; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.9.8.ebuild: - Version bump. Removed previous versions. - - 14 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org> linsmith-0.9.5.ebuild: - Various small cleanups of the ebuild, added examples USE flag and marked - ~amd64. - -*linsmith-0.9.5 (14 Apr 2006) - - 14 Apr 2006; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.9.5.ebuild: - Version bump. - -*linsmith-0.9.4 (09 Apr 2006) - - 09 Apr 2006; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.9.4.ebuild: - Version bump. Fixed bug which prevented the documentation from being - installed when USE="doc" was used. Removed previous versions. - -*linsmith-0.9.2 (16 Nov 2005) - - 16 Nov 2005; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.9.2.ebuild: - Added ebuild for linsmith 0.9.2. Removed lyx dependency as the documentation - is now distributed in pdf. Added desktop and icon file. - -*linsmith-0.9.1 (3 Nov 2005) - - 3 Nov 2005; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.9.1.ebuild: - Added doc use flag which compiles a lyx manual included in the source. - Patch Makefile.am to prevent it installing examples in /usr/share/linsmith. - Added the man page from the debian package. - -*linsmith-0.9.0_alpha3 (25 Oct 2005) - - 23 Oct 2005; Lucas Chiesa <lucas.chiesa@gmail.com> linsmith-0.9.0_alpha3: - Initial import of lismith - Smith Charting program, mainly designed for - educational use. Thanks to Vincent Paeder <vpaeder@net2000.ch> for the initial - ebuild. Closes bug #79082. diff --git a/sci-electronics/linsmith/Manifest b/sci-electronics/linsmith/Manifest deleted file mode 100644 index 818d32fc5..000000000 --- a/sci-electronics/linsmith/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 0.99.12-configure.in.patch 389 RMD160 c5b0648f6746821c40140822f45fea0907a328b2 SHA1 fc888861789d8248e2e8c0d9fc752484f6d5ff08 SHA256 5914134c58eda8f29528f4318cb922487963325b688e2c7e8f1ca546871a5a4f -AUX linsmith-datafiles.patch 757 RMD160 61cbef351c36677c6a894e3c017c1f57a5724b00 SHA1 54a13968f2593868d483fc221899141f95b61f8d SHA256 b39d2ece3aac52e0bfe35010c436771aa9fa623f2508f290d36e40853fe979ce -DIST linsmith-0.99.11.tar.gz 1089917 RMD160 262d570654471c1fdb33dc6d399b6f54ca64a6e1 SHA1 b970e5a21a43dd7d551f6831b1e281ab36009a4a SHA256 ed14e0c791d26aefa98d537102098eb6b5b76ab84eebd54b6a1ed655d89d2523 -DIST linsmith-0.99.12.tar.gz 1090254 RMD160 9833bdbe952c12497b029f9623e11d9a4d420e5f SHA1 c32f980d7fb7a42dff2af6ed7d49b4cf54390d89 SHA256 95013aaf603e69277202f0fe64c83a6c07f2faea3bc6a1e9d435d7c6087a1a35 -EBUILD linsmith-0.99.11.ebuild 1466 RMD160 c38a119137c7dc62b36eccfc8ea3c499c04f04e7 SHA1 d1ecbb263093355303752abc31f73b07a830457f SHA256 4e559d21e333e18de648096192a59d04f8da32fd55db025b00c6d3d228dc4900 -EBUILD linsmith-0.99.12.ebuild 1513 RMD160 eba2451014cb94a79093532c3c0e9976dfe8ae67 SHA1 c9ed00f793015d60dd928b9bf4651ffc8aec8a32 SHA256 e276a342da41b11c4af4bbbdbf52098b5e103d962b398589a7ab21e5020fd95f -MISC ChangeLog 2299 RMD160 27a8fd62914e41a5e8935c61b9028f46672b34fe SHA1 c6ff2224a946a3963a94e3736e1bca2e3c83e693 SHA256 795857806412ea23a1581987def06d233bf88fd05d039d9ab6664e214f438bbe -MISC metadata.xml 267 RMD160 758330c517ce3c896bd3341f26b7c7c1ce4b3cae SHA1 3861a9541470f9b96df84a1d7b37e097c441635b SHA256 c918c613adc026eb4dca07629c17bd002ac7ccdf12f371d1ec7db45297a835a4 diff --git a/sci-electronics/linsmith/files/0.99.12-configure.in.patch b/sci-electronics/linsmith/files/0.99.12-configure.in.patch deleted file mode 100644 index 49f6ecc11..000000000 --- a/sci-electronics/linsmith/files/0.99.12-configure.in.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linsmith-0.99.12/configure.in 2009-05-07 19:40:50.000000000 +0200 -+++ linsmith-0.99.12/configure.in.new 2009-10-23 21:57:51.788652724 +0200 -@@ -1,6 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. - --AM_INIT(linsmith, 0.99.12) -+AC_INIT(linsmith, 0.99.12) - AM_CONFIG_HEADER(config.h) - AM_MAINTAINER_MODE - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff --git a/sci-electronics/linsmith/files/linsmith-datafiles.patch b/sci-electronics/linsmith/files/linsmith-datafiles.patch deleted file mode 100644 index cae7a2a7c..000000000 --- a/sci-electronics/linsmith/files/linsmith-datafiles.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.am.old 2005-11-03 00:56:51.000000000 -0300 -+++ Makefile.am 2005-11-03 00:57:09.000000000 -0300 -@@ -20,15 +20,6 @@ - fi \ - done \ - fi -- @$(NORMAL_INSTALL) -- if test -d $(srcdir)/datafiles; then \ -- $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE); \ -- for datafile in $(srcdir)/datafiles/*; do \ -- if test -f $$datafile; then \ -- $(INSTALL_DATA) $$datafile $(DESTDIR)$(datadir)/$(PACKAGE); \ -- fi \ -- done \ -- fi - - dist-hook: - if test -d pixmaps; then \ -@@ -39,11 +30,3 @@ - fi \ - done \ - fi -- if test -d datafiles; then \ -- mkdir $(distdir)/datafiles; \ -- for datafile in datafiles/*; do \ -- if test -f $$datafile; then \ -- cp -p $$datafile $(distdir)/datafiles; \ -- fi \ -- done \ -- fi diff --git a/sci-electronics/linsmith/linsmith-0.99.11.ebuild b/sci-electronics/linsmith/linsmith-0.99.11.ebuild deleted file mode 100644 index 2a6416056..000000000 --- a/sci-electronics/linsmith/linsmith-0.99.11.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils autotools - -DESCRIPTION="Smith charting program, mainly designed for educational use." -HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples" - -RDEPEND=">=gnome-base/libgnomeprint-2.10.3 - >=dev-libs/libxml2-2.6.20-r2 - >=gnome-base/libgnomeui-2.10.1" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - # This patch is to prevent make install copying - # the examples in /usr/share/linsmith - # Now they are cp to the correct location. - epatch "${FILESDIR}"/${PN}-datafiles.patch - - einfo "Regenerating autotools files..." - eautoreconf -} - -src_install() { - # Delete this file, otherwise it is installed with the pixmaps. - rm pixmaps/Makefile.am~ - - emake DESTDIR="${D}" install || die "emake install failed" - - insinto "/usr/share/${PN}" - doins datafiles/conv0809 || die - - dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO || die "dodoc failed" - doman doc/linsmith.1 || die "doman failed" - - domenu linsmith.desktop || die "domenu failed" - doicon linsmith_icon.xpm || die "doicon failed" - - if use doc; then - insinto "/usr/share/doc/${PF}" - doins doc/manual.pdf || die - fi - - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins datafiles/*.circ datafiles/*.load || die - fi -} diff --git a/sci-electronics/linsmith/linsmith-0.99.12.ebuild b/sci-electronics/linsmith/linsmith-0.99.12.ebuild deleted file mode 100644 index eeec919ed..000000000 --- a/sci-electronics/linsmith/linsmith-0.99.12.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils autotools - -DESCRIPTION="Smith charting program, mainly designed for educational use." -HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples" - -RDEPEND=">=gnome-base/libgnomeprint-2.10.3 - >=dev-libs/libxml2-2.6.20-r2 - >=gnome-base/libgnomeui-2.10.1" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_prepare() { - # This patch is to prevent make install copying - # the examples in /usr/share/linsmith - # Now they are cp to the correct location. - epatch \ - "${FILESDIR}"/${PN}-datafiles.patch \ - "${FILESDIR}"/${PV}-configure.in.patch - - einfo "Regenerating autotools files..." - eautoreconf -} - -src_install() { - # Delete this file, otherwise it is installed with the pixmaps. - rm pixmaps/Makefile.am~ - - emake DESTDIR="${D}" install || die "emake install failed" - - insinto "/usr/share/${PN}" - doins datafiles/conv0809 || die - - dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO || die "dodoc failed" - doman doc/linsmith.1 || die "doman failed" - - domenu linsmith.desktop || die "domenu failed" - doicon linsmith_icon.xpm || die "doicon failed" - - if use doc; then - insinto "/usr/share/doc/${PF}" - doins doc/manual.pdf || die - fi - - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins datafiles/*.circ datafiles/*.load || die - fi -} diff --git a/sci-electronics/xnec2c/ChangeLog b/sci-electronics/xnec2c/ChangeLog deleted file mode 100644 index a6dddfcb2..000000000 --- a/sci-electronics/xnec2c/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -# ChangeLog for sci-electronics/xnec2c -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*xnec2c-1.4 (13 Jul 2010) - - 13 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> -xnec2c-1.3.ebuild, - -files/xnec2c-1.3-filename.patch, +xnec2c-1.4.ebuild: - Version bump. Fixes only bug wrt buffer overflow on long filenames. - - 10 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> xnec2c-1.3.ebuild, - +files/xnec2c-1.3-filename.patch: - Fixed handling of long path and filenames - -*xnec2c-1.3 (01 Jul 2010) - - 01 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> +xnec2c-1.3.ebuild, - +metadata.xml: - New ebuild for Xnec2c. Based on the work of Dominique Michel - <dominique.michel@vtxnet.ch> in bug #138770 - diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest deleted file mode 100644 index 53d5b6a58..000000000 --- a/sci-electronics/xnec2c/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST xnec2c-1.4.tar.bz2 560130 RMD160 1a267333938df5768e2d440a26905269af916742 SHA1 85336f6d96dec909a6771f3d7ea278c6970466e1 SHA256 66265838daae23b6ae3000f9d2d5cbc5d0f0f7a77dbe5708544b2e79e38fa751 -EBUILD xnec2c-1.4.ebuild 786 RMD160 b99d581cbb2f86b4c400a91695e7eb65d1a9cd86 SHA1 4d446f1f663c078dd63508fb0829fcedbfd3d54e SHA256 4d31637a7863606b0ed2996601d437a77c63723386b4bcbe6edb3972e7cf90ca -MISC ChangeLog 727 RMD160 413760b3e4623debae1d660b3e0c8e92b1071f70 SHA1 531fb393313bde732ce3ff353309db1b057ce15e SHA256 717736c16d2d4253cd891d4ea8a13906e8db907783eca14c54ea1aca2fa0b0dc -MISC metadata.xml 1391 RMD160 2b0f8b9b990ad556aafdde0e7fef7c5bf45c6bb2 SHA1 2f0bde8a7ad1979876914c93161a37835626ffc6 SHA256 200ed2065aff1ebac0f24fbf818adf06aceac4adc9f100dcefc255ab0ea21644 diff --git a/sci-electronics/xnec2c/metadata.xml b/sci-electronics/xnec2c/metadata.xml deleted file mode 100644 index e97b92785..000000000 --- a/sci-electronics/xnec2c/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci-electronics</herd> - <maintainer> - <email>tomjbe@gentoo.org</email> - <name>Thomas Beierlein</name> - </maintainer> - <longdescription> - xnec2c is a GTK+ graphical interactive version of nec2c. It incorporates - the nec2c core which it uses for reading input files and calculating - output data, but it does not need and indeed does not produce an output - file by default. Since xnec2c incorporates the nec2c core, it has access - to all internal buffers, including structure data, frequency-related - data (structure currents, input impedance, gain etc) and radiation - pattern data (for the far field and near field). It therefore has the - ability to graphically display user-requested data directly, as the - frequency loop progresses or after input from the user. Graphs of - frequency-related data and the current or charge distribution evolve as - the frequency loop progresses, and radiation patterns (far and near - field) are sequentially drawn for each frequency step. A new frequency - can be entered by the user from spin buttons in the main or radiation - pattern windows or by clicking on the graphs of frequency-related data. - New output data are then computed and displayed in text and graphical - form. - </longdescription> -</pkgmetadata> diff --git a/sci-electronics/xnec2c/xnec2c-1.4.ebuild b/sci-electronics/xnec2c/xnec2c-1.4.ebuild deleted file mode 100644 index 1cfcaba5d..000000000 --- a/sci-electronics/xnec2c/xnec2c-1.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit autotools - -DESCRIPTION="A GTK+ graphical interactive version of nec2c." -HOMEPAGE="http://5b4az.chronos.org.uk/pages/nec2.html" -SRC_URI="http://5b4az.chronos.org.uk/pkg/nec2/xnec2c/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -S="${WORKDIR}/${PN}" - -RDEPEND="dev-libs/glib - x11-libs/gtk+:2" -DEPEND="${RDEPEND} - sys-devel/gettext" - -src_prepare() { - glib-gettextize --force --copy || die - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS README doc/*.txt || die - dohtml -r doc/* || die - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - fi -} diff --git a/sci-geosciences/pydap/ChangeLog b/sci-geosciences/pydap/ChangeLog index 3de315382..70c31ca69 100644 --- a/sci-geosciences/pydap/ChangeLog +++ b/sci-geosciences/pydap/ChangeLog @@ -2,6 +2,23 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pydap-3.0_rc12 (02 Sep 2010) + + 02 Sep 2010; Tim Cera <timcera@earthlink.net> -pydap-3.0_rc10.ebuild, + -pydap-3.0_rc11.ebuild, +pydap-3.0_rc12.ebuild: + Version bump. + +*pydap-3.0_rc11 (20 Aug 2010) + + 20 Aug 2010; Tim Cera <timcera@earthlink.net> +pydap-3.0_rc11.ebuild: + Version bump. + +*pydap-3.0_rc10 (08 Aug 2010) + + 08 Aug 2010; Tim Cera <timcera@earthlink.net> -pydap-3.0_rc8.ebuild, + +pydap-3.0_rc10.ebuild: + Version bump and minor changes in dependencies. + 29 Jun 2010; Justin Lecher <jlec@gentoo.org> pydap-3.0_rc8.ebuild: Python ABI fixes diff --git a/sci-geosciences/pydap/Manifest b/sci-geosciences/pydap/Manifest index 8fa12230a..735ad1623 100644 --- a/sci-geosciences/pydap/Manifest +++ b/sci-geosciences/pydap/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST Pydap-3.0.rc.8.tar.gz 3058436 RMD160 be3ae12c6461b4278e37722948be35f34e2cca93 SHA1 90e158b6febad07bf26d1f01a4ed123e1b09799b SHA256 ad23dc79a20c9f50c968231c1ce1719af27db541e54955d2f5b16fd0b69262bb -EBUILD pydap-3.0_rc8.ebuild 842 RMD160 a44cab78977b1d14c52174361ba569e3df4b3277 SHA1 b948da471d2cbd0562ff6b6b79ca55b94a16c090 SHA256 821eb62fa57acd02710d1ede8686bfa4eb5a5f8b77b2ca3519dc68731c84c457 -MISC ChangeLog 556 RMD160 61fa549943c27edfe6797902f8091b4ac8efe563 SHA1 ff85a8155ab9b40cf669cec15da19360d2f6ce0b SHA256 a9dbee5c236a286707299c7c3ae4260bf0d14f3700cc5e41d3aa42f40b589d0e +DIST Pydap-3.0.rc.12.tar.gz 3074167 RMD160 de9649e41f5199cfe66095014f4cf051c326a49b SHA1 fd1a7c88a51d86e0a3637ba1986c64e47842132c SHA256 4c363598489e39045e6c96e9fcf5e00abf83c09797e8df9db12a791e751b3f6e +EBUILD pydap-3.0_rc12.ebuild 727 RMD160 13f1918f0b52d4a687f81fab9072bbf5b727ac54 SHA1 6dd25b98513afba94f6d1455d815a9a48e6b5fee SHA256 ff11423e84777d7dc1c6cd85b09b195cf1ed0c2c4b0c43c0e942ae2e1430eae4 +MISC ChangeLog 1025 RMD160 4308a48d4d9a0fde70d71569fc5237bf844d0a5c SHA1 c4b53f8505e5d2f4405b15086fa6ccd7d5f07bc9 SHA256 6679214cacfa2dbbc1fb244acf3990894b56f872441480cdf00d0804c0ef0b23 MISC metadata.xml 359 RMD160 3621d399ddf36be2ef28cc3d03f6cef8685dd940 SHA1 df37af9d4b1c0561684f92f9dd741b39c08c5c4a SHA256 b5424bbaab4a3c781b0297a85ebc49fd9c73bd8ca61ba19810aea7c6222ffd4b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwqJ7QACgkQgAnW8HDreRapMQCfQxpw9MS3XAk5okVoXl8X1uqf -ZfgAoIXXl9PrTokkJEzg7mcR9iX5ocbR -=feQ9 ------END PGP SIGNATURE----- diff --git a/sci-geosciences/pydap/pydap-3.0_rc8.ebuild b/sci-geosciences/pydap/pydap-3.0_rc12.ebuild index 38acadb67..42580fde2 100644 --- a/sci-geosciences/pydap/pydap-3.0_rc8.ebuild +++ b/sci-geosciences/pydap/pydap-3.0_rc12.ebuild @@ -16,7 +16,7 @@ MY_P=${MY_P/_rc/.rc.} DESCRIPTION="Data Access Protocol client and server." HOMEPAGE="http://pydap.org" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="pydap" SLOT="0" @@ -29,9 +29,6 @@ RDEPEND=">=dev-python/numpy-1.2.1 >=dev-python/genshi-0.5.1 >=dev-python/paste-1.7.2 >=dev-python/pastescript-1.7.2 - >=dev-python/pastedeploy-1.3.3 - >=dev-python/coards-0.2.2 - >=dev-python/arrayterator-1.0.1 - >=dev-python/cheetah-2.0_rc6" + >=dev-python/pastedeploy-1.3.3" S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_handlers_cdms/Manifest b/sci-geosciences/pydap_handlers_cdms/Manifest index c1f509a85..581002af7 100644 --- a/sci-geosciences/pydap_handlers_cdms/Manifest +++ b/sci-geosciences/pydap_handlers_cdms/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST pydap.handlers.cdms-0.1.1.tar.gz 32398 RMD160 3b11f9eda2d8e211b0b9e6920a601ce91bc7b9a8 SHA1 6ed897f8d20553f8c0a2a56c9631cc34ef6dbf37 SHA256 76d28ceb0bbf115fe50ab7bc3fa98ba3df13bd4530b270e0fa4cb71a7777421a -EBUILD pydap_handlers_cdms-0.1.1.ebuild 704 RMD160 dbd7eb6e0c0f491fc5bae150896f14e203dc7d06 SHA1 a0d8db4fbfe926cded0dfbf0dcbc97d42b92ef7b SHA256 a7fa05a4535171b53217ddc20829dd56a559f828c280aa70bc5408b753d7938e +EBUILD pydap_handlers_cdms-0.1.1.ebuild 680 RMD160 42fa82b60cdb01fe52fdba9ce994d8c5325fdf19 SHA1 3186ff20b9c12edb50cd772c90689347204deba0 SHA256 238b0727519d0e1a50344166f658956b53f2591a21ec0499c9ebcf5c5ab94d1b MISC ChangeLog 636 RMD160 fd828218acc17ef5aea38c21954f2943c5dc59a9 SHA1 042eec608e121dd223480ad5e8fe924bf667839c SHA256 dbb71e65a436e183db9963688a26750d3fe63db28030856bb45c8d468e779869 MISC metadata.xml 433 RMD160 3058502884556eb70d856d9bc2cba4815c635688 SHA1 84fed77bf7c54a776292f15ffc756eac77f14c29 SHA256 80fa49dc47cd562348f3bb2956647e2833a44ce8baab94923f6e6e6b89c68309 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwqIt4ACgkQgAnW8HDreRa3KwCdGxX4mLo+zxfEKhcWhZbOSDYG -dLoAn1m4+FNIz+8YfofYedprkRnYYBFr -=gHa8 ------END PGP SIGNATURE----- diff --git a/sci-geosciences/pydap_handlers_cdms/pydap_handlers_cdms-0.1.1.ebuild b/sci-geosciences/pydap_handlers_cdms/pydap_handlers_cdms-0.1.1.ebuild index 48c207b81..dd4bed80c 100644 --- a/sci-geosciences/pydap_handlers_cdms/pydap_handlers_cdms-0.1.1.ebuild +++ b/sci-geosciences/pydap_handlers_cdms/pydap_handlers_cdms-0.1.1.ebuild @@ -15,7 +15,7 @@ MY_P=${P//_/.} DESCRIPTION="CDMS handler for Pydap server that supports netCDF, HDF, GrADS/GRIB, or PCMDI DRS" HOMEPAGE="http://pydap.org/handlers.html#cdms" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="pydap" SLOT="0" @@ -23,7 +23,7 @@ KEYWORDS="~amd64" IUSE="" DEPEND=">=dev-python/setuptools-0.6_rc3" -RDEPEND=">=sci-geosciences/pydap-3.0_rc8 +RDEPEND=">=sci-geosciences/pydap-3.0_rc10 >=sci-geosciences/cdat-lite-5.2 >=dev-python/arrayterator-1.0.1" diff --git a/sci-geosciences/pydap_handlers_csv/ChangeLog b/sci-geosciences/pydap_handlers_csv/ChangeLog new file mode 100644 index 000000000..77c933ed4 --- /dev/null +++ b/sci-geosciences/pydap_handlers_csv/ChangeLog @@ -0,0 +1,16 @@ +# ChangeLog for sci-geosciences/pydap_handlers_csv +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pydap_handlers_csv-0.1.1 (16 Aug 2010) + + 16 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_handlers_csv-0.1.0.ebuild, +pydap_handlers_csv-0.1.1.ebuild: + Version bump. + +*pydap_handlers_csv-0.1.0 (08 Aug 2010) + + 08 Aug 2010; Tim Cera <timcera@earthlink.net> + +pydap_handlers_csv-0.1.0.ebuild, +metadata.xml: + Initial ebuild. + diff --git a/sci-geosciences/pydap_handlers_csv/Manifest b/sci-geosciences/pydap_handlers_csv/Manifest new file mode 100644 index 000000000..d9f10cbfc --- /dev/null +++ b/sci-geosciences/pydap_handlers_csv/Manifest @@ -0,0 +1,4 @@ +DIST pydap.handlers.csv-0.1.1.tar.gz 34248 RMD160 84597c83716f9256cb748bb6b08aada8b8a9789b SHA1 9eaac537ab691bb63f03aaad18e3c5fbad495adb SHA256 0843998c63ae580ebc81966c2c57c4a9f221f2b60cdf465ceecccf8c72b5d90e +EBUILD pydap_handlers_csv-0.1.1.ebuild 585 RMD160 bdb63e08ade396fd38eac75969c5b868b9d13df3 SHA1 355aeb7ff5ceb58890a9f218aa5585e3c01d7c4c SHA256 70cfb5f65e9c6ca40df6c4b00a0cf69245da8ce84c1d01ab3bff404491c30432 +MISC ChangeLog 470 RMD160 2d331825779573d8cb7e5cdd7a05e6d85db28bbf SHA1 c6828992a26ed3c1ce4db433f61b2f95ce0e5486 SHA256 0461a32369c5e85daf0b59a98200b594269b13bbf0fbc853c05d11396fabd778 +MISC metadata.xml 430 RMD160 86bbbd8ab0e1803b3f8ab5f0763d4936ea4f8713 SHA1 d0e026db8d917deda7690e7719a92d9c8b3f5b85 SHA256 5f2206cc0753d34150e78b19ae3dc23a45c33853813297c5968b0fa688ebbefd diff --git a/sci-geosciences/pydap_handlers_csv/metadata.xml b/sci-geosciences/pydap_handlers_csv/metadata.xml new file mode 100644 index 000000000..27fdcd14b --- /dev/null +++ b/sci-geosciences/pydap_handlers_csv/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> +<email>timcera@earthlink.net</email> +<name>Tim Cera</name> +</maintainer> +<longdescription lang="en"> + Pydap is a pure Python library implementing the Data Access Protocol. + pydap_handlers_csv allows Pydap server to serve CSV formatted files. +</longdescription> +</pkgmetadata> diff --git a/sci-geosciences/pydap_handlers_csv/pydap_handlers_csv-0.1.1.ebuild b/sci-geosciences/pydap_handlers_csv/pydap_handlers_csv-0.1.1.ebuild new file mode 100644 index 000000000..65b025504 --- /dev/null +++ b/sci-geosciences/pydap_handlers_csv/pydap_handlers_csv-0.1.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils + +MY_PN=${PN//_/.} +MY_P=${P//_/.} + +DESCRIPTION="Comma Separated Values (CSV) handler for Pydap server" +HOMEPAGE="http://pydap.org/handlers.html#csv" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="pydap" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-python/setuptools-0.6_rc3" +RDEPEND=">=sci-geosciences/pydap-3.0_rc10" + +S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_handlers_nca/ChangeLog b/sci-geosciences/pydap_handlers_nca/ChangeLog index 3053960bb..935d30ede 100644 --- a/sci-geosciences/pydap_handlers_nca/ChangeLog +++ b/sci-geosciences/pydap_handlers_nca/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pydap_handlers_nca-0.1.1 (08 Aug 2010) + + 08 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_handlers_nca-0.1.ebuild, +pydap_handlers_nca-0.1.1.ebuild: + Version bump. + 24 Apr 2010; Tim Cera <timcera@earthlink.net> pydap_handlers_nca-0.1.ebuild: Updated to latest python ebuild standards. diff --git a/sci-geosciences/pydap_handlers_nca/Manifest b/sci-geosciences/pydap_handlers_nca/Manifest index 7ff9f5212..27cdcf57b 100644 --- a/sci-geosciences/pydap_handlers_nca/Manifest +++ b/sci-geosciences/pydap_handlers_nca/Manifest @@ -1,4 +1,4 @@ -DIST pydap.handlers.nca-0.1.tar.gz 34418 RMD160 714a67fd19a7448d89db2b513898cf1d42d7df47 SHA1 9c52c6813212ea964d582cc8b42d7fe78431bfd5 SHA256 a324d1507f2b277fcc91f328ffda954788a72b873d11c559d4609ca1a390c41c -EBUILD pydap_handlers_nca-0.1.ebuild 620 RMD160 4e1cac629bf01be74cc49665c9e3a10ce0c87c97 SHA1 75b6e8e8f22bd44696cf63f0cf3c1dba4ddf4ba9 SHA256 3921aaa13a91414e8acd4ed9a88a52d67f37af4efd2009763caa684e91b4217d -MISC ChangeLog 520 RMD160 382f0d901018c1b49650f62c6c736e06a6104da2 SHA1 7c219aac8b1aa3d7d3afff9e84f4ad78eb1e0588 SHA256 5a6568032f41154ab126ae20f890bf1de81a865ebd0443471c7bfe0b3b3b0ecf +DIST pydap.handlers.nca-0.1.1.tar.gz 34450 RMD160 e94d11e77e38b6509cbaa9552d34d81d6d73ff1c SHA1 f21efefc17ecd3708c5f28179ebe7e57f34c9b17 SHA256 d2762487b562cf12f4443b547b899c5d0e86c1def3c9a80f918e9cc24d1dbf28 +EBUILD pydap_handlers_nca-0.1.1.ebuild 595 RMD160 8dd74bc5978acbcddfeadfe41459b748af6371b6 SHA1 2458da34a21180d9686d63b659721fd490ee4e18 SHA256 c2296c287c0bfb314b999ea98d90e27f9715e1e0a48ec0c4b3f5bf55bfff9e33 +MISC ChangeLog 694 RMD160 aa1094c883b3d5c7ea4104d2e579dcae906444c2 SHA1 9f8ba40b5eef161569691eb3b0dd878ea29d2628 SHA256 e0e9eede4ba849cbb65dca6b0f5073fb0a09ce1e457f54d233a2e3a29cf44f2a MISC metadata.xml 444 RMD160 96e42e1dbab773a1ae02b51fe1f049b15c10605d SHA1 4a36a7f4d98e727f1076ddb8d6452b4d7098c800 SHA256 bb4ce4319613b9987243500b398b5db149d6a2a73cbe45cb62c6fef3e2dec1bc diff --git a/sci-geosciences/pydap_handlers_nca/pydap_handlers_nca-0.1.ebuild b/sci-geosciences/pydap_handlers_nca/pydap_handlers_nca-0.1.1.ebuild index 0da1da6ba..996e884db 100644 --- a/sci-geosciences/pydap_handlers_nca/pydap_handlers_nca-0.1.ebuild +++ b/sci-geosciences/pydap_handlers_nca/pydap_handlers_nca-0.1.1.ebuild @@ -12,7 +12,7 @@ MY_P=${P//_/.} DESCRIPTION="Aggregated NetCDF handler for Pydap Data Access Protocol server." HOMEPAGE="http://pydap.org" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="pydap" SLOT="0" diff --git a/sci-geosciences/pydap_handlers_netcdf/ChangeLog b/sci-geosciences/pydap_handlers_netcdf/ChangeLog index b05207174..7e2789cf1 100644 --- a/sci-geosciences/pydap_handlers_netcdf/ChangeLog +++ b/sci-geosciences/pydap_handlers_netcdf/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pydap_handlers_netcdf-0.4.9 (08 Aug 2010) + + 08 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_handlers_netcdf-0.4.8.ebuild, +pydap_handlers_netcdf-0.4.9.ebuild: + Version bump. + 24 Apr 2010; Tim Cera <timcera@earthlink.net> pydap_handlers_netcdf-0.4.8.ebuild: Updated to latest python ebuild standards. diff --git a/sci-geosciences/pydap_handlers_netcdf/Manifest b/sci-geosciences/pydap_handlers_netcdf/Manifest index 549bcc23f..266128db2 100644 --- a/sci-geosciences/pydap_handlers_netcdf/Manifest +++ b/sci-geosciences/pydap_handlers_netcdf/Manifest @@ -1,4 +1,4 @@ -DIST pydap.handlers.netcdf-0.4.8.tar.gz 32485 RMD160 255ac4917466a0b4249ea19154706c449a17f49b SHA1 e472d86f8cc543b616f7666fffee990501b6c81a SHA256 85bf69cce3dbf20274612167491bbe6861342aa99453fc2dbb9a42c0abd99acf -EBUILD pydap_handlers_netcdf-0.4.8.ebuild 613 RMD160 e83732b565e00c9ded4592afebc54af2eca1c898 SHA1 acfff6e44680141cab66121cad53261dcefa8cf3 SHA256 b5115caddcc37a1ef8620405530985ed24318bdd716ff68a1ea30949c678b7c2 -MISC ChangeLog 543 RMD160 6bfc224580e303645551f894566225b2932fe263 SHA1 8a2ba43a78ce7ceee202f377760125d773838fc3 SHA256 c3342ba4f6266314a265f7fe6a8eb756de28b2dae435ecf1b5fbc548c47e92e7 +DIST pydap.handlers.netcdf-0.4.9.tar.gz 32484 RMD160 3edc35dd3ad60f48b01d80cd443042f8b9648621 SHA1 657422a0839f936c8d64e69438c6758126393fcd SHA256 bf2d0b2dc09da4c9566d48704b74c68109df3920da1f51a68b170540ed110c5e +EBUILD pydap_handlers_netcdf-0.4.9.ebuild 588 RMD160 a37a944be01e9cc8abbda94c7ef9934fe485539f SHA1 842a6abfa8ff0e9fdeeee3ffffb66267f127bbbb SHA256 50837234cd2d09e11acc5c0da500114f47b3e505dc5869762e312f13e5ecef4c +MISC ChangeLog 728 RMD160 ebd7873e705e4ed1c28433ab191e0d19db7ec6a6 SHA1 f6bb755b8046299942e64c62985bb364fdf3ecd7 SHA256 dae6d766586daf1515eb8e525a2c30fc470ec9e4f56075a84a166cf21c29b2a5 MISC metadata.xml 436 RMD160 1cbc7447cbfeaf5d9a07e6ef43314d18a52e4d32 SHA1 a1f67c8de2eed0cdc5f0a31e0dd15fa2083ef484 SHA256 8b31e486f6c1fcd2d295a9ce06ed353a8d4bc3b6d6e7f02abef66107af36c4ce diff --git a/sci-geosciences/pydap_handlers_netcdf/pydap_handlers_netcdf-0.4.8.ebuild b/sci-geosciences/pydap_handlers_netcdf/pydap_handlers_netcdf-0.4.9.ebuild index da9c8be67..10269c5ed 100644 --- a/sci-geosciences/pydap_handlers_netcdf/pydap_handlers_netcdf-0.4.8.ebuild +++ b/sci-geosciences/pydap_handlers_netcdf/pydap_handlers_netcdf-0.4.9.ebuild @@ -13,7 +13,7 @@ MY_P=${P//_/.} DESCRIPTION="NetCDF handler for Pydap Data Access Protocol server." HOMEPAGE="http://pydap.org" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="pydap" SLOT="0" diff --git a/sci-geosciences/pydap_handlers_proxy/ChangeLog b/sci-geosciences/pydap_handlers_proxy/ChangeLog new file mode 100644 index 000000000..f8934f172 --- /dev/null +++ b/sci-geosciences/pydap_handlers_proxy/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-geosciences/pydap_handlers_proxy +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pydap_handlers_proxy-0.1.1 (08 Aug 2010) + + 08 Aug 2010; Tim Cera <timcera@earthlink.net> + +pydap_handlers_proxy-0.1.1.ebuild, +metadata.xml: + Initial ebuild. + diff --git a/sci-geosciences/pydap_handlers_proxy/Manifest b/sci-geosciences/pydap_handlers_proxy/Manifest new file mode 100644 index 000000000..c6f60eb3b --- /dev/null +++ b/sci-geosciences/pydap_handlers_proxy/Manifest @@ -0,0 +1,4 @@ +DIST pydap.handlers.proxy-0.1.1.tar.gz 31416 RMD160 6d44abbd0996d4b844cca64f9bcedac59c166195 SHA1 2a74098347e241bcd4a6f26ff842c49a188e2d46 SHA256 231752138bb7553c4d45bfc1dbeff3a33ccdff84088bf64a10bea4bbed5273a9 +EBUILD pydap_handlers_proxy-0.1.1.ebuild 660 RMD160 5370d0e7a855c639b7263a88069309419b8efe96 SHA1 592c4ceb6e2469e4a3702da1f88836ceba55b444 SHA256 028bd32ae7779e460cab472c04c4ca0091214408e2180e69dffe6b649781491b +MISC ChangeLog 300 RMD160 859168a2f874b6951e039ea6a052fa74c1b833fd SHA1 925edbef393b6cc42fb6da9fff7370b8e10ec75e SHA256 8d602b97a882e33cf590b81927f10f2d25efb2eb69f4ce41989b1685fcecb3cc +MISC metadata.xml 438 RMD160 b0d4350a1d04b00a8dec45fdafe881f0197dcdc3 SHA1 f904d0c4a9d803ee3ed4b275e9af90306c29b5bd SHA256 c3a00623a78fd71cba258aa1e3be9b3bc5f487bd8a527ab7c53130deb916c5f9 diff --git a/sci-geosciences/pydap_handlers_proxy/metadata.xml b/sci-geosciences/pydap_handlers_proxy/metadata.xml new file mode 100644 index 000000000..ee40eee6b --- /dev/null +++ b/sci-geosciences/pydap_handlers_proxy/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> +<email>timcera@earthlink.net</email> +<name>Tim Cera</name> +</maintainer> +<longdescription lang="en"> + Pydap is a pure Python library implementing the Data Access Protocol. + pydap_handlers_proxy allows Pydap server to serve data from other web sites. +</longdescription> +</pkgmetadata> diff --git a/sci-geosciences/pydap_handlers_proxy/pydap_handlers_proxy-0.1.1.ebuild b/sci-geosciences/pydap_handlers_proxy/pydap_handlers_proxy-0.1.1.ebuild new file mode 100644 index 000000000..af5d89232 --- /dev/null +++ b/sci-geosciences/pydap_handlers_proxy/pydap_handlers_proxy-0.1.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils + +MY_PN=${PN//_/.} +MY_P=${P//_/.} + +DESCRIPTION="Proxy handler for Pydap server that can serve data from other web sites." +HOMEPAGE="http://pydap.org/handlers.html#cdms" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="pydap" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-python/setuptools-0.6_rc3" +RDEPEND=">=sci-geosciences/pydap-3.0_rc8 + >=dev-python/paste-1.7.2 + >=dev-python/configobj-4.6.0" + +S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_handlers_sql/ChangeLog b/sci-geosciences/pydap_handlers_sql/ChangeLog new file mode 100644 index 000000000..e98c5e7ee --- /dev/null +++ b/sci-geosciences/pydap_handlers_sql/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-geosciences/pydap_handlers_sql +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pydap_handlers_sql-0.1.0 (09 Aug 2010) + + 09 Aug 2010; Tim Cera <timcera@earthlink.net> + +pydap_handlers_sql-0.1.0.ebuild, +metadata.xml: + Initial ebuild. + diff --git a/sci-geosciences/pydap_handlers_sql/Manifest b/sci-geosciences/pydap_handlers_sql/Manifest new file mode 100644 index 000000000..c8809618b --- /dev/null +++ b/sci-geosciences/pydap_handlers_sql/Manifest @@ -0,0 +1,4 @@ +DIST pydap.handlers.sql-0.1.0.tar.gz 35477 RMD160 6ca9669063cadbc1394f35cc347d4b767981be82 SHA1 5a6c31fdcd5e01562c3ac78aa89f2ce9f5c68637 SHA256 6edf271b3e90187a7b62686d31a9b9c978056d0209c77005a401e19df1a24aed +EBUILD pydap_handlers_sql-0.1.0.ebuild 973 RMD160 21edf90a904746bac4ed8cf0f47a4e645d255d31 SHA1 06781413f7222fdf92ae7bea4f3f138083012910 SHA256 f3e20618f3aed122e0493d090b08e6bbf12e0e9a6eda5f26c72d84bc2b4c09a0 +MISC ChangeLog 294 RMD160 63e0b1ccad68c0b5d816cbe8c48a4febd577e2ee SHA1 8e4d5f88fd3e0ba5728976fe96a36b35fa01b282 SHA256 bc1aa03e8741cda7b9998b4cde554e5c91f8ee9cbe3f6d48e6212757e42b223c +MISC metadata.xml 434 RMD160 482bc484a5c2c1dcfa87c10b1ce37ce8b7f5b2cf SHA1 1ea823eac57ef42be569d4f8044f3e5fcd276d04 SHA256 959da38fa8bafbd6a283e0f73f6c37bdd5f20cd3647d5202ba610c0edbc1e70e diff --git a/sci-geosciences/pydap_handlers_sql/metadata.xml b/sci-geosciences/pydap_handlers_sql/metadata.xml new file mode 100644 index 000000000..b946abd5e --- /dev/null +++ b/sci-geosciences/pydap_handlers_sql/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> +<email>timcera@earthlink.net</email> +<name>Tim Cera</name> +</maintainer> +<longdescription lang="en"> + Pydap is a pure Python library implementing the Data Access Protocol. + pydap_handlers_sql allows Pydap server to serve data from SQL databases. +</longdescription> +</pkgmetadata> diff --git a/sci-geosciences/pydap_handlers_sql/pydap_handlers_sql-0.1.0.ebuild b/sci-geosciences/pydap_handlers_sql/pydap_handlers_sql-0.1.0.ebuild new file mode 100644 index 000000000..753fda3d5 --- /dev/null +++ b/sci-geosciences/pydap_handlers_sql/pydap_handlers_sql-0.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils + +MY_PN=${PN//_/.} +MY_P=${P//_/.} + +DESCRIPTION="SQL handler for Pydap server that allows serving data from SQL databases." +HOMEPAGE="http://pydap.org/handlers.html#cdms" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="pydap" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-python/setuptools-0.6_rc3" +RDEPEND=">=sci-geosciences/pydap-3.0_rc8 + >=sci-geosciences/cdat-lite-5.2 + >=dev-python/arrayterator-1.0.1 + postgresql? ( >=dev-python/psycopg-2 ) + mysql? ( >=dev-python/mysql-python-1.2.3_rc1 )" + + # When cx_oracle is available... + # oracle? >=dev-python/cx_oracle + + # Currently adodbapi is only availble for Windows so mssql support is not available. + # If pydap used dev-python/pymssql that would be better. + +S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_responses_kml/ChangeLog b/sci-geosciences/pydap_responses_kml/ChangeLog index b4f53cb5a..98e1cc9bb 100644 --- a/sci-geosciences/pydap_responses_kml/ChangeLog +++ b/sci-geosciences/pydap_responses_kml/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pydap_responses_kml-0.4.4 (09 Aug 2010) + + 09 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_responses_kml-0.4.3.ebuild, +pydap_responses_kml-0.4.4.ebuild: + Version bump. + 29 Jun 2010; Justin Lecher <jlec@gentoo.org> pydap_responses_kml-0.4.3.ebuild: Python ABI fixes diff --git a/sci-geosciences/pydap_responses_kml/Manifest b/sci-geosciences/pydap_responses_kml/Manifest index 8ed3f7281..ff93b3aeb 100644 --- a/sci-geosciences/pydap_responses_kml/Manifest +++ b/sci-geosciences/pydap_responses_kml/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST pydap.responses.kml-0.4.3.tar.gz 32978 RMD160 0465659b12356fcd9014d5605c5b1d29152b236a SHA1 02364c1e8e8457f55522ac20792bb30c8e02c498 SHA256 700d527dff61302682b02124a053cbe354dd8dd4f24b97ba9c6a1fa119a553c6 -EBUILD pydap_responses_kml-0.4.3.ebuild 592 RMD160 4c59a5798ed1a0220ba9b36244658b71b070fd68 SHA1 f230f7d8a7312f66b225073482d845890f4b2aa5 SHA256 5f20819e27d160c67f50c478f40299291fb500f2784c986a922a79a96e52b52d -MISC ChangeLog 673 RMD160 a03943c241e9f8c1ec6084dc2c01659c752e7430 SHA1 dad53c1de935cbdde44706bee1dfa75360432f7d SHA256 dc51730066a51261f46e7a156b739010b56df6761a295dc86456a65b57cc048f +DIST pydap.responses.kml-0.4.4.tar.gz 32986 RMD160 67adfbd5478817cae0078865bd1ce3b0efe0dee7 SHA1 6dec1bcbc406187d49667e688db6a2d73d268555 SHA256 96331a2c2233934cbaa121adbf76812896038ef16445ad36f743120fd2750e85 +EBUILD pydap_responses_kml-0.4.4.ebuild 568 RMD160 3dee7bec95204f41b739a66b6b83f538c8bbf4d5 SHA1 d5dd1fd0d84b6703b3d398368363edb901f9e04f SHA256 e2fe1aa2e35bc59f5b32d3fee1dd36478ffd09b78fff08eeac1d607b02de4128 +MISC ChangeLog 852 RMD160 5a9fc2ebc5f7bc8f7d7122825dcdbe64ac5a661f SHA1 5b62b347f8202d995a4cc869336521e939f006e2 SHA256 18cf8cf4686cfe97867a7ae8556f3827ac38d3200cae4b0508a6e29624f167ee MISC metadata.xml 441 RMD160 6fdf3b9b855cded27dc7fd2adf256cac990b5325 SHA1 88b38eb4af6e62649392abc6a47185d6efa0f083 SHA256 7fb8be21d6987b9d9fede8268ca02cef93593036d2b8ea9e474c1c5de1f4464a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwqKTUACgkQgAnW8HDreRYweACguB1ljTG7r116ltbvo3jeL11T -awkAoLMXB7Bc+hwDHURia411mr3m96by -=erut ------END PGP SIGNATURE----- diff --git a/sci-geosciences/pydap_responses_kml/pydap_responses_kml-0.4.3.ebuild b/sci-geosciences/pydap_responses_kml/pydap_responses_kml-0.4.4.ebuild index c01bc4acc..fbff6b350 100644 --- a/sci-geosciences/pydap_responses_kml/pydap_responses_kml-0.4.3.ebuild +++ b/sci-geosciences/pydap_responses_kml/pydap_responses_kml-0.4.4.ebuild @@ -15,7 +15,7 @@ MY_P=${P//_/.} DESCRIPTION="NetCDF response for Pydap Data Access Protocol server." HOMEPAGE="http://pydap.org" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="pydap" SLOT="0" @@ -23,6 +23,6 @@ KEYWORDS="~amd64" IUSE="" DEPEND=">=dev-python/setuptools-0.6_rc3" -RDEPEND=">=sci-geosciences/pydap-3.0_rc8" +RDEPEND=">=sci-geosciences/pydap-3.0_rc10" S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_responses_matlab/ChangeLog b/sci-geosciences/pydap_responses_matlab/ChangeLog new file mode 100644 index 000000000..a0b57905c --- /dev/null +++ b/sci-geosciences/pydap_responses_matlab/ChangeLog @@ -0,0 +1,17 @@ +# ChangeLog for sci-geosciences/pydap_responses_matlab +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pydap_responses_matlab-0.1.0a (20 Aug 2010) + + 20 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_responses_matlab-0.1.0.ebuild, + +pydap_responses_matlab-0.1.0a.ebuild: + Version bump. + +*pydap_responses_matlab-0.1.0 (09 Aug 2010) + + 09 Aug 2010; Tim Cera <timcera@earthlink.net> + +pydap_responses_matlab-0.1.0.ebuild, +metadata.xml: + Initial ebuild. + diff --git a/sci-geosciences/pydap_responses_matlab/Manifest b/sci-geosciences/pydap_responses_matlab/Manifest new file mode 100644 index 000000000..53c0cb3fa --- /dev/null +++ b/sci-geosciences/pydap_responses_matlab/Manifest @@ -0,0 +1,4 @@ +DIST pydap.responses.matlab-0.1.0.a.tar.gz 32252 RMD160 a2b6ea6aa3e77c78bc73583f607fb5667888c22b SHA1 7932ccd0e47b58d67f704cb23b8e053c2f48f6b8 SHA256 923330b00576d87b67de5b1915bd2804e30b94d35b4dcb4c1b0f06ec6aa01ea9 +EBUILD pydap_responses_matlab-0.1.0a.ebuild 724 RMD160 31a91e094e4807235fd4df9ac5814b2d7b49030a SHA1 7a6d09ccffc9b5178cbbaac2abe48001f301c511 SHA256 f732710b3fce5071535d7108236ce9de78bc65347724b2ea780274491d1e0042 +MISC ChangeLog 498 RMD160 18cc15133d34883fcff30d0ae535963b6c6a10c1 SHA1 424b4535cb3a14d9c25592bd2525d7a5109e7fce SHA256 ec8d95e54c3b849abb045d1560a182e5256ebcfe27ae4b018fdb15246c11fbf7 +MISC metadata.xml 431 RMD160 17a0af696b696087ff77d1fa16e5bcc768dfd480 SHA1 0e244cb1242d563c989d3858326b338fe2f9671b SHA256 1ed00e6f053b405f4dcc2360db441d4a57a1882f82c7b5142ff891b3f402c5e3 diff --git a/sci-geosciences/pydap_responses_matlab/metadata.xml b/sci-geosciences/pydap_responses_matlab/metadata.xml new file mode 100644 index 000000000..76694d5e3 --- /dev/null +++ b/sci-geosciences/pydap_responses_matlab/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> +<email>timcera@earthlink.net</email> +<name>Tim Cera</name> +</maintainer> +<longdescription lang="en"> + Pydap is a pure Python library implementing the Data Access Protocol. + pydap_responses_matlab allows Pydap server to deliver data to Matlab. +</longdescription> +</pkgmetadata> diff --git a/sci-geosciences/pydap_responses_matlab/pydap_responses_matlab-0.1.0a.ebuild b/sci-geosciences/pydap_responses_matlab/pydap_responses_matlab-0.1.0a.ebuild new file mode 100644 index 000000000..b78fc2ccc --- /dev/null +++ b/sci-geosciences/pydap_responses_matlab/pydap_responses_matlab-0.1.0a.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils versionator + +MY_PN=${PN//_/.} +LETTER_PV="$(get_version_component_range 4)" +MAJMIN_PV="$(get_version_component_range 1-3)" +MY_P=${MY_PN}-${MAJMIN_PV}.${LETTER_PV} + +DESCRIPTION="NetCDF response for Pydap Data Access Protocol server." +HOMEPAGE="http://pydap.org" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="pydap" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-python/setuptools-0.6_rc3" +RDEPEND=">=sci-geosciences/pydap-3.0_rc10 + >=sci-libs/scipy-0.7.2-r1" + +S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_responses_netcdf/ChangeLog b/sci-geosciences/pydap_responses_netcdf/ChangeLog index c9ea6ce2a..d0439871a 100644 --- a/sci-geosciences/pydap_responses_netcdf/ChangeLog +++ b/sci-geosciences/pydap_responses_netcdf/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*pydap_responses_netcdf-0.1.3 (09 Aug 2010) + + 09 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_responses_netcdf-0.1.1.ebuild, + +pydap_responses_netcdf-0.1.3.ebuild: + Version bump. + 29 Jun 2010; Justin Lecher <jlec@gentoo.org> pydap_responses_netcdf-0.1.1.ebuild: Python ABI fixes diff --git a/sci-geosciences/pydap_responses_netcdf/Manifest b/sci-geosciences/pydap_responses_netcdf/Manifest index 15afc9496..70f653654 100644 --- a/sci-geosciences/pydap_responses_netcdf/Manifest +++ b/sci-geosciences/pydap_responses_netcdf/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST pydap.responses.netcdf-0.1.1.tar.gz 31791 RMD160 fc99af1beac2dcb9970c8ee9932eae42f2a98685 SHA1 8d5e330d94bace88685a6b0faace6501076807e6 SHA256 8cdd46ad9522e6479b79946d02cbed19844dd5eb6887eee8fca998301eba2630 -EBUILD pydap_responses_netcdf-0.1.1.ebuild 623 RMD160 fa5faf2798884ac58dc915bc7cfaf38878c3c4db SHA1 2af1555350d391bdd324c1804487593e341b0463 SHA256 8917295eab8d678b95dcc76ae78eeed740a36a0dd8bf62900b0ada5f3c181a94 -MISC ChangeLog 654 RMD160 07c7697ea561c8ccde48c1b4cec49ec3bbbf09ff SHA1 1de94981e891525860192e6394ee780cbb9e909c SHA256 f1bc1da0ef9ae0e4abbf4185a64c543b706e57dac96fae8dc1a754a19b59deb2 +DIST pydap.responses.netcdf-0.1.3.tar.gz 32181 RMD160 248973bc9a19bf0a6b96cf19464a2b03ccc35912 SHA1 87726556211a1d5124a048022c6f6e7b6651bf24 SHA256 615b9f646709b66987212a2689f3e460a011bc611e6cb9c57c08f8f1c73ca22b +EBUILD pydap_responses_netcdf-0.1.3.ebuild 599 RMD160 9d731fb24b4d35b194ba6382d739b55e26cf6a8a SHA1 4ec81a00d3801593d0ab1be6924ed3179820ca5a SHA256 de149d94d84e63d72f5aee7d92b5e26f53b1860c8f19f51e0664ca0aec54997f +MISC ChangeLog 844 RMD160 b379a54acc59f03f7d96f5a9a151d4899a43f462 SHA1 fd2cf3d3463025328230ace0466332fe665ded07 SHA256 5d45fa1d11b772bd7156b0e7f351056be210763e366157611ddb92e3ef312837 MISC metadata.xml 437 RMD160 023b92469a1982afa897749463745366006c6aea SHA1 10073dcac9b4a0782cfc07df0044937981f4aeba SHA256 0f2047cb589653cf1439a215c35f30c8fd402f5db96132e514c560b8cf1db258 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwqKZEACgkQgAnW8HDreRY9GQCgst4o83evRahox8UkOLuo9qN4 -BKYAn0HRlalLnQ9D/H+KD4imeGm4pomf -=VjyY ------END PGP SIGNATURE----- diff --git a/sci-geosciences/pydap_responses_netcdf/pydap_responses_netcdf-0.1.1.ebuild b/sci-geosciences/pydap_responses_netcdf/pydap_responses_netcdf-0.1.3.ebuild index 2dccc8e18..d86d206c4 100644 --- a/sci-geosciences/pydap_responses_netcdf/pydap_responses_netcdf-0.1.1.ebuild +++ b/sci-geosciences/pydap_responses_netcdf/pydap_responses_netcdf-0.1.3.ebuild @@ -16,7 +16,7 @@ MY_P=${P//_/.} DESCRIPTION="NetCDF response for Pydap Data Access Protocol server." HOMEPAGE="http://pydap.org" -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="pydap" SLOT="0" @@ -24,7 +24,7 @@ KEYWORDS="~amd64" IUSE="" DEPEND=">=dev-python/setuptools-0.6_rc3" -RDEPEND=">=sci-geosciences/pydap-3.0_rc8 +RDEPEND=">=sci-geosciences/pydap-3.0_rc10 >=dev-python/pupynere-1.0.13" S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_responses_wms/ChangeLog b/sci-geosciences/pydap_responses_wms/ChangeLog new file mode 100644 index 000000000..1f0648d2a --- /dev/null +++ b/sci-geosciences/pydap_responses_wms/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-geosciences/pydap_responses_wms +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pydap_responses_wms-0.4.5 (09 Aug 2010) + + 09 Aug 2010; Tim Cera <timcera@earthlink.net> + +pydap_responses_wms-0.4.5.ebuild, +metadata.xml: + Initial ebuild. + diff --git a/sci-geosciences/pydap_responses_wms/Manifest b/sci-geosciences/pydap_responses_wms/Manifest new file mode 100644 index 000000000..3b132274b --- /dev/null +++ b/sci-geosciences/pydap_responses_wms/Manifest @@ -0,0 +1,4 @@ +DIST pydap.responses.wms-0.4.5.tar.gz 36188 RMD160 1f3c864f8e0e66393bb6da0d6e44753a213ea5d2 SHA1 3a649746d8479d8e07d4bfe4eb4299435f9bb003 SHA256 f4711a0fb07cce2293c42cfd956543d20cff6bb2b65a1ab9696d36d15ad330b2 +EBUILD pydap_responses_wms-0.4.5.ebuild 617 RMD160 68376caa5809c885d02be93dd5564ef8d5552e0e SHA1 6a0527d94a05e93d9a85280db7581cc34865e0d5 SHA256 f673258e5540a96d905eb0772a7646e7fa8f939043b27f5e4f90c1b570fe66db +MISC ChangeLog 297 RMD160 9f7f62c38ad7b3e5f0bbe890d5e513f41c157021 SHA1 a84793c35abb920cf9c672891240d769eaf18502 SHA256 6db725622585a6c3df3b61d0c12be7e7ab1b709ddfb872f5e82e039bcf42a43f +MISC metadata.xml 452 RMD160 f1d15809c1e893048841c5495e2bb9665429ea34 SHA1 a64ad681a2b452c0338ec1cd28832ae40efbd119 SHA256 4e6e9e220c84203b6afd5d5e238193e77ba94e05deb779823e81500a8efd1717 diff --git a/sci-geosciences/pydap_responses_wms/metadata.xml b/sci-geosciences/pydap_responses_wms/metadata.xml new file mode 100644 index 000000000..f162ddfe0 --- /dev/null +++ b/sci-geosciences/pydap_responses_wms/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> +<email>timcera@earthlink.net</email> +<name>Tim Cera</name> +</maintainer> +<longdescription lang="en"> + Pydap is a pure Python library implementing the Data Access Protocol. + pydap_responses_wms allows Pydap server to deliver maps via Web Mapping + Service protocol. +</longdescription> +</pkgmetadata> diff --git a/sci-geosciences/pydap_responses_wms/pydap_responses_wms-0.4.5.ebuild b/sci-geosciences/pydap_responses_wms/pydap_responses_wms-0.4.5.ebuild new file mode 100644 index 000000000..44b4c9b1f --- /dev/null +++ b/sci-geosciences/pydap_responses_wms/pydap_responses_wms-0.4.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils + +MY_PN=${PN//_/.} +MY_P=${P//_/.} + +DESCRIPTION="NetCDF response for Pydap Data Access Protocol server." +HOMEPAGE="http://pydap.org" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="pydap" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-python/setuptools-0.6_rc3" +RDEPEND=">=sci-geosciences/pydap-3.0_rc10 + >=dev-python/paste-1.7.2 + dev-python/matplotlib" + +S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/pydap_responses_xls/ChangeLog b/sci-geosciences/pydap_responses_xls/ChangeLog new file mode 100644 index 000000000..c2721dad5 --- /dev/null +++ b/sci-geosciences/pydap_responses_xls/ChangeLog @@ -0,0 +1,16 @@ +# ChangeLog for sci-geosciences/pydap_responses_xls +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pydap_responses_xls-0.1.0a (20 Aug 2010) + + 20 Aug 2010; Tim Cera <timcera@earthlink.net> + -pydap_responses_xls-0.1.0.ebuild, +pydap_responses_xls-0.1.0a.ebuild: + Version bump. + +*pydap_responses_xls-0.1.0 (09 Aug 2010) + + 09 Aug 2010; Tim Cera <timcera@earthlink.net> + +pydap_responses_xls-0.1.0.ebuild, +metadata.xml: + Initial ebuild. + diff --git a/sci-geosciences/pydap_responses_xls/Manifest b/sci-geosciences/pydap_responses_xls/Manifest new file mode 100644 index 000000000..f392c9305 --- /dev/null +++ b/sci-geosciences/pydap_responses_xls/Manifest @@ -0,0 +1,4 @@ +DIST pydap.responses.xls-0.1.0.a.tar.gz 32100 RMD160 c8c02034a9c6bd4a22baeef501c1880001468b9e SHA1 20723474d5dd3207aa4310c5673b64c76acb16f1 SHA256 d819778ccd031a381e4736887532c769297b9828ada70dbb7c781daaf337d7ec +EBUILD pydap_responses_xls-0.1.0a.ebuild 721 RMD160 542215da829017d9800d1b7380329334efcbd32c SHA1 c22e0a57f3fe9e3cc88c4a7e403435c20b06dce6 SHA256 d53f3875cb27a3ce7aca80ace3231acad1187ab0af044f1d4b082aa76ccf25a2 +MISC ChangeLog 478 RMD160 8e118d4cbbef1b17c518275f898dc9a697aba304 SHA1 85050596e4e746a960030c76bfbcd0049d662a4e SHA256 1aeeb6a86d07a21cbd7508afbd1c1b1ea96ef74e6b8b1f6a229ab08f0c99fad7 +MISC metadata.xml 440 RMD160 5f308815380e0817a98e7021667dd9effb4ce58d SHA1 b85b46d59125dfb3e2e385925d204f75afffc4bb SHA256 d8ce7e732541b05559a46fd5df44dbee60e7f3ec2cd394846fc26708ae4eb163 diff --git a/sci-geosciences/pydap_responses_xls/metadata.xml b/sci-geosciences/pydap_responses_xls/metadata.xml new file mode 100644 index 000000000..03c7d27f3 --- /dev/null +++ b/sci-geosciences/pydap_responses_xls/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> +<email>timcera@earthlink.net</email> +<name>Tim Cera</name> +</maintainer> +<longdescription lang="en"> + Pydap is a pure Python library implementing the Data Access Protocol. + pydap_responses_xls allows Pydap server to deliver an Excel file of the + data. +</longdescription> +</pkgmetadata> diff --git a/sci-geosciences/pydap_responses_xls/pydap_responses_xls-0.1.0a.ebuild b/sci-geosciences/pydap_responses_xls/pydap_responses_xls-0.1.0a.ebuild new file mode 100644 index 000000000..e1a9b2bda --- /dev/null +++ b/sci-geosciences/pydap_responses_xls/pydap_responses_xls-0.1.0a.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils versionator + +MY_PN=${PN//_/.} +LETTER_PV="$(get_version_component_range 4)" +MAJMIN_PV="$(get_version_component_range 1-3)" +MY_P=${MY_PN}-${MAJMIN_PV}.${LETTER_PV} + +DESCRIPTION="Excel response for Pydap Data Access Protocol server." +HOMEPAGE="http://pydap.org" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="pydap" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=">=dev-python/setuptools-0.6_rc3" +RDEPEND=">=sci-geosciences/pydap-3.0_rc10 + >=dev-python/xlwt-0.7.2" + +S="$WORKDIR/$MY_P" diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 59015cd35..71eab3a7a 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,6 +1,4 @@ -DIST qgis_1.5.0.tar.gz 17360308 RMD160 bd371640740c4f6d589d5bb9f2677a0de46d4895 SHA1 f17b1a1175bdfad6f8a005470bfbb70eaeaf806a SHA256 f99748e3948b97894703dc81c2a3eba1f2796651e581957cc2c61c9b9dbab470 DIST qgis_sample_data.tar.gz 13601736 RMD160 048f6f984a8f2a03b0700896acfd6d345d53f1d0 SHA1 024aac8ac32c41ee9fe507599d197644c78f87a1 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a -EBUILD qgis-1.5.0.ebuild 2216 RMD160 d4837422775584de607fba078c742b92ef4753d4 SHA1 daa07ab2e9d5496fc42238f691a1559a33d93679 SHA256 16e09e0bae7febd7e04c7437423c84e2475e1d0b810d24d43a30ea9b984bfade -EBUILD qgis-9999.ebuild 2206 RMD160 32c2c06d4d2d3d7ac45929437ad285904bf927a5 SHA1 b473cff4a06d180201ea113ef79b4e5bc5bde073 SHA256 aa5767c50a69133b9f79bd12c9ec1779fbf441003b824bab295809fd296f6098 +EBUILD qgis-9999.ebuild 2318 RMD160 7eed3063fd8b5e12c60f79ba2a592211296af87c SHA1 862cf3b930822254bc4c3aff99aa2538954bdfc9 SHA256 833ee7c24184927869b243a517d813e6089e774d60bb2f34cbbd6554e881911d MISC ChangeLog 422 RMD160 ee66e01f9ff08026b752b0eb9e79d47cf48636ee SHA1 bbec1b99c475c90f77ba4631b538ac257a4c72c8 SHA256 0f4022f1564ce14fc98c276425c44060c3b764c2d87f969d42866e60a08a27a6 MISC metadata.xml 664 RMD160 586f9cc0e1fcdf0f7610a749dfd766b468487196 SHA1 45e80ed6b803f6e8cec7b25cd32443a17efe519d SHA256 85807d824103a40c5e236cdf9fc287c0bf70b511274818a2242ac6efc203ff21 diff --git a/sci-geosciences/qgis/qgis-1.5.0.ebuild b/sci-geosciences/qgis/qgis-1.5.0.ebuild deleted file mode 100644 index 189929230..000000000 --- a/sci-geosciences/qgis/qgis-1.5.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -PYTHON_USE_WITH="sqlite" -PYTHON_DEPEND="python? 2" -inherit python cmake-utils eutils - -DESCRIPTION="User friendly Geographic Information System" -HOMEPAGE="http://www.qgis.org/" -SRC_URI="http://download.osgeo.org/${PN}/src/${PN}_${PV}.tar.gz - examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples gps grass gsl postgres python sqlite" - -RDEPEND=">=sci-libs/gdal-1.6.1 - x11-libs/qt-core:4[qt3support] - x11-libs/qt-gui:4 - x11-libs/qt-svg:4 - x11-libs/qt-sql:4 - x11-libs/qt-webkit:4 - sci-libs/geos - sci-libs/proj - gps? ( - dev-libs/expat - sci-geosciences/gpsbabel - x11-libs/qwt - ) - grass? ( - >=sci-geosciences/grass-6.4.0_rc6 - ) - gsl? ( sci-libs/gsl ) - postgres? ( >=dev-db/postgresql-base-8 ) - python? ( dev-python/PyQt4[sql,svg] ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_configure() { - local mycmakeargs - mycmakeargs+=( - "-DQGIS_MANUAL_SUBDIR=/share/man/" - "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DBINDINGS_GLOBAL_INSTALL:BOOL=ON" - "-DQGIS_LIB_SUBDIR=$(get_libdir)" - "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis" - "-DWITH_INTERNAL_SPATIALITE:BOOL=OFF" - $(cmake-utils_use_with postgres POSTGRESQL) - $(cmake-utils_use_with grass) - $(cmake-utils_use_with gps EXPAT QWT) - $(cmake-utils_use_with gsl) - $(cmake-utils_use_with python BINDINGS) - $(cmake-utils_use_with sqlite SPATIALITE) - ) - use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc AUTHORS BUGS ChangeLog README SPONSORS CONTRIBUTORS || die - - newicon images/icons/qgis-icon.png qgis.png || die - make_desktop_entry qgis "Quantum GIS " qgis - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples" - fi -} - -pkg_postinst() { - if use postgres; then - elog "If you don't intend to use an external PostGIS server" - elog "you should install:" - elog " dev-db/postgis" - fi -} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index c548bae43..c2dad770d 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -18,24 +18,26 @@ SLOT="0" KEYWORDS="" IUSE="examples gps grass gsl postgres python sqlite" -RDEPEND=">=sci-libs/gdal-1.6.1 +RDEPEND=">=sci-libs/gdal-1.6.1[geos,postgres?,python?,sqlite?] x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4 x11-libs/qt-svg:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 sci-libs/geos - sci-libs/proj gps? ( dev-libs/expat sci-geosciences/gpsbabel x11-libs/qwt ) - grass? ( - >=sci-geosciences/grass-6.4.0_rc6 - ) + grass? ( >=sci-geosciences/grass-6.4.0_rc6[postgres?,python?,sqlite?] ) gsl? ( sci-libs/gsl ) - postgres? ( >=dev-db/postgresql-base-8 ) + postgres? ( + || ( + >=dev-db/postgresql-base-8.4 + >=dev-db/postgresql-server-8.4 + ) + ) python? ( dev-python/PyQt4[sql,svg] ) sqlite? ( dev-db/sqlite:3 )" @@ -52,14 +54,15 @@ src_configure() { local mycmakeargs mycmakeargs+=( "-DQGIS_MANUAL_SUBDIR=/share/man/" - "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DBINDINGS_GLOBAL_INSTALL:BOOL=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBINDINGS_GLOBAL_INSTALL=ON" "-DQGIS_LIB_SUBDIR=$(get_libdir)" "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis" "-DWITH_INTERNAL_SPATIALITE:BOOL=OFF" $(cmake-utils_use_with postgres POSTGRESQL) $(cmake-utils_use_with grass) - $(cmake-utils_use_with gps EXPAT QWT) + $(cmake-utils_use_with gps EXPAT) + $(cmake-utils_use_with gps QWT) $(cmake-utils_use_with gsl) $(cmake-utils_use_with python BINDINGS) $(cmake-utils_use_with sqlite SPATIALITE) diff --git a/sci-geosciences/seawater/ChangeLog b/sci-geosciences/seawater/ChangeLog index 2c069ad42..c254f8c61 100644 --- a/sci-geosciences/seawater/ChangeLog +++ b/sci-geosciences/seawater/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*seawater-1.0.4 (02 Sep 2010) + + 02 Sep 2010; Tim Cera <timcera@earthlink.net> -seawater-1.0.3.ebuild, + +seawater-1.0.4.ebuild: + Version bump. + 29 Jun 2010; Justin Lecher <jlec@gentoo.org> seawater-1.0.3.ebuild: Python ABI fixes diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest index 3e524a595..253117051 100644 --- a/sci-geosciences/seawater/Manifest +++ b/sci-geosciences/seawater/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST seawater-1.0.3.tar.bz2 25323 RMD160 988334858e63bf285fbae4bf9e417bfa80ea4605 SHA1 bbf65d83c4860a4c0a09110e5098d82667192361 SHA256 3a53659cc9887e27b53ba1c25c148c046b2b37f3c14658ce06aa9a7f67c9cf0c -EBUILD seawater-1.0.3.ebuild 541 RMD160 2ccf14083c3aaf61dfd4f4ff225774bd25afa435 SHA1 f187788e84625048bbe476096efe60eb59a2156a SHA256 de064e22c469fe0dca46a655524521e479b6dd21f8c7f5133c06804234356931 +DIST seawater-1.0.4.tar.bz2 21623 RMD160 67987b091ed7658820eef85cdd3643a1d44efe97 SHA1 a4df8f835ea3f613e0a7a365bb2809c28f6bab4e SHA256 d61a5a02c5ab3b3978e4c6446827fb6b15d9e2a00d9a7d498b4698a78187422d +EBUILD seawater-1.0.4.ebuild 516 RMD160 f0ab8568fe0999f89316a1c1785c9bbedf63079f SHA1 6e34e52af546d36c6ea8588d024a85a2a34a9427 SHA256 233148f654dcfcce692ed91c3af8bfd4f29c95000e0cf6a416d46a26fd3b0206 MISC ChangeLog 684 RMD160 1e9fca9d7d37eeeed7a4d7ac0a615b31fc6006d3 SHA1 efd8a3337e6f43f7acebd2eebfe46de12b2f4e96 SHA256 c35526ae2bdb1542e61aea076eb38d288e0e5de6ff3abe2d5b4a46a80f49af8c MISC metadata.xml 424 RMD160 de9765a168a8f73fb1619792052f99ae6b82b31f SHA1 312b6ace74947e5b79c87ef8bcd8401eb97e8a80 SHA256 a3d01f4a00b5bdb99c16fabf04ed584426c0542374d831b60d0dbf0bea91f3b1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwqKl0ACgkQgAnW8HDreRYUAgCgou3V7KljlpHAudpUOba5yCQM -05cAn3tG73Kds4RG24OUN1424Q8xtjgg -=/oox ------END PGP SIGNATURE----- diff --git a/sci-geosciences/seawater/seawater-1.0.3.ebuild b/sci-geosciences/seawater/seawater-1.0.4.ebuild index f05c47f5f..3b0156717 100644 --- a/sci-geosciences/seawater/seawater-1.0.3.ebuild +++ b/sci-geosciences/seawater/seawater-1.0.4.ebuild @@ -11,7 +11,7 @@ inherit distutils DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water." HOMEPAGE="http://ocefpaf.tiddlyspot.com/#python-seawater" -SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.bz2" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" LICENSE="MIT" SLOT="0" diff --git a/sci-geosciences/swmm/ChangeLog b/sci-geosciences/swmm/ChangeLog index 05ff3827f..22bf23dfc 100644 --- a/sci-geosciences/swmm/ChangeLog +++ b/sci-geosciences/swmm/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-geosciences/swmm -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*swmm-5.0.020 (04 Sep 2010) + + 04 Sep 2010; Tim Cera <timcera@earthlink.net> -swmm-5.0.018.ebuild, + +swmm-5.0.020.ebuild: + Version bump. + *swmm-5.0.018 (13 Dec 2009) 13 Dec 2009; Tim Cera <timcera@earthlink.net> -swmm-5.0.015.ebuild, diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest index 79ecf71bc..c7ec7cf5d 100644 --- a/sci-geosciences/swmm/Manifest +++ b/sci-geosciences/swmm/Manifest @@ -1,4 +1,4 @@ -DIST swmm50018engine.zip 310458 RMD160 8adef30b63b6542338795a19a7d7acb2b6bafa01 SHA1 7379d34c60ff09a68c7b0cea264cf70d0cdecbb6 SHA256 11aee6c33721c185cac1df5d9f70aa8ed0696a654c593fd24b42c00c191d1ee4 -EBUILD swmm-5.0.018.ebuild 1114 RMD160 b8d32be5a5ae31395b4fd7667dfdb232eededaa2 SHA1 ff422c3d89d3f7e0b33d99118e8f607149c02376 SHA256 510c0b5133aab405177b0e6d9a6febc423f887943ad2e84e1266d1e9666987bc +DIST swmm50020_engine.zip 335900 RMD160 84c98b89747c199838a2b7cc5b515d4050ba62fc SHA1 b1aca672cb25a60503f1c45bc94e8d644d72c1c8 SHA256 e454907ddcc9c736cd59fac36b63bbd898fbe52a563fb354c81add7ce6364c6e +EBUILD swmm-5.0.020.ebuild 1115 RMD160 d36f0f62f1da7a997194df859d27680da8bf1fc7 SHA1 86ca381026c35d00ba9fbd71acc9bc5fc763434a SHA256 f643b679eac40b940beae0a271c851f34805f9e2509435beb159af6750515ea0 MISC ChangeLog 580 RMD160 74bdeb4cbd288310db07f489e2105b35dae41133 SHA1 34542de2e649029fb48fb322bf6921f38531335d SHA256 db13d3d2de2a80cb85eae57723a2188d2fd7d071110eea84064811cf29debb36 MISC metadata.xml 374 RMD160 2bb55480c43fbb6eaff57bc1d8643525e6395fd9 SHA1 2a5c6d896728c30b19f695848054b62effe2bc7c SHA256 6f3376bf6ef1ca6589af1b63cfd13a8d6924da81972bd5b84a493181c0aba617 diff --git a/sci-geosciences/swmm/swmm-5.0.018.ebuild b/sci-geosciences/swmm/swmm-5.0.020.ebuild index 1fdda19b0..06d7e7bfa 100644 --- a/sci-geosciences/swmm/swmm-5.0.018.ebuild +++ b/sci-geosciences/swmm/swmm-5.0.020.ebuild @@ -6,7 +6,7 @@ inherit eutils versionator MY_PV=$(delete_all_version_separators) -MY_SRC="swmm${MY_PV}engine.zip" +MY_SRC="swmm${MY_PV}_engine.zip" DESCRIPTION="Storm Water Management Model - SWMM, hydrology, hydraulics, and water quality model." HOMEPAGE="http://www.epa.gov/ednnrmrl/models/swmm/index.htm" diff --git a/sci-libs/factory/ChangeLog b/sci-libs/factory/ChangeLog index 2d96df641..f8ef98577 100644 --- a/sci-libs/factory/ChangeLog +++ b/sci-libs/factory/ChangeLog @@ -2,6 +2,17 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*factory-3.1.1-r1 (04 Sep 2010) + + 04 Sep 2010; François Bissey <f.r.bissey@massey.ac.nz> + +factory-3.1.1-r1.ebuild: + Import Christopher's version of factory migrated to the autotools-utils + eclass. + + 22 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + factory-3.1.1.ebuild: + Keyword ~ppc (I have the hardware). + 11 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> files/factory-3.1.1-gentoo.diff: fix as-needed issue and parallel build diff --git a/sci-libs/factory/Manifest b/sci-libs/factory/Manifest index 118f6fc95..ffe0e67cb 100644 --- a/sci-libs/factory/Manifest +++ b/sci-libs/factory/Manifest @@ -1,5 +1,6 @@ AUX factory-3.1.1-gentoo.diff 5595 RMD160 79f9d841e5f16b2bcd94b56ad612758b9d16d332 SHA1 faaa19b719e871591e439b2bf8253deba543564d SHA256 2bb53e4646d3dd614763734caebe23fbd16fe131f5bf2f53913cbb94a2dbc5c3 DIST factory-3-1-1.tar.gz 540431 RMD160 63b5d71c93b1c0f628d758959822f61b0a9c702c SHA1 2b0e087de5ff4d4b63c003e1b6f9926577f17264 SHA256 1f86833248ef2bb5fd7820201d08df864bda2d8be58bc69255ecdca6fdf12c1b -EBUILD factory-3.1.1.ebuild 839 RMD160 5a2a8e99bcf1358da088027bf0ee5d978dc796e4 SHA1 af7e2434d92bb8180d36bf823a25dd9b500b07da SHA256 55f90155413a70ed8ca29e3b891761bba20157b63b45c07d6df29c7a1eb673b5 -MISC ChangeLog 812 RMD160 041f64bcd75db202ee8795b516a64fbb683f42ea SHA1 691c453a175a011cda3a1b0588e5571ea6859cae SHA256 a98ce4ccf37b77e328d21607e309ab38f4cd95eaaea85063977fbe015c5a45c8 +EBUILD factory-3.1.1-r1.ebuild 893 RMD160 991989bf14b71e079a10e8f4b0b46a4ac1a3f6af SHA1 7dbe7ac4926174ecb49dca101cc970641a076abe SHA256 563e3364cd626dfa035a93009cd097e5e903482a02d4866d0ea2d8d41e821231 +EBUILD factory-3.1.1.ebuild 844 RMD160 edf171189042319a6538731b485826afd88e075b SHA1 096537200aa0c9bb09604155a187a837d95e4385 SHA256 198af2494622ca1ab4598abc42311edfd9c4b8d79f0ef50f0de6991dfba2931a +MISC ChangeLog 1137 RMD160 e6a9e721db9c2646fecf89e5b4020c1be113f914 SHA1 ed48002174bce35fc6f4bb4dd4491a41d8707049 SHA256 e333c4ca7f694f0273a18c52661678891f0db93a2a503e193d204e05f49c5ce6 MISC metadata.xml 449 RMD160 c52a2832cc38539fe78127151e5310fd7661679d SHA1 412d825cc5c243ac255310f420908429c738c6d3 SHA256 d11c31ca1d60e6a48218955e83a5a1f710d7c47d5fcf798109b7ca83b46071bd diff --git a/sci-libs/factory/factory-3.1.1-r1.ebuild b/sci-libs/factory/factory-3.1.1-r1.ebuild new file mode 100644 index 000000000..9d242a78a --- /dev/null +++ b/sci-libs/factory/factory-3.1.1-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit autotools-utils versionator + +MY_PV=$(replace_all_version_separators '-') + +DESCRIPTION="C++ library for representing multivariate polynomials" +HOMEPAGE="http://www.mathematik.uni-kl.de/pub/Math/Singular/Factory" +SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${PN}-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~ppc" +IUSE="singular" + +RESTRICT="mirror" + +DEPEND="dev-libs/gmp + >=dev-libs/ntl-5.4.1" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}" + +AUTOTOOLS_IN_SOURCE_BUILD="1" +DOCS=( README NEWS ) +PATCHES=( "${FILESDIR}"/${P}-gentoo.diff ) + +pkg_setup() { + tc-export CC CPP CXX +} + +src_configure() { + myeconfargs=( $(use_with singular Singular) ) + + autotools-utils_src_configure +} + +# TODO: get rid of factories static libs ? diff --git a/sci-libs/factory/factory-3.1.1.ebuild b/sci-libs/factory/factory-3.1.1.ebuild index bb4c9af04..9be4da090 100644 --- a/sci-libs/factory/factory-3.1.1.ebuild +++ b/sci-libs/factory/factory-3.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${PN}-${MY_PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~ppc" IUSE="singular" diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog new file mode 100644 index 000000000..cf0de9304 --- /dev/null +++ b/sci-libs/fftw/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-libs/fftw +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*fftw-3.3_alpha1 (12 Sep 2010) + + 12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de> + +fftw-3.3_alpha1.ebuild, +metadata.xml: + Added alpha version to test mpi interface + diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest new file mode 100644 index 000000000..45895319a --- /dev/null +++ b/sci-libs/fftw/Manifest @@ -0,0 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9c73 SHA1 c831f88d297579f6feed13a726184dea7f2362f8 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c +DIST fftw-3.3alpha1.tar.gz 3466915 RMD160 97abe5966b86193bbe52a550bb18d180fdaa8a5d SHA1 a782c2b2f17780bccf491090e80dee22994776cc SHA256 b5e64e261e0379deb165fa56ec61cfb0990b6a8963b8ebec9a0f3e6bfbc76e4b +EBUILD fftw-3.3_alpha1.ebuild 3747 RMD160 3d538eb87a33b6827cda63de51ad8add8cdcfadd SHA1 12c53c94385682dd7879cc102b749714f192ecb9 SHA256 32da3793a6c466e8bc7dbd229b9b3ee67dbd15909fea595d6fa8f460325a3d95 +MISC ChangeLog 289 RMD160 fb93d48c3a7db5fb589e1f8e50bb727653e96b2d SHA1 bee05e3bccc3de28fd49b8559dde224e0ae6dec2 SHA256 bd3aa0a63f45726af28f5c82ee946a55604c3cfde38150ddee49c4b7b9d0e848 +MISC metadata.xml 637 RMD160 a7f1ab3fce5eae79531875234ca77532d0fd2cfa SHA1 b1cce6af4d119fc1b4f640b33e4ef1a8318a736c SHA256 a2798427fe8d4cbe97cf588e66bf54cc37d9650b9451290c2b6846cc6bb81e50 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkyNJaQACgkQy0OE/ans1/n96wCeNHj0tb5MEr3UMVrxwR245kMI +1LQAoIToghaV4qaZtrYecpZaJNrs9sir +=demm +-----END PGP SIGNATURE----- diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.3_alpha1.ebuild new file mode 100644 index 000000000..2c6abddbc --- /dev/null +++ b/sci-libs/fftw/fftw-3.3_alpha1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 +inherit flag-o-matic eutils toolchain-funcs autotools + +DESCRIPTION="Fast C library for the Discrete Fourier Transform" +HOMEPAGE="http://www.fftw.org/" +SRC_URI="http://www.fftw.org/${P//_}.tar.gz" + +DEPEND="mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +LICENSE="GPL-2" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="altivec doc fortran mpi openmp sse sse2 static-libs threads" + +S="${WORKDIR}/${P//_}" + +pkg_setup() { + FFTW_THREADS="--disable-threads --disable-openmp" + if use openmp; then + FFTW_THREADS="--disable-threads --enable-openmp" + elif use threads; then + FFTW_THREADS="--enable-threads --disable-openmp" + fi + if use openmp && + [[ $(tc-getCC)$ == *gcc* ]] && + [[ $(tc-getCC)$ != *apple* ]] && + ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || + ! has_version sys-devel/gcc[openmp] ) + then + ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " + ewarn "If you want to build fftw with OpenMP, abort now," + ewarn "and switch CC to an OpenMP capable compiler" + ewarn "Otherwise, we will build using POSIX threads." + epause 5 + FFTW_THREADS="--enable-threads --disable-openmp" + fi + FFTW_DIRS="single double longdouble" + use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch + + # fix info file for category directory + sed -i \ + -e 's/Texinfo documentation system/Libraries/' \ + doc/fftw3.info || die "failed to fix info file" + + rm m4/lt* m4/libtool.m4 + + AT_M4DIR=m4 eautoreconf + for x in ${FFTW_DIRS}; do + mkdir "${S}-${x}" || die + done +} + +src_configure() { + # filter -Os according to docs + replace-flags -Os -O2 + + local myconfcommon="--enable-shared + $(use_enable static-libs static) + $(use_enable fortran) + $(use_enable mpi) + ${FFTW_THREADS}" + + local myconfsingle="${myconfcommon} --enable-single" + local myconfdouble="${myconfcommon}" + local myconflongdouble="${myconfcommon} --enable-long-double" + if use sse2; then + myconfsingle="${myconfsingle} --enable-sse" + myconfdouble="${myconfdouble} --enable-sse2" + elif use sse; then + myconfsingle="${myconfsingle} --enable-sse" + fi + # altivec only helps singles, not doubles + if use altivec; then + myconfsingle="${myconfsingle} --enable-altivec" + fi + + for x in ${FFTW_DIRS}; do + cd "${S}-${x}" + einfo "Configuring for ${x} precision" + local p=myconf${x} + ECONF_SOURCE="${S}" econf ${!p} + done +} + +src_compile() { + for x in ${FFTW_DIRS}; do + cd "${S}-${x}" + einfo "Compiling for ${x} precision" + emake || die "emake for ${x} precision failed" + done +} + +src_test () { + # We want this to be a reasonably quick test, but that is still hard... + ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" + # Do not increase the number of threads, it will not help your performance + #local testbase="perl check.pl --nthreads=1 --estimate" + # ${testbase} -${p}d || die "Failure: $n" + for x in ${FFTW_DIRS}; do + cd "${S}-${x}/tests" + einfo "Testing ${x} precision" + emake -j1 check || die "emake test ${x} failed" + done +} + +src_install () { + # all builds are installed in the same place + # libs have distinuguished names; include files, docs etc. identical. + for x in ${FFTW_DIRS}; do + cd "${S}-${x}" + emake DESTDIR="${D}" install || die "emake install for ${x} failed" + done + + cd "${S}" + dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS + if use doc; then + cd doc + insinto /usr/share/doc/${PF} + doins -r html fftw3.pdf || die "doc install failed" + insinto /usr/share/doc/${PF}/faq + doins FAQ/fftw-faq.html/* + fi +} diff --git a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch b/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch new file mode 100644 index 000000000..ee9c12a4d --- /dev/null +++ b/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch @@ -0,0 +1,82 @@ +diff -Nur fftw-3.2.1.orig/configure.ac fftw-3.2.1/configure.ac +--- fftw-3.2.1.orig/configure.ac 2009-02-20 19:28:55.832163268 +0000 ++++ fftw-3.2.1/configure.ac 2009-02-26 15:02:37.533259854 +0000 +@@ -440,14 +440,15 @@ + AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no) + + if test "$enable_openmp"x != nox; then +- AX_OPENMP([THREADLIBS=" " ++ AX_OPENMP([THREADLIBS="$OPENMP_LIBS" + AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives]) + CFLAGS="$CFLAGS $OPENMP_CFLAGS"], +- [AC_MSG_ERROR([don't know how to enable OpenMP])]) ++ [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])]) ++else ++ THREADLIBS="" + fi + + dnl Check for threads library... +-THREADLIBS="" + if test "$enable_threads" = "yes"; then + # POSIX threads, the default choice: + if test -z "$THREADLIBS"; then +diff -Nur fftw-3.2.1.orig/m4/ax_openmp.m4 fftw-3.2.1/m4/ax_openmp.m4 +--- fftw-3.2.1.orig/m4/ax_openmp.m4 2009-02-20 19:28:55.792160754 +0000 ++++ fftw-3.2.1/m4/ax_openmp.m4 2009-02-26 15:02:08.887255943 +0000 +@@ -54,13 +54,18 @@ + done + []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS + ]) ++OPENMP_LIBS=" " + if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then + m4_default([$2],:) + else + if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then + OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp ++ if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then ++ OPENMP_LIBS="-lgomp" ++ fi + fi + m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])]) + fi + AC_SUBST(OPENMP_[]_AC_LANG_PREFIX[]FLAGS) ++AC_SUBST(OPENMP_LIBS) + ])dnl AX_OPENMP +diff -Nur fftw-3.2.1.orig/Makefile.am fftw-3.2.1/Makefile.am +--- fftw-3.2.1.orig/Makefile.am 2009-02-20 19:28:56.040169973 +0000 ++++ fftw-3.2.1/Makefile.am 2009-02-26 15:02:08.887255943 +0000 +@@ -36,6 +36,13 @@ + if SMP + if COMBINED_THREADS + COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la ++else ++lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la ++libfftw3@PREC_SUFFIX@_threads_la_SOURCES = ++libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ ++libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \ ++ libfftw3@PREC_SUFFIX@.la \ ++ threads/libfftw3@PREC_SUFFIX@_threads.la + endif + endif + +diff -Nur fftw-3.2.1.orig/threads/Makefile.am fftw-3.2.1/threads/Makefile.am +--- fftw-3.2.1.orig/threads/Makefile.am 2009-02-20 19:28:55.832163268 +0000 ++++ fftw-3.2.1/threads/Makefile.am 2009-02-26 15:02:08.887255943 +0000 +@@ -2,11 +2,7 @@ + -I$(top_srcdir)/rdft -I$(top_srcdir)/api + + if SMP +-if COMBINED_THREADS + noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la +-else +-lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la +-endif + endif + + # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@ +@@ -16,4 +12,5 @@ + openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c \ + vrank-geq1-rdft2.c f77api.c f77funcs.h + ++libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS) + libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml new file mode 100644 index 000000000..d7ac5d19f --- /dev/null +++ b/sci-libs/fftw/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<longdescription lang="en"> + The Fastest Fourier Transform in the West is a C subroutine library + for computing the Discrete Fourier Transform (DFT) in one or more + dimensions, of both real and complex data, and of arbitrary input + size. It is becoming the FFT library of choice for most + applications. Benchmarks, performed on a variety of platforms, show + that FFTW's performance is typically superior to that of other + publicly available FFT software. +</longdescription> +</pkgmetadata> diff --git a/sci-libs/fgsl/ChangeLog b/sci-libs/fgsl/ChangeLog new file mode 100644 index 000000000..e38e9a53a --- /dev/null +++ b/sci-libs/fgsl/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sci-libs/fgsl +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*fgsl-0.9.3 (17 Aug 2010) + + 17 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> +fgsl-0.9.3.ebuild, + +files/fgsl-0.9.3-sharedlibs.patch, +metadata.xml: + Initial import. Ebuild written by me. + diff --git a/sci-libs/fgsl/Manifest b/sci-libs/fgsl/Manifest new file mode 100644 index 000000000..8953fdd51 --- /dev/null +++ b/sci-libs/fgsl/Manifest @@ -0,0 +1,5 @@ +AUX fgsl-0.9.3-sharedlibs.patch 726 RMD160 91b13474678c68ae6539f58c4ccde108f28c62a7 SHA1 a4f750f13c8c8675aae0ae41b34ff62cc80ace1d SHA256 1c4a1bfb406e624f716c56c30345c56a49657148a10ce07ed573e0aed4e22ac3 +DIST fgsl-0.9.3.tar.gz 293761 RMD160 159162527256408ecf210b382461794b71c4738c SHA1 96e0e0c6b538377bdbe043c8c064e5d60ba6e428 SHA256 ba6c7d95ea73ea81435b6960fa9dc1e6e11d2da7fa145117111352d873c71ce9 +EBUILD fgsl-0.9.3.ebuild 1294 RMD160 74b7d87cd557b9e6dd5da02e99b6bddef3b86026 SHA1 022d6c238abdf1928abb1a307e6480b31de87e4d SHA256 ab4e08836ec64a638b526dcb2675c1724fa1331cee7a7dced8fec88db1e698ac +MISC ChangeLog 309 RMD160 f017ad09f8b076d3b6dcb9175f622c8765d855fb SHA1 35185c2df55598aa2d448ce257d9c30f2550496a SHA256 7d98c6c919befb8e84a4edf0064f50dee6cffeccd0072ef9919aadd85525bed6 +MISC metadata.xml 347 RMD160 52c569b75eaf0223827be9e12af42dd83e0df9e3 SHA1 af5df8f6d153077ca37f527ce46abbc49500dfca SHA256 5619b315d05f66962c028e3b5bdfa7dd5366d3e8e6853a9c680b0a71622a7b9b diff --git a/sci-libs/fgsl/fgsl-0.9.3.ebuild b/sci-libs/fgsl/fgsl-0.9.3.ebuild new file mode 100644 index 000000000..2d7bbfc9b --- /dev/null +++ b/sci-libs/fgsl/fgsl-0.9.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="A Fortran interface to the GNU Scientific Library" +HOMEPAGE="http://www.lrz.de/services/software/mathematik/gsl/fortran/" +SRC_URI="http://www.lrz.de/services/software/mathematik/gsl/fortran/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="static-libs" + +DEPEND=">=sci-libs/gsl-1.14" +RDEPEND="${DEPEND}" +#TODO: make docs + +src_prepare() { + epatch "${FILESDIR}"/${P}-sharedlibs.patch + use amd64 && ln -s interface/integer_ilp64.finc integer.finc + use x86 && ln -s interface/integer_ilp32.finc integer.finc + cat <<- EOF > "${S}/make.inc" + F90 = $(tc-getFC) + CC = $(tc-getCC) + GSL_LIB = $(pkg-config --libs gsl) + GSL_INC = $(pkg-config --cflags gsl) + PREFIX = /usr + ARFLAGS = -csrv + FPP = -cpp + LIB = $(get_libdir) + EOF + use static-libs && echo "STATIC_LIBS = yes" >> "${S}/make.inc" +} + +src_configure() { + return +} + +src_install() { + dodoc NEWS README || die + ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 + ln -s lib${PN}.so.0.0.0 lib${PN}.so + dolib.so lib${PN}.so* || die + insinto /usr/include + doins ${PN}.mod || die + if use static-libs ; then + newlib.a lib${PN}_$(tc-getFC).a lib${PN}.a || die + fi +} diff --git a/sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch b/sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch new file mode 100644 index 000000000..401d75098 --- /dev/null +++ b/sci-libs/fgsl/files/fgsl-0.9.3-sharedlibs.patch @@ -0,0 +1,27 @@ +--- Makefile.orig 2010-05-01 23:35:17.000000000 +0200 ++++ Makefile 2010-08-17 10:15:38.117694977 +0200 +@@ -14,7 +14,23 @@ + @cd tests; $(MAKE) clean; $(MAKE) -j 8 run + + +-lib : libfgsl_$(F90).a ++ifeq ($(STATIC_LIBS),) ++lib : libfgsl.so.0.0.0 ++else ++lib : libfgsl_$(F90).a libfgsl.so.0.0.0 ++endif ++ ++libfgsl.so.0.0.0: fgsl.lo fgsl_utils.lo ++ $(F90) -shared $(LDFLAGS) -Wl,-soname,libfgsl.so.0 -o $@ $^ $(GSL_LIB) ++ ++fgsl.lo : fgsl.f90 api/*.finc interface/*.finc ++ $(F90) -fPIC $(FFLAGS) $(DEBUG) -c fgsl.f90 -o $@ ++ ++%.lo: %.f90 ++ $(F90) -fPIC $(FFLAGS) $(DEBUG) -c -o $@ $^ ++ ++%.lo: %.c ++ $(CC) -fPIC -c $(GSL_INC) $(CFLAGS) $(CDEBUG) -o $@ $^ + + libfgsl_$(F90).a : fgsl.o fgsl_utils.o + ar $(ARFLAGS) libfgsl_$(F90).a $^ diff --git a/sci-libs/fgsl/metadata.xml b/sci-libs/fgsl/metadata.xml new file mode 100644 index 000000000..111e6a558 --- /dev/null +++ b/sci-libs/fgsl/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sci</herd> + <maintainer> + <email>xarthisius@gentoo.org</email> + <name>Kacper Kowalik</name> + </maintainer> + <longdescription>FGSL: A Fortran interface to the GNU Scientific Library</longdescription> +</pkgmetadata> diff --git a/sci-libs/m4ri/ChangeLog b/sci-libs/m4ri/ChangeLog index 7427c0072..d2f04b778 100644 --- a/sci-libs/m4ri/ChangeLog +++ b/sci-libs/m4ri/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for sci-libs/m4ri -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*m4ri-20100221 (20 Aug 2010) + + 20 Aug 2010; Christopher Schwan <cschwan@students.uni-mainz.de> + +m4ri-20100221.ebuild: + Version bump - ebuild taken from sage-on-gentoo overlay without + changes. New ebuild was migrated to autotools-utils and has an option + for USE=openmp + *m4ri-20090512 (03 Nov 2009) 03 Nov 2009; François Bissey <f.r.bissey@massey.ac.nz> diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest index d9c6f4763..0f9a77a6b 100644 --- a/sci-libs/m4ri/Manifest +++ b/sci-libs/m4ri/Manifest @@ -1,4 +1,6 @@ DIST m4ri-20090512.tar.gz 983208 RMD160 9423cace7197e2444a760448c7d7a08ea77c068a SHA1 f573bc1522100a400c16db8693baa5841515f574 SHA256 504d9630cc5af564af44e77daf2720f4bcd92e3d825b69f2a92a2ba547beab62 -EBUILD m4ri-20090512.ebuild 451 RMD160 29875f91d075d08d48dd38ba4ce6ffaff7234e56 SHA1 6a249fb607cb8dfd2c67118c9eb616108bb7cf25 SHA256 2f324c1c08301ee88954cea98d66ac7fcf49be7dc8ccb43cef699c780873d5c3 -MISC ChangeLog 369 RMD160 45a1445e82f56188a268b35ac912eb10fcd4e2dd SHA1 841af47b05e521e0bfcb4f12368ad53a332137f6 SHA256 e361817e730377c01f2de9e7e210c39a2e34df4b2b14202aa172bba9fe76072a +DIST m4ri-20100221.tar.bz2 1236812 RMD160 2a1436aa1fbfaec3e7ffeaff1fbbf799116c55fc SHA1 35b1829595e01c64cccf0d1101ad68a89697a544 SHA256 8463aaae43ec5caef6087a819d78cc7e0dc6a24ac049849142c0290b238ab68d +EBUILD m4ri-20090512.ebuild 451 RMD160 0794f9bf0996b0396ebcbaab7bc92faa87ec765f SHA1 f27ae20486e4945866dc813081ac2d6b472f340e SHA256 fa09816f04e16e4199201b52da4ac34f2db256d449169a2db701ae6d37970672 +EBUILD m4ri-20100221.ebuild 764 RMD160 1be9cd486e04017f744afc42a699b06041896037 SHA1 671e904b4de233e586566a3041f794056770afd1 SHA256 62b3346bbf4d941ed699d16d459d629c8c64da8ebf81ecbd1da4c464d8f29011 +MISC ChangeLog 646 RMD160 6219513fe21b43717665dbeb84ae6e6c43a6a8f4 SHA1 16cc86c36458b03e6624383f2ee5fa0325f0850e SHA256 b0db9d44257be73882660f8bf0c22345c32bea28c34888a8ffeabc23ae33b693 MISC metadata.xml 554 RMD160 1d6f59fd4c999d8c74276f67dc648ac3410c55d7 SHA1 f6aa9c89402b853a9ae0f7617c3f8054251a61ea SHA256 c283cc76ddc3df9e929448563f59ef524db721f5017a92ee02bb18b1c8fdce1e diff --git a/sci-libs/m4ri/m4ri-20090512.ebuild b/sci-libs/m4ri/m4ri-20090512.ebuild index 4d5bdb9b6..e171f2bfe 100644 --- a/sci-libs/m4ri/m4ri-20090512.ebuild +++ b/sci-libs/m4ri/m4ri-20090512.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ diff --git a/sci-libs/m4ri/m4ri-20100221.ebuild b/sci-libs/m4ri/m4ri-20100221.ebuild new file mode 100644 index 000000000..b6ba7f0af --- /dev/null +++ b/sci-libs/m4ri/m4ri-20100221.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit autotools-utils + +MY_P="lib${P}" + +DESCRIPTION="Method of four russian for inversion (M4RI)" +HOMEPAGE="http://m4ri.sagemath.org/" +SRC_URI="mirror://sage/spkg/standard/${MY_P}.spkg -> ${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="debug openmp static-libs" + +RESTRICT="mirror" + +DEPEND="openmp? ( >=sys-devel/gcc-4.2[openmp] )" +RDEPEND="" + +S="${WORKDIR}/${MY_P}/src" + +DOCS=( AUTHORS README ) + +src_configure() { + # cachetune option is not available, because it kills (at least my) X when I + # switch from yakuake to desktop + myeconfargs=( + $(use_with openmp) + ) + + autotools-utils_src_configure +} diff --git a/sci-libs/matio/ChangeLog b/sci-libs/matio/ChangeLog index 6d402fd7c..37c11651a 100644 --- a/sci-libs/matio/ChangeLog +++ b/sci-libs/matio/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for sci-libs/matio -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*matio-1.3.4 (10 Aug 2010) + + 10 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> -matio-1.3.3.ebuild, + -files/matio-1.3.3-makefile.patch, +matio-1.3.4.ebuild, + +files/matio-1.3.4-autotools.patch: + Version bump. Ebuild modernisation. Disabling doc generation (bug #330237) + *matio-1.3.3 (22 Jan 2009) 22 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest index 5bd6b2a63..0edd5d54d 100644 --- a/sci-libs/matio/Manifest +++ b/sci-libs/matio/Manifest @@ -1,5 +1,5 @@ -AUX matio-1.3.3-makefile.patch 1002 RMD160 f0714522a3e6cebb5ce22e446022a8530f236616 SHA1 34a0c2654b120e886b1bcfcf5154a33fa0c7150c SHA256 88f3bc24bb707c5f25cfebb09a807704f289c24bfbde655443ff110bd7fa36b9 -DIST matio-1.3.3.tar.gz 418794 RMD160 acc835c83fc615978c9ba407f8c17b79afdafb9a SHA1 3f8c0dd2eb1abe4ded77ecfca6376f171bcff66c SHA256 5ab18a4e31e7688623a74493f06a493b857c8a58f60c67673b7b7ff4a4cf08b0 -EBUILD matio-1.3.3.ebuild 1183 RMD160 2b9d43f35ccd15e172ef4bd0f1d7c3b8ac9c4a3c SHA1 b9a6f51c13efbe642dfe7fdf9f15fdd6ea71343e SHA256 a4e6474bb652fb8686f996df67eff7e7da3c0616391bb67e309c069f7a15b211 -MISC ChangeLog 866 RMD160 bc77215c88e442070cd2ba96f108fbf4365b4abf SHA1 a09a8089008362147da6a103092c1a732e448dde SHA256 5d329cc4bb8bdd647d46dbe05376272006a22f03f3489c8b04142654371de8a4 +AUX matio-1.3.4-autotools.patch 1087 RMD160 996771a8d033247fb701356a96b71ea56c5cb97f SHA1 0ae3f6e5e75ae0c211ab43ef4b7ac6d3948d107e SHA256 37a572925ae026e42b682b1a816ed0094e7e906b76bdde098e775b5d1c203f7c +DIST matio-1.3.4.tar.gz 450343 RMD160 3a0f2fe1260e48af0fb9e501d0af1383cefe5dd3 SHA1 721b9b57f2437850dd114acca1f422622e2c47e2 SHA256 7261880b18a661e5d206b4e479d4334b47549f093130df42f7204fd05dfe0bc5 +EBUILD matio-1.3.4.ebuild 1127 RMD160 98bb6afc3c1361a100b3f392102f3ed8d618b1e5 SHA1 88d02c1c3f5a5a2de6e54f377e3f23befa584ebc SHA256 4d5c6ae5206abfb30d2831c2d53577b2ccc5b0dae41c8fd349e769e26f20ba07 +MISC ChangeLog 1144 RMD160 4d8c5db6e907cc1e57914ab22403d11cd56abdf7 SHA1 3ca196ded85f063d56f837c129d3504fdcfdba36 SHA256 a713f381d19c65654805b02e2b2e5f5699bf3aada7f07c931ca4e81d588a7f4e MISC metadata.xml 313 RMD160 974b1335daa5b99cc1afc3d1592ca45e64b12259 SHA1 0e01789e32462b40a3d646d9de831a5987de65d2 SHA256 d7d339f2978f3b717d87eeffa70343181e30d19b42a74a498291bf641353e9aa diff --git a/sci-libs/matio/files/matio-1.3.3-makefile.patch b/sci-libs/matio/files/matio-1.3.4-autotools.patch index 49b192314..c9e6a0412 100644 --- a/sci-libs/matio/files/matio-1.3.3-makefile.patch +++ b/sci-libs/matio/files/matio-1.3.4-autotools.patch @@ -1,6 +1,17 @@ ---- src/Makefile.am.orig 2009-01-22 09:41:46.000000000 +0000 -+++ src/Makefile.am 2009-01-22 11:12:09.000000000 +0000 -@@ -17,14 +17,16 @@ +--- configure.ac.orig 2010-08-10 20:36:52.000000000 +0100 ++++ configure.ac 2010-08-10 20:39:03.000000000 +0100 +@@ -5,7 +5,7 @@ + AC_INIT([MATIO],[1.3.4],[cch@isl-inc.com],[]) + AC_CONFIG_SRCDIR([src/matio.h]) + AC_CONFIG_AUX_DIR(config) +-AC_CONFIG_MACRO_DIR([m4]) ++ + dnl AM_INIT_AUTOMAKE([-no-undefined]) + AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE +--- src/Makefile.am.orig 2010-08-10 20:31:41.000000000 +0100 ++++ src/Makefile.am 2010-08-10 20:34:44.000000000 +0100 +@@ -17,6 +17,7 @@ lib_LTLIBRARIES = libmatio.la libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \ mat5.c mat4.c mat.c @@ -8,9 +19,7 @@ if ENABLE_FORTRAN AM_FCFLAGS = -I. -I$(top_builddir)/src/fortran - AM_LDFLAGS += $(FCLDFLAGS) -- nodist_include_HEADERS = $(top_builddir)/src/matio.mod -+ nodist_include_HEADERS = $(top_builddir)/src/matio.mod +@@ -25,6 +26,7 @@ noinst_HEADERS += fortran/create.f90 fortran/read_data.f90 \ fortran/write_data.f90 fortran/write.f90 libmatio_la_SOURCES += fortran/matio_internal.c fortran/matio.f90 @@ -18,12 +27,3 @@ endif dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -@@ -32,7 +34,7 @@ - -e 's,\/,\\,g' - - doc: -- -+ - - print: - @list='$(libmatio_a_SOURCES)'; \ diff --git a/sci-libs/matio/matio-1.3.3.ebuild b/sci-libs/matio/matio-1.3.3.ebuild deleted file mode 100644 index b2f8c2df5..000000000 --- a/sci-libs/matio/matio-1.3.3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -inherit eutils fortran autotools - -DESCRIPTION="Library for reading and writing matlab files" -HOMEPAGE="http://sourceforge.net/projects/matio/" -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples fortran" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -DEPEND="doc? ( app-doc/doxygen virtual/latex-base )" -RDEPEND="" - -#### Remove the following line when moving this ebuild to the main tree! -RESTRICT="mirror" - -pkg_setup() { - use fortran && fortran_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - eautoreconf -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - --enable-shared \ - --disable-test \ - $(use_enable fortran) \ - $(use_enable doc docs) -} - -src_install() { - emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - install || die "emake install failed" - dodoc README ChangeLog - if use doc; then - insinto /usr/share/doc/${PF} - doins -r doxygen/html - fi - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins test/test* - insinto /usr/share/${PN} - doins share/test* - fi -} diff --git a/sci-libs/matio/matio-1.3.4.ebuild b/sci-libs/matio/matio-1.3.4.ebuild new file mode 100644 index 000000000..9cd4fc1aa --- /dev/null +++ b/sci-libs/matio/matio-1.3.4.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +inherit eutils autotools + +DESCRIPTION="Library for reading and writing matlab files" +HOMEPAGE="http://sourceforge.net/projects/matio/" +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~x86" +# disabling (until fix) doxygen doc generation +IUSE="examples fortran static-libs" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +#DEPEND="doc? ( app-doc/doxygen virtual/latex-base )" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-autotools.patch + eautoreconf +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --enable-shared \ + --disable-test \ + $(use_enable fortran) \ + $(use_enable doc docs) \ + $(use_enable static-libs static) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc README ChangeLog + #if use doc; then + # insinto /usr/share/doc/${PF} + # doins -r doxygen/html || die + #fi + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins test/test* || die + insinto /usr/share/${PN} + doins share/test* || die + fi +} diff --git a/sci-libs/modglue/ChangeLog b/sci-libs/modglue/ChangeLog index 2bf81c10a..9ac3b987d 100644 --- a/sci-libs/modglue/ChangeLog +++ b/sci-libs/modglue/ChangeLog @@ -1,7 +1,27 @@ # ChangeLog for sci-libs/modglue -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + modglue-1.16.ebuild, files/modglue-1.16-lib64.patch: + Properly fix the lib/lib64 troubles. + + 21 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + modglue-1.16.ebuild, +files/modglue-1.16-parallelmake.patch: + Fix parallel make. + + 20 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + modglue-1.16.ebuild, +files/modglue-1.16-lib64.patch: + Keyword ~amd64 and apply a band aid patch for it. + +*modglue-1.16 (19 Aug 2010) + + 19 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + -modglue-1.13.ebuild, -files/modglue-1.13-gcc4.4.patch, + -files/modglue-1.13-makefile.in.patch, +modglue-1.16.ebuild, + +files/modglue-1.16-ldflags.patch: + Bump modglue to 1.16 - now respect LDFLAGS + 03 Nov 2009; François Bissey <f.r.bissey@massey.ac.nz> modglue-1.13.ebuild, +files/modglue-1.13-gcc4.4.patch: gcc-4.4 love diff --git a/sci-libs/modglue/Manifest b/sci-libs/modglue/Manifest index 7795b88cd..8b95c1f5f 100644 --- a/sci-libs/modglue/Manifest +++ b/sci-libs/modglue/Manifest @@ -1,6 +1,7 @@ -AUX modglue-1.13-gcc4.4.patch 272 RMD160 fdc49c22d731157e155792d62a093ee56b37b157 SHA1 677697f01c4eeefb3b7bd5e0fde1443daee4cecb SHA256 c8049e2155c1549254061d0cf9d8043f0304ebe6140675e142c6d53cf3e39882 -AUX modglue-1.13-makefile.in.patch 461 RMD160 94417fa61396e66981b99af0ca5f0d4a4da19d27 SHA1 04ae505fdc883797c7aa1f20b59fcef7900d061a SHA256 9f83631922fbbf5a1c8bf1546849e6882be6ae160b0d8a27b62e74aa1d8346bd -DIST modglue-1.13.tar.gz 89907 RMD160 f493e49d6d80bb9dbc418db6b079958708a01c69 SHA1 a9c839653fb5e654360104bdc9d9f20afb4ae78b SHA256 a36a3bea7cd9eb5d9c03d44029269023d1310870bbf89da35a0edf2ece27fdfe -EBUILD modglue-1.13.ebuild 893 RMD160 be08a115d42c87a60e163eb162a93fe64f585f11 SHA1 c323ea692d54d4e15448b3f18581c204e278c392 SHA256 efdfdf27434d95031b48641df21ec3377098d259f5332bdf390cde32f1c8402c -MISC ChangeLog 365 RMD160 88d725b42a2578b1eb0cb42f703d9d12c54a12a0 SHA1 9a670413fd3365c1a0ee25de4082b915081d7f7c SHA256 19c026a002771383b00cd1ed31d4b4edecd49c71eda87e01527df3ec2b56ca42 +AUX modglue-1.16-ldflags.patch 687 RMD160 32369f6aebc57f065dffc41942e45f4b9e67896f SHA1 5376c23d2d3115b08efb8e13b5ba7f794231d541 SHA256 be2c3788f96a99a101421fc5ee4ac49d3bfcdd5b5056fcd466cc4e3d6db8dcf7 +AUX modglue-1.16-lib64.patch 2145 RMD160 704320cca279e61366268675b0cca3af69843c26 SHA1 14a670705faa25ed4f59cf31cb6d0cb12a15e131 SHA256 2c3526bc68405feaba50caa00c7e04f1ea2579cdcc4565532085b90c2480ee95 +AUX modglue-1.16-parallelmake.patch 1475 RMD160 57d087fa3d8cda09bf9bc420a01196e928f5c4c5 SHA1 1deb19735157281c22b8f17251c67f4053917c92 SHA256 110d385e42b4013b0cf8cdb1c7b74d1c103e12ad79eb7264b367d6a126b8e5ec +DIST modglue-1.16.tar.gz 89987 RMD160 46e0ee58004dfbdcc34862d73ec85d699b2dece0 SHA1 3f47c261c81fdd0ff4ba2dc7958dd4d83dcffd1b SHA256 1da62910d7171cb5547c0757c366e5338f889c0155c33375e891df75e2ee429e +EBUILD modglue-1.16.ebuild 1183 RMD160 fe803f7db9259b45afec7208cfc0b069d6bd008a SHA1 59fcc5773f4078f4ce40104a22cb3cc24ac68e51 SHA256 d1f6fc1312257548043461435184184e4956628be332ff1e98a753f0618be97d +MISC ChangeLog 1250 RMD160 2014b7fcd1dad066610a95cf4330fb08c1ca6d7d SHA1 1c8b903ac2181779c3486fbab502da988cc41b9d SHA256 05307b5c1e5931a01c434572bcec3a7efd90f0be566748f32c451fd0bc439669 MISC metadata.xml 885 RMD160 34165bffafd7c55b7d84155b39bd32a1251e6aa7 SHA1 6386d45d76662564b2f064fe1379d7cf69b83c3f SHA256 930e55dd4ad9b6e93ca69134cd181210c6bf6c114a4b9a7a6200ea47ee465eb4 diff --git a/sci-libs/modglue/files/modglue-1.13-gcc4.4.patch b/sci-libs/modglue/files/modglue-1.13-gcc4.4.patch deleted file mode 100644 index 9c4e25981..000000000 --- a/sci-libs/modglue/files/modglue-1.13-gcc4.4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/modglue/pipe.hh~ 2009-11-03 22:39:45.000000000 +1300 -+++ include/modglue/pipe.hh 2009-11-03 22:39:45.000000000 +1300 -@@ -25,6 +25,7 @@ - #ifndef pipe_hh_ - #define pipe_hh_ - -+#include <cstdio> - #include <string> - #include <string.h> - #include <sigc++/sigc++.h> diff --git a/sci-libs/modglue/files/modglue-1.13-makefile.in.patch b/sci-libs/modglue/files/modglue-1.13-makefile.in.patch deleted file mode 100644 index 6f0860e5d..000000000 --- a/sci-libs/modglue/files/modglue-1.13-makefile.in.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.in.orig 2009-04-03 22:17:57.000000000 +1300 -+++ src/Makefile.in 2009-04-03 22:18:19.000000000 +1300 -@@ -103,7 +103,6 @@ - @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin - @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue - ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/lib -- mv ${DESTDIR}@prefix@/lib/libmodglue*.so ${DEVDESTDIR}@prefix@/lib - # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib - ${FPHASE} - ${IPHASE} ptywrap ${DESTDIR}@prefix@/bin diff --git a/sci-libs/modglue/files/modglue-1.16-ldflags.patch b/sci-libs/modglue/files/modglue-1.16-ldflags.patch new file mode 100644 index 000000000..4c2bbbc27 --- /dev/null +++ b/sci-libs/modglue/files/modglue-1.16-ldflags.patch @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig 2010-08-19 23:38:00.081085063 +1200 ++++ src/Makefile.in 2010-08-19 23:38:56.018083508 +1200 +@@ -15,8 +15,8 @@ + LTRELEASE = `echo ${RELEASE} | sed -e "s/\./:/g"` + + CPHASE = ${LIBTOOL} --tag=CXX --mode=compile @CXX@ -c @CFLAGS@ +-LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@/@libdir@ @LIBS@ +-MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ ++LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LDFLAGS@ -rpath @prefix@/@libdir@ @LIBS@ ++MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ @LDFLAGS@ + IPHASE = ${LIBTOOL} --mode=install @INSTALL@ + FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@ + diff --git a/sci-libs/modglue/files/modglue-1.16-lib64.patch b/sci-libs/modglue/files/modglue-1.16-lib64.patch new file mode 100644 index 000000000..e67adba2e --- /dev/null +++ b/sci-libs/modglue/files/modglue-1.16-lib64.patch @@ -0,0 +1,61 @@ +--- Makefile.in.orig 2010-03-04 10:34:54.000000000 +1300 ++++ Makefile.in 2010-08-23 23:21:34.931886424 +1200 +@@ -3,6 +3,9 @@ + + .PHONY: all install library static examples uninstall clean distclean + ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++ + all: library + #examples + +@@ -17,8 +20,8 @@ + + install: + ( cd src && $(MAKE) install ); +- @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/@libdir@/pkgconfig +- @INSTALL@ -m 644 modglue.pc ${DESTDIR}@prefix@/@libdir@/pkgconfig/ ++ @INSTALL@ -d -m 755 ${DESTDIR}@libdir@/pkgconfig ++ @INSTALL@ -m 644 modglue.pc ${DESTDIR}@libdir@/pkgconfig/ + @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/share/man/man1 + @INSTALL@ man/man1/prompt.1 ${DESTDIR}@prefix@/share/man/man1 + @INSTALL@ man/man1/ptywrap.1 ${DESTDIR}@prefix@/share/man/man1 +--- src/Makefile.in.orig 2010-03-04 10:34:54.000000000 +1300 ++++ src/Makefile.in 2010-08-23 23:21:41.165883457 +1200 +@@ -1,6 +1,8 @@ + + + MACTEST= @MAC_OS_X@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ + + ifeq ($(strip $(MACTEST)),) + LIBTOOL = libtool +@@ -18,7 +20,7 @@ + LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@/@libdir@ @LIBS@ + MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ + IPHASE = ${LIBTOOL} --mode=install @INSTALL@ +-FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@ ++FPHASE = ${LIBTOOL} --mode=finish @libdir@ + + TIMESTAMP = -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\" + +@@ -98,13 +100,13 @@ + + install: library tools + @INSTALL@ -m 755 -d ${DESTDIR}@prefix@ +- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@ +- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/@libdir@ ++ @INSTALL@ -m 755 -d ${DESTDIR}@libdir@ ++ @INSTALL@ -m 755 -d ${DEVDESTDIR}@libdir@ + @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin + @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue +- ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/@libdir@ ++ ${IPHASE} libmodglue.la ${DESTDIR}@libdir@ + ifneq ($(DESTDIR),$(DEVDESTDIR)) +- mv ${DESTDIR}@prefix@/@libdir@/libmodglue*.so ${DEVDESTDIR}@prefix@/@libdir@ ++ mv ${DESTDIR}@libdir@/libmodglue*.so ${DEVDESTDIR}@libdir@ + endif + # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib + ${FPHASE} diff --git a/sci-libs/modglue/files/modglue-1.16-parallelmake.patch b/sci-libs/modglue/files/modglue-1.16-parallelmake.patch new file mode 100644 index 000000000..b6d675084 --- /dev/null +++ b/sci-libs/modglue/files/modglue-1.16-parallelmake.patch @@ -0,0 +1,53 @@ +--- Makefile.in.orig 2010-08-21 22:04:51.877629329 +1200 ++++ Makefile.in 2010-08-21 22:06:12.887628815 +1200 +@@ -7,7 +7,7 @@ + #examples + + library: +- ( cd src && $(MAKE) ); ++ ( cd src && $(MAKE) library tools ); + + static: + ( cd src && $(MAKE) static ); +--- src/Makefile.in.orig 2010-08-21 22:05:26.411630332 +1200 ++++ src/Makefile.in 2010-08-21 22:08:20.961629492 +1200 +@@ -49,21 +49,21 @@ + + #------- Tests ---------------------------------------- + +-test_child_process: test_child_process.o ++test_child_process: library test_child_process.o + ${MPHASE} -o test_child_process $< libmodglue.la + +-test_ext_process: test_ext_process.o ++test_ext_process: library test_ext_process.o + ${MPHASE} -o test_ext_process $< libmodglue.la + +-test_pipe: test_pipe.o ++test_pipe: library test_pipe.o + ${MPHASE} -o test_pipe $< libmodglue.la + +-test_writes: test_writes.o ++test_writes: library test_writes.o + ${MPHASE} -o test_writes $< libmodglue.la + + #------- Tools ---------------------------------------- + +-prompt: prompt.o ++prompt: library prompt.o + ${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la + + prompt_static: prompt.cc library +@@ -77,10 +77,10 @@ + endif + + +-ptywrap: ptywrap.o ++ptywrap: library ptywrap.o + ${MPHASE} -o ptywrap ptywrap.o @LINK_UTIL@ + +-ptywrap_static: ptywrap.o ++ptywrap_static: library ptywrap.o + ${CPHASE} ${TIMESTAMP} -o ptywrap.o \ + -I@top_srcdir@/include -DSTATICBUILD ptywrap.cc + ifeq ($(strip $(MACTEST)),) diff --git a/sci-libs/modglue/modglue-1.13.ebuild b/sci-libs/modglue/modglue-1.13.ebuild deleted file mode 100644 index 233a80a7a..000000000 --- a/sci-libs/modglue/modglue-1.13.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="C++ library for handling of multiple co-processes" -HOMEPAGE="http://www.aei.mpg.de/~peekas/modglue/" -SRC_URI="http://www.aei.mpg.de/~peekas/cadabra/${P}.tar.gz" - -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86" -IUSE="doc" -DEPEND="( >=dev-libs/libsigc++-2.0 )" -RDEPEND="${DEPEND}" - -src_prepare() { -# fix src/makefile.in - epatch "${FILESDIR}/${P}-makefile.in.patch" -# gcc4.4 fix - epatch "${FILESDIR}/${P}-gcc4.4.patch" -} - -src_install() { - emake DESTDIR="${D}" DEVDESTDIR="${D}" install || die - use doc && dohtml "${S}/doc/"* - dodoc AUTHORS ChangeLog INSTALL -} - -pkg_postinst() { - elog "This version of the modglue ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=194393" -} diff --git a/sci-libs/modglue/modglue-1.16.ebuild b/sci-libs/modglue/modglue-1.16.ebuild new file mode 100644 index 000000000..5666b20ab --- /dev/null +++ b/sci-libs/modglue/modglue-1.16.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit eutils autotools-utils + +DESCRIPTION="C++ library for handling of multiple co-processes" +HOMEPAGE="http://cadabra.phi-sci.com" +SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz" +RESTRICT="mirror" + +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc" +DEPEND="dev-util/pkgconfig + >=dev-libs/libsigc++-2.0" +RDEPEND=">=dev-libs/libsigc++-2.0" + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + # Respect LDFLAGS + epatch "${FILESDIR}"/${P}-ldflags.patch + # fix parallel make. test are made at the same time as the library?? + epatch "${FILESDIR}"/${P}-parallelmake.patch + # take care of the lib/lib64 problem. Without this modglue installs + # stuff in /usr/usr/lib64 on 64bits systems. + epatch "${FILESDIR}"/${P}-lib64.patch +} + +src_install() { + emake DESTDIR="${D}" DEVDESTDIR="${D}" install || die + use doc && dohtml "${S}/doc/"* + dodoc AUTHORS ChangeLog INSTALL +} + +pkg_postinst() { + elog "This version of the modglue ebuild is still under development." + elog "Help us improve the ebuild in:" + elog "http://bugs.gentoo.org/show_bug.cgi?id=194393" +} diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog index b3e48bf73..9243a1f74 100644 --- a/sci-libs/mpir/ChangeLog +++ b/sci-libs/mpir/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*mpir-2.1.2 (12 Sep 2010) + + 12 Sep 2010; François Bissey <f.r.bissey@massey.ac.nz> + -mpir-2.1.1.ebuild, +mpir-2.1.2.ebuild: + Bump - there is only one (important) patch in this release. + + 31 Aug 2010; Christopher Schwan <cschwan@students.uni-mainz.de> + mpir-2.1.1.ebuild: + Use autotools-utils.eclass + *mpir-2.1.1 (09 Jul 2010) 09 Jul 2010; François Bissey <f.r.bissey@massey.ac.nz> diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest index 22f6b2877..04494b40f 100644 --- a/sci-libs/mpir/Manifest +++ b/sci-libs/mpir/Manifest @@ -2,8 +2,8 @@ AUX mpir-1.3.0-ABI-multilib.patch 3903 RMD160 3f961212097a7957f2cc831929c545cfc3 AUX mpir-1.3.0-yasm.patch 1741 RMD160 a10820ce5a350f746cab4981ccf40ca9f40e1cca SHA1 5aa4003a7ff6d3f1f4d36734acd90c41cb8b39f0 SHA256 32d1ed07d65b033c70d78cb85ae3cb551ba2f7871d50ad9f3e991abec9bcc5c1 AUX mpir-2.0.0-yasm.patch 1735 RMD160 70ef89894167b239461c7a10e2a8ac594a553712 SHA1 c74be424e98b1c5c01fa4d3c193bb68a50fda1f7 SHA256 c2217abb8993d5d88e26f6d8b1704a65aa170a0a3c4fad82266b620092173656 DIST mpir-1.3.1.tar.gz 4359993 RMD160 d80d0e88fcea5508aea34f198a50f5beb20abe0e SHA1 8494bea32a0e1eed1bfc679f118490243bc5a0c6 SHA256 866c4a66904e1a600fe4ee09a485afcc30f1d950c5797b965288babc81009b66 -DIST mpir-2.1.1.tar.gz 4702461 RMD160 7e87e68ee9dfbee9cc49001eaef541b6e752132d SHA1 3ed060b33a6280250eb53d19a2c20a4d475b5c8d SHA256 7c21bafc452add5b0545d92d72b6e222653c61c200a8ea74b28f49df590fff6c +DIST mpir-2.1.2.tar.gz 4691901 RMD160 fde4d398f702129c7e8475da311521c4b32bec89 SHA1 3bd9fe8dd48eee781b23fe47727ea5db912d8199 SHA256 eaf652ae43b0ae2cfb8b2c05bcbb696eb0918b034a69d557e743e86e66f9a66d EBUILD mpir-1.3.1.ebuild 1478 RMD160 8766f97c31040c6487b574baf7dc7eeffb511ee2 SHA1 5f5def20670ade166855424e4cf303f1d70147db SHA256 96d520a63f545eeb587904f6bcfa313f4a58fe2ec15159bc658c9b48bd6eddaa -EBUILD mpir-2.1.1.ebuild 2110 RMD160 2357a523659f0ea99a6c6ec44f1a9bcbc75f3743 SHA1 de40bfa7e38edd3fab9d8315043393ce7738cae0 SHA256 6152b7122cf7a19ef7a75fc980ef4ebeb2658937de8db67d6c70ad0eab2e1994 -MISC ChangeLog 2433 RMD160 fdcf6d22dc48daa331cd7254003a3e243a431da5 SHA1 3c63bad80bd2a2fe1ce5cc8607e3520b2e1f49e6 SHA256 863ec78d7d41295a54be781f1e71b307a99283cb02fbbb48a1bcaf5048a5f378 +EBUILD mpir-2.1.2.ebuild 2159 RMD160 638b1cfebb5019b03134434066d977ea7502828f SHA1 059cc2269cc7bf5cf56e1df16b9fb9df4b58aa68 SHA256 4da0689589335b6055308bbd895c131e0f56d4cef885908e93848c74ff8c7870 +MISC ChangeLog 2740 RMD160 db8f5c9614e64cc329fee810a7a38c49a7125ddd SHA1 60b65b79a4c84d2497f143d270b537da898f3eed SHA256 678d9d582ed67cc7ee7c14b158f0be54560861334a5cff61095c243c6c65d897 MISC metadata.xml 516 RMD160 dcd6e4599dfc146ef42a021dcfbaf65444d5b272 SHA1 a922010b05f992381656820c3c93697da3b30b70 SHA256 d4a7736b383f142b29166bca022254c5e4e599a3304886ca73491dd7b5954d76 diff --git a/sci-libs/mpir/mpir-2.1.1.ebuild b/sci-libs/mpir/mpir-2.1.2.ebuild index 5c43214f8..f930e0330 100644 --- a/sci-libs/mpir/mpir-2.1.1.ebuild +++ b/sci-libs/mpir/mpir-2.1.2.ebuild @@ -4,25 +4,32 @@ EAPI="3" -inherit eutils autotools +inherit autotools-utils DESCRIPTION="MPIR is a library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp" HOMEPAGE="http://www.mpir.org/" SRC_URI="http://www.mpir.org/${P}.tar.gz" -RESTRICT="mirror" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="+cxx cpudetection" +IUSE="+cxx cpudetection static-libs" + +RESTRICT="mirror" DEPEND="x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm )" RDEPEND="" -src_prepare(){ - epatch "${FILESDIR}/${PN}-2.0.0-yasm.patch" - epatch "${FILESDIR}/${PN}-1.3.0-ABI-multilib.patch" +DOCS=( ChangeLog README NEWS ) +PATCHES=( + "${FILESDIR}"/${PN}-2.0.0-yasm.patch + "${FILESDIR}"/${PN}-1.3.0-ABI-multilib.patch +) + +src_prepare() { + autotools-utils_src_prepare + # FIXME: In the same way there was QA regarding executable stacks # with GMP we have some here as well. We cannot apply the # GMP solution as yasm is used, at least on x86/amd64. @@ -32,8 +39,9 @@ src_prepare(){ # TODO: report this to upstream # TODO: apply patch for all files ? - # TODO: why does the as-style patch work (does mpir really use yasm ??) + # TODO: why does the as-style patch work (does mpir still use yasm ??) for i in $(find . -type f -name '*.asm') ; do + # TODO: why does this not work without the following echo ??? echo $i >/dev/null cat >> $i <<-EOF #if defined(__linux__) && defined(__ELF__) @@ -57,17 +65,14 @@ src_prepare(){ } src_configure() { -# beware that cpudetection aka fat binaries is x86/amd64 only. -# Place mpir in profiles/arch/$arch/package.use.mask when making it available on $arch. - econf \ + # beware that cpudetection aka fat binaries is x86/amd64 only. + # Place mpir in profiles/arch/$arch/package.use.mask when making it available on $arch. + myeconfargs=( $(use_enable cxx) \ - $(use_enable cpudetection fat) \ - || "econf failed" -} + $(use_enable cpudetection fat) + ) -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog README NEWS + autotools-utils_src_configure } pkg_postinst() { diff --git a/sci-libs/nfft/ChangeLog b/sci-libs/nfft/ChangeLog new file mode 100644 index 000000000..6d1482ea6 --- /dev/null +++ b/sci-libs/nfft/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for sci-libs/nfft +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*nfft-3.1.3 (12 Sep 2010) + + 12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de> +nfft-3.1.3.ebuild, + +files/nfft-3.1.3-install.patch, + +files/nfft-3.1.3-remove-maintainer-mode.patch, +metadata.xml: + Initial commit + diff --git a/sci-libs/nfft/Manifest b/sci-libs/nfft/Manifest new file mode 100644 index 000000000..bb28e126f --- /dev/null +++ b/sci-libs/nfft/Manifest @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX nfft-3.1.3-install.patch 455 RMD160 5acbfcddfe923036e5e47c2317a017b30a31a838 SHA1 6e19ec569811996efe2f1955bbb090b0efe20a75 SHA256 6e5e0d9c5c839e228109fc1386e146bb8ba6a549701eaaf527b5aa60a2b369fa +AUX nfft-3.1.3-remove-maintainer-mode.patch 2810 RMD160 70925c0a1583b651383369edc2ae4934e282005c SHA1 26a1febeca6a2e729e2796068b7964c3b49e55c2 SHA256 acecf6ed6fda98fd7d104908036a1f4f166721f68469f54e9267c9ea349f7b6f +DIST nfft-3.1.3.tar.gz 1659745 RMD160 fd43df4bf42e464caccdf10eeb5b9c55e9c7920e SHA1 45ce0e0ae3eeb49ccb2f3ba37b8ad427f08cf9ac SHA256 e4f65f0d1aa81cf76a506f10a9ac68bdcd770a4426671274d372101dca497382 +EBUILD nfft-3.1.3.ebuild 941 RMD160 1fff109b30c70561218f5adf02049455e8f3290b SHA1 4c2deadc3c0dc0e10eff5b610a3d183307ceeef7 SHA256 21d38aa8e255dc686f15e006720a17e971d9a56a0b302efbf300a274e11c713c +MISC ChangeLog 335 RMD160 6808f9942e76ad6aa56ea371e9f83c07e48efeec SHA1 b409a433b292634ceb5bf370a3df56bfb389d8d8 SHA256 8a56adce98da9d02bb579988a4c54ad08707a130009cc5128d4ddf5de499d13b +MISC metadata.xml 256 RMD160 53a5d04f6246118e052c9cae27b7070de9b88529 SHA1 563e3277f01cc3bf484d46a6da50719855a5a689 SHA256 e683c0d7d2051297085cdbb7444ce887044c7ed0ba02cf04be170cdf62919c74 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkyNIaoACgkQy0OE/ans1/l8HQCdGwMClhqdXoVpBEid/WvjEzJ2 +iaMAn0RIgpVD5dSLeaCTqG6O76v/KoNX +=aYE3 +-----END PGP SIGNATURE----- diff --git a/sci-libs/nfft/files/nfft-3.1.3-install.patch b/sci-libs/nfft/files/nfft-3.1.3-install.patch new file mode 100644 index 000000000..7da362890 --- /dev/null +++ b/sci-libs/nfft/files/nfft-3.1.3-install.patch @@ -0,0 +1,14 @@ +diff -Naur nfft-3.1.3.orig/Makefile.am nfft-3.1.3/Makefile.am +--- nfft-3.1.3.orig/Makefile.am 2009-12-23 11:57:40.000000000 +0100 ++++ nfft-3.1.3/Makefile.am 2010-09-12 20:46:27.000000000 +0200 +@@ -31,8 +27,8 @@ + EXTRA_DIST = bootstrap.sh VERSION doxygen.c + + install-data-hook: +- mkdir -p $(pkgdatadir) +- cp -R doc $(pkgdatadir) ++ mkdir -p $(DESTDIR)$(pkgdatadir) ++ cp -R doc $(DESTDIR)$(pkgdatadir) + + maintainer-clean-local: + rm -f doc/api/html/*.html diff --git a/sci-libs/nfft/files/nfft-3.1.3-remove-maintainer-mode.patch b/sci-libs/nfft/files/nfft-3.1.3-remove-maintainer-mode.patch new file mode 100644 index 000000000..c1e89eb60 --- /dev/null +++ b/sci-libs/nfft/files/nfft-3.1.3-remove-maintainer-mode.patch @@ -0,0 +1,69 @@ +diff -Naur nfft-3.1.3.orig/Makefile.am nfft-3.1.3/Makefile.am +--- nfft-3.1.3.orig/Makefile.am 2009-12-23 11:57:40.000000000 +0100 ++++ nfft-3.1.3/Makefile.am 2010-09-12 20:27:01.000000000 +0200 +@@ -8,11 +8,7 @@ + # Subdirectories + DIST_SUBDIRS= 3rdparty include util kernel . examples applications matlab + +-if MAINTAINER_MODE +- EXTRA_DIRS= tests +-else +- EXTRA_DIRS= +-endif ++EXTRA_DIRS= + + if HAVE_MATLAB + MATLAB_DIRS= matlab +diff -Naur nfft-3.1.3.orig/applications/Makefile.am nfft-3.1.3/applications/Makefile.am +--- nfft-3.1.3.orig/applications/Makefile.am 2009-10-13 07:54:19.000000000 +0200 ++++ nfft-3.1.3/applications/Makefile.am 2010-09-12 20:27:37.000000000 +0200 +@@ -17,12 +17,7 @@ + DIST_SUBDIRS = fastgauss fastsum $(DIR_FASTSUMS2) $(DIR_MRI) polarFFT \ + $(DIR_QUADRATURES2) radon + +-if MAINTAINER_MODE +- EXTRA_DIRS= $(DIR_ITERS2) +-# EXTRA_DIRS= texture iterS2 +-else +- EXTRA_DIRS= +-endif ++EXTRA_DIRS= + + SUBDIRS= $(DIST_SUBDIRS) $(EXTRA_DIRS) + +diff -Naur nfft-3.1.3.orig/configure.ac nfft-3.1.3/configure.ac +--- nfft-3.1.3.orig/configure.ac 2009-12-15 16:39:45.000000000 +0100 ++++ nfft-3.1.3/configure.ac 2010-09-12 20:32:27.000000000 +0200 +@@ -439,32 +439,3 @@ + matlab/nfsft/@f_hat/Makefile + ) + +-if test "x$USE_MAINTAINER_MODE" = "xyes"; then +-AC_OUTPUT(tests/Makefile \ +- VERSION +- doxygen/doxygen.Doxyfile +- tests/kernel/Makefile \ +- tests/kernel/fpt/Makefile \ +- tests/lowlevel/Makefile \ +- tests/lowlevel/nfsft/Makefile \ +- applications/iterS2/Makefile \ +- applications/texture/Makefile \ +- applications/texture/examplesTexture/Makefile \ +- applications/texture/examplesTexture/correctness/Makefile \ +- applications/texture/examplesTexture/data/Makefile \ +- applications/texture/examplesTexture/data/data_publication/Makefile \ +- applications/texture/examplesTexture/data/util/Makefile \ +- applications/texture/examplesTexture/data_creator/Makefile \ +- applications/texture/examplesTexture/interpolation/Makefile \ +- applications/texture/examplesTexture/matrix/Makefile \ +- applications/texture/examplesTexture/paper1/Makefile \ +- applications/texture/examplesTexture/paper1/data/Makefile \ +- applications/texture/examplesTexture/paper1/reconstruction/Makefile \ +- applications/texture/examplesTexture/paper1/texture/Makefile \ +- applications/texture/examplesTexture/performance/Makefile \ +- applications/texture/examplesTexture/regularity/Makefile \ +- applications/texture/examplesTexture/regularity2/Makefile \ +- applications/texture/examplesTexture/regularity3/Makefile \ +- applications/texture/examplesTexture/texture_util/Makefile +-) +-fi diff --git a/sci-libs/nfft/metadata.xml b/sci-libs/nfft/metadata.xml new file mode 100644 index 000000000..69b66cbec --- /dev/null +++ b/sci-libs/nfft/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> + <maintainer> + <email>kleiner_otti@gmx.de</email> + <name>Christoph Junghans</name> + </maintainer> +</pkgmetadata> diff --git a/sci-libs/nfft/nfft-3.1.3.ebuild b/sci-libs/nfft/nfft-3.1.3.ebuild new file mode 100644 index 000000000..18714bec0 --- /dev/null +++ b/sci-libs/nfft/nfft-3.1.3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit eutils autotools + +DESCRIPTION="library for nonequispaced discrete Fourier transform" +HOMEPAGE="http://www-user.tu-chemnitz.de/~potts/nfft" +SRC_URI="http://www-user.tu-chemnitz.de/~potts/nfft/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="static-libs" + +RDEPEND="sci-libs/fftw:3.0" +DEPEND="${RDEPEND}" + +src_prepare() { + #file for maintainer mode are not in the tarball + epatch "${FILESDIR}"/"${P}"-remove-maintainer-mode.patch + epatch "${FILESDIR}"/"${P}"-install.patch + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + local myconf + myconf="--enable-shared $(use_enable static-libs static)" + + econf ${myconf} || die "econf failed" +} + +src_compile() { + emake || die "emake failed" +} + +src_install() { + emake install DESTDIR="${D}" || die "emake install failed" +} diff --git a/sci-libs/pfft/ChangeLog b/sci-libs/pfft/ChangeLog new file mode 100644 index 000000000..ec6d34c49 --- /dev/null +++ b/sci-libs/pfft/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for sci-libs/pfft +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*pfft-1.0_alpha1 (12 Sep 2010) + + 12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de> + +pfft-1.0_alpha1.ebuild, +files/pfft-1.0alpha1-Makefile.am, + +files/pfft-1.0alpha1-configure.ac, +metadata.xml, +metadata.xml~: + Initial commit + diff --git a/sci-libs/pfft/Manifest b/sci-libs/pfft/Manifest new file mode 100644 index 000000000..3778a1480 --- /dev/null +++ b/sci-libs/pfft/Manifest @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX pfft-1.0alpha1-Makefile.am 450 RMD160 67a78c31b56207483779b778eda00394a22899f5 SHA1 8c23087a636e0ed2e54476c4e1afe06c557def8c SHA256 e57952f5d18a821ad25280719b3acf46e444a5273c7f5a0c34f8166570936400 +AUX pfft-1.0alpha1-configure.ac 945 RMD160 496e839b79f34d615c76a5b3d319bd915167cc4a SHA1 6cacbd28b4049551d515e22714def6c2504f5e0c SHA256 8d12bd1b0de5e6b3b28be26c25536ca2f38c1773d2b9df0dad8fee56abc00552 +DIST pfft-1.0alpha1.tar.gz 29635 RMD160 b17066560d267f2b58a7b10a7db47c8c72e5c545 SHA1 bdd35a2dae1e1a1d9177f1e5a238fe6ce38f4b64 SHA256 83e201717506e0857bb4c6f986a6b9e98ea418d05454a34914175e61d0b3b395 +EBUILD pfft-1.0_alpha1.ebuild 912 RMD160 270ab16e4e035368a6f69eda24ead0a510d416be SHA1 cdaf3fc9c9479a53a6e46de04f0c3f6319068506 SHA256 d38f3c27d8d3a00f922fada4a13e298afc0fca4d6c07f49813a8b733c1020e81 +MISC ChangeLog 351 RMD160 099d1f7d4206944c2a425bc736a08ca882e20a42 SHA1 8448ccf54981c9cdf868b68e15bf91539e92aa9e SHA256 12853fc732d2db399751a6d5bb699bac24594d21a1f1bace8b96575d2493a4f4 +MISC metadata.xml 256 RMD160 53a5d04f6246118e052c9cae27b7070de9b88529 SHA1 563e3277f01cc3bf484d46a6da50719855a5a689 SHA256 e683c0d7d2051297085cdbb7444ce887044c7ed0ba02cf04be170cdf62919c74 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkyNIuoACgkQy0OE/ans1/ncwwCfULjVCIa1jnj30TplUfKWCwoN +rtkAnR3jVGYss2D7wcGCC7OBullYEjdv +=Wxfd +-----END PGP SIGNATURE----- diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am new file mode 100644 index 000000000..f3fe64851 --- /dev/null +++ b/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am @@ -0,0 +1,17 @@ +ACLOCAL_AMFLAGS = -I config + +lib_LTLIBRARIES = libpfft.la + +libpfft_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ +libpfft_la_SOURCES = \ + check.c profiles.c transpose.c dft-parallel.c \ + dft-serial.c api-basic.c api-adv.c api-guru.c \ + utils.c block.c malloc.c getargs.c \ + gcells_plan.c gcells_sendrecv.c gcells_RMA.c + +include_HEADERS = pfft.h +noinst_HEADERS = ipfft.h + +noinst_PROGRAMS = simple_test sample_ghost + +LDADD = libpfft.la diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac b/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac new file mode 100644 index 000000000..74fa6c68a --- /dev/null +++ b/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac @@ -0,0 +1,38 @@ +AC_PREREQ([2.65]) +AC_INIT([pfft], [1.0alpha1], [michael.pippig@mathematik.tu-chemnitz.de]) + +AC_CONFIG_AUX_DIR(config) +AC_CONFIG_MACRO_DIR(config) +AC_CONFIG_HEADERS([config.h]) + +AM_INIT_AUTOMAKE([1.8 foreign]) + +SHARED_VERSION_INFO="1:0:0" +AC_SUBST(SHARED_VERSION_INFO) + +# Checks for programs. +AC_PROG_CC(mpicc) +AC_PROG_CC_C99 +if test "$ac_cv_prog_cc_c99" = "no"; then + AC_MSG_ERROR([Compiler does not understand c99]) +fi + +LT_INIT +# Checks for libraries. +AC_CHECK_HEADERS([fftw3.h]) +AC_CHECK_LIB([fftw3],main,,AC_MSG_ERROR([Cannot find fftw3 library])) +AC_CHECK_HEADERS([fftw3-mpi.h]) +AC_CHECK_LIB([fftw3_mpi],main,,AC_MSG_ERROR([Cannot find fftw3_mpi library])) + +# Checks for header files. +AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_SIZE_T +AC_CHECK_TYPES([ptrdiff_t]) + +# Checks for library functions. +AC_CHECK_FUNCS([pow sqrt]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/sci-libs/pfft/metadata.xml b/sci-libs/pfft/metadata.xml new file mode 100644 index 000000000..69b66cbec --- /dev/null +++ b/sci-libs/pfft/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> + <maintainer> + <email>kleiner_otti@gmx.de</email> + <name>Christoph Junghans</name> + </maintainer> +</pkgmetadata> diff --git a/sci-libs/pfft/pfft-1.0_alpha1.ebuild b/sci-libs/pfft/pfft-1.0_alpha1.ebuild new file mode 100644 index 000000000..46dc07535 --- /dev/null +++ b/sci-libs/pfft/pfft-1.0_alpha1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="parallel 3d FFT" +HOMEPAGE="http://www-user.tu-chemnitz.de/~mpip/software.php" +SRC_URI="http://www-user.tu-chemnitz.de/~mpip/software/${P//_}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="static-libs" + +RDEPEND="=sci-libs/fftw-3.3*[mpi] + virtual/mpi" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${P//_}" + +src_prepare() { + local i + for i in Makefile.am configure.ac; do + cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die "cp of ${i} failed" + done + + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + local myconf + myconf="$(use_enable static-libs static)" + + econf ${myconf} || die "econf failed" +} + +src_compile() { + emake || die "emake failed" +} + +src_install() { + emake install DESTDIR="${D}" || die "emake install failed" +} diff --git a/sci-libs/scikits_learn/ChangeLog b/sci-libs/scikits_learn/ChangeLog index e0c8b0b18..cd2099603 100644 --- a/sci-libs/scikits_learn/ChangeLog +++ b/sci-libs/scikits_learn/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*scikits_learn-0.4 (05 Aug 2010) + + 05 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> + -scikits_learn-0.2.ebuild, +scikits_learn-0.4.ebuild: + Version bump. Now depend on system libsvm + 29 Jun 2010; Justin Lecher <jlec@gentoo.org> scikits_learn-0.2.ebuild: Python ABI fixes diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest index c5b0599d0..818e672a3 100644 --- a/sci-libs/scikits_learn/Manifest +++ b/sci-libs/scikits_learn/Manifest @@ -1,15 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST scikits.learn-0.2.tar.gz 3546152 RMD160 d11a9d8b3a6db41d4e257f5e1feb9a99c4813b0a SHA1 155313abd33cb5c393636e784795e5d1ebb6c37d SHA256 0a2615f19232e631fb115d4a5a77fecf1f6192f950c1483083ab4a4f477170fc -DIST scikits.learn.pdf 594915 RMD160 5a8e9501a11c90098cc6cb79c3575daf5e4c3100 SHA1 4b352c5bec5bcf1254d6918cb08f29277bc11f02 SHA256 39f97b9f1ef45583227dae266fe770ec6551d6cf8b15a7a72f3949ea36277ae2 -EBUILD scikits_learn-0.2.ebuild 1368 RMD160 4653fb0170c8f9e8d8de65c4e3d3db3df7c63d52 SHA1 2b5e241e9fb562dba39d7d4633e659b61c93c431 SHA256 0fdc1db61315c2fd44d5b03dca5c91f81ee39288cc147ff3f9ea01b6e910eabc -MISC ChangeLog 367 RMD160 e69a74328e7bbc235577ca96e55a83ae9da428da SHA1 41b071f57bd37d355ac260cacbd933cc92e6adcd SHA256 1e709f21f8d941d0ea634356002845f2e1aa8145c9f127f4c47a435959d0c605 +DIST scikits.learn-0.4.tar.gz 654070 RMD160 08012a26fbf552a35d0b3c5c245b115bf1904e70 SHA1 c9d11c24ac3004f743f9df0f1e75ab2513c029a3 SHA256 48fb6b5baaf6ba1f16a021bb5b3c52ed59892acd7d1eb46235e525f677e014bc +EBUILD scikits_learn-0.4.ebuild 1462 RMD160 63bd7500a07faa5fb5cd2d4a63bc1b919a7784a4 SHA1 304b054824dfc58f8a13aa8286865590bbe78176 SHA256 9358cf2301c9e413c7d4c583c31af80991afb72d39545b1f53ae52c59d5912e9 +MISC ChangeLog 557 RMD160 fc0da5cc77f2b05eb9fcdd861e5bbf18861740bf SHA1 f7a6c194d204bf305378f3361f7c17fc30a49adb SHA256 fa1709e0ff57e4b2bf90e9059332cd5805892c57c768600ba0b4639532eb273d MISC metadata.xml 360 RMD160 b7e8ec0449f59c0dd0a7e3810b7c86b260d51530 SHA1 a54074283be9e7d2a113220e92a622b6fb4bfe45 SHA256 6d8c6ea79bfa70bc97b21c3b11454f4e47e31c20442a9ff96230d535562e945c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkwqNc8ACgkQgAnW8HDreRaZwgCcCe68/O1xHGBFCeAYzHDzVmzb -FhQAoKtq9Bj28eiDC58QdJSgeisHNnTp -=YBE/ ------END PGP SIGNATURE----- diff --git a/sci-libs/scikits_learn/scikits_learn-0.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.4.ebuild index 28dea4bf4..2b1559c4f 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.2.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" @@ -14,38 +14,45 @@ MY_P="${P/scikits_/scikits.}" DESCRIPTION="A set of python modules for machine learning and data mining" HOMEPAGE="http://sourceforge.net/apps/trac/scikit-learn" -SRC_URI="mirror://sourceforge/scikit-learn/${MY_P}.tar.gz - doc? ( http://scikit-learn.sourceforge.net/doc/scikits.learn.pdf )" +SRC_URI="mirror://sourceforge/scikit-learn/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc examples test" -RDEPEND="dev-python/numpy - sci-libs/scikits_optimization" - -DEPEND="${RDEPEND} +CDEPEND="sci-libs/scipy + >=sci-libs/libsvm-2.91" +RDEPEND="${CDEPEND} + dev-python/matplotlib" +DEPEND="${CDEPEND} + dev-python/cython dev-python/setuptools - doc? ( dev-python/sphinx ) - test? ( sci-libs/scikits_optimization )" + doc? ( dev-python/sphinx dev-python/matplotlib )" S="${WORKDIR}/${MY_P}" +src_prepare() { + # use stock libsvm + cat <<-EOF >> site.cfg + [libsvm] + libraries=svm + library_dirs=${EPREFIX}/usr/$(get_libdir) + include_dirs=${EPREFIX}/usr/include/libsvm-2.0/libsvm + EOF +} + src_compile() { distutils_src_compile if use doc; then - "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed" + cd "${S}/doc" + export VARTEXFONTS="${T}"/fonts + MPLCONFIGDIR="${S}/build-$(PYTHON -f --ABI)" \ + PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \ + emake html latex || die fi } -src_test() { - testing() { - PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test - } - python_execute_function testing -} - src_install() { find "${S}" -name \*LICENSE.txt -delete distutils_src_install diff --git a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild index 564c3a12a..8b54b0415 100644 --- a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild +++ b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI="3" -inherit base +inherit autotools-utils DESCRIPTION="software package for algebraic, geometric and combinatorial problems" HOMEPAGE="http://www.4ti2.de" @@ -13,10 +13,8 @@ SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="" -DEPEND="sci-mathematics/glpk[gmp] -dev-libs/gmp[-nocxx]" +IUSE="static-libs" +DEPEND="sci-mathematics/glpk[gmp] + dev-libs/gmp[-nocxx]" RDEPEND="${DEPEND}" - -## This package seems to work with everything default diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog index b8a6999bc..1aa950e29 100644 --- a/sci-mathematics/4ti2/ChangeLog +++ b/sci-mathematics/4ti2/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Aug 2010; Christopher Schwan <cschwan@students.uni-mainz.de> + 4ti2-1.3.2.ebuild: + Migrate to autotools-utils.eclass in order to get rid of static libs + and *.la files + 04 Mar 2010; Thomas Kahle <tom111@gmx.de> 4ti2-1.3.2.ebuild: QA/ebuild improvements diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest index 14fbb7e8d..d03ba0fcb 100644 --- a/sci-mathematics/4ti2/Manifest +++ b/sci-mathematics/4ti2/Manifest @@ -1,4 +1,4 @@ DIST 4ti2-1.3.2.tar.gz 4658600 RMD160 e3c5994f458912553988cd113fb9ce1f51c17fe6 SHA1 bb0bddb3a9de6f6ceeee7e296b5315b8b7e59ea5 SHA256 30f15696105b5cfa0784d2f7f9a310ef67d616d2367e064c85ba36ec9a20a066 -EBUILD 4ti2-1.3.2.ebuild 496 RMD160 a4b7d72e16e5f3d05a9dd1de15698da026236e4a SHA1 dfbc91fcc87734e00033cee8dd66abe995ddbaa7 SHA256 a2251ebd1560164d63e1873a66ed293c8631283afbd1af0984a9c85cd3019831 -MISC ChangeLog 400 RMD160 dba8116e28f798919d3be0ab470ba6ff0963ddda SHA1 d98819fcf5e52e54b13ec6b15f72ae2c893d27c8 SHA256 6e6a51bb3effa62e969062decdbbd76c79e0a64daf0d0d31c1141bae5f837d28 +EBUILD 4ti2-1.3.2.ebuild 466 RMD160 57a102d7fd792cfbf322317c6989da2e004e8287 SHA1 09d72230b9752a82db47f237c541b421bdcd2805 SHA256 dae17886e9af405c45d3d3b1e17c05a577755e03bba774b072c44c977d625fdb +MISC ChangeLog 576 RMD160 e6d6178e151c5edce9a0cd05dd847a77dbad1fb8 SHA1 ece10e193d529878461292e377ebf04ebcf49bd4 SHA256 888f1ba24d8a27ce7694e09e4983131f572c31eef44eab4a461ea5cd2accd23c MISC metadata.xml 407 RMD160 b56723a4946cc11ee2b137f85dda1b95855937a7 SHA1 0bb46a9862771e10ba7e5c1e323d6ef39731f5df SHA256 3efd7aa88bf1706dabf23d92f89439acd521386d3c5082477ff5089333a0cdc5 diff --git a/sci-mathematics/Oid/ChangeLog b/sci-mathematics/Oid/ChangeLog new file mode 100644 index 000000000..0289bc9f5 --- /dev/null +++ b/sci-mathematics/Oid/ChangeLog @@ -0,0 +1,9 @@ +# ChangeLog for sci-mathematics/Oid +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*Oid-4.0 (02 Sep 2010) + + 02 Sep 2010; Thomas Kahle <tom111@gmx.de> +Oid-4.0.ebuild, +metadata.xml: + Initial Import, ebuild due to Johannes Rauh + diff --git a/sci-mathematics/Oid/Manifest b/sci-mathematics/Oid/Manifest new file mode 100644 index 000000000..f9a0a0379 --- /dev/null +++ b/sci-mathematics/Oid/Manifest @@ -0,0 +1,5 @@ +DIST Oid4-0.tar.gz 244760 RMD160 f5beb62e0373fa14605b8f8277d803e3056bf37c SHA1 9d4bb24cfe09134e794de412cf6532d8b1222ab6 SHA256 225c2089bfb99e386af8344c5a3fd606c19fce9a8132df5a65c6b3de956e00bf +DIST OidUserManual4-0.pdf 191264 RMD160 eccb7297dcc587f715d75601eacd4ed012c00e03 SHA1 e7bbbbc859549a745c382bd653c2a29d04aeb17a SHA256 87f96d61c42b0f430da1295b159ac0079aa05fea45fca44bdf9a3efb504239b0 +EBUILD Oid-4.0.ebuild 1158 RMD160 9fde29226a7d6b0caf55b665f0a4f94fece40229 SHA1 876211e6590f7e16b40dd228e9d1239db81225fb SHA256 d2a6d0094785a170e1ae26bfefc8ea3a7103cd7786a595b05a7ed855aa82b5a9 +MISC ChangeLog 267 RMD160 b055c879ccb0270544b0ede0c4cefea531ee562f SHA1 d86553fff6864ced5fe077d2db0b969b8699b474 SHA256 f063d10d971c22e569f7cb7c31c81ad76c3f7ad2b53e1107ca5b45b396808cd2 +MISC metadata.xml 345 RMD160 1b66c7c0b95be1bcc965175f86b779e8e442f947 SHA1 4bb0a3d3ed84fc9317e17cc9b1d112c10a1717fd SHA256 2714feb431f4621e440649e063784e4629fbd15d13c848a0046d5247575bd9d6 diff --git a/sci-mathematics/Oid/Oid-4.0.ebuild b/sci-mathematics/Oid/Oid-4.0.ebuild new file mode 100644 index 000000000..972fa967b --- /dev/null +++ b/sci-mathematics/Oid/Oid-4.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils java-pkg-2 versionator + +MY_PV=$(replace_version_separator 1 '-') +MY_P="${PN}${MY_PV}" + +DESCRIPTION="An interactive, extensible software system for experimenting with matroids" +SRC_URI="http://sites.google.com/site/wwwmatroids/${MY_P}.tar.gz + doc? ( http://sites.google.com/site/wwwmatroids/${PN}UserManual${MY_PV}.pdf )" +HOMEPAGE="http://sites.google.com/site/wwwmatroids/" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2" +IUSE="doc" + +DEPEND=">=virtual/jdk-1.4" +RDEPEND=">=virtual/jre-1.4" + +# The source uses 'enum' as an identifier, therefore: +JAVA_PKG_WANT_SOURCE="1.4" + +src_prepare () { + mkdir classes + +# change path names + sed -i -e 's:NAME = ":NAME = "/usr/share/Oid/:' MatroidToolkit.java +} + +src_compile () { + ejavac -d classes @Oid/filelist.unix + ejavac -d classes @filelist +} + +src_install () { + jar cef Oid Oid.jar -C classes . || die "Failed to create jar" + + java-pkg_dojar Oid.jar + java-pkg_dolauncher + + use doc && dodoc "${DISTDIR}"/OidUserManual4-0.pdf + + insinto /usr/share/Oid + doins matroid*.txt +} diff --git a/sci-mathematics/Oid/metadata.xml b/sci-mathematics/Oid/metadata.xml new file mode 100644 index 000000000..dc4589f36 --- /dev/null +++ b/sci-mathematics/Oid/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci-mathematics</herd> +<maintainer> + <email>tom111@gmx.de</email> + <name>Thomas Kahle</name> +</maintainer> +<longdescription lang="en"> + Oid is a tool to experiment with matroids +</longdescription> +</pkgmetadata> diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog new file mode 100644 index 000000000..ecc2bd911 --- /dev/null +++ b/sci-mathematics/axiom/ChangeLog @@ -0,0 +1,107 @@ +# ChangeLog for sci-mathematics/axiom +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.22 2008/08/30 13:17:33 markusle Exp $ + +*axiom-201005 (09 Sep 2010) + + 09 Sep 2010; Thomas Kahle <tom111@gmx.de> + +files/noweb-2.9-insecure-tmp-file.Makefile.patch, + +files/noweb-2.9-insecure-tmp-file.patch.input, +axiom-201005.ebuild, + +metadata.xml: + Bump to 201005 (local to science overlay) + + 30 Aug 2008; Markus Dittrich <markusle@gentoo.org> axiom-200803.ebuild, + axiom-200805.ebuild: + Added missing dependency on sys-apps/debianutils (fixes bug #236080). + + 15 Jul 2008; Markus Dittrich <markusle@gentoo.org> axiom-200805.ebuild: + Ebuild cleanup. Thanks much to <dberkholz@gentoo.org> for pointing + out improvements. + + 13 Jul 2008; Markus Dittrich <markusle@gentoo.org> axiom-200805.ebuild: + Switched linux-info based brk randomization check to a run-time + check via sysctl (see bug #186926). Thanks much to Martin Väth + <vaeth@mathematik.uni-wuerzburg.de> for suggesting this. + +*axiom-200805 (12 Jul 2008) + + 12 Jul 2008; Markus Dittrich <markusle@gentoo.org> +axiom-200805.ebuild: + Version bump. Added check that CONFIG_COMPAT_BRK is set for kernels + >=2.6.25 since gcl compilation will fail otherwise. + +*axiom-200803 (30 Mar 2008) + + 30 Mar 2008; Markus Dittrich <markusle@gentoo.org> + -files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch, + -files/gcl-2.6.7.fix-configure.in-gentoo.patch.input, + -files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch, + -files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input, + -axiom-3.9-r1.ebuild, +axiom-200803.ebuild: + Version bump and removed old version. + + 01 Feb 2008; Markus Dittrich <markusle@gentoo.org> + +files/axiom-200711-gcl-configure.patch, axiom-200711.ebuild: + Fixed broken gcl configure (see bug #208326). Thanks much to + Martin Väth <vaeth@mathematik.uni-wuerzburg.de> for this fix. + +*axiom-200711 (23 Jan 2008) + + 23 Jan 2008; Markus Dittrich <markusle@gentoo.org> axiom-3.9-r1.ebuild, + +axiom-200711.ebuild: + Version bump (see bug #185481). + + 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; axiom-3.9-r1.ebuild: + Drop virtual/x11 references. + + 19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: + Remove plasmaroo from metadata.xml due to retirement. + + 01 Oct 2006; Tim Yamin <plasmaroo@gentoo.org> axiom-3.9-r1.ebuild: + Fix bug #143738; patch by Johannes Weiner. + + 25 Aug 2006; Luis Medinas <metalgod@gentoo.org> axiom-3.9-r1.ebuild: + Added ~amd64 keyword. + + 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest: + Fixing SHA256 digest, pass four + + 18 Mar 2006; <plasmaroo@gentoo.org> axiom-3.9-r1.ebuild, -axiom-3.9.ebuild, + -axiom-9999.ebuild: + Fix #121430, remove stale versions. + +*axiom-3.9-r1 (25 Feb 2006) + + 25 Feb 2006; <plasmaroo@gentoo.org> +axiom-3.9-r1.ebuild, + +files/noweb-2.9-insecure-tmp-file.Makefile.patch, + +files/noweb-2.9-insecure-tmp-file.patch.input: + Security bump; bug #122705. + + 14 Feb 2006; <plasmaroo@gentoo.org> axiom-3.9.ebuild, axiom-9999.ebuild: + Port over to modular X. + + 22 Jan 2006; <plasmaroo@gentoo.org> axiom-3.9.ebuild, + +files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch, + +files/gcl-2.6.7.fix-configure.in-gentoo.patch.input: + Fix #118633. + + 30 Dec 2005; <plasmaroo@gentoo.org> axiom-3.9.ebuild, axiom-9999.ebuild: + Fix #117216. + +*axiom-3.9 (29 Dec 2005) + + 29 Dec 2005; <plasmaroo@gentoo.org> +axiom-3.9.ebuild: + Add snapshot; bug #117097. + + 13 Dec 2005; <plasmaroo@gentoo.org> axiom-9999.ebuild: + Update Savannah CVS info; #115327. + + 04 Dec 2005; <plasmaroo@gentoo.org> axiom-9999.ebuild, + +files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch, + +files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input: + Add compile fixes (#75372, #111923) as well as a gcl fix so compilation works + once we're out of the sandbox. + +*axiom-9999 (16 Jan 2005) + + 16 Jan 2005; <plasmaroo@gentoo.org> +axiom-9999.ebuild, +metadata.xml: + Initial commit. diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest new file mode 100644 index 000000000..169a5a265 --- /dev/null +++ b/sci-mathematics/axiom/Manifest @@ -0,0 +1,6 @@ +AUX noweb-2.9-insecure-tmp-file.Makefile.patch 439 RMD160 16cdc72fab65bab45c7728d374da60f7b4cccc65 SHA1 428d4380a17535939a59b5efd12556ab4cafde06 SHA256 3c4b5bea61620cb545e576d2e82dd8daa0478fc6c40ae0a93dbdac432aa9531d +AUX noweb-2.9-insecure-tmp-file.patch.input 4819 RMD160 2afe80731bd3fcfa23e0ee799649886ce3fdd0af SHA1 23aff1cf0862618c7450704d0d47fcec2497de0b SHA256 68bf232fd91b94fc9d08373d079afcb890a6af6991373da81089560ce21889a9 +DIST axiom-july2010-src.tgz 119868477 RMD160 0d5492d39b07603bd6600e0f124cd573b5d140cc SHA1 4de6f81336128f4b0a842c4d4b5eabcc1a85e5fd SHA256 cc45f6487e0809d09b0f528ec2f5c9ac4553fdbcaa4b563c891487984e27b1a8 +EBUILD axiom-201005.ebuild 3396 RMD160 e6ff7a8409574610dc37e66ae3b18db497889011 SHA1 599319ef88040f7e65997ed6022927bc21597f0a SHA256 3e5b662d89e0a19072cc996d7354209a23c8cac4e91e6c32e8b13e9949e53469 +MISC ChangeLog 4030 RMD160 909a51de08fa832258fca2006cb5d696c87d8f7f SHA1 12c49ed4f933254830f6f4aaad8173bd2e1233e7 SHA256 2c92bbf87416cef41dcacbfab0f5016bbe51d9ae933ba9a0bbd424e4d4497e8d +MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 diff --git a/sci-mathematics/axiom/axiom-201005.ebuild b/sci-mathematics/axiom/axiom-201005.ebuild new file mode 100644 index 000000000..98d53d906 --- /dev/null +++ b/sci-mathematics/axiom/axiom-201005.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200805.ebuild,v 1.6 2008/08/30 13:17:33 markusle Exp $ + +inherit eutils multilib flag-o-matic + +DESCRIPTION="Axiom is a general purpose Computer Algebra system" +HOMEPAGE="http://axiom.axiom-developer.org/" +SRC_URI="http://www.axiom-developer.org/axiom-website/downloads/${PN}-july2010-src.tgz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# NOTE: Do not strip since this seems to remove some crucial +# runtime paths as well, thereby, breaking axiom +RESTRICT="strip" + +DEPEND="virtual/latex-base + app-text/dvipdfm + x11-libs/libXaw + sys-apps/debianutils + sys-process/procps" + +S="${WORKDIR}"/${PN} + +## The following stuff seems to be fixed? + +# pkg_setup() { +# # for 2.6.25 kernels and higher we need to have +# # /proc/sys/kernel/randomize_va_space set to somthing other +# # than 2, otherwise gcl fails to compile (see bug #186926). +# local current_setting=$(/sbin/sysctl kernel.randomize_va_space 2>/dev/null | cut -d' ' -f3) +# if [[ ${current_setting} == 2 ]]; then +# echo +# eerror "Your kernel has brk randomization enabled. This will" +# eerror "cause axiom to fail to compile *and* run (see bug #186926)." +# eerror "You can issue:" +# eerror +# eerror " /sbin/sysctl -w kernel.randomize_va_space=1" +# eerror +# eerror "as root to turn brk randomization off temporarily." +# eerror "However, when not using axiom you may want to turn" +# eerror "brk randomization back on via" +# eerror +# eerror " /sbin/sysctl -w kernel.randomize_va_space=2" +# eerror +# eerror "since it results in a less secure kernel." +# die "Kernel brk randomization detected" +# fi +# } + +src_unpack() { + unpack ${A} + cd "${S}" + + ## How weird, axiom ships these patches, but does not apply them. + ## So, we keep our gentoo patches around. + cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \ + "${S}"/zips/noweb-2.9-insecure-tmp-file.patch \ + || die "Failed to fix noweb" +# cp "${FILESDIR}"/${PN}-200711-gcl-configure.patch \ +# "${S}"/zips/gcl-2.6.7.configure.in.patch \ +# || die "Failed to fix gcl-2.6.7 configure" + epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch \ + || die "Failed to patch noweb security issue!" +} + +src_compile() { + # lots of strict-aliasing badness + append-flags -fno-strict-aliasing + + econf || die "Failed to configure" + +## I believe 2.6.8_pre4 can be used now. + # use gcl 2.6.7 +# sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \ +# -i Makefile.pamphlet Makefile \ +# || die "Failed to select proper gcl" +# + # fix libXpm.a location + sed -e "s:X11R6/lib:$(get_libdir):g" -i Makefile.pamphlet \ + || die "Failed to fix libXpm lib paths" + + # Let the fun begin... + AXIOM="${S}"/mnt/linux emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \ + || die 'Failed to install Axiom!' + + mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom \ + || die "Failed to mv axiom into its final destination path." + rm -fr "${D}"/opt/axiom/mnt \ + || die "Failed to remove old directory." + + dodir /usr/bin + dosym /opt/axiom/bin/axiom /usr/bin/axiom + + sed -e "2d;3i AXIOM=/opt/axiom" \ + -i "${D}"/opt/axiom/bin/axiom \ + || die "Failed to patch axiom runscript!" + + dodoc changelog readme faq +} diff --git a/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.Makefile.patch b/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.Makefile.patch new file mode 100644 index 000000000..b8cd40ea0 --- /dev/null +++ b/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.Makefile.patch @@ -0,0 +1,10 @@ +--- Makefile~ 2005-09-05 19:50:31.000000000 +0100 ++++ Makefile 2006-02-17 17:08:31.000000000 +0000 +@@ -85,6 +85,7 @@ + ${PATCH} <${ZIPS}/noweb.modules.c.patch ; \ + cd ${OBJ}/noweb/src ; \ + ${PATCH} <${ZIPS}/noweb.src.Makefile.patch ; \ ++ ${PATCH} -p0 <${ZIPS}/noweb-2.9-insecure-tmp-file.patch ; \ + ./awkname ${AWK} ; \ + ${ENV} ${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \ + MAN=${MNT}/${SYS}/bin/man \ diff --git a/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.patch.input b/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.patch.input new file mode 100644 index 000000000..00288a8a3 --- /dev/null +++ b/sci-mathematics/axiom/files/noweb-2.9-insecure-tmp-file.patch.input @@ -0,0 +1,168 @@ +--- awkname ++++ awkname +@@ -5,7 +5,7 @@ + esac + + rc=0 +-new=/tmp/$$.new; old=/tmp/$$.old ++new=$(tempfile -p new); old=$(tempfile -p old) + + for file in lib/emptydefn lib/unmarkup lib/toascii \ + awk/noidx awk/totex awk/tohtml awk/noindex \ +--- awk/totex.nw ++++ awk/totex.nw +@@ -24,7 +24,7 @@ + @ + On an ugly system, we have to put it in a file. + <<invoke awk program using file>>= +-awkfile=/tmp/totex$$.awk ++awkfile=$(tempfile -p totex) + trap 'rm -f $awkfile; exit 1' 0 1 2 15 # clean up files + cat > $awkfile << 'EOF' + <<awk program for conversion to {\TeX}>> +--- lib/toascii ++++ lib/toascii +@@ -7,9 +7,9 @@ + *) echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;; + esac + done +-awkfile="tmp/awk$$.tmp" +-textfile="/tmp/text$$.tmp" +-tagsfile="/tmp/tags$$.tmp" ++awkfile=$(tempfile -p awk -s .tmp) ++textfile=$(tempfile -p text -s .tmp) ++tagsfile=$(tempfile -p tags -s .tmp) + export awkfile textfile tagsfile + trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15 + nawk 'BEGIN { textfile=ENVIRON["textfile"] +--- shell/cpif ++++ shell/cpif +@@ -17,7 +17,7 @@ + 0) echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2 + esac + +-new=/tmp/$$ ++new=$(tempfile) + trap 'rm -f $new; exit 1' 1 2 15 # clean up files + + cat >$new +--- shell/nonu ++++ shell/nonu +@@ -2,7 +2,7 @@ + LIB=/usr/public/pkg/noweb/lib + # attempt to convert nuweb to noweb using sam + +-tmp=/tmp/nonu$$ ++tmp=$(tempfile -p nonu) + trap '/bin/rm -f $tmp; exit 1' 1 2 15 # clean up files + cp $1 $tmp || exit 1 + +--- shell/roff.nw ++++ shell/roff.nw +@@ -80,7 +80,7 @@ + other, and quoting each quote is ugly. The pragmatic solution is to + copy the awk program into a temporary file, using a shell here-document. + <<invoke awk program>>= +-awkfile="/tmp/noweb$$.awk" ++awkfile=$(tempfile -p noweb -s .awk) + trap 'rm -f $awkfile' 0 1 2 10 14 15 + cat > $awkfile << 'EOF' + <<awk program>> +@@ -662,12 +662,13 @@ + + base="`basename $1 | sed '/\./s/\.[^.]*$//'`" + tagsfile="$base.nwt" ++tmpfile=$(tempfile -p tags) + (echo ".so $macrodir/tmac.w" + if [ -r "$tagsfile" ]; then +- cp $tagsfile /tmp/tags.$$ ++ cp $tagsfile $tmpfile + $AWK '<<action for [[tags]] line>> +- <<functions>>' /tmp/tags.$$ +- rm -f /tmp/tags.$$ ++ <<functions>>' $tmpfile ++ rm -f $tmpfile + fi + cat "$@") | + ($ROFF $opts 2>$tagsfile) +--- shell/noroff ++++ shell/noroff +@@ -35,9 +35,10 @@ + + base="`basename $1 | sed '/\./s/\.[^.]*$//'`" + tagsfile="$base.nwt" ++tmpfile=$(tempfile -p tags) + (echo ".so $macrodir/tmac.w" + if [ -r "$tagsfile" ]; then +- cp $tagsfile /tmp/tags.$$ ++ cp $tagsfile $tmpfile + $AWK '{ + if (sub(/^###TAG### / , "")) tags[$1] = $2 + else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n" +@@ -88,8 +89,8 @@ + # print str3 + # print convquote(str3) + # } +- function tag(s) { if (s in tags) return tags[s]; else return "???" }' /tmp/tags.$$ +- rm -f /tmp/tags.$$ ++ function tag(s) { if (s in tags) return tags[s]; else return "???" }' $tmpfile ++ rm -f $tmpfile + fi + cat "$@") | + ($ROFF $opts 2>$tagsfile) +--- shell/toroff ++++ shell/toroff +@@ -9,7 +9,7 @@ + exit 1;; + esac + done +-awkfile="/tmp/noweb$$.awk" ++awkfile=$(tempfile -p noweb -s .awk) + trap 'rm -f $awkfile' 0 1 2 10 14 15 + cat > $awkfile << 'EOF' + /^@begin docs 0$/ { if (delay) next } +--- lib/toascii.nw ++++ lib/toascii.nw +@@ -28,9 +28,9 @@ + Also arranged here is a temporary file for storage of the awk program on an + ugly system, as discussed below. + <<arrange temporary files>>= +-awkfile="tmp/awk$$.tmp" +-textfile="/tmp/text$$.tmp" +-tagsfile="/tmp/tags$$.tmp" ++awkfile=$(tempfile -p awk -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; } ++textfile=$(tempfile -p text -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; } ++tagsfile=$(tempfile -p tags -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; } + export awkfile textfile tagsfile + trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15 + @ %def textfile tagsfile awkfile +--- shell/roff.mm ++++ shell/roff.mm +@@ -214,7 +214,7 @@ + .ADDLIST 1a + .PRINTLIST + +-awkfile="/tmp/noweb$$.awk" ++awkfile=$(tempfile -p noweb -s .awk) || { echo "$0: Cannot create temporary file" >&2; exit 1; } + trap 'rm -f $awkfile' 0 1 2 10 14 15 + cat > $awkfile \&<< 'EOF' + \c +@@ -1628,14 +1628,15 @@ + tagsfile="$base.nwt" + (echo ".so $macrodir/tmac.w" + if [ -r "$tagsfile" ]; then +- cp $tagsfile /tmp/tags.$$ ++ tagstemp=$(tempfile -p tags) || { echo "$0: Cannot create temporary file" >&2; exit 1; } ++ cp $tagsfile $tagstemp + $AWK '\c + .USE "action for \*[BEGINCONVQUOTE]tags\*[ENDCONVQUOTE] line" 11c + \& + \c + .USE "functions" 8a +-\&' /tmp/tags.$$ +- rm -f /tmp/tags.$$ ++\&' $tagstemp ++ rm -f $tagstemp + fi + cat "$@") | + ($ROFF $opts 2>$tagsfile) diff --git a/sci-mathematics/axiom/metadata.xml b/sci-mathematics/axiom/metadata.xml new file mode 100644 index 000000000..5a2f1c7b8 --- /dev/null +++ b/sci-mathematics/axiom/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci-mathematics</herd> +</pkgmetadata> diff --git a/sci-mathematics/cadabra/ChangeLog b/sci-mathematics/cadabra/ChangeLog index 2cd3e899f..26353ecd0 100644 --- a/sci-mathematics/cadabra/ChangeLog +++ b/sci-mathematics/cadabra/ChangeLog @@ -2,6 +2,20 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + cadabra-1.25.ebuild: + Keyword ~amd64 + + 20 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + cadabra-1.25.ebuild, +files/cadabra-1.25-xcadabra-flags.patch: + Make xcadabra respect FLAGS + +*cadabra-1.25 (19 Aug 2010) + + 19 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + -cadabra-1.16.ebuild, -cadabra-1.21.ebuild, +cadabra-1.25.ebuild: + Bump to cadabra-1.25, remove old. old patch still applies. + *cadabra-1.21 (28 Mar 2010) 28 Mar 2010; François Bissey <f.r.bissey@massey.ac.nz> diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest index 50c83a42b..1ef42ebf3 100644 --- a/sci-mathematics/cadabra/Manifest +++ b/sci-mathematics/cadabra/Manifest @@ -1,7 +1,6 @@ AUX cadabra-1.21-no-stripping.patch 847 RMD160 51501996863439d423257f834fef4472bc8d3f8f SHA1 cf5f4aeac7b5f0fd57cb95b52d21540d0db89fa7 SHA256 1f99493ae210d8741c30d83917d6449af527a20ef41de7849f4d7ada93e5a8ef -DIST cadabra-1.16.tar.gz 809418 RMD160 bbe773b6831e66a0bcdead5148ceb8f5ab1edcc2 SHA1 4fdaf6a959c048dde9efaf449d1e6667eab445c6 SHA256 1783a3dbc13127bce846afb206d0dd1ef934a00db57cac2b5dfe9bbd5d733a08 -DIST cadabra-1.21.tar.gz 826532 RMD160 882e5a05535c1227007790ed3386d9e73c56b1e9 SHA1 55eb5f28e9a3e2330f4c9f0c2769ca440575364c SHA256 618835e32e46a2f36d5dcb91b52a3c80a2c2d53970af7bc4e17bfae07b9d6522 -EBUILD cadabra-1.16.ebuild 1452 RMD160 13d799a06014229b7ff34cef52b624b0a19604b2 SHA1 520f881e64f3528577393db12d0b8fe1d0045e6e SHA256 bb4cc209325b623aab201f063e8dbdf3a7ce26e0585d1ae747dd1af69d990746 -EBUILD cadabra-1.21.ebuild 1595 RMD160 a70593bbd0b8bf2cef735bff8aa7775ef648c7d5 SHA1 9aabb63111905dc996883910d27cd14eaa2fa6ab SHA256 4596667d03f77866530029d276d75a4bb1ab7bdefb274a013e7e8e45f66aeefe -MISC ChangeLog 1059 RMD160 b42b481b3ef5b457224f7b9942ca04f28ded053b SHA1 8b3777788129e4c04ad95b1be84c363509088f63 SHA256 07b013879ad11aa98ebbe04ffd74485e00a3cc4e2f3fdbc756bfb82144ada51c +AUX cadabra-1.25-xcadabra-flags.patch 488 RMD160 332172c1927d35186001969a90d0e7cefab607f0 SHA1 8c2fe0a7df9e50375f820f74aa0ae4b41e5e68b1 SHA256 dfbc211be9395bbff673be04c618b59a87f6e91668969f4863a53e8374f0dc2c +DIST cadabra-1.25.tar.gz 847273 RMD160 c6341585d521d350bad09b07a1f41ea25df8bbb9 SHA1 c7a6c846fc48b60ad4b8f92c594f5e4408e9d943 SHA256 8a284f5d9782b9f94acb8df1d3af8a14d319f49f43550f0f47d7e4b710bbb7da +EBUILD cadabra-1.25.ebuild 1725 RMD160 b07453719923568bb92b13bb6bacdbab1473bc56 SHA1 a1c7a3e9914f04ca71322747bcc900cb95a672c4 SHA256 797a03668ef28f12244d1f50935b213f13d6a2240198a8b1ca98ef1c88248285 +MISC ChangeLog 1529 RMD160 8c1f1f1c61d87ce44e6e6bfe5804e262038f9395 SHA1 c0761c70bad2c94546e4354c143395c6570584ed SHA256 ad21cb58f13eb42dbd28d0bdc86491908eecf5b828f9c6aa144a6eab260091c8 MISC metadata.xml 594 RMD160 7a4da042b357ffe448a4d75dc15be0bbe685f82f SHA1 766f7f12b1ea17d7b78a58f9e44861b424817463 SHA256 d9081050db0124d955e62e53100aa242e374d56ec1b96f6d7bf40c6625bb810e diff --git a/sci-mathematics/cadabra/cadabra-1.16.ebuild b/sci-mathematics/cadabra/cadabra-1.16.ebuild deleted file mode 100644 index ce24472a4..000000000 --- a/sci-mathematics/cadabra/cadabra-1.16.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="Field-theory motivated computer algebra system" -HOMEPAGE="http://cadabra.phi-sci.com" -SRC_URI="http://cadabra.phi-sci.com/${P}.tar.gz" -#### Remove the following line when moving this ebuild to the main tree! -RESTRICT="mirror" - -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~x86" -IUSE="doc examples X" -DEPEND="sci-libs/modglue - sci-mathematics/lie - dev-libs/gmp[-nocxx] - dev-libs/libpcre - X? ( >=x11-libs/gtk+-2.0 - >=dev-cpp/gtkmm-2.4 - app-text/dvipng ) - doc? ( || ( app-text/texlive-core dev-tex/pdftex ) )" -RDEPEND="${DEPEND} - virtual/latex-base - dev-tex/mh" - -src_configure(){ - econf $(use_enable X gui) -} - -src_compile() { - - emake - - if ( use doc ) - then - cd "${S}/doc" - emake - cd doxygen/latex - emake pdf - fi -} - -src_install() { - emake DESTDIR="${D}" DEVDESTDIR="${D}" install || die "install died" - - dodoc AUTHORS ChangeLog INSTALL || die - - if ( use doc ) - then - cd "${S}/doc/doxygen" - dohtml html/* - dodoc latex/*.pdf - fi - - if ( use examples ) - then - docinto examples - dodoc "${S}/examples/*" - fi - - rm -rf "${D}/usr/share/TeXmacs" -} - -pkg_postinst() { - /usr/sbin/texmf-update - elog "This version of the cadabra ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id= 194393" -} - -pkg_postrm() -{ - /usr/sbin/texmf-update -} diff --git a/sci-mathematics/cadabra/cadabra-1.21.ebuild b/sci-mathematics/cadabra/cadabra-1.25.ebuild index 144bb0395..b0d52a6c3 100644 --- a/sci-mathematics/cadabra/cadabra-1.21.ebuild +++ b/sci-mathematics/cadabra/cadabra-1.25.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI="3" inherit eutils @@ -15,14 +15,15 @@ RESTRICT="mirror" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="doc examples X" DEPEND="sci-libs/modglue sci-mathematics/lie dev-libs/gmp[-nocxx] dev-libs/libpcre X? ( >=x11-libs/gtk+-2.0 - >=dev-cpp/gtkmm-2.4 + >=dev-cpp/gtkmm-2.4 + dev-cpp/pangomm app-text/dvipng ) doc? ( || ( app-text/texlive-core dev-tex/pdftex ) )" RDEPEND="${DEPEND} @@ -31,7 +32,9 @@ RDEPEND="${DEPEND} src_prepare(){ # deal with pre-stripping - note that upstream do not provide any makefile.am - epatch "${FILESDIR}/${P}-no-stripping.patch" + epatch "${FILESDIR}/${PN}-1.21-no-stripping.patch" + # xcadabra doesn't respect LDFLAGS (cadabra does!) + epatch "${FILESDIR}/${P}-xcadabra-flags.patch" } src_configure(){ diff --git a/sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch b/sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch new file mode 100644 index 000000000..0d1beaa2d --- /dev/null +++ b/sci-mathematics/cadabra/files/cadabra-1.25-xcadabra-flags.patch @@ -0,0 +1,11 @@ +--- gui/Makefile.in.orig 2010-08-20 22:59:47.208483158 +1200 ++++ gui/Makefile.in 2010-08-20 23:00:51.888482426 +1200 +@@ -19,7 +19,7 @@ + main.o: $(OBJS) Makefile + + xcadabra: $(OBJS) +- @CXX@ -o xcadabra $+ `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` -lpcrecpp ++ @CXX@ @CFLAGS@ @LDFLAGS@ -o xcadabra $+ `pkg-config modglue --libs` `pkg-config --libs gtkmm-2.4` -lpcrecpp + + xcadabra_static: $(OBJS) + @CXX@ -o xcadabra -static $+ -L@prefix@/lib `pkg-config modglue --libs` \ diff --git a/sci-mathematics/lie/ChangeLog b/sci-mathematics/lie/ChangeLog index 7518af7e3..581a3da02 100644 --- a/sci-mathematics/lie/ChangeLog +++ b/sci-mathematics/lie/ChangeLog @@ -1,7 +1,22 @@ # ChangeLog for sci-mathematics/lie -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> lie-2.2.2.ebuild: + Keyword lie ~amd64 + + 20 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> + files/lie-2.2.2-make.patch: + Edit the patch to put lie help system files under /usr/share/lie. + + 16 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> lie-2.2.2.ebuild, + files/parrallelmake-lie-2.2.2.patch: + Fix double compilation issues. + + 15 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz> lie-2.2.2.ebuild, + files/lie-2.2.2-make.patch, files/parrallelmake-lie-2.2.2.patch: + Migrated to EAPI=3 and fixed QA: parallel make (again) & FLAGS + 03 Nov 2009; François Bissey <f.r.bissey@massey.ac.nz> files/parrallelmake-lie-2.2.2.patch: bump the parrallel-make patch to care for some more possible breakages diff --git a/sci-mathematics/lie/Manifest b/sci-mathematics/lie/Manifest index 0b76930be..78e0dbf9d 100644 --- a/sci-mathematics/lie/Manifest +++ b/sci-mathematics/lie/Manifest @@ -1,6 +1,6 @@ -AUX lie-2.2.2-make.patch 4665 RMD160 c37324244e80c50cac591f909d3b279f26428d73 SHA1 637674b22abd6fb3bf26f7ff43ab349dcdcc0100 SHA256 62c87afe8b0fcffa02dad069ffb0ab27d2ca32ffb0161ed071971a6b982904fa -AUX parrallelmake-lie-2.2.2.patch 926 RMD160 ce4304114eeaebe399bbd4c1e6c19c9b0511240f SHA1 77e6a8daf62fcf59660a5e30c53cb440ed68ffad SHA256 0e1eea2a227ddded526fe7e40d837e7c7e498fe2b847f330d55b79745d267470 +AUX lie-2.2.2-make.patch 4687 RMD160 94a98939240eeab992f47cc23c43776f3060d476 SHA1 526e29b35bb797db152e8575f04f43ab0218a5cf SHA256 0edbab199c380816c1f80a742f6224ee5111e9f4da10ec2716736d131b41dd9f +AUX parrallelmake-lie-2.2.2.patch 1734 RMD160 790e3d85bade83504cce93a7a47dd6d9ac3a3a94 SHA1 02b001285b3f0bcd399c3ff50f4fe566c280191a SHA256 6e57a21fa70ceaa21f625a7632b05ee83d511fa7ada846aa4b399df04824cb42 DIST conLiE.tar.gz 361170 RMD160 3a0ff7e62db3de194222d0d5bd5fab8390ef8537 SHA1 92eb9283868cc46ae0b87c4dfd6f13631e046bee SHA256 6eac244471abb730811a05c8cb0b36eb7f8285cd18a03b956dadcf80ef1f0961 -EBUILD lie-2.2.2.ebuild 1078 RMD160 dbc6fe71db218c255967fba519c3353eabc9cea0 SHA1 92786c226bbb8136a9b088fbec2a8d119b1eabca SHA256 5134bc7e7f0ce1dad139ff0dffaeaf280189e43483542b0066e4539a4b4ce37e -MISC ChangeLog 505 RMD160 2cf9ed4366008eb4ece430fd7d899efc43dd37df SHA1 e7cfb143bbc9360069da388a794e43e2bffe2606 SHA256 053b7825a466017c7a218bb456bd0d3062f8e3a0c2a160a66d4d0aef07f57873 +EBUILD lie-2.2.2.ebuild 1193 RMD160 803a2d2d9986486508cedb6796f99f393c6cadfc SHA1 04b3ad4a6cf764d76ac5f19ccf9b570517fb229d SHA256 86c9f1475a95051f2088676fa3e60dc35fac0d17e5c61f73f7faafbcc648e2b5 +MISC ChangeLog 1118 RMD160 892e10791e8351f9beb9ed5d22e94a401cb5a6a3 SHA1 f32aac0de8c7b640591f8870e127d11884b07222 SHA256 6b80fb0f7410f29da3e5b8ef8d9453b1ac840ad3c337ab7ce301b85aba112f5d MISC metadata.xml 490 RMD160 86d74e0315fd46dcb1ef92be92e9c399c6ad596c SHA1 30ddf33d8bc318eb3eba19600719de1126da5ee1 SHA256 2c4512011eb778ff4063be3a181a00266912cf9ec962d142dc5c36b5008316ff diff --git a/sci-mathematics/lie/files/lie-2.2.2-make.patch b/sci-mathematics/lie/files/lie-2.2.2-make.patch index 69b4a1a76..cf6bd4537 100644 --- a/sci-mathematics/lie/files/lie-2.2.2-make.patch +++ b/sci-mathematics/lie/files/lie-2.2.2-make.patch @@ -36,7 +36,7 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/lie lie-2.2.2-1/lie +#!/bin/sh +PTH=`which ${0} | sed -e 's/bin\/lie//'` + -+exec ${PTH}/bin/Lie.exe initfile ${PTH}/lib/lie ++exec ${PTH}/bin/Lie.exe initfile ${PTH}/share/lie diff -u -r -P --new-file --exclude=CVS lie-2.2.2/lie_script lie-2.2.2-1/lie_script --- lie-2.2.2/lie_script 1996-09-16 16:14:38.000000000 +0100 +++ lie-2.2.2-1/lie_script 2006-12-17 13:42:23.000000000 +0000 @@ -45,7 +45,7 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/lie_script lie-2.2.2-1/lie_scri -exec $LD/Lie.exe initfile $LD +#!/bin/sh +#LD=actual directory gets substituted here -+exec /usr/bin/Lie.exe initfile /usr/lib/lie ++exec /usr/bin/Lie.exe initfile /usr/share/lie diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile --- lie-2.2.2/Makefile 2000-04-07 08:46:28.000000000 +0100 +++ lie-2.2.2-1/Makefile 2007-02-20 20:41:22.000000000 +0000 @@ -63,12 +63,12 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile + +install: + install -d $(DESTDIR)/usr/bin -+ install -d $(DESTDIR)/usr/lib/lie ++ install -d $(DESTDIR)/usr/share/lie + install Lie.exe $(DESTDIR)/usr/bin/Lie.exe + install lie $(DESTDIR)/usr/bin/lie -+ install -m 644 *.ind $(DESTDIR)/usr/lib/lie -+ install -m 644 INFO.a $(DESTDIR)/usr/lib/lie -+ install -m 644 INFO.* $(DESTDIR)/usr/lib/lie ++ install -m 644 *.ind $(DESTDIR)/usr/share/lie ++ install -m 644 INFO.a $(DESTDIR)/usr/share/lie ++ install -m 644 INFO.* $(DESTDIR)/usr/share/lie +# install -d $(DESTDIR)/usr/share/doc/lie +# install manual/manual.dvi $(DESTDIR)/usr/share/doc/lie + install -d $(DESTDIR)/usr/share/man/man1 @@ -95,7 +95,7 @@ diff -u -r -P --new-file --exclude=CVS lie-2.2.2/Makefile lie-2.2.2-1/Makefile Lie.exe: date.o - $(CC) -o Lie.exe $(objects) date.o static/*.o box/*.o -lreadline -+ $(CC) -o Lie.exe $(objects) date.o static/*.o box/*.o -lreadline -lncurses ++ $(CC) -o Lie.exe $(LDFLAGS) $(objects) date.o static/*.o box/*.o -lreadline -lncurses chmod g+w Lie.exe Liegap.exe: gapdate.o $(CC) -o Liegap.exe $(GAP_objects) gapdate.o static/*.o box/*.o diff --git a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch index 4880e2324..5bd54b403 100644 --- a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch +++ b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch @@ -1,18 +1,47 @@ ---- Makefile.orig 2000-04-07 19:46:28.000000000 +1200 -+++ Makefile 2009-11-03 22:31:29.000000000 +1300 -@@ -82,9 +82,9 @@ +--- Makefile.orig 2010-08-16 23:59:45.463692224 +1200 ++++ Makefile 2010-08-17 00:00:45.069692939 +1200 +@@ -1,11 +1,11 @@ + srcdir :=$(shell pwd) + +-CFLAGS= -O ++CFLAGS?= -O + fixed-flags = -I$(srcdir) -I$(srcdir)/box + all-C-flags:= -ansi $(fixed-flags) $(CFLAGS) + non-ansi-flags := $(fixed-flags) $(CFLAGS) + +-CC = gcc # some compiler for ANSI/ISO C ++CC ?= gcc # some compiler for ANSI/ISO C + + # These settings should also be used in subdirectories: + export CC all-C-flags fixed-flags CFLAGS +@@ -49,9 +49,7 @@ + # To 'make all', we first descend into the subdirectories, and afterwards + # return to finish here. + +-all: +- $(MAKE) math_functions binding_functions +- $(MAKE) finish ++all: math_functions binding_functions finish + + finish: lie Lie.exe LEARN.ind INFO.ind # do not call 'make finish' directly + +@@ -98,12 +96,12 @@ # been set to the most recent one of object files in the respective # subdirectories, whence taking that dummy file as dependency suffices. -date.o: date.c $(objects) box/.last_compiled static/.last_compiled -+date.o: date.c $(objects) math_functions binding_functions box/.last_compiled static/.last_compiled ++date.o: date.c $(objects) math_functions binding_functions $(CC) -ansi -c date.c -gapdate.o: date.c $(GAP_objects) box/.last_compiled static/.last_compiled -+gapdate.o: date.c $(GAP_objects) math_functions binding_functions box/.last_compiled static/.last_compiled ++gapdate.o: date.c $(GAP_objects) math_functions binding_functions $(CC) -ansi -c -o gapdate.o date.c - Lie.exe: date.o -@@ -115,7 +115,7 @@ +-Lie.exe: date.o ++Lie.exe: math_functions binding_functions date.o + $(CC) -o Lie.exe $(LDFLAGS) $(objects) date.o static/*.o box/*.o -lreadline -lncurses + chmod g+w Lie.exe + Liegap.exe: gapdate.o +@@ -131,7 +129,7 @@ learnind: util/learnind.c $(MAKE) -C util ../learnind diff --git a/sci-mathematics/lie/lie-2.2.2.ebuild b/sci-mathematics/lie/lie-2.2.2.ebuild index e723f5bd7..11c707cae 100644 --- a/sci-mathematics/lie/lie-2.2.2.ebuild +++ b/sci-mathematics/lie/lie-2.2.2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils +EAPI="3" + +inherit eutils toolchain-funcs DESCRIPTION="A Computer algebra package for Lie group computations" HOMEPAGE="http://young.sp2mi.univ-poitiers.fr/~marc/LiE" @@ -14,23 +16,27 @@ LICENSE="LGPL-2.1" ##### See http://packages.debian.org/changelogs/pool/main/l/lie/lie_2.2.2+dfsg-1/lie.copyright SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="doc" DEPEND="sys-devel/bison - sys-libs/readline" -RDEPEND="sys-libs/readline" + sys-libs/readline + sys-libs/ncurses" +RDEPEND="sys-libs/readline + sys-libs/ncurses" S="${WORKDIR}/LiE" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${P}-make.patch" epatch "${FILESDIR}/parrallelmake-${P}.patch" } +src_compile() { + emake CC=$(tc-getCC) || die "failed to compile" +} + src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${ED}" install || die use doc && dodoc "${S}"/manual/* dodoc README } diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog index 089eac891..de571395d 100644 --- a/sci-mathematics/normaliz/ChangeLog +++ b/sci-mathematics/normaliz/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*normaliz-2.5 (05 Sep 2010) + + 05 Sep 2010; Thomas Kahle <tom111@gmx.de> +normaliz-2.5.ebuild, + metadata.xml: + Bump to 2.5 + + 14 Aug 2010; Christopher Schwan <cschwan@students.uni-mainz.de> + normaliz-2.2.ebuild: + Fixed SRC_URI - url has moved because upstream has released 2.5 + 04 Mar 2010; Thomas Kahle <tom111@gmx.de> normaliz-2.2.ebuild: QA/ebuild improvements diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest index abb2e4b3f..2b78bc320 100644 --- a/sci-mathematics/normaliz/Manifest +++ b/sci-mathematics/normaliz/Manifest @@ -1,4 +1,6 @@ DIST Normaliz2.2Linux32.zip 3712125 RMD160 0b223dc7996c5b3d1d4b2d009c718043ee7647e9 SHA1 e3b518164c8c6d22f6303b357a337fdc7dadae77 SHA256 9588942dc63a999070341f5b84e4eeab318bf5c610a5403d909793f9931f1263 -EBUILD normaliz-2.2.ebuild 769 RMD160 e699c332ad4552b990d5384c5b05f67b17c8d1b2 SHA1 14dc193a682bd472aa305038b7edbd37c9621792 SHA256 ed01efebc73c6386f7557349204bc756112aede8339a867cff61cb5a5c1df670 -MISC ChangeLog 340 RMD160 ff76cae3da656dca1ed14d4241384cb51e0d2696 SHA1 2bad4046cdff5c4ab8e9e1e583a74eaa4c5b9340 SHA256 b7b985bba159ef98230ab05d193fcdacd7c21c50631cf1400004e280a6b1ebdb -MISC metadata.xml 421 RMD160 3877e916b9efaf447139174c187eb04dc400e527 SHA1 5f83d6586e145e78f11bd4e2167d43c447fcbe40 SHA256 baee293f19fbe342b2976a565bb6c5c702cba12573ca03cd5baa62682f6c82da +DIST Normaliz2.5.zip 4678783 RMD160 28f2c1aa0d88e83ef1e1f26f4a946e64e4871436 SHA1 a0095aa8f591fe485224deb73cce034e247472ab SHA256 31decc5172450ac918b97ff5cefb3b9b9b94e70d69cc4271962ba90f04ecde43 +EBUILD normaliz-2.2.ebuild 781 RMD160 2a3e08479875f799f85a8116648c5f432903a2d9 SHA1 8db64bfd896ef270ce28be7ae23a2156f589a654 SHA256 d028cf3aa12706dd608512b7c847824bc9195d0cf8988eb6b18cda9b268779ec +EBUILD normaliz-2.5.ebuild 1429 RMD160 142fb5d0920cbd3b10d5b970aa82a549ddb762c4 SHA1 48ac8938d8e06948c277b91fa51961d33640c80b SHA256 3dedba72f4b8137f79b709de613df86b48a4b8c09294540436e51aabb99c296d +MISC ChangeLog 622 RMD160 d2e864da6b93e741e9e82d8af00abef6410bb6b9 SHA1 7cc3663799784dbf094a407cc2a8c37dc5c156d1 SHA256 e756fe14fef9fa902954603eac9aadb5a34f4d993e9a7b2b40ddeb8d52fe1345 +MISC metadata.xml 622 RMD160 061c75168a8d9b3ba45c3540c8a237f11dfd2870 SHA1 59cf06140e04d754796ef4f1c776ddb3fb57fde4 SHA256 d6a6dd3aa1f8749303d3072a15504b2fe5900cc947a16a14d9c3f61e06612075 diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml index 269daa4e4..2ec8c8221 100644 --- a/sci-mathematics/normaliz/metadata.xml +++ b/sci-mathematics/normaliz/metadata.xml @@ -6,6 +6,10 @@ <email>tom111@gmx.de</email> <name>Thomas Kahle</name> </maintainer> +<use> + <flag name="extras"> Install the java-gui and Macaulay2/Singular packages.</flag> + <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag> +</use> <longdescription lang="en"> Normaliz is a (command line) tool for computations in affine monoids, vector configurations, lattice polytopes, and rational cones. diff --git a/sci-mathematics/normaliz/normaliz-2.2.ebuild b/sci-mathematics/normaliz/normaliz-2.2.ebuild index e98fa6e48..de4b90b93 100644 --- a/sci-mathematics/normaliz/normaliz-2.2.ebuild +++ b/sci-mathematics/normaliz/normaliz-2.2.ebuild @@ -8,7 +8,7 @@ inherit eutils DESCRIPTION="Normaliz is a tool for computations in affine monoids and more" HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/" -SRC_URI="http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.2Linux32.zip" +SRC_URI="http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.2/Normaliz2.2Linux32.zip" LICENSE="GPL-3" SLOT="0" KEYWORDS="~x86 ~amd64" diff --git a/sci-mathematics/normaliz/normaliz-2.5.ebuild b/sci-mathematics/normaliz/normaliz-2.5.ebuild new file mode 100644 index 000000000..d1a5a041a --- /dev/null +++ b/sci-mathematics/normaliz/normaliz-2.5.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Normaliz is a tool for computations in affine monoids and more" +HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/" +SRC_URI="http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz${PV}.zip" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc extras optimization" + +DEPEND="dev-libs/gmp[-nocxx]" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/Normaliz${PV}/source" + +src_prepare () { + if ! use optimization; then + sed -i "s/-O3 -funroll-loops/${CXXFLAGS}/" Makefile || die "sed on Makefile failed" + fi +} + +src_install() { + dobin norm64 normbig || die "install failed" + if use doc; then + dodoc "../doc/Normaliz${PV}Documentation.pdf" || die "install failed" + fi + if use extras; then + elog "You have selected to install extras which consist of a gui jNormaliz.jar," + elog "and Macaulay2 and Singular packages. These have been installed into " + elog "/usr/share/${PN}, and cannot be used without additional work. Please refer" + elog "to the homepages of the respective projects for additional information." + elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own" + elog "copies of these interface packages." + insinto "/usr/share/${PN}" + doins "../jNormaliz.jar" + doins "../Singular/normaliz.lib" + doins "../Macaulay2/Normaliz.m2" + fi +}
\ No newline at end of file diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog index 5ad2aea09..7ce314028 100644 --- a/sci-mathematics/singular/ChangeLog +++ b/sci-mathematics/singular/ChangeLog @@ -2,6 +2,18 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Sep 2010; François Bissey <f.r.bissey@massey.ac.nz> + singular-3.1.1.4-r1.ebuild: + Add missing factory templates. + +*singular-3.1.1.4-r1 (04 Sep 2010) + + 04 Sep 2010; François Bissey <f.r.bissey@massey.ac.nz> + +singular-3.1.1.4-r1.ebuild, +files/singular-3.1.1.4-parrallelmake.patch: + Import all my fixes from sage-on-gentoo: parallel make should now work. + libsingular install its own copy of the factory + headers without colliding with the factory ebuild. + 26 Jul 2010; Thomas Kahle <tom111@gmx.de> singular-3.1.1.4.ebuild: libsingular fixes from sage-overlay. Kudos to kiwifb diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index 2840d3c3c..e67d13773 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -4,8 +4,10 @@ AUX singular-3.1.0-emacs-22.patch 637 RMD160 ad6648dd733a064aa8f801056ed8f9c3f84 AUX singular-3.1.0-gentoo.patch 4765 RMD160 9ba5f369c473c58ed28019b85a95c27eb58f495d SHA1 385b3932e1d2257fe28ee0dc5cef5729726c1b41 SHA256 ae59a98268270ef68ecb2e7f34074fa5eee379d13565a0f359c48db4f6e02351 AUX singular-3.1.0-glibc-2.10.patch 1407 RMD160 5cc0db1754b16397b7af3c044489bdb1efacaf6c SHA1 fc696943e0a10217f0839ef2b14128a709fb6bb3 SHA256 57461bf8bba6a44ef6f1c3bcf8a1121fb7ea95ce286118219c22f2bf366905f7 AUX singular-3.1.1.3-soname.patch 651 RMD160 76c4d10f7fa0f55ffdb55232c8e4c670343ea3e7 SHA1 d7909ac36431742ecb43104d7c55b48fdc4439f6 SHA256 ad025b5a19c29ab8f25782fe3ee36a0139f1db64defa2298afb8b84d37ccdef1 +AUX singular-3.1.1.4-parrallelmake.patch 2283 RMD160 7cdc684eb85cd9b9e4a24749f1743fa896de6d41 SHA1 2a421de40935faf0f5cc1f2a41ae4eb7a36edf1c SHA256 32cf64e4a9f2febe35625697dd01830720de343dc54b1675eafee160b3012c5f DIST Singular-3-1-1-4-share.tar.gz 8283752 RMD160 4201afe285e1e3c6a65e3af34dee512d3752ea86 SHA1 e4e555d142b548b1165c022b6a025f66cb10de19 SHA256 ebf598d056b76cc5c5c5108d368a47fcdace92087eb2bbda61afb091f7e27b46 DIST Singular-3-1-1-4.tar.gz 19422406 RMD160 ef65429b8b75c9996e14f8848559d59b129c7f21 SHA1 cd330df7f83b439635d0a3a1db5314c45435eead SHA256 ea8328708ce5f9aaa5f73eee010c138b948b171228db737014d317038eff72d9 +EBUILD singular-3.1.1.4-r1.ebuild 5810 RMD160 9d1b3c185cac02e36118e5fd0f8b34f2da74f1e3 SHA1 7ce43e3d0986cd2781bc59717008d24823a42245 SHA256 8ea99cee2223a7a435184bce9215e9d5b2f04a1ddb1c186fc9e44790c0ccf856 EBUILD singular-3.1.1.4.ebuild 4719 RMD160 7e036b0cc5a7ab2d8121445942e2f1a2ef2378b1 SHA1 42a7f25eae69c092b2655b049127d58fd757a1cc SHA256 f8c2e05d466f3fed746cb4fb0c244aa3f86581b5668ebc1747f5cc3291aaf2ba -MISC ChangeLog 1639 RMD160 a469d7b98a4deb9f10894aea018b80eebf07cdf4 SHA1 dd14e094171237bd5f2660893bd407c4e51bcd29 SHA256 cb809036e61e1276b50ecfce721224d9fe602cced1e3f7b0c940a8cfb74d27b2 +MISC ChangeLog 2110 RMD160 aab47e6c7319fed30d69092dcc8b23d6df679306 SHA1 d9cba9bd462c2ef13431f6fa7d7b2f8e0248c491 SHA256 558e64071c186328b87db2f12205587e913e871bba1df1f174711c8cce85c199 MISC metadata.xml 471 RMD160 f505db20910413450175a8a9dc6dc27cc41ffa41 SHA1 4f0d34a55b6d10392e819cf08877d5877adc9729 SHA256 d1b8811843425ea5cf1d1ce1e90eeb4fae2198f1f93de190aeab4c10400b9805 diff --git a/sci-mathematics/singular/files/singular-3.1.1.4-parrallelmake.patch b/sci-mathematics/singular/files/singular-3.1.1.4-parrallelmake.patch new file mode 100644 index 000000000..617e3e961 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.1.1.4-parrallelmake.patch @@ -0,0 +1,61 @@ +--- factory/GNUmakefile.in.orig 2010-08-13 22:33:11.846891482 +1200 ++++ factory/GNUmakefile.in 2010-08-13 22:35:43.109891920 +1200 +@@ -490,6 +490,7 @@ + # + # - explicit targets. + # ++$(basefactorysrc:.cc=.o): factory.h + $(libfactory): $(factoryobj) + $(AR) $(ARFLAGS) $@ $^ + $(RANLIB) $@ +--- Singular/Makefile.in.orig 2010-08-13 22:33:48.169892406 +1200 ++++ Singular/Makefile.in 2010-08-13 22:35:31.758892190 +1200 +@@ -377,7 +377,7 @@ + claptmpl.o: claptmpl.cc mod2.h + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${DEFS} -c $< + +-iparith.inc: claptmpl.o iparith.cc \ ++iparith.inc: ${OBJS} claptmpl.o iparith.cc \ + ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \ + -o gentable1 claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \ +@@ -385,7 +385,7 @@ + ./gentable1 + /bin/rm -f gentable1 gentable1.exe + +-mpsr_Tok.inc: claptmpl.o iparith.cc \ ++mpsr_Tok.inc: ${OBJS} claptmpl.o iparith.cc \ + ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \ + -o gentable2 claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \ +--- Makefile.in.orig 2010-08-13 22:57:16.547892094 +1200 ++++ Makefile.in 2010-08-13 23:04:02.824894172 +1200 +@@ -75,12 +75,12 @@ + echo "* do not forget to install Singular-@SINGULAR_VERSION@-share.tar.gz" + + libsingular: +- cd Singular; make libsingular ++ cd Singular; ${MAKE} libsingular + + install-libsingular: libsingular +- (cd Singular && make install-libsingular); +- (cd kernel && make install-libsingular); +- (cd omalloc && make install-libsingular); ++ (cd Singular && ${MAKE} install-libsingular); ++ (cd kernel && ${MAKE} install-libsingular); ++ (cd omalloc && ${MAKE} install-libsingular); + + maintainer-install uninstall: + @ for SUBDIR in ${BUILD_SUBDIRS}; \ +@@ -174,9 +174,9 @@ + test: + @echo "make Tst for the official Singular test suite" + @echo "this part here are unittest and still under development" +- (cd Singular; make libsingular.a) ++ (cd Singular; ${MAKE} libsingular.a) + mkdir -p build +- (cd build && cmake .. && make && make test) ++ (cd build && cmake .. && ${MAKE} && ${MAKE} test) + + ############################################################## + # distribution targets diff --git a/sci-mathematics/singular/singular-3.1.1.4-r1.ebuild b/sci-mathematics/singular/singular-3.1.1.4-r1.ebuild new file mode 100644 index 000000000..d1cfe787d --- /dev/null +++ b/sci-mathematics/singular/singular-3.1.1.4-r1.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix + +inherit autotools eutils elisp-common flag-o-matic multilib versionator + +MY_PN=Singular +MY_PV=$(replace_all_version_separators -) +MY_DIR=$(get_version_component_range 1-3 ${MY_PV}) +MY_PV_SHARE=${MY_PV} + +DESCRIPTION="Computer algebra system for polynomial computations" +HOMEPAGE="http://www.singular.uni-kl.de/" +SRC_COM="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${MY_PN}" +SRC_URI="${SRC_COM}-${MY_PV}.tar.gz ${SRC_COM}-${MY_PV_SHARE}-share.tar.gz" + +RESTRICT="mirror" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="boost doc emacs examples libsingular +readline" + +RDEPEND="dev-libs/gmp + >=dev-libs/ntl-5.5.1 + emacs? ( >=virtual/emacs-22 )" + +DEPEND="${RDEPEND} + dev-lang/perl + boost? ( dev-libs/boost ) + readline? ( sys-libs/readline ) + test? ( dev-util/cmake + dev-util/cppunit )" + +S="${WORKDIR}"/${MY_PN}-${MY_DIR} +SITEFILE=60${PN}-gentoo.el + +pkg_setup() { + append-flags "-fPIC" + append-ldflags "-fPIC" + tc-export CC CPP CXX +} + +src_prepare () { + epatch "${FILESDIR}"/${PN}-3.1.0-gentoo.patch + epatch "${FILESDIR}"/${PN}-3.1.0-emacs-22.patch + # I don't see a need for the following patch, looks like cruft from + # older versions to me. The shipped code is fine ! +# epatch "${FILESDIR}"/${PN}-3.1.0-glibc-2.10.patch + epatch "${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch + epatch "${FILESDIR}"/${PN}-3.1.1.3-soname.patch + epatch "${FILESDIR}"/${P}-parrallelmake.patch + + sed -i \ + -e "/CXXFLAGS/ s/--no-exceptions//g" \ + "${S}"/Singular/configure.in || die + + SOSUFFIX=$(get_version_component_range 1-3) + sed -i \ + -e "s:SO_SUFFIX = so:SO_SUFFIX = so.${SOSUFFIX}:" \ + "${S}"/Singular/Makefile.in || die + + cd "${S}"/Singular || die "failed to cd into Singular/" + eautoconf +} + +src_configure() { + + econf \ + --prefix="${S}"/build \ + --exec-prefix="${S}"/build \ + --bindir="${S}"/build/bin \ + --libdir="${S}"/build/lib \ + --libexecdir="${S}"/build/lib \ + --disable-debug \ + --disable-doc \ + --disable-NTL \ + --disable-gmp \ + --without-MP \ + --enable-factory \ + --enable-libfac \ + --enable-IntegerProgramming \ + --enable-Singular \ + $(use_with boost Boost) \ + $(use_enable emacs) \ + $(use_with readline) || die "configure failed" +} + +src_compile() { + emake || die "emake failed" + + if (use libsingular || use test ) ; then + emake libsingular || die "emake libsingular failed" + fi + + if use emacs; then + cd "${WORKDIR}"/${MY_PN}/${MY_DIR}/emacs/ + elisp-compile *.el || die "elisp-compile failed" + fi +} + +src_test() { + # Tests fail to link -lsingular, upstream ticket #243 + emake test || die "tests failed" +} + +src_install () { + dodoc README + # execs and libraries + cd "${S}"/build/bin + dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \ + || die "failed to install binaries" + insinto /usr/$(get_libdir)/${PN} + doins *.so || die "failed to install libraries" + + dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \ + || die "failed to create symbolic link" + + if use libsingular; then + cd "${S}" + emake install-libsingular || die "failed to put libsingular in the right location" + cd "${S}"/build/lib + dolib.so libsingular.so."${SOSUFFIX}" + dosym libsingular.so."${SOSUFFIX}" /usr/$(get_libdir)/libsingular.so \ + || die "failed to create symlink" + insinto /usr/include + cd "${S}"/build/include + # Move factory.h and cf_gmp.h in the singular folder so we don't either + # collide with factory or need it to use libsingular. + sed -e "s:factory.h:singular/factory.h:" \ + -i singular/clapconv.h singular/fglm.h singular/mod2.h || die + sed -e "s:cf_gmp.h:singular/cf_gmp.h:" \ + -i singular/si_gmp.h factory.h || die + sed -e "s:factoryconf.h:singular/factoryconf.h:" \ + -e "s:templates:singular/templates:g" \ + -i factory.h || die + doins libsingular.h mylimits.h + insinto /usr/include/singular + doins singular/* + doins factory.h factoryconf.h cf_gmp.h + insinto /usr/include/singular/templates + doins templates/* + fi + + # stuff from the share tar ball + cd "${WORKDIR}"/${MY_PN}/${MY_DIR} + insinto /usr/share/${PN} + doins -r LIB || die "failed to install lib files" + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples || die "failed to install examples" + fi + if use doc; then + dohtml -r html/* || die "failed to install html docs" + insinto /usr/share/${PN} + doins doc/singular.idx || die "failed to install idx file" + cp info/${PN}.hlp info/${PN}.info && + doinfo info/${PN}.info \ + || die "failed to install info files" + fi + if use emacs; then + elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \ + || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + einfo "The authors ask you to register as a SINGULAR user." + einfo "Please check the license file for details." + + if use emacs; then + echo + ewarn "Please note that the ESingular emacs wrapper has been" + ewarn "removed in favor of full fledged singular support within" + ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs" + ewarn "and you should be good to go! See bug #193411 for more info." + echo + fi + + if use libsingular ; then + einfo "libsingular include the functionality included by libfactory (factory ebuild)" + einfo "To avoid file collisions with factory and the need of factory to use libsingular" + einfo "We have moved the factory headers shipped by singular in /usr/include/singular." + einfo "If you want to use the factory functionality offered by libsingular rather than" + einfo "the one offered by the factory ebuild you should include sngular/factory.h rather" + einfo "than just factory.h." + fi + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sci-misc/gcam/ChangeLog b/sci-misc/gcam/ChangeLog index b7b0c814b..4f44daf4b 100644 --- a/sci-misc/gcam/ChangeLog +++ b/sci-misc/gcam/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-misc/gcam -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*gcam-2010.07.27 (22 Aug 2010) + + 22 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + +gcam-2010.07.27.ebuild: + Version bump. + 20 Dec 2009; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> +gcam-2009.05.31.ebuild, +metadata.xml: New application, see bug 231227. Thanks to Renato Caldas, sedzimir, and Tommy[D]. diff --git a/sci-misc/gcam/Manifest b/sci-misc/gcam/Manifest index d4331e4d8..d8ba54032 100644 --- a/sci-misc/gcam/Manifest +++ b/sci-misc/gcam/Manifest @@ -2,23 +2,25 @@ Hash: SHA1 DIST gcam-2009.05.31.tar.gz 588143 RMD160 d1e9e6135da28a8258f6ffa61e58ca96a01b8a23 SHA1 a0b0d9d4dfef9d124d62cc245ae9c4a32a500279 SHA256 490a5248e8bb51167a553989d1566e94d1e57cb758cc1e3af4a904eec4681fd8 +DIST gcam-2010.07.27.tar.gz 554771 RMD160 a2f412b3b09803963f2d74a5f828b0029369a596 SHA1 a007a1a5d528ec7f3513504242991fe399f0ba65 SHA256 9e4eaf1933aed72316c162b5fff86e00d5df1478fcebd65b9621e552a0a42ccf EBUILD gcam-2009.05.31.ebuild 384 RMD160 9daa80afe09871aa6c57e0d2e58e2a5de3a057b4 SHA1 c4d8239f40a87a3b2df246078cf66be20481f640 SHA256 df23a98c6dd333f3a0f89c639db415ec381749e4167ec261a986d5a287d1a8dd -MISC ChangeLog 307 RMD160 aa1deb3fc88ac22c5e9cb45fb0f2678faef59d19 SHA1 59c6acb7d28824e2b988f6623466d7a62ded23ea SHA256 2702a9be4d6f61fde50e4b2ec01c266dad15998d8923807e311438f45621af99 +EBUILD gcam-2010.07.27.ebuild 384 RMD160 9daa80afe09871aa6c57e0d2e58e2a5de3a057b4 SHA1 c4d8239f40a87a3b2df246078cf66be20481f640 SHA256 df23a98c6dd333f3a0f89c639db415ec381749e4167ec261a986d5a287d1a8dd +MISC ChangeLog 449 RMD160 66bdd1e1a905132f53ca0afae52608b9fe43301c SHA1 899f02be829156b54c3f5d259bc24fa3c207a47a SHA256 302eecdcb99cb55b58da2fae9652e7e8a2ae4352c64481b6c4a8a39fa46a395e MISC metadata.xml 220 RMD160 ca6550596e8161335672d43190679937c7d7e379 SHA1 1cae3ca7e09c8dfada0ec9a3b9ac515594e16a0d SHA256 e3ca9a1bc10b0012ad51dd8f49771e09837812dd49b6c9e083a94d832ac5257a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBAgAGBQJMGRKgAAoJENwGBM22xffeUH4P/0/ZFiiaZ1rC4f8yeclCT/by -vWI4muwj6/KWORIthy7RFZhx8I5umuhvhoKlqrNoBCNyXxbymKGVZhjwrFCsoQr1 -pl6jmms16UqPvUtlBNZfv5kjEJuDkvDWCoTxcN7qVCTk4Y8/h7Fp+n32BwpcnHu1 -8bRsfBcT2v+N6Eo80k27sYiQV1+7SZnz2G/S1hxpZDh4yc6DexMT1Y+0Z8JTj8fb -xft2ZmFLVB2jAiqSuFn+UItkfd7oYmSTdzKzaQG91/ouiWVSzCIjfEEWKNukZVjw -iDyntVNlDFHGipBw8lRC/hk8I32phEq3pWz+gHHptpKDre0qwQCcK6bEzwnwmfE6 -Aqs/6zCA4kz/sYh/+V777kCu+7iiCRiSM37frZKVrFGOjvS11f+ZuayEnqMEAOks -f+QYOIix228bFa43Mc3+UQSUg71fnhn/7BoSexmxmMfJIRbIqILAGRzmEJ9FpLEe -TA/DEpLJEf9s5XAJTP8byo8aLobbeZIS+GT08ZjjWWVF5cy6tB8bIJ7+SriQSte1 -kC2w1780FbtuMQO1/u1xjdLoDmrNyXOYI9H2YJmqwAC0ForSXnFXWQ5LyBEBy6z4 -+KssU8gUi8qLvZxSFElw42rR6utEZCCOGlDGuS2qCXl2qPHGVcl9iDvHM9YUdFg1 -L0qzj+eroNVT1t/4wlEH -=+Nb9 +iQIcBAEBAgAGBQJMcTqyAAoJENwGBM22xffeFa8P/A1841yqXCmmMzg6hdTQplxl +vF51OkJywUoQeRPeSuLYkP4i4xP+IpZiFwnYFemQyH9HGcChNsnU+QPV6CS4wCPS +58TRWesIRuPZoBqFjkBG2avhFGfXTw+WaXN958qRbQ4Gdda0shk9vO7VDE6j5ghn +7+ucUVBjSRPIStJjF0neZvZDGEBOx8hF0VOBdEwktTbKBFlQGP77AH2ufd2pEnw4 +o4eftsFLtu07x8zUfBbvfGsu7+p+1Vw0HvtxFi8quOGj+62ocRY+kgU0twaNJhac +ORRxfP2ZXNlMP5ZAsxvxxXkiZjg96b51YC/Dn23ICt4oiHieweloaIhGHHGe/WaR +A0Xyyl4mwKNxDhdRIQNdSQuzTZ+8RLcm/IrZfOHY4rFL0qGyBY9Tog9SFqt72Mp+ +ve94PY47jLiRiKsN07DvYPttuM/tEyeExB6S5sxYnVngM4+28p7id+drYRZOauA8 +O/SSTcy4uphnTGW2Qdl8P/KP+6t4PoH92zGWB0x603a+PxKpoStovogowzrnXJ3v +DIbGVFqoebOJYT0soARzU0UShZV0p1VtI1vEpW2sRASEhNI+DJA4gIBsz9NZvags +DEaJYZJCSIbQSi3b8JsWC0Cr/22rHGW77y19YABIl1ul1psXZywkYbk4zjKDF4T+ +g3lQUjmsnj0ShLqfGiPu +=q5b5 -----END PGP SIGNATURE----- diff --git a/sci-misc/gcam/gcam-2010.07.27.ebuild b/sci-misc/gcam/gcam-2010.07.27.ebuild new file mode 100644 index 000000000..f519ff065 --- /dev/null +++ b/sci-misc/gcam/gcam-2010.07.27.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="1" + +inherit base + +DESCRIPTION="GNU Computer Aided Manufacturing" +HOMEPAGE="http://gcam.js.cx" +SRC_URI="http://gcam.js.cx/files/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="x11-libs/gtk+:2 + x11-libs/gtkglext" +RDEPEND="${DEPEND}" diff --git a/sci-misc/openfst/ChangeLog b/sci-misc/openfst/ChangeLog index 5362fdb7d..a180622c2 100644 --- a/sci-misc/openfst/ChangeLog +++ b/sci-misc/openfst/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openfst-1.2 (23 Aug 2010) + + 23 Aug 2010; <flammie@gentoo.org> +openfst-1.2.ebuild, + -openfst-20080422_beta.ebuild: + Version bump + *openfst-1.1 (22 Feb 2010) 22 Feb 2010; <flammie@gentoo.org> +openfst-1.1.ebuild: diff --git a/sci-misc/openfst/Manifest b/sci-misc/openfst/Manifest index 1654c77fe..6e4b6ca8b 100644 --- a/sci-misc/openfst/Manifest +++ b/sci-misc/openfst/Manifest @@ -1,7 +1,7 @@ AUX openfst-20080422_beta-gcc-4.3.patch 2918 RMD160 0aeceeb049614182f2e83fa3a149ba5aa54cffaa SHA1 64bb951888f83a3ba9f780b4ec4dec46d9d20303 SHA256 8aab92d28f806074916d76245de4c46b15c9ac302a8417e4cb168aa8d755cb12 -DIST OpenFst-beta-20080422.tgz 156800 RMD160 480e4da360d3d854a85473a8f40f7d1a53ad6421 SHA1 3266501f9362a22e52982d940fa888cf699ae88b SHA256 9b07d6ceb1a88cd01f7e41b511cd71b2c56278ad924c5947b71e642bab0bfff2 DIST openfst-1.1.tar.gz 513404 RMD160 45657bb11f91ffdce5261ff6f4c103c164cc161b SHA1 b070f84a981dfadc4c049f505bd3406a43dfa55d SHA256 445e364eaf44d13c0c876f0702abe9680eee80fdd731f6a653439e5f7849b50a +DIST openfst-1.2.tar.gz 653084 RMD160 d3b5f21f7e8c4c4696cc16c30d956f8a1906f521 SHA1 80ea5c4d83a55708e599d86b6d23d318ff7fb3c0 SHA256 c82eb4e1828eb087b1dedc15513ba20ab7f939e776c021b791b8c4ba9b0b3304 EBUILD openfst-1.1.ebuild 645 RMD160 9d59e74d2b468e5c0ff3a84556e4a806eb3c35a4 SHA1 7b837c6f1f2b764450e1b1aa2781a08563c0d1e7 SHA256 33fe51fb13620534896ff1eb7850c37f4e67a7e7fc64cc98296118800aa4545b -EBUILD openfst-20080422_beta.ebuild 1279 RMD160 c2b8f98642066bae459262ed6997e3441119a9fb SHA1 e204748bb06931ddc92d5eaa38a52f550da18665 SHA256 2ba750327cb706e523d5a3de49751fc1089eb8277192eef9b26e49e42dc4060a +EBUILD openfst-1.2.ebuild 645 RMD160 9d59e74d2b468e5c0ff3a84556e4a806eb3c35a4 SHA1 7b837c6f1f2b764450e1b1aa2781a08563c0d1e7 SHA256 33fe51fb13620534896ff1eb7850c37f4e67a7e7fc64cc98296118800aa4545b MISC ChangeLog 605 RMD160 0dd9015660a64b8bdcac357f7629876e04b6cd95 SHA1 cb6143460edcb3f87f29261ba31ca8123f1da71f SHA256 a5124b6da489da4186773c910c540709e2b95a2e8b2bc510a53a067e9d8267dc MISC metadata.xml 223 RMD160 754bf1189c9d51090f3e0439f6e7d6f603b93df0 SHA1 54348ca01c174e03ff3318b2a9da50d970db6695 SHA256 5c57a999484660ea4a3e55f9c526bb38097d5c1cb2356353133ec4d7e89f1f88 diff --git a/sci-misc/openfst/openfst-1.2.ebuild b/sci-misc/openfst/openfst-1.2.ebuild new file mode 100644 index 000000000..1fb4eb424 --- /dev/null +++ b/sci-misc/openfst/openfst-1.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils multilib + +DESCRIPTION="Finite State Transducer tools by Google et al." +HOMEPAGE="http://www.openfst.org" +SRC_URI="http://mohri-lt.cs.nyu.edu/twiki/pub/FST/FstDownload/${P}.tar.gz" + +LICENSE="Apache-2.0" + +SLOT="0" + +KEYWORDS="~x86" + +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + dodoc AUTHORS NEWS README || die "docs missing" +} + +src_test() { + einfo "make test can take a few hours on moderately modern systems" + make test || die "check failed" +} diff --git a/sci-misc/openfst/openfst-20080422_beta.ebuild b/sci-misc/openfst/openfst-20080422_beta.ebuild deleted file mode 100644 index b43cb808a..000000000 --- a/sci-misc/openfst/openfst-20080422_beta.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils multilib - -MY_PN="OpenFst" -MY_P="${MY_PN}-beta-${PV/_beta/}" - -DESCRIPTION="Finite State Transducer tools by Google et al." -HOMEPAGE="http://www.openfst.org" -SRC_URI="http://cims.nyu.edu/~openfst/twiki/pub/FST/FstDownload/${MY_P}.tgz" - -LICENSE="Apache-2.0" - -SLOT="0" - -KEYWORDS="~amd64" - -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/OpenFst/fst" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/${P}-gcc-4.3.patch" || die "Patching failed" - cd "${S}" - sed -i -e "s/OPT=\(.*\)/OPT=-fPIC ${CXXFLAGS} \1/g" bin/Makefile - lib/Makefile -} - -src_compile() { - emake all || die "emake failed" -} - -src_install() { - # bin dir has .o and stuff - # bins have insecure runpath’s - for f in $(find bin/ -executable ) ; do - dobin ${f} - done - dodir /usr/include/fst - dodir /usr/include/fst/lib - insinto /usr/include/fst/lib - doins lib/{fst,arc,compat,properties,register,symbol-table,util}.h - dodir /usr/$(get_libdir) - insinto /usr/$(get_libdir) - doins lib/libfst.so - doins bin/libfstmain.so - cd "${WORKDIR}/${MY_PN}" - dodoc README -} - -src_test() { - einfo "make test can take a few hours on moderately modern systems" - make test || die "check failed" -} - diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog index 31c86c3a6..b1050df59 100644 --- a/sci-physics/espresso/ChangeLog +++ b/sci-physics/espresso/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*espresso-2.2.0b (29 Jul 2010) + + 29 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de> + -espresso-2.2.0.ebuild, -files/espresso-2.2.0-autotools.patch, + +espresso-2.2.0b.ebuild: + version bump + *espresso-2.2.0 (25 Jul 2010) 25 Jul 2010; Christoph Junghans <kleiner_otti@gmx.de> diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest index e41737b52..a449b96f8 100644 --- a/sci-physics/espresso/Manifest +++ b/sci-physics/espresso/Manifest @@ -1,15 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX espresso-2.2.0-autotools.patch 265 RMD160 9b7bf0947d7cf65d650bc1d15d677f2678e14d20 SHA1 b81e9db833b72da9e91fc942844da1962fe11609 SHA256 20feed8b6225ade461231768e97f05112ccc2227ff7ef2a2cb9d3c69855e74cb -DIST Espresso-2.2.0.tar.gz 5123296 RMD160 2398803b279a6578938074e9cee604d2271af098 SHA1 3a9603cfccaea083f27598616097832edc07dc01 SHA256 88a72081532b6cecf1c80fa50a4df4aed598f6d5d138d90e48dc0c8103c2ae03 -EBUILD espresso-2.2.0.ebuild 2199 RMD160 fa2514dac1798401520587fff61e40952621df16 SHA1 524ca94de88a50cfa0e14ef3b78fe559de03a55b SHA256 8256b102a04e011ac8bf6fb3510bd429eb1666ab20b1dab4980aa29424c23ef3 -MISC ChangeLog 592 RMD160 30ee9fd5a2e54ac47bf23160adfc0e5a5340e38e SHA1 96fb9f01d809ef24e1237fbf2a6f927b4e2c202a SHA256 b2718330246f3be9587278280f454a12b52261a41370b0829b396fae86d31a3f +DIST Espresso-2.2.0b.tar.gz 5020436 RMD160 8a2fec1956e2314aee66e382ef39824143914c81 SHA1 1670a15ea6b2e8f639c932f5d19b140c334688ee SHA256 69882313d15a186f17153a4b9784af28338254a7f6566668a3b44c326ddf29f0 +EBUILD espresso-2.2.0b.ebuild 2149 RMD160 7be9afeadb36fbc73ae697c479c73a01fbbc7332 SHA1 b4b5a1b846687e68bbca5d54a01f5f233ebe0856 SHA256 8d9f890c5dc327de4f79784ff305256a7c1e6f603efbc5a9c91c66cfcaabf707 +MISC ChangeLog 788 RMD160 216433a4029eb4218c25072459f9c932d5aced90 SHA1 372247874fd431d0688f18972cbb4b4803357b1f SHA256 ce873e080e8151b6259cbd27fe8a54e0a8f012f1e2b94361c7636669bab5cd9c MISC metadata.xml 291 RMD160 5ae1471fd0e7b60d7de7027f8b807dcd005bd0b0 SHA1 10bcd36795a8dcc9ebf5b720fe79bd42a9518b7a SHA256 112c54edd1ef7cbe34d7132ba3fd95a0728b9298eea9b2e957fa5e40962842ea -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkxMf/AACgkQy0OE/ans1/kErgCfb0L0zuM8KDO3H+8xzESQzUpN -2eEAn3LALdTcH5aN5ght73SUYXU6U029 -=M/6+ +iEYEARECAAYFAkxR49YACgkQy0OE/ans1/kPWACaAw3N5AbnhOVRkAemf04NlEyf +3EIAnRfTF8V7MwJJ7CgteR3jMCVitGwX +=P3tj -----END PGP SIGNATURE----- diff --git a/sci-physics/espresso/espresso-2.2.0.ebuild b/sci-physics/espresso/espresso-2.2.0b.ebuild index b5c044ae4..fa74e64e3 100644 --- a/sci-physics/espresso/espresso-2.2.0.ebuild +++ b/sci-physics/espresso/espresso-2.2.0b.ebuild @@ -4,11 +4,11 @@ EAPI="3" -inherit autotools eutils savedconfig +inherit autotools savedconfig DESCRIPTION="Extensible Simulation Package for Research on Soft matter" HOMEPAGE="http://www.espresso.mpg.de" -SRC_URI="http://espressowiki.mpip-mainz.mpg.de/wiki/uploads/6/67/Espresso-${PV}.tar.gz" +SRC_URI="http://espressowiki.mpip-mainz.mpg.de/wiki/uploads/f/f3/Espresso-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -25,10 +25,9 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen virtual/latex-base )" -S="${WORKDIR}/${PN}-${PV:0:5}" +#S="${WORKDIR}/${PN}-${PV:0:5}" src_prepare() { - epatch "${FILESDIR}/${PF}-autotools.patch" ln -s Makefile-am.am Makefile.am eautoreconf restore_config myconfig.h diff --git a/sci-physics/espresso/files/espresso-2.2.0-autotools.patch b/sci-physics/espresso/files/espresso-2.2.0-autotools.patch deleted file mode 100644 index 17940f3eb..000000000 --- a/sci-physics/espresso/files/espresso-2.2.0-autotools.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- scripts/Makefile.am.old 2010-07-25 19:30:55.000000000 +0200 -+++ scripts/Makefile.am 2010-07-25 19:31:02.000000000 +0200 -@@ -7,7 +7,6 @@ - bundle.tcl \ - convertDeserno.tcl \ - countBonds.tcl \ -- init.tcl \ - parallel_tempering.tcl \ - pdb.tcl \ - polymer.tcl \ diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 85b86f1ad..69eaf966a 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Jul 2010; François Bissey <f.r.bissey@massey.ac.nz> + paraview-3.8.0.ebuild: + Correct SRC_URI. + 11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> metadata.xml: Silenced repoman. diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 2e894c1f0..8fb9ddb13 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX paraview-3.8.0-h5part.patch 467 RMD160 bd34e8bf02a1855dcfeabdc77cac39bd78a41492 SHA1 8416ef8a782425624b04c28c379d383e8f924c44 SHA256 ea46a024d8cb398c93dabee22ac2bef66af3771477811551275bfa85a765cc3f AUX paraview-3.8.0-installpath.patch 1554 RMD160 c998ba929f32892191161a9ead0572e2afbef817 SHA1 41cc9dc5d83bc67290653997145fe9e1b45411c6 SHA256 b57a10a4a2e299385c581231173e4b2c67a0367cf7d8ce1ca618db4c370a9550 AUX paraview-3.8.0-pointsprite-example-install.patch 400 RMD160 e7e027393025767748844b13f32499134afd3ef1 SHA1 0a78a35d6f51cefe885b79438a94e655eab562f4 SHA256 217b1f02199fef668201ccc78d2db3fce50730123946b992567f1a925ef764dd @@ -10,23 +7,6 @@ AUX paraview-3.8.0-xdmf-cstring.patch 353 RMD160 3866f7d3ea997099b566386956aa69b AUX vtk-5.6.0-cg-path.patch 1106 RMD160 a6cb9f4855dfe417d83e7bba04a02da88af869a6 SHA1 fa5afd4b1a943f255e2f20fa35f440518f9d9d95 SHA256 7ad4eb9a82664a2e9c51d8763e594634027051b54ce48bb1c2fca6d1a42635c9 AUX vtk-5.6.0-libpng14.patch 734 RMD160 d54626d332130fe242b3a5b1300a650e45763d29 SHA1 e6480b68a14345d7dfa78f6d37ff7301366d99d8 SHA256 81565709c8cfb4df3c28d69df8094d15923d824345330ab5ba101a9780e6e9f9 DIST ParaView-3.8.0.tar.gz 31703024 RMD160 8eb8fc590cf723848ef18b368b1e0e46dd38de8d SHA1 410d421fc32fd43a46ac6f48d6404954cc592597 SHA256 fe26c5aab225e804a9d890007d3963988c5f1000bdb270576dc9c2549c6a4078 -EBUILD paraview-3.8.0.ebuild 6568 RMD160 9fd2e8bbfd040567b41a5a7cc16dcf1bdaa652f9 SHA1 4181d22c4aebc28fbc1aaaea4d9c38fb7f6d49a4 SHA256 d0f0a6ba1b891f0b25c12ff48157eff8e9d3cd2e03f4cbce5d93a7e9cce0a6dc -MISC ChangeLog 871 RMD160 4b99c69ad87d8d32d1defbdbb85ead27778304cd SHA1 98fe652c9663be7bb50b115887867ec4ef440a73 SHA256 0a4925351795efbba4f6f2f5066ced54ca5d1c54607c74b6d09860eaabbec630 +EBUILD paraview-3.8.0.ebuild 6493 RMD160 d30db941c3619f3a3017d43c305a0c273a07f054 SHA1 a7a21ccba21a847a247a5a6af59b8de56710e875 SHA256 232d447fb19624fe095b4ed4481bffb672c757ffc22d5c325908efcb18ac587d +MISC ChangeLog 974 RMD160 90cc22ac72c3c4d794a1fb82ae7c45544ed0aa28 SHA1 5ef9f3a76d130ca814a42195794c9ac9f0ad81fc SHA256 090e05a40c51f5514c661c187cfcb795a86f956722eb5c56c3885806d2d347dc MISC metadata.xml 811 RMD160 f0af97f0b2ef863ad26006ebeba0ae2000f82d2d SHA1 2c90bde6bfb680006a609c6ec6a7b8d3dbb35494 SHA256 75badcaa670d70e163a608a5cb0ae5184ed6e0b2cf96e15413e92ce91627118d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iQIcBAEBAgAGBQJMObAKAAoJENwGBM22xffeqG0P/2Utt/xxMh1zTk+O8LfXCbZY -k/3dNRvegUHrROA9ppXJSc0DEIKN9jfQp4+IIQtpNIM0j//bTci2MpgB1VVeRf6Q -AeU7bRhy/NLyVzcHktXWRUQYWT3opmwjy9xAQ1o449lMrgBAa3P+g7q7IA4x7ujl -Lzv9gokWF9ESuUfD5poKljNMs/awY+/UYV1yRi1Fca0v0Ip5s/hqoFc2YBbRwVj6 -NXhAT0Nyn4k62zP3TUuD7tshmCSrQYqNqFGOx5kEXdEfCaVLwK6007ptEc6dPDl0 -xM15FB6qWJpjvnzMMXYNXvuPtLw8r5pTKbI+nvc846kibGETBPDDnCZPOk2c9je+ -mcTO1fpe7dmE26yH54ygq1Ee3oo1H51qMKDDVx+W7W0ggGbktzdxLIMXH64lXGDq -GwI2SoByEOIcUxb7XwqGiUxHo3g8hqL+ZEFOkwErWC8jFFayV36oE+qck3vfaoYQ -cH7uf/WRQK7DKD7hx4zFWSnYe1NPi/yugluBNw+hWJdiSpc3S/xm5Ny+KfgPBS6E -PZeAmEjUMYRkTtQlt4KV5dwLydwwc88iOPbAefNTdOhs/OmKqMdGMK6O7m4P3RMn -bbsI+P35xn/wl4OFju4LOm/cwVAJlJM16dHhyq6Z5eEW8hpQMu0rMcMnJPJLaYLp -Vd+bmO2slUvaMQgEa7TK -=w1+i ------END PGP SIGNATURE----- diff --git a/sci-visualization/paraview/paraview-3.8.0.ebuild b/sci-visualization/paraview/paraview-3.8.0.ebuild index edcc0cd29..770227980 100644 --- a/sci-visualization/paraview/paraview-3.8.0.ebuild +++ b/sci-visualization/paraview/paraview-3.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.8 2010/05/21 10:47:15 arfrever Exp $ +# $Header: $ EAPI="2" @@ -14,7 +14,8 @@ MY_P="ParaView-${PV}" DESCRIPTION="ParaView is a powerful scientific data visualization application" HOMEPAGE="http://www.paraview.org" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" +SRC_URI="http://www.paraview.org/files/v3.8/${MY_P}.tar.gz" +RESTRICT="mirror" LICENSE="paraview GPL-2" KEYWORDS="~x86 ~amd64" diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog index 6642e4631..291107ece 100644 --- a/sys-cluster/mpich2/ChangeLog +++ b/sys-cluster/mpich2/ChangeLog @@ -2,6 +2,21 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Aug 2010; Justin Bronder <jsbronder@gentoo.org> + mpich2-1.2.1_p1-r2.ebuild: + Fix python handling, thanks to jlec for noticing. + +*mpich2-1.2.1_p1-r2 (05 Aug 2010) + + 05 Aug 2010; Justin Bronder <jsbronder@gentoo.org> + -mpich2-1.2.1_p1-r1.ebuild, +mpich2-1.2.1_p1-r2.ebuild, + +files/mpich2-1.2.1-fix-missing-libs.patch: + Fix #313045, add missing libs during linking + + 05 Aug 2010; Justin Bronder <jsbronder@gentoo.org> + -mpich2-1.1.1_p1.ebuild, -mpich2-1.2.1.ebuild, -mpich2-1.2.1_p1.ebuild: + cleanup + 03 Jul 2010; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1-r1.ebuild: Remove debug code diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest index 9139e765a..a2b65d656 100644 --- a/sys-cluster/mpich2/Manifest +++ b/sys-cluster/mpich2/Manifest @@ -10,19 +10,15 @@ AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 RMD160 5b9904ae02f1c1098fdfd2dc4717610f89469afd SHA1 a33bcefa87d990a678436ebfac70976069a7f90d SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced AUX mpich2-1.0.8-mpdconf-env.patch 5355 RMD160 26ffada537073676553fdc4a9ee6a02f1a1af279 SHA1 f40eee99425894d9c76c8eefa87b8e72d9b7a02a SHA256 14cbd73be6969569574a880ad23e7c71c4bb02e6994392b2661bf5fb1965ce3d AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e -DIST mpich2-1.1.1p1.tar.gz 18343542 RMD160 efa469c42306f3c4ce1d38d09da7c793c55ae03d SHA1 053fadf971f93fd023fae1e762f801f1d08d76e3 SHA256 10badc5afe55998f7be90f569447ce1b56c42ed0248c3a925090ad1e6a5d800f -DIST mpich2-1.2.1.tar.gz 18284454 RMD160 6ffbfbd11d9a51a79228713705df7be6d7f67be7 SHA1 0f7e104143cb4449afcec542e44098423e1627cb SHA256 394736543f021ac0ea73f3f40a58ca0320b7223487eb13991f0312aa9e8721c1 +AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964 -EBUILD mpich2-1.1.1_p1.ebuild 5133 RMD160 7dd128592d5dffb39d90469c08011c71fe9a73e1 SHA1 e74375bd76a631cc030c41dc4035928693b29b8c SHA256 70cf6beb15ca07b4b42383568ae9c87849f5cd640016d7039309593797967d7a -EBUILD mpich2-1.2.1.ebuild 5074 RMD160 bc9a907c09eaf7b07e818af27a4e06daf6bc315f SHA1 1c31421495bb07a6cfb1d027bc17fecc7b872dd1 SHA256 1c279e280bc01c49c8b383158837398cb5c4a24df279f572e7feda486c2925e3 -EBUILD mpich2-1.2.1_p1-r1.ebuild 5314 RMD160 f68da81a6bb714273b7efadfc46c2465e55da930 SHA1 9a830a1b6c9529550e9747702513c0f8247b2c9e SHA256 c95be8a760f0aa00ddfdeb5292cee18ad7d9c2ca2139500b49f649397b5bca49 -EBUILD mpich2-1.2.1_p1.ebuild 5298 RMD160 b8e863f33646f64cd716db6668f86875d77c34b0 SHA1 80aed9500ff444e416a74c104164e9789b059ea5 SHA256 db8aa90ddf2f1ba208b4486b221eaa0fda93208c0ff4f6f511f7113f99190ab2 -MISC ChangeLog 2778 RMD160 1372de233de0bbf75a4d49e8fc339e2508144702 SHA1 5ba46f8ca59da49f2af435ed4dc7bf68c5fca3d9 SHA256 840ccffb4d6d392b6ce1e23e7cd1e13996892a0e0b9453576be7e472163ced58 +EBUILD mpich2-1.2.1_p1-r2.ebuild 5250 RMD160 c83b3edcfbd4fd5f13d3184cd62f2711d7410562 SHA1 de44bb663254cb5861e8a2eb1e8a270a3d5c28d3 SHA256 92b2b0dfa1d2c52b7b125d0940d23b76568186c11a6e617b9765c17e90678199 +MISC ChangeLog 3291 RMD160 9cfbd9989e2e0937447b3278ba77e3098d0429b9 SHA1 3fc66919567acbaf7715d00ce9f17da6e16020cb SHA256 8f3a0ff18e9ac5ad1057bec48c8bc3e5761126fb816f9151016ff324723952c1 MISC metadata.xml 607 RMD160 135a7788ce8c8b0434be793aea5a41e081b09630 SHA1 9b9f3342ad6d29a77321c663fa56f9944b30ce29 SHA256 149f73e9eec49b3125b6ac791958206043f3ec278e608279e6f28cccd3a1cc75 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwuul4ACgkQ4MrvBE1wQ8m1JACfVZKje1pHYTYD4fzUZUqfIyZx -VakAoIE1RkD9vfQ4VTMqhHUDVpwbdgAK -=HByy +iEYEARECAAYFAkxa4zUACgkQ4MrvBE1wQ8mcHgCeO3DBbUwOI6WS3W9hHHkvI8B+ +sgQAn3LkT98KBCLqHWLYhgJWRBWhttQ0 +=LvgM -----END PGP SIGNATURE----- diff --git a/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch b/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch new file mode 100644 index 000000000..1f2ba04cf --- /dev/null +++ b/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch @@ -0,0 +1,33 @@ +From 94707148dc8c33a1d3245e1f0dd7e28542f91e75 Mon Sep 17 00:00:00 2001 +From: Steve Arnold <nerdboy@gentoo.org> +Date: Wed, 4 Aug 2010 23:34:06 -0400 +Subject: [PATCH] Added missing library references for the f90 and C++ shared libraries + +Backport of upstream r6848. Directly modifies the Makefile.in to avoid +having to call simplemake to regenerate the entire build system. + +http://trac.mcs.anl.gov/projects/mpich2/changeset/6848 +--- + Makefile.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index cbe4a93..d12babb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -143,10 +143,10 @@ lib/libf${MPILIBNAME}.@SHLIB_EXT@: lib/libf${MPILIBNAME}.la + (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS)) + # Build the shared library from the shared object files + lib/lib${MPILIBNAME}f90.@SHLIB_EXT@: lib/lib${MPILIBNAME}f90.la +- (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la -rpath $(libdir) -ldflags "$(LDFLAGS)" $(LIBS)) ++ (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS)) + # Build the shared library from the shared object files + lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la +- (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la -rpath $(libdir) -ldflags "$(LDFLAGS)" $(LIBS)) ++ (cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS)) + + # -------------------------------------------------------------------------- + .libstamp0: +-- +1.7.1 + diff --git a/sys-cluster/mpich2/mpich2-1.1.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.1.1_p1.ebuild deleted file mode 100644 index ac418fc2c..000000000 --- a/sys-cluster/mpich2/mpich2-1.1.1_p1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=1 -inherit eutils fortran mpi - -MY_PV=${PV/_/} -DESCRIPTION="MPICH2 - A portable MPI implementation" -HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" -SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads" - -MPI_UNCLASSED_BLOCKERS="media-sound/mpd" - -COMMON_DEPEND="dev-lang/perl - >=dev-lang/python-2.3 - romio? ( net-fs/nfs-utils ) - pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) - dev-libs/libaio - $(mpi_imp_deplist)" - -DEPEND="${COMMON_DEPEND} - sys-devel/libtool" - -RDEPEND="${COMMON_DEPEND} - net-misc/openssh" - -S="${WORKDIR}"/${PN}-${MY_PV} - -pkg_setup() { - MPI_ESELECT_FILE="eselect.mpi.mpich2" - - if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then - elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}." - else - elog "User-specified configure options are not set." - elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS." - fi - - if use fortran ; then - FORTRAN="g77 gfortran ifort ifc" - fortran_pkg_setup - fi - - if use mpi-threads && ! use threads; then - die "USE=mpi-threads requires USE=threads" - fi - - if mpi_classed; then - MPD_CONF_FILE_DIR=/etc/$(mpi_class) - else - MPD_CONF_FILE_DIR=/etc/${PN} - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # A lot of these patches touch Makefile.in and configure files. - # While it would be nice to regenerate everything, mpich2 uses - # simplemake instead of automake, so we're doing this for now - # and hoping for a receptive upstream. - - # #220877 - sed -i 's/-fpic/-fPIC/g' \ - $(grep -lr -e '-fpic' "${S}"/) || die "failed to change -fpic to -fPIC" - - # TODO: None of this has been sent upstream yet. - epatch "${FILESDIR}"/0001-MPD_CONF_FILE-should-be-readable.patch - epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch - epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3.patch - - # We need f90 to include the directory with mods, and to - # fix hardcoded paths for src_test() - sed -i \ - -e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \ - -e "s,\$(bindir)/,${S}/bin/,g" \ - -e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \ - $(find ./test/ -name 'Makefile.in') || die - - if ! use romio; then - # These tests in errhan/ rely on MPI::File ...which is in romio - echo "" > test/mpi/errors/cxx/errhan/testlist - fi -} - -src_compile() { - local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc" - local romio_conf - - # The configure statements can be somewhat confusing, as they - # don't all show up in the top level configure, however, they - # are picked up in the children directories. - - use debug && c="${c} --enable-g=all --enable-debuginfo" - - if use threads ; then - c="${c} --with-thread-package=pthreads" - else - c="${c} --with-thread-package=none" - fi - - # enable f90 support for appropriate compilers - case "${FORTRANC}" in - gfortran|if*) - c="${c} --enable-f77 --enable-f90";; - g77) - c="${c} --enable-f77 --disable-f90";; - esac - - if use mpi-threads; then - c="${c} --enable-threads=default" - else - c="${c} --enable-threads=single" - fi - - if use pvfs2; then - # nfs and ufs are defaults in 1.0.8 at least. - romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr" - fi - - ! mpi_classed && c="${c} --sysconfdir=/etc/${PN}" - econf $(mpi_econf_args) ${c} ${romio_conf} \ - --docdir=$(mpi_root)/usr/share/doc/${PF} \ - --with-pm=mpd:gforker \ - --disable-mpe \ - $(use_enable romio) \ - $(use_enable cxx) \ - || die - # Oh, the irony. - # http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make. - # https://trac.mcs.anl.gov/projects/mpich2/ticket/297 - emake -j1 || die -} - -src_test() { - local rc - - cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die - chmod 600 "${T}"/mpd.conf - export MPD_CONF_FILE="${T}/mpd.conf" - "${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid - - make \ - CC="${S}"/bin/mpicc \ - CXX="${S}"/bin/mpicxx \ - FC="${S}"/bin/mpif77 \ - F90="${S}"/bin/mpif90 \ - F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \ - testing - rc=$? - - "${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - return ${rc} -} - -src_install() { - local d=$(mpi_root) - - emake DESTDIR="${D}" install || die - - dodir ${MPD_CONF_FILE_DIR} - insinto ${MPD_CONF_FILE_DIR} - doins "${FILESDIR}"/mpd.conf || die - - mpi_dodir /usr/share/doc/${PF} - mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die - mpi_newdoc src/pm/mpd/README README.mpd || die - if use romio; then - mpi_newdoc src/mpi/romio/README README.romio || die - fi - - if ! use doc; then - rm -rf "${D}"/${d}/usr/share/doc/www* - else - mpi_dodir /usr/share/doc/${PF}/www - mv "${D}"/${d}/usr/share/doc/www*/* "${D}"/${d}/usr/share/doc/${PF}/www/ - fi - - mpi_imp_add_eselect -} - -pkg_postinst() { - # Here so we can play with ebuild commands as a normal user - chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - - elog "" - elog "MPE2 has been removed from this ebuild and now stands alone" - elog "as sys-cluster/mpe2." - elog "" -} diff --git a/sys-cluster/mpich2/mpich2-1.2.1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1.ebuild deleted file mode 100644 index 424f9e148..000000000 --- a/sys-cluster/mpich2/mpich2-1.2.1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=1 -inherit eutils fortran mpi - -MY_PV=${PV/_/} -DESCRIPTION="MPICH2 - A portable MPI implementation" -HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" -SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads" - -MPI_UNCLASSED_BLOCKERS="media-sound/mpd" - -COMMON_DEPEND="dev-lang/perl - >=dev-lang/python-2.3 - romio? ( net-fs/nfs-utils ) - pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) - dev-libs/libaio - $(mpi_imp_deplist)" - -DEPEND="${COMMON_DEPEND} - sys-devel/libtool" - -RDEPEND="${COMMON_DEPEND} - net-misc/openssh" - -S="${WORKDIR}"/${PN}-${MY_PV} - -pkg_setup() { - MPI_ESELECT_FILE="eselect.mpi.mpich2" - - if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then - elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}." - else - elog "User-specified configure options are not set." - elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS." - fi - - if use fortran ; then - FORTRAN="g77 gfortran ifort ifc" - fortran_pkg_setup - fi - - if use mpi-threads && ! use threads; then - die "USE=mpi-threads requires USE=threads" - fi - - if mpi_classed; then - MPD_CONF_FILE_DIR=/etc/$(mpi_class) - else - MPD_CONF_FILE_DIR=/etc/${PN} - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # A lot of these patches touch Makefile.in and configure files. - # While it would be nice to regenerate everything, mpich2 uses - # simplemake instead of automake, so we're doing this for now - # and hoping for a receptive upstream. - - # Upstream trunk, r5843 - epatch "${FILESDIR}"/0001-MPD_CONF_FILE-should-be-readable.patch - # Upstream trunk, r5844 - epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch - # Upstream trunk, r5845 - epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch - - # We need f90 to include the directory with mods, and to - # fix hardcoded paths for src_test() - # Submitted upstream. - sed -i \ - -e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \ - -e "s,\$(bindir)/,${S}/bin/,g" \ - -e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \ - $(find ./test/ -name 'Makefile.in') || die - - if ! use romio; then - # These tests in errhan/ rely on MPI::File ...which is in romio - echo "" > test/mpi/errors/cxx/errhan/testlist - fi -} - -src_compile() { - local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc" - local romio_conf - - # The configure statements can be somewhat confusing, as they - # don't all show up in the top level configure, however, they - # are picked up in the children directories. - - use debug && c="${c} --enable-g=all --enable-debuginfo" - - if use threads ; then - c="${c} --with-thread-package=pthreads" - else - c="${c} --with-thread-package=none" - fi - - # enable f90 support for appropriate compilers - case "${FORTRANC}" in - gfortran|if*) - c="${c} --enable-f77 --enable-f90";; - g77) - c="${c} --enable-f77 --disable-f90";; - esac - - if use mpi-threads; then - c="${c} --enable-threads=default" - else - c="${c} --enable-threads=single" - fi - - if use pvfs2; then - # nfs and ufs are defaults in 1.0.8 at least. - romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr" - fi - - ! mpi_classed && c="${c} --sysconfdir=/etc/${PN}" - econf $(mpi_econf_args) ${c} ${romio_conf} \ - --docdir=$(mpi_root)/usr/share/doc/${PF} \ - --with-pm=mpd:gforker \ - --disable-mpe \ - $(use_enable romio) \ - $(use_enable cxx) \ - || die - # Oh, the irony. - # http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make. - # https://trac.mcs.anl.gov/projects/mpich2/ticket/297 - emake -j1 || die -} - -src_test() { - local rc - - cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die - chmod 600 "${T}"/mpd.conf - export MPD_CONF_FILE="${T}/mpd.conf" - "${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid - - make \ - CC="${S}"/bin/mpicc \ - CXX="${S}"/bin/mpicxx \ - FC="${S}"/bin/mpif77 \ - F90="${S}"/bin/mpif90 \ - F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \ - testing - rc=$? - - "${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - return ${rc} -} - -src_install() { - local d=$(mpi_root) - - emake DESTDIR="${D}" install || die - - dodir ${MPD_CONF_FILE_DIR} - insinto ${MPD_CONF_FILE_DIR} - doins "${FILESDIR}"/mpd.conf || die - - mpi_dodir /usr/share/doc/${PF} - mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die - mpi_newdoc src/pm/mpd/README README.mpd || die - if use romio; then - mpi_newdoc src/mpi/romio/README README.romio || die - fi - - if ! use doc; then - rm -rf "${D}"/${d}/usr/share/doc/www* - else - mpi_dodir /usr/share/doc/${PF}/www - mv "${D}"/${d}/usr/share/doc/www*/* "${D}"/${d}/usr/share/doc/${PF}/www/ - fi - - mpi_imp_add_eselect -} - -pkg_postinst() { - # Here so we can play with ebuild commands as a normal user - chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - - elog "" - elog "MPE2 has been removed from this ebuild and now stands alone" - elog "as sys-cluster/mpe2." - elog "" -} diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild index 520f09992..7afcee630 100644 --- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild +++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild @@ -62,6 +62,8 @@ src_prepare() { epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch # Upstream trunk, r5845 epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch + # Upstream trunk, r6848 + epatch "${FILESDIR}"/mpich2-1.2.1-fix-missing-libs.patch # We need f90 to include the directory with mods, and to # fix hardcoded paths for src_test() @@ -187,34 +189,23 @@ src_install() { # See #316937 MPD_PYTHON_MODULES="" for f in "${d}"usr/bin/*.py; do - MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${d}usr/bin}" + MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${d}}" done } pkg_postinst() { - local f - local d=$(mpi_root) - # Here so we can play with ebuild commands as a normal user chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - for f in ${MPD_PYTHON_MODULES}; do - python_mod_optimize ${d}/usr/bin/${f} - done - elog "" elog "MPE2 has been removed from this ebuild and now stands alone" elog "as sys-cluster/mpe2." elog "" - + + python_mod_optimize ${MPD_PYTHON_MODULES} } pkg_postrm() { - local f - local d=$(mpi_root) - - for f in ${MPD_PYTHON_MODULES}; do - python_mod_cleanup ${d}/usr/bin/${f} - done + python_mod_cleanup ${MPD_PYTHON_MODULES} } diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild deleted file mode 100644 index 68f2fd6c4..000000000 --- a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 -inherit eutils fortran mpi - -MY_PV=${PV/_/} -DESCRIPTION="MPICH2 - A portable MPI implementation" -HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" -SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads" - -MPI_UNCLASSED_BLOCKERS="media-sound/mpd" - -COMMON_DEPEND="dev-lang/perl - >=dev-lang/python-2.3 - romio? ( net-fs/nfs-utils ) - pvfs2? ( >=sys-cluster/pvfs2-2.7.0 ) - dev-libs/libaio - $(mpi_imp_deplist)" - -DEPEND="${COMMON_DEPEND} - sys-devel/libtool" - -RDEPEND="${COMMON_DEPEND} - net-misc/openssh" - -S="${WORKDIR}"/${PN}-${MY_PV} - -pkg_setup() { - MPI_ESELECT_FILE="eselect.mpi.mpich2" - - if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then - elog "User-specified configure options are ${MPICH_CONFIGURE_OPTS}." - else - elog "User-specified configure options are not set." - elog "If needed, see the docs and set MPICH_CONFIGURE_OPTS." - fi - - if use fortran ; then - FORTRAN="g77 gfortran ifort ifc" - fortran_pkg_setup - fi - - if use mpi-threads && ! use threads; then - die "USE=mpi-threads requires USE=threads" - fi - - if mpi_classed; then - MPD_CONF_FILE_DIR=/etc/$(mpi_class) - else - MPD_CONF_FILE_DIR=/etc/${PN} - fi -} - -src_prepare() { - # A lot of these patches touch Makefile.in and configure files. - # While it would be nice to regenerate everything, mpich2 uses - # simplemake instead of automake, so we're doing this for now - # and hoping for a receptive upstream. - - # Upstream trunk, r5843 - epatch "${FILESDIR}"/0001-MPD_CONF_FILE-should-be-readable.patch - # Upstream trunk, r5844 - epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch - # Upstream trunk, r5845 - epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch - - # We need f90 to include the directory with mods, and to - # fix hardcoded paths for src_test() - # Submitted upstream. - sed -i \ - -e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \ - -e "s,\$(bindir)/,${S}/bin/,g" \ - -e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \ - $(find ./test/ -name 'Makefile.in') || die - - if ! use romio; then - # These tests in errhan/ rely on MPI::File ...which is in romio - echo "" > test/mpi/errors/cxx/errhan/testlist - fi - - # 293665: Should check in on MPICH2_MPIX_FLAGS in later releases - # (>1.3) as this is seeing some development in trunk as of r6350. - sed -i \ - -e 's|\(WRAPPER_[A-Z90]*FLAGS\)="@.*@"|\1=""|' \ - src/env/mpi*.in || die -} - -src_configure() { - local c="${MPICH_CONFIGURE_OPTS} --enable-sharedlibs=gcc" - local romio_conf - - # The configure statements can be somewhat confusing, as they - # don't all show up in the top level configure, however, they - # are picked up in the children directories. - - use debug && c="${c} --enable-g=all --enable-debuginfo" - - if use threads ; then - c="${c} --with-thread-package=pthreads" - else - c="${c} --with-thread-package=none" - fi - - # enable f90 support for appropriate compilers - case "${FORTRANC}" in - gfortran|if*) - c="${c} --enable-f77 --enable-f90";; - g77) - c="${c} --enable-f77 --disable-f90";; - esac - - if use mpi-threads; then - c="${c} --enable-threads=default" - else - c="${c} --enable-threads=single" - fi - - if use pvfs2; then - # nfs and ufs are defaults in 1.0.8 at least. - romio_conf="--with-file-system=pvfs2+nfs+ufs --with-pvfs2=/usr" - fi - - ! mpi_classed && c="${c} --sysconfdir=/etc/${PN}" - econf $(mpi_econf_args) ${c} ${romio_conf} \ - --docdir=$(mpi_root)/usr/share/doc/${PF} \ - --with-pm=mpd:hydra:gforker \ - --disable-mpe \ - $(use_enable romio) \ - $(use_enable cxx) \ - || die -} - -src_compile() { - # Oh, the irony. - # http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make. - # https://trac.mcs.anl.gov/projects/mpich2/ticket/297 - emake -j1 || die -} - -src_test() { - local rc - - cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die - chmod 600 "${T}"/mpd.conf - export MPD_CONF_FILE="${T}/mpd.conf" - "${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid - - make \ - CC="${S}"/bin/mpicc \ - CXX="${S}"/bin/mpicxx \ - FC="${S}"/bin/mpif77 \ - F90="${S}"/bin/mpif90 \ - F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \ - testing - rc=$? - - "${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - return ${rc} -} - -src_install() { - local d=$(mpi_root) - - emake DESTDIR="${D}" install || die - - dodir ${MPD_CONF_FILE_DIR} - insinto ${MPD_CONF_FILE_DIR} - doins "${FILESDIR}"/mpd.conf || die - - mpi_dodir /usr/share/doc/${PF} - mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die - mpi_newdoc src/pm/mpd/README README.mpd || die - if use romio; then - mpi_newdoc src/mpi/romio/README README.romio || die - fi - - if ! use doc; then - rm -rf "${D}"/${d}/usr/share/doc/www* - else - mpi_dodir /usr/share/doc/${PF}/www - mv "${D}"/${d}/usr/share/doc/www*/* "${D}"/${d}/usr/share/doc/${PF}/www/ - fi - - mpi_imp_add_eselect -} - -pkg_postinst() { - # Here so we can play with ebuild commands as a normal user - chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf - - elog "" - elog "MPE2 has been removed from this ebuild and now stands alone" - elog "as sys-cluster/mpe2." - elog "" -} |