diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-10 00:43:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-10 00:43:02 +0000 |
| commit | a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch) | |
| tree | e6d8d3589fcd01fbc3f1286185639163daa81424 /eclass | |
| parent | fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff) | |
gentoo resync : 10.11.2017
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/meson.eclass | 13 | ||||
| -rw-r--r-- | eclass/php-ext-pecl-r2.eclass | 3 | ||||
| -rw-r--r-- | eclass/vim-plugin.eclass | 17 |
3 files changed, 11 insertions, 22 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index be1055a3fe57..2c943dd6ae27 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -103,12 +103,13 @@ _meson_create_cross_file() { # system roughly corresponds to uname -s (lowercase) local system=unknown case ${CHOST} in - *-aix*) system=aix ;; - *-cygwin*) system=cygwin ;; - *-darwin*) system=darwin ;; - *-freebsd*) system=freebsd ;; - *-linux*) system=linux ;; - *-solaris*) system=sunos ;; + *-aix*) system=aix ;; + *-cygwin*) system=cygwin ;; + *-darwin*) system=darwin ;; + *-freebsd*) system=freebsd ;; + *-linux*) system=linux ;; + mingw*|*-mingw*) system=windows ;; + *-solaris*) system=sunos ;; esac local cpu_family=$(tc-arch) diff --git a/eclass/php-ext-pecl-r2.eclass b/eclass/php-ext-pecl-r2.eclass index ca712c800525..84627b06f9db 100644 --- a/eclass/php-ext-pecl-r2.eclass +++ b/eclass/php-ext-pecl-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @DEAD @@ -61,6 +61,7 @@ fi SRC_URI="http://pecl.php.net/get/${FILENAME}" HOMEPAGE="http://pecl.php.net/${PECL_PKG}" +die "Please upgrade to php-ext-pecl-r3. This eclass is due to be removed." # @FUNCTION: php-ext-pecl-r2_src_compile # @DESCRIPTION: diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass index abe9c7b3661b..a0ba714f6e6e 100644 --- a/eclass/vim-plugin.eclass +++ b/eclass/vim-plugin.eclass @@ -35,19 +35,6 @@ vim-plugin_src_install() { has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" local f - if use !prefix && [[ ${EUID} -eq 0 ]] ; then - ebegin "Fixing file permissions" - # Make sure perms are good - chmod -R a+rX "${S}" || die "chmod failed" - find "${S}" -user 'portage' -exec chown root '{}' \; || die "chown failed" - if use userland_BSD || [[ ${CHOST} == *-darwin* ]] ; then - find "${S}" -group 'portage' -exec chgrp wheel '{}' \; || die "chgrp failed" - else - find "${S}" -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed" - fi - eend $? - fi - # When globbing, if nothing exists, the shell literally returns the glob # pattern. So turn on nullglob and extglob options to avoid this. eshopts_push -s extglob @@ -85,8 +72,8 @@ vim-plugin_src_install() { mv "${S}" "${ED}"/usr/share/vim/vimfiles || die \ "couldn't move ${S} to ${ED}/usr/share/vim/vimfiles" - # Fix remaining bad permissions - chmod -R -x+X "${ED}"/usr/share/vim/vimfiles/ || die "chmod failed" + # Set permissions + fperms -R a+rX /usr/share/vim/vimfiles } # @FUNCTION: vim-plugin_pkg_postinst |