From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 6 Sep 2019 10:28:05 +0100
Subject: gentoo resync : 06.08.2019

---
 app-arch/qpress/Manifest                             |  5 +++--
 app-arch/qpress/files/makefile                       |  6 ------
 .../qpress/files/qpress-1.1-fix-build-system.patch   |  7 +++++++
 app-arch/qpress/files/qpress-1.1-fix-includes.patch  |  7 +++++++
 app-arch/qpress/qpress-1.1.ebuild                    | 20 +++++++++++++-------
 5 files changed, 30 insertions(+), 15 deletions(-)
 delete mode 100644 app-arch/qpress/files/makefile
 create mode 100644 app-arch/qpress/files/qpress-1.1-fix-build-system.patch
 create mode 100644 app-arch/qpress/files/qpress-1.1-fix-includes.patch

(limited to 'app-arch/qpress')

diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest
index a50b803cd869..1066cd43b93e 100644
--- a/app-arch/qpress/Manifest
+++ b/app-arch/qpress/Manifest
@@ -1,4 +1,5 @@
-AUX makefile 128 BLAKE2B 8022d7cac27556d27a2ca1e4c760ec4c59fb1073071f2cb0877ea6554f340ffe5a2dee4c2e786173c8cc73e73319420c38d33cf43e243213f67f3e3c47129d16 SHA512 57004d5735f486170824b3056970d2c4787abf0708e0771b1a7161f942458abea9edc223d940a93f0560d630fe80d7ab6053e20984120ffda545349bcf4debfd
+AUX qpress-1.1-fix-build-system.patch 231 BLAKE2B e8fa8dad2a660d37e927f254804ad9a5e556d7f6058c0ed28a46c08070d8f790765eefe41506216cc6f7e11d1813d55ef39fdd6a65470ccc85ac63e052196da4 SHA512 9e6123baed7917d484aba0dfadd9f0382f6739bf7ee4600cd5248034276bd6cd7e71a5ebe1314734182caaa2448a1fe33639c57d611d08459f3d8fef718ba618
+AUX qpress-1.1-fix-includes.patch 158 BLAKE2B fa446d129cfc56fc7d53c342df334810311de9c5e903ee8402e78b196583d5caefee29bdc2381e4f5c9193f57a328f196e68e0c79031ca37fbe40ce7d7aedeed SHA512 321cdafc7ca71597c4ccf94a8493ff5156cb7103266d5c71ad4e650efded68e91dc655ae567562f5bc28913b137d9d3f142fbe295703864277e4e53729bf4658
 DIST qpress-11-source.zip 26998 BLAKE2B 08dd943f248f7211e8588fbaf7a2c2eee988d33b17aebfb5f1178647d80314fde576caec9b4aab67d69689f5931d086f88fd51204c1df6d3abc2cca583830380 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b
-EBUILD qpress-1.1.ebuild 525 BLAKE2B 9fc94482e6d05ba3d8ab6176ded9443e853173b2a3a10b55110fbd9a65c8cfef2d5ac37ac7cc40bfd5bfc2d09bb163976d0dcc61ab6fe77d7b78e3b07d79145d SHA512 aee317456ab1126bb2c4f7a9eaa487f8ae6487e3777ee1d63433afdc12d11fef66c699e6e809c29de7b93ef8d068216efd33eecdbc1cbb2f537648eb96f680e5
+EBUILD qpress-1.1.ebuild 589 BLAKE2B 0335a96ebdca99ddf6fc95ab3baa9c519dd2a5786df3f1f3bcbd68186b439cb273ccd137813b585ec92a4d5196dbb0a288307a704da15ad1c3ab711062e2167d SHA512 a1825c173d6c2222a8533bb363d87c6432e77e2c064832d52aea57c934ed3543e19abb26604dc9e588c78489db614c751eb5d63147ef6588ba6ebd1624d69773
 MISC metadata.xml 477 BLAKE2B ac47bfa42430372f34f6bb63148e95db752d885f1f64740d3d2a817189e01921659914c1b16c5e5b5ec3810c9e654c9a56b2803c164249d5c009bd76de1e0af0 SHA512 e75146f4a742e9c51d47ea4e0c2e4058547378907abc0fce61e83d048c7af2eebe67fbb2f52d9affdef9a793e7c6abf63c5a1799dbe45b37c3dba74cafeffaba
diff --git a/app-arch/qpress/files/makefile b/app-arch/qpress/files/makefile
deleted file mode 100644
index 63c1f91b3943..000000000000
--- a/app-arch/qpress/files/makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-CXX ?= g++
-CXXFLAGS ?= -O3
-LIBS=-lpthread
-
-qpress:
-	$(CXX) $(CXXFLAGS) qpress.cpp aio.cpp quicklz.c utilities.cpp -o $@ $(LIBS)
diff --git a/app-arch/qpress/files/qpress-1.1-fix-build-system.patch b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch
new file mode 100644
index 000000000000..b6f7c0f2841b
--- /dev/null
+++ b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch
@@ -0,0 +1,7 @@
+--- a/makefile
++++ b/makefile
+@@ -1,2 +1 @@
+-g++:	qpress.cpp aio.cpp quicklz.c utilities.cpp
+-	g++ -O3 -o qpress qpress.cpp aio.cpp quicklz.c utilities.cpp -lpthread
+\ No newline at end of file
++qpress: aio.o quicklz.o utilities.o
diff --git a/app-arch/qpress/files/qpress-1.1-fix-includes.patch b/app-arch/qpress/files/qpress-1.1-fix-includes.patch
new file mode 100644
index 000000000000..51bfee465aa9
--- /dev/null
+++ b/app-arch/qpress/files/qpress-1.1-fix-includes.patch
@@ -0,0 +1,7 @@
+--- a/qpress.cpp
++++ b/qpress.cpp
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ /*
+ qpress - portable high-speed file archiver
+ Copyright Lasse Reinhold 2006-2010
diff --git a/app-arch/qpress/qpress-1.1.ebuild b/app-arch/qpress/qpress-1.1.ebuild
index e7787c7973a5..21904daf9eb3 100644
--- a/app-arch/qpress/qpress-1.1.ebuild
+++ b/app-arch/qpress/qpress-1.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A portable file archiver using QuickLZ algorithm"
 HOMEPAGE="http://www.quicklz.com/"
@@ -11,14 +13,18 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="app-arch/unzip"
+
 S="${WORKDIR}"
 
-src_prepare() {
-	default
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-fix-includes.patch
+	"${FILESDIR}"/${PN}-1.1-fix-build-system.patch
+)
 
-	# Fix compilation with newer gcc
-	sed -i '1i #include <unistd.h>' qpress.cpp || die
-	cp "${FILESDIR}/makefile" "${S}" || die
+src_configure() {
+	tc-export CC CXX
+	export LDLIBS="-lpthread"
 }
 
 src_install() {
-- 
cgit v1.2.3