4 files changed, 27 insertions, 13 deletions
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() {