From 6d6a3717d7d80efe9e863180965d3576d2a5a2f3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Mon, 14 Aug 2017 17:35:30 +0200
Subject: [PATCH] crypto++: update to 565.

---
 common/shlibs                             |  2 +-
 srcpkgs/crypto++/patches/arm-native.patch | 31 +++++++++--------------
 srcpkgs/crypto++/patches/soname.patch     | 20 ---------------
 srcpkgs/crypto++/template                 | 22 +++++++---------
 4 files changed, 22 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/crypto++/patches/soname.patch

diff --git a/common/shlibs b/common/shlibs
index 540da211ef..daab096354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1194,7 +1194,7 @@ libdb-5.3.so libdb-5.3.21_1
 libdb_cxx-5.3.so libdb-cxx-5.3.21_1
 libsdb.so.0 sdb-0.6.2_1
 libcares.so.2 c-ares-1.10.0_1
-libcryptopp.so.563 crypto++-563_1
+libcryptopp.so.5.6 crypto++-565_1
 libqzeitgeist.so.1 libqzeitgeist-0.8.0_1
 libphonon.so.4 phonon-4.6.0_1
 libphononexperimental.so.4 phonon-4.6.0_1
diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch
index 9861e4f928..ff7678735d 100644
--- a/srcpkgs/crypto++/patches/arm-native.patch
+++ b/srcpkgs/crypto++/patches/arm-native.patch
@@ -1,33 +1,26 @@
---- GNUmakefile.orig	2016-03-20 22:08:25.169365978 -0600
-+++ GNUmakefile	2016-03-20 22:35:13.653257163 -0600
-@@ -75,21 +75,6 @@
+--- GNUmakefile.orig
++++ GNUmakefile
+@@ -125,23 +125,6 @@
   endif
  endif
  
 -# Guard use of -march=native
--ifeq ($(GCC_COMPILER),0)
+-ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
 -   CXXFLAGS += -march=native
--else ifneq ($(GCC42_OR_LATER),0)
+-else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
 -   CXXFLAGS += -march=native
 -else
 -  # GCC 3.3 and "unknown option -march="
--  # GCC 4.1 compiler crash with -march=native.
--  ifneq ($(IS_X86_64),0)
+-  # Ubuntu GCC 4.1 compiler crash with -march=native
+-  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
+-  # Sun compiler is handled below
+-  ifeq ($(SUN_COMPILER)$(IS_X64),01)
 -    CXXFLAGS += -m64
--  else
+-  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
 -    CXXFLAGS += -m32
 -  endif # X86/X32/X64
 -endif
 -
- # Aligned access required at -O3 for GCC due to vectorization (circa 08/2008). Expect other compilers to do the same.
+ # Aligned access required for -O3 and above due to vectorization
  UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
- ifeq ($(findstring -O3,$(CXXFLAGS)),-O3)
-@@ -175,7 +160,7 @@
- endif
- 
- ifneq ($(SUN_COMPILER),0)	# override flags for CC Sun C++ compiler
--CXXFLAGS ?= -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
-+CXXFLAGS ?= -DNDEBUG -O -g0 -template=no%extdef $(M32OR64)
- LDFLAGS =
- AR = $(CXX)
- ARFLAGS = -xar -o
+ ifneq ($(UNALIGNED_ACCESS),0)
diff --git a/srcpkgs/crypto++/patches/soname.patch b/srcpkgs/crypto++/patches/soname.patch
deleted file mode 100644
index 43a7f5dcc9..0000000000
--- a/srcpkgs/crypto++/patches/soname.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GNUmakefile.orig	2016-03-20 18:33:19.932703639 -0600
-+++ GNUmakefile	2016-03-20 22:08:25.169365978 -0600
-@@ -36,6 +36,8 @@
- INTEL_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
- MACPORTS_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "macports")
- 
-+VERSION = 563
-+
- # Default prefix for make install
- ifeq ($(PREFIX),)
- PREFIX = /usr
-@@ -375,7 +377,7 @@
- 	$(RANLIB) $@
- 
- libcryptopp.so: public_service | $(LIBOBJS)
--	$(CXX) -shared -o $@ $(CXXFLAGS) $(GOLD_OPTION) $(LIBOBJS) $(LDLIBS)
-+	$(CXX) -shared -Wl,-soname=libcryptopp.so.$(VERSION) -o $@.$(VERSION) $(CXXFLAGS) $(GOLD_OPTION) $(LIBOBJS) $(LDLIBS)
- 
- libcryptopp.dylib: $(LIBOBJS)
- 	$(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" $(LIBOBJS)
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index c7923dc89c..481ae0cf92 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -1,29 +1,25 @@
 # Template build file for 'crypto++'.
 pkgname=crypto++
-version=563
+version=565
 revision=1
 create_wrksrc=yes
+build_style=gnu-makefile
+make_build_target="libcryptopp.so libcryptopp.a"
 hostmakedepends="unzip"
 short_desc="A free C++ class library of cryptographic schemes"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.cryptopp.com/"
 license="Boost Software License 1.0, Public domain"
 distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9
+checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34
 
-do_build() {
+CXXFLAGS="-DNDEBUG -fPIC"
+
+post_extract() {
 	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-	export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
-	make CXX=$CXX -f GNUmakefile ${makejobs}
-	make CXX=$CXX libcryptopp.so ${makejobs}
 }
-do_install() {
-	install -d ${DESTDIR}/usr/{lib/pkgconfig,include/cryptopp}
-	install -m644 *.h ${DESTDIR}/usr/include/cryptopp/
-	install -m644 libcryptopp.a ${DESTDIR}/usr/lib/libcryptopp.a
-	install -m644 libcryptopp.so.${version} ${DESTDIR}/usr/lib/libcryptopp.so.${version}
-	ln -s libcryptopp.so.${version} ${DESTDIR}/usr/lib/libcryptopp.so
-	install -m644 ${FILESDIR}/libcrypto++.pc ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
+post_install() {
+	vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig
 	sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc
 	vlicense License.txt LICENSE
 }