version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 160 insertions, 22 deletions

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index ee34fe2b43ff..2ddac3a539a8 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/espresso
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.16 2013/12/11 12:44:33 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.17 2014/08/11 21:33:08 ottxor Exp $
+
+*espresso-3.3.0 (11 Aug 2014)
+
+  11 Aug 2014; Christoph Junghans <ottxor@gentoo.org> +espresso-3.3.0.ebuild,
+  espresso-3.2.0.ebuild, metadata.xml:
+  version bump
 
   11 Dec 2013; Justin Lecher <jlec@gentoo.org> espresso-3.2.0.ebuild:
   Drop unnecessay dep
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index e4116276820c..321107cc4b57 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST espresso-3.2.0.tar.gz 16688287 SHA256 64f87b4a9cf02aa7b836a9c20d971aafae4b858e532ad2a9cb1ca750883f9118 SHA512 557127b82af97ca2eff1f3951e1c5792b22ef80d2d6e00c8f10c98540c64040fd02500126dd24f944c70de717b09e444a4e887f5da245391d0504fe66f59e10e WHIRLPOOL ed8b225bf4cb3a6eaa1fc1052c373345f0a317ceb4e2fea4df35c36fe5334c1fd40d5986d17624ed281c173c73217aeb109cbca822a0439768fdaac01ca7b09d
-EBUILD espresso-3.2.0.ebuild 2833 SHA256 5fa9a5b88898a781d450f222a4ef5bed82379b265ed95e310e4b6211b1a5ec87 SHA512 6623e126dad533f4d45671849fb511ce44e9adf5f679291bcb88eb0dfa02cd4c3c3f3cf646c860e325c42cd6d1253c9f3ddf3eabd7e67f9111da660bd1faecbd WHIRLPOOL 138898cb3a89d72b521327903d8828d3c300ccf2af21db02562cf4c5d88d1a1a66e4bf0861a4aa6b8704d6ceb91483fd6fd9501d493be41986d44226426673b9
-MISC ChangeLog 2424 SHA256 a45a2bac70c1f198275cb158da5dcb25da547c1d6e0a8c6e11b3805d81f8c2de SHA512 2e4e1ccb0d0ed8d13a4c2064444eac0ef5acf9096d8b84aff0a9c0e3ee093d0f670a9c9a0180de28be280b2b9f353712f98bc694e175460389fd06471ecdd869 WHIRLPOOL 503cb869612ac0a093e60f780a3d11d4c5506ef439d7e789802d96853ff55d70f51a3c64d6cb6873dbe72dfd86eddd04e09fbf8dbbccd45a9c39d7aa6d018da3
-MISC metadata.xml 402 SHA256 7b60ad2f24df6bfaebe306a7c03345fa1a35f3d298616a29b3bc2392dd0d8d5e SHA512 2f41e66463acfeef5db31f2a4c147ec0f25c69f7ab84afd44c6956576764ecde1af83f0c8e266984351b54ac263b33ba68d07f3ef6cdcc9956fb6df42a6e0b7e WHIRLPOOL 470e5871b6e19fe5009d78fba74bf07fb507823fa20a3ab4daf19fd6883a8f44deff07f494ec09955cd6522beccd64237f8d2e3a62621be1458f5fbc30b7be74
+DIST espresso-3.3.0.tar.gz 18952622 SHA256 64ea2684e4fc0d31c11969e49ec74c25138b4f74686f67b93c7e1103833ff08f SHA512 90edbbdc8d7f7247b5179fce0fad796a9488f82a1754519918c6588c932050675397d36e0167aae770db9803b6c22f7d14d23c04cf307d10802afd3d5d5edc20 WHIRLPOOL 3e9547f2da6676edf3de415fa848301f2959c3dfeef1c3f461b4e1eb202224ead7635748b47d42edb9f661dc5d672f38168e15ab6c55a9c9d7f102ae11f8574e
+EBUILD espresso-3.2.0.ebuild 2835 SHA256 9a71bf4b6ef8b93e21fc5d493c2bbb11c40423d850477590415d0b19c1474c67 SHA512 ae5aadf3e0241a844fc90840620a3f2228020898f265c0178b34b102ce77deb31f12d9770c0348763628094d45dc98ea7d3e8881b1dab490980f2810f1d436c3 WHIRLPOOL e68d96bb4ba8033bf1f46b9f9cf1fb4810680e2d263a56ae5574d4c6c48595c11b5153282719b79abdf8b3312ce4ca7340c16367223716a3f9f763995c4dc334
+EBUILD espresso-3.3.0.ebuild 3263 SHA256 8fcdb598b3984c90ce1d5ca44291291ee350ce3487c08a4fa60e7d5f1bfb694b SHA512 bfbd7969ea1534873b774272954132c815e7238773cfa3b46dd7042001df0af8d8a453dd7e5d5d9e6f7abfbf2bfa6bc3a593f7ec06f04405cc0141f825231aac WHIRLPOOL 549190325f56bb4c5233d2cd8d625c97d9ab06a8eca71cfcb6b3d51e208a7293e74ae3e9cd377c24bfb86160781fefa40be79f5b024f1601705cd17431ce32ac
+MISC ChangeLog 2590 SHA256 0f68cf106d0b6bbb12f6d5d007a8520f0a1bdc321d6a887b5e9f73ec7ededf06 SHA512 82d283896e489d62fcf38f873aa185ec854a8e49bcb585947204cb7f702994ce58a48a8883e418fb5b211009cefba7b3bba1ce7df8eafdf749a092eb4bce7b9e WHIRLPOOL b04ee8d734970b9b9f54d27b8175afd58c349ab7b0ecb08ed03d813a0ef1a3993bcca8b7b5d63c783be312b507f36ca711b01dea5b80294d4a7a4fac1c810742
+MISC metadata.xml 451 SHA256 eb96c98f12bf924ab770da9e8d5ed1cefd98c2e1c7f415382551a37e4abac00d SHA512 e76a0532a764e6aaf565fb2e3d4fe2fc792243ae3381cdaae267c800ed96b7ef2087677e0fdd1d5aee9b0e3afb7810d8d2370ba28c6478b2738447b3c137d8bf WHIRLPOOL fa8022d0c2c3a4263149f8c23664042371e1c51af1eff20168c3a2d96b37270d344566e2270160956d0157265d507fca938e85ec7b6e2200bbe865d15b469bde
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJSqF4yAAoJELnU8jG9FVirnvoP/2+npvFtPecG3uXlOLcaeN/f
-WpKTTmGP4Ay8psGqedDorqblpRn6iJIMagXLaWmDOXsLluO31RlksKWzEYRqCSjp
-t8FUMLRNynY3bJoZU/Lfa1PfR/Of9+QqrVSAuo7rGpX+LcTLF3UCzAjBYxCqiQSz
-p6NWfP5ZRuHNs8iv8/bWO+EIc74EJwQ6ALkI0mGFc+CX3IQWm6cATLQh+6JvQ1Kz
-R+7lXG02bp1j2lBUUtW9os0Pr+s9IXn0q/9MsU0L66Tcj1j+0onbLUXAtpCR/aou
-Yy6b0tictAPhXknENFBCNsGVRja7tRICvmrL+i79QYvo89n2dHhPArhUC8nvAJ6t
-UHVGmECJIVLC7dd3VxASZRcyBan34Orsjw/hHyE+9dq7I72NQaGDCnHBbnRlaaFV
-5P2TtKLl90clTh2UMyeXtCQL+3mTqnTAlTY9r5xEO47pbD+HCgv6B/aR+LS3THCR
-F6hw0TKBWSTMkURikX4EKiTT0/t9lNCSm6NWZvnwCDdUBK6SW0jQSvFF/etECfcV
-IIlX6/2EOO5ufZOYoJ7e6eA7DnpFOf5fYRowv6jpf+G8mu/ylLBpeofw5wF6atsW
-PHoAeWvAWJ+exW3VQ/cqsL49HaGmcwFagI/Iyccd/evCMMj8AeZHyNUlamS6XNlr
-MhZhzlVdQKWNStHB8TQn
-=czno
+iQEcBAEBCAAGBQJT6TagAAoJEOeBhlrCAAWG4xUH/3R0lqf71115PSYpP31sJo/A
+kVH94NHjqRAvdoy8UWKq74rDxVkn11nfxprDEy95c5c1821Qm9c9hXXzDcpwgU1p
+SkelfPRqCMT6VVvKDWPiou/igYwdajaaJZWG1jO0HxfAmhdmVVIpGM3RwHaMDlpj
+UBJ4sTa5Tfjd4RmSI21Xr2BqpOM/iu2JKIXDhpZyLK0UWK6/HchE+NiDpvdizTMp
+650G7Ojdb6Nz94ZXLy7icZDYtTgo5ZMuv39o4BNO1gM0/2QftjCK0KGaFoAy0eCB
+FlXHQoJdWZ0suIc+zE9dQgvAYX2uuIPmfQFEFj9M5aoOjO2ofmSGIK0RSIELtfA=
+=sfPX
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/espresso/espresso-3.2.0.ebuild b/sci-physics/espresso/espresso-3.2.0.ebuild
index d37267030534..9b8666b3c488 100644
--- a/sci-physics/espresso/espresso-3.2.0.ebuild
+++ b/sci-physics/espresso/espresso-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.2.0.ebuild,v 1.3 2013/12/11 12:44:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.2.0.ebuild,v 1.4 2014/08/11 21:33:08 ottxor Exp $
 
 EAPI=5
 
diff --git a/sci-physics/espresso/espresso-3.3.0.ebuild b/sci-physics/espresso/espresso-3.3.0.ebuild
new file mode 100644
index 000000000000..78cdf623c181
--- /dev/null
+++ b/sci-physics/espresso/espresso-3.3.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.1 2014/08/11 21:33:08 ottxor Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://www.espressomd.org"
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
+	EGIT_BRANCH="master"
+	AUTOTOOLS_AUTORECONF=1
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X cuda doc examples +fftw mpi packages python test -tk"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tk? ( X )"
+
+RESTRICT="tk? ( test )"
+
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	dev-lang/tcl
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	fftw? ( sci-libs/fftw:3.0 )
+	mpi? ( virtual/mpi )
+	packages? ( dev-tcltk/tcllib )
+	tk? ( >=dev-lang/tk-8.4.18-r1 )
+	X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		dev-texlive/texlive-latexextra
+		virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	myeconfargs=(
+		$(use_with fftw) \
+		$(use_with cuda) \
+		$(use_with python python-interface) \
+		$(use_with mpi) \
+		$(use_with tk) \
+		$(use_with X x)
+	)
+	CXX=$(usex mpi "mpic++" "$(tc-getCXX)") autotools-utils_src_configure
+	restore_config myconfig.hpp
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile doxygen
+	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile ug dg tutorials
+}
+
+src_install() {
+	local i
+
+	autotools-utils_src_install
+
+	insinto /usr/share/${PN}
+	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.hpp
+
+	save_config ${AUTOTOOLS_BUILD_DIR}/src/core/myconfig-final.hpp
+
+	if use doc; then
+		if [[ ${PV} = 9999 ]] ; then
+			newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/dg/dg.pdf developer_guide.pdf
+			newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/ug/ug.pdf user_guide.pdf
+			for i in "${AUTOTOOLS_BUILD_DIR}"/doc/tutorials/*/[0-9]*.pdf; do
+				newdoc "${i}" "tutorial_${i##*/}"
+			done
+		else
+			newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
+			for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
+				newdoc "${i}" "tutorial_${i##*/}"
+			done
+		fi
+		dohtml -r "${AUTOTOOLS_BUILD_DIR}"/doc/doxygen/html/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins -r samples/*
+	fi
+
+	if use packages; then
+		insinto /usr/share/${PN}/packages
+		doins -r packages/*
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "Please read and cite:"
+	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+	elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
+	echo
+	elog "If you need more features, change"
+	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+	elog "and reemerge with USE=savedconfig"
+	echo
+	elog "For a full feature list see:"
+	elog "/usr/share/${PN}/myconfig-sample.h"
+	echo
+}
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index ca1d5d80b67c..1ef3470bdd04 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -7,6 +7,7 @@
     <name>Christoph Junghans</name>
   </maintainer>
   <use>
+    <flag name="cuda">Enable cuda support</flag>
     <flag name="examples">Installs the examples</flag>
     <flag name="packages">Installs extra subpackages</flag>
   </use>