public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/groonga/
Date: Wed, 10 Mar 2021 01:24:23 +0000 (UTC)	[thread overview]
Message-ID: <1615336168.0e4ca75c33d0fe6bbe74324cfe09520894393c15.sam@gentoo> (raw)

commit:     0e4ca75c33d0fe6bbe74324cfe09520894393c15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 00:29:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 00:29:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4ca75c

app-text/groonga: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/groonga/groonga-8.0.2.ebuild | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild
index 81552b275bf..19c48773526 100644
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ b/app-text/groonga/groonga-8.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit libtool user
 
@@ -26,11 +26,17 @@ RDEPEND=">=dev-libs/onigmo-6.1.1:0=
 	zeromq? ( net-libs/zeromq:0= )
 	zlib? ( sys-libs/zlib:0= )
 	zstd? ( app-arch/zstd:0= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
+	sphinx? ( dev-python/sphinx )
+"
 
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+REQUIRED_USE="
+	abort? ( dynamic-malloc-change )
+	fmalloc? ( dynamic-malloc-change )
+	sphinx? ( doc )
+"
 
 pkg_setup() {
 	enewgroup groonga
@@ -38,7 +44,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default_src_prepare
+	default
+
 	elibtoolize
 }
 
@@ -80,14 +87,16 @@ src_configure() {
 		$(use_with zlib)
 		$(use_with zstd)
 	)
+
 	econf "${econfopts[@]}"
 }
 
 src_install() {
 	local DOCS=( README.md )
+
 	default
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
@@ -95,5 +104,7 @@ src_install() {
 	keepdir /var/{log,lib}/${PN}
 	fowners groonga:groonga /var/{log,lib}/${PN}
 
-	use examples || rm -r "${D%/}/usr/share/${PN}" || die
+	if ! use examples ; then
+		rm -r "${ED}/usr/share/${PN}" || die
+	fi
 }


             reply	other threads:[~2021-03-10  1:24 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-10  1:24 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-27 11:10 [gentoo-commits] repo/gentoo:master commit in: app-text/groonga/ Patrick Lauer
2024-10-28 17:03 Patrick Lauer
2024-06-13  9:35 Patrick Lauer
2024-02-29 23:58 Sam James
2023-04-10  9:25 Sam James
2023-04-03  5:37 Sam James
2022-07-28  7:10 Sam James
2021-04-18 22:22 Andreas Sturmlechner
2021-04-11 19:24 Conrad Kostecki
2021-04-11 19:24 Conrad Kostecki
2021-03-27 22:36 Sam James
2021-03-10  1:24 Sam James
2021-02-11 20:33 Conrad Kostecki
2020-09-26 19:40 Aaron Bauman
2020-08-07 14:14 Brian Evans
2020-06-11 13:13 Brian Evans
2018-06-11  9:59 Thomas Deutschmann
2018-05-11 18:23 Brian Evans
2018-05-11 17:38 Brian Evans
2017-01-04 14:53 Brian Evans
2017-01-04 14:53 Brian Evans
2015-11-20 19:53 Brian Evans

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1615336168.0e4ca75c33d0fe6bbe74324cfe09520894393c15.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox