Drop useless USE=doc flag. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

9 files changed, 43 insertions, 258 deletions

diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index 37ad41cdfac2..02ad23d18a0c 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libsoup-gnome-2.31.92-system-lib.patch 5433 SHA256 de4fd6dd04a6972fe63e4214fc4b0d55eb8aec1503261d1cfdd3f11d1970425b SHA512 bffe26884f58e862b74bd132d8ebc680d1da0510fb65aa894c30e31177f3ade074c15a3bb6552d531b83f3a628e63aa3600cc97f648709d7bbb31f63b035e1f7 WHIRLPOOL 1d6f4b564faf6864a887e453b04e2c19708651ef9ef0fc3ff0e154e04a7ef71eb4523a8e01eab3ed4d2bcabc8a18f8de081eac4e8875286cbd466f1b2134504e
-AUX libsoup-gnome-2.34.1-system-lib.patch 5725 SHA256 e79bd7a13b97313e03c6658ed24d254fcdf0173911e69941a73a23362cd12726 SHA512 a0f6cf99a5e7fe62c85101986b33e3c5c57c43cf72b28c5776ae4960a5c872137d9007216e65336d1b078471426bdc5897dcf55e6f632aa317a7b9ab2cd6cdd8 WHIRLPOOL a537e6e047d0b32bf2d37911b6c796f7c2e2c7cc905453eb064f3c9c4b45bb2b16337f997deb81e6dbef7dfc3532b96a25231db127d3e40bd11bf60f20e40c50
 AUX libsoup-gnome-2.36.1-system-lib.patch 5725 SHA256 9e036ef690958aa212493a753ff1da80e34b97da79f2af5395d1349ff188f629 SHA512 3694fd8bf8003acd38ecc4b75f03a66d146ffec8e46521e1d424eebef9e2a3a2cced247eaa6d74a7045d3b3e8ed5e2658c0e3128908d94b1a92cdc079978bf00 WHIRLPOOL 4dd5949c0a5124d617010d7fad87df9a2e87001fe5a3868b133670659bd5d0093e4131881c73b85f8b0988ac04a243011460bf9fe4dd578d5b0e2164cc79605d
 AUX libsoup-gnome-2.38.0-system-lib.patch 6632 SHA256 6693f3976025c07d5ddfb5c27ebd46df5c92491691fdab7d07d47f1058ac696e SHA512 2434a6515bff745dc615d5a80f3c8c6f555ce55f0bd1748538d4571a97f973e811693aa2b8352f47c40ff6b14374a7a2b8b42b7fb6cb3c117a88353c66105399 WHIRLPOOL a95f9c1699407cbd8c5451e511bab75e8dda8d986cf3960726c30f40c4e76d13990a6e9ceb9a49180c5d02e8973f16993ce01ba46a24cab6a1dba2b0c17f5398
-DIST libsoup-2.34.3.tar.xz 595916 SHA256 c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c SHA512 ef690ca916ddd26bd0f286d46d2e29f8c8a32900f3ba0c0d94110d4ce3b362dc84fbe69b9466bfa8aea6a049458ec53b18027a22a14022e4445f84e15bbdf097 WHIRLPOOL 299ebfa742c8dabc85df080e8edce524539d6fc4d5cb9a8cda1060d8ef0dc104b409b8fc067bfe4b08440f73e9242cf1b2f0edc692ef00e93f37b621cf1a9594
 DIST libsoup-2.36.1.tar.xz 608308 SHA256 73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65 SHA512 6f4ff97ca62758d72687ee00b991306ee65465898292db7ba4202ae09184bd324f2cece185eaf61790d11920853aa72d0c79653507fc3c431862789d22b5bbb7 WHIRLPOOL f41c9a83228f28f48502d4425f6f7d637ac5de9ea157959866dc6f20373739a958abe3670408ea37b39fc5dfb6e330265b41ab60b937892ccedd36912ad2cc11
-DIST libsoup-2.38.0.tar.xz 618636 SHA256 8fc1470309aacfc45842ec774b5a5de1848d3d59f7c467efaca555b21bef96ad
 DIST libsoup-2.38.1.tar.xz 620832 SHA256 71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a SHA512 57d4327abb59bee0def4fe8419fbb63e3112255a12792405329a25fafa4e8cf2a531a3eade13304adbd27cd94c9a8e6bd25d7f83674978f351ea62de27222127 WHIRLPOOL 38e19a1060270d76685ca3a99a93d441acf8775621f022b6a1a475701848f839189bf868a08736bfec6160fda64f2dd4f6ac1fef8f2ffea98c9f554a506e2e8f
-EBUILD libsoup-gnome-2.34.3.ebuild 1446 SHA256 bfa01f875b907836874fcbe96a356c414d04c7c701f964e3ec24cc1353360856 SHA512 528c5ba55b76dbee60298b81010a20cce2c0842251c463486167d399666c255621868db02b21b99e2eb9711a710616bbce55e837eb448c65ab9bbef30cb08033 WHIRLPOOL d61635aafab26db6ed276500e1f2f395f15358b55da41ac3770819dfaa8aa3ce21c10e2bae30238a9187215de370b12f55159699718eb8b31634c7553fff4f18
-EBUILD libsoup-gnome-2.36.1.ebuild 1419 SHA256 47283d6012028659f3e23ecb3333dfcdc421e49f5ec9f539b6d6ef3cf3b9cdbc SHA512 b9e7ec64070583fb965ed39ee08d08aeb220b2e6394854db1bd62b797037c91988964ef2f7968051e55df2ed0ce4fbec7d2b08b46ed91e360407c42e2f11a409 WHIRLPOOL 3c9af191bfc2c243bad8c16daf73f44dc4f4e2e6febc40a1327cf423b2383e54bec5b0943464936aca51ec68b2484566a27578916b391eae8bfe564d6e2fac34
-EBUILD libsoup-gnome-2.38.0.ebuild 1428 SHA256 35924c306a4b192668f9415c689ce3f0aff5f72a3c8300ea0ff08e81227d1fe9 SHA512 a7e542038d7fdedab1efeb9da33c77110167ff5a566c8d8f376b3d45b062df8d192ee4c557d4c28c2ad4c3c6711877e659a75e451d779e38ad20a1ff6148fbd0 WHIRLPOOL 86459f022bee7a6cb0f7be9fee609efb7c5f86699b11a95de07ce32e0da7f624b6fbb6020a0806b458e44f274ab3e8e4cf7c5e7dff828a393029d71b5dd0fb21
-EBUILD libsoup-gnome-2.38.1.ebuild 1438 SHA256 f9a591885a06ba4fff550f71ea6fda8dd07cfb333bce1ab5a8320f421693e602 SHA512 2417727ff2b21511d9d6ae306441e502eacd3fd1d17cda96ef46d76b23ef2001839dac5ba5bc23a5e28afad1fa022dc713690320e8acaeb1500307e67ac71ee9 WHIRLPOOL 44fb1087f4ee2948e9ecee9b97ac9732ef74bbf779bd2a5a38d8347b3891fc7d0a3f4b6ff7e14bbd6f9712098f6088879aa2364d7e5959f59fcaf0e8bd3afd95
-MISC ChangeLog 12230 SHA256 948570d0bf32f8fb0329c33a3a922edc0e0be3fac0db987fd31f2bba08e816fe SHA512 37563b9b9114562865c0a29bb1026048a30784ad9a5f02458d2e6fe2bd75562549146650b223349cb365549578276caf560052b4e0fff42a1ff57c694eac5b16 WHIRLPOOL 6f12bc92be73da3c9487fb264529371c6e7b16a1e3ca5f9468534a33a83d19f3face3aff3b6ee648cea23d84e0ae0458700387c3f5054c7c22b230896bcd48ad
+EBUILD libsoup-gnome-2.36.1.ebuild 1402 SHA256 5f6c3ca19caff5f70910e0823ce08b687b4a171723271aae6548ebc0f5615a81 SHA512 b0b7c3ded43ca2aa5a9a16ad5b968f7c9fb3fc3e641179dae8b3b05bdc01de80b11a28da4660347f40c19ef1cd67f702561a21140c96cbb2cb19f46da7ab0f5c WHIRLPOOL 3b44508848ae4eab36d2102f3d0a42519ec6fcf98ed512f73b6230ea55c2f64a8e89a324196a6b8e3d253899cbd4f8e8fb92c981fc72cc5f934ffa12dbb5a4cb
+EBUILD libsoup-gnome-2.38.1.ebuild 1418 SHA256 53c3b9b75c897f1befa11ed71d85894f2f4d5b141db301373b040d336878ac63 SHA512 4d42899baed8f2e0fecc7c8cf4098eadd81a998bcc39bfb659d86fd58ee117d845631b02c0121d442de41bbd741ed424aac7a482d6986586e1711155261da386 WHIRLPOOL 197385340bcfbde7b728922c96d76ac92ee725b168fcdbe41e2264202f660fb0ed12f2a8fe2199fe2fe20b561da02a7fb3fba14fdd8ec0139516f49f4bdcfbb6
+MISC ChangeLog 12648 SHA256 d75ccf2e1d62119805d06a21375b4ad49ab85661b8b218b6e237a601a3b253bc SHA512 b14a5fecaf596a14418a324978529f5e29b095a63a3e1dd49c4f7dd2d809845f427a612c2d862ddcf8c417b483260f499dfd7b135fea74395f83b2e98289c09c WHIRLPOOL e76f411ed511328b392e3db6a58836a28c1ce051411d12adba41dee163230372581231cee7d0be67ee16eed88743a06c18ea2e06d98e2fd0f9a992a5c078bae9
 MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBwz7kACgkQl5yvQNBFVTU7nQCbBRV311eDXsq9qqiR8dNES7TG
-5ugAoIzv/uEgKXMk0yAyfr20dX2PPzRb
-=4nxv
+iQEcBAEBCAAGBQJQdOkIAAoJEJ0WA1zPCt1hnyUH/inCwJlE97+CAMsBpYAVtyZV
+33/91V29lVpzuoadlngWvHu3mDnyfhjPNJ138e30S0U04GL8Iv5s+QfNuErvaLlK
+8o9+To+GXozozO8EFepJOp912vinivRYfeEhOkIvh5SWEBp8YHjYLwTWKjB7pQ1G
+0bz0VbelMj/kPJyA79SHLN0eeBiB642LiGXynUcDYnQaVY1LGpVZnUVwhm60yDBx
+SU3FaoArZkA60/K6yXCQ0d/sQIdNXs7m6YfQqK7WJ0zQECACo7vMsMJ0ne/NxzwE
+bqwSAGG8iKtqzWx/7+7nIZmjquiF6+YGMi3TDY8uM+Lc/HPveZHsBB3j1Dwj/kU=
+=Y1fr
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index c43bfedc957c..2e9738f9f3f7 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.289 2012/10/07 00:41:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.290 2012/10/10 03:18:13 tetromino Exp $
+
+  10 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch,
+  -libsoup-2.34.3.ebuild, libsoup-2.36.1.ebuild, libsoup-2.36.1-r1.ebuild,
+  -libsoup-2.38.0.ebuild, libsoup-2.38.1.ebuild:
+  Drop useless USE=doc flag. Update license. Drop old.
 
   07 Oct 2012; Anthony G. Basile <blueness@gentoo.org> libsoup-2.38.1.ebuild:
   stable ppc64, bug #427544
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 2def1e93e7ac..abc0833e2f65 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libsoup-2.30.1-fix-build-without-gnome-with-doc.patch 1818 SHA256 f385b68a7a6db02634e2189e775bc2eea54529ccebe1eefc4b81a12c28ff0e89 SHA512 e436c38d6b5b2219b96b4aab19c04c546ce29bba16ae4dd7cdd1db8f9a3e0a2028dc4472597318cfc4d7caaa90e29180701f5e8938dcfd81cec63251387cbe6b WHIRLPOOL e37d92a89b55a286b8d75c24f061b273fc14fc354d6de1f68c653e749248252e697a5a832d14b1fb44ed5c162f01fc2caa876413e6ab1be41bfcb43c9d0c2095
 AUX libsoup-2.34.2-fix-build-without-gnome-with-doc.patch 1834 SHA256 d4c1e1a36eebb9264a2d33b4b6efcc5076c62d9669eed67151b5d777e6112986 SHA512 c67b39f150b492c3044f5dff4de5197033e18d11f76bf2097b5672a8ac30aa1c79f2a2a3b3d80437590bb3493617dd4a8fba5e21bea83e2bbb9bffdb479d1597 WHIRLPOOL 9fce71a8799268540388a0705c12859197bc17ba101c6bbb13c974602609a5ed658e8efe0b565e352ffcd41e20868fea216ad933ead01522d620592073af0b3b
 AUX libsoup-2.36.1-SoupHTTPInputStream-GCancellable.patch 3461 SHA256 3282bdb0f5872bae48392d1ea744c711ed1ac17bcd7ea9e3879e9073c9f66d35 SHA512 a6b49762966028e2ed9c3a7042674690083bdb34a655ab8f6c4f17e47f7b4666835cd76f734cc01664974e62281cd3211e201d3c4cdec4c514bf1fa027b90975 WHIRLPOOL afdf270a2fb30231299fb8ffabaa49de0543092803ed62c3492c2a40b331c46020656bce0e3d99f7446ccfd8acefbb35911cfbeb1b82df55b97fde16010d5e7e
-DIST libsoup-2.34.3.tar.xz 595916 SHA256 c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c SHA512 ef690ca916ddd26bd0f286d46d2e29f8c8a32900f3ba0c0d94110d4ce3b362dc84fbe69b9466bfa8aea6a049458ec53b18027a22a14022e4445f84e15bbdf097 WHIRLPOOL 299ebfa742c8dabc85df080e8edce524539d6fc4d5cb9a8cda1060d8ef0dc104b409b8fc067bfe4b08440f73e9242cf1b2f0edc692ef00e93f37b621cf1a9594
 DIST libsoup-2.36.1.tar.xz 608308 SHA256 73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65 SHA512 6f4ff97ca62758d72687ee00b991306ee65465898292db7ba4202ae09184bd324f2cece185eaf61790d11920853aa72d0c79653507fc3c431862789d22b5bbb7 WHIRLPOOL f41c9a83228f28f48502d4425f6f7d637ac5de9ea157959866dc6f20373739a958abe3670408ea37b39fc5dfb6e330265b41ab60b937892ccedd36912ad2cc11
-DIST libsoup-2.38.0.tar.xz 618636 SHA256 8fc1470309aacfc45842ec774b5a5de1848d3d59f7c467efaca555b21bef96ad SHA512 367cd88e988d8456fa0b1aed19a19869007f4d6b1e3c678075973871efbc8ad4ebb57f288f63423765a3bde26c474c0197ed8cdceb459bdbf4d3476b0041b398 WHIRLPOOL 7571bca26eee2d397833a5aca3a08ec892d99c14b9439bc2b4fc2182fb2db0bda03e1199d68f5fc9b5ea646c9173397f1b2fcc8916ef6186c9fe29f9c6c5db95
 DIST libsoup-2.38.1.tar.xz 620832 SHA256 71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a SHA512 57d4327abb59bee0def4fe8419fbb63e3112255a12792405329a25fafa4e8cf2a531a3eade13304adbd27cd94c9a8e6bd25d7f83674978f351ea62de27222127 WHIRLPOOL 38e19a1060270d76685ca3a99a93d441acf8775621f022b6a1a475701848f839189bf868a08736bfec6160fda64f2dd4f6ac1fef8f2ffea98c9f554a506e2e8f
-EBUILD libsoup-2.34.3.ebuild 2201 SHA256 fa279b4be441e92e279967c9b2e4d741bc27e1d839ecb5a8bffd3c3f66e86ab5 SHA512 f6557a313bae02efa2b194bfab5661d949e3dfc90c0f07559bf049839bdc24b0bcf9188cce0a0b0e2420d83fb647ae84d0a5475b696055dd3946943f6f90b59f WHIRLPOOL 466dca1cee7eec21edb8d5af4ff1c8517454577bf1f185450a30410dac272797408c88b72eabe16896e511aba81e9415919a0348a55041c546238f55e95f2dd7
-EBUILD libsoup-2.36.1-r1.ebuild 2495 SHA256 aad18239fc54abc86f7d54e79568ba156897f2ea36ae22e3ac798e4484347854 SHA512 1c95791391b296d6725e13379c4333ba490364150645a434f288dda4f225d1908ba6d6ebd977e0c9fed11a79ac2712a2e238e4ee30ac3297a95ea3e08bffc055 WHIRLPOOL a84c19172cac521874e799548b5418e14b37a77751286647d593a117a06f2d5d377037d0fce7039bdea8987dbf417161261f9cd39eda7b1e49ab1090d4e23148
-EBUILD libsoup-2.36.1.ebuild 2368 SHA256 8dec67ead633af234b3f623b00972b9aa0bb95b0326f84b7dc37e63a4f8e3b0c SHA512 6cb615bd4fabec4be965017fe56629aaffec4a5f377ba3d32d1668aec44f875f1733e36e0e5e914ee42b350f1a078395b7e6d9a5ee976833c96933787bf93e64 WHIRLPOOL e58508e25244682ef8b0f1466fc6d293969b37abdc44f9fc9df90250f03e6a0558115b187c95eff9f8ec039751d8cc7e74e2b389e86827a25d0be66935ecc8b8
-EBUILD libsoup-2.38.0.ebuild 2310 SHA256 e9737b9bcd9546cf671bff9e9bcec251e852177e00fb48b3531897609757e73b SHA512 79e7a6f1a88b4068a6e03ed78b8ef0c908f36a4961a817b2b3d42b0e28e04c121e87e38516903bfe0d25064a427405f1f6cd9f348a5ce9f386df4a42b2cad336 WHIRLPOOL b87ac954e52f8950ea2f7365efd16fd6f84cd7955d87a84bb4963cef00b801602b2b568b168af711f49fa792f4f5747bf7b7ddd176c2b13bfd1a7c37857b59ae
-EBUILD libsoup-2.38.1.ebuild 2319 SHA256 95dce4c2d3faa4f435471acd67302171b9a378a31ce3aae588ab6256d93db4c3 SHA512 e9270b069ddaa386f7999334afb890e5c7b4e1e5dcf59d16933a28b7b9226d9c89254ded125cffc0208e6b77d724065d5953ac1945cf6d90fc9650bb612271f7 WHIRLPOOL 1b220ab6847e9ff90d38d247742b20b1e9ce17d68bc3b0d9b23573f19d5e4f14b75e14db248c1c037d14e16e70681ff7601bff746b30b763742b170f55d806d0
-MISC ChangeLog 37959 SHA256 e545820ca36a1e9ce8ae008724b46f76822489de9386c4cceb2322ceee196e34 SHA512 ea95819fefa1330a8b1ccfe42b362894ccdb93a50b693e2b8101f9c4d4a040136dfed9607c152f7db04ca47a8daf35bcc12cc3842a44632ee0d97a0afe1f2b29 WHIRLPOOL 708cd08895f73639760ccee6b5c4085af7a3a28a52103e96b34981850e1d8e5123f22f02156faff6cae2d495476599d9a0219e778f05c7d8aeef35728a4543be
+EBUILD libsoup-2.36.1-r1.ebuild 2200 SHA256 3ad21fbb223197c6537b09d07623764e6c28c029af0e5b9ade421f485f49cc80 SHA512 4702e5b96215a473db16b3e50618517baa4aa6c3e22ebbd09d13e91898cc78f5e10b34af4e2d319d8552e5c9932c6e66b02a5fb514b6f6fbfc7967cfff92a850 WHIRLPOOL 5f2694e0771ee8765bff807abb4d5b99658917389ddf7a902336aeed7e23f84f74182a0ba31fea3f3ae28682e265d7025366252d0b124cf6387316a01bbd97df
+EBUILD libsoup-2.36.1.ebuild 2067 SHA256 626c9248979989955249d9f6ed802381a830b83431c3eb5a01e0224910841328 SHA512 b46c6faddd129d03de24073bab5d54a72585728e75f9823317397f895c83b11fc3139439b0692275e249e8ff1ae7eef9fe4a946c49c488f585039f04cbd1e91e WHIRLPOOL 0561a61cdc985aabd7e0451dc9bf9899eddba4dc21e01f627b68748dc9bc16e62af24d1259ae8edf8d6f087bbd14b208d03dcf19473ff90caf97737b65fe11cf
+EBUILD libsoup-2.38.1.ebuild 2016 SHA256 3671d0ed60d80b9a6967af7fbee12cd8ce6c3b8eba2b2cc8416ddd5a30221b8f SHA512 65c340f9a65295a52d4be71cf1125a20786d4649412f963bbe9195b5a65a46a47c75badbb0b5cc9097ce703237b16272fa57da73f3db0a6b65e566c39ba50659 WHIRLPOOL f6b9c2cfb04f29d136509c0a5b790c2f81113d7f11a5a583418aacab034e4ce59d8cf372a6b891a272a5cd8234ec0100d1fb8ae00c9f78d4c56bfac277a65e61
+MISC ChangeLog 38263 SHA256 cd8ae3e65f3d3f1269f91b6548833de9a38f2820713a1f760ea081269bf182d5 SHA512 38fd78edd4da8db451da114102abf4a2363850bf0e9b7551257d3448f59444a2ad812654615dcbf37b2828cc4d335dfabe20b39779358d4db18fb901aebdb874 WHIRLPOOL b910230c5a1f366e6b024b1bbca9cd9c3ec56457f3866ccaa00bd336a3d11e7de567ad42a3e5d605ef8e380df344fe0e80232b781b395a3683556533c72a9ebe
 MISC metadata.xml 360 SHA256 02b6b0b09606924604c828622c68f4e1eb238628561812f354cdae9b7e44b1cd SHA512 f9d4059775f067840d24c764beae3890d7f4d86f357a07e809cf2f6b10023082375453565dd1866e2cb985d3064a7303d6c59de39bf972aa8abbb12b191ad7cd WHIRLPOOL 1b0bda9689a10012da9b0b4099edac8fea685c540f1c99919924e6ead3fa5e7fa98bd4b699a6a3f76d1bf644632e10470eb6e9b931c7a1107a7e786be0a56bb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBwz5EACgkQl5yvQNBFVTWRgwCfWbcrKDnXKFs/iS3t1+x0mkL1
-CEwAn3p9tog5tI91m4MlyCgagEbTZ8Ud
-=lC9T
+iQEcBAEBCAAGBQJQdOj2AAoJEJ0WA1zPCt1hg3EIAJt0wgfTB0IN+m4tl+CEXiqy
+7Qaj+1UQp/9TIRBZ95C0bxmUOEuB0WPsW/K/4staIUho/HzE+LIL3GNaVp0Tndrm
+oLXvP0QMsbeWH7kGip73KpifWTyE8sTRaGIeLCBo+FxUzFkP8u/kE+pU4A7IAVHm
+ZU7R29djFXguysvo7NohxcKPftaIuMYnGXOrnK26mToTPgvA3RgPMMlKr2AjGo20
+BU8myL4dyMAR4ScC97P1hXT5M6/5Iub/Rx26qTXHIx0GTdvOxUnBQHfL2Gbeedz5
+98qL14QyRFqlP9wO1e7i4AB6o0SsI9lVTJWeoIUgCBs0rYcONOwbuD0MmPWyTEQ=
+=z5K+
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index 2b5a39d83e41..000000000000
--- a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c8ff78e489ccf5becd1ae309222b7977510558e6 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 25 Feb 2010 20:59:51 +0200
-Subject: [PATCH] Split docs into libsoup and libsoup-gnome.
-
-Fixes Gentoo Bug 268592, patch adapted from upstream patch.
-
-Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
-Hence, to be applied ONLY when !gnome && doc
----
- docs/reference/Makefile.am           |    5 ++++-
- docs/reference/libsoup-2.4-docs.sgml |    2 ++
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
-index 64d3cf8..8b91b7f 100644
---- a/docs/reference/Makefile.am
-+++ b/docs/reference/Makefile.am
-@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
- 	soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
- 	soup-proxy-resolver-static.h
- 
-+IGNORE_HFILES += soup-cookie-jar-sqlite.h \
-+   soup-gnome.h soup-gnome-features.h
-+
- # Images to copy into HTML directory.
- HTML_IMAGES = 
- 
-@@ -62,7 +65,7 @@ GTKDOC_CFLAGS =				\
- 	$(GNUTLS_CFLAGS)		\
- 	$(LIBPROXY_LIBS)
- 
--GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
-+GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
- 
- # include common portion ...
- include $(top_srcdir)/gtk-doc.make
-diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
-index 3cb3d11..707e525 100644
---- a/docs/reference/libsoup-2.4-docs.sgml
-+++ b/docs/reference/libsoup-2.4-docs.sgml
-@@ -52,11 +52,13 @@
-     <xi:include href="xml/soup-value-utils.xml"/>
-   </chapter>
- 
-+<!--
-   <chapter>
-     <title>GNOME integration</title>
-     <xi:include href="xml/soup-gnome-features.xml"/>
-     <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
-   </chapter>
-+-->
- 
-   <chapter>
-     <title>Low-level Networking API</title>
--- 
-1.7.0
-
diff --git a/net-libs/libsoup/libsoup-2.34.3.ebuild b/net-libs/libsoup/libsoup-2.34.3.ebuild
deleted file mode 100644
index 5b8df6caed2d..000000000000
--- a/net-libs/libsoup/libsoup-2.34.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.3.ebuild,v 1.8 2012/05/05 02:54:27 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc +introspection ssl test"
-
-RDEPEND=">=dev-libs/glib-2.27.5:2
-	>=dev-libs/libxml2-2:2
-	net-libs/glib-networking[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	# Set invalid apache module dir until apache tests are ready, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--with-apache-module-dir="${T}"
-		$(use_enable introspection)"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
diff --git a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild b/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
index ce151af1f2f2..0597b9019a1a 100644
--- a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1-r1.ebuild,v 1.10 2012/07/15 18:18:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1-r1.ebuild,v 1.11 2012/10/10 03:18:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
 
 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
 RDEPEND=">=dev-libs/glib-2.30.0:2
@@ -24,8 +24,7 @@ RDEPEND=">=dev-libs/glib-2.30.0:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-1.10"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -59,13 +58,6 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-
 	# Patch from 2.37.x, fixes 'Too many open files' error
 	epatch "${FILESDIR}/${P}-SoupHTTPInputStream-GCancellable.patch"
 
diff --git a/net-libs/libsoup/libsoup-2.36.1.ebuild b/net-libs/libsoup/libsoup-2.36.1.ebuild
index 195083845bf1..087ab48d8a74 100644
--- a/net-libs/libsoup/libsoup-2.36.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.10 2012/05/05 02:54:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.11 2012/10/10 03:18:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
 
 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
 RDEPEND=">=dev-libs/glib-2.30.0:2
@@ -24,8 +24,7 @@ RDEPEND=">=dev-libs/glib-2.30.0:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-1.10"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -59,12 +58,5 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-
 	gnome2_src_prepare
 }
diff --git a/net-libs/libsoup/libsoup-2.38.0.ebuild b/net-libs/libsoup/libsoup-2.38.0.ebuild
deleted file mode 100644
index 7b8eafce8f51..000000000000
--- a/net-libs/libsoup/libsoup-2.38.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.38.0.ebuild,v 1.2 2012/05/05 02:54:27 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc +introspection samba ssl test"
-
-RDEPEND=">=dev-libs/glib-2.31.7:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	# Set invalid apache module dir until apache tests are ready, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--with-apache-module-dir="${T}"
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
diff --git a/net-libs/libsoup/libsoup-2.38.1.ebuild b/net-libs/libsoup/libsoup-2.38.1.ebuild
index be4feefcd873..622136a2b218 100644
--- a/net-libs/libsoup/libsoup-2.38.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.38.1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.38.1.ebuild,v 1.8 2012/10/07 00:41:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.38.1.ebuild,v 1.9 2012/10/10 03:18:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
 
 RDEPEND=">=dev-libs/glib-2.31.7:2
 	>=dev-libs/libxml2-2:2
@@ -23,8 +23,7 @@ RDEPEND=">=dev-libs/glib-2.31.7:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-1.10"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -58,12 +57,5 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-
 	gnome2_src_prepare
 }