diff options
Diffstat (limited to 'profiles/prefix')
| -rw-r--r-- | profiles/prefix/sunos/solaris/package.mask | 4 | ||||
| -rw-r--r-- | profiles/prefix/windows/cygwin/profile.bashrc | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask index 927f9bdcd322..e830b8ac3e2b 100644 --- a/profiles/prefix/sunos/solaris/package.mask +++ b/profiles/prefix/sunos/solaris/package.mask @@ -1,10 +1,6 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Fabian Groffen <grobian@gentoo.org> (2019-03-22) -# fails to compile, bug #681316 -=app-crypt/gnupg-2.2.14 - # Fabian Groffen <grobian@gentoo.org> (2018-11-12) # these versions of binutils produces shared libraries with symbol lookup # errors, probably a versioning problem, confirmed on Solaris 10 and diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc index aecfd9adb7c0..9694edc101df 100644 --- a/profiles/prefix/windows/cygwin/profile.bashrc +++ b/profiles/prefix/windows/cygwin/profile.bashrc @@ -198,21 +198,14 @@ cygwin-rebase-merge() { } cygwin-rebase-post_pkg_prerm() { - # The pending list is installed as part of the package, but - # the merged list is not. Move from merged back to pending, - # in case the unmerge fails... - local pendingdir=$(cygwin-rebase-get_pendingdir) + # The pending list is registered as being installed with the package, but + # the merged list is not. Just remove the unregistered one. local mergeddir=$(cygwin-rebase-get_mergeddir) local listname=$(cygwin-rebase-get_listname) ( set -e cd "${EROOT}" [[ -w ./${mergeddir}/. ]] - [[ -w ./${pendingdir}/. ]] - if [[ -s ./${mergeddir}/${listname} ]] - then - mv -f "./${mergeddir}/${listname}" "./${pendingdir}/${listname}" || : - fi rm -f "./${mergeddir}/${listname}" ) } |