Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xapian-omega/
Date: Wed, 08 Jun 2022 03:06:42
Message-Id: 1654657549.6853b3940b9360206ce24ae64a1af18a2d98802d.sam@gentoo
1 commit: 6853b3940b9360206ce24ae64a1af18a2d98802d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 8 03:05:49 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 8 03:05:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6853b394
7
8 app-text/xapian-omega: fix prefix install
9
10 Closes: https://bugs.gentoo.org/699426
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-text/xapian-omega/xapian-omega-1.4.19.ebuild | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
17 index 8095ec6dba1f..91ff25791e25 100644
18 --- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
19 +++ b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
20 @@ -13,14 +13,14 @@ SLOT="0"
21 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
22 IUSE=""
23
24 -DEPEND="~dev-libs/xapian-1.4.19:0/30
25 +DEPEND="~dev-libs/xapian-${PV}:0/30
26 dev-lang/perl
27 dev-libs/libpcre
28 sys-libs/zlib"
29 RDEPEND="${DEPEND}"
30
31 src_install() {
32 - emake DESTDIR="${D}" install
33 + emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
34
35 # Protect /etc/omega.conf
36 echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
37 @@ -32,7 +32,7 @@ src_install() {
38
39 # Directory containing OmegaScript templates:
40 keepdir /var/lib/omega/templates
41 - mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
42 + mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
43
44 # Directory to write Omega logs to:
45 keepdir /var/log/omega