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 90BD5138359 for ; Sun, 15 Nov 2020 23:24:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60906E094F; Sun, 15 Nov 2020 23:24:16 +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 49147E0950 for ; Sun, 15 Nov 2020 23:24:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7A3B83413C0 for ; Sun, 15 Nov 2020 23:24:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C42F456 for ; Sun, 15 Nov 2020 23:24:11 +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: <1605482578.42d1f1dda83fc0301581946b937b3bfa4cc920ee.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/hyperleveldb/, dev-libs/hyperleveldb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/hyperleveldb/files/snappy.patch dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild X-VCS-Directories: dev-libs/hyperleveldb/files/ dev-libs/hyperleveldb/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 42d1f1dda83fc0301581946b937b3bfa4cc920ee X-VCS-Branch: master Date: Sun, 15 Nov 2020 23:24:11 +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: eab0aec6-adb4-4f06-a39f-5ac41bfd0b3d X-Archives-Hash: 1e5e3ffe60ac6c65c06e12852f7aabc7 commit: 42d1f1dda83fc0301581946b937b3bfa4cc920ee Author: Jakov Smolic sartura hr> AuthorDate: Sun Nov 15 23:22:58 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Nov 15 23:22:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d1f1dd dev-libs/hyperleveldb: disable static libs Closes: https://bugs.gentoo.org/723176 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-libs/hyperleveldb/files/snappy.patch | 4 ++-- dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild | 24 ++++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dev-libs/hyperleveldb/files/snappy.patch b/dev-libs/hyperleveldb/files/snappy.patch index f926e3f6a38..db3d2e3885a 100644 --- a/dev-libs/hyperleveldb/files/snappy.patch +++ b/dev-libs/hyperleveldb/files/snappy.patch @@ -1,5 +1,5 @@ ---- Makefile.am 2014-07-29 14:44:37.851568232 +0800 -+++ Makefile.am.new 2014-07-29 14:44:54.687855718 +0800 +--- a/Makefile.am ++++ b/Makefile.am @@ -196,7 +196,7 @@ TESTS = $(check_PROGRAMS) diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild index b9f1cd0e7a4..1a42b9d33f7 100644 --- a/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild +++ b/dev-libs/hyperleveldb/hyperleveldb-1.2.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WANT_AUTOMAKE="1.11" -inherit eutils autotools +inherit autotools DESCRIPTION="Hyperdex fork/extension of leveldb" HOMEPAGE="http://hyperdex.org/" @@ -14,14 +14,22 @@ SRC_URI="http://hyperdex.org/src/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND=" - dev-libs/leveldb:=[snappy] - " +DEPEND="dev-libs/leveldb:=[snappy]" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/snappy.patch ) + src_prepare() { - epatch "${FILESDIR}/snappy.patch" + default eautoreconf } + +src_configure() { + econf --disable-static +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +}