From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8FD88138334 for ; Wed, 28 Aug 2019 09:11:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 873C2E0866; Wed, 28 Aug 2019 09:11:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA537E085E for ; Wed, 28 Aug 2019 09:11:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A502234A4CA for ; Wed, 28 Aug 2019 09:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3A3B77B for ; Wed, 28 Aug 2019 09:11:48 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1566983461.cf6fb2cbf01ace6e0fce246abbb284e65d6ec814.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/qpress/files/, app-arch/qpress/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/qpress/files/makefile app-arch/qpress/files/qpress-1.1-fix-build-system.patch app-arch/qpress/files/qpress-1.1-fix-includes.patch app-arch/qpress/qpress-1.1.ebuild X-VCS-Directories: app-arch/qpress/ app-arch/qpress/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cf6fb2cbf01ace6e0fce246abbb284e65d6ec814 X-VCS-Branch: master Date: Wed, 28 Aug 2019 09:11:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 20d9b9ef-d664-4054-8ebf-e5b251a0de1a X-Archives-Hash: 98b71329e29cbb1988bbe5b492a4ca8c commit: cf6fb2cbf01ace6e0fce246abbb284e65d6ec814 Author: David Seifert gentoo org> AuthorDate: Wed Aug 28 09:11:01 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Aug 28 09:11:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6fb2cb app-arch/qpress: Port to EAPI 7 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> 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 +++++++++++++------- 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 63c1f91b394..00000000000 --- 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 00000000000..b6f7c0f2841 --- /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 00000000000..51bfee465aa --- /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 + /* + 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 e7787c7973a..21904daf9eb 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 ' qpress.cpp || die - cp "${FILESDIR}/makefile" "${S}" || die +src_configure() { + tc-export CC CXX + export LDLIBS="-lpthread" } src_install() {