summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-08-14 20:22:34 +0000
committerFabian Groffen <grobian@gentoo.org>2013-08-14 20:22:34 +0000
commit77c88225c73779ccc316dc6d980afd1b5dd260e0 (patch)
tree02bc33ecaae141d92b9f37c5c01e187794369138 /dev-libs/crypto++
parentremove the mask for freerdp/libkfbapi, they are keyworded (diff)
downloadhistorical-77c88225c73779ccc316dc6d980afd1b5dd260e0.tar.gz
historical-77c88225c73779ccc316dc6d980afd1b5dd260e0.tar.bz2
historical-77c88225c73779ccc316dc6d980afd1b5dd260e0.zip
Fixed and marked for ~x64-macos, bug #479554
Package-Manager: portage-2.2.01.22288-prefix/cvs/Darwin i386 Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'dev-libs/crypto++')
-rw-r--r--dev-libs/crypto++/ChangeLog5
-rw-r--r--dev-libs/crypto++/Manifest16
-rw-r--r--dev-libs/crypto++/crypto++-5.6.2.ebuild17
3 files changed, 23 insertions, 15 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index b77b98758346..d21d24197855 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/crypto++
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.85 2013/07/13 08:43:16 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.86 2013/08/14 20:22:30 grobian Exp $
+
+ 14 Aug 2013; Fabian Groffen <grobian@gentoo.org> crypto++-5.6.2.ebuild:
+ Fixed and marked for ~x64-macos, bug #479554
13 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> crypto++-5.6.2.ebuild:
Add ~arm keyword, wrt bug #469294
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index e5e82c0cbfc3..de0e2a6a8f4d 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -11,17 +11,13 @@ DIST cryptopp561.zip 1069703 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d
DIST cryptopp562.zip 1137964 SHA256 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 SHA512 016ca7ebad1091d67ad0bc5ccb7549d96d4af6b563d9d5a612cae27b3d1a3514c41b954e319fed91c820e8c701e3aa43da186e0864bf959ce4afd1539248ebbe WHIRLPOOL e31203da48a31b09e6ea48a75aa64fe5fd27fd370a1a609c4387526f09daab7582716563b688c0c81a8c3b200b8ffa7bdb2b981e5911640e5f1c172d6027f6ac
EBUILD crypto++-5.6.1-r1.ebuild 1397 SHA256 8474b1601e83723210c33c9811292a79d14eca9991c031fdefda626b5c8e2886 SHA512 3d0fdb9ccebbde09156eb5af3d2860033bccba5f656106c7e59841c2de6843dea10f363ae2291c23931bf3d89882b89dd54dd3c0436b6b419070928d89273a3c WHIRLPOOL c3bbc671c18a9d83302c9860cdcf579f6b1bf2600530511ce293b1c64e3cb9dc1234c1baceec45bce2612e92bd44b7de05f7821ea736474c27fd9997dbd02aed
EBUILD crypto++-5.6.1-r3.ebuild 1449 SHA256 f6cfe49a51c5d5d61ddcb8cf09307d7ff73c404c8736c54b90d84c83b0ad7a1e SHA512 2091eb3e7b1701c3c36dd841fb51954b8a3595f53c5f010006d6ce62fe56ddca802cbe0719d9687d15a70031a8ba2023926b8e610edaaf148187920f7b9dfd1e WHIRLPOOL f01acd83e54bb051f1581964e2cb49e99d356eff69fc95e577b0dc69bc6c66949d169fe7da5350db1d7d6586f4398a311b5c5cc749f28052fe2884feb5d6ad1f
-EBUILD crypto++-5.6.2.ebuild 1338 SHA256 2da358336f337b08c02e1142f13b96dbf7ed227c678b5be56da1965644956fe8 SHA512 87fb9d7255469815448765abc628aca1e6d68f74c28395cee2bffb61ce6acfad5b2efabe24586289fc01f4b766b072e2a79a1cd258928d9b3c2835c017815935 WHIRLPOOL 16fa626b1cf464cc5f8f6dc8a19449acad6a9bf31137447767387224f0eb74940e258fe67437b493895eff66588f00e1d7cb01bcaf5e47ebbc153d51140ab269
-MISC ChangeLog 12628 SHA256 547efbf4411e82522ada8668b591b5056e04ca7244c65d469a7cb097e1130f2d SHA512 b49285090681487fcb6471a029174553f3166540f2cc83c6ddf8d3287bcca3b81c73fb8eece2bf8457b98b057f13d214ac509fad4510470da7aaec3963bf265c WHIRLPOOL e2af89ff0e1e5a324e2a3bae0ba9f40c26e69ee6f4de764afe887bd03aec86f3d9730a9c82e0fd2716158ffd6cea3f1d7afb47b2fba4076d4326d974a3862dfb
+EBUILD crypto++-5.6.2.ebuild 1783 SHA256 7af05f777e7850428c9c2a019fa6b776a2d8f2a32de2e64eaac20d1ae3d868ed SHA512 6e38e2cd27f6a3c556595ea3d9889c63934b91cbdadcb3287f0a528cd1971c5c4ff2f81608e30f7ff1d2a5b91563a95e3698f529d4e2af9962c34c0d01210ee0 WHIRLPOOL 7e110ae4128609bda9cd669c1af21d1c2d927fdb215e495fb1b9d49c3a99c7d99ce5c32cbcca577e3bbc052c0ea079f8a7fe94cbced115e2a520598e18fd8896
+MISC ChangeLog 12749 SHA256 7577e5a33d20ac8ece92ce580e7393b90ec4f807dc80dea56c7a915b79b7aa67 SHA512 fa9bb3d6312ae739f8662c5c1b8a4f09fd59d0854ce66a02c0d53ad1cd1cfc63d636e39011dda74818d130ee34956a9ff856ece9095f99393ef80f8531155485 WHIRLPOOL b87134df0aab1d0406fea9d331b0b73db90a4547996ddaf818aa326ca752ed83cc95b1d98dcffb1234d59d7e682462bb85bee126fe8b58ac5482f994b50c37aa
MISC metadata.xml 160 SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 SHA512 bfec8d424a118209f298dd88f7073aaaf6e1ad49f67a441817313a6fa525a0d228241dfb1ccd8dae45e1192db9712b1d5e9cf053f9f398eff5c17089373e7104 WHIRLPOOL 47a9e0b778a140714a565acf9db6bd59e11732af1f4cbb86af0beb36a8a9d77a29f0a875aa24537387ffe6e3143724a59cc60a0d93cf7870fd47e511d17c3de5
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.20 (Darwin)
-iQEcBAEBCAAGBQJR4RMlAAoJECo/aRed9267dgMIAJh0wXxaC86An7gTMkciW9Sc
-qWrOlPEpBC2d1NrKGTgWi8kqcqs1KmpGV31rmTXtvo318eMqRZj1DzNAC3JUJHH6
-wW09toHUAG1qGHbV3HdPPfsUiGoE3KzIXq+zMwW10+d5ESrVYcXL+MapYEnigEm+
-R04Fj2LFRK2pE7mFEFsnFpBeH0Xu7ANRN5GPxHLrRzdb7HpbzxAL3qLnkZtsy26n
-W17dLHNDLNcNeMxnIvWp/4cDdj74t8ar/92zOosN+eOV4zquuVunINjBYrpAcQN9
-w4YT6unzHNRVP+Sr2xkfvxKv+tVsTdzYZJyK+k225SDLnaMNbj4ksht4K81Xbn4=
-=HpGi
+iEYEAREIAAYFAlIL5wcACgkQX3X2B8XHTokkvgCggaVM/U2Zj9sP5lxKjYe7degU
+piYAn2J06Rw/W4FZHTPZLuFFXMSD38bE
+=Gd++
-----END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.6.2.ebuild b/dev-libs/crypto++/crypto++-5.6.2.ebuild
index 8b929f63f126..2b3a0a4d0c87 100644
--- a/dev-libs/crypto++/crypto++-5.6.2.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.2.ebuild,v 1.9 2013/07/13 08:43:16 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.2.ebuild,v 1.10 2013/08/14 20:22:30 grobian Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x64-macos"
IUSE="static-libs"
DEPEND="app-arch/unzip
@@ -22,14 +22,23 @@ S=${WORKDIR}
src_prepare() {
epatch "${FILESDIR}"/${P}-make.patch
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i \
+ -e '/^LIBTOOL =/s/= /= g/' \
+ -e 's/libcrypto++\.so\.0\.0\.0/libcrypto++.0.0.0.dylib/' \
+ -e 's/libcryptopp\.so\([\.0]\+\)\?/libcryptopp\1.dylib/' \
+ GNUmakefile || die # 479554
+ fi
}
src_compile() {
# higher optimizations cause problems
replace-flags -O? -O1
filter-flags -fomit-frame-pointer
+ # ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+ [[ ${CHOST} == *-darwin* ]] && append-flags -DCRYPTOPP_DISABLE_X86ASM
- emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)"
+ emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr"
}
src_test() {
@@ -47,6 +56,6 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
+ emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.{a,la}
}