dev-libs/crypto++: Revbump. Add new revision of fix_build_system.patch to address bug 401431. sunos.patch can be dropped when -r3 is stable and -r1 is dropped.

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

4 files changed, 192 insertions, 8 deletions

diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index cf7ee454266a..da07578d548e 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-libs/crypto++
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.73 2011/12/28 07:02:03 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.74 2012/01/30 16:06:14 c1pher Exp $
+
+*crypto++-5.6.1-r3 (30 Jan 2012)
+
+  30 Jan 2012; Dane Smith <c1pher@gentoo.org> -crypto++-5.6.1-r2.ebuild,
+  +crypto++-5.6.1-r3.ebuild, +files/crypto++-5.6.1-r3-fix_build_system.patch:
+  Address NEEDED library issues wrt bug 401431. Thanks Arfrever for the patch.
+  Add new patch (updated fix_build_system patch) for r3 since the current one
+  is
+  used by the stable -r1. The new patch includes the changes that are in the
+  patch {P}-sunos. This should be dropped when -r3 goes stable and -r1 is
+  dropped.
+  Drop -r2.
 
 *crypto++-5.6.1-r2 (28 Dec 2011)
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 44cfa1052a6b..b02c91c57546 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX crypto++-5.6.1-fix_build_system.patch 5008 RMD160 df6813be73acddba7aac0e70abd2c9ff75c5a4de SHA1 c514f778c97cb739f9e3a02f2c44ef86dcafa992 SHA256 cc2c823046f38c154f7cc6899ff2cb94bb378bfbbb534662246d378e751f0480
+AUX crypto++-5.6.1-r3-fix_build_system.patch 5684 RMD160 7465de1abd6ec4556249ca53f228df4ba7b3f089 SHA1 5f88b3f351ebc95ad76c226f6eaf4a0dbc2bbf03 SHA256 b66efd9b50efc66afa06e19601646fd6e4f93f1bc8424192efee3d6e5c8cf514
 AUX crypto++-5.6.1-rijndael.patch 578 RMD160 3d90b5e917be68ce44180377b8965708cfdb9d9c SHA1 76357ba0afd2c5688d0b23b4924c039a5601c732 SHA256 8d5c406987a1a98c3e2aa5c1046d86bc3ff2c7af6c487b70b8b0fa9cb938ca0c
 AUX crypto++-5.6.1-sunos.patch 546 RMD160 69e22a1db8f5fefae1660cf1adbb2cca6600b2d9 SHA1 c21120d904eab8ec3531ebbab68a9663355ac098 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c
 DIST cryptopp561.zip 1069703 RMD160 a8a5b80c995c5d4ddafba228caf8866425212fbf SHA1 31dbb456c21f50865218c57b7eaf4c955a222ba1 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
 EBUILD crypto++-5.6.1-r1.ebuild 1380 RMD160 611f381055e27cbbdb9a4593cd50b4118cb25f90 SHA1 fbbc76fcf90df6855b0b1ff2b0dcc3fa5ff56969 SHA256 613af20fe8e05295e207688948f16451f72e26250cb6474257610dfab269995c
-EBUILD crypto++-5.6.1-r2.ebuild 1424 RMD160 44859a29f011a0cbd12c85a3c2b922249229e6de SHA1 f18fe9fb76b00b52756fee98eaf3a24abf41da0f SHA256 d99596a7198f7b77dbed83fd9d33a4f7e2e81f6fa77a9aae3335f8adf9139e59
-MISC ChangeLog 10741 RMD160 0308f7d5b5bea8d5e6255d2ee55b0e79665e94a1 SHA1 1fbc430988c7017ae02505d39b3e94e90e3ab76b SHA256 8d160356d892b07c71b0cf09a60e729957db687efb437aa83e6f75e38d6c821a
+EBUILD crypto++-5.6.1-r3.ebuild 1389 RMD160 cb0c9f628faf8da51d1a944ccc4033292b88b733 SHA1 53ce56b7f027931163118c343ea2385628024557 SHA256 5240b7cfe4390625ae9f417b58cb62f345bbcc22e9b0016fd1f2dc4c993e9738
+MISC ChangeLog 11262 RMD160 28760c99e77a4cb962ca0ea1368a57b01f55ec28 SHA1 e69b0f02804d87ea43ed64787396d5f69ece35c1 SHA256 7e3decbc1dfdfa8372dea0a53d1b6cfa2d6be786e02a30dd9548177076ab4c40
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPJr/hAAoJEDhV2qHwDPIGHmwP/iySYP6PZ4qdnLVxQu3JV8Ey
+eWVUS4hUx6A9yjCUtVgH1ZXZf3k6i+OQLCAKkAEBvUE1Kx+a7xjahUCVKnCZd0GD
+8F7t9zG/qnK0ZRYR0N0qUm22BWndNxzPnl/OHts5g89Pm48oMWSQX2Ofc9yQ+ine
+bbR1eblL0RHz68MsHe9/S28xGszJyMdGWRnfgMu3arSVbhk1qSJh7eBJi3166AQm
+dKJvmYxNeCc939I2vajQ0iig7fOuFDSPTXNKUqfMDu/9QpnnXF3ppXsw/YLaKn9r
+aOhk2nEWW9R6biU93JW7xnVcf1bDLdnfm4sYwkXsnaCXGucLXpE+oIRTflg1Oqga
+JIEFAFBxlJN16/4E9K8xyjpkxqyM3Sc3TWBcuT9OrZeInZ/ZP9NBEsWo778L104G
+mto9z0/W4eABUWdrAYAmAAES9wIeIOdCu+1/reRbIsUBxqFTcWrEyOX4OX0mYw+I
+9fcPPw+tNVRT0pOsEE8D4cwdTTtxfW2oXZtPQLAgzJ4bisz05AVYtd2nQVCD3Xw4
+OSUdFFP+mgCFANQhQ1ZLw4AmVIrz0K4f0WE4yecQxIsqdqLS9sym8+1s93koD4ez
+NBGqVFs1/CPh58CtaOPbsZ5Ku0LfCX/NIUi+5s8+omcc22/EhMdJMM7ramTLMIvt
+XmCaAopDbvukbO4FN5gm
+=wBYL
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild b/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild
index 2891f858eb5d..5583bfd88b3e 100644
--- a/dev-libs/crypto++/crypto++-5.6.1-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.1-r3.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/crypto++/crypto++-5.6.1-r2.ebuild,v 1.1 2011/12/28 07:02:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild,v 1.1 2012/01/30 16:06:14 c1pher Exp $
 
 EAPI="3"
 
@@ -21,8 +21,7 @@ RDEPEND=""
 S="${WORKDIR}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix_build_system.patch" \
-		"${FILESDIR}/${P}-sunos.patch" \
+	epatch "${FILESDIR}/${PF}-fix_build_system.patch" \
 		"${FILESDIR}/${P}-rijndael.patch"
 }
 
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch b/dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch
new file mode 100644
index 000000000000..c4b22e41aeea
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.1-r3-fix_build_system.patch
@@ -0,0 +1,152 @@
+--- 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")
+@@ -77,8 +80,11 @@
+ CXXFLAGS += -pipe
+ endif
+ 
++THREAD_LIBS =
++
+ ifeq ($(UNAME),Linux)
+ LDFLAGS += -pthread
++THREAD_LIBS += -lpthread
+ ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0)
+ M32OR64 = -m64
+ endif
+@@ -99,8 +105,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 =
+@@ -114,52 +118,52 @@
+ CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
+ endif
+ endif
++endif
+ 
+ SRCS = $(wildcard *.cpp)
+ ifeq ($(SRCS),)				# workaround wildcard function bug in GNU Make 3.77
+ 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
+-
+-libcryptopp.a: $(LIBOBJS)
+-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+-	$(RANLIB) $@
++	$(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.so: $(LIBOBJS)
+-	$(CXX) -shared -o $@ $(LIBOBJS)
++libcrypto++.la: $(LIBOBJS)
++	$(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS) $(THREAD_LIBS)
+ 
+-cryptest.exe: libcryptopp.a $(TESTOBJS)
+-	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
++cryptest: libcrypto++.la $(TESTOBJS)
++	$(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcrypto++ $(LDLIBS) $(THREAD_LIBS)
+ 
+ nolib: $(OBJS)		# makes it faster to test changes
+-	$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
++	$(LIBTOOL) --tag=CXX --mode=link $(CXX) -o ct $(LDFLAGS) $(OBJS) $(LDLIBS) $(THREAD_LIBS)
+ 
+-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 +172,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 +185,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 $<