7 files changed, 68 insertions, 52 deletions
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 20657b9cb..07f427e76 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,4 +1,5 @@
 AUX cmake.patch 618 SHA256 924f236a1c085fbd3effeb5770447e554c35de0c6fa236d6e0b38c87af3c2e46 SHA512 eb993fc9730a4a5dd41c010d436f34ea2f9fe610eb76c76194097f8c62175278528085c4ff293bc5bef4677d0a0fee8b8e4c75942b65c2f654d4d6cdc8030dfa WHIRLPOOL a2861aca40433ba8ba54f6793c277027e421c9747af4f250d4d4c9177f65a57baee8ffa92c3d8487ded0c79d1274d28aab87722b794dd30f90206b96676f4ddb
 DIST libgeodecomp-0.1.0.tar.bz2 581136 SHA256 71442a60e7cc5c3f38e462d5d52010a948bd089759487687f217e4dec4dffae5 SHA512 56de4e6bfc92f8dda4d4931559a553a7a2c847205637394ea87f73dfb5a34776cb043beba2857bbe07c52a61ed457f22b7d76e4e23c183c8bd25868d36df4704 WHIRLPOOL df2b5c6830dbc92befd873bdced1712687046a43e814f7676271a2041a58c9e2562a86c6b4034343499f813136f38e298b33fa9a67911b726f42f323f666b03e
-EBUILD libgeodecomp-0.1.0.ebuild 1122 SHA256 8eb55caeb0a90fd1799d77f98574c17a20929c54cf63277454ef0056b4d657e6 SHA512 11e03000bbc3f2bea602b1dad65d9a23d319f57c6dcca2a57e70bbe0e28bbe994a19ef3408735d4f8900e506ebeb37f5d3c435766138a546e61969d25db12da3 WHIRLPOOL e9072e36c32b17abb30be8e2182f22ced1354e8cf0dbdad69289e806f6abf0fbe3f65cd2b7df0191dc5f4f035c28f6aa4742b824c2e6e30d8772c4f62b93624e
-EBUILD libgeodecomp-9999.ebuild 1176 SHA256 730710e5223253f2f500ca11a150945944868dfc8e2116a35b002913a1d596f3 SHA512 1f1cc02f6db36c22cc6d538b6eaf6b69b5d3641d172273eb619662fc3ea0e682bda1b7842ec3bc32afb9cc4c0a4e8b9bf52123be24f13bccb4641413abb297f8 WHIRLPOOL ee95bfb6f01ae473134029128ff9b1c6c026dbc7fbc4f35c8a949e077e934607e349ee8fd47815d6afe2dc687857b8d5dc3e5872986bcb5ddda683801cb63228
+EBUILD libgeodecomp-0.1.0.ebuild 885 SHA256 5197ebcac0b99a5aa8f8d48d9dbebc23f737b0a1793626395ad4d4f6a97929d1 SHA512 883e92e48160c5b354923f19452604758b7c675378dc9a1f3f18455c83edde3a8a5c2839d706f73db3454be6804d3850e54013b6f366d83e2f94af1311adaa00 WHIRLPOOL 7f5faf9d53ee24677bf480636ac524fceb340b37cfce674b10cd989b2805ee67f80bec903e05ad0773ec8e6f180371b4255f233c112ee2469550495d0f04b9da
+EBUILD libgeodecomp-9999.ebuild 946 SHA256 9590cac0bd7be1e488351f3275c5ea0fc6f8e45a9637795eca45449b1d5a00e8 SHA512 803caccbeb0cdc2c0993f9d9db988530fe7c15dbe63b0315eb539f3abf78203e1a2f232f44a19578f7160d80ac40c765f4d7b41e129c1e77bd739cd60a4e04cf WHIRLPOOL e60e3100310f2551de714912a964997b77bc567bcb8aeaf656b2ddfa12abd415a737a3e04a80e6220e4f1fd81aae0fbd698a8ef40963f5405571b7a75279c234
+MISC metadata.xml 408 SHA256 238bbd42f5787c8d4877ea030f17c461ce7d47885eadc144853c21d86b60c94e SHA512 69e50aa6e136a61de45f5062ca2410bc1f2df693cb3fc27e5aeeaac6d0bed57f6edbbe05221a6e1af5779cff77a3d5c29574f46bf3948dae88135509b18a187c WHIRLPOOL 77c5e2653d14e297dd4b4ae21041fe32518237d128e2cddbc60b3afa90fbba826dfde70e5a6547ef06c4807f76ade9b92b240aef2885fcd45b91af1fe6078cab
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild
index 117f06b77..87888911d 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.1.0.ebuild
@@ -1,50 +1,47 @@
-# Copyright 2013-2013 Andreas Schäfer
+# Copyright 2013-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit versionator
-
-if [[ ${PV} == "9999" ]] ; then
-    _SCM=mercurial
-    EHG_REPO_URI="http://bitbucket.org/gentryx/libgeodecomp"
-    SRC_URI=""
-    KEYWORDS=""
-    CMAKE_USE_DIR="${S}/src"
+if [ ${PV} == "9999" ] ; then
+	_SCM=mercurial
+	EHG_REPO_URI="http://bitbucket.org/gentryx/libgeodecomp"
+	SRC_URI=""
+	KEYWORDS=""
+	CMAKE_USE_DIR="${S}/src"
 else
-    SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-    KEYWORDS="~amd64 ~ppc ~x86"
-    S="${WORKDIR}/${P}/src"
+	SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/${P}/src"
 fi
 
-inherit cmake-utils vcs-snapshot ${_SCM} 
+inherit cmake-utils vcs-snapshot ${_SCM}
 
-DESCRIPTION="LibGeoDecomp is an auto-parallelizing library to speed up your stencil code based computer simulations. It runs on virtually all current architectures, be it multi-cores, GPUs, or large scale MPI clusters. "
+DESCRIPTION="An auto-parallelizing library to speed up computer simulations."
 HOMEPAGE="http://www.libgeodecomp.org"
 
-LICENSE="LGPL-3.0"
+LICENSE="LGPL-3"
 SLOT="0"
-IUSE="mpi"
 
 RDEPEND=">=dev-libs/boost-1.48"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-    epatch "${FILESDIR}/cmake.patch"
+	epatch "${FILESDIR}/cmake.patch"
 }
 
 src_compile() {
-    cmake-utils_src_compile 
-    if ( use doc); then 
-        cmake-utils_src_compile doc 
-    fi
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+	fi
 }
 
 src_install() {
-    cmake-utils_src_install
+	cmake-utils_src_install
 }
 
 src_test() {
-    cmake-utils_src_compile test    
+	cmake-utils_src_compile test
 }
diff --git a/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild b/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild
index 5aae3e000..4d75771a2 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-9999.ebuild
@@ -6,47 +6,47 @@ EAPI=4
 
 inherit versionator
 
-if [[ ${PV} == "9999" ]] ; then
-    _SCM=mercurial
-    EHG_REPO_URI="http://bitbucket.org/gentryx/libgeodecomp"
-    SRC_URI=""
-    KEYWORDS=""
-    CMAKE_USE_DIR="${S}/src"
+if [ ${PV} == "9999" ] ; then
+	_SCM=mercurial
+	EHG_REPO_URI="http://bitbucket.org/gentryx/libgeodecomp"
+	SRC_URI=""
+	KEYWORDS=""
+	CMAKE_USE_DIR="${S}/src"
 else
-    SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
-    KEYWORDS="~amd64 ~ppc ~x86"
-    S="${WORKDIR}/${P}/src"
+	SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/${P}/src"
 fi
 
-inherit cmake-utils vcs-snapshot ${_SCM} 
+inherit cmake-utils vcs-snapshot ${_SCM}
 
-DESCRIPTION="LibGeoDecomp is an auto-parallelizing library to speed up your stencil code based computer simulations. It runs on virtually all current architectures, be it multi-cores, GPUs, or large scale MPI clusters. "
+DESCRIPTION="An auto-parallelizing library to speed up computer simulations."
 HOMEPAGE="http://www.libgeodecomp.org"
 
-LICENSE="LGPL-3.0"
+LICENSE="LGPL-3"
 SLOT="0"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/boost-1.48"
 DEPEND="${RDEPEND}
-        doc? ( app-doc/doxygen )"
+doc? ( app-doc/doxygen )"
 
 src_compile() {
-    cmake-utils_src_compile 
-    if ( use doc); then 
-        cmake-utils_src_compile doc 
-    fi
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+	fi
 }
 
 src_install() {
-    cmake-utils_src_install
+	cmake-utils_src_install
 
-    dodoc README
-    if ( use doc); then 
-        dohtml doc/html/*
-    fi
+	dodoc README
+	if use doc; then
+		dohtml doc/html/*
+	fi
 }
 
 src_test() {
-    cmake-utils_src_compile test    
+	cmake-utils_src_compile test
 }
diff --git a/sci-libs/libgeodecomp/metadata.xml b/sci-libs/libgeodecomp/metadata.xml
new file mode 100644
index 000000000..a803c13e7
--- /dev/null
+++ b/sci-libs/libgeodecomp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cluster</herd>
+  <longdescription>
+    LibGeoDecomp is an auto-parallelizing library to speed up stencil code based computer simulations. It runs on virtually all current architectures, be it multi-cores, GPUs, or large scale MPI clusters.
+  </longdescription>
+</pkgmetadata>
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 8e6e9d14b..7a725ce3b 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,3 @@
 DIST hpx_0.9.5.tar.gz 3801863 SHA256 4e9f71b70d005104142157969f5ab3a980e2594279a2fb5f79a48bf77a8bc6aa SHA512 b156935061130bd87ababc4693b936687a4098eae305b55fce3c1fa7e0aef13b24f396045b8b392131c9eb973e67a1c1e665ae192a4b6350b5d3802dae9231a7 WHIRLPOOL 41a3e28be66578f0f665470847b38e2c6e5c573cb2ada7fbb49fe07c51b9bb15b761e811299560b2f4ed2e386bff5d42c6748c1c58fe430f4d8bed1376588c2a
+EBUILD hpx-0.9.5.ebuild 593 SHA256 5fa4e70c27ac22ca8dff5c0a30b86250f25cae55016d9dbbf6eaa34f7ce08deb SHA512 4c48123a2ed43a4be93905fd0eacca6cc83daebeef1da6c01682e7364d1b89e02d7422bd8c70c658588a3c7871630c4568891327fe44b617bb3a05f7c0c279c9 WHIRLPOOL d109377fca125283f5724e96dffaaf9ac6f3ec71ab0b70e592544349a30176c343e76eb75604393330b51a79be3e19c417e3d51575e64545f0ff7cc52d839e87
+MISC metadata.xml 602 SHA256 a348c27742e993f850c033f5aeabd90aa7a02568663dc935d9a6cb57f7f7c8ed SHA512 9d7ce5ceff8aaba96f9b2ede817830d21880294de080609a4de637e62689e2ff09887997c2b7ac98e2c3e5c381e09795d8f102b5c6d48c35b2e9b91afbe04ad5 WHIRLPOOL 4945ad2e29396761d78d3c47e83b28f377a9b0ff05becc548e2d189f8b53843b1237298302bca51adbaca19c9578a856afa50a9c5039ebfc13f26723389c8419
diff --git a/sys-cluster/hpx/hpx-0.9.5.ebuild b/sys-cluster/hpx/hpx-0.9.5.ebuild
index e42c031ea..07792d7e4 100644
--- a/sys-cluster/hpx/hpx-0.9.5.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2013 Andreas Schäfer
+# Copyright 2013-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,7 +9,7 @@ inherit versionator
 
 S="${WORKDIR}/${PN}_${PV}"
 
-DESCRIPTION="HPX (High Performance ParalleX) is a general C++ runtime system for parallel and distributed applications of any scale."
+DESCRIPTION="A general C++ runtime system for parallel and distributed applications of any scale."
 HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
 SRC_URI="http://stellar.cct.lsu.edu/files/hpx_${PV}.tar.gz"
 
@@ -22,6 +22,6 @@ DEPEND=">=dev-libs/boost-1.48"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-    export CMAKE_BUILD_TYPE=Release
-    cmake-utils_src_configure
+	export CMAKE_BUILD_TYPE=Release
+	cmake-utils_src_configure
 }
diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
new file mode 100644
index 000000000..fac1ea31e
--- /dev/null
+++ b/sys-cluster/hpx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cluster</herd>
+  <longdescription>
+    HPX (High Performance ParalleX) is a general C++ runtime system for parallel and distributed applications of any scale. It is the first freely available, open source, feature-complete, modular, and performance oriented implementation of the ParalleX execution model. HPX is targeted at conventional architectures and, currently, Linux based systems, such as SMP nodes and conventional clusters.
+  </longdescription>
+</pkgmetadata>