From 23c6ebcd654cd6006e329b79d7bdac724649dc8f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 6 Feb 2013 17:25:15 +0000 Subject: added missing base_src_prepare (bug #455844) Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586 --- sci-libs/votca-tools/ChangeLog | 8 ++- sci-libs/votca-tools/Manifest | 18 +++--- sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild | 72 ----------------------- sci-libs/votca-tools/votca-tools-1.2.3-r2.ebuild | 74 ++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 82 deletions(-) delete mode 100644 sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild create mode 100644 sci-libs/votca-tools/votca-tools-1.2.3-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog index c3f996278d4e..f5298089712d 100644 --- a/sci-libs/votca-tools/ChangeLog +++ b/sci-libs/votca-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/votca-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.20 2013/01/27 04:03:19 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.21 2013/02/06 17:25:10 ottxor Exp $ + +*votca-tools-1.2.3-r2 (06 Feb 2013) + + 06 Feb 2013; Christoph Junghans + +votca-tools-1.2.3-r2.ebuild, -votca-tools-1.2.3-r1.ebuild: + added missing base_src_prepare (bug #455844) *votca-tools-1.2.3-r1 (27 Jan 2013) diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest index f25a4390cc45..b0bab9d6735d 100644 --- a/sci-libs/votca-tools/Manifest +++ b/sci-libs/votca-tools/Manifest @@ -7,17 +7,17 @@ DIST votca-tools-1.2.2_pristine.tar.gz 85442 SHA256 23e53ea7d462ced18dde8a5795c4 DIST votca-tools-1.2.3.tar.gz 986326 SHA256 134beda26291904f0a4b86ef8c5b7e7264c6ea53b73c18cf6e93fafca80e0e25 SHA512 aa8161d46e96071184158364acf75746d8df09f3aabbc518488c492f4853ad09350c62fdd9aed9ad03ff9d72cd3fb5872a9f7bea577d3e24f225fbe69f075fa2 WHIRLPOOL d16745499075645f2136b2450f810ec4f7bffee672211f10172f31368e5b7dc380995ec932ce5aad500b347e1ab6ae73174aca6e4bb31969ad9e7a08903d4264 DIST votca-tools-1.2.3_pristine.tar.gz 84532 SHA256 4012147bd2522032e86e181982c21245d669bfe6c5b4a77bd1d082e29d9fb145 SHA512 092ce6fc692a38b9e76afc06baf6f9d7cc942b8de1c0bce710c20ddd0b54c2df29871214c912c9f0bee41ae06d3512df9da5b144a10234674c96e46d847eefb2 WHIRLPOOL 336645b551fa5190c40c6915ac5cd9a4ad01929808d822337d8ed80224334e1d4a796939249e3418d38d33df0dd5995482369b9607ed3332731989a7d30c9b74 EBUILD votca-tools-1.2.2.ebuild 1775 SHA256 7542fe372174d1e27da0a3a542a222e62494328c8947a14f05695f5ebb512942 SHA512 ec6b810f7ba79f8c7e8af99f604fab75fe897133304a6ff1274914810c60eb5169946ce187e0b5e7b111a754e9d3ead3cdca6f24d5933e0276a4d1c59a2f4019 WHIRLPOOL 48eb9409061dc472da2e97197eec8807082092032d5bb0fa697b1589f05de98681d92decd67ec2ba0f5b0d14d1ea136829001111c14bef8175a573373cadb066 -EBUILD votca-tools-1.2.3-r1.ebuild 1800 SHA256 9ae9115403be989f64a159b9d64633493e3a6955931331e64543f2b258c5670a SHA512 533452b24fac5b9b32ba2106711bd9e76770cca067ec5bedf620b65d84650a68bcb37acbb51d2c63d445d626ee88b7e3015796030c9fe14e4237aafd8a8fbf8a WHIRLPOOL a40ec1b0cbd314d7e382379249e7a48687e73e2dc77796e8f88b00c7901662e03eb3f6711904dc38ccdbc14d270a932e8a8a69c77fde891c49afd0e4964eb6b9 -MISC ChangeLog 2960 SHA256 2cdb3b887fa94fd3c2c1114f76755a11a03d955cfd9f289be0455506589de348 SHA512 6bb8ab9afcd438a3f2e8ed889b04cbad40f5f9f38328a7706a933d2c0ba465898408985143c0fe9515f717784e5880b18700d68442d66e3258d77f6b4ed47c11 WHIRLPOOL b4f66a6bebe933316989de177776ff9e08e6933bdd69b1f262bd9d60fee6172cf6b3352de2c84d9c37cf5f37fcdbb12b777c0de6e06af84982c0f18bcd883671 +EBUILD votca-tools-1.2.3-r2.ebuild 1819 SHA256 baae94aa2491ca5a08ef188cca4f2ed3635e452db1c81d0d18da7ecbff83bc70 SHA512 74912516521d8ff65cfda9c4516f3d7bd8726da3a541d095cfa6e2081de240bd7f7889317e32ace98d99ba306c89f4c407d27622359f310923a59333a873fa2b WHIRLPOOL 58dc55f78028eebea6dca7e45078aad706a244a6cdf1886031d0d967f21538f0849cd7ed70955736823b6efbf25ee66fd7b8193a699ac105e9d07ef3f646b37d +MISC ChangeLog 3161 SHA256 35f2541d632f590df80ac9fddfd7976a309028ad0551e312b6d42d08bd2e6862 SHA512 c7e88c10530b3f039befec99170436415dd9d507bae10af5939dcbd385f6d6801ecb5fe580cf2a6a1c273b27ce1769b288dc56d6e2db9969cbae351d3d9c0c12 WHIRLPOOL 11d7dd48da6ead59f6b62cd0769885aaacd4f8e8950270ab304bbe33bbfc79ec1fb9ecf1f795fd60298cdcf6d117cb3632d55b1b49253d2c9963469c59f8624a MISC metadata.xml 458 SHA256 37518bd45105eef114841f0c1a19383bd48ba96852c28fe33729097e8c607922 SHA512 c2014d78f6c741c7ad6e418f9df2d97f2870f0346fb8c91f6437e0d17cf31751af02622d5cdf7900a6012bc413a3bce3d1057a4a4c0383274ecdcd723fc8a843 WHIRLPOOL 05feaf37c6a76eee898e6efa000d6104c66e654b9a51f8f9f506f11df1cbc5da094e5dc7c4563312faef4ac5c8ac012c7a6b907666bb6121746211508bd84a17 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRBKcIAAoJEOeBhlrCAAWGMBwH/A7MzyySUHdXB4YgHqZIEUWD -TjEbgsSRUyrBXWIRvL/hS89yfoft5wOTf4lFL01LLuBxzmxeXz+GA8z6+uGQyrSA -CShkxoOVmtccigE6b2OAsg0xIRm8ajSzyR/+vWAMaGNn1jgMU6A8mAAwxYEO/C3o -vHBcpqNvGhHifcPUSxw47oBRCp98FX4FMWc5WckRWFm7pP4xl8jt8ST+BT6N5TRZ -bIw2db5v3yiV5XmVQWnQOukC651oX/FjFok61EVHomplb9zhI+bce+4iBwQBALtt -dkl+dhDsTCxMF5TChgMOwmSV0THpWkd6fNzUpMtkg8xd+oYtspSHipwOz/Pjl6k= -=BIkK +iQEcBAEBCAAGBQJREpH3AAoJEOeBhlrCAAWG6mcIAI3ZWHRCqvROiPhk0r3WufkQ +1W0yVMjLfpxQy1jZD4QJ8YzjmAn8x+tozn0XUuDC+bqqLLddLSwU16jCUA16GlTd +9C5catlxUK2IGmRF/DqfiVZkbPY3X/zlciTPRgZ88xOTO4gcgGajJXQOYWGL7GLb +6NZ5G9jaYMFg/0DyWmcJ9RQXM5hWJOIAsDVtZFVKXlEOBO8XiUC2YAwVHy3bWDQE +UTvhZAkDk1iGWW69PlWzOzWusTx5VnwoNflvaYBviQJLJQjpnA3w/1sT4YOkSOsA +iPysSQbCGsbDtCnQCUxU0oa/vMPsunyctdbmYEkQdPLDy2jYEYCJLf/pFGDAduk= +=uWpO -----END PGP SIGNATURE----- diff --git a/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild b/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild deleted file mode 100644 index 4677a238af8c..000000000000 --- a/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild,v 1.1 2013/01/27 04:03:19 ottxor Exp $ - -EAPI="3" - -inherit cmake-utils eutils multilib - -if [ "${PV}" != "9999" ]; then - SRC_URI="system-boost? ( http://votca.googlecode.com/files/${P}_pristine.tar.gz ) - !system-boost? ( http://votca.googlecode.com/files/${P}.tar.gz )" - RESTRICT="primaryuri" -else - SRC_URI="" - inherit mercurial - EHG_REPO_URI="https://tools.votca.googlecode.com/hg" -fi - -DESCRIPTION="Votca tools library" -HOMEPAGE="http://www.votca.org" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" -IUSE="doc +fftw +gsl sqlite +system-boost" - -RDEPEND="fftw? ( sci-libs/fftw:3.0 ) - dev-libs/expat - gsl? ( sci-libs/gsl ) - system-boost? ( dev-libs/boost ) - sqlite? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - doc? ( || ( =app-doc/doxygen-1.7.6.1[dot] ) ) - >=app-text/txt2tags-2.5 - virtual/pkgconfig" - -DOCS=( NOTICE ) - -PATCHES=( "${FILESDIR}/${P}-boost-1.53.patch" ) - -src_prepare() { - use gsl || ewarn "Disabling gsl will lead to reduced functionality" - use fftw || ewarn "Disabling fftw will lead to reduced functionality" - - #remove bundled libs - if use system-boost; then - rm -rf src/libboost - fi -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use system-boost EXTERNAL_BOOST) - $(cmake-utils_use_with gsl GSL) - $(cmake-utils_use_with fftw FFTW) - $(cmake-utils_use_with sqlite SQLITE3) - -DWITH_RC_FILES=OFF - -DLIB=$(get_libdir) - ) - cmake-utils_src_configure || die -} - -src_install() { - cmake-utils_src_install || die - if use doc; then - cd "${CMAKE_BUILD_DIR}" || die - cd share/doc || die - doxygen || die - dohtml -r html/* || die - fi -} diff --git a/sci-libs/votca-tools/votca-tools-1.2.3-r2.ebuild b/sci-libs/votca-tools/votca-tools-1.2.3-r2.ebuild new file mode 100644 index 000000000000..b1e3c50132b1 --- /dev/null +++ b/sci-libs/votca-tools/votca-tools-1.2.3-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.3-r2.ebuild,v 1.1 2013/02/06 17:25:10 ottxor Exp $ + +EAPI="3" + +inherit cmake-utils eutils multilib + +if [ "${PV}" != "9999" ]; then + SRC_URI="system-boost? ( http://votca.googlecode.com/files/${P}_pristine.tar.gz ) + !system-boost? ( http://votca.googlecode.com/files/${P}.tar.gz )" + RESTRICT="primaryuri" +else + SRC_URI="" + inherit mercurial + EHG_REPO_URI="https://tools.votca.googlecode.com/hg" +fi + +DESCRIPTION="Votca tools library" +HOMEPAGE="http://www.votca.org" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" +IUSE="doc +fftw +gsl sqlite +system-boost" + +RDEPEND="fftw? ( sci-libs/fftw:3.0 ) + dev-libs/expat + gsl? ( sci-libs/gsl ) + system-boost? ( dev-libs/boost ) + sqlite? ( dev-db/sqlite:3 )" + +DEPEND="${RDEPEND} + doc? ( || ( =app-doc/doxygen-1.7.6.1[dot] ) ) + >=app-text/txt2tags-2.5 + virtual/pkgconfig" + +DOCS=( NOTICE ) + +PATCHES=( "${FILESDIR}/${P}-boost-1.53.patch" ) + +src_prepare() { + use gsl || ewarn "Disabling gsl will lead to reduced functionality" + use fftw || ewarn "Disabling fftw will lead to reduced functionality" + + base_src_prepare + + #remove bundled libs + if use system-boost; then + rm -rf src/libboost + fi +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use system-boost EXTERNAL_BOOST) + $(cmake-utils_use_with gsl GSL) + $(cmake-utils_use_with fftw FFTW) + $(cmake-utils_use_with sqlite SQLITE3) + -DWITH_RC_FILES=OFF + -DLIB=$(get_libdir) + ) + cmake-utils_src_configure || die +} + +src_install() { + cmake-utils_src_install || die + if use doc; then + cd "${CMAKE_BUILD_DIR}" || die + cd share/doc || die + doxygen || die + dohtml -r html/* || die + fi +} -- cgit v1.2.3-65-gdbad