dev-libs/cryptlib: Fix append-flags call wrt bug 392339.

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

3 files changed, 13 insertions, 29 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index ce3a216df03a..049b49803482 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cryptlib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.30 2011/02/26 13:37:47 arfrever Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.31 2012/01/25 21:46:14 c1pher Exp $
+
+  25 Jan 2012; Dane Smith <c1pher@gentoo.org> cryptlib-3.4.0.ebuild:
+  Drop no longer needed blocking dependency.
+  Adjust append-flags wrt bug 392339. Thanks Malte Starostik
+  (m-starostik@versanet.de) for the fix.
 
   26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -cryptlib-3.3.3-r1.ebuild:
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 82e4791bedcd..d0119e79fd68 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -1,29 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cryptlib-3.3.2-external-zlib.patch 1086 RMD160 9f9da93a99945d66302d3bb458029d815bcbf61c SHA1 c37209b57b2f8fdc32c5bff2be14116c373a91ae SHA256 ca7bf1670b83380e26a51f4dceb0684c2d0694338c509cc36bbb2bb6deb31f8c
 AUX cryptlib-3.3.2-ld.patch 821 RMD160 391e5a689f906a858c20be3721ccc3c3c81faa15 SHA1 2fe7573d1cd3f9f2f7d6ec18568420ac01d288a7 SHA256 0e813cd10d11f0dcfb8420d5e8690bf682faeb50e83c221a7e5bd35d44eaab4f
 AUX cryptlib-3.4.0-external-zlib.patch 1194 RMD160 e67b232ae57c43dde00dc79b48a78e52ed234798 SHA1 a69863fb2c290526360bd54405e94fc7efc158d8 SHA256 18cc9f193de28e7cfbf322d0ee47587fe334b2751bb397851b2b09b76f3c0c85
 AUX cryptlib-3.4.0-python.patch 1888 RMD160 9aa675d1a3fbb0a6aa2e9c5103ece9892454f611 SHA1 49379a91e29591106fd0723d4dba6dc34c3cc5f8 SHA256 1a857ff90e833e5f32a927f6568d63d616f82e3339691041562d89ea6692370f
 DIST cl340.zip 5514751 RMD160 d38cf69841942670f84e4c2d64a708f5cb3d4299 SHA1 78f7599971c889a55346ddf858e3ef147a5270f0 SHA256 fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5
 DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 RMD160 9070e2ed2fd748463cd06f09e22d422ce79bc0eb SHA1 bcb4f6bd558920b69a04bfd757460fc8f16afd7a SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8
-EBUILD cryptlib-3.4.0.ebuild 3698 RMD160 84d9b4b95911fb0cefbc58dd632e4a534fed5004 SHA1 5c50fa8d4fcc560a15e8b8252fcfc4f536b25327 SHA256 bbdc12b0e4f7e7c0672f8615b2c027a295372c60e8505797c3aa9ee610bbe7aa
-MISC ChangeLog 5844 RMD160 9c6ff7bc29b1a3bee265eb0aab98e4010021eb1f SHA1 80f8d7435f4caa3b58c5a90996e15ff2fe59c7e6 SHA256 111d89dd8776919e19286d088053ef0af06eb8b44f76161544256107ea5e0825
+EBUILD cryptlib-3.4.0.ebuild 3670 RMD160 77ce8c8dd57a6746fe8798415c361d148e00ca92 SHA1 8fff325eee09fccaa93d42570d4b26f0a21c777c SHA256 0ffc96acd99877ffaf457e021ecb36ab5559138399b618700a3f6ca3722b99fd
+MISC ChangeLog 6059 RMD160 2f6b372c3f07712cc3471f71c0da740c75653630 SHA1 f7fb3575a0aa9a73b2453b8888c65083cbfd0b97 SHA256 edf049f0452dff2e374fc702382fc426e2f94eed8d20e790ca7296d1abd1c4e9
 MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNpJSbAAoJENgZr6v6gHY0naEQANopUVBK8XgIC+Km48N/Ypc7
-bgFR3kA1eOqSsCzUFaMfOqaGjKDtFkUReNX8hDBBcswg5ZcLpUN4wJ4zxfre9MmS
-ONBRsr676rZ5PtngrDinN+CSi/4IMVb2yOCDHbjknj6ktwY/vSD4JSN86gMBIYxr
-V1TmH07iGE+Gm5amymMg4KSvZL0YXxF3RLa3DIiGtxVqHyPfUltaV0AMM4CyDViZ
-WhDpsu8km94lwKcSnA20rPkRmLgcXvd2cG/Wu+uCTAzFxMV+fFCZ5UN5HzTXqIJV
-UcqcQdra3if75xYuz8waZTHqLUWgh+2Gs6LKhYHOcS1goKezATefJKCKZMuIFP/r
-AHaztvqfisqPMSX2tizlhSaCFXdu2KPiC0mfP2Xbgz8PT9NuuP1lWX7FgI9HdyM7
-oPUTpb9zoRI+iN/kOaJkj3ZW9L1pLNDD1WJQdFhZwD8ZKhMNYRdunzExPPwfq9YA
-WDOOQD045HHrEDn4T25101NI1VzweZ39fNQPBXwqwNNjBBnUAOHI/Hhc8QQEowAa
-4CJpKYhjP0OTV4CiG+SU5CEnKrGC0t5NYVXmr8sc0Y04VYgB/c9DOm/dnDL7knQ8
-+ntiB3P81eQ6WbfOkitSxy9lKYF0wO3NhdQU7HndzS1PzemPXjCt7dPfobmH0coZ
-466AgRrug1EGzhvHDGAp
-=2Du1
------END PGP SIGNATURE-----
diff --git a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild
index 0a8b818c35f0..331b0c014213 100644
--- a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.4.0.ebuild,v 1.5 2011/04/12 18:05:58 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.4.0.ebuild,v 1.6 2012/01/25 21:46:14 c1pher Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -26,8 +26,7 @@ S="${WORKDIR}"
 
 RDEPEND="sys-libs/zlib
 	ldap? ( net-nds/openldap )
-	odbc? ( dev-db/unixODBC )
-	!dev-python/cryptlib_py"
+	odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -85,7 +84,7 @@ src_compile() {
 	replace-flags -Os -O2
 	is-flagq -O* || append-flags -O2
 
-	append-flags "-D __UNIX__ -DOSVERSION=2 -DNDEBUG -I."
+	append-flags "-D__UNIX__ -DOSVERSION=2 -DNDEBUG -I."
 
 	if [ -f /usr/include/pthread.h -a \
 	`grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then