summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/Manifest.gzbin37443 -> 37446 bytes
-rw-r--r--eclass/distutils-r1.eclass11
-rw-r--r--eclass/emboss-r2.eclass4
-rw-r--r--eclass/kernel-2.eclass23
4 files changed, 26 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 0a50771fae27..061ddf4fd7f4 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
Binary files differ
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index fa7a3ab5c12b..66920d1f7553 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -597,7 +597,16 @@ distutils-r1_python_install() {
die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
fi
done
- if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
+
+ local shopt_save=$(shopt -p nullglob)
+ shopt -s nullglob
+ local pypy_dirs=(
+ "${root}/usr/$(get_libdir)"/pypy*/share
+ "${root}/usr/lib"/pypy*/share
+ )
+ ${shopt_save}
+
+ if [[ -n ${pypy_dirs} ]]; then
local cmd=die
[[ ${EAPI} == [45] ]] && cmd=eqawarn
"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
index 266c4583c189..1eca48b42b36 100644
--- a/eclass/emboss-r2.eclass
+++ b/eclass/emboss-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: emboss-r2.eclass
@@ -58,7 +58,7 @@ RDEPEND="
dev-libs/libpcre:3
sci-libs/plplot:=
sys-libs/zlib
- mysql? ( virtual/mysql )
+ mysql? ( dev-db/mysql-connector-c:0= )
pdf? ( media-libs/libharu:= )
png? ( media-libs/gd:2=[png] )
postgres? ( dev-db/postgresql:= )
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index edbb4a8584d4..ece1edfb36c6 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1227,16 +1227,21 @@ unipatch() {
UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
debug-print "genpatches tarball: $tarball"
- # check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010
- if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then
- # drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch
- if [[ $UNIPATCH_DROP != *"5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"* ]]; then
- UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+ local GCC_MAJOR_VER=$(gcc-major-version)
+ local GCC_MINOR_VER=$(gcc-minor-version)
+
+ # support old kernels for a period. For now, remove as all gcc versions required are masked
+ UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+
+ # optimization patch for gcc < 8.X and kernel > 4.13
+ if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
+ if kernel_is ge 4 13 ; then
+ UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
fi
- else
- if [[ $UNIPATCH_DROP != *"5000_enable-additional-cpu-optimizations-for-gcc.patch"* ]]; then
- #drop 5000_enable-additional-cpu-optimizations-for-gcc.patch
- UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch"
+ # optimization patch for gcc >= 8 and kernel ge 4.13
+ elif [[ "${GCC_MAJOR_VER}" -ge 8 ]]; then
+ if kernel_is ge 4 13; then
+ UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
fi
fi
fi