renamed boost useflag and removed old

Package-Manager: portage-2.1.10.3/cvs/Linux i686

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 8a6cf7579f6afd08303dc32e6fe9b97d77b65f5c..f88ca3a2739cfce0a98e37eed91d8243dc538503 100644 (file)
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/ChangeLog,v 1.6 2011/07/17 12:46:17 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/ChangeLog,v 1.7 2011/08/14 15:17:01 ottxor Exp $
+
+  14 Aug 2011; Christoph Junghans <ottxor@gentoo.org> -votca-csg-1.1.1.ebuild,
+  -votca-csg-1.1.2.ebuild, votca-csg-1.2.ebuild, metadata.xml:
+  renamed boost useflag to system-boost and removed old
 
   17 Jul 2011; Christoph Junghans <ottxor@gentoo.org> votca-csg-1.2.ebuild:
   Added IUSE=examples

diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 4e0c6586b46f031ed1938b0f253ec4e8ba65ffa5..cc07188147f4ad3f5aa0d8e446c347bae6e4193f 100644 (file)
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -1,25 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST votca-csg-1.1.1.tar.gz 537252 RMD160 a5c721e22eeac38114e78e80d4b1d83f8c24eda9 SHA1 dd341c8c7af2a680d00474da58f65cdcf98e3f18 SHA256 636ff1ea0011491d06e76958d37936e5507e1a7be3622e99915d06597a2324dc
-DIST votca-csg-1.1.2.tar.gz 538083 RMD160 78009517cd94f87a4107447b7b612d8226171e28 SHA1 ad1247cd3c0686b7dbe1dbd04a736b5ea02065b4 SHA256 85bb047e1978bb9f2277cb27834880de04b2de3603dc63e12bf06c66f0116e2c
 DIST votca-csg-1.2.tar.gz 185095 RMD160 f1bd4a02571d4fc1c311c1b0c17349fdf5202391 SHA1 2704fff575b9f46c55715026f68665e75823aa94 SHA256 be97284dc604ff208d4fc87467a42be1770d82e97bafd654bfeeabea1d75febe
-DIST votca-manual-1.1.pdf 940226 RMD160 d599a9dc04005e2e87659e896e405df3fc5ba5d6 SHA1 ef48681b8d0144a8578fce546911a8880ef5990e SHA256 b361da5383e3ac6efb207823f306eb0d3ea88e37ba728a0deb278a196f187802
 DIST votca-manual-1.2.pdf 1002421 RMD160 38699a2e1f98fb65d8ae64b1028a7b8f14a1ad9f SHA1 c300202cb7b014a9fae1149dcb1a0b6a2cd01077 SHA256 0e964aab4f11553b77389d4430fb6e8709de2fe8512dbd36e840aac1bf6a78df
 DIST votca-tutorials-1.2.tar.gz 3146575 RMD160 810d3d4d8a83bf569938aa7fbb38a00e5c29c37a SHA1 5f28be35d77767184b281264fc5d445da009cb06 SHA256 23e44e8fd4977a1b8e9fdd2b2cff862e49e5d6776190ddb0a166071ad59a675a
-EBUILD votca-csg-1.1.1.ebuild 2185 RMD160 c21da16536ed1d8c9743478e68261c065d2b2fcb SHA1 ec9f0417a74485b083dc97c82a928908782bb75a SHA256 d700285e03639fed30997a483258a139d75f4fc48468dabb65d18c31149fc9fb
-EBUILD votca-csg-1.1.2.ebuild 2185 RMD160 40c86f9560d9d036d8b1f463eafa1c2ce18021b7 SHA1 9219c16a0a6672eecf94c46b652329802741b6a7 SHA256 e095e8b8738729056c3b59905dab87a1e196257402bfaa5ef2db1720d9d990f9
-EBUILD votca-csg-1.2.ebuild 2269 RMD160 58c0544af9c5cdb6a3024f11a54d6f1f506f984a SHA1 17fbec72b2eb61b5991ff27c673092a94c086db9 SHA256 cb476071be98670a5829f63122c9ab6d49bc9647a3470a48da17f487c2eac433
-MISC ChangeLog 1006 RMD160 def9456c02465f4d857d1f16ab0f0e2f66c3666c SHA1 0d4a6df8249df282be88463c483755742fcbd705 SHA256 142753b5701f792f3534663318b90c53e92074f5f4871db66b5406806eab73ee
-MISC metadata.xml 461 RMD160 574da0b6398a0e67e1703135ff2c9b5074dfed2c SHA1 173c66d49b1f7aea278fbab9fed6e5e79163cf0f SHA256 feaec1fbacdf80066b9bb1aa26930ec374cacd6d2a54bc852beb77dc6278c3e5
+EBUILD votca-csg-1.2.ebuild 2415 RMD160 2a3ee0517299dced620b8f443639d6c3fc43aba3 SHA1 cc87494205158550b2445ee6459f6fbe3d29453a SHA256 d12f11f89a2d63dbacade06c3b80d1164bb7598318b0bf7ff72c3aa1326467b0
+MISC ChangeLog 1205 RMD160 68ff7737b7720e2650155d31c191c37d38d62618 SHA1 03b86c7b02322162a7e9467056840e1e1d9ecc2d SHA256 5168b09c16ebc5555fa19730b067cf2d186189a6ff00b503f66a9d1795b66ce9
+MISC metadata.xml 491 RMD160 ff7ccb1a8f902b80a573c11a07cc7a959680189e SHA1 1baa021d1f685c3d2f66523455dc308deb5a0acf SHA256 d562268394f429d11a7f60a464df099d8a559460d9a3cc2ad847442ee43918c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOItmfAAoJEOeBhlrCAAWGdawIAKTmQ/eQm0fJmvr0Ck7avanf
-eSiTU2TKF03jly7Rd/MO7g3d+IvablQuKMK2WyWFZOilJlvPPNOrvJz+gbuSbeB5
-axAXo1jtguiFsXC/cK1KMV6aJZSBfBWYvyiIfYB+qJJVi0Lk43yzobzqmU4Hmikq
-IRYYNt5oIRopZlbwBR0Ds9ODqDHCfxolp6QCB5QRiR1/PPt9WwkvqpsW9tT/PWwV
-SGEdlDfb0J0qqx8/ovpbkPtV8HrHcPfVCJPjEKfaWeGN9t5CPiQt2BP54W1EJqKn
-oj6d37VsLvoIiAXXyjyMT+s89W4v7ArVtClwETm9YCApP6B2u48kW1nFZcL5xnw=
-=z7wJ
+iQEcBAEBAgAGBQJOR+bzAAoJEOeBhlrCAAWGz0QH/RGpY6eY11XoBRlPF0/RzbhK
+eUiaZ1OnyAbWtcAdPCpAfSsbxj/Yy/0UesE3JHrzwTQf7dCiL3ZAGRZLa0wm4me+
+wZgQKVTUDAhEOKnZHRUCO52e6EltOgZqv4Ah1MWX9S1UTTJbA92Nro3ByGItKGI8
+RUQvh8RuGb8CJBMejobRrXTie/9BvZ87dW5Jc2kt/RqhDnWK/m4B+zPpxOu34AMw
+S2+aveizvgze3FnVfeEBMe0D9TkrC5iPWb0t3Els1F4WOlHwIpfiDTuUzWSRW7V+
+2wy8PsHWVFmYUWJUHGCwgxowFzRuK8zT+Iq4NOpenRNmbkN884rb1JhuFURpPG8=
+=lvHI
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 7daef59af41ea6174e1337bf87b749a2dafc26d4..2b261601af3e0923ce030479a3fa5cf7ad2d1048 100644 (file)
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -7,7 +7,7 @@
                <name>Christoph Junghans</name>
        </maintainer>
        <use>
-               <flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
-               <flag name='gromacs'>Add support for file formats from <pkg>sci-chemistry/gromacs</pkg></flag>
+               <flag name='gromacs'>Add support for gromacs file formats through <pkg>sci-chemistry/gromacs</pkg></flag>
+               <flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
        </use>
 </pkgmetadata>

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
deleted file mode 100644 (file)
index 6691823..0000000
--- a/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.1.1.ebuild,v 1.2 2011/03/09 22:12:21 ottxor Exp $
-
-EAPI="3"
-
-inherit autotools-utils bash-completion
-
-MANUAL_PV=1.1
-if [ "${PV}" != "9999" ]; then
-       SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
-               doc? ( http://votca.googlecode.com/files/votca-manual-${MANUAL_PV}.pdf )"
-       RESTRICT="primaryuri"
-else
-       SRC_URI=""
-       inherit mercurial
-       EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
-       S="${WORKDIR}/${EHG_REPO_URI##*/}"
-       PDEPEND="doc? ( =app-doc/votca-manual-${PV} )"
-fi
-
-DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +gromacs static-libs"
-
-RDEPEND="=sci-libs/votca-tools-${PV}
-       gromacs? ( >=sci-chemistry/gromacs-4.0.7-r5 )
-       dev-lang/perl
-       app-shells/bash"
-
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen[-nodot] )
-       >=app-text/txt2tags-2.5
-       dev-util/pkgconfig"
-
-src_prepare() {
-       #from bootstrap.sh
-       if [ -z "${PV##*9999}" ]; then
-               emake -C share/scripts/inverse -f Makefile.am.in Makefile.am || die
-       fi
-
-       eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-       local libgmx
-
-       #in >gromacs-4.5 libgmx was renamed to libgromacs
-       has_version =sci-chemistry/gromacs-9999 && libgmx="libgromacs" || libgmx="libgmx"
-       #prefer gromacs double-precision if it is there
-       has_version sci-chemistry/gromacs[double-precision] && libgmx="${libgmx}_d"
-
-       myeconfargs=( ${myconf} --disable-rc-files  $(use_with gromacs libgmx $libgmx) )
-       autotools-utils_src_configure || die
-}
-
-src_install() {
-       DOCS=(README NOTICE ${AUTOTOOLS_BUILD_DIR}/CHANGELOG)
-       dobashcompletion scripts/csg-completion.bash ${PN} || die
-       autotools-utils_src_install || die
-       if use doc; then
-               if [ -n "${PV##*9999}" ]; then
-                       dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
-               fi
-               cd share/doc || die
-               doxygen || die
-               dohtml -r html/* || die
-       fi
-}
-
-pkg_postinst() {
-       elog
-       elog "Please read and cite:"
-       elog "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
-       elog "http://dx.doi.org/10.1021/ct900369w"
-       elog
-       bash-completion_pkg_postinst
-}

diff --git a/sci-chemistry/votca-csg/votca-csg-1.1.2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.1.2.ebuild
deleted file mode 100644 (file)
index c6e7ffc..0000000
--- a/sci-chemistry/votca-csg/votca-csg-1.1.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.1.2.ebuild,v 1.1 2011/04/04 20:05:31 ottxor Exp $
-
-EAPI="3"
-
-inherit autotools-utils bash-completion
-
-MANUAL_PV=1.1
-if [ "${PV}" != "9999" ]; then
-       SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
-               doc? ( http://votca.googlecode.com/files/votca-manual-${MANUAL_PV}.pdf )"
-       RESTRICT="primaryuri"
-else
-       SRC_URI=""
-       inherit mercurial
-       EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
-       S="${WORKDIR}/${EHG_REPO_URI##*/}"
-       PDEPEND="doc? ( =app-doc/votca-manual-${PV} )"
-fi
-
-DESCRIPTION="Votca coarse-graining engine"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +gromacs static-libs"
-
-RDEPEND="=sci-libs/votca-tools-${PV}
-       gromacs? ( >=sci-chemistry/gromacs-4.0.7-r5 )
-       dev-lang/perl
-       app-shells/bash"
-
-DEPEND="${RDEPEND}
-       doc? ( app-doc/doxygen[-nodot] )
-       >=app-text/txt2tags-2.5
-       dev-util/pkgconfig"
-
-src_prepare() {
-       #from bootstrap.sh
-       if [ -z "${PV##*9999}" ]; then
-               emake -C share/scripts/inverse -f Makefile.am.in Makefile.am || die
-       fi
-
-       eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-       local libgmx
-
-       #in >gromacs-4.5 libgmx was renamed to libgromacs
-       has_version =sci-chemistry/gromacs-9999 && libgmx="libgromacs" || libgmx="libgmx"
-       #prefer gromacs double-precision if it is there
-       has_version sci-chemistry/gromacs[double-precision] && libgmx="${libgmx}_d"
-
-       myeconfargs=( ${myconf} --disable-rc-files  $(use_with gromacs libgmx $libgmx) )
-       autotools-utils_src_configure || die
-}
-
-src_install() {
-       DOCS=(README NOTICE ${AUTOTOOLS_BUILD_DIR}/CHANGELOG)
-       dobashcompletion scripts/csg-completion.bash ${PN} || die
-       autotools-utils_src_install || die
-       if use doc; then
-               if [ -n "${PV##*9999}" ]; then
-                       dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die
-               fi
-               cd share/doc || die
-               doxygen || die
-               dohtml -r html/* || die
-       fi
-}
-
-pkg_postinst() {
-       elog
-       elog "Please read and cite:"
-       elog "VOTCA, J. Chem. Theory Comput. 5, 3211 (2009). "
-       elog "http://dx.doi.org/10.1021/ct900369w"
-       elog
-       bash-completion_pkg_postinst
-}

diff --git a/sci-chemistry/votca-csg/votca-csg-1.2.ebuild b/sci-chemistry/votca-csg/votca-csg-1.2.ebuild
index e998195aae1d24893cbdc18abf161ea4cba7c53c..4b05ee2b3f01c38993cde2915295cd96dc67f34c 100644 (file)
--- a/sci-chemistry/votca-csg/votca-csg-1.2.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.ebuild,v 1.2 2011/07/17 12:46:17 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.ebuild,v 1.3 2011/08/14 15:17:01 ottxor Exp $
 
 EAPI=4
 
@@ -8,6 +8,7 @@ inherit bash-completion cmake-utils
 
 MANUAL_PV=1.2
 TUTORIAL_PV=1.2
+IUSE="doc examples +gromacs +system-boost"
 if [ "${PV}" != "9999" ]; then
        SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
                doc? ( http://votca.googlecode.com/files/votca-manual-${MANUAL_PV}.pdf )
@@ -15,12 +16,15 @@ if [ "${PV}" != "9999" ]; then
        RESTRICT="primaryuri"
 else
        SRC_URI=""
+       #make this a common use when csg-apps get released
+       IUSE="${IUSE} extras"
        inherit mercurial
        EHG_REPO_URI="https://csg.votca.googlecode.com/hg"
        EHG_REVISION="default"
        S="${WORKDIR}/${EHG_REPO_URI##*/}"
        PDEPEND="doc? ( =app-doc/votca-csg-manual-${PV} )
-               examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )"
+               examples? ( =sci-chemistry/votca-csg-tutorials-${PV} )
+               extras? ( =sci-chemistry/votca-csg-apps-${PV} )"
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -29,9 +33,8 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc examples +gromacs"
 
-RDEPEND="=sci-libs/votca-tools-${PV}[boost=]
+RDEPEND="=sci-libs/votca-tools-${PV}[system-boost=]
        gromacs? ( sci-chemistry/gromacs )
        dev-lang/perl
        app-shells/bash"
@@ -48,7 +51,7 @@ src_configure() {
                extra="-DWITH_GMX_DEVEL=ON"
 
        mycmakeargs=(
-               $(cmake-utils_use boost EXTERNAL_BOOST)
+               $(cmake-utils_use system-boost EXTERNAL_BOOST)
                $(cmake-utils_use_with gromacs GMX)
                ${extra}
                -DWITH_RC_FILES=OFF