| 1 |
commit: cf6fb2cbf01ace6e0fce246abbb284e65d6ec814 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 09:11:01 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 09:11:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6fb2cb |
| 7 |
|
| 8 |
app-arch/qpress: Port to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
app-arch/qpress/files/makefile | 6 ------ |
| 14 |
.../qpress/files/qpress-1.1-fix-build-system.patch | 7 +++++++ |
| 15 |
app-arch/qpress/files/qpress-1.1-fix-includes.patch | 7 +++++++ |
| 16 |
app-arch/qpress/qpress-1.1.ebuild | 20 +++++++++++++------- |
| 17 |
4 files changed, 27 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-arch/qpress/files/makefile b/app-arch/qpress/files/makefile |
| 20 |
deleted file mode 100644 |
| 21 |
index 63c1f91b394..00000000000 |
| 22 |
--- a/app-arch/qpress/files/makefile |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,6 +0,0 @@ |
| 25 |
-CXX ?= g++ |
| 26 |
-CXXFLAGS ?= -O3 |
| 27 |
-LIBS=-lpthread |
| 28 |
- |
| 29 |
-qpress: |
| 30 |
- $(CXX) $(CXXFLAGS) qpress.cpp aio.cpp quicklz.c utilities.cpp -o $@ $(LIBS) |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..b6f7c0f2841 |
| 35 |
--- /dev/null |
| 36 |
+++ b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch |
| 37 |
@@ -0,0 +1,7 @@ |
| 38 |
+--- a/makefile |
| 39 |
++++ b/makefile |
| 40 |
+@@ -1,2 +1 @@ |
| 41 |
+-g++: qpress.cpp aio.cpp quicklz.c utilities.cpp |
| 42 |
+- g++ -O3 -o qpress qpress.cpp aio.cpp quicklz.c utilities.cpp -lpthread |
| 43 |
+\ No newline at end of file |
| 44 |
++qpress: aio.o quicklz.o utilities.o |
| 45 |
|
| 46 |
diff --git a/app-arch/qpress/files/qpress-1.1-fix-includes.patch b/app-arch/qpress/files/qpress-1.1-fix-includes.patch |
| 47 |
new file mode 100644 |
| 48 |
index 00000000000..51bfee465aa |
| 49 |
--- /dev/null |
| 50 |
+++ b/app-arch/qpress/files/qpress-1.1-fix-includes.patch |
| 51 |
@@ -0,0 +1,7 @@ |
| 52 |
+--- a/qpress.cpp |
| 53 |
++++ b/qpress.cpp |
| 54 |
+@@ -1,3 +1,4 @@ |
| 55 |
++#include <unistd.h> |
| 56 |
+ /* |
| 57 |
+ qpress - portable high-speed file archiver |
| 58 |
+ Copyright Lasse Reinhold 2006-2010 |
| 59 |
|
| 60 |
diff --git a/app-arch/qpress/qpress-1.1.ebuild b/app-arch/qpress/qpress-1.1.ebuild |
| 61 |
index e7787c7973a..21904daf9eb 100644 |
| 62 |
--- a/app-arch/qpress/qpress-1.1.ebuild |
| 63 |
+++ b/app-arch/qpress/qpress-1.1.ebuild |
| 64 |
@@ -1,7 +1,9 @@ |
| 65 |
-# Copyright 1999-2017 Gentoo Foundation |
| 66 |
+# Copyright 1999-2019 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
-EAPI=6 |
| 70 |
+EAPI=7 |
| 71 |
+ |
| 72 |
+inherit toolchain-funcs |
| 73 |
|
| 74 |
DESCRIPTION="A portable file archiver using QuickLZ algorithm" |
| 75 |
HOMEPAGE="http://www.quicklz.com/" |
| 76 |
@@ -11,14 +13,18 @@ LICENSE="GPL-3" |
| 77 |
SLOT="0" |
| 78 |
KEYWORDS="~amd64 ~x86" |
| 79 |
|
| 80 |
+BDEPEND="app-arch/unzip" |
| 81 |
+ |
| 82 |
S="${WORKDIR}" |
| 83 |
|
| 84 |
-src_prepare() { |
| 85 |
- default |
| 86 |
+PATCHES=( |
| 87 |
+ "${FILESDIR}"/${PN}-1.1-fix-includes.patch |
| 88 |
+ "${FILESDIR}"/${PN}-1.1-fix-build-system.patch |
| 89 |
+) |
| 90 |
|
| 91 |
- # Fix compilation with newer gcc |
| 92 |
- sed -i '1i #include <unistd.h>' qpress.cpp || die |
| 93 |
- cp "${FILESDIR}/makefile" "${S}" || die |
| 94 |
+src_configure() { |
| 95 |
+ tc-export CC CXX |
| 96 |
+ export LDLIBS="-lpthread" |
| 97 |
} |
| 98 |
|
| 99 |
src_install() { |
Archives