diff options
author | Jeffrey Gardner <je_fro@gentoo.org> | 2009-05-28 00:28:35 +0000 |
---|---|---|
committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-05-28 00:28:35 +0000 |
commit | e0430f1f4d144f7653e8607cad3129a1cec5e1d5 (patch) | |
tree | fc54e9ecb7755ec9f93e93d908d790d400dbeee9 /sys-cluster/charm | |
parent | Add UW license used by sci-biology/seaview. (diff) | |
download | historical-e0430f1f4d144f7653e8607cad3129a1cec5e1d5.tar.gz historical-e0430f1f4d144f7653e8607cad3129a1cec5e1d5.tar.bz2 historical-e0430f1f4d144f7653e8607cad3129a1cec5e1d5.zip |
Fixing a boo-boo where I ran cvs commit from portage rootdir :(
Diffstat (limited to 'sys-cluster/charm')
-rw-r--r-- | sys-cluster/charm/ChangeLog | 7 | ||||
-rw-r--r-- | sys-cluster/charm/Manifest | 6 | ||||
-rw-r--r-- | sys-cluster/charm/charm-5.9.ebuild | 4 | ||||
-rw-r--r-- | sys-cluster/charm/charm-6.1.2.ebuild | 158 |
4 files changed, 4 insertions, 171 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index 02a2772ecb07..1008677ab798 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,11 +1,6 @@ # ChangeLog for sys-cluster/charm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.17 2009/05/28 00:07:38 je_fro Exp $ - -*charm-6.1.2 (04 May 2009) - - 04 May 2009; Jeff Gardner <je_fro@gentoo.org> +charm-6.1.2.ebuild: - Latest version +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.18 2009/05/28 00:28:35 je_fro Exp $ 30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> charm-5.9.ebuild: Update dependencies w.r.t. bug 264230, fully-split-out poppler transition. diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest index cdda2b4e119e..9be0b9d62932 100644 --- a/sys-cluster/charm/Manifest +++ b/sys-cluster/charm/Manifest @@ -6,8 +6,6 @@ AUX charm-examples-gentoo.patch 3920 RMD160 d038f9e2f32db47a6f335c92dd73e727a54d AUX charm-fpic-gentoo.patch 963 RMD160 d725ce4085638996244db909d4b30ce0e5623bce SHA1 02e80605505bf1aa3ec371643b165f3890ba0cc1 SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837379f50148e2 SHA1 3a7e9e81b9f4019aad643e5fe68093f185b8229f SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SHA1 8b34d083486e6350ddf31a71e7476d6027ef9c0f SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89 -DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a4634811dc9 SHA1 0e6cee877f22794cb647ab22ef5651048abcbbd0 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366 -EBUILD charm-5.9.ebuild 3845 RMD160 687f92f1d0b635e53238d12a16a4b8d98bd6a68d SHA1 e2c01674c95578bac023f4aefed6f318e87ab49d SHA256 e26a5198cf66d465a5e25afe3e442fa2498737a20ece40782b72e5579c803f7b -EBUILD charm-6.1.2.ebuild 3753 RMD160 91a9053a6c75313d2d177803c06d9b38c6bf0369 SHA1 16c10d1bac5f27c1bd63f149c13d0bdf1bb7c037 SHA256 771ec5c649b7ba4d7e5db89f161f6b58d527bc572e6c19f293b1daeeaf369104 -MISC ChangeLog 3182 RMD160 21ef1f99dfbfbffd4a8920c776212cbc68a1da12 SHA1 c68f773f6d9c1d38b0bf96a535bdb7917ef4eeb4 SHA256 28686d4c3e1cf4d24def61487013cc26610a19e5c1f5694011dd939cf096e065 +EBUILD charm-5.9.ebuild 3824 RMD160 32948b60f334d7b3d270ef22405b4970e6e2e02b SHA1 8ee6276ff44335d13bdd4168ef69669d33d2696b SHA256 bf8826ee18785b60a4c31b013b3a2a8d7810b57cf8ed381e3e8419e5be4a8c87 +MISC ChangeLog 3067 RMD160 699697064b7bafd5512dec8eae3dc584f3c400a4 SHA1 b0531d599a124f42ae3167b2f196b9c7c39c129f SHA256 39fc7c2da238483bf29d12d5891dfa0d6d105fc23fbd3e1845ded661dcfb91d2 MISC metadata.xml 398 RMD160 bf40832b2220f644b2d56f653a41f047d0184b85 SHA1 9782cf178225fb5944bc6612076ff81c2512c842 SHA256 bc7d0905ab52e35d45967685ef8106826e8bfaacc7a0f58ae652fdb2b863e33d diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild index d47cb4842908..df8ec359e5ce 100644 --- a/sys-cluster/charm/charm-5.9.ebuild +++ b/sys-cluster/charm/charm-5.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.14 2009/05/28 00:07:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.15 2009/05/28 00:28:35 je_fro Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -26,8 +26,6 @@ DEPEND=" app-text/ptex ) )" -RDEPEND="${DEPEND}" - CHARM_ARCH="net-linux" CHARM_DOWNLOAD="http://charm.cs.uiuc.edu/download/" diff --git a/sys-cluster/charm/charm-6.1.2.ebuild b/sys-cluster/charm/charm-6.1.2.ebuild deleted file mode 100644 index c9fca3300d08..000000000000 --- a/sys-cluster/charm/charm-6.1.2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $ - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="Charm++ is a message-passing parallel language and runtime system." -LICENSE="charm" -HOMEPAGE="http://charm.cs.uiuc.edu/" -SRC_URI="${P}_src.tar.gz" - -SLOT="0" -KEYWORDS="~x86" -IUSE="cmkopt tcp smp doc" - -RESTRICT="fetch" - -DEPEND=" - doc? ( - virtual/poppler-utils - dev-tex/latex2html - virtual/latex-base - || ( ( dev-texlive/texlive-genericrecommended - dev-texlive/texlive-latexextra ) - app-text/tetex - app-text/ptex ) - )" - -RDEPEND="${DEPEND}" - -CHARM_ARCH="net-linux" -CHARM_DOWNLOAD="http://charm.cs.uiuc.edu/download/" - -pkg_nofetch() { - echo - einfo "Please download ${P}_src.tar.gz from" - einfo "${CHARM_DOWNLOAD}" - einfo "and then move it to ${DISTDIR}" - echo -} - -src_unpack() { - unpack ${A} - -# epatch "${FILESDIR}"/${P}-gcc-4.2.patch - - # add -fPIC to generate PIC code for charm so's - epatch "${FILESDIR}"/${PN}-fpic-gentoo.patch - - # for pdf/html docs we need to patch the makefiles -# if use doc; then -# epatch "${FILESDIR}"/${PN}-doc-makefile-gentoo.patch -# fi - - # patch the example Makefiles so they run out of - # the box -# epatch "${FILESDIR}"/${PN}-examples-gentoo.patch - - # enable proper detection of python in configure -# epatch "${FILESDIR}"/${PN}-python-configure-gentoo.patch - - # gcc-4.1 fixes -# epatch "${FILESDIR}"/${P}-gcc4.patch - - # TCP instead of default UDP for socket comunication - # protocol - if use tcp; then - CHARM_OPTS="${CHARM_OPTS} tcp" - fi - - # enable direct SMP support using shared memory - if use smp; then - CHARM_OPTS="${CHARM_OPTS} smp" - fi - - # compile with icc if requested (icc or icpc) - if [ $(tc-getCC) = icc ] || [ $(tc-getCXX) = ic* ]; then - CHARM_OPTS="${CHARM_OPTS} icc" - fi - - # CMK optimization - if use cmkopt; then - append-flags -DCMK_OPTIMIZE=1 - fi -} - -src_compile() { - # build charmm++ first - ./build charm++ net-linux ${CHARM_OPTS} ${CFLAGS} || \ - die "Failed to build charm++" - - # make pdf/html docs - if use doc; then - cd "${S}"/doc - make doc || die "failed to create pdf/html docs" - fi -} - -src_install() { - # make charmc play well with gentoo before - # we move it into /usr/bin - einfo "Fixing paths in charmc wrapper" - epatch "${FILESDIR}"/${PN}-charmc-gentoo.patch - - sed -e "s/gentoo-include/${P}/" -i ./src/scripts/charmc || \ - die "failed patching charmc script" - - # install binaries - cd "${S}"/bin - dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \ - ./conv-cpm ./dep.pl || die "Failed to install binaries" - - # install headers - cd "${S}"/include - insinto /usr/include/${P} - doins * || die "failed to install header files" - - # install static libs - cd "${S}"/lib - dolib.a * || die "failed to install static libs" - - # install shared libs - cd "${S}"/lib_so - dolib.so * || die "failed to install shared libs" - - # basic docs - cd "${S}" - dodoc CHANGES README || die "Failed to install docs" - - # install examples after fixing path to charmc - find examples/ -name 'Makefile' | xargs sed \ - -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ - die "Failed to fix examples" - find examples/ -name 'Makefile' | xargs sed \ - -r "s:./charmrun:./charmrun ++local:" -i || \ - die "Failed to fix examples" - insinto /usr/share/doc/${PF}/examples - doins -r examples/charm++/* - - # pdf/html docs - if use doc; then - cd "${S}"/doc - # install pdfs - insinto /usr/share/doc/${PF}/pdf - doins doc/pdf/* || die "failed to install pdf docs" - # install html - docinto html - dohtml -r doc/html/* || die "failed to install html docs" - fi -} - -pkg_postinst() { - echo - einfo "Please test your charm installation by copying the" - einfo "content of /usr/share/doc/${PF}/examples to a" - einfo "temporary location and run 'make test'." - echo -} |