diff options
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/Manifest.gz | bin | 39194 -> 39192 bytes | |||
-rw-r--r-- | eclass/ant-tasks.eclass | 11 | ||||
-rw-r--r-- | eclass/cmake-utils.eclass | 6 | ||||
-rw-r--r-- | eclass/elisp.eclass | 4 | ||||
-rw-r--r-- | eclass/gnatbuild-r1.eclass | 1 | ||||
-rw-r--r-- | eclass/gnatbuild.eclass | 1 | ||||
-rw-r--r-- | eclass/kernel-2.eclass | 2 | ||||
-rw-r--r-- | eclass/linux-info.eclass | 3 | ||||
-rw-r--r-- | eclass/meson.eclass | 7 | ||||
-rw-r--r-- | eclass/webapp.eclass | 5 |
10 files changed, 20 insertions, 20 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 883d0f8d33df..0722b4a4b9f8 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index e008e6eaea81..31683e682437 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -16,7 +16,8 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true # rewriting build.xml for are the testcases has no reason atm JAVA_PKG_BSFIX_ALL=no -inherit versionator java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 +[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver EXPORT_FUNCTIONS src_unpack src_compile src_install @@ -60,12 +61,12 @@ if [[ ${PV} == *beta2* ]]; then MY_PV=${PV/_beta2/beta} UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src" GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" - ANT_TASK_PV=$(get_version_component_range 1-3) + ANT_TASK_PV=$(ver_cut 1-3) elif [[ ${PV} == *_rc* ]]; then MY_PV=${PV/_rc/RC} UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles" GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" - ANT_TASK_PV=$(get_version_component_range 1-3) + ANT_TASK_PV=$(ver_cut 1-3) else # default for final releases MY_PV=${PV} @@ -101,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then fi # we need direct blockers with old ant-tasks for file collisions - bug #252324 -if version_is_at_least 1.7.1 ; then +if ver_test -ge 1.7.1; then DEPEND+=" !dev-java/ant-tasks" fi @@ -167,7 +168,7 @@ ant-tasks_src_install() { java-pkg_register-ant-task --version "${ANT_TASK_PV}" # create the compatibility symlink - if version_is_at_least 1.7.1_beta2; then + if ver_test -ge 1.7.1_beta2; then dodir /usr/share/ant/lib dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar fi diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 558ff3a1ef9b..e64502b3b9b0 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -614,6 +614,12 @@ cmake-utils_src_configure() { _EOF_ [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" + if [[ ${EAPI} != [56] ]]; then + cat >> "${common_config}" <<- _EOF_ || die + SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") + _EOF_ + fi + # Wipe the default optimization flags out of CMake if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then cat >> ${common_config} <<- _EOF_ || die diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 4447f12532c2..9a66ec58ce50 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -137,14 +137,14 @@ elisp_src_prepare() { fi case ${EAPI:-0} in 0|1|2|3|4|5) epatch "${file}" ;; - 6) eapply "${file}" ;; + *) eapply "${file}" ;; esac done # apply any user patches case ${EAPI:-0} in 0|1|2|3|4|5) epatch_user ;; - 6) eapply_user ;; + *) eapply_user ;; esac if [[ -n ${ELISP_REMOVE} ]]; then diff --git a/eclass/gnatbuild-r1.eclass b/eclass/gnatbuild-r1.eclass index cdc64a3fe7c6..236a9aa1ce16 100644 --- a/eclass/gnatbuild-r1.eclass +++ b/eclass/gnatbuild-r1.eclass @@ -313,7 +313,6 @@ should_we_eselect_gnat() { echo elog "eselect gnat set <profile>" echo - ebeep return 1 fi } diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass index 5d485c9338ca..da72f554439d 100644 --- a/eclass/gnatbuild.eclass +++ b/eclass/gnatbuild.eclass @@ -237,7 +237,6 @@ should_we_eselect_gnat() { echo elog "eselect gnat set <profile>" echo - ebeep return 1 fi } diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 6ffbd37f300e..94937b6630ba 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -749,7 +749,6 @@ unpack_2_6() { touch .config eerror "make defconfig failed." eerror "assuming you dont have any headers installed yet and continuing" - epause 5 fi make -s include/linux/version.h ${xmakeopts} 2>/dev/null \ @@ -1607,7 +1606,6 @@ kernel-2_pkg_setup() { ewarn "Also be aware that bugreports about gcc-4 not working" ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" echo - epause 10 fi fi diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 035b722e2d6d..dd62b26855d2 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-info.eclass @@ -914,7 +914,6 @@ linux-info_pkg_setup() { ewarn "Also be aware that bugreports about gcc-4 not working" ewarn "with linux-2.4 based ebuilds will be closed as INVALID!" echo - epause 10 fi fi diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 576e9b428643..f2202a04593d 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -157,12 +157,13 @@ _meson_create_cross_file() { # This may require adjustment based on CFLAGS local cpu=${CHOST%%-*} - cat > "${T}/meson.${CHOST}" <<-EOF + cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF [binaries] ar = $(_meson_env_array "$(tc-getAR)") c = $(_meson_env_array "$(tc-getCC)") cpp = $(_meson_env_array "$(tc-getCXX)") fortran = $(_meson_env_array "$(tc-getFC)") + llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") pkgconfig = '$(tc-getPKG_CONFIG)' @@ -217,9 +218,9 @@ meson_src_configure() { --wrap-mode nodownload ) - if tc-is-cross-compiler; then + if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then _meson_create_cross_file || die "unable to write meson cross file" - mesonargs+=( --cross-file "${T}/meson.${CHOST}" ) + mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" ) fi # https://bugs.gentoo.org/625396 diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index c80674d3b13e..8983af334ab8 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: webapp.eclass @@ -411,9 +411,6 @@ webapp_pkg_setup() { ewarn "This ebuild may be overwriting important files." ewarn echo - if has "${EAPI:-0}" 0 1 2; then - ebeep 10 - fi elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then echo eerror "You already have ${my_output} installed in ${my_dir}" |