summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-11-04 18:51:34 +0000
committerJeroen Roovers <jer@gentoo.org>2010-11-04 18:51:34 +0000
commit457c807a02fba554a4d17009fb86203ebe53078f (patch)
treefa721fca568aece7e89e34adb63c451038f2cbbf /dev-libs/crypto++
parentVersion bump. (diff)
downloadhistorical-457c807a02fba554a4d17009fb86203ebe53078f.tar.gz
historical-457c807a02fba554a4d17009fb86203ebe53078f.tar.bz2
historical-457c807a02fba554a4d17009fb86203ebe53078f.zip
Fix building on HPPA (bug #343909). Wrap long lines. Replace spaces with tabs.
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'dev-libs/crypto++')
-rw-r--r--dev-libs/crypto++/ChangeLog7
-rw-r--r--dev-libs/crypto++/Manifest15
-rw-r--r--dev-libs/crypto++/crypto++-5.6.1.ebuild17
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch19
4 files changed, 38 insertions, 20 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index c56f2e789149..f94d11ecdb07 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/crypto++
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.60 2010/11/04 12:38:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.61 2010/11/04 18:51:34 jer Exp $
+
+ 04 Nov 2010; Jeroen Roovers <jer@gentoo.org> crypto++-5.6.1.ebuild,
+ +files/crypto++-5.6.1-sunos.patch:
+ Fix building on HPPA (bug #343909). Wrap long lines. Replace spaces with
+ tabs.
04 Nov 2010; Markus Meier <maekke@gentoo.org> crypto++-5.6.1.ebuild:
x86 stable, bug #343373
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 658564f7564a..76ff9054205e 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX crypto++-5.6.0-fix_build_system.patch 4916 RMD160 1d762f637f9dd5cad1ef0fa7edaad9b81f307a67 SHA1 c8968fe8d2dde15e515e43bdc0c78e9bf9720796 SHA256 facbc38cbd310058ed6d9a1d2cc868d00ec6f41b3840267ce701de14abfabe1c
AUX crypto++-5.6.1-fix_build_system.patch 5008 RMD160 df6813be73acddba7aac0e70abd2c9ff75c5a4de SHA1 c514f778c97cb739f9e3a02f2c44ef86dcafa992 SHA256 cc2c823046f38c154f7cc6899ff2cb94bb378bfbbb534662246d378e751f0480
+AUX crypto++-5.6.1-sunos.patch 546 RMD160 69e22a1db8f5fefae1660cf1adbb2cca6600b2d9 SHA1 c21120d904eab8ec3531ebbab68a9663355ac098 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c
DIST cryptopp552.zip 992073 RMD160 8929795b654d7186b2b38714d22a57ea01862dbd SHA1 18efe451b3c682f40db75dc2b09cb448a835e7d6 SHA256 078f8deb033e2619582b4e9e462bbac5127b0defbcfea49c3583be31f940a759
DIST cryptopp560.zip 1049029 RMD160 82e5061ec76f23643ba5477ab28bbee6eebd393a SHA1 b836783ebd72d5bc6a916620ab2b1ecec316fef1 SHA256 b522f0b5f850b50e9917823ea986f855295407380fafbe30f358875c41998bc5
DIST cryptopp561.zip 1069703 RMD160 a8a5b80c995c5d4ddafba228caf8866425212fbf SHA1 31dbb456c21f50865218c57b7eaf4c955a222ba1 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
EBUILD crypto++-5.5.2-r1.ebuild 1604 RMD160 59a14887f8be587735a349ba7ddf9c91a7e2b0d2 SHA1 9e9ff3b1c171f350a7b92ecfeca668ef750b69e4 SHA256 0838d76207c20dd6f4ed26894f633557843cf807ae5ccb2cd72d68189c628793
EBUILD crypto++-5.6.0-r1.ebuild 1383 RMD160 47dc57c3004fa0b5bb4718b2d2c5d8b8d57e2d6a SHA1 02727959dda01316bdacfd030e49c7d0c1738955 SHA256 9a0fc03ad16dcf768e194c25065bf47627302345ebc2bad0197f8e557dadd758
EBUILD crypto++-5.6.0.ebuild 1598 RMD160 caae59ceba6198ca359bc7a563912f07ca9cdcce SHA1 25f6ee493565eb3b66aa0890407c186e97318264 SHA256 9c8301fe961079960f095a38611180a722f70309f2e189733d90dad8eb566f56
-EBUILD crypto++-5.6.1.ebuild 1397 RMD160 cc5ea364de03e8b7172dc70cb227fb64dd539f30 SHA1 be813b587f758925a496b2037fa26c76467c871b SHA256 08d30c9dba70c55a9aa229d0395d60b3850bf3eceb903c66f547862e59812c32
-MISC ChangeLog 8260 RMD160 fa8715ad1c506bb8b715ed1eb1ca6baf41b45a1d SHA1 115d2bb589d4d653a75e63dd3c4c5b346038b427 SHA256 fdd4c308b06eaea751f908a62dbf7bbe771681ac35250e5d394046c7c0323565
+EBUILD crypto++-5.6.1.ebuild 1428 RMD160 91ca71da1ab8c88234951c922c17b6336cab6493 SHA1 57a8747fb420170c3ae5ebf9e64d22f7967eab92 SHA256 318ee23fd9d12d51ca9c6464293491539dbbe7ddb2bca93038d694bd3e125d6b
+MISC ChangeLog 8448 RMD160 e2ae87b448658d6051808ffdea4d54fc182bb25f SHA1 3845f9ffc66a8ff79da24ca5c143e0d6b65344da SHA256 7bfc598f40ab67df8ead03eec04e85edaa481120c6d310a8a007466bcaac80f1
MISC metadata.xml 251 RMD160 127ab6e8b8dd3f2a743bcd6bfea272c751b268ce SHA1 8d42822867803ce048112d88c0dd0ee9c81b6c2c SHA256 1015b452a49cd5d28354cfdaa180045d6b4c0b59dd7697f335a594438110238d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzSqO0ACgkQkKaRLQcq0GJVGQCfWcI/2fQUJ0WUh54TPwU+KklZ
-aikAn3HM421/glIWMoEFQAVN/5PwzgAP
-=sm9k
------END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.6.1.ebuild b/dev-libs/crypto++/crypto++-5.6.1.ebuild
index 2e68e35b2850..e41a93c3a2ef 100644
--- a/dev-libs/crypto++/crypto++-5.6.1.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1.ebuild,v 1.2 2010/11/04 12:38:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1.ebuild,v 1.3 2010/11/04 18:51:34 jer Exp $
EAPI="3"
@@ -21,7 +21,8 @@ RDEPEND=""
S="${WORKDIR}"
src_prepare() {
- epatch "${FILESDIR}/${P}-fix_build_system.patch"
+ epatch "${FILESDIR}/${P}-fix_build_system.patch" \
+ "${FILESDIR}/${P}-sunos.patch"
}
src_compile() {
@@ -30,7 +31,8 @@ src_compile() {
filter-flags -fomit-frame-pointer
use amd64 && append-flags -DCRYPTOPP_DISABLE_ASM
- emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LIBDIR="$(get_libdir)" || die "emake failed"
+ emake -f GNUmakefile CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
+ LIBDIR="$(get_libdir)" || die "emake failed"
}
src_test() {
@@ -41,12 +43,13 @@ src_test() {
done
if ! emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" test; then
- eerror "Crypto++ self-tests failed."
- eerror "Try to remove some optimization flags and reemerge Crypto++."
- die "emake test failed"
+ eerror "Crypto++ self-tests failed."
+ eerror "Try to remove some optimization flags and reemerge Crypto++."
+ die "emake test failed"
fi
}
src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die "emake install failed"
+ emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install \
+ || die "emake install failed"
}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch b/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch
new file mode 100644
index 000000000000..eb3f18e62da6
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.1-sunos.patch
@@ -0,0 +1,19 @@
+--- GNUmakefile.orig 2010-11-04 18:18:03.000000000 +0100
++++ GNUmakefile 2010-11-04 19:21:29.000000000 +0100
+@@ -102,8 +102,6 @@
+ ifeq ($(UNAME),SunOS)
+ LDLIBS += -lnsl -lsocket
+ M32OR64 = -m$(shell isainfo -b)
+-endif
+-
+ ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler
+ CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
+ LDFLAGS =
+@@ -117,6 +115,7 @@
+ CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
+ endif
+ endif
++endif
+
+ SRCS = $(wildcard *.cpp)
+ ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77