From f1907f8db97f0c76f55e519f184b260b87f9a27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:55:56 -0300
Subject: [PATCH 1/4] crypto++: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/crypto++/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index d56e7ff2c20..18ed0314e3d 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -21,9 +21,6 @@ if [ "$XBPS_CROSS" ]; then
 	make_build_args+=" -f GNUmakefile-cross"
 fi
 
-post_extract() {
-	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-}
 post_install() {
 	vlicense License.txt LICENSE
 }

From d08642bb0791174547b92d3558dd33dfd679ffef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:15 -0300
Subject: [PATCH 2/4] espeak: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/espeak/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
index 354ae5d6988..4161b04dd94 100644
--- a/srcpkgs/espeak/template
+++ b/srcpkgs/espeak/template
@@ -5,6 +5,7 @@ revision=5
 wrksrc="${pkgname}-${version}-source"
 build_wrksrc=src
 build_style=gnu-makefile
+make_build_args="AUDIO=runtime"
 hostmakedepends="unzip"
 makedepends="pulseaudio-devel portaudio-devel"
 short_desc="Text to Speech engine"
@@ -18,10 +19,6 @@ pre_configure() {
 	cp portaudio19.h portaudio.h
 }
 
-do_build() {
-	make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
 libespeak_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {

From d0ec9aa107eb7528b2ca877d6929c62eb621d142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 3/4] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/fuse-zip/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..315bdcf530d 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -13,7 +13,3 @@ license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
 checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}

From 2bb37e287135ae91f9943637e50561a83e25d35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 4/4] splix: remove unnecessary build_style.

---
 srcpkgs/splix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..a1405f0793c 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -3,7 +3,6 @@ pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"