libgcrypt-1.6.0 compatibility patch added

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 69 insertions, 20 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index a2da0d2a4b09..6fec75d56e94 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/keepassx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.60 2013/12/26 03:44:08 pesa Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.61 2014/01/14 14:20:26 polynomial-c Exp $
+
+  14 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  keepassx-2.0_alpha5.ebuild, +files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch:
+  libgcrypt-1.6.0 compatibility patch added.
 
 *keepassx-2.0_alpha5 (26 Dec 2013)
 
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 9be6d264d1f7..f0b9961b8cb2 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -2,26 +2,27 @@
 Hash: SHA256
 
 AUX keepassx-0.4.3-gcc47.patch 424 SHA256 fc714bb9c2f5f5c71fa0850cd6c3037904dbd5ecfc9fa2e1af6749683dab3cb0 SHA512 89e08c9e3584f50c642fe0fa5517e84d18bb10022696b24f543cbf776bc7e4327bbdb89a94f86efbbd7ad40777885d3e34b380a22b3c2a8e941f1ebf8f3801d8 WHIRLPOOL c67d322e4107b650452c94319737900caacb445c220eda4ce14e739f04faa9915cb675c842097533e5af08c7d123ebf399256815c530baf3effd830d45e94a6b
+AUX keepassx-2.0_alpha5-libgcrypt-1.6.0.patch 1070 SHA256 5d231a6a7828ce8c36dada904026884ca7d7de0fbe54eb1c1a4351757ce793c8 SHA512 1a21bf5ddbfbcd2d2021199a3b58c4ca11147d05f1a77ad479eee1b684e4fdfcfc830435fdf12d4e3a2c983b8941ea373a941c954aec725b89561a3fbb0494ba WHIRLPOOL e60613a59c4a8866513d02a62b22963a14c902bbdd475b391b4a2b5b3f32001a8d83332a98577f3c2e90e93d99545eab25bd77589bc4aa2564d40a36f9a9ccfa
 DIST keepassx-0.4.3.tar.gz 1368766 SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 SHA512 8ce1bc252694e11a8b0da94bb00a4e5ca2837fe099f2f992aa9a93bacc4d94f33970cec687bd73a7a7762e86220a0541fe85a6708a2d4ad1bb3aef5f19935ccc WHIRLPOOL e2f54832eeb8eb3c7b7874e2deb97843a9ef1a92f027ec540fd197cf850d313be5d8959595e122b24a286973747d3b71bd33537de601b31ba3d45a16a095747b
 DIST keepassx-2.0_alpha5.tar.gz 1052454 SHA256 d5554d98666c7e0ea14d868ea837a3bc83661e95770faf77452367f80d18b2ef SHA512 864b56b35c768cf084d1934909c8f1aca474c0586ed644c3d5fef6d4eaffb550eeb14b1ac93d01e26a1319ad38144130ccdcf9f0c5634c395afed9f560173e79 WHIRLPOOL 92a0d9b653ea63c5abb5dde0ff2e92f92221e8b7f877da042b70f3a517ba9ac3c3e220c7014bc2da6cdb8a309f9c9575efce62de5026b281df2899ac756c21ec
 EBUILD keepassx-0.4.3.ebuild 1060 SHA256 57a3d8436fe7f609bd934d354b09fbda96363e74ca8dbcb4dab86121c985c51e SHA512 b91124d6b3eb5f75fc157bc6225d47f3b12cf0e72e308bac8d985c2a25ab58f3610712fc5095bad3ae1db54d31c704a435fba0ac543ea9ece43858dec677184f WHIRLPOOL 329f5366fbd85326d1bbb5d515cd828cf6efe1b3df0515cdb791b83f5c51c3151b8cc292bcf08e22b87d337e7119949a1ff096d1a2e946460d8b2ad6a67dfaf7
-EBUILD keepassx-2.0_alpha5.ebuild 943 SHA256 a4041f95f47ef314ff787095047ff282a9ec32268faec395a475f30ba36d2dbf SHA512 0621e6241be333623dd232d4a05c00eeb4f482c8db0a1b4b39862b48b8ffdc8b61c15ff741feec931a98b1ac985c581a722a8904bd44c3ae98038af19a6e08f7 WHIRLPOOL 13c7fc951086fdbf56c79003ccb8fa4e835c99d78e4360f820a0f29638c40d9ac42ae4d046e988a26ff575283493d6fa0292a1de74ce7c9a7d8fdd98cc5fb2fa
-MISC ChangeLog 9645 SHA256 aa03e328a6c08dceb99d306da0a261439fa3a6723c2374311119de7d09921202 SHA512 56ad537c501f78d882dc217499dba53820c5a3324455e188e49cc492b7ccd194005b57fcead49fd96c06258d5c3805d22a06721d16830839a8a31c949f05da6c WHIRLPOOL 9fde5289ea3a3a7fd41ae4f7bc9e4f0d683b0c4c84bc1f364224b93ea64ea843d73ed5f5032fdcd1a896d3dd36ab2531f002a7f14999b4092bb84a99c621af14
+EBUILD keepassx-2.0_alpha5.ebuild 1041 SHA256 b57cf0080afad07627e05f375ed60bfcb09a2a1c6da901882a355bf3d6fe809b SHA512 f554cca8eb1303bebf989cd5e7a218dd6535f1985a49f50daaa387f260e1b8b78cbb115526abc7598e00f50b3c8324b7dde6fd6b92a20137e73580e32311d548 WHIRLPOOL 3871fa53beae251e2d4dd152f1cdd8167a13b362870de804c9c4afe3937ede9f99b7599bf201ae5171527404a411d9a5f25ad23f7f6143bd2b34588317a08188
+MISC ChangeLog 9833 SHA256 ddac8a3c0a61301e937f5b2dc41eacffadb37e9a02082eee2cd8e0aa2c03df38 SHA512 b9bcd586619fec909afe8c5c5897f4730a0ed05c999c2f9b9451740bae514208f55587fd965563abc1b8ae52a4b07155d2c994d2118f6bf8fbba1783491f007b WHIRLPOOL 9767cabb88214adc52874d4d4f2f3a8f96ae1c817bd5bc5a538fd20584e28a453ac202600e5eeb0a0a4040c0450270748bf1cbf7f436b8c30d66046f4536cecd
 MISC metadata.xml 490 SHA256 3a8a94f82dcc4da2003bbaab332b81e4ac2f29b3196af08c1fe9c383a9867512 SHA512 d36d7aff01a28fd326c4f87410602f4991724fd3629a5c9f717c4ca15cb33542ba07012aef0e506c284c39a7352ef8568f308c3c5d177fa4a32ae8eb02809081 WHIRLPOOL bafbc180b15df00296bbb97e9946df0a9207b2a25488910fc66163d93dcbe07637db9714d475355dae9f65cfdaa3515adcd9185fd6a1a2c248515b0e82d1331e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSu6YJAAoJENXLsxwXqFxy1+4P/2M+GlRRqQ0saJ25Uz2m5+Ua
-qmuLPvolDiLKn5NfyLfArBULcXI68PPaL5VTnZYqJWXcxzfTu2iNdHYhQZ7mB6Nd
-aQpE/GtTsyZF679MVu6JgHRMZHxg0WGtY/VsOTe+uTZ8tMfsOi1ff8jWkFgagNWC
-W/ZfAtdTbsSKTn3P/8cEu6SgT56hzriZLzVVHCsS1N5qz7ATvym+w48pvSrWVtHR
-wZ3MX53n6mDq4P7uLuP9b2q0pzgDwMgUTa+KgEeGN+kUefqAAXILCQIWvoJqsYfw
-yGUgGKT6dgIcgnT4ZXL/5mpYU1VUHybB8er50lVy6ZmJbRmM5BJPV1cEy3K93vHW
-ltBx5J1lQz0kW9f2jBqUyXAyXLQGMqmqwAqg9Wss1FxggffJvtRql8Wnq8hxICpx
-l8kAhfeZqvHHWGWLJ99OZq4JLh/fQHq5sxnQo93VMHk9x/Zd5/EMsTUbIXGpFGgf
-uhCOSbWmVOLpwA9HR4s6MRC6FFr943FaB/wJDGGV9nw/be3D7bUMMTvF9F8g6m/V
-SgeIXtbeAHju/pn84PA5ldFIBPo5BdZdnYDY5wDNwo/uCiSkV7jIZPmngeIbidSp
-o9fFI3OFz2pBR0ZJ0m30DKoAxvHqTv5ET+E1BVBgDTKyFlloIV5ZR75xZPC63M/s
-3p9dd59cxgi//EefkrIx
-=uPEo
+iQIcBAEBCAAGBQJS1UerAAoJEPiazRVxLXTF2N4P/2Iu4thBHt4On+Ps/f9afIUx
+Z942NQ2NsPUKP9KCt8F6SylLI6ofyjmfgd7U4TZwqoiDswOMFUzx7WiIcli4R1af
+P5l9Y0XLW/lqV3wWpKudKfZoQluQkWFWPkldUiOBkQUpAWBXjtp0DQ8f1DRRoyZg
+Ba4baMDI4G/cNpfAD7UUEcMY4VJW2vskkCefBiU1BDo6CbFWreww8xSvSVEN6aT8
+nSG1Lcug4IZvsOvZksuDgtR/qnqUZxbUjOckhpICnu8XVxrkFRbNMI+NDiL3cPcE
+p3k6pjNLDFVjObPAgHyIMovbE75H6Lm1CEOc6OmGlfyQ4qXhB3uTzgNk7Nx/oief
+tIaO5i6tt9iDOOZD6hATzGQmNNNB+rStMu/cH0lWu2QbRSn5bA4RP09AMDYSopES
+zTyEYlWmHt0EoRY94BWGxHJM+xGiM9sBvQ7+EEKJG4lYXn86pg01gQy4K+EckpE+
+zh3K9Oz1HrgqLZH14lEcStIoIZzttqExsTrZl7uEJJyXq2LF+AHV4tu+MHpFARVs
+40ezqyJuU6YLHcS3FQU6jm794T1JEAsx0v0mVtAaOpn6DBNkLSvPPsaWsPNFpGOM
+Er68wNsel6ddQs8O26YlC+sPFlnTMisUpGOGmRrUFWFCVT3T35oZbcpI4kdQP0lS
++a9LJEbk76ejwCHy9qWb
+=pz1B
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch b/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch
new file mode 100644
index 000000000000..c2734c83e45d
--- /dev/null
+++ b/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch
@@ -0,0 +1,39 @@
+commit 8c7e6552742d11b13bc381fb39c00f9d57ce70ba
+Author: Felix Geyer <debfx@fobos.de>
+Date:   Sun Jan 12 12:39:39 2014 +0100
+
+    Add compatibility with libgcrypt 1.6.
+    
+    Closes #129
+
+diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp
+index 6ad7fb0..1e28002 100644
+--- a/src/crypto/Crypto.cpp
++++ b/src/crypto/Crypto.cpp
+@@ -23,6 +23,7 @@
+ 
+ bool Crypto::m_initalized(false);
+ 
++#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
+ static int gcry_qt_mutex_init(void** p_sys)
+ {
+     *p_sys = new QMutex();
+@@ -57,6 +58,7 @@ static const struct gcry_thread_cbs gcry_threads_qt =
+     gcry_qt_mutex_unlock,
+     0, 0, 0, 0, 0, 0, 0, 0
+ };
++#endif
+ 
+ Crypto::Crypto()
+ {
+@@ -69,7 +71,10 @@ void Crypto::init()
+         return;
+     }
+ 
++    // libgcrypt >= 1.6 doesn't allow custom thread callbacks anymore.
++#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
+     gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt);
++#endif
+     gcry_check_version(0);
+     gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+ 
diff --git a/app-admin/keepassx/keepassx-2.0_alpha5.ebuild b/app-admin/keepassx/keepassx-2.0_alpha5.ebuild
index 7e73b3d10fb5..9c850deae03a 100644
--- a/app-admin/keepassx/keepassx-2.0_alpha5.ebuild
+++ b/app-admin/keepassx/keepassx-2.0_alpha5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-2.0_alpha5.ebuild,v 1.1 2013/12/26 03:44:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-2.0_alpha5.ebuild,v 1.2 2014/01/14 14:20:26 polynomial-c Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
-	dev-libs/libgcrypt:0/11
+	dev-libs/libgcrypt:=
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
@@ -29,6 +29,11 @@ RDEPEND="${DEPEND}"
 
 DOCS=(CHANGELOG)
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libgcrypt-1.6.0.patch
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with test TESTS)