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 3DA8C139085 for ; Tue, 24 Jan 2017 15:54:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0B7C23412B; Tue, 24 Jan 2017 15:54:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6E5E23412B for ; Tue, 24 Jan 2017 15:54:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C675634167A for ; Tue, 24 Jan 2017 15:54:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8DFF2DD2 for ; Tue, 24 Jan 2017 15:54:28 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1485273260.84d9bec0db2d23c6c38489997dcd576d1be7ee9a.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/, app-text/zathura/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/zathura/files/zathura-0.3.7-tests.patch app-text/zathura/zathura-0.3.7.ebuild X-VCS-Directories: app-text/zathura/ app-text/zathura/files/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 84d9bec0db2d23c6c38489997dcd576d1be7ee9a X-VCS-Branch: master Date: Tue, 24 Jan 2017 15:54:28 +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-Archives-Salt: 062efb6c-1152-462b-bc27-880e155fe61c X-Archives-Hash: befee67a8477ad7cba3c32b88d40419a commit: 84d9bec0db2d23c6c38489997dcd576d1be7ee9a Author: Michael Weber gentoo org> AuthorDate: Tue Jan 24 15:53:52 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Tue Jan 24 15:54:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d9bec0 app-text/zathura: Fix test for USE=-sqlite (bug 606870). Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-text/zathura/files/zathura-0.3.7-tests.patch | 24 ++++++++++++++++++++++++ app-text/zathura/zathura-0.3.7.ebuild | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/app-text/zathura/files/zathura-0.3.7-tests.patch b/app-text/zathura/files/zathura-0.3.7-tests.patch new file mode 100644 index 00000000..7732144 --- /dev/null +++ b/app-text/zathura/files/zathura-0.3.7-tests.patch @@ -0,0 +1,24 @@ +--- zathura-0.3.7/tests/Makefile ++++ zathura-0.3.7/tests/Makefile +@@ -7,7 +7,11 @@ + include config.mk + + PROJECT = tests +-SOURCE = tests.c $(wildcard test_*.c) ++ifneq (${WITH_SQLITE},0) ++ SOURCE = tests.c $(wildcard test_*.c) ++else ++ SOURCE = $(filter-out database-sqlite.c,tests.c $(wildcard test_*.c)) ++endif + OBJECTS = $(addprefix ${BUILDDIR_RELEASE}/,${SOURCE:.c=.o}) + OBJECTS_DEBUG = $(addprefix ${BUILDDIR_DEBUG}/,${SOURCE:.c=.o}) + OBJECTS_GCOV = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o}) +@@ -23,8 +27,6 @@ + INCS += $(SQLITE_INC) + LIBS += $(SQLITE_LIB) + CPPFLAGS += -DWITH_SQLITE +-else +-SOURCE = $(filter-out database-sqlite.c,$(OSOURCE)) + endif + + ifneq ($(WITH_MAGIC),0) diff --git a/app-text/zathura/zathura-0.3.7.ebuild b/app-text/zathura/zathura-0.3.7.ebuild index d6a5333..543b3b0 100644 --- a/app-text/zathura/zathura-0.3.7.ebuild +++ b/app-text/zathura/zathura-0.3.7.ebuild @@ -36,6 +36,12 @@ DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" +src_prepare() { + epatch "${FILESDIR}"/${P}-tests.patch + + epatch_user +} + pkg_setup() { myzathuraconf=( WITH_MAGIC=$(usex magic 1 0)