Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

20 files changed, 252 insertions, 64 deletions

diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index 35d29052002d..95d837197cd5 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX c2esp-24-ldflags-cppflags.patch 1039 SHA256 6ef278119a9d1655f09a42f48fa0894ba9455212b99d6394abd2f45d8b029322 SHA512 26712e2010e8ac5f51ecdb27a59618dfe593c536c10f23a44bbda40ab969852406810e8732f5adca741cb72f623f8e4dc763b033ebda9c70607b18fb7d56fad6 WHIRLPOOL bdf8ed6aed462a20d0a46c1da07be3bd2365e6828cb444d9ed36d5f484793ed3cc6fa09df9b2de9c6a01c969b616d53f20506117e569849e387879bc5392c1ef
 AUX c2esp-25c-ldflags-cppflags.patch 1049 SHA256 8e46d6d6cde053dae5790f6ad7a809630a59ee1828f3abc16efe80df9baf0215 SHA512 315d30b7aea8b89a23edba3bc15a018de72287f0025611c4fa137dad1f868cac3fe06cd6713e348ffb63ea8633caa3873b51a44d534c77c6ff8805183afab341 WHIRLPOOL 86825aa3118198611721a307c67b88c96247036fbbde294d9b56c77e16c1026a77624c36eac47e5d4c379ddbec3ecb86677e8becfde2a1f5e0f624800a99bb19
 AUX c2esp-26-ldflags-cppflags.patch 1152 SHA256 6cf971ca82d0d1306ee460c8d9033d8238bb19038b81d5b6eb42cf67a8d29b7d SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4 WHIRLPOOL 6e379fd15f5c61bfe804390b31f7790dd4dcd8bd8e068b3a8b8c85dc693e7c6ae804bfb9e5d8e93b5e61dcbe7c544a27a875bc4a2fb51b2d797672fe2a02e70e
@@ -6,4 +9,23 @@ DIST c2esp26.tar.gz 127593 SHA256 9c1427ca9a7374b2dc052953084f5c1a3675ec6842ea77
 EBUILD c2esp-25c.ebuild 1261 SHA256 f83bab41c1527751fc456c0722bd465d3c43346194bcbaa5ef9ef6132f942231 SHA512 35b3327c9e6045e327b22dc84386308bceb79c81cfa6f23a39fd9757273c637cbe50cbbca750d4a072521289ed32395301a051d7f342ca3ad917da451260fe44 WHIRLPOOL 627476d0e46831bb293008dbb8c76a5536dca1e0dd2408153d5fba8b3c69c517495e73ecd7c36679e5f713d08a3ece7f2199b4801d742377d0bc4d46a95dffa6
 EBUILD c2esp-26.ebuild 1264 SHA256 481692a457f0f525b8726cc4d55f732de17ee01c6aca79a81940104292b2f71d SHA512 3a3e06adc2ff272de78e435d256500488316eace858ec26681209705a4b9275dec256ef0908f0c4fb91c9107513760d7209c7bf04c5d3b68c31e0ac070f8e09d WHIRLPOOL 3727b28ca2a5586e33db897b680fdff0b52656d11a90eaad39188de45ca16f2c494d18aaf879f30bd0d2e100e5426c6f410d807d87b256e408309419dd2d5001
 MISC ChangeLog 1167 SHA256 c2a99485e237d6b95f081415307e03733e9d39fd6d154539e8658f0f62ecc5f5 SHA512 6a276a32e645629a30a1203ebd823eb99709eda037c174e9416f1deb1d97173e053d984a006c495844c2c6232e95e64c426024c080aef068a046b4a7dabd6b13 WHIRLPOOL 362c98dd1d0a506b897b101967b62a942976a4605e55fa2af6acf1adba4803eba62af6cc4cedba65183c7b36453f539b52ea2f5d4941458840c19d9fb7cd00ca
-MISC metadata.xml 268 SHA256 288c33a2f3360fb312a69164b4f5ef4dfa9234a5e790de319f00ebebbcbd6331 SHA512 913baa970d7fd8b2e9bdc9026320e091c529a3e43c83e48210a659f6f0f8e6d74bc0a327d0dad4e2157d9f949c36e0b75a1d1a9be5da225115def3c03fc2929a WHIRLPOOL 5c7092e9b4af48c86002731cd4c52140fb1c236c4c3b33320ff53d5dbcc67488ee24f00cce1214b0e6e951fd3145c4fc6d93b1ea37f1fe25d8d1d890b36fa853
+MISC metadata.xml 357 SHA256 2592a685fcec693dfcd2f2a3de6089b802bb8dded1e2b300e26f63455650d679 SHA512 8167b50d1efb89658b77c8043444f87dbd966b7b582aa79648a80b85ba4f80bca11f8494708e50bda36907dfb87a3c8368d37991f57c39b1eada56025325bdfe WHIRLPOOL d75993c03aa5262a597f306fb22cad4c9494e3ba70355adac1a111792c53974e95d77ee0a124ff3205f593a6fb16d5fd64dff180593e8e749c060826de3c6f6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxejXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmih/8P/A1ceFPRlGlpcCzsEv5MgG/O
+9lbwayWkCCMMpRV9bp1RRpfXzJNAPWcmOtE8Ad6RIKeuEQellv1LSMD/fcKuciP9
+IiJsORiCgK6kVWT3JMBe9zRGHkSHZH3SBoTP+k6Tuu2EISdnqk1KvnnLYpv9vBjz
+BJ7GdZoLWvoOHfvClWRo/LTcxec1QICGGL6bnWJd2k6PtRcGk77Lu/UHPbw5LMDt
+TtytkEbUBoI3Vb/MUx6emmxJrLFBga/LYqqy8pihpwB8MfwDMz5m7gtb+y8cyUDk
+Tr7R9StjfZhiNKaTdExjujBv6onIzAmQpmj7dAUc43A2sY4CYqFRuRKJGSxar6Mf
+MAn3RjLzmqUf1o0Fxmkv7yEZiR/zhs4Eme9pHtUx1dYc7g+AvJrdgFfyjdrwIOmZ
+Up2XGe0UhoA05kbOQIFFa9wFCT0yLwqTd4UFwrrMHzuIznhwAJEwjzv2OX0YELRI
+7cZfkyor2fbnKMB0YqROc/B1kz3LnLuoDMRxYZ8yZh26OXV4Of8I5jZBkPjRhXOs
+UoTUiYj/mY0TVwbM3GXCDC6LSWKNoKUi6EvsqN7erckE8kAEbUTYBKZ9ddsJ7rtn
+BEzdYAiE8XMxrAKgY6zmOeTaB6MgUdKzyXR9r3NLx+v2G6ijrrmZc77YztWPM9T4
+gQGkos9lrADv9BsCuCMw
+=mA8u
+-----END PGP SIGNATURE-----
diff --git a/net-print/c2esp/metadata.xml b/net-print/c2esp/metadata.xml
index 7c12f3b82e46..dd23d29d0696 100644
--- a/net-print/c2esp/metadata.xml
+++ b/net-print/c2esp/metadata.xml
@@ -6,4 +6,7 @@
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cupsdriverkodak</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index ec425729099c..673b8fc97ed2 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST cups-bjnp-1.1.tar.gz 139838 SHA256 db6be8ae2e8db63fe70ca0e3c64b119fd7ba83687e1c314c5e7b61622cab6f83 SHA512 9a1558c7f2530e14ecab3143e0e03239d430d261486309cbf12f28a43b6358e704f60fdbcfeb0150b3ca80d31bf03b0c628179fbf37d313ca23d2f6e1d28265d WHIRLPOOL 173e1f81eeb39415845e66c4c7bac8de9a6f71f257ead546112500bf08f5d9ee37f975d66b408e449039bc3528b54c17fd8e593d0d36d7c9c2829e7329483267
 DIST cups-bjnp-1.2.1.tar.gz 140536 SHA256 bda4ff2a9e9f673018374b75b1cf6f67f5aef3025a3a08d2c9ccf15a2bb8573a SHA512 c14152592255f9092d543f00f67a8fdd71cc9b27bc12cc6e66d3d94e1112920feafba35b7f7a830b07666b9b2d8d070f52757a3e150195e71ec989985a74d489 WHIRLPOOL 35ab78c1c73987fdccc45421616046ff4987dbbf183c262e23fcbe373baa5244016e0cf8a1df0ab80919ada34d3adbd0f8bc2b4268a3d8ddf97ebe5341ff9f74
 DIST cups-bjnp-2.0.tar.gz 140617 SHA256 2acb716680d66f1378cf8dcd45fedf7f72ccc9b66fa80214d6dcb042b5e3c9ab SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0 WHIRLPOOL 217e8cce22cb8ea4390dfedbaa5d5f37e8c5cab79f3b25924fd05eeec3e39b29e85a4732182f508daa8a379ebd4d0ced8b59038c6a538b366ac156250127243c
@@ -5,4 +8,23 @@ EBUILD cups-bjnp-1.1.ebuild 546 SHA256 bfc167b695f31acf51140727cd5e131690ac7ce61
 EBUILD cups-bjnp-1.2.1.ebuild 599 SHA256 f87ab8ede01b12854fdc4bd7ed9798a0506221379b0252cf7dac434882da5c2e SHA512 4357ec234a80039e07690214a2ae7029fef185fb4b6878d9aa157d46665e7b7ecca2460dcbf922d1777fbab50db0d956d1a837046efe9ee63a355501eb0c8322 WHIRLPOOL 3d43afc9a17983a164ec20a0a63e1438dac5165b4c48aff93780dbd5886d28085b9695149e2fe40d7cd4dca66705de5f2c3afa1ba3ec0c4a525852dad02a500a
 EBUILD cups-bjnp-2.0.ebuild 596 SHA256 8d0e032d3186339c763765a798306d26a0933ba2d27d9e56d3e74a70269c223b SHA512 e5e6c3e815cd578f9c91be0805f1ddb3047d99aed589c27e78ccba27c47826c371c3552c28424bd64c045849441bb8debb9a18b16fd2beb7e3fcfb0e32e64e4a WHIRLPOOL 2dcd0c01d3f2f1cb19c9ae86ec96eeb580b71dac2ef07dbadf1709ff556771711e6b618e5ed8c2dc6fd9c0133c0abadb31cbdf93941843d31c652b502ce2dcc9
 MISC ChangeLog 1067 SHA256 e8e1061584c00bdb8af20f1faea1b34c606392e24cc2063e5f40e3e818c5564d SHA512 01b7d441e97503378d75369de8bd7f5536c5b04f8f6598a8a0ee4ea1b82bc0538048d43f8c9f69b725a8c1ee084f14de5e614e1732c3e711d99cd16b7264232c WHIRLPOOL 433fd1794f553ae83e303fbf1c71f363ec1e680275fd6c811528fefedad978d2c2b49fd02ba3f52a967d6d2a8c60ee6a3b2f629c373e72655ce6f30162dd9089
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+MISC metadata.xml 241 SHA256 a6651785efc04a71db3b23db983f9aec9b045d1f57b6fc2e23297bf3fe968dbc SHA512 5c52248ed176d26b4a2cb76b71a28ee1fd5030a28839fcd77182c3b4136b6f79c1682a6828903701188affcae0f9b02614bfe377d491aba0c53b8cf1a0fa3184 WHIRLPOOL 2e8b0ba5ebf867524f477ea67157b26675aebcc1f5f58c30cf3b63141cc5022c9ca96389b75f7f71c8a0318519b64a761d7558b2079fa5633e1579e4a659c919
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxevXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikrAQAJrV4Lb3EVbop86z83w5arXe
+emlOlKurPL0Ye9ZBU7IF5W5pgrFnP2SwbavEMC7afyU3OkRft5qCvaZSrpCnnp/L
+SdT+7xcEPUjfOcUsruPA5pcJ3TkzqX6A7CptufQzcnpLXZgtwEHWKzY91asIke5g
+Y6z9uLGcpjyHTBXHAbWanMnt9BETbGKu6Pl2erjNPjN1KStHGhMvz5b6HVUbfXqj
+NhdPoK8EFNYfgDbLjeavyZcKk1glQHEgD6ulmLC60L3uD6qQyvEGAeI7UCKIgDuh
+6sGSRy7XJ4UWfb/qZV7Y94R2BfH2Vimxkip2cD2WAcMITqVWkmbozcPLZX4a4yNn
+nkwAb65O6Se0CZWGfV7KmuXNok/noSbrmDf1+H1Nah3kA90G2PibuCBN9DO980zA
+31JzEiCx7OOlgVHXxhk2wHCjpmLZAHXFUIM6vqmfjoF6Y+R8DOCwvEnefCEBtV/5
+M5afkRIvtgc9cNbmwkHeebd/73KIT9cnZZI7ExOSkmUhxRS2okburxVYkJkvy5My
+iCzWSDtxdmVIXkyMwYKn+uRmik2NVQa75iRenWtYgfumtb6pHQ077uDmyW2fOZ0V
+6MURYidkVa9FWfUB7kqmAZJ89fgAzryNNIq2DiBSzj46v+MPNGNBI6EMGvwmrBVh
+T1F5Ew1K/mSYpwRPVPPf
+=cGuU
+-----END PGP SIGNATURE-----
diff --git a/net-print/cups-bjnp/metadata.xml b/net-print/cups-bjnp/metadata.xml
index 1fa0ca569505..88a6a6da2e3b 100644
--- a/net-print/cups-bjnp/metadata.xml
+++ b/net-print/cups-bjnp/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>printing</herd>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">cups-bjnp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/foomatic-gui/Manifest b/net-print/foomatic-gui/Manifest
index 34fae35f5f4f..f7b5f15cdf3c 100644
--- a/net-print/foomatic-gui/Manifest
+++ b/net-print/foomatic-gui/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST foomatic-gui_0.7.9.5.tar.gz 122249 SHA256 e0ae4afa43a39bbcc74510ad22796a95eefd898f780fb392cf39afd3318931ff SHA512 d118caa3f905d8b2a20f55d7b51c41501f83455c5ef18b1e18c99414cefaa5d32a051f33cad8a446740566e7f4928c7ff4ccca3cfee9f20b39ca43290d05987e WHIRLPOOL 0988a5635297ecff94410bea2e71fe2d3b603ed5b6bb7a4cf2c62d9e20e33d84d6723e66c8651a3ce9ccf603956e433e3e03a918ff9ddcf9b1a2a465d45f614f
 EBUILD foomatic-gui-0.7.9.5-r1.ebuild 1014 SHA256 e8b569b6c342a95355338e2b654324ed2b8a10076b13d83d3d8c63011a7ed403 SHA512 44befdae6413c2205e057c8e016f5adf1befab880a7622ed4731b48de5cc83a311bbd3005b720e11046fb3bd1f3ff74510486d996d60e6cfb7bacccfd249a07c WHIRLPOOL 1d1104f83901ade6d16afee5f0f0b3ceaaa0312411f24bac75c719bee44c5a405c79f17a3272b8e8e160a839b98873d3ea2ce4485601cc0c62bc3249e9c82f33
 MISC ChangeLog 2599 SHA256 363d4973cc8e359c757c9c5a8e7221873d3957db7f9c90c77596e08fba4d9ed5 SHA512 7d4ffc4799f9f63dd96c820c00637c2561bfaed8c9a198060e18b78e471c23b5e0faa2cff8846b664c63f99edd606a3d1a225139ca8cec69ed6403d47d54de63 WHIRLPOOL 7f9eb14b8e2cb24f55bffb23ab92b2a9f988e61f807d686c2a28cb17bb5b97ac878955842cbae1857e75093b59bdeea8c6d258df6a7988d420bebd3697a416da
-MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
+MISC metadata.xml 242 SHA256 de39eeffc4605411bca4311601926d5a94f693db6561dad27fec9866d58f5f5e SHA512 0a16422019532267b654aa2acdc7d979cbebe2ea7f3ff7cce7c05e0a4a24e80ef90579f6de6833950a26873e2e4f7a0ca82d5d9eb826812cb7497fda81002a80 WHIRLPOOL 1646aba44405f559b78d1c809b70e9880863d624d00b2e066fab41b3ae526adbef053eee45bb98af3dbae3ac94de660878ce527a896bed6dbf4755444beddb33
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUX5PQACgkQso7CE7gHKw1QWQCfWQzO8Sx4EE218UE67JV8QOS/
-0L4An3ltnpm7K+6Vq56Ho/iVvH17nadY
-=le1L
+iQJ8BAEBCgBmBQJVfxe8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiy+MP/RrzqtnjlfA1XKXMpNz4GTVD
+Vs/JFxuhXNyVoeAfa18LaFe+Kew6CbJviduPcHAK+d/aeqKrgfS3M27HD7DTVPhk
+wxyrpQF+Uo8+GbFomDusV7p36YTlxw608GIX3zzPubtM1EZRCVrYR4Yb2OklTlRd
+q5W9ChE23CcHA9/GS5zc7EJ5dT/1FjCpVoIOZLB9tDqNSR6XgMnVhfXW2DG9Gswe
+gtkqmu4j0AE7G+K704ZNX9JFlrNpwf9i2eqAjQWJp1zT51hzuEXj8fJNrhGypfbc
+n9KRaMrqoDS0DppTgnRtObNXNCdvvjQj9HrBz8rWdyEoiiMBEM0Gsts5rvnTyNpz
+gh6zJN1o7mtr0GpRpGJngtYrYmhd47XA4zsPLoaCCKFTr94jR7vqUY4zINup6i6E
+jxEpYVziIVL8eXtA7GnG3R/SM3Ico4yGsro6C0jBiQRAlUUbiIrH2gvu1zmXe3h5
+rD8s/Ee9qU4QIT2gogkKktIDT+LSjB7cFekB6pgl0Nrwgk+G+ckz85NU1V7Reu05
+7b0RWarSnAKNvg3weWDGpBFV9YdqDo+D0nVUwfKY0SaonrBPIOLO1pl+QUlUyBQO
+JORS4mkz7raKoairJNVqbPzGgLsle8oX+DXKtzAb8ZresfhVIvbnXU7WiLm64JrB
+d4lUAN88NnmOBbAetQSW
+=OPvN
 -----END PGP SIGNATURE-----
diff --git a/net-print/foomatic-gui/metadata.xml b/net-print/foomatic-gui/metadata.xml
index e450ba260ec9..f5e9aa5b215c 100644
--- a/net-print/foomatic-gui/metadata.xml
+++ b/net-print/foomatic-gui/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>printing</herd>
+	<upstream>
+		<remote-id type="freshmeat">foomatic-gui</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
index 2aad48ec28b2..fac975f2d7dc 100644
--- a/net-print/gtklp/Manifest
+++ b/net-print/gtklp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST gtklp-1.3.0.src.tar.gz 649791 SHA256 addd9271f0849f6dc417459e52654fb156d72a94e035f8dfd531980981ded001 SHA512 dda05ef49dbcb05e42f6bfbc44b30e5b7a20a0044cf94123b9353fd01252d9e67cf300b980a0a64dacccef867e853cdb2af9a05e5cd1629f734b050826bb0900 WHIRLPOOL 38ac47bb6d839bf127eeeac093e16d17cb7ff24d4cee46a70075625abc03ed80c5daa5ac8c64f91aa916600efe56a9a88e9058b6ecf34cc9a67f5286f20f734d
 DIST gtklp-1.3.1.src.tar.gz 641805 SHA256 734f9b0edb4f01ffce1288553150966231253a5bf4bd76db739ee180a1f39fdb SHA512 22d8e519d5d767add9d786bb9d4e288fffad929e8cac5b0125f654f520e1a466cf0d32bb2f6fbc0804085748403436adc5850b805531dbc971b91eb05627ae70 WHIRLPOOL b985adb5f88ad6ab1f526a3bdea14893690c81ff2bd1f1e557cf9fb3f6f2c84205adfdc2b5c8e29264c7c6e562e9f4961dae1a3d72354de7a462d6196a3d2cef
@@ -7,21 +7,23 @@ DIST gtklp-logo.xpm.gz 2254 SHA256 cb5292aa0b866a39a1d0719c52e46b33241d640c23739
 EBUILD gtklp-1.3.0.ebuild 1254 SHA256 fe28d9a282bc08aea8ab4f4853d131470caa30195657d8a3123dd551a9b6ac13 SHA512 87943f0195177c723ffa8caf8647d42d60da67e389bd675e2d1a8441bcdd8222613d85d6599479cf963a2c39f6bfd1eeeb571c33aaa2bf5b7818eb3332cbffb6 WHIRLPOOL 4d93eb161b1d7b2e10154cd60e19667eeaaf7b12bcb525a7c9512ac3a4a8b00424431af1ed0f8266e9aeae22baf65a5abd112b16003630e6c0bc34c0d14d904a
 EBUILD gtklp-1.3.1.ebuild 1254 SHA256 398d24912b5f82c3f8c426733446c26e39ed3ddcf5c1e36bb455bcd6b3dae2e1 SHA512 9776d6930502d2ae51cd141805a0d82b3bf571061ed9a492b43ac56ffa9788fb470ef19070551d4a947b6e36847506739056ce2b59a4c44869a9df6e5f8ce8a5 WHIRLPOOL 53b0e84e14e38d02b7d8d015da0d097cde96d048b0503ab917f3e8175dd7ce7326465bcdc3d43e88f5338340e5f338f3675d6a19a9c21deada3751b702979082
 MISC ChangeLog 8454 SHA256 6bda34c33bd68c94c59a94d82d97f2239c6c9826a18fdfa824a3f2eae4809d9b SHA512 58a1f27283efffeccd02ee8601de5cae9e98e59fce4f30928e68a62c1c3bf715a5d1c46c5072867bb9415b62a3f57c837a3f4210cb8bd83c7c6b8aeaeac3c2b2 WHIRLPOOL 8b92bd56c6c63dfef97a4a08b607f3809fa14d32729531d169bce5221916a6bc4f42842af1fbd28f77cc4df3e20a3821e5c2aaaf56720087d7fdda152ca96f98
-MISC metadata.xml 453 SHA256 55a76a755bb1da8989b1f418332b01f09e17bc25dccb181ccbcc2c4ec091239c SHA512 09afecab917de59952f086dbd19e737b6c7c44333b85f7e840a5af95c886d0790cce02d84866b32020b014ef8561a9f7d4d429d158a760c26f6de7a7a04273a6 WHIRLPOOL f8a02ff1a2a52391bb7bf05f0241d3ab85d3586a021bd2f77f4ede618b291171f724d564c85ec67dec6949572a8ba428a481ad2f0f788ae96e1f30876c5be1b2
+MISC metadata.xml 530 SHA256 c72defde9eeeaf1f1ecce0f229bd7b23f2eb51fb364e306e8dec8bc43bcff963 SHA512 724eaacf463373d6547cec899e735717b8fdea9b73aec38a2f9a04de68ca5b3f64b4e6d7becbfcef2e66afb04e74551859279b3ea48b65a3fda30036aca146b6 WHIRLPOOL e1b927fb4876b6bfd21b913c1a548abb7bee01ecb95ad13ef4bb13faa1091e05d4862e491c8b589c82019966ff2b4ae358b90bb733a6149cd498592a97f42428
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUyLoRAAoJELp701BxlEWfiw0P/iQs79YWg7a7BFetKEjiHVvb
-tv8bh+BNqnIHZITKIQA8CfflOQyP5M9pQmoZREhwA5baVVAnHzKoyinzZwDYusNl
-lAgLVyH7uBeR5EesR526bBX36b2VXCB6W4BKEXq0XcWHMz4TPtbAFM6MQDjmafiM
-7NmFM0rBnayQ6h3w0YaPGD7gD7amqdgjC8MaImCEjX1ot7m8Jck8Iyvk3EqjuuNh
-+qSTXAzJPShss6DJlr7wmRzE3XVTPdr/8l9IP2TjQelKEfW2FfjNMNCYkeiQHN4i
-nVYIMtYOze9A9XtliYnvTkz9BxfiiJzGWj+g27YW9lujM8IdSk/5lKhVPwMk0dWP
-0PO7A8ZTz7jMz6UMV7Y+Ek6vbUYIOeuskOL65pL0PzS9mLYesZ4okIbwY7yXoQYH
-WR8kqfJb/fWBvijsvRRZbL+FpVZpOcLiREmOUdU8Vg6Qg3syz0m3td0zDVhCpv7O
-yAJVdJMLYgNPsUftSfa0SG/C2pfdNdzvRxPleONhoQ4Qayoo9ptLqAnWjc9fwbN3
-NPSNBzUWsO1l1J1WXYY76cm5wsW6APLx9JMLtgho0PDvLvKKBsE8S6kHhVAV4+Sk
-x1PjrjuiC4I+8W6Y5+i4c0GfPx3/VkfRHKC+oOqMdpBsz1fm0BR9sE3A6T5A3UY6
-+LysFmEz0KzPQwIdLKgF
-=cXCx
+iQJ8BAEBCgBmBQJVfxfMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmim6QP/Am5qqZ4wQHidhHR78xVYPxG
+P2SGofsWF88bE/+IFiAFcL6QaLb8lOfg3KqBIoTf1VrUUlcUHD2Il0+/qo5+/uGR
+StSLSCZ4AqdeBxHhP0h1jSALPfq5YOnebwGWqyONISqj5qcqBcAU5bJWFHC5pr6D
+MwTTbzupfQQ/wM5QQMBWC8R08b1uqQDEL0M+Gtc5TlV7Qj+K5t1l8RZ5dNJwYXXq
+F3CYkW+5b9uao4PcEcimrygwylVRqM8U/8dcIVUI5wzRnqYmCwJ0xjGIG8hnCy+H
+8B7aGbE3rN9enonZ/gZOjAUlJ3n2RW661nWCyV1qUZYisJFa3zRaGVMEJJ4B9url
+LjIUE6OR1Qetw99faWEyfCyKDE7pAhG+Evd1WaPI6Gp1ll4qALt/DhdRHxlZWO1z
+0cZ18ynMmm/0jRYQa7ooPlBZnIy+pyDBJ6qyJVK4nh66jaM+neDyS0kLxB3vcqSC
+wvhhYiBggoL3Y0Ov1nzy14rJReuvXXNSeIynjqqrIr0g1m3toVjKeUd9CTmWNEim
+V+r5+l0TshgILMdkRvfkMkcMHQf7dR+nGkKLKx2YRfOZt12aC0T+oLgCPBLgfINA
+Ml9jrZMlQtD7ivoBaGwXx4aptOlgKz/W0RqLTrUNLD4mO/QgThlUc8Kw7Ui7b53f
+rHprfIYPUnMwcNQw7pUo
+=sKzJ
 -----END PGP SIGNATURE-----
diff --git a/net-print/gtklp/metadata.xml b/net-print/gtklp/metadata.xml
index ab009ec438c1..943c68620e38 100644
--- a/net-print/gtklp/metadata.xml
+++ b/net-print/gtklp/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<longdescription>
+	<herd>printing</herd>
+	<longdescription>
 	GtkLP is an graphical frontend for CUPS, the Common UNIX Printing System.
 	It is used to have an easy (and graphical) access to all of the many options
 	of cups-managed printers. Package also includes GtkLPQ - a graphical
 	frontend for CUPS-Printqueues.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gtklp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 0016eac51398..4268d0bebbfd 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX gutenprint-5.2.10-genppd.patch 1609 SHA256 a9d5e8a0dffba31e1e12801a21dbfc53ced030dd919aa1eb6f6a480cbc27e837 SHA512 d582bafdf593a9e00d0f20aa5dd9043f52ca0c53bc713e979fd162c023acef937fd4a1706bcc808579ea97d122ede54f7a505537bb97b4fba5f68eeffced0a96 WHIRLPOOL ca948b19b3af4cfba26174982a6a009bbc7ab92d513b6313010381a670f6b23231c72329750087586d5683de24ed8c2a5c5440b72866bb606e9e4dcd94db3049
 AUX gutenprint-5.2.4-CFLAGS.patch 781 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438 SHA512 2bdfbb024251f79d06b24a5fc72ec35c7c7f794df8eb4cb06983047e4339d77d3d9a7c1b2913e96ef4c28f82ba7970276e27e8fe7709aecfd20b27357995ea20 WHIRLPOOL b0b3de9a03251b23dfa6f3d092036bc5d0643812eec36b70814d26af4ca46173d9be39dc663e0c6d8133f83a5014b24f0f80346e87c8d82cf4c41b7a1fcbc2cb
 AUX gutenprint-5.2.8-genppd.patch 1959 SHA256 3ff261224f2b93cbdea289066f018282a201ab68e16d27461a0e54cb3a13f58d SHA512 69aa4dae7a06c5473672c3737c6f5565dda584b933c3409279a32e21275e8556fcf6ca5479c7f9bf87616b4ce062ebcaafaf1ab41d7b6f8f8e3279c371ce5916 WHIRLPOOL 086c7b33f1a5574b9ee2615e2f9b0475f990ad7dc33daa60f2334e64cddd3de656fd06a4c854e6e56e369d9903ed15700b41dbb0e058a3b75cfe064e380fd038
@@ -6,4 +9,23 @@ DIST gutenprint-5.2.9.tar.bz2 5720450 SHA256 4b27e4f06f32d30271df89ecb6089bb11bc
 EBUILD gutenprint-5.2.10.ebuild 2469 SHA256 0bb92816b80771ff856f72479d2d533ea6dbbd4ef34048949e8409d6cb10b608 SHA512 549f0807a5eefc03fcd1b881614bb290a01c8370de9d9687cdc0a3bfe0f2516b578a63767b57831b1fb7d8730414dbf8314b9e67538a437e8f377cf1ce9d257c WHIRLPOOL ff69d8adeeb04a1766859bb9a538f19193786d8fdb7bf666c6bc33082486db5c0d12642aa7a3e23e10a7cd3b1e4ccd037b4a59de860444636886e1c85e966b43
 EBUILD gutenprint-5.2.9.ebuild 2469 SHA256 7de2c1ddfa0056c3e7165ac938d704fe6e7eeac2ae9d4e1424146283234be48f SHA512 e738446046e399e6508b6212e1ce29c911e0ac666a8057a7e72a865f7404f00dfbb88c54f6a6b6a172820f6b1ac874558727221591b7316c4fe93c297f17db38 WHIRLPOOL e1199f26dfd5971e584e9f5c3bb5090d6d3cb9e8c97cb4803e94264155339439ddc9d3a0bac6424b1517f2e99a5ab2aeee087694522b2ccd6999487b9f89f247
 MISC ChangeLog 23076 SHA256 d69888b308f2b2f11052ea8b851e5f46291d46b698bb0e9783b57ae1a322eb68 SHA512 20411e024bb015f1789e3c1318b35d9c84a5f9cdeff2d8aaded6fea1549d251a5e4ebd3c704c6fc9485737eec61769c5c0c7c3d869d8aa40a6197d3bbf916972 WHIRLPOOL 0acd752f537e9a77845cb47d6d79e587f977d72881c93e871f4bfee1f7c7b428f310553017a2d2681d2a1f150e5d0b6c90e45a2cb324b2d5d783d75d522be4a0
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+MISC metadata.xml 242 SHA256 9b5129caebc811452c66560ffcc39b042b5a002f3c811c9e02ffd7af141f365b SHA512 5b6a38dbba22aa5e9223b02ea33e55ff68ad3ca8e598595df37a200e3a97fc8fb82dbad72c4ac69ae49a2d10d8e8dd2cd1cbb9add63e62643e05f0e5bd4e804c WHIRLPOOL 480745f1da153fd7d660da37d4a6293f2149e58ef40fbd067834bd57b3cd660066eed724bc000decf8d0f5da2695e5cafda3f33d1a8c639238ec2511fad94db0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxfjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiz2YQAJWVi31e1ukUFDtw0kDX8qFG
+Qely175F6mMXaGRPNgwCCmJHSdJusxJFyK9EJY4nC5/F2imdmgr8F3Cq+dHb7SH6
+kqeCODqiQRaXJ9r4PBGqdZlNKPUmDmjd0AostOC/q+ws6izTW9krTquEgwOYgvSy
+7zt6z1Tr/Ip+HXq7LdtkePZuexhUQvjL1Vi2de8KayY+FFZN+QtV5oUFQLIeEeTX
+UtaodU6DinP/Narg9X4wnyEcecTc/GCsM222MRooikIByBHEVmDhpF3+/y8auCzv
+cMgr05D2nrmNU0+MRUd9kfDUMFHhSdPXrCMqctevJ40VnMgJT3XOCLKXrzSq+xwD
++7ygNnnKifaBkqWLx2zICyy8Q8xBIPBomp1rCB7YblOZCN7bfY2pcNP/bRhHncZV
+Bac52DqayXKADHKoSs8CYhguPCXZSxSLSWxp0IVFje1Jsh/ErqnwRDRtCGGGrwBC
+qzh8wPDHpwpHEmYyEdac6hOTu8vhFxu98NZcdQoQf/Up3xQP5uoohX8qi04c3lpL
+dAvclJX/PCT+I1ipnNg3RmAANNwcOulB/AaT+mHpBFSvNUfQ96ChPdOxLxJjEXcE
+bF3IS1m5flKwuJ6Tpi9PSu5+pGQ7cfgxg/9bhd3sko00sds8mX2humHKmI5vnKNu
+QPxaJv1A5zi9jZo4Pupq
+=6RQC
+-----END PGP SIGNATURE-----
diff --git a/net-print/gutenprint/metadata.xml b/net-print/gutenprint/metadata.xml
index 1fa0ca569505..09e04478b8db 100644
--- a/net-print/gutenprint/metadata.xml
+++ b/net-print/gutenprint/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>printing</herd>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">gimp-print</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0d53f378ec2e..18d1bf583a3b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae5eaaf269cd5ee8e988b035eb20aa23ab SHA512 a8deb03979c55b660ef299505afc328fc930786ea9d473109a9fafd83d72528a9c3700faf4742f2e05829824fc97c3656538e1a607e2191e617f3944f0482e9a WHIRLPOOL bbf5d62f29c0fb0162f34b7815fc190459c619fdaf4f96e33d085f9b7228fa5431b6d668322256995a0a1d16aa1cccb75171000bbb2334ad3b51fec47f2653c0
 DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6
@@ -10,11 +10,23 @@ EBUILD hplip-3.14.10.ebuild 7907 SHA256 4ba6773b226c5e10d1a2f4f06bff5e97f3ce5a76
 EBUILD hplip-3.15.4.ebuild 7653 SHA256 4086a7405cea742735a43a9897ec0f47845464be66d95f82b571c7e0cd560023 SHA512 8f6745c68dc95d6764534b87f60c7c51fca651526826cd13ce7f24bec6edca5e639e957cc02439c45e51e16c608237f383d2e62713c3adc7fd67f456beace7cf WHIRLPOOL c36c5021301d9fd6180486cb53bb80a49e818d45151bd1641bc45929cfac843f08dc6c580f2e3c519cd6ca0d70b9ec1743dc0826365d94f314a49530a69f1cd6
 EBUILD hplip-3.15.6.ebuild 7652 SHA256 12de1519841f3ad612fdb41e2f68a4da0c33efcefc11930b8e24d405f9b33b56 SHA512 48fff8095cf0711c1dff100bffe05f3ee7f0f116ead863caeef405cb66e5e6534fe4abb9ea002c0a4e01831a8ace2ebc3a52665a1a6220c098debc37205a8f3e WHIRLPOOL e9b98c19f5fa8088a80b7340e0bf06b6d915e2da56fc8b52cb73277b7849ed1e6b207544319972a20f6b3c658b17e4a13fbcdc66b474d4852241f716d037f0c1
 MISC ChangeLog 54610 SHA256 36e2b4681b1e4f00792995feeabe88f86a047b7817f3756870e33aadbd6e6286 SHA512 696d3c2796dd25b3d9cbdfecdfbc16029c3a63c6dad14f54d24794c765c70d901f7690139c32bf0fb125cec09c94684943ac0083e08891bba16e065a624cb903 WHIRLPOOL fb9f7a27f715d4025f09c459f516b60dacfb7065aabccef7fc55c9916c6f55f6467202eb895fb9fad1674cded95aba74ebef8e2c311e995df2646eca0e5e2ae0
-MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
+MISC metadata.xml 1817 SHA256 db3b5d18fbd1db40762cfbd1126d572d3ed71fdec59a98a6613152140ff28c92 SHA512 8a62e0e05f36ab7dad3838da52dc2cebdcc9ffb01d2014dd94a05d85e68b0033f4385eed24636651295ae79bdafd2dfa4eff1ca74461e3b2ab231940da6bb5a6 WHIRLPOOL b7e3a3c66333c8d9f7ccdd99bfdf732a98b7a73f4386a5f77a034975fbfecd69c8c265f51da313ddd9f691aa93f932fa43621f0b1e6c4cacf8b97f0341a85d96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV9PkEACgkQlcuUeyFa0U1X/wCcDytj4Zw1+7e9Xb+r0JHNt2Iv
-fZMAn3LGtVvuCobuOcGs8dHMYCsVC1FC
-=cygr
+iQJ8BAEBCgBmBQJVfxf2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicJkP/0sZfVs/kPR4wkI+gGdXBMcq
+K9D2Q95/B4gfbxCHXn2JueM9GTmvrkd7JqCJVydXnUP5hx6hBhwsFoWJWexbL+Nx
+j0yVbsjXOW59QT3lMFleRtnfJ8W/o3YlM9h9Hb98m1OXqDXbOGbIzkh0j30k2ulC
+bDHxoqM825lo3GK4HE4Z8h7VZ0wcjtmZIdswUNpHMpUey+IDvUkoqYoYLRHEy62R
+Am49TkmelzFxfx9a0h054pWUp2xZBCr3hB4p6ni8We6R+acvAihJERtTUmEhoInM
+5Iz+70Bvg3RfR9TO4RTZ9/YSQ4ZX8KkRO4wkrryWUPwIm6uaPKLYwL+uFgRFbhPp
+HSdgBVRDIz11Zuxjyi87vlaSkRM0dusQVu1N6GJQu11WT6XpaSHKwANmbTycoWzV
+6JFa4yUehqfLcJePlISWPI3ai83lOJIzxQ9+SzDVnuQWqMOSqf471QxRO71nMb1L
+rPmwRDiz53XQO3FCu0BcbeBCDHIqJu2IXBljV52e6zeUNmIVGDL77kwWHpRaOBhk
+q17YGUM20euOcUVnXBJ2higjTHYzRlZ0CwIydumX3pCv2DxahwoZhhnmdg6Tegcj
+t7DMkknWBgEv6Lv74kPMynSpS5zWO6rLmn877pnw2AKXzZLIfAM1jHTAaA/YFz64
+wjHPCARzuxfKS7zm0Vch
+=kn7b
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 9e6ad145b5d7..36375d8c02c9 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -22,4 +22,7 @@
 		<flag name="static-ppds">Use statically-generated PPDs instead of Dynamic PPDs. Although this is deprecated some printers may still need it to work properly. Use this flag if hp-setup fails to find/create a valid PPD file</flag>
 		<flag name="X">Enables scanner GUI dependencies with USE="scanner" where <pkg>media-gfx/xsane</pkg> is preferred over <pkg>media-gfx/sane-frontends</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">hplip</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest
index 5e9240e40cd4..b16c0f37f70c 100644
--- a/net-print/ink/Manifest
+++ b/net-print/ink/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST ink-0.5.1.tar.gz 105174 SHA256 d1985d40baae5cb8bf2c7ea554d24530b1cd95cd93cd143134f19ca7e1e90298 SHA512 12a21279ca4f390c5748b8ab1c62770c82decec1f9bfa3e6c13d7a269a7cb28fb96f92506c532f52fb4e3f1b72012e2c2a08e654a91edb1c73d1f7b778dc5848 WHIRLPOOL 9a5d4ad75ef0ad4fd6879aa1104d55cfdbe333d7411c9265fbf3dccd2cff5ebd4fde5f588f4e1e68abdb4eb9f62695b26e5a91b3ef532c7b441e27734bf86c40
 DIST ink-0.5.2.tar.gz 120024 SHA256 65af1e7d886125889076cd52c0bb09101da1a8811cb8150af0a46afe90ccbbbb SHA512 3e04646141b4c3267cf6e29b28b84b2a879a8edbe3356e469b8195b8fb97787144d167ec2bab41b3365c3171638a31dd566cb690725711d942528e2b4c6d4195 WHIRLPOOL 02d3ae224ee952d9f76dd606ef7d044e44cd58f4ebf512c0bce2d063609cf51265bf3547eb4ee6f4b66338a600b16262f22ac9ade8efab4e0534ed074a13e260
 EBUILD ink-0.5.1.ebuild 610 SHA256 535e2f1e947f6e8ce0b26401d7a26faf9e4c5c36a157fe4329a8711e13480be3 SHA512 938fcdc03aae60debcf36483e109b6e47105ac97ffabeb9b3a48c80cc5046a2685222831589d7efeac52ba7228473f437d3fddb20f5fea8cb8eac37a36c9e508 WHIRLPOOL f093eab5859fa1f2ad6156b17e50317fd8e33e1870bda7318c71db46c2a8dcb84837c7f95aa9bdd912f484b0759d5b7fdfbea6887086f82810510858c2935187
 EBUILD ink-0.5.2.ebuild 609 SHA256 fcf739b10a6ebde16bb6af05b2e8a915a644d3d517c9d97e91a6089ba363e333 SHA512 1cae43a80395f210485f24e3e16c32e9b1e9b42236f1574f44563e1672e3590658b072e57022890fd8a9c7cf5916323a49e708d8fe1b8790fbc6c1f98fda868a WHIRLPOOL 27461dad6606fc7e67c662c5ac18bf4e63ecd1c3c38e7a962395eea30af2f7e82001dc25be7e8d9774a12c2259748d9a62086359cb5550e09e704502e8c87594
 MISC ChangeLog 2858 SHA256 9244425e49b6512354dd7439fc0a5473f1ed8d84de3df0859b30039f28a25af0 SHA512 b78d3d8d276821bab6475e4ef53698d8c6c4ee91fc39dcf6f16f2ce23377138ef30fc413aa17e26db60f3f73a02aaeffa79bbb9fec912ba00a366a8ceea56c9b WHIRLPOOL 32b545bc1ea127366b0e97fb8d6e19cf433cf7a122b462c9fa64025caabfe68994886d308350a52b61724b0223581bf0170ec5c1693e156d6742a0b50ac77c68
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+MISC metadata.xml 235 SHA256 be14f84737c356906604347b7bfef9eaabde2c5718137fef004b9c4ac100d78e SHA512 b44e54ad4895824b8d844505aa3bc08ceb4bdd3dafb2cbda0ef9849430ee73692c2e25f09f7ad02a74b5d5edef9cde944299e0bad9d48b0c7a5daceece2564ac WHIRLPOOL 7537c5a11d2f0bde257724fce91e6bee205ae2b0e7a0e8d88c092db89bc76a57489cf5ab6a67979fbe4f253dd503977e7ade610e7bb7c05b080b8279bb6caf58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxgBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilnQQAIZ0KC9VO/PkpFJrnSt2F15B
+MEyjVQdz+OlTRP1K6JmFhTQAufBaDemcDfNH1OlaZA/CFp151WOlhLlqrVqCYj1H
+BpYwJxFlnIFKX37GyswMsD10YvM+JoK4zHcrD1Ow1OeIRNa6zhoxESyxtL9RX5oA
+eMZRdRQSWAqhHJM/Yj7RXBjSKTxiN359kK2DgnO1cF/3Iamj8gqdQbcBGog0TVAS
+CXXLYZeLfa8hrKKcWGC/45Jb9i4iXbjo96Aay010HbmZAC1REai6d2k2WXfSZm9z
+6S9JEcMtcuc00KTbloGX7TAoX4kW0rVoCMLAqHd92KPkbUSGBXJh0o/zYwN2hR8f
+fyoyQy0u0HitpyWcb+FN78zuOGYXcWvstNmOW18XTLUPPk1Pajk7f/e0cYa/eMeH
+zGfKtYWAuSTwY660Xw9AkyAR4TbI4AyS3kB+r9W+wdkO8Obl9bvWGoVkbvLMGrc8
+YLobciFeDnUcY7mULfwc+xslG6W6kB9KkT76jzu5l3fejrq5Xr9F7FGba2Iwptyg
+cF7DvmM0LZ51C3R96bY/ljzwjORb/Ho3Ndmc1g3JiKPXx3zRzAPoQ8ewj2j/7XAQ
+0QRxnSUNkNJ/vCabjvFx6mtCmxL4ScEWB/Diev/5HXOQI4lmdkeysWI8Dze6wys0
+/zpVqMkktkKDi9sJjorD
+=Qifj
+-----END PGP SIGNATURE-----
diff --git a/net-print/ink/metadata.xml b/net-print/ink/metadata.xml
index 1fa0ca569505..f2b69ae1caa4 100644
--- a/net-print/ink/metadata.xml
+++ b/net-print/ink/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>printing</herd>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">ink</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index e397fc294339..4c2476bd69a5 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libinklevel-0.8.0-automagicdebug.patch 671 SHA256 916a2f6f3bef57d62fbf0f9283ee8487ea4596f7f9eb009cd3749479cbfabd8c SHA512 1c3cc70e969dfa1cd574e27566a92f7dff82638256c5ac87f6eb6ba847666510f2616e54637a9cfd7a9a9c05ad9b4f279a0fd2c513e725d824f858cff1c298da WHIRLPOOL 005ee0fc25a69f95c7ec1afec7b725f24702c5d4fe55bd123e0dedcc6dc07db77b9fa54d1811409d01ef0761874b81ae545d5111e8ae1869aa63e7420cc89af4
 DIST libinklevel-0.8.0.tar.gz 326397 SHA256 1442cdb34c528b5c50d3cd8cb19eb07054a773de755aca0c4073346b8f1de3be
 DIST libinklevel-0.9.0.tar.gz 367521 SHA256 380df78fb814add2e1c63bd5db0a169e8eea1d1378d9e1bef6a3879124384d61 SHA512 23ff9a0f959aff953006a51d1bced235be57dee7bf4046147cdec85525b8d8003d3d3d22bd116b7a3adf3620b10002f736e0156968c78224bccab63505bc5b49 WHIRLPOOL 8c5ce8219a763a0312c6fea33147c044a2559ed77de164cac1284e4ca391533211cad44ca13208afb122f369316deffdb305627713cec187f0b4921dd6fa8266
@@ -8,4 +11,23 @@ EBUILD libinklevel-0.9.0.ebuild 962 SHA256 51546106c3d280cf926a5c69cce1328d3df4d
 EBUILD libinklevel-0.9.1.ebuild 962 SHA256 ff3602e059b62fd95117872baa11551597eda4c94c610b38b2a40fb3c6e92a63 SHA512 d810d42e733f0d056d5995da5335827a595897b141a93c0053a2143b12d6fa52a53d90f689530ee683b42a42984898936b8cafa80c1fac35ce27d36f95d66aa5 WHIRLPOOL 200e22fcc91f1d2a179e4399a3fc486fa33133d45b0fe59e0bb65f02c56ce32b9690805bd4b3ce51cf6ee49572c6b591ba13b7b1093d8db3b89234c7effbfdb8
 EBUILD libinklevel-0.9.2.ebuild 962 SHA256 fd7d1ae83d2c36c4d248680a804b49ab5aba2c15041aa2f80dbcdcac98916c7e SHA512 376521f1215c7e7e94522b7936399c099aadba0b230bf0935205a55d22964a37c2f591eef6bb7bb99b1209c7f4e2f6b6e22d8ff729c3a4a46d5b76629858a3d9 WHIRLPOOL 9c2b3d1cfafdbea02457c73b3b1d8037050ca6b04f807689d9da304cf63cad48bcc824b380e3600413e03a94ddb6359e917030ea09ffe58d3241b4ecbb8e63b0
 MISC ChangeLog 4231 SHA256 f9448f37f00e481ba74d304927b3e9ec89cdebea6141c1e8d9700725b168a33e SHA512 6129307ba09d99435228937d871b737fb84a6444d902b069f3d3d0a14f889a1f83ba82f4b7b55fbf01d35c7a9c7bb62f3beb70815dda0dc6f7b87b2251bddf06 WHIRLPOOL 64edfe26281ad8af7de61fb55c978773bfaf711f614770388bfddf5dcfa4e46dd3e67edbde32ec24304a8a77ad85a13e4c61a54917b2161cc66d6212a224a74b
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+MISC metadata.xml 243 SHA256 e2bb0cc649e47ea5405a5e3eeb0d95e92d34f026473a311a775c4615918c1ffc SHA512 fbddfdb6f3acc27ed9216d6482c73393f6f860a16e6920de440b08e8dc05f008b044b2b26698b5488c12e74e02afb7ef2bbaa277cc73568116a5a8b215a833ab WHIRLPOOL 55e3a1ff5ecadb46bbc5db76e259847da73335718ebc699950404ce2748de622465981680a4f1b00d86a859099a4e5e77a5606300ef591e06016be0ce3855c56
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxgRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPfIP/3W72gcoTITCxFMhZiNPKEbb
+yCf7nYOuNzcD6fNH/SQB8OhDfTIoEPYTGqkdmse0DdAqcnVYNxRZpsRApHhp96yi
+7KVVYAkWTsz01bsDIWci4YaxTmUanbP7GNQdIMo1qIZI/CBHEszl4E+fmK5eIREb
+7I6VOhjqBdgb0mk6TROYqrWH6i9DEbwaQvOKpdy8hbHPm6JQy1IgQ29FlH5Q1Ig1
+JgfmjJF9cDBYgCfuICeDS6Izr+fT5PQcHvF7c3e4muCawBPWuzQ75Q3YhFg0Cg5+
+MRwJdmvFMUKH1Q9JksjVc/q1a6Oj1FVV+tDExptR6tG1J4axZhc7V+h3eyuA+gQ7
+EdqIsQnpfrhpOwLKXCi0Y93XOqzaVgIzvt5hpL9nQ+B/G9aW62ReSLURV8zjNDXf
+CvQfopre1dLz9L9t5NCmv9kNqFwHt9ATznVm89o86nSeStQCeA6vkk93Qr+R/D4B
+L3KZLEqhoXdGbYRQXRRSq9XETOddLFE2JJP2YSWrJWFYywvGMX9JLVc6jyUQOwpo
+uoPj1kGaP1aNQnxthfyDER6LAG5zzSAR2WzcS6bYKvlr9k2S2x6y/BL9KjT4DEdK
+JWXdBtowBU2x39L0RjZPT3kF7oDQoWPhiUc7wNTIPpEeO8dwguUp1s9bRJyUe1M4
+BXwCtBpyFM/KgNtU7wg6
+=sGOI
+-----END PGP SIGNATURE-----
diff --git a/net-print/libinklevel/metadata.xml b/net-print/libinklevel/metadata.xml
index 1fa0ca569505..d737387c7805 100644
--- a/net-print/libinklevel/metadata.xml
+++ b/net-print/libinklevel/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>printing</herd>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">libinklevel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/npadmin/Manifest b/net-print/npadmin/Manifest
index 4a31aa75273f..84552b646aa3 100644
--- a/net-print/npadmin/Manifest
+++ b/net-print/npadmin/Manifest
@@ -1,5 +1,27 @@
-AUX npadmin-0.8.7-stdlib.patch 258 RMD160 7a65277d517ca111952c93d46e3a91fdcadf7aa5 SHA1 493b5513c7ed0e18bcca51a01b0ea722747a3029 SHA256 734384620481f6f90a857174036fbccbd79d7d23601b8cc32a4197623a41732a
-DIST npadmin-0.8.7.tar.gz 104209 RMD160 af906c1839a439f7212a1842953d2adcb7cf3df5 SHA1 e9c9983019ae16eb0048d7b4b8b90c9103e4b67d SHA256 829056157c5244e200af96d323fc2436bff53d353c671de8b1e7d7e0bca5ee1b
-EBUILD npadmin-0.8.7.ebuild 760 RMD160 8a6084d9c0d5b354d1d74c53a73f8f9815900027 SHA1 a209fce98fb1316780eab3ddd2016475ea5a2042 SHA256 2429115c231bcad406f0a8ef6c6acd27070a8311dcb8229a62899ebef888cd84
-MISC ChangeLog 1004 RMD160 0672580a8d6573f8a0fdc85113db523f5912ba49 SHA1 9899265594d6c5b29addc8adaf44e128135d683c SHA256 b516ab1e66c8db00425f94db6e472be2d3c1161e47c23dcdef55198857ed0918
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX npadmin-0.8.7-stdlib.patch 258 SHA256 734384620481f6f90a857174036fbccbd79d7d23601b8cc32a4197623a41732a SHA512 36d4f8225e03f0d3ccde706414179a5489fbdf7ec5fa65e083c1de4a00db1626e40195e1e48b7213bc63241907716788c85cb10daea08c64aee6d8ac09094ecc WHIRLPOOL 1087dc7ca5ca658fa7d91eb12c157b5d831c13690299b561d1a1b05100c421999b5d69cbf04bfdd0d1ad191f4690f8896892646fb8f2cda3af616493504c254c
+DIST npadmin-0.8.7.tar.gz 104209 SHA256 829056157c5244e200af96d323fc2436bff53d353c671de8b1e7d7e0bca5ee1b
+EBUILD npadmin-0.8.7.ebuild 760 SHA256 2429115c231bcad406f0a8ef6c6acd27070a8311dcb8229a62899ebef888cd84 SHA512 b21c8b0337328574b26fd4111d2c5e12e8026dce073559c596a4574affc047ca4947509c0944ddb4a290f0fe8c2cb6a21df37591b968eddf3db0f17198da99c3 WHIRLPOOL 11457c67760e66c290c7b4419b7feec10ebc9515d6aeff1d389c129264412886e4eacda1cac4589d049106b846cd13dff1b9399db6bdd20f1a9a4ea4a19aed68
+MISC ChangeLog 1004 SHA256 b516ab1e66c8db00425f94db6e472be2d3c1161e47c23dcdef55198857ed0918 SHA512 0842490ec86b81827865470a18c6dc2408b047dcd3e6c59a5d018b54a43cb8f4c8ffa7620d8bb86bd92526e3d4642839a33d14acc8d57987c88b955b59135706 WHIRLPOOL 3ed8352972e205e9ad0bf36a9602f94ecf75782ff6f5c4e775012820055b17922fef3087973fc0c05919d7cc141c1abf42b03bac03e6f1f1ae36e8bb67cbfc2b
+MISC metadata.xml 239 SHA256 f73b998f45b62f63011d887df2db1ac8861cab58a59357ecbf61022d650f2554 SHA512 032d72dabcaac6c419ca2b50a130610d08bf2ffec58dbd8098fe470f3223fe0dacf2451877c73307d860d3349116ce0614584e0c4606881a029319c51c12136b WHIRLPOOL e4fe39ef4a3abab111d4e57d54698c8420fa2077a0b42ac4f3b442a559782b71b85c8e46e386f772c6504f884fd1acf12722e1e5f78d8690600b4aeeb6a9bb8f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfxgeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijbAP/2zl4Cvi0eNtKQaNixp4Ny1u
+DrYVXHE9NsBBnHkvPSzu4itk1aCaDJh+ezHI38k76mvUH2ax8tUPo9HSdEHrjPgJ
+0EUl4VLVZM1BmqAA7dGUoRDyww29kNgO2QnNpBKfpMk3c8mY1sqkt7YkTktF+rEG
+ke8TEtIRmFy1mP5PmHJICLQSQVAHXkd3G38JQe6rC6Jbu2hwfzZmppGgfBqd59gN
+ukiLDHzT9eDUwRBDWU9+yQcvONq9CWaJma4g3+R/qNOqcKtYYtST0KukwgKSXLDY
+VGGgEOjhqGHXPaOPgwJ2a+C9aaeh5aH3bwPzJ/LI8P4HeHwc+Pn0mj1GanrNIg4T
+11+Ft9qsLaV3woijyrdN6dNHwcpfsL2RlEPcE38AFA+Y3h3nagidfDSgMaAC2S2v
+g/o5W8sCvh7bWizHnjcov08V9GMjihJimrIh0DEnQ4qcRY1GY0+GW4pbB03NZ/Ai
+w3rT1Zds665uF4STmTKe5ktENbW43INDoZBr5brusRBAhEXez3El2ECrmQvZz7Wj
+SDGxgN+Y5ricQ4tTxEenZpTj2pyJD7HX+RuwZDpbqoqPzXSDmnvyKnaGLjnLCM+2
+A8/jOsxhr7z9nQWLwQRPrqBqQmiG4D4bMZQwwWYEPv2H20NJFfDHIBpFJHOyi/DK
+m29gSX5RzTurW2ltueGn
+=Ro8s
+-----END PGP SIGNATURE-----
diff --git a/net-print/npadmin/metadata.xml b/net-print/npadmin/metadata.xml
index 1fa0ca569505..911d11367046 100644
--- a/net-print/npadmin/metadata.xml
+++ b/net-print/npadmin/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>printing</herd>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">npadmin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/pnm2ppa/Manifest b/net-print/pnm2ppa/Manifest
index 58508423d277..71da4c12251f 100644
--- a/net-print/pnm2ppa/Manifest
+++ b/net-print/pnm2ppa/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pnm2ppa-1.12-gentoo.diff 6344 SHA256 8d413a0237fd531e641ca117b0dac994b0fc24aab736aacd3ce3b552ccda3eaf SHA512 6c67b32544a89f27109945dee183edfe942d27af43e8785c563d2da527e79dd294c4694ab7f575f42cb5c7273a02233622ccd71bc9e0dfd3dfac73f2b751d51f WHIRLPOOL 81f7e1e67df13ef1e7f38eb214fddab4f9d0ede4e0fdb1c69980da9e1133dc8a244b3e1755bd4b29cae8ac98b1e6246c42c8a9ed4f06f0f01f500be280621c17
 DIST pnm2ppa-1.13.tar.gz 291190 SHA256 1c50ea2c97b232f5bee6ac3fab408d64b6f1380f1e289ac278778a7e368e7379
 EBUILD pnm2ppa-1.13-r1.ebuild 1684 SHA256 d1cd97117587e690127fa589d41826f25ce3d8ffdb2412cf74dcbee2f74eb97c SHA512 473e58909698feba0f195ae1f57570f53a9971390ace0ce2776e4a2de5c4796c11cd26117c4c79c0c84e2452ba3118bf98bceef1fd045ecd5a3da96f8acdf556 WHIRLPOOL 4048c13cca80d0aeb5dc6c937f5b3ce0bb9582212f6b986f6edf2cf7004cd5913e22008781ccee6c72d830af5ef577e93ef87dd4a2dc2dbff4c7d35b1a40996b
 MISC ChangeLog 4097 SHA256 1527e87211c513bef58b26713cca29d37749798412c1d2c2d7877fc4b0e50373 SHA512 d2e18d736c86463dae44b4625a66be4f18c27a5249ffbff88243fea3c2efcd1dfa790cfa81c37eac389016fcea23e92ae96c4ec2dad08a032c8be79260ef7725 WHIRLPOOL 6e7b2f55775ad40e315bf337dcff666242f270c4ab0e594628599934a687247bad3f2653a82501644117ecde46c746a3a1cf095ac02ff8a48f52f082ef72463f
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
+MISC metadata.xml 239 SHA256 c3fc28b47d4df0a9894d847dc35d29bd5b7c3ada04bd6b839033901bcec34ce8 SHA512 201b4fb928a611ad0ddd43afb7f4d567f0627ba1edc856f9b4d79f62b35388b0e496f54c7f1a2ec47cdf0098dde8cacedab22f9f5547cca947854526ba33ce04 WHIRLPOOL 70f252dc55cc0c390c499d3b7f38a7e2309c1e1003364785296caa221dab2bddca6094ea0fcda89b5ec5de4f4324c3e799b86c796092a9569a9903e4cdb33abe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJSyeaHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcwDIQAIgTvIXZB8rhUY32UQbsRPkC
-50oo7a3ZMApqgqFtwwsGr00Knv8Em0+h6i6OwS9KfaUmNon1uq9YDQ8iU9Cdv89s
-RGAkfCxVHowxxlgIIbIGFYdyc9GnXR1K83ECKW9/yuC/4DaJ6/lT3U8wdXvZtb5u
-BEeVPSIk6mgqM4h9UbGHdndHlgY1LlSa51OeYb0SNC1+KUFYNoeMH8pb7JeqDjVi
-PINE5HjmNSbXYP11QXLSR0lmYWNy9JR07AVC/GB62hMij1mM2ohy1XcIxI/lb0rY
-WL/vRrcgUVKyNh+6kruUPKu7dwpA332sljRcZnVhkdkq4q61LcXRacZwVe/xbndj
-o2+ssNfy+2YnO0zAF08C0JpkQkfXbdhULU7uu+3EnkaNUbDD+W/sz6/8C5mp5qj6
-YlwcCWUTXFhRin7AvitzVw8hFXi/+S067ByLe4+gL0nRtXrSihucCdsqrKyvNnpW
-5ksnVw/Qi07R8iDEr7MF5PPgy9oiHXfFi2FPJydhl14TkzceFpHPcx3yNn7OlLlZ
-Yj7SYlT5Qtqn8frwe/VVe5RU4UwVitPn3UlH8OausceOw4ln+l0CZFNd34r9GqtE
-4JsM3oCOqDPfY7rBQAlkZ/LUCSC2AblwTnI9vGU+jCy4WUIKReudv+NDbkawun52
-fiJkfsncymawyuQTQJgK
-=Mbuf
+iQJ8BAEBCgBmBQJVfxgmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGXoQAJWq/9XSxulVTZxa/Stjb0vq
+Ssgyoty7XRzsv1Qq9GdqkKMmWfikMZdCTc4yk/0FIX5MGDVEPLTYBeA31eJ75Quf
+psg/aDyHvk1Un4JrC+/01pj10cTsVYpwhe3bN9N/mLXQAuJ3v6dcCbAbq8UxFD50
+lSDUIEArmoEzVyI7El/DfRqOrzuw7IPrdpUdcXG0azQPkJDfsUaq0g8UgeJaZp36
+dWVykn6FY9ZD19btGaS3ayTwt7R0FfDuLHVvRpZvmybUrC4acPEtjv89mXCBB8zS
+T7Gs5FUwRAQArVFsXirDhU2y0X72cpijrQMqDc2JyFFP7n8bKVyp9q1H7Wx3j66b
+i32zmaMDvBQggt4uB1rKF0ZP08kXkFX+qwAcsBQ9mEZ3isVNHNLH8MHtTOysGVB3
+8SyA2L7zfJxstXgM0/JKZJIXM8q9TAVCrcSc5d3PsVqPSb1r6FQ/Nb133z2g+JNG
+Lgq/X+4D6DY61y/pRQsCKmoQzPjzJNoBaVyOKyb/J3nQOG7OHzyV0bf3IbpRLLTf
+U5ZVui2fvIggbHj5uT1oHi+N4bgOk/WT8vueC3mSwZ/9sNWH63s3dABpgxR62tLQ
+c9DgvtGITtbvIKBin3s0+zTzv6tPaSjRyzBvbsJZfsWS4RKL+EtXPOM7FyK31jZD
+S2e0ymXWUTvHeUUsIGeJ
+=5g3Z
 -----END PGP SIGNATURE-----
diff --git a/net-print/pnm2ppa/metadata.xml b/net-print/pnm2ppa/metadata.xml
index 1fa0ca569505..9a586855c36c 100644
--- a/net-print/pnm2ppa/metadata.xml
+++ b/net-print/pnm2ppa/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>printing</herd>
+	<herd>printing</herd>
+	<upstream>
+		<remote-id type="sourceforge">pnm2ppa</remote-id>
+	</upstream>
 </pkgmetadata>