1 |
commit: 44dc00f87317dc5697da14bc9e8e9540c670dbc0 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 25 21:11:11 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 25 21:11:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=44dc00f8 |
7 |
|
8 |
crossdev: migrate from package.keywords to package.accept_keywords |
9 |
|
10 |
Reported-by: Doppler |
11 |
Bug: https://bugs.gentoo.org/706212 |
12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
13 |
|
14 |
crossdev | 7 ++++--- |
15 |
1 file changed, 4 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/crossdev b/crossdev |
18 |
index 5dcd82d..1722942 100755 |
19 |
--- a/crossdev |
20 |
+++ b/crossdev |
21 |
@@ -530,7 +530,8 @@ uninstall() { |
22 |
# clean out portage config files |
23 |
[[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ |
24 |
&& rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} |
25 |
- for f in categories package.{env,mask,keywords,use} profile/package.use.{force,mask} ; do |
26 |
+ # crossdev stopped creating 'package.keywords' in Jan 2020 |
27 |
+ for f in categories package.{accept_keywords,env,mask,keywords,use} profile/package.use.{force,mask} ; do |
28 |
f="${CONFIGROOT}/${f}" |
29 |
rm -f "${f}"/cross-${CTARGET} |
30 |
rmdir "${f}" 2>/dev/null |
31 |
@@ -1016,7 +1017,7 @@ _set_portage_file() { |
32 |
set_keywords() { |
33 |
local pkg=$1 ver=$2 output |
34 |
[[ -z ${pkg} ]] && return 0 |
35 |
- output=$(_set_portage_file ${pkg} package.keywords) |
36 |
+ output=$(_set_portage_file ${pkg} package.accept_keywords) |
37 |
|
38 |
if [[ ${ver} == "["*"]" ]] || [[ -z ${ver} ]] ; then |
39 |
local keywords="" |
40 |
@@ -1254,7 +1255,7 @@ for f in "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/profiles ; do |
41 |
|| echo cross-${CTARGET} >> "${f}" |
42 |
done |
43 |
cd "${CONFIGROOT}" || die "wtf!?" |
44 |
-for f in package.{env,keywords,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do |
45 |
+for f in package.{accept_keywords,env,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do |
46 |
[[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" |
47 |
xmkdir -p "${f}" |
48 |
rm -f "${f}/cross-${CTARGET}" |