Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
author: Justin Lecher <jlec@gentoo.org> 2015-06-15 19:33:10 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-15 19:33:10 +0000
commit: 3dc3bc1619e1e61503be740ecd5b665278cca7f0 (patch)
tree: d504b7db0ca274ae7fee7833184c32f21d16bdec /sys-cluster
parent: Updating remote-id in metadata.xml (diff)
download: historical-3dc3bc1619e1e61503be740ecd5b665278cca7f0.tar.gz
historical-3dc3bc1619e1e61503be740ecd5b665278cca7f0.tar.bz2
historical-3dc3bc1619e1e61503be740ecd5b665278cca7f0.zip
34 files changed, 413 insertions, 188 deletions
diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index 92fefb2dbcd9..ffc2db9831a3 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX corosync-2.0.0-docs.patch 1238 SHA256 505575c1025f46249fdedd8e46d0ae756da59f57f63bf42b2e3af78aa5f4e962 SHA512 d6c1a5e6c0ccef07b5748e5ec4fa6dd9f76c162b71d679ec809b3986e53ec30934ea4cf569d461c4f284f45588a5bf0ed63fe9618083f18f5be7d876d2139bd6 WHIRLPOOL 87422b99d0cf870cf93400e662813c1d9b5e6fb1249132752efb08b7d13f2ad10a03fcc7d37d4f616abdd9dba87a42b2957ad4e9975da0282794164a9fa4fa71
 AUX corosync-2.3.4-docs.patch 842 SHA256 233e25049233e6d2c213c194a74d274a4fed850c34cb6b36dba0720f92546076 SHA512 e73db019b1fbe8a030e530a0be55cdc33972d018a6415d17c7c425607613ef1f0695e9c4d231eddbce708710e1cb2341c42e911e59382974ba8b24204205896f WHIRLPOOL dd743290e0334cfe8f6b373eae82734e030e03300d068ad77842af5879784b31b2cd74e844ad50601bee2bb47351237bd7bb5cf7354d2603c0801d01b464f812
 AUX corosync-docs.patch 1022 SHA256 0c988b55ea471d9c413c0143d2a523a683a324c23de5dd82bcba62676eea6857 SHA512 49f8b19cbfd5f0b1f0f927a7aa8cd2f0ad24ff958cf2baf06e8a9d87858fa01cf3656ba05189a085e265a2d8b1b320ca7f18b3a4d405d73ff05f1876ebe14960 WHIRLPOOL a2a54277d91e378cf2eec7b2385de4773815a109e425c41f725255424ec1bcd03bbc6bc7dedb7db6293e46dc5b5a2c7cf093b818085b02beed2ddaa616a71d77
@@ -14,4 +17,23 @@ EBUILD corosync-1.4.7.ebuild 1529 SHA256 5b45b3195b4144ba3166d6fa9a713df36992623
 EBUILD corosync-2.3.3.ebuild 2062 SHA256 cb0e313ee2f3d64f3f4474413e5310835feb842482762c5fe9cb91cabeb8e144 SHA512 dadd8cedfe857bc8d4fa415c809455c6fc942e38def1c5b2472fddd61408a7dcacc6d471a2a9c6f4180936f75a52246d3733a17506d0bd6fea0d747fbaab5afe WHIRLPOOL 560ce29319c4675143567ab4bd9721769733010c7df4220042c0b5e60b118318b228e6b29c1dc851f36525e6b676d64ee396e3c371fa8dffce120e2546851356
 EBUILD corosync-2.3.4-r1.ebuild 2066 SHA256 575a1ca6f8967920008ac1a6986634b33fd19b0078fddfad35b6d03af6682a42 SHA512 b6929a91b780ae73be97755b5e79ac998a5aa8ab7d1022d99b5823b3ed3c38b24507d78e948118a8f3ef560dabbf9dff4f99fca80ca2c37cf9963aeedced106a WHIRLPOOL 82f8033f5edef12979a5d35aca6996132a2cc2bb3fb53c5b7daf82c3855156ddee4037f819d3af2edb0624f529b49f0b61443aded38605e567f80b6ee0084c16
 MISC ChangeLog 6009 SHA256 ec272736141c3e5d85f468c503c2a88b01c6f3c54d85021baad6e12070d8c385 SHA512 7a7d230c3293e4fb5c8135ababddb9e5ab5b8f373d7307c5018700947342c96d457acd7d767a2344eca56cb0291408f6094528e8972f6aff0cccea4e8718f669 WHIRLPOOL a11a5857402407eecb233a6beca1f8d9a4b2c83799d6023534eb1b6fb91fa2e6f2704554f83cbea7e46a77bb106832b72693bd20648f9723e10cd6bf2e77c826
-MISC metadata.xml 439 SHA256 c42c0a4842cfe519184bc5f0ed1a67e0d08957add7f680a3112c17d6f7aabb14 SHA512 9840d4948e84c3a98a7dafe2909648a529d735f3a9297912e4c044439035ff8ed4be3848787f41d5a868e94a9c6137ab6efaf38a84c7373084ba76ec1272b5a5 WHIRLPOOL 2940d8c05e9b0ade0ea3d00e17fd632998f0d46274864c140de8dd49ff25a5fa0bafb3fb54427be9ff366546a82a69e2905e5587655e97d05b9aaac76ad9af04
+MISC metadata.xml 520 SHA256 9034153188275bdc5ddd13c5a50de5dbf0925b524fd73ec6026850529c0b8258 SHA512 04f981e26c0431972ebc89ce97bdeb1d069e5eaa2fabb646306ad88157181da78dc6f750b215aa03a7c4d258e506a474d2dd4735b543b1e8f8f4580b9c0f9384 WHIRLPOOL 5475f3e2c182ddf5041ddc11b7c2eab5f376600bd82cf0b42dbed06724d9f6296fb6db71ac1ed5fcc01816f38259e27740982bed54fbfccc5d84bd3f67b76d75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyffXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKzMP/RNkh4UR4Ml85bvhOCChttvz
+ym0i4UjZBHcaZs/ER91zFA0Xv8HUlVO+a2RubB44onmpvA7asf0VexQwr7dPxKw8
+8kpM/Ce5oWAAvBHEJ5ICuPFbwDOstJRBEFbH2uXMroAAeEkT2nA2EB8Ziy6eTGZD
+n4ItxpoeFynkuljzrch0Yo3YGhLZlLqoSPVH+NssBhdr3j453Rb+bInYhpA5+gqf
+sw/62FZPzcGw0+UkIP3v9oGDuWvLfUUq+bhZGs6rSx6+WyH4pu2sTb8/DsFOD9w3
+a6ooerKmkXi1C8wbUZMWPCuNSqGXi87HRHmCTjFrxp/whveo9/uww+ixkUD1CZcY
+N/nZupmWAspP4rcuxxxtIBn11SFuA/NCUQ/jTIJnSD88sL+eTl9B227TJiisx75H
+Hbr/hhqojZjP+RH0S9tr6vISBElpCOxALUiCp16pE8uMXEZWXAnXL9w1pABqsQGr
+D34vGTp/CE/PLb1NKHDP32W1TKvhAtQlJRmX9PJMY86UfzIA2aLv8XtwfuhWfqLS
+tmCkauo50nij7eOANyyQad2YY53hRqZHw8MECeEilpfpMS9o/z22mFgdoJZpgL+o
+vYWXKDiMMsgrY+2mxACtwDleU7YI9kcLsRJ2qrFz1qAFyL6IfhEW6Ay5oI/bsI56
+4uzvCIa0kW+6pxk1gqxL
+=zyz3
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/corosync/metadata.xml b/sys-cluster/corosync/metadata.xml
index ce6b356be267..08d3ba8b7302 100644
--- a/sys-cluster/corosync/metadata.xml
+++ b/sys-cluster/corosync/metadata.xml
@@ -11,7 +11,9 @@
 		<name>Robin Johnson</name>
 	</maintainer>
 	<use>
-		<flag name='infiniband'>Enable Infiniband RDMA transport support</flag>
+		<flag name="infiniband">Enable Infiniband RDMA transport support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">corosync/corosync</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index 1d745a323c60..6a3b7ddea97d 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST crmsh-2.1.1.tar.gz 733302 SHA256 11dea68a2fea9d069ff31a35e4ab2fc29b279dbe1fa0d1958f942830400bdb7e SHA512 556190e4e8da009d5f84f6356eeae2f5a18d8ca19d8c384c01d4d8526f7a20bb9545a08a6abe7cb6d9c33d9ae62ba0ea5df9ff0ae90341a53d9f7b201f5788ae WHIRLPOOL 731339a7309b6351f1227b9b83f35d172bf8cdc4a8cde7884b43c6f0169746ad60932ded43739a6070936ef44fd518f2d1a90a61e82be191e9c6a855fcc24caf
 EBUILD crmsh-2.1.1.ebuild 1306 SHA256 04467b8e94a50b71f2bc0387cdc197c296920e9cee6aaaa5937697f202b6d173 SHA512 af6cb960505a1fe9277eb0119036a403eebf5e16e7eac9511291e443a1923bb65440706c0b0c6a5aea7d6eb3356127dbbdae2c19ca92f468be676096b0f9305e WHIRLPOOL 42944c02f01fb82732bad64193e8b07643d1157385160b656a280c9d033b8d7a14e235bc9b0154a57d87bb0b1d21de818f0186aae87108312aa293f7c730d6aa
 MISC ChangeLog 2310 SHA256 324ae7b394dfda6767233e5d72e761f0d82153fee7e72b899e380bea41c3a9a9 SHA512 95b67693606ee6c42ce636a613d3635b1206322be4a1e6cec134d47afb1df8fb11bed2a8e9dc54ae82dc09204660eb8bd0da362b089df15a60e6454b7bb244cd WHIRLPOOL 2e1c7037c5cbddb157d65a590bc4377b80948b392095625833fa89f419e05c5401e5cb75b3852147edb5cb784ba1516b76ef894f9d96371b9e734d71b358cdb7
-MISC metadata.xml 162 SHA256 ba8ac4b0fbb2acb09677330e980feed7de66b52d6ec4ee0ff9e44cccea58fa7c SHA512 2f5b58b83e2be686d8c7a0151b76ec40b9139b62065464f629b8f27d0e46d0a3e314e85c5d8f376372dd4b66ec8d21570f043a7bbeba3684a40517fa1b04bc37 WHIRLPOOL e9aa5ace065aeac9ec418a0bf1fba7321e970f49b853af8201983aa73563ec8a9ecc6a8177d378b7f122178667501865dab9f16136b09ab7cf08a46faa179d3a
+MISC metadata.xml 242 SHA256 95de493e6ae69d905a0c7834d14c8713bd65f7adb969fb7a01739c160c162c68 SHA512 b96f991d72a90c7f5c5cdf5378adbc900676758e23d1b3de1bf55db44b108ef357a09a29b45753050aa5855373c5c51fd2d17937351e355fa9dd19be30c20962 WHIRLPOOL 110354bed784d467c38fb6f3bc6bdeb2bfeda44f555a645aaab240cabe3a7bb68216f36ba340252360edcec787a3194aee18d8d7cd5d737083a4bc23e0396a62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJXK9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTAIQAMOt2faHbNSjaqqGYpXynFsu
-hXezDsbvwhILEtsbkB7MyR1fn9i2uJ2UKYGrqsL1aVLVp1cy+ThoRbb8bFMZ2pOG
-hpT+Xqu8Gzy9g+o7MfZAy4V9LYU6V09IpX5/veLxDPmQYPyR+5UE0/MutOI4sFGt
-U0JVmhedQAR0yWoDFySi4hge3wouaDKZRqyNWyM4hDgRhCagsanA+w9hoP3wJbnk
-KoRYFtRZe+JgW3O8/+yyHKSa68xJdSeqMiQpuz/3pg6aM0MGcod6Rfk6RxXOreFc
-WBRzliSWUIUcbVGaHns3vh/B2CxaPDfH/N6N1+iyZ563mz21QJui/d1D1jq/NmzZ
-BsrNKTFWznA8/kBCOoYB3Fqtpvx0eW2qDg7ZX0aep8Zw42tudTkciZFbqVE3EDbq
-m9E9i2PB6kRVoZwVO2lk7EoEx5zq+mKTDscWhXqpRkd8KW6CNZDoNe8BRbJSMeDR
-pGsrve4K3/2GnqTcDfk539oLcGpGvcZ97JK+PGy1LmijQ2ZTsNoFhNzA/vZdPWC3
-vmw4MtL0XB6/zdfnr6WdZAl+VxyW2TjDtHb0vsKAwgde6cYAem02jEWORR4IdTq2
-TEL8uJI8Co5WT1OxFMJpFoL/eDVYOWRgbe8QptPof4eSSmNgLADpIbbToxFez7rg
-bWLUrwzAx6IAoS53ixgP
-=mILU
+iQJ8BAEBCgBmBQJVfyfnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBIAP/jwm5fWcODIQVUwHbvZ1rkMQ
+bjBUkmI0YBt5/ED0j0wUeyxOC9InPT8/2Zcyci8GY4zB4T7BH+wWTou9mbHzfTiS
+3SY8Ia7WNICdC7+1FiBlIb5PYh5bIVLX4hZw7JzxGLJRn4i0PSMe5tT/YPgQGxiJ
+O6F9W3U1RwEj9hHo5aXZsj1a+qzc58JEGInTEzzBDntwAgaqcWDAOclZ24TVXBhm
+5GCFG81JZTuAEM5/yrb0Lfzf1Bl49iZPmeoOJ92mmTe5d0CSXMJ4qzb0U+d1pDho
+nCq9vO88f1JflnKoRFs55xTw4dHYsiawmbhDVkUkacMFBQZjSUGvxw6yiosHdkKu
+p9BDxj6etNvbVLiibSoPrVJClkQvydaThUDdaUgzKBj3in8fru29Apk+xM/a8bQD
+2gGF6mx3Br02YWPYNoZ8t7bNH8b/NMWHouj0WIHkCqv0+VvwXKKTU5REH+AQOcjK
+DCj3lHfEFaowLfH7S+3z9JYFhfQjDaU92aND+NM26/wKFTZXfVdKHdaLYwHvd0Cu
+b+N2AISnCUaKOtSg/N32FRm59JndQJZ7CY0F2f8u8qcDUWho5bT4xT6qjFTiJMrR
+/JqVVs2naa5Eexcr9VLTMhDH+5E8BhnXeWKD7SORWYMGicHl3JbiDsjptAOSzY1W
+FY2KRZJxnjHpaw9JNaRu
+=kVKd
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/crmsh/metadata.xml b/sys-cluster/crmsh/metadata.xml
index 081af556e9a2..3aadfb53ff27 100644
--- a/sys-cluster/crmsh/metadata.xml
+++ b/sys-cluster/crmsh/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cluster</herd>
+  <upstream>
+    <remote-id type="github">crmsh/crmsh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/feedbackd-agent/Manifest b/sys-cluster/feedbackd-agent/Manifest
index 25989a327c92..86f253ed96a5 100644
--- a/sys-cluster/feedbackd-agent/Manifest
+++ b/sys-cluster/feedbackd-agent/Manifest
@@ -1,5 +1,27 @@
-AUX feedbackd-agent-0.4-asneeded.patch 1079 RMD160 6410199785b82e3ce93ff982d40c629586291414 SHA1 2d942dad560051d42945d2a05aadcc8db4938299 SHA256 bdca5fc14ea24b15d152ca5a63cf35ee4cc51ef009f6b0e2e11159af9a7afc99
-DIST feedbackd-agent-0.4.tar.gz 69078 RMD160 1cb84abfd86b0fb12a93b99b63bc8c4190b610a9 SHA1 eab7014235139bbc6e7057bebad406e6c79b2515 SHA256 0e1cf74d26387e5ce2591f29b92a19dfcd29b005585d363baa717c03705e49c8
-EBUILD feedbackd-agent-0.4.ebuild 944 RMD160 0deb3d1e826ccaf0481463e1b898c0a0594f5cef SHA1 f9f6f341e46474b6425aca0682c144a1416cee56 SHA256 fea4ceab6dcce452119e4495ff3bbc9a8155a37d5d2a92cee7736cc6cd9af89d
-MISC ChangeLog 1716 RMD160 39e4eb9848ca7d0e3279aeffa241af76d9947b14 SHA1 53420511384e5f95bcd09dd718c9e79e4e554656 SHA256 c80266783478ff31837013c849bda573c2e50d78dca8f8c74c4e0b098f559531
-MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX feedbackd-agent-0.4-asneeded.patch 1079 SHA256 bdca5fc14ea24b15d152ca5a63cf35ee4cc51ef009f6b0e2e11159af9a7afc99 SHA512 957a197678eb6ac99e16d655987e1f5c18a28604c5252f3ff248548f7025aded50891e90cd126b4786d81a79ef6a1de915e2e7f28df2c98e9340cc718241b302 WHIRLPOOL 654121033d14661ea8bfca5659714ec6895e173e04b98aa799529e89b278c6abc5eba5c4e70f4ca6581016f71360ddad85ae379286b3769700314df94570c06c
+DIST feedbackd-agent-0.4.tar.gz 69078 SHA256 0e1cf74d26387e5ce2591f29b92a19dfcd29b005585d363baa717c03705e49c8
+EBUILD feedbackd-agent-0.4.ebuild 944 SHA256 fea4ceab6dcce452119e4495ff3bbc9a8155a37d5d2a92cee7736cc6cd9af89d SHA512 52399ee3daa2544271f3b356d5e2d216d5fc04687b81d369798953e698b2d0e0cd2c03e2888e00ebedec16b5d5b5ddb606ec08c3f9631cee5f966d3101494bbd WHIRLPOOL 044498114bb10cd8541fd3b32178d7697eb2bfbcaa1addb0a59f5eeeff6704c8812e15b61b18bb1529d38c08c02012174f7f7d25a5064df69d4f13bd00e79ce2
+MISC ChangeLog 1716 SHA256 c80266783478ff31837013c849bda573c2e50d78dca8f8c74c4e0b098f559531 SHA512 20f553996402974f7917b63bfbf0e21cb00f1c5c19619b156d03f34a6381b0d61e3090889544af03839abce41700a90ba43918910c68217673be88fd3170e3cc WHIRLPOOL 8664e35edbb617d874ebda2282c57edbcae830240cf7f3358b10e164a676cc55c9dc9568acaf13afcac8f11dd7ad4767e46206666de5dc100fdffd842d2e6464
+MISC metadata.xml 240 SHA256 ef30c05a3ba9f5b63db7f0d44603cd258451ca57604b84c25083bfe31c364591 SHA512 2fca9dda1a650a2ee8471d590febea66e040863ae0c76ced63f0c1d5fa966118ebfc5237d0441f6b695e35f9414305a33c7c9a8e66a802ce5755457871471dec WHIRLPOOL 89c43b3e426c6e973d8cce360db6f5dbae8b1800fe47b606dde7111bb14386a815cfd659fab630e3d8d51445e30cb22e96925f314a77dc35ef8a513b0015d697
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyftXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiScwP/2mW9s9PTHVCIgAPe6kdEwFE
+n9gkXIpo7oYZ87usOflmCAwH2cFyGyK/ROOa5e2lOu8DiHz2ms1Ro4tc34l8T7yC
+jbZxqE51IVGsjHmIIWnkoFZXd3PnMsTMhVL9ZeYg+Bmqfwch85ehE0mbZxZCLVa6
+jX8/Ec+h0mCQsCUnrRr9zAWn3c/Xa6wS+OJY/ce5kioAVI1bSpJdq+woTNaN5XAf
+kOEz9vQJRblN2xICw9UdBuWLUJidoaE0rohw4848IWQ/nFTUxAowz09mNKYlPqHq
+BaFB+Vf4BdY15pEhWK+qg89wnNLE5oky/kr63ZExbvdo2zHH/AXmGfbKyukqyv8y
+eFShfzidGq3yNpxchy7wpGd+YudXu3/ndksezStovEbT7I4zur/plSy/cXJ9JQOa
+mKBk+FihYPNTFtgkODRsRCpysBxleAKwkFNhEC06WO+2+zo2AatdAhICaURl3Edp
+bRwTrMzL2YVaxEuEeeMiL8vyWhoe4PEZbkZesA83jRTTDUwF7GGci3HPwu3N210G
+O7FKuX8btHwNR4xHCTm49xAvuq5VwSFSVPVzS47H/mX8VeyThncRCzLFkHO/jcVl
+eALHweejPPOwkswqQzHG5TbBUukFKmIZ+vBT/K/I1i0H1el4jkWlGjlc9zXew7Hw
+8Si9EJ3heJatkd50YA69
+=MCZP
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/feedbackd-agent/metadata.xml b/sys-cluster/feedbackd-agent/metadata.xml
index 348e6c4de815..dfc0fe502816 100644
--- a/sys-cluster/feedbackd-agent/metadata.xml
+++ b/sys-cluster/feedbackd-agent/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+	<herd>cluster</herd>
+	<upstream>
+		<remote-id type="sourceforge">feedbackd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/feedbackd-master/Manifest b/sys-cluster/feedbackd-master/Manifest
index 19830c9723f3..d7eb73b02c6d 100644
--- a/sys-cluster/feedbackd-master/Manifest
+++ b/sys-cluster/feedbackd-master/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST feedbackd-master-0.4.tar.gz 73715 SHA256 9e8504a8314d99f7b2be95e1f39a5aed9f8f86d4cd21bedfca7af6e7f3d6f401
 EBUILD feedbackd-master-0.4.ebuild 833 SHA256 0cb442d524ebdcb673612d18cd81c456399f30cb623b8938cbd6f4a0a7b05ed9 SHA512 31cd14365d9e35d0c9b8b6ddc38872e3421378526714b7b814208b5b1ecb5f07b9892d59e7ebd9565b1b98bf22adc6bb974853f49e332f535021f49b171131dc WHIRLPOOL a43fb56aec227049272ce320baae490046dd5a2d92d4e2303b435a5d28033263b18c1d4501ca6c7749fe3007e91c776de0395062da7a9f2f9fd3b75305cca0c6
 MISC ChangeLog 1619 SHA256 b5a6a0fc7cfd36645f1cd2eb5afdc0f0cb5e1c0e2d01c1ced910d4dd3bac60bf SHA512 9c969499ed82f4dd0015c65088032f6c1979ce5eb6d007574c480b5bc762bd3c769984762275c77f466099a8e8417d22c51b6a4a60dea9402927a57344e182a2 WHIRLPOOL c634f3c7748d74d9fdd396db3c2224e8f7181f62c8d50150d42d74e7ebc46bb8b3aaea497ea100be8f037035158148576cf9beaf8aa143f7fc957cbdeca5dc57
-MISC metadata.xml 321 SHA256 3d2a9a6d12cb00fc3cfbc6cf82c117ff0f4e8aee7f3b884d7dbe56648636cc8d SHA512 af60022163997c54487913ea9f07308575ef68c376bafdbf50b9d176bdbe66a909ecbc5499f45c78031278457289af89e93902974fecb826d9ae51ee71b9bf58 WHIRLPOOL 7723b2e432d75c9911dd6f669a59058b9d46540ebfb0714930549988ecdddc07761ac4f3235c4d88506b1a146fc9166411c99d2a34942a0b66d0fcf3ba0d9207
+MISC metadata.xml 401 SHA256 f48e9d8815bf39a1a4b95c69c9efe03352a093dc61bb000448ed4e295eacf6e7 SHA512 014cb1df61929a1fad8ea1dcb21c1a7a4bc5cc66849570e66203bbc1ecc0a4d6864f845dc4ed065305cd7dbb4d22f414d2be53293f2df1d70d9bd4ec29fdd6b8 WHIRLPOOL 872fad0afe66c7024e408702ed7455d9a3d652d046f31f4f016da1477a179bb1701dc3494faca7626f371020b9cc94c99a4f44ebe0335c543841b4c6c14c28fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1BoACgkQcaHudmEf86o48wCdGlI+9FPG9GMpKMydzhOmK2la
-AukAnRKq42E/8EwZK0rGwxZboW9oJ752
-=0m9K
+iQJ8BAEBCgBmBQJVfyfzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQlMP/3VJWFyKcemT0Gud5bszY3xr
+hpQ1KWbhugOdIhXySoqFLhVS5w/HiZ+8gU2Krfy1Szh8NuHPRgAufBwCCdGMhVNS
+w04gkOZy0J8ZNMb8Hf+oiHvP3352B3XvGr9nUGre2MghrNiT5V583OjX3Nl/SnXy
+PkD5nb7m/mUR0t0dd2mbAJsNMlXI+xA42YUr/r1aHvID3bXc6k/oZpjSsWPJMRqS
+QdHWZZ9dCw9+qq1GwsgeLkvk4hEOJO3bOQhY244ka6vEjnuZOwLouTuGFBwPCRse
+XtdFZ02qFgHCZT019XSzgeOX/MADzvqNVpJEhQUQP7eEw8WTZdG6jGYFP5KeEVgo
+ToU/CDRUB0BDbkFVPx6MHy16tSXNY8VPij2WOncEvKuBzrqoIncwFiZdSwHJBPrs
+b8fOgmw0ABse1kbjeka0nf8sbue9THb681LlQR68ubjOuwUA1R0RIEVBAyhdMGXv
+MAQEyLnQiNnZdr6UzxI45FTjnrPDSbVLM0hgF/Z888PERDU9uOToy3ENu7gCX3om
+ZNRRkmukh2BFS1AYEwURrP0jU5ku97h1pE3QrKwQCF2gzsxMnvwe4iMSpd7mjFGm
+gnTkm5Kk7R3ubIj79PQBPmvPC9/T2FaeT9kTEEVGoc/9D+jNGB4ns3zAQfDHzw3B
+/GeUoTIUwsOceQjwQvfH
+=BEy0
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/feedbackd-master/metadata.xml b/sys-cluster/feedbackd-master/metadata.xml
index cf51601002be..17c73f3b8f21 100644
--- a/sys-cluster/feedbackd-master/metadata.xml
+++ b/sys-cluster/feedbackd-master/metadata.xml
@@ -2,8 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cluster</herd>
-  
   <longdescription>
     Feedbackd is an add-on to the Linux Virtual Server project (LVS) to provide dynamic feedback of server health.
   </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">feedbackd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 67dd7a8dde16..5736bbb78573 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX disable-tests.patch 2703 SHA256 80da2484a51c7ff6f9a1ccd37481c006d87fb1e0964600a132d6a72fc3eba6fa SHA512 6ae782e9ab346c77be434c285d3bb291cc3056b0180c4b8987ab8356e793999e4efb40b9e516a01f3fe2486fcc63339fc6a6b6ba7ea470b65cf408c1c3098e9b WHIRLPOOL 9e5702fe21e13e91a43b61708c35b491c33a048277d390f86c34e80c22652b6d61fd8fc5058db6a136195cfdb1ae1717f753cfe9ea6c3b889702385f41d1cee4
 AUX galera-strip-machine-cflags.patch 2196 SHA256 068ada21167a0bff9a0c4ab4fffcf14bfae1e1fc2ac3ad2ae228bda54f5525bc SHA512 7c62cca31219b05ef1ada9bf0b6afc82c0e4de1e774ee36d55f11119dfc3e8b816d4c8c07051ba0216e95f174b7564b79d702ad9e148fbca23305b0539cbd6cf WHIRLPOOL 99195107e133ed056f53cce5723b7ee41d936180fa908bfd22e356d55d4f72da08d973fb586dca7175fc3b644ab795eb19edcb5ddda3f31158595a5d00795e45
@@ -11,23 +11,23 @@ DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c136
 EBUILD galera-25.3.10.ebuild 2162 SHA256 dc05e4bee499920a309af850a6cbcda9014e69b757ee38823f2b935f925ca866 SHA512 f253c8e98d796dfd9d7976db6df9dcd8c3766643435e46b2ed918f6ee9fbec691238bc4df895c4da1fd2eaefbd4f468bff63d0d63f4c2960ad4021fa344039e7 WHIRLPOOL 183d705586c9fc0d88ccc4c706c8903ed9850921ed76f8f72f492f433eb3d68c43adb556b7ad382de46423b52e72957bf69b6605bbd1bc3f509b99dba86f19fc
 EBUILD galera-25.3.5.ebuild 1888 SHA256 018411877d8b3c93083787a525c6b0075e8382ed8191135590c0f376443121a9 SHA512 b33740fda982d9627f5fc3fe7a4962e7ae65a3354b528b1f134e9ceab89485f91847e2b36665950f873ce45aeaf95b95ca9114b9e04fa5b51368915703913f1f WHIRLPOOL 84fae8a7347135d70d660edd2f39cc1b81b16e17ffe0f5b07e015df5268a37854d1694d3695ac93b2aa6e0753f502d6d304e7443e9de257efe1711ef060362e8
 MISC ChangeLog 1453 SHA256 9fa3b9879d179c2b71d4e37b53c28e1fc0eb9c6ae04d0209cffb5b02ec962b0d SHA512 b9e92604a17f0db373c5fd569cef83bb2ef0f1e09536fa4c13ae24d7cccf09b78633fe11207f106247cf522a1dc8dcef40e26c733098afdab797ebe002bba3ab WHIRLPOOL b44624cbb06f4fa085bf653aaa18467ba042180559b91c35a3e7db133f7fb35d9453856d89930e538fc16ec3429f27795e86a6b45d620db47d03a79edb5f7557
-MISC metadata.xml 287 SHA256 a721bbdc105190e59b893dd6045954be5335317a3cb3ee04ade10ae84e91ed66 SHA512 b948f84f81ab15a82c332c9daecd73da57f7029c09a1779475dbd08667f90932ffb05507756d2daa7035dd949979f0233ddc15a68ccce01f05ad4fc57028d582 WHIRLPOOL 4a7f7eef9bf626325e0690d772b16e8816db42cac95f4df19e6ccde55beb36671246ea9e8878b904ce93b336f2d235a56d1df795bd059161694ac67f86193da7
+MISC metadata.xml 373 SHA256 16141ba1aace97ee92908890f7f1eb65fc8a91cbbe78ac55f38b66a52e79fe28 SHA512 570de861727880dbc0dbe94146786ea40fe16c7e69f2bcef8ccc017d3b0e975511df8ec77874be1feb7bbc882f8a242eea4894b20b2086099ccd31696b16717d WHIRLPOOL c336f97d8ce58a83a96fca6d00824c9a497be87a9f01bec542a6ecb0fb91abd5e1487a4ffa5a7dee478f5083fe1390ffce94ec88152aca4d9af2dea1271f6046
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVZfKDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2qKgQAMMFWKVUgWvy3UxIFGJ0Hwbp
-FIoPn/tmAguZzXvlXFvO8wwtOLPbtJ8g2/2zZMkLd4eEh7pSt5X+zg0uCy5fnXTT
-9jBX6rgJKzHk8PcwNRpgcS4cziZALITw2ON8255Dte/78Fu/AUxV2pedJ1BXf4hK
-9EjMSm0wr8V93gSWkese2Hch/ADRvjuPN+mcyNPAVtUpHePzpR5o4mQhP9HiiylL
-lKjVhUdPHLW2jTRKLFKNd27l0ByVjEpuH1WaVuB1coUhPCYxhz8tOKtgmivyBuJn
-ZtBkGo/lWO7aFGpcb3K+j4iHLgV1N1EyC78VwzEJM0pblvrjfXmX24ldZ1h+Yj40
-aC1X8epiFpfC1DMsyjbYpBpH0s0NE6urn5UfXQL9IHdioVnfWdWB7LG4M3F1ItgF
-E/rNX+x9Q9uCtyDB1cM+5coVjvGWSo4KXp9eXY9sLaUji8ulPOFzG/y2i4jc2ewB
-CEqetWUuzBWQF3a72XZpFG2w/3nYHKyOOUeA2wrOOPBi85psDnSYSz2HX5DtXIcc
-9JrFipEvdumaUId4L+NUrhwdUaT8VmWI4Xu6hEyY/WlwnjrM01WZ6Z3cUe2n4i3Y
-l7D+m1+EwpzbctBdyDERIoVY1tj/ogE4hjsJ+SU8Bo17Uizbb6OoWpd42cKAoYgD
-UATZGnmDc/iSbG3Pzr+u
-=xHDf
+iQJ8BAEBCgBmBQJVfyf7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEkQP/jYLMVRXuqeizEjAULsr5RSQ
+In4xABnB+q7Kez/RoH2EBuY7GsfZS3PK6AE/nt6Cf6L0nprLx+DOD8jV+DF7CLfD
+C105aG3Py31t2x33nAuJoC7patumcMNNiwTlao9ikm2fhMM7YrqIqDWeDfkLefaf
+YA+rkzy/vWox/PxNy4Rh5yWCy3kkvluVlDhw2BqwC5bDlQHqWAU+azILRs/KI3Tb
+RJSSXuFy9x1mtbt1G/jZixldn8i3BeNxXAlZfo8akQo9penfOd+9PXfQwNVrkCNY
+/s7x0g0bQTXV3F7I7z0Gtk4GbvVnb0Voo3JOV0GUDZcb92uIgD4/8qpiubmrNBly
+Ixd+sn6JL1614am7IWB2Y3srqt7yMJt1M1TEv3opEkjNdAzP7OtnXIB9QcnomeSG
+/qr7B1p/89wjEXZUAgXrtkRICIcYYlQWzxzbdlnFzUzm9K6HfLNqYkf7zNlcx9xN
+7/TXMp+A85k1+tnivUBkwN1TJFXQTA+j/U9mwfnR7kcsZDnTwpPFLDx0f/X4kNVi
+ev15fBHEjAXZkk+HLA8QQKwSTBtUBYd3d8B77zp5cjnLAwNg72Wu+RnJ11E0uT/6
+tF8RZbdBX3mYjx4umDsW1QRJ/DyexTltICWHIh13mYhop0XNKPXPniiTPDcEmDmj
+/hI7mjWBe//XBWPj/HBr
+=NYsq
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/galera/metadata.xml b/sys-cluster/galera/metadata.xml
index 6c8e5852a141..b4af621f040a 100644
--- a/sys-cluster/galera/metadata.xml
+++ b/sys-cluster/galera/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-<use>
-  <flag name='garbd'>Install Galera Arbitrator - a stateless daemon which acts as a lightweight group member</flag>
-</use>
+  <herd>mysql</herd>
+  <use>
+    <flag name="garbd">Install Galera Arbitrator - a stateless daemon which acts as a lightweight group member</flag>
+  </use>
+  <upstream>
+    <remote-id type="launchpad">galera</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/ganglia-web/Manifest b/sys-cluster/ganglia-web/Manifest
index 39804ebb5fc0..57409afab428 100644
--- a/sys-cluster/ganglia-web/Manifest
+++ b/sys-cluster/ganglia-web/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX CVE-2013-6395-fix-xss.patch 922 SHA256 42cb7108991ef3061f9a34710b29fda75bc4635bcc6f824fb1115fd4f0277159 SHA512 6ea9694203f5402eb84bf412db6f8c687872a6ab0bea1a0645d92e7852b4a8542f48420442e451042c032d43056ba07d23fd09344d45533017ebdebf111ec556 WHIRLPOOL 785701d303c8649a1d7ac830272f703e7a26f10b0a5d840898f8a36a6d4d1075d1f442f4455d266d978574bc81424ef772e529bc7f5c0a8232f59fcf676f6b05
 DIST ganglia-web-3.5.10.tar.gz 1431977 SHA256 cd6948d4a08a65c3f4f042fa22f04948e089b2b1f970ba1f9f3d91c31bc0ca02 SHA512 9f035c27e7afe944d854a701fc70869940c9cacef5b58b92493241a817f4f5b80103191ab6e9c062ade4c92288fdd25097c95f6d57f409d4840cab2c5ee66efd WHIRLPOOL 6a9dad89961f1cb6c7e63a20f8b79eff2c5758795fe4eac89c9c6ea02f3aef0ade7b4b1851c78c0a0f901825883c0bc08419379b81977f532aa56db04a2564c9
@@ -7,11 +7,23 @@ DIST ganglia-web-3.5.8.tar.gz 1431184 SHA256 c1728c6a073a9d4dd66e10a77b0ab34ccf5
 EBUILD ganglia-web-3.5.10-r1.ebuild 1316 SHA256 0cc19147502dbec9b8ef2e52b88944c55bd440aed2a8c246b95b968ac7f1304a SHA512 8acfeae364ddab4ae0204450f00cb290dd83ff3e66c10f09c3e87dc886749a772f1a711e5b7f5f4fd3d8cad126fc6947760a61a48fd7dd694b675c1cad4eed92 WHIRLPOOL d057d7c2d74fa3cd2018e89baa3ce5b1a1706cf598eb2322ccafed20d48303d5e7789975c617915f0f1571c0ed5c1adbffa3b9a68825d8143d931019bf4e39b7
 EBUILD ganglia-web-3.5.8-r1.ebuild 1306 SHA256 c47ebcaa31dce960b3c7fa5223be3116d5e237205ff10b605fc07609e9a16cee SHA512 16f00e56b4b830845cd9854daa7e18147d7222c8128f84e8de93b09ddf776930b38dcff85630dcdc78734953c1061feeb9109955d7056d1ed26d2107fc5ced2b WHIRLPOOL 2ceb477381defe6a33630cb6c7a808c8c108d86d08040ff8484a1a03aaff5c21999b76b52144579e7caae384cb61bad27e03dc766605679a94f19eb21cd2be68
 MISC ChangeLog 2664 SHA256 2eb54d9b47760e4ab81f048809b86796ff775951be8af5243762e14412a9d1e3 SHA512 82cd3ab616fb9c5e5b77199693722f99e481a2cabb1df757148853ce58123c53ad2be7b4f83def6fa89e3ece57e7377cc8ee161b739181b092ea47e13e6cf4e7 WHIRLPOOL d251c50847d8c4fa38a30940c9cc2da081f610dbe846b3e2ecad8e1402c2bd839e0c3772198fb286e1e68c684d346ce8445a075254f06d7393dae0588e593c79
-MISC metadata.xml 228 SHA256 867e2c9cf08802c1ae7c8a1e84fafa792a531488dc15c7e8efd5596b33465d30 SHA512 ced4d7a8792403fe33b4500e75af897dfda1997dbea848fb4c699555e8d1fcad08f54b7c446ecc35306d025edde55d151d89c5e6ba7dba2244854637d4248d28 WHIRLPOOL d3195ff37ccca6b73e2b576c08e70cb057f222608b072b4ce5852522447cd9659d3b86a94a10b97635e82194b41d0f60715ac81cb336d8f4919b914738b1f3ef
+MISC metadata.xml 305 SHA256 6496ec21d4fb0ad15237084e8c152d2cb47048bec79844492a86e7e82cfdf76f SHA512 fe8474ebcc51074fbd674b9a51879c2025c014e9d25df2be3b92c354c5d3d69e1f3244a5e49eb1b739047dee71f11c4e07992293796b0d41fa8cba9347c71d59 WHIRLPOOL 64832c9eb951ed09dc2cc1b64ab9f4799a9ba07695064894c7a7f4b51d72815cc2c1d1295a502dbc57356fe96f0a7341d20a6fd3db185788c41057fb6b5e8697
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlNOmakACgkQ4MrvBE1wQ8mdnwCfQEQjQYwK6iHYMbksX7DKyWiw
-8IkAnjWrRCRAF6WPPAfUKpEJVWautRxY
-=HWVv
+iQJ7BAEBCgBmBQJVfygQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZZQP924pSyYLOFNG9BM97f6DVSWr
+0101kOkr6X47kKaLo6eq0YkSbv1lA4FGe3YWAPdGpVj1S4aLQ8VhL3Qb+p2yFspC
+xl/UZ2jnVIbzmDYYD+uPipR0WKsE5ttKhcfDIWwBZ8dZjHkgn0nN11wlZKUIafRX
+vUlQC4jPQ5MBI6Gf+lxWTWzKx2RW5XdcH5LygnBXx9xacMyb24YUKqVzBSaxxtaR
+uR3c3HTe9uqNR9CcfuIsB+/2jTGz00fB7b3YDTrMzdLOOYwB3a4ljmvbfToDxNgy
+wDvtnP1Pl8p/wAQcyex+ZfhBUX+Oz5DTG7TsTLVtTYJj7j/9gu0Z1MTxdYazyYRB
+sR7P+OgJUQgg2SK7Y8Y7DIsXB+7NJtZe2SFyBS7P6r2nyDnndS8XI3JbmInbGzrA
+nw+gYlfHyC11s+9mFSdT794rzy5uF8Qq3PFl5Mk7Ab0S6wsXQLKBsxh3TzZycR0l
+iKw3/LlU3a2CZ+GTZcMsRMc8WNki8O4EutcURq0H6/JiZs6rQtl1vOLn4FsGaKo7
+Fdj4MHjFvrAcgogfQp+VifxphTz3V+x2Qx4bitC1W7SkPNxKIj+Opd/ir+k1yOlp
+Szj3MfTPG7OclEI1p3eOD3Mg1b8HVbSIFur7ESOagik9oVdGAglJIvh2PdpEx6l/
+xzNUF1OOaRKqzQv+xs0=
+=9435
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia-web/metadata.xml b/sys-cluster/ganglia-web/metadata.xml
index 3d994f9dbeae..e6685629582f 100644
--- a/sys-cluster/ganglia-web/metadata.xml
+++ b/sys-cluster/ganglia-web/metadata.xml
@@ -5,4 +5,7 @@
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ganglia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index c29ecbfd4623..21aeee9720c9 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ganglia-3.1.1-ctype-c99.patch 437 SHA256 385397d0e6b3810f19fe420fbb7db70ab9978089fe8388eed2ea6a8d8deafcf8 SHA512 ef1469f669b59ff3ef7841f288de9245fd50b1d7c24e9487a89d1efc4de7b2d1fa6e125b32861a28cabd805279c4ad4a7a949f97b10cd2945ff93d7ae25250a7 WHIRLPOOL 7d2225e0cbcd6adefd6b7546bbefa2ffce93a96c100692986ed5f26cf5979051fc6008938f773868661efa2c7311d92b66cc3babc1c78f2428e5707652fdddee
 AUX ganglia-3.1.1-multidisk-group.patch 482 SHA256 fd4f3a3798cc99cd0bd93eb238d6c7f381b65c8329852b5a9fa07005c85a6639 SHA512 2e633a80a4f3c611c47abac98fee52ce6923f931ccaec3615cda115eeb16df3721063afd06b324a7b112ddee950da0ae53b411b96f325d8d9014d6e49c62162c WHIRLPOOL 997238e1ced03a3678a8dec90b92b75e65046142c1ad7b4ae1834430a2c1d2db5a9b80b9c584ff54e4e48609fa6b053ad306aeffab8b87adac12defb1fc8d06f
@@ -14,11 +14,23 @@ EBUILD ganglia-3.5.0-r1.ebuild 2295 SHA256 7414e617f6c08bb406f2bd079dcee99a8ceb5
 EBUILD ganglia-3.5.0.ebuild 2228 SHA256 db358829e6486f8e30f5ab30569a462741f832cd6663e7050a66d6e7465c3e63 SHA512 a04ee0c71c7178863150ccaa81d63d225338fdddcac086c78d5c1dce73dd32d733bec28384327835c132a678fb705aa6712d553c38d91a3c868f988969b9fd3c WHIRLPOOL 6cffc2386360ffec5541791665168fb2efd92a67086bee828a1396ef492fb803d5227365b63cc92cc6273df8207a7d18e3bddc2aa8e4837b1dc630e99dabced9
 EBUILD ganglia-3.6.0-r1.ebuild 2430 SHA256 fcadef7551909c52a5f8e1c92334adf15c76f14e4e25159c000273a6e77fefac SHA512 9a0bed743ceb20ef102d27f9cafe077d4780b6802d59303643efaa0fa574e217a6aa1ff3117882baac37afc0ab7e88374847cf2767f9219b2a73ef74fe6baf23 WHIRLPOOL eb8fa8e5f0c49baabeffc8a645c0efa195f4f63a117efc9c22fb55c6c9242ea6d89ff4eedfccae0730b5a0bc24877c7834c9d2c2dfbc2061d52c0d3586f50f62
 MISC ChangeLog 11726 SHA256 6b231f122587936042da8112179f339ede3267e85dba2d2cb546211dc3fe1d9a SHA512 40be72a28a5c77a89212120ccdec8d352350f3b47b47338a2f572639b146f65c1e9cc9e689e208598337d9f3f8b3922d60c801153c6633c8c9f9ce919a1f7d05 WHIRLPOOL aefb5417dfac52f99ad6be4830b3a5e93244e67e633e62a82db5bbabd3d3b7c010121bd017d9db66d31b09843e9e40985ec098d34a7bc7b6a30f766d9117a277
-MISC metadata.xml 228 SHA256 867e2c9cf08802c1ae7c8a1e84fafa792a531488dc15c7e8efd5596b33465d30 SHA512 ced4d7a8792403fe33b4500e75af897dfda1997dbea848fb4c699555e8d1fcad08f54b7c446ecc35306d025edde55d151d89c5e6ba7dba2244854637d4248d28 WHIRLPOOL d3195ff37ccca6b73e2b576c08e70cb057f222608b072b4ce5852522447cd9659d3b86a94a10b97635e82194b41d0f60715ac81cb336d8f4919b914738b1f3ef
+MISC metadata.xml 305 SHA256 6496ec21d4fb0ad15237084e8c152d2cb47048bec79844492a86e7e82cfdf76f SHA512 fe8474ebcc51074fbd674b9a51879c2025c014e9d25df2be3b92c354c5d3d69e1f3244a5e49eb1b739047dee71f11c4e07992293796b0d41fa8cba9347c71d59 WHIRLPOOL 64832c9eb951ed09dc2cc1b64ab9f4799a9ba07695064894c7a7f4b51d72815cc2c1d1295a502dbc57356fe96f0a7341d20a6fd3db185788c41057fb6b5e8697
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSi4vMACgkQ4MrvBE1wQ8kFZgCfUtPZS21KdiihUBCtAkADXzPV
-//0AoKpIjjjir0WHDZ0mRx1c83gxskX/
-=5S/E
+iQJ8BAEBCgBmBQJVfygGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWVkP/1UMjtSGrqhuHQWMneGd6eN2
+ooUg8fgJUVE8SoyosX/n+eRSputK2xx2uzhQvn00ncb1C3Bvr8l49MtY2ciOCtFg
+B8X8ZHxwp22+fx6WOqqXlTiMM2PS9IEKCk57nQfJM0fKKQHTSmDbFnWgXaaWRDRr
+Fkr0nsH+HJdsQul3Y6gwbMfsuAVmAGUJiiPyDQrIQhpXBDu4xhCzpb6e/zTnnkOL
+BeI/blMbXTkJiwJyhiZkBP8ZHk+6J5wKpJPF5AUVGrT7L/xAqaukArWAeyHHkcm5
+JTOG/HZFS5mfOLay3cpuVerAcQtCjZcl7ywlXUJgO/6S8WJYa3hbCsrTRiUa07cJ
+TIrKKplsJ4h7szORN2PUISpY9qb+iQDSLaY7KzVipq1JsN0xXRBRFYKt4caa46Hx
+xwPGQjZy7hhVZLAV1jP+k1ntZLd46guWrpMZjj8P+aCbh7DDekRr+fm2HCKIhgpA
+w3EXT3QIkxtWGw7zmGUJ/3stYEaWKGsjn7ZQ3zcM/puidKW+71ThR6HBcUscfosI
+8Eq1piTdh3G/iQdEeq9lPrOBninx4chhOGVdyZBNGEkji5UrXhfobsgfOxEaHCIW
+ZbFd6wn1Hs8KVy/OcwJJuut/sB9RBtp4wvGDr4+FrZUjakFdb323ejb4q8NkDM+Z
+Zdp5SZ/NqQyiynBUfC5I
+=p9lk
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/metadata.xml b/sys-cluster/ganglia/metadata.xml
index 3d994f9dbeae..e6685629582f 100644
--- a/sys-cluster/ganglia/metadata.xml
+++ b/sys-cluster/ganglia/metadata.xml
@@ -5,4 +5,7 @@
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ganglia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/gearmand/Manifest b/sys-cluster/gearmand/Manifest
index e62f639bb823..a207ecf8d41d 100644
--- a/sys-cluster/gearmand/Manifest
+++ b/sys-cluster/gearmand/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gearmand.conf.d 1542 SHA256 a99bd1672091da3d4c2776225dacc497a5a9fb36ff8b34a464cd984cf584a29e SHA512 850cf6bd13475d30879bd49c9650e1f01e52c1bd8ed580d6dda09c83f74e424a17c04e9d8203c2b3555a69cf5cf3f00ede3fbcc7d005f90844e4494041c9168f WHIRLPOOL 1a07ee704aa646cfbeeb0cd590e494c86090077668288e0c217ddc6e21041987db498607f682b1de44a638f7e80201c95f318aaaf44b0704580b8b9fe6b45f87
 AUX gearmand.init.d.2 3205 SHA256 06126059defe8b17abe92b25d2b906b7860dcec8e32b75c6f124f336f12a35af SHA512 6aa87d1cfd29028b4ce7bead1142a2834fb0df7e389223ff57afc5a30dd446b0bd9c0e5b56e7fd5df4286c12fdb60d58331632abbd0bcf796c8be4ddba20245f WHIRLPOOL d7c1bf8cf2a6ec9c356da9f3f6c4419797670934af3399d5d90fbcfd2765ec6b8d1a3b27710d8448cb12c548211d427a5402f54bfb4ea0f51ddfe6d8f11c0508
 DIST gearmand-0.34.tar.gz 842579 SHA256 968d701233f2376060274a69fa7c1b8e99f34b454a401805a2bd62067c13bca1 SHA512 8263cd19337f56cb692209efb4867b54954081a907c109b4828c1a7dfd8e1dec803f9c06e0f09e1ec6cc4271299bf77bcd5069b765647b31559480b4e7e756ba WHIRLPOOL 19e3c8b6e5f5c4edb15413901fb9c250a3d85a4ad0f9a13a7e3165732733c6e8e1072be593ba0820cd34e837e83638464b079dd9c840ffb336d67aee13a6bd86
 EBUILD gearmand-0.34-r1.ebuild 2413 SHA256 f470e17c09436e6455b8eaa953516e543543460539181b1268e6059e529042a1 SHA512 762277b4380c3c9ce5937ccd0465368dff5890a3e1c71d6bcd110f0cd44110497cebdd36f6a57f312eecd9b1ba731547d1b37278577f5c0ca60b53615af6059b WHIRLPOOL ee5b4d0b49f95af6617fecc583e2c55a9883ebaec1cd52c901bcc22fbfeca3356862520c78c3fe035e00d7651edc7b5ebb197b229abf90b718002174433d4d09
 MISC ChangeLog 4641 SHA256 9694e863de408970bef7561099c4ab2b11c3b04bad9b56dba25409f90f2eb606 SHA512 5c55b6cacad1db3879a857c0409b493f0d335d150ba333de69510038084a3b195ea6c36da3e594e9b93ed7ef0d05116e17601f3a611d71f76f0bbda0cd1b1293 WHIRLPOOL 2fd708c5797491ed1ace35f5bca86777e409710c092d14b23ddef76544a20b243e8b362bf7205933b51462cd49da788340ce7d8c574041c0554e6ac9b5f5df46
-MISC metadata.xml 813 SHA256 ec292bbc60580866ee4fd18daa5b897d8d59efe518205b55e3dd50085e47b22b SHA512 0a7a4717b4d955692fbc5b777dad8f97f0cf89797137515f33eaee79d740db9acf2604428fe57e5352442553b3b3d5b1e171c540902db8dbf2634cd82499f05e WHIRLPOOL d62ae5bcf8ff9ea76f35d89c89381c53bef602904bf48026d18e76ad51056142f9c3656bc4ed06c09d90a37b582ae01d32f80b6bac5ac14913ebc67a75636b55
+MISC metadata.xml 890 SHA256 8b94c6b40087181f19696263e08a67738969a5833eaad698d2ca68204540d263 SHA512 706e1edc5a1f258bc36ac4dd57334a0a59495167cd104b7fc2b2d13cb0a6675cef25b7afadd72bb51b30ec677ac28e58598696ad2ddd4575df1d9cd2f4d5a2f1 WHIRLPOOL d9bf07a5afc6627e21aab60b01114f922b1c33425cd5c15dfd2e0daa37fb9677e6c0fa905c00b05c07420c36cdce0bd0130a66663a7551efe8cb921f034b9e30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlSgNnQACgkQVxOqA9G7/aA5LwEAn8aqxSus6FetJqbjFbI8A/Nm
-jSTUEI7S1KkYlrKKoAsA/3cft2LFeL+wJsFkfJPD0ciKvVO5uLIeiaQcC0MXbMmn
-=VSKk
+iQJ8BAEBCgBmBQJVfygYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiSZQQAIic2P3yfkYe/g44HG+2Q9Ou
+eVxMQE+6IqSuhct27p2P6Vzn3u7dm9ldgtyVPKwT3IqYZkyf15xqziDeGUD9qdl3
+1i4At5NDY5yl2FvoU86/pL5fKkJHn/c+J2tmX3GRXkxnTHvya/BANXKUlYEvNurn
+QBXCzV0depytvgNAyrFz9jNvVLAQtc/n1PVdssB4HO5xvaRjm9JnNnb3aMEB2yTD
+so1zCyL0F696FG+My1k8S4yp3Bq850Z0oA6skj3BjJg1mf80kiTaUTiysQbDQFYB
+zk28mZjBqjBSAzCbIfPb6fugcVYnIH8zpS483cPuZ9u+r72D3xKlVJwWGq5XqwwV
+WWV7XqaHNpa9yVt6AHveQJffX/sWWI8MS6yq6PGEAFEfJ3iAPP8bkAnbB8Sgy/HN
+w4csqJYJH1J1Zaf0gDkudm+HiVfwxiJzVwuF1VzGTHR1tTi1cqCd1L3HmlhIuqpX
+hsGKGN/W76D7htR/8IoEfHBtDpGcPE9a+Kbh2QUKKv6smchn6xgQ+fa2uIyu1Qv5
+isSTKrFRJjeF5cIVfM6+KQojzOXnpr5rVed8ScAgmUJ8c1VjeWFDWsqqVrxbVOHQ
+npAU7uW0h7IkXBK8sylpCUfwq2Oi4ADcgP9MVw162gwaqDjtmyRMsWDXbb6MBeip
+V5F51d9yh30mR93A9HK0
+=wxyA
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/gearmand/metadata.xml b/sys-cluster/gearmand/metadata.xml
index 14379cb604e4..9efee3599098 100644
--- a/sys-cluster/gearmand/metadata.xml
+++ b/sys-cluster/gearmand/metadata.xml
@@ -9,13 +9,11 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
-
   <use>
     <flag name="memcache">
       Support memcache daemon (via <pkg>dev-libs/libmemcached</pkg>)
       for the queue storage.
     </flag>
-
     <flag name="drizzle">
       Support <pkg>dev-db/libdrizzle</pkg> for the queue storage. This
       also adds support for MySQL storage.
@@ -23,6 +21,8 @@
     <flag name="tokyocabinet">
       Support <pkg>dev-db/tokyocabinet</pkg> for the queue storage.
     </flag>
-
   </use>
+  <upstream>
+    <remote-id type="launchpad">gearmand</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 5bd8b6f7ab19..dbaa30e0170e 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX hpx-0.9.8-cmake_dir.patch 782 SHA256 bb442661be8fca955c09de44073d49d8e89d603f8169600009fd77146a3294f9 SHA512 93fadaf1a8e302f8433c35ebbe4f75af6db21136d64a88574f56122f7204a387e6a0fc9a3fcde21cd8897364ecea203223a365fc84e2e725e8436b77a8fec9d9 WHIRLPOOL fbdcad3ee78f8153519d64d5fc2b05c451dbe4bd45c34dcb2b0502accc5743d13fdc9d42e797204e7001733126056a3699381d314d3d049569cd3d862691d6dd
 AUX hpx-0.9.8-install-path.patch 2952 SHA256 c8bc7ed3a3023b6a278d7540009cd9b837085b6a0995b444f039863e8f008043 SHA512 94273cbd42291fe8dcefe76f8e663997632c8dfc729ceac9c9e6a13b1168334788fe4f2e8c0c20b37d3d5ab339db2b44ba2a6c3fee656cc3981f26d79503f606 WHIRLPOOL c4c539b337f43f09a95f69ea123d74db425a84ae81a927d4d8d5e04830cba36a8a2bf237bfbdee4b2f90f3eec2053e9cd50f9c91de898e710deeccecc6323d2e
@@ -11,15 +11,23 @@ EBUILD hpx-0.9.10.ebuild 1926 SHA256 c5b63184c4a63a420bbe2a4ed67fc1cc9a2587e52e9
 EBUILD hpx-0.9.8.ebuild 2090 SHA256 1e10d76bde04b6c53eaff356639eb56b9b3bccf81f5b151a702afd50bd84a90e SHA512 344df21fd03baed5236be1d50ba708808e43e7b3310a4119cbbf01eaa750f4ac2149160d6c4b815c25775afd6cec9ba2cb724cf683994772380d2f84cbe83b71 WHIRLPOOL a995e35b0a54ea62d356b2b4a8d914131801f08657fa887885788c61e1aadb5afa2057d9093cb18577f1e49d54a1ac117eeb46962b7eecae0be8c7c8e3075cb5
 EBUILD hpx-0.9.9.ebuild 1994 SHA256 d2560cb501772c249ee15df779aedde5de2d6e373a3b8fd492efd6b5c02ad925 SHA512 50fb38138e97097d79d30fbb5b9866e6af7c0c722e17bd5e0497de1fda7760d7f3f7d3fc45d538c220a28ac7557cf2e419ef626c3c024a3ef6e2d8769e596ceb WHIRLPOOL 3580f83794de550ecb04389a8d3c5d39903108ad6107bfc725f278b8430436a8bf7a3f5135c1d24014066ca3f5576202653d1ac856e97482a5be1dceb92c50aa
 MISC ChangeLog 995 SHA256 b6fdb7fe62ccf172be14b87d40e8e79980f889527303947fe8c21c31a0bf9bcd SHA512 8650f90a73b3200c24c517b6f0fcf2d1866b22b5ad2ac9d6600e420579d57c4db82c4283a617e9d80c0c4e72ac64d47f8268cd2e53d60d4700890bd9ebc49f9d WHIRLPOOL 359ca8a637981c47686c968554aa58b6ea965367442cc40e15fda79b520522474dfb45e97db8049908501a700aab340a83654a96f23340aae1f2f95959c7661f
-MISC metadata.xml 983 SHA256 d02d8e4f5427067f5e132cd085da5baf96905e4a06b0d8ea84c95769b89065b8 SHA512 68d7d83ca092d51ffb22fc8633af8df1a82ab7b052fbba4f939777dd81b225d8991616890fb9585c1044b406dac05292030d049ddc62b38587d187a23fa08dff WHIRLPOOL 723e5bc2e99e258f9b9b92bda106fd2ad7c33221d98228142630df214fb220a07dece447389fc6ac0f1b368d812fe661c1cf58ec310af803e735e3da0a41b8c9
+MISC metadata.xml 1089 SHA256 7c80ef2a47b8407407fdf45ee3a22b9b3e1228b176c99eae7feec35ee24f7622 SHA512 4861b35637e9fcda00bd57368107fede8242f28021ac54b1022d414c1f1521c5c0e8b4c6701356ef3087ec03c24970d65ac49b5ae8e498f0abe1cabf656393b7 WHIRLPOOL 6b6cee0437e6b316d1a95d6e7da0eb3c3e62c2eb2fa3491a49ff57376ad2d2a30d76a35da8d432d2f235916730c22142122c566a1a374ff565b9d27620121d5e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVMp9HAAoJEOeBhlrCAAWGo0IH/iikHLzXJ7WFkAIBeS2AkD0R
-0qdTVh3QJ/1yIm0vXQhjkLK1BU1aicahRidmlgBClXY7y39KkK9Vo8SNhKfTl2ev
-XKQkv+Z2oX+78M03jsSbY1FiiF5CITcCrDnsd9F8rgcj1U5v9F3E6MGphU4Ov13q
-rI0uwyiYS73W2WGAW0MVNUqv/XBnGbIzVpLvv32CTpc5BHpYnQxnrFjO1xxVZRtu
-/gXB5EOK4cZDUeTLkFHVSFVWzUNTPvVFNXCA8k9S2Iut0KY+o6qLxi8PdrC+O5li
-qdpkPL4J93RFSkX3eYSl1MxY+mStLOvhILkA11dIDfTndG+mhgdDlzv7rS7bN10=
-=FRmf
+iQJ8BAEBCgBmBQJVfyghXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixv4QAJ7QkFtDqt//KX0d5XL1Bjwv
+k0tQPIoFob9FFowkyp+ilvJaYutxPNu3Nj4oO3I2vbS0L4g7O9MXkA1qBavjUssG
+BvN9v3F9KJMopr0ncWcCvoCXa8Mu52vzwskrVbwFUnmJG8ka3tXn69pLqZ63smty
+4qBhoZC37pws33VEHROIecUeNsQ6H9MJEZUdzI1Z0+Drx+pOzwFle9uzMgTXDuuM
+90RCFiq86DqjAkDKccFynpToe9HMXkcroZoKUfu9HDY9s7SSZvnykm8RVNjJ0YkP
+fNRj/tAuVHeZQXeNlZFfc7bFtTw//SLu0C+69R1itbBctW/GHnSPepcRfVXM+9n/
+EZJPvodJNmL6Y1FftLrZrPSjptjrDgmDO60laF2ZI9Wik84AqrylXWQTVSCm1SL7
+6Bp8ByZXySJmZsL2w8EtFRp98TVvlJoHexaqvVNoV2/fiPlQqhUDhlMJFMUT7Wzv
+BBhhnjsdT2/8IHV9JadAmBll8lnorpKtSFf982hJR3z8OCpeAAk4Uh6tWRTrOIvQ
+lkJAl5BhqV3VJB67XR8h0H/NIjYf2rNmnLmKyRHEpWV7RSJTvTfYi7JbZjf9ozXp
+FZYC8jE/2RAewlmmMtlDwoPXB9CAYm1bHTn0rc8ZzjONtXqundLF9Jyh7SClB5IC
+FqdqgNGo6+oNJe7MCIEW
+=NHSr
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
index 5d165f4a00ab..ef651df75ce7 100644
--- a/sys-cluster/hpx/metadata.xml
+++ b/sys-cluster/hpx/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<longdescription>
+  <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,
@@ -10,15 +10,18 @@
   currently, Linux based systems, such as SMP nodes and conventional
   clusters.
 </longdescription>
-<maintainer>
-  <email>slis@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
-  <flag name="perftools">Use <pkg>dev-util/google-perftools</pkg> for
+  <maintainer>
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
+    <flag name="perftools">Use <pkg>dev-util/google-perftools</pkg> for
   memory allocation</flag>
-  <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> for memory
+    <flag name="tbb">Use <pkg>dev-cpp/tbb</pkg> for memory
   allocation</flag>
-  <flag name="papi">Use <pkg>dev-libs/papi</pkg> for NaCl</flag>
-</use>
+    <flag name="papi">Use <pkg>dev-libs/papi</pkg> for NaCl</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">STEllAR-GROUP/hpx</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/libcircle/Manifest b/sys-cluster/libcircle/Manifest
index 0d0e209e637a..21d2582023bd 100644
--- a/sys-cluster/libcircle/Manifest
+++ b/sys-cluster/libcircle/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST libcircle-0.2.0_rc1.tar.gz 351901 SHA256 59ed75c0bdf2b24f96fbc0230848a5aab57d4eab5a68895489d59a7f68ddd2ee SHA512 1ce07ae012c281fe3e6fbae29bf48e1079768ed5f92f9375c3be02880bed1b1feee6630b31560d7129f76640990e94da1753f55b11a0a8977adaaf9e51144044 WHIRLPOOL 984713d28ee80f686daea7d419a1135360bcda542f904a1aa4ea0ef03b87482e60c2c0858a9e6fd85d7bde1ef557bd61c717ba924f942dfd82d7cbeb9a2e0359
 EBUILD libcircle-0.2.0_rc1.ebuild 1092 SHA256 74fbcf075381951ef400ac97f2b64984a9580cc04389ef8ebe51caea2d9915da SHA512 4757ea43e2e2b08820e478b2bf32450e1ecd3ba53c498fac71763d46eb17354acfa6e4c2e09619e3e85d5a83948f527d3869838daad34d756ba67043fdeec8dc WHIRLPOOL e6751d69663a7bd6d2be2bef1391319916e508f892a5eab1fd06347d45a2ab8309f9bb7050f04728f0ffe4e3f8931f2881c9a80b5134ef7af8d5e265443d3d19
 MISC ChangeLog 990 SHA256 1830ed52c65b9045127ae5d8e21b7dcb75190eed76fd0a45ee4e7b9520c1f6fa SHA512 bbb1741fb1abe7caa94c6a7b76b210b50c1826553cb18f7286f5c411e141577e4937695203a93b08f96eaca62c34931b5b08f8ef64929b99bb64a22f88d563f2 WHIRLPOOL 1c189f3e396c8a3338da32cad54a342fed1d5d420ce1ac41b15af04f191592828b78cef7b04f85d1226c5a41a1ba2c7a33717054bf7e4cb7e4c365969a1b1535
-MISC metadata.xml 262 SHA256 6c8aa30d690b5d7956f8e36d45705799e17f130de4dd4178aa1c212abd2a0592 SHA512 7287ca063880419761cc7e27a0d6be28e4ddc2207a591e4e4d9bc9638acc33f3bc1314a2d224be12bbaeefb2224b21024e031a89b180c369b2cb84e0f152ae88 WHIRLPOOL 721ef1c7d9aaf4387b2bd3505ebf7b150615aa9ee29a7860da44f80e43945e86a2a9aa3651050932c7c7c94becb83a7e6ae4c6db29ce3ce05fee843b065c2fb4
+MISC metadata.xml 337 SHA256 91024d85c706688ce3958c29363665c5fa3ea9d74b24ab3b6f1eead12b7acfa8 SHA512 4d08aba9f8b53daf67abcd10bf09df18582eef109a2c1ae398dc1f86040ea585019a28917e9ed86d23d418ba44510a9acd7b2e7cb1b7ca0f43834f933fdeb112 WHIRLPOOL d9c35602a2aa0b9547f91a6f1de55a5703172a6dc43cffba9ee0274557665f89d05fceb220b49e38c22fdfab7d9e72e236343640f7d3578ff8f6db02cb557760
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUwojDAAoJEOeBhlrCAAWGQDUH/jln7JQOkOoVkxEmrOxBluIc
-c0ZVt7prAoTi68YkG25qrC9MqSIwCZEzViONbQOoFEHaE2QgGR6JeakCgPFzC9Dm
-XfNCNSqZjSyfWsxKfEzQZri7Za3WkrmHuJWrwNdemNrBHjsDQHVxc/DRxsLWr6Tu
-S1jt1SB5THIJy+audb2oXtkqvrh0q+PxDD6uvFqXWE7oqN8I/JJwnG0cmlVHvHe1
-4RwAeBV0Jn484aahwYBkqrcimV6fp6aOQUOSFCtuWepwcZN8xvrTi2FfeJR12J5U
-6TEvFuhNe4pbEY3w/KPAMjCCt2pMybYyyNGGBN7kNLh4WxsplpTEBT7b67u7NW8=
-=oe4z
+iQJ8BAEBCgBmBQJVfygpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDIIQAJO1J0k/LcqFzM3rKcAPGiNt
+CzrTZSmqH+FrSg8evEVI6FhGwsZG9Ge2u4ZKdaLuKZnnfr+hy3+3IPK41kzGxSEq
+kQbmKJyyc7Rt3qskG3Vlnj/avOH6FJ/3YQetZQoNLGe6cOGk/WOEyV2TBMZUMG/f
+jnwu5XCDfUSGmdlMxDKUdYed4QDeGjOx0eY8U4ezTT+dOn1KJ9NFRL16aqSQr2qJ
+4e0FUyj2+8G9Puamtf4Sz9RN8218B1j9Iss4V82+NA6ubKlPxIq9usumAApsBcVO
+a6IgHO+ReKzcx+ZHZ0LDcrHze/pP2BIrrxgNJd2goGTBsizJ5e06BKdGYgp63YQW
+mkLym+1DhpJpyeV+WEa1Mfk/TD3lqovdJnXtKLs9Blna0iu25W+alshZEkq4dObo
+XxXlUa7nRdcRftR3lqSFilFtHcYmPWG73sX7QD9qxLBtvyO6PNB27+oSiiEq17hH
+5OJ0dOD8JJGYiD2RtGvO368YBi7i+efCwlttZspeTEdB6XUNKquDTfeF53d4CSv6
++c8dRFfICpkF378T3CO7zChFOTvjk+W0mj4xlUiDovdidDJCDwg1GIIkoHQWW42W
+75OBKLtN2/UMAVlNveYVodCCmrN+PGkE43TYKflYpBo3k8x2xAFVfooQj/+9CV4X
+XIyzgeWGucE4TD51QyeI
+=XYXk
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/libcircle/metadata.xml b/sys-cluster/libcircle/metadata.xml
index 50a781216a03..b3a83b96a3a2 100644
--- a/sys-cluster/libcircle/metadata.xml
+++ b/sys-cluster/libcircle/metadata.xml
@@ -4,6 +4,9 @@
 	<herd>cluster</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
-    	<name>Christoph Junghans</name>
+		<name>Christoph Junghans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hpc/libcircle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index 0ef7f50c252d..7d5323855c08 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST libqb-0.13.0.tar.xz 363096 SHA256 2d54c5cd33ee1b7a362ccbc8453f277fa3a350c5302428b24f83073f483a7f33
 DIST libqb-0.14.3.tar.xz 367956 SHA256 c1c80b47c9ad737690461a580ae49dac810743cf94d56dd1f36300c675b68186 SHA512 2494a815cee2ab7e3595e6aec00f3c4950628670e78abd223034414e8f58ac5dbba7b4825f6ad39fd5c68b6e3156e0dfe419ff99ad22782083bf111009cb2075 WHIRLPOOL 6ac42a0bdf70bad0376808922756a85ace5f1a106203a415eb3963de16426c21058824fc6458bb776c3c33bf17374b0612bbf712f2f68ddd0f30ee94c9f91b49
@@ -12,11 +12,23 @@ EBUILD libqb-0.14.4.ebuild 1216 SHA256 8eeac7f17d112e7dca9906bdb51525d8fb0b76245
 EBUILD libqb-0.17.0.ebuild 1222 SHA256 96aa5b8cb4b6c5d35d120e4322391f2f995bfbcb8924e66f39366b1e3e88a5d3 SHA512 9ebfbca19b41849e7ea5f9de72af4e9026f480cff53c63a4ae0257627636f7d48d4197bfa29dca710f55841868aefc85b02f434e8446c8ea40dbbdf0cd2801ba WHIRLPOOL 2ff13893183bc1c7fc4e206c3ea8654fe87a496f7b42fa244be5c39086093d7ba40297a5b793519706c30e2e079bc4d6881f7a5f03122dd826fe2de004255dcd
 EBUILD libqb-0.17.1.ebuild 1214 SHA256 1079b712c8ea72241e58a6e69de27a444d86e66eb301615ee6605f02e4bd3fb1 SHA512 15cf817a33b2c8627d0222dbecb3b622e46b3f4aeea307eb2a5003aabaa7f347d3cacae24f8acc96216b164cd1daa30aac421eb6b332b1fddd4b468394f5ca94 WHIRLPOOL 70525b8d29256fe97dc0b5b0df8c912807d227cb1e48922403b056fe72da94a67d3459eeeb043d0a8be2e4b3065a95fb7d60707cc7288cc70998162ae5d096e0
 MISC ChangeLog 1333 SHA256 93680a027ed56342e595745cfa15c7ac59919a082223176bb1455d12a7e059da SHA512 0158ef1fedb42ad998ac51fca844d273ce166000fe2912dad857ea9e9544bba110b5c3ad9128f2c8d54fde81cff8b985e47f16e66cd4870a3ad4b4267d3b661c WHIRLPOOL 9cdaf9554ecf74aa17bfed02fab986b61428805cb8b2315b79f6332583605613b35947f915437c19cc846a6998f67338d663449d957455c0bc413e7be9b3d475
-MISC metadata.xml 161 SHA256 fb0c2b5d458c0b9e6cae1b1cf1c80137c4b23c54e657343370b7d293fb29ecce SHA512 f3e07a100754c87015a67a1dd5e71686adbaf25281054a74ec21cb342a2440c010b30eb7d3d813a2504ea2b6d0330ac32511f11b583df1c519d579ad2b6f0c6a WHIRLPOOL c13246d1d1357f83c01bfb11b06c0bfe565c741b971d846363d44579f974fc1cb7b29470627460f6fc4d62eff22056b98cae11bfd497e5a20dfb566abd46c6d3
+MISC metadata.xml 240 SHA256 4560e65eba9eeacb8716076bec4a8c147403356947644d8d3f614e980891dd44 SHA512 bebd73a6bf4044b06320ca74c91d6b5dce34388775b7078ce948921fbef3615313743de665f486591a9ef48e7da59cc4a5f8338f94120edac3486e2d6a4fa2ba WHIRLPOOL e0015ce891f1d9dab7caaa516503437fe3fdf7c4a25f024a4a80b736e8bad01263315e69026d9ebc9499983b5b52674496922ee14600ae8d835516eae06f01e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUdcgwACgkQVWmRsqeSphPx6ACeNspkXE1iLKFGJ2ccvm6lqIJP
-3o4An0bJsrX3j/Tbvl+Hc32xhwSTqebq
-=ak2K
+iQJ8BAEBCgBmBQJVfygxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5U0P/j9bpymlKC1eAwWFEMFELbm1
+7YI2xg4lSGMsMx6nRaVNaEBSC1KJFCI287w4qh+gE6cNQzH1mFfbDJ43T5Q/D4NV
+bxvq6zFTK981kmEq+wMyjv2PkIQ/L3l9wk5enPO0o6trx01xm+SOnEIatAefcWjZ
+FGju2PGXXboGcB4GMRJKBZTFTdsCM37cp9J2ZC/+4V4ylcQkB06R3b3JO6QiL5fp
+aEPKNPbahWRMuHi3ehlp+ql2JeZ17X3HrtXx/UtqJYyesi5U7zN69wtGpx+bG7xF
+EYQUtJ2yowgABw5GWbyrfNVexdlbDdKPryhTFD1niF+/q6oAtUBWu5uQh4nBLLpR
+/8FY43uMnFMLL1Quqz6Ng4Hj5y9S6wiRTg7zfptkzY010QGRb52Mi53izBxbuCW4
+cEXOp4cWvN2TDcRwPvp+1t1mBpDl8NZPXql1t8SSR48jNcG8KeoxcC6COtmTbqjm
+Pca6vS+R/nm09cp1esgGaGjVTDQ0XM8HkiDuIahMH9Z9DJSldqxbSQ2ktZ/E3Hjb
+kG7bwENawsEQGE2A8u5vj5t+XMK9uFxsgfy7ymRX/wK6Pvfml0gqwPyTyb6Vt6ag
+yNlTxw1DDbG/ig9rsPbsUG+WgZEitleeAlMQ9jl3oJZcpyE+P/AEdgHsmqGpF0Ck
+dSr5oWpHyfg+cgJrXiTz
+=zVWA
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/libqb/metadata.xml b/sys-cluster/libqb/metadata.xml
index 55dd68aadc97..c856cec9fa6a 100644
--- a/sys-cluster/libqb/metadata.xml
+++ b/sys-cluster/libqb/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cluster</herd>
+	<upstream>
+		<remote-id type="github">asalkeld/libqb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/onesis/Manifest b/sys-cluster/onesis/Manifest
index a7bf92ddfb63..7c3681558838 100644
--- a/sys-cluster/onesis/Manifest
+++ b/sys-cluster/onesis/Manifest
@@ -1,8 +1,30 @@
-DIST oneSIS-2.0.2.tar.gz 1703998 RMD160 6f0ad4432b8f6828e19eb60e2a1ebb1c107f50ce SHA1 7c76910ab7b9b3667d77e914a9d12a36d549e4d7 SHA256 0840f2b7d5e1378aa6e08bc377b0c93ac9411c81edff91bfa2b81ab1f2503eec
-DIST oneSIS-2.0.tar.gz 5007368 RMD160 43157d2219b45f35e531efe44625e967a74d51fe SHA1 2dfc698b3be89572035f9b592e07072a2d938152 SHA256 91b55e887181489edef990170fa1bcd24dd2718a822d0114a03ae9ca1bd87704
-DIST oneSIS-2.0rc10.tar.gz 2126016 RMD160 735ba6b609917f6cc948cd1d13943fdfbfa561c6 SHA1 ae2b230483caf3a6aec96fb4d36e59c866ab4f1a SHA256 4a8da7cae21ae11c80283dde85ac0934be4d544d69f82681fb663e1df13f3861
-EBUILD onesis-2.0.2.ebuild 612 RMD160 a95d669ad97ac28f26b43f4122e529aae69d784d SHA1 c81af294b4185760199ff32f5bb684e05ce5eb7a SHA256 fc13abfe1614c25f2b332084a723dd02fafd6553c0ad11bbd30e09706c8656e2
-EBUILD onesis-2.0.ebuild 610 RMD160 333a0be80e5ed7212396ea813294ea2a0e860a04 SHA1 05f99d829f98fef73285ee14c7b962bda9390104 SHA256 e44ef5dc43e5b9b03ea28e75932dfce7b3d9a3a336678d58b2a0de56b459f963
-EBUILD onesis-2.0_rc10.ebuild 615 RMD160 c3923c9dacbdc4f725b9388d348f3b2bdc9373af SHA1 b615cba5f3cfcfcb76a51250c6797f29466e8899 SHA256 a450c3e16a443235f4ea6383ca749d4dce670de50fabfb2894a56f0f46ab2ac4
-MISC ChangeLog 1230 RMD160 57224cb665359f9112ccb3b1955ff6179127e3ba SHA1 1bfcd6baf1dc92b60f6c6d95bef527be89f2c4ca SHA256 a1b742bd509f3f7457d0505063f931b797aa06c5bb53e0e14ab278ab91103eb6
-MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST oneSIS-2.0.2.tar.gz 1703998 SHA256 0840f2b7d5e1378aa6e08bc377b0c93ac9411c81edff91bfa2b81ab1f2503eec
+DIST oneSIS-2.0.tar.gz 5007368 SHA256 91b55e887181489edef990170fa1bcd24dd2718a822d0114a03ae9ca1bd87704
+DIST oneSIS-2.0rc10.tar.gz 2126016 SHA256 4a8da7cae21ae11c80283dde85ac0934be4d544d69f82681fb663e1df13f3861
+EBUILD onesis-2.0.2.ebuild 612 SHA256 fc13abfe1614c25f2b332084a723dd02fafd6553c0ad11bbd30e09706c8656e2 SHA512 acbcf2aa1e9ffa972fc4c3d47ec015cfdec2a434914c4c508e271b00c0e3a5b42d3771b2f08ad97c5fe12295436014700436bbe47186cdda40a1a7d46ec96372 WHIRLPOOL af9915817466ec680507488e20098f3eec4287d40aba0ac27e0feaf937e2e3858f0ff107985fbfa3ee2a4c7f2d28a31ae489ac7782cddb225f5255ec14fe0b9d
+EBUILD onesis-2.0.ebuild 610 SHA256 e44ef5dc43e5b9b03ea28e75932dfce7b3d9a3a336678d58b2a0de56b459f963 SHA512 c3be6cbdd5b26c9562c1da4ff1dcb14d3fef7c233d2fe2587905b9c8517718fd619c9c757e6ebf5a68d8fd25e41f50c43c1eaff654c81a379d93573ac58c07de WHIRLPOOL d6f6d78bd48c103dbc5db6f6016b5c7b35a3d5332da892d91d3438d04c20419f1a3fc032d4f946f1a8ba33b8890543d8bdb64a61df03801cc1995d5bdc70c8a9
+EBUILD onesis-2.0_rc10.ebuild 615 SHA256 a450c3e16a443235f4ea6383ca749d4dce670de50fabfb2894a56f0f46ab2ac4 SHA512 54b3acd32a11a3711e6a20fdb04080f0763a5728694aeac641930d7be3d27bd0c716246c55d23ef1b9525f072822151398496f5661f9403d77e62530ec12f3e3 WHIRLPOOL 60179f8a0975fa989aa0316fc14f23e034cadae728d7d0fd264beeb2e4b34ae31983e717709528e5427f1fd972c2ff4c7b9ca91426dcfad6bdc335557f9dd94d
+MISC ChangeLog 1230 SHA256 a1b742bd509f3f7457d0505063f931b797aa06c5bb53e0e14ab278ab91103eb6 SHA512 b0088586436ffef94ce4a9037fcae797db4b0132f3abac3da4584d1231ddfba0f2b3ab0f190b79aa16c04dbcd68e1b84c2f5985e47fe6eb8bbf658d3ed25caf8 WHIRLPOOL 91a04d8685abdd755ab2a17a498d953652a3e6a70a7137f91396c7eedfb801061820db79d67c92554a902da95d870b2f7a2f72f20a5b962215a97d58284fef0c
+MISC metadata.xml 237 SHA256 e9c986e747bb3b2dd7d7535a57bff803c86a1bd0482fb20ad51b47c4c9a49536 SHA512 f0211552f47ceffb2086d4457909924d0867679fd59162281b73e55044adcb04e9f83b0fa250d71842a9f16c372ead4cc2e13813dd314d9f5eb5f74aaa1b2a40 WHIRLPOOL fb557aee9dd40947d999c5157579ed8a1cc15cd6ac8a5ec6f7eccbe74e087aee356e10601ba84609548109957005fc31735297ec75451eee8664c586fcf73d22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfyhHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/90QALPkDZufHffmmQKZdlp4SQi1
+keHYQN7Z7HnsR4qmxExqwp0ZNqwAHtuBNb/llIfQsqv9U3v4x7KzDE5J0tvunUyW
+YtoiD5+OFNT3EToEBYL4jV1urz6+HNKCZJcF2pe0r6hH1+xxfmgW7feNg2ZOqzZ5
+pitvcQf+YVRtzzcKzy4I1YDd8ZD4g0EPmh6Pbukffd2eVsKzu2xYBsuszmInMl1F
+ga/RAhafF6qbLSHo2FPPetzlMX7aXd3uaeKKbJX1iTFpPCxF8+4Y1LXXUw2bg/zx
+iggbbKVtbqPzrKAxm0eMWUFfze3+lnKk/idOvFqFfpVvEkbdReeZHuOeEBdGRfEQ
+iPR8NsJcdMuZkKHiDw8KdVzg+dkQ92eiPmG5G5yOzmC7ardKULPtnjo6g24IbLS8
+2Sp89WYuX+Qi8KR3zc0o4cLTJPJ04HBbaS2SMmxnHrgO5lohsFM6Ii0NTp6bEh07
+giThqXd6GlX3KiFXB1hOYdAV8Y0mrBcRBfcqSiUbTyvkVLzcrxkoGKUH3U26ShLs
+/1Jm3B1OmEpGVbaHh/Ehi98WehG4urQFW4bt1WyMuJFqdKDZPbBdVYlQOq/A/hyH
+z+YO1pCRzqIUVGK41/yn+NwdJzcv9sXCr7fViHs+eIwhyF7kkvO5XYUw8Yih/L4R
+zml2urAkMfvoRbBD9WHR
+=6qeE
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/onesis/metadata.xml b/sys-cluster/onesis/metadata.xml
index 348e6c4de815..e7c33620d4d9 100644
--- a/sys-cluster/onesis/metadata.xml
+++ b/sys-cluster/onesis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
+	<herd>cluster</herd>
+	<upstream>
+		<remote-id type="sourceforge">onesis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/pacemaker-gui/Manifest b/sys-cluster/pacemaker-gui/Manifest
index 28ddf574658c..59ff29871889 100644
--- a/sys-cluster/pacemaker-gui/Manifest
+++ b/sys-cluster/pacemaker-gui/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pacemaker-gui-2.1.1-doc.patch 421 SHA256 5f42694bc0e007be7677cd2a5a9ac0dc046e43be6888e7da9c5f33f5a8ade3e2 SHA512 2a49cfb393c531200915a02f7c4d4a69dfc5130a9eb7661cbd048c25dae263291aa13323feb9c8ed0249c611a88ed2c6d66b56785bb3c79e421c7e98a6d5a18e WHIRLPOOL b149cf152a8ead929795a23f481bcd153422e1597097bdff0607271fe2543e26d69fa68558a5294ea995069da8ccc95d1e569d35c337f1cade2e026ae681c64f
 AUX pacemaker-mgmt-query-node-uuid.patch 533 SHA256 5632ed448acb44c13f45a229c529af89ffacd37ec8432593e06df265171d1140 SHA512 6a914135fd685a476b6f71b8bdb52825c1a844c8e2a622c31ac5978aa59049968ce3eade72766678c60cd7c66d30cd0f900ac2f25172dd7f988bbba203d67e5f WHIRLPOOL 7710166873d5ceaf6390d6594ec056bbde73870e14d19e5f5aa17b47393bb29e907c79808ced3708d3cca3482f9dc9547213a697e25c0e83cc3d6d6397092960
 DIST pacemaker-gui-2.1.2.tar.gz 398311 SHA256 9c431916a186c027fe714b46acf84f017440ed120cdca174cf244cd946fbfac3 SHA512 7d1bffbe6478a250452ce692371f2e47d6cba11eaa2a7684e99cf2befdb32662c092d0e6b59973fe076ed9ce640082fd4ebb3e7b7cd8730cfa697af82dfdf06f WHIRLPOOL 3f2913a283d9a2ef18153d10f477348e15c292a19070173dec761e0f5aee2999c7395476e237e6d5690efdc29d9157de4a0d6ef2280b46f7c8895057b3850428
 EBUILD pacemaker-gui-2.1.2.ebuild 2182 SHA256 c73b93385fcb69582dd6029654c054176444cd6f43a26228c03394db1eec7c45 SHA512 4f138a0ba48d867cab38e66a47f16c5a316939630c489038b504e3233cc9bc020c71c767a6baf253efbd99437b92a12d7e832b0da05fef7705ac12db530898f5 WHIRLPOOL eb571c4630ac61d34997e97060db9c0fc0552fac5a4a631acc7602d52fe40bd2211b648559325ffca490783fdaec553956374dabefe514f93bd0ac1ba40be955
 MISC ChangeLog 2140 SHA256 bd32bfd25730751b183660e2cc1c255daa93b3d694913496f83e444ff6928a9f SHA512 d66b0e52bf1efbd32769cc498a31519f7d8c4263182d5de173f96b8b5c3a60d88b5e48a694c3bc735dd03426c68bd149080b62e026664f46723785cba925975e WHIRLPOOL 2c29773a6cc44ca4c2f8edee1aab85dd03c878594393d81da1455af894d79bf728894226c3fccc6c4f9596e94d874e9e205855158b80c843cf239eed9b0dbbe5
-MISC metadata.xml 429 SHA256 aa528f0fc82c129c23cc4339f3701b0265388d40a3e8f907f4fdddd452d829e0 SHA512 626c99d13d67c664378cff8a924282a360dbd4d843b34e40e244040569828c89b97ec16c5f90d2c9f0c2687bee3d28f6f4ef9f9e54495095c959ef6c9ea96e43 WHIRLPOOL 0d94cfad997a0eeaed78884814e1dac53ca9a938c9bf16c1435a66a9aedcb5d9a36b0a588db4dddc1361abcdac400a43291a7da5db3f7243e9a17dae3783fe42
+MISC metadata.xml 503 SHA256 a18885660cc75dac8f7b7646d819a85f6e196d6c31b78f3f24df759a1a143674 SHA512 504bf853c0736bc2ceaed9346a1d4609255ce85b72d707810835b6cef4a269c2a1fa1b88f0d2bca76881a9e61a3e23574c9085385dc4b56c2e453e86954fcbe5 WHIRLPOOL e0465292abf7641a682bae641fbb6696f055378119b4b1c44d7e10a7a5763840668ccd021de40724b0ef76e78219e5f3eb0017c574cfa6ac167c175a95bcefed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVI/yVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8rgQANYVoCxB57id4INWurjwHctP
-+xMKRG4aO3dJZqDrsLLReY+UHIkexG3lzf83HSsAgccrmM/IWEEmUtlaNRGwgmYq
-0R22zSa3SbG3ERmtKyqY0/u6v5gmfHy8wJ6ZbCq0Qkdftw56OV04OchWoEXDoeve
-D0uQSaW1fx5rG959FX9JZm49C0w5+puA/4pLZBTnXnAcUsPJho7WOuAyC6p9OToN
-Or4EwwXtd1/4+4cr5rapEofaXI4bqAOJy5OCxid887PahCVR3APaJBk9ppJ2DlJY
-MWt+IexVCoRPxJsKD7o6JRVmIEpHjQaPn/BklaUJyzeftyO7x0yaxg1Mge/6mJo1
-YTmhsNucBJ3LwhMVHfJNEGyMYrHtllwCQPr2CiWivlZI+h1yCXFJr7QspRBCBf7K
-Luia7eZtBEuI3IxgH2Gk951K4c+pgq0I+wfkYJNxkoDC15JiDCYfVSv/T0K0/zed
-et18lp9Wfu+KIFlB5a4JGQAnnzy8RNyx7QzIOZ/VDA3upjPkWGOAc8/KEfjQWJTN
-nEJTOkmygBdNAV4zdB9ghBQwTMqqn6UPOgkdDKhWRWCB1zk0nepUy8BC0wDxzPxC
-Xuq6eCy8Hn75RI5nYDgHudz38C57oNnMPM1zfawBskoej3IZ7AkU8p1Hx+7PnggO
-5JU6NSg+aKGDi/PGsMWQ
-=nO4A
+iQJ8BAEBCgBmBQJVfyhXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmid8kP/1Q3XwJi1A/+z3WWIoa0sdOT
+94H4E7ZKNmP6J35GEuLvcKYrDI+5c7HG9IzpX0yu1VRSnqSdobfsW44/qMhl2CFO
+3Qmv2kaSvOPwW9j1hWyF+gMI0iU71p0/aFqNuC81QD0uzEaEwYIcxU6t/NcsbzRw
+55AfO4wBHTFA4JLERahevvt09c8F8aHv7JGy0WHvm/5TEZ6+p0LJnvvNwOn4b5c7
+c/4kz95lu4z+byDOZiflNgfsCs4sv/uY+fmZcELyfDpmckS3jlINhLK/cPBVEQ1B
+/esZ672qcGyENmSodFnjeUJATkCNa9nipgpJt306G7L+pxd9A2HbUdhc3RMCMgiG
+P2/p3An+P7+/vpmVoyNcyjo1XKdUWGgKvqmsyzpiUSOy8FY2rIhx2o9Kq1UAU9tj
+nhm7ci7KEObUlufKRxM1x/XO8mPzOEtPnZr73v/J/Pcl/O1SmuIzYeuhCGLbTYsu
+LSOTyrZNsh/FdundE7Nq1CK2D/jH7VwIV3GaDEwxOcCUpsWgdpbz3Eh4ZA7ODuDu
+I0RrAVbOZ4jzjdqsVuWlXFJFjgaSdLRwTUjJCbBuRk2i3Nja3ryJE0ikHcIweGAG
+mXM+jZzWAdGfbk9iyoB1eZMe5wQzu5+1C76jiEw+gye5G0pWl4A6yY1PPaFt+eFs
+xU6K53sGgW6xQ3+oTEWy
+=6j3l
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker-gui/metadata.xml b/sys-cluster/pacemaker-gui/metadata.xml
index 17fffa4bcbf3..44a5e4b0e806 100644
--- a/sys-cluster/pacemaker-gui/metadata.xml
+++ b/sys-cluster/pacemaker-gui/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<longdescription>Pacemaker python GUI and management daemon</longdescription>
-    <use>
-       <flag name="heartbeat">Enable support for heartbeat based <pkg>sys-cluster/pacemaker</pkg>.</flag>
-	   <flag name="gtk">Enable the GTK+ based GUI client.</flag>
-    </use>
+	<use>
+		<flag name="heartbeat">Enable support for heartbeat based <pkg>sys-cluster/pacemaker</pkg>.</flag>
+		<flag name="gtk">Enable the GTK+ based GUI client.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">gao-yan/pacemaker-mgmt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index f86676519a49..81fb907f73ca 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.0.12-BUILD_VERSION.patch 1423 SHA256 7b46b0d2200126e3294302448902b546a59bc8319f8afad3938f7aa020c5d847 SHA512 c9ed1d8adf750a81d11765bfcbb9d3de5ae9cf947d27ac114bcb146d2cf3450c1b98b66ec6b07861e368aed6674fbbb8f7eae8ec6407459652dcf42a5b30a0af WHIRLPOOL 239bcf96fc6339ba89b4dd708541faad5e4b596c3f85c4fcbf21b39cbad00a2e224d889f792203956e4ab615e47c3e5f5ed01b887e70d3743341159c7963f12b
 AUX 1.1.7-glibc2.16.patch 262 SHA256 4c0cce3eb7b02e7a879b81549e8300ca3d71af70d536a310b745f36deb8d9104 SHA512 9ddabc3b0806bb25f11475e7c041834024c38d09efa5faf59d1d51c186f4a9831f02a7924c549baf6349efb4279fe87e6e720937c0a1578f82c4355b3cadbe6a WHIRLPOOL ffe5dfefc899ab2b49f426ae2b455d045bc62263ef3a51ada2f4f4e26fb5dfb8ad7d2eab39ea21cccd66b4329d314eea7c12d3a660ca568c5c1d66a2d9781fd4
@@ -15,11 +15,23 @@ AUX ping 10389 SHA256 021c85d8019b182be7a3603d3363328219ba0b165ea2fe37495dc77d03
 DIST Pacemaker-1.1.12.tar.gz 10459675 SHA256 f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c SHA512 cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1 WHIRLPOOL e737d70288936d2f76d310848940bde78537c32e703c68d8dd37a78e54a66dc9d34cf2fe0037f1621fbc5ba10bb9688490da96394cde65f0668d4b62eccf3f03
 EBUILD pacemaker-1.1.12-r2.ebuild 2477 SHA256 a739d5e634780c04fab0c971c1b45de86d6c5c25ebeb5add4158e548f3afef3e SHA512 2d74e1b565428502e7481ef60841b7e113785b1f28a0fce97283ce320f1c1409349178ef368069c09462b94c7d13682f7d0a4d85c002da1ee227af127c5a2f59 WHIRLPOOL 1faa3491e61b861f55cba7fc64c12fefb8a29cc55d99f7174d8e133f2d852a09ad43e5f30895b9cbd2406ecd4680d100ba2fb4a0fc25a932b313a64830eab07e
 MISC ChangeLog 8024 SHA256 7c53f5f74ec8cf5d30d97a1a5ea752524b0b5cdf2a6a48de3fb5382412f23750 SHA512 fe69e97802784a74be5cd102b18ab6e1fac13927a2529e58d5a4035740cef11b8cee857b9fff708aeda614633c73fc903308561db08bbe9f1bde739d358ea0ca WHIRLPOOL 9ab3163a8c0565d19e7854fa3d6454c0955d9076fcbab745555a49fad215b7d57fb99f5c1ce8bbf0b6f086e10cced069f377b7fd5d3ae257af2a892b5a0b4005
-MISC metadata.xml 795 SHA256 a9a97ffc7f1dd3e5b3865158e5be0136a76c458ddd6a913cb1285e2e884b0f06 SHA512 ddb180c322a07880de3f92253d8acfea3241aceb969f03f7b8808e5628a6379076f482e832a4e3041dce3f719eb4a7150af59c37a31625006cd01992a3732706 WHIRLPOOL ee08612a46c40974f0af2a724bc3aa83df70c603b943caf30684081b77efa089418c29e94b38aca831ab25cffbeb2e0123534c9c38925ff868754925c9bf1ef5
+MISC metadata.xml 881 SHA256 250da4963b87097facae4b13dbd5ce30947989b95bc359dbf9002538ae36bab9 SHA512 c91f156ed84929bbef498f0fe6566e285b5f90fb71bfbccb23589aa808e1150a5fb53244fcf34e333e6bd4ba6580a5ecaf0c9897fe93bd1dfb806ba04c85f90d WHIRLPOOL d997ac8d2aa938a403ad9888919e97157abc49e995e3e9cba85f00a93b85b096cb44f3ad6633ce926cebdadbbee5c9dd3946fc489d8d2b36c10f3291e82af8f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUjkQkACgkQKiQSS7ZY+hPapAD/XOYUGn/a7vvD0EEck39unp7E
-21EVq+uh1V9SWdUmmQYBAJJ3h+UKGICPdQaznv+gHeH0Ce5m6FR0Dc71be9iEnSL
-=ElD4
+iQJ8BAEBCgBmBQJVfyhPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmin+UP/0mpE1MH83UPSbZWhYRyYIcH
+mx1eC+qfslG4EnzTWl7uPsYONhQl6DAW4Ksn6Ea0tNNWhA2NI+gbqyHfZL/ZhQCC
+vY2fT5Js/NYuCIkmDlSkCNqTU6rs0egZtZbSejDNitmoRbLc88Qa+WRjQmyFDqmW
+GP8+rTRw57V5eLiv63qugFUHyhQp+R1zD4Ybvhr5S75lOlui7B/GEgztx2d2twRd
+L9JN1hm7Yro7vNq7xix3J1Z1n9zTsZPtmMTegz713SlH1Mr2YrH/XB6w8dj8tu2H
+U3+4TXDfctAjoTezP9dBChBcJvwcWuB4a/QBykRb1CrWFxAMBGh3qS8gzEKgAMdQ
+4MhvlFyaf+yJCH0nY7rUWqWF5V+anIC65dumnLt5JvbC355Z1+wTrcipQLWbtV1x
+2QZmqupr2tj+NaoN+nJyJ2jCY0J06i90nkw8PVgh/UnNc2RPTvUC6yQ/7cnU6g8H
+7cPWLceGS5sgnJcpHwMUclWcEfDzlqASaFYy5V039/f8Vz/XoY/SABtAsZgdJYiQ
+oNCoErRTxVFd9N9lRfkNX7/vfCS53ypHVpDX/MeBqFpYE56Iypj8vohd38Qv7ZUR
+Kp3mgef4fzdBuoAVDqQZbbJFyODIo2WOtcaiA+Cj6uSFC6dzYrTTN30jxbDb5r4/
+5Oi53MYxByOfsnGneY2b
+=HCBr
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index f18bd7f45ec8..a841b6df7fb2 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <herd>cluster</herd>
-   <longdescription>Pacemaker is a cluster resource manager.
+  <herd>cluster</herd>
+  <longdescription>Pacemaker is a cluster resource manager.
 	  It achieves maximum availability for your cluster services (aka. resources) by detecting and 
 	  recovering from node and resource-level failures by making use of the messaging and membership 
 	  capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
    </longdescription>
-   <use>
-	   <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
-	   <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
-	   <flag name="smtp">Enable SMTP support via <pkg>net-libs/libsmtp</pkg></flag>
-   </use>
+  <use>
+    <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
+    <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
+    <flag name="smtp">Enable SMTP support via <pkg>net-libs/libsmtp</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">ClusterLabs/pacemaker</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/poolmon/Manifest b/sys-cluster/poolmon/Manifest
index 9110fd220f04..3fac8d13e420 100644
--- a/sys-cluster/poolmon/Manifest
+++ b/sys-cluster/poolmon/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX poolmon.conf 67 SHA256 cce26febefa84d2e184786f04760cddbce373c6ebdfcba614c9c4008f705ef7c SHA512 74641c17776aa8cc3d3155d92a731da05eb9ca18c053de216ccc7b98ad684ca3aff9f8a7972955670f2b8e4210c6ac469a3a124686824efa91f6c6c537ee35b2 WHIRLPOOL 8740ef5321326cf46d5f0823ecf21ca8387aba35c1775657a38f20d2433df16c9f804ea97a447243985dcf073e9a08ddba6daf210d570b3bc19272e3692c4376
 AUX poolmon.init 529 SHA256 66d9144c67207d5462003225541fa896221d315d363ec257a2028416ecda461b SHA512 c8c2b71c184cfb35e114af916dc4aaef134f6e02918ef9b6d81c8d57f1c264368dd8b2a63aa95fbabe9a0864331f75ce634d1512d83228b12ee7821cb757e2ef WHIRLPOOL 56c0e016734343a7ed452f29fd4c9143876ffbcf3295fcde41005b1bb0c79cc339b71bb9ee0c153eca785d3ec2811cc910dd5f7ded261c1df7a5bd0a167333a0
@@ -7,11 +7,23 @@ AUX poolmon.logrotate 132 SHA256 d689c9a79043d6cb5d6797fe143f1ecb59e46bd4ce48a62
 DIST poolmon-0.5.tar.gz 6902 SHA256 7418c1486e9cf34740ca82f72f32be97eeaeb4b4ddeda74ce1972ca4735ed6dc SHA512 17faa13e6b9b42f0913673598002aa5ad65e7d35b6ed4f5d6a1bb36d7fce630a7e9f1afc6979d7a098a2b66e5943901213b5617ba6190b5b7e1e9a6a55f6cbf5 WHIRLPOOL d72866b0675724eb2787818799152a94c75ee76351db96f36f4a1bd9c4ec1c90e2e314eb2acc980c90149ca82133c2369996a14dd4386718259e7700139414ba
 EBUILD poolmon-0.5.ebuild 765 SHA256 92b3c814cf9e1fff41dc9da7baab786b86b924480b14234985e1fefec219fc4a SHA512 70c00a0cb538e3aec50ad804561685d48a2bbb1572b9eaf23cfc7060f1f00b5a6792a748afc19f923bcd2d229724789e17d33fa34f9d02212aa827502b596627 WHIRLPOOL c40cbcb9a45ea8722cda56f6f75f353d3f676dd51df6b268292c0fcb02b76d36c5d2be24172bc9f60269e5031291369f03ec05a7994d383d7f04f230130f6d39
 MISC ChangeLog 671 SHA256 132e52288fee128123afef0e8518ff41212524b9e5a716a0f714cee028e637a6 SHA512 b2080c1aedacff8614da9ceccfceaced32ba93315dc8c5432888039102dc2766f77e67c57ac37c948702cde91b3a26fe866bb1eabf5e860b64a2430e2343eda4 WHIRLPOOL 7fc758d654e749695120a15c14316ef1e5acdbee437bcac09abe8b8525c11037fba4c938754553988339376c647d324f30a8da389c509210824cca41eacdccf6
-MISC metadata.xml 242 SHA256 6e140bfac1a92ce9e0dcfc80a57d8f8d6c2656dba12ffce79660eb2a875e1b8c SHA512 ff9bfb41196afa0a2166ae50f2a10fe90e021439a156a5153f34f8c7ed78ad9913424b196f208a46fb92a801b13b81f75c395515c28df3a07fb19e9bdd960782 WHIRLPOOL 6147ea7a520030df6ba9f6816484fa547191d3f021ec08c17e952424ef2583bdf6d6611dc0ea7d1633af8e8c1712edec3245e9ad6664af4e8e81b2a77a6c0cbc
+MISC metadata.xml 327 SHA256 d6961630643e117c0ccdbf8f3f5a12b357952d8caf86771513273b8ae4d42b65 SHA512 d7a50e6ed542732d6a78bf34feeb818f05a58cafedf6ab51da9039b75f527253c55fefb50f6915e041413b3fc7a1584971c841acae29a56df5189d32bb17f8ce WHIRLPOOL 3331fb717bc0eb97591e7c618bb7a32cdf2b13e9abc09d8421abf7fed84b6ee98c5e5272534e04df7faf3e825c29f94db6ec7b3c22ef32c15090dfd71ab828ae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUyTfYACgkQI1lqEGTUzySKYwCfYk5P7cN4wcQ8mDxCd1qMEGjh
-DYEAn0dQufGV7w8/bt0VesB8zGGmQpPj
-=WOcJ
+iQJ8BAEBCgBmBQJVfyheXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNGkQAJzMOrT83Y4E1fw9xQiuWg8x
+ZyW7IjzpNh7nGxbfTx53o69+0tbPpWu/0E9SJuCXyTP82CyWowQR5Or6Y0fjbwPl
+J2vsln93HYkq78KcDKRJiY+s5kBIVT1EaAnwadn9RWMNy0JVhWtt6LW2lpBUJrEE
+vQlArP+1zEVsgFqs6RLlZzIBms3vgzCw4V8yXk4MQESAsdr9kMVSnewjkDF+Vx34
+mMD4vcCb74vaD0xWxtD1lVyJaA8o4zXMzbbuf9nrb/hlEsT3/cu0Me01Sl9Nximu
+Nldoh9uZKnmdwsoFST8KdwFxtmNI3rhvm8DTG9PZbTV9sFXAAUJ3HwfAxeSxrZ3q
+EfqX+AqmpxkYJ2BYGBNIx1FcRcTITKcqCnI1d6kAtiUOIUCEZ1ruVyxui18mZFh1
+aJhP6CDH5P9/p2UzNrvRyYGuM5SwV6uU4SI24iBPFJ7RHxYui4r2ww7Qy7nyVoF9
+sl9vYc47dMh1prO5NcTjI+zXh4iirhvgYELeiwCZM9oSCBbrqFIK/Swd9l/jM5eA
+hvkfbbL6Eb4ZxWtNQnU1w9Prx4Kvuae8AfqhUdVbHH4OciUzK4Zb2K564fUYvKei
+ZokSAzTaMvjKcI1MGTFdZ6JiilkhjN3e64R76sMkLfddnqB55/3N2yDxUX0hmkCc
+2UznpGP864lcmLsO8Uxp
+=BUfM
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/poolmon/metadata.xml b/sys-cluster/poolmon/metadata.xml
index 7d663c1c78f7..2b951263ab67 100644
--- a/sys-cluster/poolmon/metadata.xml
+++ b/sys-cluster/poolmon/metadata.xml
@@ -5,4 +5,7 @@
     <email>mschiff@gentoo.org</email>
     <name>Marc Schiffbauer</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">brandond/poolmon</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 3a3e5df580cd..8e86a2d047e9 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.0.3-docs.patch 1164 SHA256 92f061cf7926e6d93ed993d94df1e360be3a4f88e54cdf0134d14d0d054b6350 SHA512 efec7f4c0cbc33e2c58835d3df1b85798f291cf8ddec44b207a71dfe615a67b2d150a8a222e07779fc3728ded50131a891a6e4207a723db966c3b16770ad97e3 WHIRLPOOL 0585e78fbc8b5b8aef07fc6861ab4d7e7cb95ac88a83d9508e5e2123af683df1172fd4003fe9236f2bbcfe58f2eb82699842bcd82365d1d825076b943eb7cf2f
 AUX 1.0.3-respect_cflags.patch 316 SHA256 62cee339be61f5d1fd0cf0e335687633e19e38f84feb4ae2de52547269f9fce2 SHA512 58955b08d0bee3e97a2069d3215e8a20f0c4908c13f387f099a09164b445577969e5a89069012463a67c7fa13d5d2624363b2e9bcf855cf7cfd7f67e4fee7ad7 WHIRLPOOL ee03de33b01007d110aa8b27b04a59d733d23744d47ec484435e2aad537505e44d62de805980063649828c4898287d651c3265a86b15b2dc2b543f8dde58930f
@@ -15,11 +15,23 @@ EBUILD resource-agents-3.9.4.ebuild 1682 SHA256 67c3db3d5323292689aa45e7738c3054
 EBUILD resource-agents-3.9.5.ebuild 1682 SHA256 6874d51dc19bf145df1955ef3c81fae862d8c857a8ddc58d3eeb45453a124e43 SHA512 925071ff99e42a5310e3e41780a6029bdf6bbd4df95ad12ebbd220cc5e537125ec1dbd4fdfbd814431a6dd1ea34bc20f018aefe2b44603ee7f8e767d4adefaa2 WHIRLPOOL ebdb61d045321df2df389201608e977b4b6d57a1785c15e4c15989317a162f676688f022afa958576a754085ff0292c364ec6b38e88640a4fd32bf2e6cb1f429
 EBUILD resource-agents-3.9.6.ebuild 1682 SHA256 011ee8de5a6254673426ab5713310f35211193ccf7e59c781bce44485da53412 SHA512 415f9e09f1843250cb79e38fd484713722f3ec57f46147382a6d0500fccf14a5dc491d885166f9918167a621cb602bc9c0483f6c7e729689d354f295428ea9d4 WHIRLPOOL 35adab5ae79e6412e3eca1156ac45b0e115865f85830a5e634de931951cb0f95f479bcd78196db4e730d1288be1905a8037c4739ad334f5970ba2f24bae0f924
 MISC ChangeLog 3069 SHA256 5c4236212552a234e81e800a0e3b8cc76126813d32f952a20b40c31b8a5aafb6 SHA512 94267d76f7cd4068657377809bc83cd7a2601287c7e9e1fac5531d780e0d6340a232452e99be41624b5fca947b783384c0428cbdefb0c5cff120411de5a1d611 WHIRLPOOL 4da650b74106a168800624682423c4d2c92f7a417b4b2a27d576cf399490956d4059abfe9b1f3be9953a9b0adab1500c99803c1809acad382818a00278754620
-MISC metadata.xml 700 SHA256 58ce6f7697bd6fb666347dd4a712c76e639e5297f8daed6bebe16854e680863f SHA512 d66d18baec9d7af45b504f52ffab5372c0395bd24a6d19f5c6f0f6dfb38f99be1d0f43aea8e819c40571f1800dc1924e5990b382987161aff82ef000a5a43a84 WHIRLPOOL b2806944446b8ebca7ab2b7a2012a772b70e041f403bfa7edc49e5a8fcd56ac0d4242dd9fb012bcc715cb17101503ecd5e039dd92051a7ae299a8210a4501cdf
+MISC metadata.xml 792 SHA256 7d21d0caf5532870567a1833c1641657fb0c4cef15abfaca5bbb555e7b8662ab SHA512 28f3ff00464a83e615720dca5351391180f7507e7762410af2ecbfb35ba230ee28a5a7c9906cbdaf4f83d0a76b01f5afc74b01fa535d79ea1df169881c7a3f58 WHIRLPOOL 6e03b3bbd8b8e11bdbdfac62e519baa783136365051635732e1c61a77b386331459844b83c01c4af093237056b895b4e74eb3e3e5c7f2acfa565d359f0a196c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlTrRWcACgkQKiQSS7ZY+hM5QQEAu1gzqhtgI0cRwx5x+Qhrxa78
-mcb/9QiOG3r4QCg/ZfYA/iS0rMT+73Hf6r+40a9HyfPmiGB3TAGAB5FDnMz+kMJ9
-=S7wo
+iQJ8BAEBCgBmBQJVfyhqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiv9EQAJ6c/FtENRRR4qVKQlfaf5qD
+Je6ujT8TZbQZW8oxzilHsKpwAwwFdqG01oIvEweDwKoGP7m7StJBffuntOZFrGzt
+A2QQm8+tinIdEY4R7ja/8qG5+RfLkiUmBz2nHv9ptaR8a0UsCexbl7D/ncKBKbXj
+zN0DqyklLakAQU7gPPC4jXo2LojitSG5hnWTTuAGcTyQ3vbmGHZv/tnlAzm7Lvk2
+0GuO3WKJk+VZP6/n0HIxR/s6qU+GH4N/MbNK5thFyYtxu+eg5UpUM7pgs60x4s/E
+U3ZhChSZ+V3fvm/JPmjjxnIOmtiGL6rc53pU5GpLYXX19tvqlutJGj3VPQdKYqZ3
+MR+U+McDvXTuMSb+6SRienFoCrceW4Yj1dmBkb2WkeM5VI8zCNPIGqvCsshQH7NQ
+DCT5UTxsu3SaPZve/Vmt2a0MxEhc1E+HFlFqBMdbkfR1CUu/fjPFt8q31dChSrVj
+QFM80fIqXWFh0CIzy++IDVOcDHHz231ErPjGbthvfbl4UlpXpO9pppJHyvNB+mXh
+EtJuaoeS/5kCCiQB/8ZyhRPgUC0ycZAtZCoKggVQEYehcqM4jJojN5Dti2Kl3s7P
+TTkyl2JmxfX+XMV4+VFG2C28RdcPA7UoIdm1vB35loJgvaRZrI/Wx9KKpRewkQoA
+YWHn8YSyxZz5qqd2vfjT
+=lao9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/resource-agents/metadata.xml b/sys-cluster/resource-agents/metadata.xml
index ec40dd44fdd5..a631e7b4490a 100644
--- a/sys-cluster/resource-agents/metadata.xml
+++ b/sys-cluster/resource-agents/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
 		<flag name="rgmanager">Install resources for <pkg>sys-cluster/rgmanager</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ClusterLabs/resource-agents</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 020b3c348416..3657b2129b32 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cve-2015-1856-master-kilo.patch 11096 SHA256 c57f05cae2a7543a757222ea3bd6543789c4d6abd73e85b6ccffa0a5ef8b06a7 SHA512 65b4d016f11fe97efa95749e3033aefbc06750cbc1e17ece245bbd1bb6bf20c9cc65d14fa10e763188cd49648413e8cd88b8684b0502ac8596fd25d214f89afe WHIRLPOOL 8ba9422600bd6edd220c949c15e651371b416f0600953429b641d7575902176ea021c6d628d549ddbdc97945c24919b77f9118a350af9a28a599bb86b130300d
 AUX swift-account.initd 992 SHA256 a920abae629964eace9edb9e15e754bbb6765dcd6845a7f2819ed07831ea7c8b SHA512 f2ff3a7054a240d58c8b6584539365908fabcee8fdbe067dba2fb6562306a96f94450ed56a93c16e985813e266e7e0afa34e921b8d9bed754bbd85c5dab85670 WHIRLPOOL 757ccd49fcf9afbfaa5f3f7df3ee45cd30104b1c5f190a10f452bdbcdc5c1dfdc6cd9eae85d2c60c80a062f56af2cad7bc7ce80dd552ac0e812a1bc2f0e72a8e
@@ -11,21 +11,23 @@ DIST swift-2.3.0.tar.gz 1346492 SHA256 7225061f92597e7eaf6196c9336c5e590c7626b7e
 EBUILD swift-2.2.2-r1.ebuild 4091 SHA256 e636fc3daf38751da971e52573888bbf9a13713effff418ef71945dc0d542f04 SHA512 018521764c18349ba0e9d32a0418103c861bb1576ea57c080ae7656cb6839bf10c9d40bbedbf7b6a99d25dfef194aa16fdf82e38297a59a0ffa9a5417a81b333 WHIRLPOOL 076d22eb72af072f882f018e9c42e95e84b898c2a43b19c743413dbb36eb449deebf46be4966bdd43c1370a4cfdf10852edcab69874bcd243c85aad83a077a3d
 EBUILD swift-2.3.0.ebuild 4136 SHA256 79a0d9ce0616d3fb761de99c0f567e9eb04987a97376e5a3993e0c6978782044 SHA512 9c8ffcc0a5df0850b5bee55697889cdb32d5b11522f1ee9ab19d19af16e2a61bb4ec7b11441b2c0b8f2b1123ceb5e1a27f3a695ce7f14244ae8a723dfd269e7c WHIRLPOOL a0b2eb1f3fe848202e4aa93e3661045e4ce765475b5fa116b9bd1bc8e9a703edde857231612a2fd718c15e096b01a523a20d509224b7f2123356a9ef68f896ff
 MISC ChangeLog 7975 SHA256 80720ded2cb164d6826efd7384e92d2892e26c8cadadba2364ff6c1a183667ac SHA512 c08f7c4d3abd4b0948a118f544d13eb2ab47453e55579907d64cbe496ed658d6f4a29e073d0d3fecf5611ec5e885e54bbf9ff33c966c636dccaf74907c5e227b WHIRLPOOL d723fa4cb3300e7ef4b73e76b709294e3fe9b34c9070a1603efeaf5bf49ae5e83b66e74831dae76b36c80441e938db2aabc05929c57f0a74a67ce70a6ab9b98e
-MISC metadata.xml 718 SHA256 3b5950b308bb7bff9c0b1e1df0ec6d2616a42225c6a60f8d23f8774cf3dcb0d8 SHA512 e86d128b5c6ccacfcb8032d33cc1a7e00ecfaa1d0e1fe325ef067f0073a5d411e27e84f89e7f843a7d242d8aca2163978f08f71f91bef43675adb5156d4716df WHIRLPOOL 8fdfc74a8b54c32edc06618e7ac59227a79ab24b32ee8757f14cd2dbed49786422bed58b4dce1808397856604027d0a148f74bb0d0e97cbaa232030fb93e0454
+MISC metadata.xml 794 SHA256 6a648df240ff06cb2e1513fc8cb1e281aca0fba86e1f21bd2d733448a55c9240 SHA512 f784d06632b45153702579dc090719c857f11d967e7f3f5a7fa7c6ef7b59ee7093c25f04bcde426e906e99dfa964c3647cc7e675e2aad0d9b48f9e28221aa4f7 WHIRLPOOL 4f6c3cdab89a7828f80d48f2653d720b810b4012a863712655cdcdfcc5df02e0e5ab43be5999d7fc697708adedc76952b3f6b8cbd8a011505badd73ab5c3eb04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVRTekAAoJEGSje+quGaTo5v4QAJXrAHcroTJjdm8UjgJxnMCh
-hLHXbWWOV4FhfLhd/8ZrJEeIDYCc0VhX0zO9eIiA1Kq61AsbkJmFe1vgKdcmK/Ie
-7nkN10GWDtXKSD+euL7FGUBi3s5Zw9D6z5WMfh+4PBJHUXaGW5mdVnaiNUbC1dLS
-LTugVTAjd8xKbKxWKLo380ifLkP6gUsH/BGkqdfylI3vV41NgrXUZEmbhFnrPF8i
-Kq0EnAYvU5wFXhZBAHmA4ZUgjeDVIdfvd8uCT0qVdc9qvRfsQSg8kqHjZf0XNo6B
-iHp1a7goJk3+QvKsUWDWQjRQbpIMlIrGUq/4KBH/QijkoJc1nECYvD3TvcZ1Src9
-WTkQfOj1tKp5kUtkMj8wT4Ptj8vFvCN2gQFydi7mMSrsop1PSQ4KVNZ5NBk+5ulO
-2TG12lTKgJ4aeWnQMJFX2k93+e03FXLl4Ao8NKpt7+YL83wLlcFgDdXcy37pBndH
-jdZj1xW9C50QJFApEc9XzWTQ5yqafLLOx3i+hq0KgSMXmajoQ7EiA5noofjYAkFX
-Un1h3T80MCzW2B8Pyi7R9f147eNIcsLqyCFYyvFDc1DNbIU2Z6uOBQu/dtarDKAo
-uIs33rGOys2D42delcZ+e0aCnql982Xm7SXWRF6AIiE//7/KuHgc3f9X00msryeG
-PYlbiMUwxsMXrEMKKwxX
-=CS+h
+iQJ8BAEBCgBmBQJVfyh2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifwAQAJmgAWCR6IB1dNzNTrntQb8g
+Tk5DZIc5mfxU6ksMeB458iVy2VQdSYx4M/gHXPd+NXCzChx1B/jaOJ/O9HD2J5nx
+BhBQGETxdKRdVhwfAAMVA88wMXUrwhNhe4TxMp4SFisD5/XM/MWaWftc2x4XyEjg
+a/L7uF1cIXrrqD4e86EVHDy0SLUbrNShwB+QDjQFtlGZukUSam2dmOb/GPcRxfEP
+vIceFouQzB8qwijas2CZY40h4r9uMQ3dfQT2wMuXW7tA4Vkd5LafH6UQyyRH1dyU
+loEzumy2c99I1xncMmnjNyZhx6G0UBJLxSu767BZ7OWPk4TL2mg6MdK56YH+sSN8
+5hFtQOvWfCEX684nheOK0KsIYttcHEySrAJczsTCAFaOfYfKwPKeJZnWent4B4Dp
+nqaLvq9cQTAhAkxIiB9svvJaJvKudU5DMMwljpdsOYiCBXCp+3qaattzw5VPGGXL
+AyKdNp2JhUbL2G6vzdjNa0GzFwsooByAs5+CBWEVZG9POdJmwA1swZfc8RGkWwZa
+bLlwZqQtplBqHbrAKSosuSzeW/kZ+eK6Y3+NFE5pvnP3fXZ9cKt2jSGgUGjjvM5g
+qxOaolGVlgf8YSiGn+lx+rjUpFg7aEVhbbXGpWevpVRfgxaP0MXCr/SGTPgaP+By
+zrssQn471xSYcIPiLnNC
+=IWlp
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml
index 9c4d0f4701f1..68889444c8f1 100644
--- a/sys-cluster/swift/metadata.xml
+++ b/sys-cluster/swift/metadata.xml
@@ -17,5 +17,7 @@
     Swift is a highly available, distributed, eventually consistent object/blob
 	store.
   </longdescription>
+  <upstream>
+    <remote-id type="launchpad">swift</remote-id>
+  </upstream>
 </pkgmetadata>
-
author	Justin Lecher <jlec@gentoo.org>	2015-06-15 19:33:10 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-15 19:33:10 +0000
commit	3dc3bc1619e1e61503be740ecd5b665278cca7f0 (patch)
tree	d504b7db0ca274ae7fee7833184c32f21d16bdec /sys-cluster
parent	Updating remote-id in metadata.xml (diff)
download	historical-3dc3bc1619e1e61503be740ecd5b665278cca7f0.tar.gz historical-3dc3bc1619e1e61503be740ecd5b665278cca7f0.tar.bz2 historical-3dc3bc1619e1e61503be740ecd5b665278cca7f0.zip