bump to 2.2.1, and add a patch to make both build when no libgphoto2 is installed; fix bug #120812

(Portage version: 2.1.1_pre2-r2)
 (Signed Manifest commit)

1 files changed, 23 insertions, 11 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index c8c6aab9ffde..40b9f2215dfe 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -33,10 +33,15 @@ AUX libgphoto2-2.1.4-gcc2_fixes.patch 1680 RMD160 68f9ded2e70a973a8cd4e4c2ea2820
 MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
 RMD160 68f9ded2e70a973a8cd4e4c2ea2820ee337f99f8 files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
 SHA256 b626415c5ba5fcd7dd8048a30787dd367555f7835a33bae69b6038698f10bccd files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
+AUX libgphoto2-2.2.0-includes.patch 591 RMD160 e379beaa15415fa2ed29af20b8e80821281cf9e4 SHA1 f4b6ce1ac65c12fdfb81945faaa6c108a13aa5e6 SHA256 10bca0dfd46833cad2e07ce2588a26e4f2d0a15d90c42588498652ae20216cb5
+MD5 29fdda8de011f7e177486aecfa410782 files/libgphoto2-2.2.0-includes.patch 591
+RMD160 e379beaa15415fa2ed29af20b8e80821281cf9e4 files/libgphoto2-2.2.0-includes.patch 591
+SHA256 10bca0dfd46833cad2e07ce2588a26e4f2d0a15d90c42588498652ae20216cb5 files/libgphoto2-2.2.0-includes.patch 591
 DIST libgphoto2-2.1.4.tar.bz2 1819325
 DIST libgphoto2-2.1.5.tar.gz 2946757
 DIST libgphoto2-2.1.6.tar.gz 3205731 RMD160 ef32357d9722a69d20a02098bd30c13165c27e6a SHA1 22be325303fa10a4a3f519d71b25364b3f84d653 SHA256 f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
 DIST libgphoto2-2.2.0.tar.gz 4473345 RMD160 119ae418622ef94d1d56830299b30fa350b95425 SHA1 24f1ee4e9f6c017649fcb56469d9378588144b2a SHA256 6de6a26a8c47c81af587240f9c0b7b7378574e1b5a86e579048229bf96dcbb84
+DIST libgphoto2-2.2.1.tar.gz 4474022 RMD160 0b93ba1b6fe80c909623691f7a2452f01fa8832d SHA1 6636ae0020c201abaea74f9e3ea2d4bd404587c0 SHA256 2b8bdf357283951f990a05c8ffe897f57ddfa6be2bd1eca4253c13631405c9cf
 EBUILD libgphoto2-2.1.4.ebuild 3872 RMD160 5e402219f1a8c559a68ea0566a5241813cb23c15 SHA1 b97317224a2329861dc7fc24c2b9ec0fff48492d SHA256 eaf0e93a92eef919d897c69358d18427d09e23c323a18d883d94af239f523dea
 MD5 9bdc55dbb224488ada58de4d1d8fd2aa libgphoto2-2.1.4.ebuild 3872
 RMD160 5e402219f1a8c559a68ea0566a5241813cb23c15 libgphoto2-2.1.4.ebuild 3872
@@ -57,14 +62,18 @@ EBUILD libgphoto2-2.1.6.ebuild 4097 RMD160 ab27eb404f02e8ceebf22e14e3f1b46a6474e
 MD5 09e03121ecd86f34ca1d457b262fcc66 libgphoto2-2.1.6.ebuild 4097
 RMD160 ab27eb404f02e8ceebf22e14e3f1b46a6474e35e libgphoto2-2.1.6.ebuild 4097
 SHA256 358bf78bb5035a856e79b94ac9af6c9c1920f94b27f6111b8d014d336aa03c8f libgphoto2-2.1.6.ebuild 4097
-EBUILD libgphoto2-2.2.0.ebuild 4396 RMD160 39668a9ac756482311e57327e2ef64165fd02d0c SHA1 518b82437c5273582098dae5cef799722c45c5eb SHA256 86e50a78190482ad12ba9496014424faa497f6f9a10689730fd6e94c864a8091
-MD5 7039427526a6e37c1b4e15af13758c6d libgphoto2-2.2.0.ebuild 4396
-RMD160 39668a9ac756482311e57327e2ef64165fd02d0c libgphoto2-2.2.0.ebuild 4396
-SHA256 86e50a78190482ad12ba9496014424faa497f6f9a10689730fd6e94c864a8091 libgphoto2-2.2.0.ebuild 4396
-MISC ChangeLog 9830 RMD160 56441254940a72089de018d21c3d86365d01b50b SHA1 533bc299800161d41b13fa19b6d1454bb67ee3bd SHA256 42dc748184d05fe103f953f1e9cfd26d918a7e3f2deaa00bd6adfc23fee9d2a6
-MD5 1a161c0eb610b4497ea00be2a2911e96 ChangeLog 9830
-RMD160 56441254940a72089de018d21c3d86365d01b50b ChangeLog 9830
-SHA256 42dc748184d05fe103f953f1e9cfd26d918a7e3f2deaa00bd6adfc23fee9d2a6 ChangeLog 9830
+EBUILD libgphoto2-2.2.0.ebuild 4436 RMD160 3abf0f5b2c331be9bb8ffc529e28f53bc111a4c9 SHA1 e3e1443d78a3a4c419af86a726931a797e58b380 SHA256 2672ed70fae261a8e16cbffc5d7c4de5bc59e20ef59238d34d5fd2d6efe141fa
+MD5 ff5871b75b86c6ffb84ad171d889e772 libgphoto2-2.2.0.ebuild 4436
+RMD160 3abf0f5b2c331be9bb8ffc529e28f53bc111a4c9 libgphoto2-2.2.0.ebuild 4436
+SHA256 2672ed70fae261a8e16cbffc5d7c4de5bc59e20ef59238d34d5fd2d6efe141fa libgphoto2-2.2.0.ebuild 4436
+EBUILD libgphoto2-2.2.1.ebuild 4796 RMD160 f1dd352e2dde1c3e232695b06eacb00b9f16375b SHA1 851dc2aae46182bb6b76b1d20f1ceec69ee141b3 SHA256 4ec9b8944141ec132733953374fffb21977105e626dd00760d920cd511330d0a
+MD5 1ba6c49fe6bfe6df10168c85dc2535ab libgphoto2-2.2.1.ebuild 4796
+RMD160 f1dd352e2dde1c3e232695b06eacb00b9f16375b libgphoto2-2.2.1.ebuild 4796
+SHA256 4ec9b8944141ec132733953374fffb21977105e626dd00760d920cd511330d0a libgphoto2-2.2.1.ebuild 4796
+MISC ChangeLog 10113 RMD160 299e81f53a54774d7fc74a52a8c3012a8a7681db SHA1 23f0004f8af180c1cc4c635e8025999b4303129d SHA256 1b7c0e293477094d26bf7de59b2ef2a16df1f892dae9ca48e824ab7a769b2c6a
+MD5 fae12294e6a0da294b7dd84e71d2d120 ChangeLog 10113
+RMD160 299e81f53a54774d7fc74a52a8c3012a8a7681db ChangeLog 10113
+SHA256 1b7c0e293477094d26bf7de59b2ef2a16df1f892dae9ca48e824ab7a769b2c6a ChangeLog 10113
 MISC metadata.xml 217 RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 SHA1 4e896159ae71f6294c983df1e31772404536478d SHA256 8d9b308751481891a748c6b43b222ef52999140d5c587ba5e7464d1a8414d30a
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 metadata.xml 217
@@ -87,10 +96,13 @@ SHA256 b35f586405aaa35bbde945d1b790625b3ff9bd2f8324fd4284671aafb4361ef5 files/di
 MD5 fcb8522f2de78f687fcb41252fb8d439 files/digest-libgphoto2-2.2.0 253
 RMD160 00cdb3caf532ca6368b41be9710e8d2c7593be73 files/digest-libgphoto2-2.2.0 253
 SHA256 3299b626e160461c7d9c7a42611ac4f10f20efdae6f25791778db5e72f25b1d8 files/digest-libgphoto2-2.2.0 253
+MD5 2a6cbda61749e6fc014bfff5f25b1492 files/digest-libgphoto2-2.2.1 253
+RMD160 d40dc6a0d1b6b95af1baeb234ef117c241c0ef63 files/digest-libgphoto2-2.2.1 253
+SHA256 bce3c4c7a08f9d9a3e8627e4bab1d096c6736d7e96b3cfa4c5e8d3886d312724 files/digest-libgphoto2-2.2.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFErABjomPajV0RnrERAuLwAJ95iIOSbcdpKEDyADCVGqfTWyurpwCcC0f1
-4otyvsBlDCCi+HOKfR8XTXA=
-=Y4qW
+iD8DBQFErWn9omPajV0RnrERAte7AKCCBj9M7r5VJYx4nOq/etDPqnBGNgCdFrYP
+8jNUAsPhIlduPpb6mna2NQU=
+=O77j
 -----END PGP SIGNATURE-----