commit: 44dc00f87317dc5697da14bc9e8e9540c670dbc0 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Jan 25 21:11:11 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jan 25 21:11:11 2020 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=44dc00f8
crossdev: migrate from package.keywords to package.accept_keywords Reported-by: Doppler Bug: https://bugs.gentoo.org/706212 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> crossdev | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crossdev b/crossdev index 5dcd82d..1722942 100755 --- a/crossdev +++ b/crossdev @@ -530,7 +530,8 @@ uninstall() { # clean out portage config files [[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ && rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} - for f in categories package.{env,mask,keywords,use} profile/package.use.{force,mask} ; do + # crossdev stopped creating 'package.keywords' in Jan 2020 + for f in categories package.{accept_keywords,env,mask,keywords,use} profile/package.use.{force,mask} ; do f="${CONFIGROOT}/${f}" rm -f "${f}"/cross-${CTARGET} rmdir "${f}" 2>/dev/null @@ -1016,7 +1017,7 @@ _set_portage_file() { set_keywords() { local pkg=$1 ver=$2 output [[ -z ${pkg} ]] && return 0 - output=$(_set_portage_file ${pkg} package.keywords) + output=$(_set_portage_file ${pkg} package.accept_keywords) if [[ ${ver} == "["*"]" ]] || [[ -z ${ver} ]] ; then local keywords="" @@ -1254,7 +1255,7 @@ for f in "${CONFIGROOT}" "${CROSSDEV_OVERLAY}"/profiles ; do || echo cross-${CTARGET} >> "${f}" done cd "${CONFIGROOT}" || die "wtf!?" -for f in package.{env,keywords,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do +for f in package.{accept_keywords,env,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do [[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" xmkdir -p "${f}" rm -f "${f}/cross-${CTARGET}"