Version bump.

Package-Manager: portage-2.2_rc87_p23/cvs/Linux x86_64

4 files changed, 187 insertions, 2 deletions

diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index 4881443d3290..b40fe707c22f 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2010/04/25 00:53:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.59 2010/09/27 16:20:35 arfrever Exp $
+
+*crypto++-5.6.1 (27 Sep 2010)
+
+  27 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +crypto++-5.6.1.ebuild, +files/crypto++-5.6.1-fix_build_system.patch:
+  Version bump.
 
   25 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   crypto++-5.6.0-r1.ebuild:
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 46d790a71a50..e77609c79384 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,8 +1,11 @@
 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
 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
-MISC ChangeLog 7971 RMD160 d6da15a69ed747bb6a7134ef695e16425e0bae73 SHA1 28a95a705d30937635ed821af250f3724edc1d47 SHA256 11dc13b3398aa4bdf5e85d658cd8251dd4ee9d6b3aedafbba5dc604141d9844d
+EBUILD crypto++-5.6.1.ebuild 1400 RMD160 e1de23c8ca6979a2ad34363945f50cb96a3da781 SHA1 8a92db7643ec1e24971b47424e09da31b29b4860 SHA256 ea5bab5c561f8253707c12fd0de25b77b1312ba511e55086bffe852f0af067a0
+MISC ChangeLog 8164 RMD160 cee413e9660ac379a8289e113af9957aa2ed52c3 SHA1 b10013fbd476107cb1dbd40d896a5fe10077ed77 SHA256 725634f88b66a1dd4c3c2c685f30e6db22eccad9daf53feca42fa100b7ae83ac
 MISC metadata.xml 251 RMD160 127ab6e8b8dd3f2a743bcd6bfea272c751b268ce SHA1 8d42822867803ce048112d88c0dd0ee9c81b6c2c SHA256 1015b452a49cd5d28354cfdaa180045d6b4c0b59dd7697f335a594438110238d
diff --git a/dev-libs/crypto++/crypto++-5.6.1.ebuild b/dev-libs/crypto++/crypto++-5.6.1.ebuild
new file mode 100644
index 000000000000..a1f89c762513
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-5.6.1.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2010/09/27 16:20:35 arfrever Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Crypto++ is a C++ class library of cryptographic schemes"
+HOMEPAGE="http://cryptopp.com"
+SRC_URI="mirror://sourceforge/cryptopp/cryptopp${PV//.}.zip"
+
+LICENSE="cryptopp"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_build_system.patch"
+}
+
+src_compile() {
+	# Higher optimizations cause problems.
+	replace-flags -O? -O1
+	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"
+}
+
+src_test() {
+	# Ensure that all test vectors have Unix line endings.
+	local file
+	for file in TestVectors/*; do
+		edos2unix ${file}
+	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"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die "emake install failed"
+}
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch b/dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch
new file mode 100644
index 000000000000..829e9bf782cb
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.1-fix_build_system.patch
@@ -0,0 +1,124 @@
+--- GNUmakefile
++++ GNUmakefile
+@@ -1,3 +1,5 @@
++LIBTOOL = libtool
++LIBDIR = lib
+ CXXFLAGS = -DNDEBUG -g -O2
+ #CXXFLAGS = -g
+ # -fPIC is supported. Please report any breakage of -fPIC as a bug.
+@@ -7,8 +9,9 @@
+ # LDFLAGS += -Wl,--gc-sections
+ ARFLAGS = -cr	# ar needs the dash on OpenBSD
+ RANLIB = ranlib
+-CP = cp
++LN_S = ln -s
+ MKDIR = mkdir
++INSTALL = install
+ EGREP = egrep
+ UNAME = $(shell uname)
+ ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
+@@ -120,46 +123,45 @@
+ SRCS = $(shell echo *.cpp)
+ endif
+ 
+-OBJS = $(SRCS:.cpp=.o)
+-# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?)
+-TESTOBJS = bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o fipsalgt.o dlltest.o
++OBJS = $(SRCS:.cpp=.lo)
++# test.lo needs to be after bench.lo for cygwin 1.1.4 (possible ld bug?)
++TESTOBJS = bench.lo bench2.lo test.lo validat1.lo validat2.lo validat3.lo adhoc.lo datatest.lo regtest.lo fipsalgt.lo dlltest.lo
+ LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS))
+ 
+ DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp
+-DLLOBJS = $(DLLSRCS:.cpp=.export.o)
+-LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
+-TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
+-DLLTESTOBJS = dlltest.dllonly.o
++DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
++LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
++TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
++DLLTESTOBJS = dlltest.dllonly.lo
+ 
+-all: cryptest.exe
++all: libcrypto++.la
+ 
+-test: cryptest.exe
+-	./cryptest.exe v
++test: cryptest
++	./cryptest v
+ 
+ clean:
+-	$(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
++	$(RM) -f .libs cryptest libcrypto++.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+ 
+ install:
+-	$(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
+-	$(CP) *.h $(PREFIX)/include/cryptopp
+-	$(CP) *.a $(PREFIX)/lib
+-	$(CP) *.so $(PREFIX)/lib
+-	$(CP) *.exe $(PREFIX)/bin
++	$(MKDIR) -p $(DESTDIR)$(PREFIX)/include/crypto++ $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	$(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/crypto++
++	$(LN_S) crypto++ $(DESTDIR)$(PREFIX)/include/cryptopp
++	$(LIBTOOL) --mode=install $(INSTALL) libcrypto++.la $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	$(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
++	$(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
++	$(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
++	$(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
+ 
+-libcryptopp.a: $(LIBOBJS)
+-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+-	$(RANLIB) $@
+-
+-libcryptopp.so: $(LIBOBJS)
+-	$(CXX) -shared -o $@ $(LIBOBJS)
++libcrypto++.la: $(LIBOBJS)
++	$(LIBTOOL) --tag=CC --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS)
+ 
+-cryptest.exe: libcryptopp.a $(TESTOBJS)
+-	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
++cryptest: libcrypto++.la $(TESTOBJS)
++	$(LIBTOOL) --tag=CC --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcrypto++ $(LDLIBS)
+ 
+ nolib: $(OBJS)		# makes it faster to test changes
+-	$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CXX) -o ct $(LDFLAGS) $(OBJS) $(LDLIBS)
+ 
+-dll: cryptest.import.exe dlltest.exe
++dll: cryptest.import dlltest
+ 
+ cryptopp.dll: $(DLLOBJS)
+ 	$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
+@@ -168,10 +170,10 @@
+ 	$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
+ 	$(RANLIB) $@
+ 
+-cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
++cryptest.import: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
+ 	$(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS)
+ 
+-dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
++dlltest: cryptopp.dll $(DLLTESTOBJS)
+ 	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
+ 
+ adhoc.cpp: adhoc.cpp.proto
+@@ -181,14 +183,14 @@
+ 	touch adhoc.cpp
+ endif
+ 
+-%.dllonly.o : %.cpp
++%.dllonly.lo : %.cpp
+ 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@
+ 
+-%.import.o : %.cpp
++%.import.lo : %.cpp
+ 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@
+ 
+-%.export.o : %.cpp
++%.export.lo : %.cpp
+ 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@
+ 
+-%.o : %.cpp
+-	$(CXX) $(CXXFLAGS) -c $<
++%.lo : %.cpp
++	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(CXXFLAGS) -c $<