Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 02 Aug 2016 22:34:49
Message-Id: 1470177262.2b5c4aea1d5b482987578a61793dc93da19b4c36.chewi@gentoo
1 commit: 2b5c4aea1d5b482987578a61793dc93da19b4c36
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 22:16:15 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 22:34:22 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5c4aea
7
8 java-vm-2.eclass: Allow java-vm_revdep-mask to be called repeatedly
9
10 This is useful for multilib JVM ebuilds. revdep-rebuild currently
11 supports multiple SEARCH_DIRS_MASK entries.
12
13 eclass/java-vm-2.eclass | 7 +++++--
14 1 file changed, 5 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
17 index 52f040e..8bfb1bb 100644
18 --- a/eclass/java-vm-2.eclass
19 +++ b/eclass/java-vm-2.eclass
20 @@ -267,10 +267,13 @@ java-vm_set-pax-markings() {
21 # @CODE
22
23 java-vm_revdep-mask() {
24 + debug-print-function ${FUNCNAME} "$*"
25 +
26 local VMROOT="${1-"${EPREFIX}"/opt/${P}}"
27
28 - dodir /etc/revdep-rebuild/
29 - echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}"
30 + dodir /etc/revdep-rebuild
31 + echo "SEARCH_DIRS_MASK=\"${VMROOT}\"" >> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}" \
32 + || die "Failed to write revdep-rebuild mask file"
33 }