diff options
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 0 -> 41338 bytes | |||
-rw-r--r-- | eclass/db.eclass | 32 | ||||
-rw-r--r-- | eclass/mozconfig-v6.45.eclass | 4 | ||||
-rw-r--r-- | eclass/mozconfig-v6.49.eclass | 5 | ||||
-rw-r--r-- | eclass/mozconfig-v6.51.eclass | 5 | ||||
-rw-r--r-- | eclass/mozconfig-v6.52.eclass | 5 | ||||
-rw-r--r-- | eclass/mozconfig-v6.53.eclass | 5 | ||||
-rw-r--r-- | eclass/mozconfig-v6.55.eclass | 5 | ||||
-rw-r--r-- | eclass/mozconfig-v6.56.eclass | 5 | ||||
-rw-r--r-- | eclass/mozconfig-v6.57.eclass | 5 | ||||
-rw-r--r-- | eclass/ruby-fakegem.eclass | 2 | ||||
-rw-r--r-- | eclass/user.eclass | 10 |
12 files changed, 68 insertions, 15 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differnew file mode 100644 index 000000000000..03dc3f96d341 --- /dev/null +++ b/eclass/Manifest.gz diff --git a/eclass/db.eclass b/eclass/db.eclass index c46c431ea9cd..5227601c456f 100644 --- a/eclass/db.eclass +++ b/eclass/db.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 # @ECLASS: db.eclass @@ -17,7 +17,8 @@ DEPEND="test? ( >=dev-lang/tcl-8.4 )" RDEPEND="" db_fix_so() { - LIB="${ROOT}/usr/$(get_libdir)" + has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" + LIB="${EROOT}/usr/$(get_libdir)" cd "${LIB}" @@ -50,7 +51,7 @@ db_fix_so() { # do the same for headers now # but since there are only two of them, just overwrite them - cd "${ROOT}"/usr/include + cd "${EROOT}"/usr/include target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -n |cut -d/ -f2- | tail -n1` if [ -n "${target}" ] && [ -e "${target}/db.h" ] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then einfo "Creating db.h symlinks to ${target}" @@ -67,19 +68,21 @@ db_fix_so() { } db_src_install_doc() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # not everybody wants this wad of documentation as it is primarily API docs if use doc; then dodir /usr/share/doc/${PF}/html - mv "${D}"/usr/docs/* "${D}"/usr/share/doc/${PF}/html/ - rm -rf "${D}"/usr/docs + mv "${ED}"/usr/docs/* "${ED}"/usr/share/doc/${PF}/html/ + rm -rf "${ED}"/usr/docs else - rm -rf "${D}"/usr/docs + rm -rf "${ED}"/usr/docs fi db_src_install_examples } db_src_install_examples() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" if use examples ; then local langs="c cxx stl" [[ "${IUSE/java}" != "${IUSE}" ]] \ @@ -90,15 +93,16 @@ db_src_install_examples() { src="${S}/../examples_${i}/" if [ -f "${src}" ]; then dodir "${destdir}" - cp -ra "${src}" "${D}${destdir}/" + cp -ra "${src}" "${ED}${destdir}/" fi done fi } db_src_install_usrbinslot() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # slot all program names to avoid overwriting - for fname in "${D}"/usr/bin/db* + for fname in "${ED}"/usr/bin/db* do dn="$(dirname "${fname}")" bn="$(basename "${fname}")" @@ -109,18 +113,20 @@ db_src_install_usrbinslot() { } db_src_install_headerslot() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # install all headers in a slotted location dodir /usr/include/db${SLOT} - mv "${D}"/usr/include/*.h "${D}"/usr/include/db${SLOT}/ + mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ } db_src_install_usrlibcleanup() { - LIB="${D}/usr/$(get_libdir)" + has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" + LIB="${ED}/usr/$(get_libdir)" # Clean out the symlinks so that they will not be recorded in the # contents (bug #60732) - if [ "${D}" = "" ]; then - die "Calling clean_links while \$D not defined" + if [ "${ED}" = "" ]; then + die "Calling clean_links while \$ED not defined" fi if [ -e "${LIB}"/libdb.a ] && [ ! -e "${LIB}"/libdb-${SLOT}.a ]; then @@ -139,7 +145,7 @@ db_src_install_usrlibcleanup() { find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \; rm -f \ - "${D}"/usr/include/{db,db_185}.h \ + "${ED}"/usr/include/{db,db_185}.h \ "${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a } diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass index d6d3621ffc52..8409b11f0b96 100644 --- a/eclass/mozconfig-v6.45.eclass +++ b/eclass/mozconfig-v6.45.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="jit". Currently this would include @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="gtk3". Currently this would include @@ -59,6 +62,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass index f4f80065ac58..4ca5b079b8f6 100644 --- a/eclass/mozconfig-v6.49.eclass +++ b/eclass/mozconfig-v6.49.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="jit". Currently this would include @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="gtk3". Currently this would include @@ -59,6 +62,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -72,6 +76,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.51.eclass b/eclass/mozconfig-v6.51.eclass index 3048fd726508..e2d65ca25738 100644 --- a/eclass/mozconfig-v6.51.eclass +++ b/eclass/mozconfig-v6.51.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # deterministic jit support via IUSE="jit". The upstream default will be used @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="gtk3". Currently this would include @@ -59,6 +62,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -72,6 +76,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass index c859aa7b8c13..04042b9a982d 100644 --- a/eclass/mozconfig-v6.52.eclass +++ b/eclass/mozconfig-v6.52.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # deterministic jit support via IUSE="jit". The upstream default will be used @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="force-gtk3". Currently this would include @@ -61,6 +64,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # MOZCONFIG_OPTIONAL_GTK2ONLY. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -74,6 +78,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.53.eclass b/eclass/mozconfig-v6.53.eclass index d15c47eedbb9..a5aa97186242 100644 --- a/eclass/mozconfig-v6.53.eclass +++ b/eclass/mozconfig-v6.53.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # deterministic jit support via IUSE="jit". The upstream default will be used @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="force-gtk3". Currently this would include @@ -61,6 +64,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # MOZCONFIG_OPTIONAL_GTK2ONLY. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -74,6 +78,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.55.eclass b/eclass/mozconfig-v6.55.eclass index 4c20d971e87a..cb513565b917 100644 --- a/eclass/mozconfig-v6.55.eclass +++ b/eclass/mozconfig-v6.55.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # deterministic jit support via IUSE="jit". The upstream default will be used @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="force-gtk3". Currently this would include @@ -61,6 +64,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # MOZCONFIG_OPTIONAL_GTK2ONLY. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -74,6 +78,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass index ee47ccdea4a5..6d6063ab191f 100644 --- a/eclass/mozconfig-v6.56.eclass +++ b/eclass/mozconfig-v6.56.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # deterministic jit support via IUSE="jit". The upstream default will be used @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="force-gtk3". Currently this would include @@ -61,6 +64,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # MOZCONFIG_OPTIONAL_GTK2ONLY. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -74,6 +78,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/mozconfig-v6.57.eclass b/eclass/mozconfig-v6.57.eclass index 8aed435bd4ee..f05a69c1a2e0 100644 --- a/eclass/mozconfig-v6.57.eclass +++ b/eclass/mozconfig-v6.57.eclass @@ -29,6 +29,7 @@ esac inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # optional necko-wifi support via IUSE="wifi". Currently this would include @@ -39,6 +40,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild needs to provide # deterministic jit support via IUSE="jit". The upstream default will be used @@ -49,6 +51,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk3 support via IUSE="force-gtk3". Currently this would include @@ -61,6 +64,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # MOZCONFIG_OPTIONAL_GTK2ONLY. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional gtk2-only support via IUSE="gtk2". @@ -74,6 +78,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 # Set the variable to any value if the use flag should exist but not be default-enabled. # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 +# @DEFAULT_UNSET # @DESCRIPTION: # Set this variable before the inherit line, when an ebuild can provide # optional qt5 support via IUSE="qt5". Currently this would include diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 57ff678cdf07..c606ccfdb7b3 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -98,11 +98,11 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}" # Filename of .gemspec file to install instead of generating a generic one. # @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTRAINSTALL +# @DEFAULT_UNSET # @DESCRIPTION: # List of files and directories relative to the top directory that also # get installed. Some gems provide extra files such as version information, # Rails generators, or data that needs to be installed as well. -RUBY_FAKEGEM_EXTRAINSTALL="" RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}" diff --git a/eclass/user.eclass b/eclass/user.eclass index 86bcd282479f..97e417a7be9d 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: user.eclass @@ -103,6 +103,10 @@ egetent() { # Default uid is (pass -1 for this) next available, default shell is # /bin/false, default homedir is /dev/null, and there are no default groups. enewuser() { + if [[ ${EUID} != 0 ]] ; then + einfo "Insufficient privileges to execute ${FUNCNAME[0]}" + return 0 + fi _assert_pkg_ebuild_phase ${FUNCNAME} # get the username @@ -262,6 +266,10 @@ enewuser() { # do the rest. You may specify the gid for the group or allow the group to # allocate the next available one. enewgroup() { + if [[ ${EUID} != 0 ]] ; then + einfo "Insufficient privileges to execute ${FUNCNAME[0]}" + return 0 + fi _assert_pkg_ebuild_phase ${FUNCNAME} # get the group |