version bump

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

4 files changed, 103 insertions, 27 deletions

diff --git a/sci-physics/espresso++/ChangeLog b/sci-physics/espresso++/ChangeLog
index 524e35592683..267db04f82d3 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.5 2013/01/26 02:30:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso++/ChangeLog,v 1.6 2013/10/09 13:48:49 ottxor Exp $
+
+*espresso++-1.6.0 (09 Oct 2013)
+
+  09 Oct 2013; Christoph Junghans <ottxor@gentoo.org> +espresso++-1.6.0.ebuild,
+  +files/espresso++-1.6.0-multilib.patch, -espresso++-1.4.0.ebuild:
+  version bump
 
 *espresso++-1.4.0 (26 Jan 2013)
 
diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index d97b9a5bac45..fcadb4493989 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST espressopp-1.4.0.tgz 12902405 SHA256 47764996dbbdc550bd3dc0d839694188141e164177f8427a732c1edccf194a14 SHA512 99dde0d6ae57ebb6f36df1241a06e92a5a1a4a47b697807fd847f63cef49c638d8a9182c6feae1358ad2e78c107ab3a61d3b33f84461a56d830cb0e433ecd08b WHIRLPOOL 1768a013fdc3be47bc49edde5463742591c4200067b080175477357ea899a12ceb84df247f18dd6a56f67e6ed240adfa63400824aacc428ab6283749a6634d2b
-EBUILD espresso++-1.4.0.ebuild 1118 SHA256 9eb7402b4f7c198e5add0c0892e3426a00c1e4ea968b740882a062cab3ddb393 SHA512 8b216d9c75d56404e953a2a6f119639a123f7ede2278c54925ad25eebe36d7b190a7427f28a9e638f9a66182cab3bebdf7b611afd0c40196836e2fbb31605287 WHIRLPOOL 2f2e550cd00ea965b0e3ecd0fa2029f8bb75572004418b70a1dd9c73fe2ac18e4d7bbb1537f1cf1eb7cfde6ea094d92f644157ced0fe3298eb898db051e96985
-MISC ChangeLog 892 SHA256 1f1d050bd7464bac5834db17d878c66e8fae3423d6b2231d263e74201a960efd SHA512 f4658e4a559aeb53e6963f7e545ab4550d412f72a02d868b6256a6d882bf4dcf61f598be1728036eb4c74294ee94f52fb38f22ab46c26d99c352fa69c8fc75d5 WHIRLPOOL 2027c3cfd1e54d4a7d51152a5ca584e74daa1980d6e6ef3aefe5d0428fbc863cbf88196f5eeb16c2cbf4ba2c01fc85305d185fde8912e45fdce10b572eee16a3
+AUX espresso++-1.6.0-multilib.patch 3351 SHA256 95786b0cef9a7a343b64efbff212da9bbff8d466b855124fcb332f512150ed8b SHA512 8d5b82dfd9a056a80ad3470a8af7088c7d2da73b33c9cca5376a3100da2b5b13fe7d9fe18693eb1ee31ee1849063b320c94a4dc7c8d464617f53db4492633813 WHIRLPOOL e01e064256fb837319802cc8fe6a025478c40f118ffc2cf2c8dbbf108c3ae45a34f89a76bb56bc17a684b9af2b2d65d614da9a274a9019b44c8c964d8459ff9a
+DIST espressopp-1.6.0.tgz 16002382 SHA256 5383e98db14684e2a8c11e3ed966b24fefe759457659a5c07929ba8f4b5f2186 SHA512 eb5af50d766d155104ad8d973ea52046758bca203a379d1648e91f024f2cf604e781e9d7fe987e259ee810ade5728c506e5375156d6a99988f22c91d55881a59 WHIRLPOOL ec2f50e4a3ab4fc5186633a030ccc60b522f4718748e9f6844f03baa889c74c86300e774955b3eb87e1d4d4396003d24f320850ca400b0a34f77052c1f438c8b
+EBUILD espresso++-1.6.0.ebuild 1587 SHA256 b78c940ae1644ce55ee34d8be5777850dccb23e84603a656e25a220981a0923c SHA512 bcd970e3225daf508aa45cb0c2f5e9d9e7bfc94ef43ddc160ce4f12c6eedd0f7386fede49586754e9de1dd993d90fe2d588926914e4519500a009f7862b360be WHIRLPOOL 3cce50eae1a3676856943e3e264709262d93e442dd818ad62af2efd0ee1e7088abca5b34e45bc9ec0ea181e36d256310f1c4368858a8c11be49412ea88b70596
+MISC ChangeLog 1089 SHA256 9110f88af7694b7191d3899ec984496e4c645e0e2855d724baaf2e4f070855df SHA512 5cc9a85b774e5531f1650fbf1a8664531e3704733ad3eede3593e4a1df4420a41c73301af8ccd4f33be6eef0a2cdd33e744c7ec570d40c927928c500944b3cdc WHIRLPOOL 3b4597c8de81eeb7408828751c8cbcb6f6e5a6432fa18f79b9b2d2aa871b616e1d7c4496d7d7e5b1fc5c641d7676fa9e9a5338568958ca5f90475c52b0d299a1
 MISC metadata.xml 381 SHA256 65daec50442b73bf9af711c7efe1543872c0c26b363aa251f855e4b54930d1e2 SHA512 5e8b4c9acdef2c3fd70c85d0e1c7978851c00f6a1a5a4b328e94d73490f50893271b8443f11eeb10b202e3d95d163e8b74e0db53af73f523e6550e9250250692 WHIRLPOOL f8a5d40c87d4411396e2cae4358d231e19d0ca89a5406d0be7946309b9f6ebf3dd83f00d14d983cfa14dd839dcf3f9c3ffa69126e4cf5deffe071bac0c36e12c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRAz/cAAoJEOeBhlrCAAWG8aYH/RJoq94VI3OMmN4Mfvx/vTrG
-ucSjdYyv6YBo0k81H4/uC5I2V9+D9zCwxz03N7JxEngOg1aKaiGEeawPf9fM50Ie
-PMWruZ2Ekj7Y4Sn2Grb4rhH6H3tmw6TxpsV+rdj0m6Mec3DNbuaMbHg3audedeZc
-faxCFJhgUc6yRIJnYLl6ch4H75TXY5FM6XpEkb3mLG5Vw6OZcD3uOBYZqHO+z1Z8
-fiRrulzdvuo4MMXpMPQeaM40LKtXu/cY7yHazxlnCeb/itlTkqpEgKF+5biP1rFv
-Tw+6iYKsv5Uv+OJiou1F/hsVE9gtolkKfzw/ZciM+kqhjC1hdikWBqIiCe80dBA=
-=RnLk
+iQEcBAEBCAAGBQJSVV7CAAoJEOeBhlrCAAWGi2sH/3OgtRhjGrwbFryioyrSLyFu
+fh/qby+jwjZ9SmZs/zIphCCsINB8Mag3Dsn8BPhKGs1fUhT83bJ0UhFO87lKSvuS
+dNb4yYF1Qmi5bOLEG7bkZVA7D9/gnwEuf6rrBI5qNOcBxSplAjzZzCT5GGS0vVI6
+P8qwz6udFtgCuGKPOML1AqnK9jG1/DK02hOyE578kIC7NLTRnESZ/U3JvJPNn/tN
+l7S8h1n25FVLY2W7ke9njtFU8qnWsfXoPR48Y4cugyYvCwBKLDQyIunP7TbzQ/E7
+761SslI7cmDcCyDVN8l2nev+S15p0rjd8YsZ8ZUwTk5QV8/ihNaaMR5WcT6N6uM=
+=ELNo
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/espresso++/espresso++-1.4.0.ebuild b/sci-physics/espresso++/espresso++-1.6.0.ebuild
index c16433866157..9275fe4a08ea 100644
--- a/sci-physics/espresso++/espresso++-1.4.0.ebuild
+++ b/sci-physics/espresso++/espresso++-1.6.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso++/espresso++-1.4.0.ebuild,v 1.1 2013/01/26 02:30:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso++/espresso++-1.6.0.ebuild,v 1.1 2013/10/09 13:48:49 ottxor Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit cmake-utils python
+inherit cmake-utils multilib python-single-r1
 
 DESCRIPTION="extensible, flexible, fast and parallel simulation software for soft matter research"
 HOMEPAGE="https://www.espresso-pp.de"
@@ -18,31 +18,35 @@ if [[ ${PV} = 9999 ]]; then
 else
 	SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz"
 	S="${WORKDIR}/${PN//+/p}-${PV}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
 fi
 
 CMAKE_REMOVE_MODULES_LIST="FindBoost"
 
+EHP_OPTS="--config hostfingerprints.hg.berlios.de=f4:79:d2:17:f8:0c:9b:c2:6e:65:60:2a:49:0e:09:79:85:6d:4b:e3"
+EHG_CLONE_CMD="hg clone ${EHG_QUIET_CMD_OPT} ${EHP_OPTS} --pull --noupdate"
+EHG_PULL_CMD="hg pull ${EHG_QUIET_CMD_OPT} ${EHP_OPTS}"
 LICENSE="GPL-3 !system-boost? ( Boost-1.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE="-system-boost"
 
-RDEPEND="
-	system-boost? ( dev-libs/boost[python,mpi] )
-	virtual/mpi
-	"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RDEPEND="${PYTHON_DEPS}
+	virtual/mpi
+	system-boost? ( dev-libs/boost[python,mpi,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
 
-pkg_setup() {
-	python_set_active_version 2
-}
-
 src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use system-boost EXTERNAL_BOOST)
-	)
+	mycmakeargs=( $(cmake-utils_use system-boost EXTERNAL_BOOST) -DLIB="$(get_libdir)" )
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	rm "${ED}/usr/bin/ESPRC" || die
+	rmdir "${ED}/usr/bin" || die
+}
diff --git a/sci-physics/espresso++/files/espresso++-1.6.0-multilib.patch b/sci-physics/espresso++/files/espresso++-1.6.0-multilib.patch
new file mode 100644
index 000000000000..a66988b1bc82
--- /dev/null
+++ b/sci-physics/espresso++/files/espresso++-1.6.0-multilib.patch
@@ -0,0 +1,65 @@
+# HG changeset patch
+# User Christoph Junghans <christoph.junghans@gmail.com>
+# Date 1381325052 -7200
+# Node ID bcdda52214df0c007e44ec8d5045b0e68b142227
+# Parent  65da1a6110e59322efa1bb5eaff596baf9f07d5d
+added LIB variable
+
+diff -r 65da1a6110e5 -r bcdda52214df CMakeLists.txt
+--- a/CMakeLists.txt	Tue Oct 08 20:52:46 2013 +0200
++++ b/CMakeLists.txt	Wed Oct 09 15:24:12 2013 +0200
+@@ -29,6 +29,9 @@
+ option(BUILD_SHARED_LIBS "Build shared libs" ON)
+ option(BUILD_STANDALONE "Builds pypresso an standalone binary" OFF)
+ option(BUILD_PYTHON_MODULE "Builds epresso as python module" ON)
++if (NOT DEFINED LIB)
++  set(LIB "lib")
++endif(NOT DEFINED LIB)
+ 
+ if(NOT BUILD_STANDALONE AND NOT BUILD_PYTHON_MODULE)
+   message(FATAL_ERROR "You need to enable pypresso or the python module")
+diff -r 65da1a6110e5 -r bcdda52214df contrib/boost/CMakeLists.txt
+--- a/contrib/boost/CMakeLists.txt	Tue Oct 08 20:52:46 2013 +0200
++++ b/contrib/boost/CMakeLists.txt	Wed Oct 09 15:24:12 2013 +0200
+@@ -21,4 +21,4 @@
+ 
+ add_library(espresso_boost ${BOOST_SOURCES})
+ target_link_libraries(espresso_boost ${PYTHON_LIBRARIES} ${VAMPIRTRACE_LIBRARIES} ${MPI_LIBRARIES} ${RT_LIBRARIES})
+-install(TARGETS espresso_boost LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++install(TARGETS espresso_boost LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION lib)
+diff -r 65da1a6110e5 -r bcdda52214df contrib/mpi4py/CMakeLists.txt
+--- a/contrib/mpi4py/CMakeLists.txt	Tue Oct 08 20:52:46 2013 +0200
++++ b/contrib/mpi4py/CMakeLists.txt	Wed Oct 09 15:24:12 2013 +0200
+@@ -12,4 +12,4 @@
+ target_link_libraries(dl ${PYTHON_LIBRARIES} ${VAMPIRTRACE_LIBRARIES} ${MPI_LIBRARIES})
+ set_target_properties(dl PROPERTIES PREFIX "" SUFFIX ".so")
+ 
+-install(TARGETS MPI LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION lib)
++install(TARGETS MPI LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${LIB})
+diff -r 65da1a6110e5 -r bcdda52214df src/CMakeLists.txt
+--- a/src/CMakeLists.txt	Tue Oct 08 20:52:46 2013 +0200
++++ b/src/CMakeLists.txt	Wed Oct 09 15:24:12 2013 +0200
+@@ -70,11 +70,11 @@
+ add_library(espresso_common ${ESPRESSO_SOURCES})
+ target_link_libraries(espresso_common pylogger ${BOOST} ${PYTHON_LIBRARIES}
+                                       ${VAMPIRTRACE_LIBRARIES} ${MPI_LIBRARIES} ${FFTW3_LIBRARIES})
+-install(TARGETS espresso_common LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++install(TARGETS espresso_common LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION lib)
+ 
+ add_library(pylogger esutil/PyLogger.cpp)
+ target_link_libraries(pylogger ${BOOST})
+-install(TARGETS pylogger LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++install(TARGETS pylogger LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION lib)
+ 
+ if(BUILD_STANDALONE)
+   add_executable(pypresso main/pypresso.cpp)
+diff -r 65da1a6110e5 -r bcdda52214df src/pymodule/CMakeLists.txt
+--- a/src/pymodule/CMakeLists.txt	Tue Oct 08 20:52:46 2013 +0200
++++ b/src/pymodule/CMakeLists.txt	Wed Oct 09 15:24:12 2013 +0200
+@@ -5,5 +5,5 @@
+   add_dependencies(_espresso scripts)
+   #python libs have not prefix (default would be 'lib')
+   set_target_properties(_espresso PROPERTIES PREFIX "" SUFFIX ".so")
+-  install(TARGETS _espresso LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION lib)
++  install(TARGETS _espresso LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${LIB})
+ endif(BUILD_PYTHON_MODULE)