sci-physics/espresso: Drop old; fix python handling

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 48 insertions, 394 deletions

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 188126dc46cb..a1673c0555db 100644
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2013/05/11 21:51:46 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.15 2013/12/11 12:42:15 jlec Exp $
+
+  11 Dec 2013; Justin Lecher <jlec@gentoo.org> -espresso-3.1.0.ebuild,
+  -espresso-3.1.1.ebuild, -espresso-3.1.2.ebuild, espresso-3.2.0.ebuild,
+  metadata.xml:
+  Drop old; fix python handling
 
 *espresso-3.2.0 (11 May 2013)
 
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 9c40add8f267..af6b74dbc60a 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST espresso-3.1.0.tar.gz 8999207 SHA256 72a8b9711a95b32cf6361d8f3b2712a37bcade592996686f5cec1506fe82f1e6 SHA512 3eb41907097074d1bd95549cc4a0f042f0411568c57fc2aa516444781b4315c3e91b96b254d74938e9547188934a012cefbe167bd97d50242141c8bbd2c9ce5e WHIRLPOOL fdce37653cdaee7492f19305fcf4c733c21671e887b858d4d725a8edbc2d8652d77e52e32caea2c0d79e009aedda7940c05e8012d0493b296672b404189b7756
-DIST espresso-3.1.1.tar.gz 13893135 SHA256 00115eb4f58b7cf65a39a5d9c01b9cc3a5689003045f6f1540078eb916f7c0b3 SHA512 5bc2cef4866771044a5307e8293b24ba6deae1874ff91d344e4c4ae6f8964628febc2b615ea0befd3908b17ba087acfd7a634fa49221f2018c9991881fb08801 WHIRLPOOL dfba6c7fc2297c14cc6c5a4cfc4e24eb4562a6817492e7eaafe735a6e71a8700e2032232cc0191224a4e51412fd5a1964aab6444f1632d18e56a3ee24c3a935a
-DIST espresso-3.1.2.tar.gz 13851383 SHA256 ee48e01d772cf2c0db9631dd416d7657a3787cc9bab6a8b7fa2340ac586b58ea SHA512 b495e7db31ce8a94e53fab4cdc92d91fb60c9d703eaec195a5834c6c9088dcf30facbd481e60669b6b339b5ee8bc21d0db120cdc0db5798bc9df597563388174 WHIRLPOOL c01defee281b46f39d4e840439977e159d4ac7edce3d90b638ed3e95675875a82e6fa6023df81ceb15d20e73069be472fd4579f9251d6e4c5a532a222ce36cac
 DIST espresso-3.2.0.tar.gz 16688287 SHA256 64f87b4a9cf02aa7b836a9c20d971aafae4b858e532ad2a9cb1ca750883f9118 SHA512 557127b82af97ca2eff1f3951e1c5792b22ef80d2d6e00c8f10c98540c64040fd02500126dd24f944c70de717b09e444a4e887f5da245391d0504fe66f59e10e WHIRLPOOL ed8b225bf4cb3a6eaa1fc1052c373345f0a317ceb4e2fea4df35c36fe5334c1fd40d5986d17624ed281c173c73217aeb109cbca822a0439768fdaac01ca7b09d
-EBUILD espresso-3.1.0.ebuild 2816 SHA256 29e0a53c8334a2b2a780ed821fc197af530b4ac6862672d6b0aa8e535f9a39a3 SHA512 c6b25d2e51715fa4b78d793db1b68938b94204a2a6e63bf34caa6574a27038b26b3cae0aeea2b380167dda52893e52b5c324925b399b885c37108848cdc5b5d3 WHIRLPOOL 5fd0585054473f9471284cf71eac16c42e5361ac0d6e980180052de3b3aa70fcba82288bc32fd0f1029484a7097bbf02c5d76c702947dcd9042e27620aa3f508
-EBUILD espresso-3.1.1.ebuild 3025 SHA256 447b47e9934de8593477bdba8b38cf9ef6dc0dba691d260375a799e1fe3a7d37 SHA512 b79cbd67905b668506d3ed9ab80d406722816ae27a5849061032d0c4d3a4dec19c36c11e98491b7aea03875cb24335fd34e5f6de8a0c477ab1b91991d9b8129a WHIRLPOOL 66b394ba441c508b33b114b26dcbd49433398b0c506fda60896acc60c1f8e39c975d2bde297891adeb36e15ac0a9212d2cfc40486bfcb243ecf3acd86c65b5a6
-EBUILD espresso-3.1.2.ebuild 2761 SHA256 8cb4b0892da00cac681613d43d947c248da212a3407c906326c9c20d3474c7ee SHA512 082f5e6e3d6a32e2785ce1a057c9f83e4579e17a003c1507dfa06f7427f82b252ec089294387f567abb7b5b1452e17a3c81ae2ab0eded6567d5fe94b214bbe2a WHIRLPOOL 8ec3b6f66588da86d3a5bc0cd0ec1ac22b8278c3fe6b3c2f26e38101e2241967d254f2c1fee44b06c96f094f46ff6216d0de02e6a05e8e3fd2b9e11643e94af4
-EBUILD espresso-3.2.0.ebuild 2761 SHA256 70eddfa13d6679ac75fa0ae96447487287b3d365f2ca1d6bc03650b83a20828f SHA512 7efb8c37268048c6365b713818d8190ac270f2e074fed86c3aaaa0cc9ee768809a172f8f4514e700fd5bf7558c78cae5c12b5669943e1507c50cf4219fb99d20 WHIRLPOOL fc860186abaa28c21dc623e8966b270602b3dc180757644c7a07167d6729f35256b293a48d33b312346743d4a2c20765e39faa2a70f3e089a8647f4ed2ecec36
-MISC ChangeLog 2140 SHA256 758c772a72515b90cb91080ec2b1923a74b67a36f4591210e8e2f5e19e5e947e SHA512 14ef655cfc55599394acfdac4a7c3a957ea1993addb39cb07b480837b8b24963734b3ac28a6bfc604f163ba6255100dcc6aa7734a17a5158bd0624b1fffa51c2 WHIRLPOOL d5ab85c5829030c7adc55ce4f413d2a0a8266276ab7edde7cb32b620c2013ea28193b6896140590a7a6631a15e2887c26cf9fe0655212da176d09afb96c92312
-MISC metadata.xml 389 SHA256 2e3930885bef14d1e5669744db5e5f8a489a6f75e3b6c6861665a94c0fa07b29 SHA512 3f71c1be5efe4d53815e803aca0b865328bcf6734f1d247109d7a30fb1aecca38b564c58d8d9d9fb38a9b7b97c23e75a2aa18940cc50cd8285226f0cc1549d11 WHIRLPOOL 7206652516e34a2379fa062bfca9a1b2e9ca4b9b983c9b693bafe8d40681e2a7be9a738d60f0207532c4a00767c563055af0d1c1ada78c09aba66d55eeaac49b
+EBUILD espresso-3.2.0.ebuild 2850 SHA256 51759789d56b07ac7b7176ff936de6ea02bab0bbd5557752a7e0de61deb5b70f SHA512 85c3c9cadff287e871c8fd8369b66129738d3ce5d91c9d68e46c44e97f1277e0df9a1919ef1360cd1f290584c90e139ad5787acdc69f747011b48a8f2a5aa0d9 WHIRLPOOL 8fb1ec778f531ad9f397f5029021622e84cd2e3e598d895b2cfb671c889d301de58049b45f186df1c37a4ea5268bf417632634b2049d8320bb249444b39ec9c2
+MISC ChangeLog 2331 SHA256 059760b556c4a59750a7e518ffacab038b111c8d04971123f125e1dd6bd0cf70 SHA512 f3f8a66707fee2d41cc184408ad06b8f96f309518e315368ae5d9fae1282f23c61f2e74747883a4ffd1343d3c037d27b51a07b405a4436c3dbf43765aeae2f50 WHIRLPOOL 7d232ab85c53377b4407a3d5fe6d158922b5598d100ac618e5ccad53d3198fa48e81c28fc3e56a63b880fe54d2718ac59568eea027b46ac015cd38f20812167c
+MISC metadata.xml 402 SHA256 7b60ad2f24df6bfaebe306a7c03345fa1a35f3d298616a29b3bc2392dd0d8d5e SHA512 2f41e66463acfeef5db31f2a4c147ec0f25c69f7ab84afd44c6956576764ecde1af83f0c8e266984351b54ac263b33ba68d07f3ef6cdcc9956fb6df42a6e0b7e WHIRLPOOL 470e5871b6e19fe5009d78fba74bf07fb507823fa20a3ab4daf19fd6883a8f44deff07f494ec09955cd6522beccd64237f8d2e3a62621be1458f5fbc30b7be74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRjr18AAoJEOeBhlrCAAWGkXQH/2MtvlkuhzKgRqaLy7wOqsxJ
-HBY0qdOxr+nkCrg4mXfWIHTTWATLmtOTjG6dHQyCVSBUK4ZAI0OVQZgIckRwKHMq
-0rjN2CaidfknPbrhPgRCOhx1bbirOwpiIoRRHoA3sBQFyXKC/XK6OkTrd3BLZ/Q7
-IqMtaL32SPQOsnud2mcp7b1a9mpQlXDsZVR9H5In0xP7Lop2rGc7f4Mif0TI4bQv
-TzI0BFc9Ccvd5rn377XtYY1d+PS6ZveNH/0NWQwQE/2rH7IVxjMmFflm5WDUXB7g
-HfLwmvpvc7HNRga6zYIY37LSIzENVoxYK5frjEXfXk2w5g8ky9Ubh5HKm/Xs+wk=
-=2WJh
+iQIcBAEBCgAGBQJSqF2oAAoJELnU8jG9FVirNSEP/j1y4B9c62cyL//2gNcLLhhQ
+FhjzSkhliEzXmJYyut2TmQOcHiDKamDgHldeZ8vT98X2J0Muk93rv4OnPw/dUg3x
+zSckZ2cppdHG9WNabHC1WKQQ/vl+pqWoSUV39xjclmF9qQ4guoP9xNn81Varj/1t
+3tXDraRH//QC4zvH11dc72UGWK5m7ULh7HqZ94AyCNEivsNYBT8BueFEzSVKXs9B
+vTKgn/0s9S0d0tjJKagjl2MEgXi+cNOLOpUhOpj3cPTfDBO8fklUIoDwEQk1Di3S
+CK7JmHuDWLwAQ5alwZJ006j6T9+ENbxZLSqPtA9jmAP63/az8WeizJgb/NtE91Z1
+JC7Onuybsdl9j+RdxVZQ7kzuZRa3S7cIKcTiCkvqOLRvFPHyXKKDTPEGWoiNszA/
+yU9aK++Bd7o9qjTNpCIZKG4df+J//cvKKUGahsL3ufL2jJ2d/AkqsHDytRYSp7Xl
+VAUZkbofHUWpXNatazOaY9PYkay2pYteSGpgGyfBbOQP3v567UuEl3vr7PjQjoQA
+fzVOsuUjbYXb12r2SbzLLcaDIIypU8wPk7pvljtwb3iLhXJrllGQp0CP1dN3BEO9
+sb9nDq7zpLHsvfOfDkA9FRHgnWWsm/T0MttQWJVcEalMNr+M5TUH5YNWkwXDz3yz
+BaiwMy5xluEntO7EQFvp
+=6uyn
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/espresso/espresso-3.1.0.ebuild b/sci-physics/espresso/espresso-3.1.0.ebuild
deleted file mode 100644
index 685cac47c714..000000000000
--- a/sci-physics/espresso/espresso-3.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $
-
-EAPI=4
-
-inherit autotools-utils 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"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-IUSE="X doc examples fftw mpi packages test -tk"
-REQUIRED_USE="tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
-	dev-lang/tcl
-	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}
-	dev-lang/python
-	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 )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-	restore_config myconfig.h
-	rm -f src/myconfig-final.h
-	if [[ ${CHOST} == *-darwin* ]]; then
-		#tclline uses stty, which has different exit code on Darwin
-		sed -i '/source.*tclline/s/^/#/' "scripts/init.tcl" || die
-	fi
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with fftw) \
-		$(use_with mpi) \
-		$(use_with tk) \
-		$(use_with X x)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile ug doxygen tutorials
-	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile dg
-}
-
-src_install() {
-	local i
-
-	autotools-utils_src_install
-
-	insinto /usr/share/${PN}
-	doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.h
-
-	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
-
-	if use doc; then
-		[[ ${PV} = 9999 ]] && \
-			newdoc ${AUTOTOOLS_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
-		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
-		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/*
-		for i in ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/*/[0-9]*.pdf; do
-			newdoc ${i} tutorial_${i##*/}
-		done
-	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() {
-	elog
-	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"
-	elog
-	elog "If you need more features, change"
-	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	elog "and reemerge with USE=savedconfig"
-	elog
-	elog "For a full feature list see:"
-	elog "/usr/share/${PN}/myconfig-sample.h"
-	elog
-}
diff --git a/sci-physics/espresso/espresso-3.1.1.ebuild b/sci-physics/espresso/espresso-3.1.1.ebuild
deleted file mode 100644
index 984b8d295695..000000000000
--- a/sci-physics/espresso/espresso-3.1.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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-3.1.1.ebuild,v 1.2 2013/02/09 18:56:26 pacho Exp $
-
-EAPI=4
-
-inherit autotools-utils readme.gentoo 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"
-	inherit git-2
-else
-	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-IUSE="X doc examples fftw mpi packages test -tk"
-REQUIRED_USE="tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
-	dev-lang/tcl
-	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}
-	dev-lang/python
-	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 )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-	restore_config myconfig.h
-	if [[ ${CHOST} == *-darwin* ]]; then
-		#tclline uses stty, which has different exit code on Darwin
-		sed -i '/source.*tclline/s/^/#/' "scripts/init.tcl" || die
-	fi
-
-	DISABLE_AUTOFORMATTING="yes"
-	DOC_CONTENTS=( "
-Please read and cite:
-ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006.
-http://dx.doi.org/10.1016/j.cpc.2005.10.005
-
-If you need more features, change
-/etc/portage/savedconfig/${CATEGORY}/${PF}
-and reemerge with USE=savedconfig
-
-For a full feature list see:
-/usr/share/${PN}/myconfig-sample.h
-	" )
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with fftw) \
-		$(use_with mpi) \
-		$(use_with tk) \
-		$(use_with X x)
-	)
-	autotools-utils_src_configure
-}
-
-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.h
-
-	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
-
-	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
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-	readme.gentoo_pkg_postinst
-}
diff --git a/sci-physics/espresso/espresso-3.1.2.ebuild b/sci-physics/espresso/espresso-3.1.2.ebuild
deleted file mode 100644
index 8190ab31c114..000000000000
--- a/sci-physics/espresso/espresso-3.1.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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-3.1.2.ebuild,v 1.1 2013/03/09 02:43:23 ottxor Exp $
-
-EAPI=4
-
-inherit autotools-utils 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-2
-else
-	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-IUSE="X doc examples fftw mpi packages test -tk"
-REQUIRED_USE="tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
-	dev-lang/tcl
-	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}
-	dev-lang/python
-	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 )
-
-src_configure() {
-	myeconfargs=(
-		$(use_with fftw) \
-		$(use_with mpi) \
-		$(use_with tk) \
-		$(use_with X x)
-	)
-	autotools-utils_src_configure
-	restore_config myconfig.h
-}
-
-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.h
-
-	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
-
-	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() {
-	elog
-	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"
-	elog
-	elog "If you need more features, change"
-	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	elog "and reemerge with USE=savedconfig"
-	elog
-	elog "For a full feature list see:"
-	elog "/usr/share/${PN}/myconfig-sample.h"
-	elog
-}
diff --git a/sci-physics/espresso/espresso-3.2.0.ebuild b/sci-physics/espresso/espresso-3.2.0.ebuild
index 37782f5db4ad..a7f968538ef4 100644
--- a/sci-physics/espresso/espresso-3.2.0.ebuild
+++ b/sci-physics/espresso/espresso-3.2.0.ebuild
@@ -1,10 +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-3.2.0.ebuild,v 1.1 2013/05/11 21:51:46 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.2.0.ebuild,v 1.2 2013/12/11 12:42:15 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools-utils savedconfig
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools-utils python-any-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
@@ -13,7 +15,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
 	AUTOTOOLS_AUTORECONF=1
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
 fi
@@ -22,11 +24,14 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE="X doc examples fftw mpi packages test -tk"
-REQUIRED_USE="tk? ( X )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( X )"
 
 RESTRICT="tk? ( test )"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-lang/tcl
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
@@ -98,16 +103,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
+	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"
-	elog
+	echo
 	elog "If you need more features, change"
 	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
 	elog "and reemerge with USE=savedconfig"
-	elog
+	echo
 	elog "For a full feature list see:"
 	elog "/usr/share/${PN}/myconfig-sample.h"
-	elog
+	echo
 }
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 05916be9fd25..ca1d5d80b67c 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<maintainer>
-		<email>ottxor@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<use>
-		<flag name='examples'>Installs the examples</flag>
-		<flag name='packages'>Installs extra subpackages</flag>
-	</use>
+  <herd>sci-physics</herd>
+  <maintainer>
+    <email>ottxor@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <use>
+    <flag name="examples">Installs the examples</flag>
+    <flag name="packages">Installs extra subpackages</flag>
+  </use>
 </pkgmetadata>