diff options
21 files changed, 331 insertions, 236 deletions
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0.ebuild index 5fb59fc6617a..89c9004502c4 100644 --- a/dev-lang/ocaml/ocaml-4.09.0.ebuild +++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" RDEPEND="sys-libs/binutils-libs:= diff --git a/dev-ruby/barby/barby-0.6.8.ebuild b/dev-ruby/barby/barby-0.6.8.ebuild index 8b5f75b2b3d6..78290277d133 100644 --- a/dev-ruby/barby/barby-0.6.8.ebuild +++ b/dev-ruby/barby/barby-0.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -25,7 +25,7 @@ KEYWORDS="~amd64" IUSE="test qrcode rmagick prawn png cairo" ruby_add_rdepend " - rmagick? ( dev-ruby/rmagick ) + rmagick? ( dev-ruby/rmagick:* ) cairo? ( dev-ruby/rcairo )" ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode ) diff --git a/dev-ruby/rcairo/rcairo-1.16.5.ebuild b/dev-ruby/rcairo/rcairo-1.16.5.ebuild index 56694baf14ba..ec94518c6401 100644 --- a/dev-ruby/rcairo/rcairo-1.16.5.ebuild +++ b/dev-ruby/rcairo/rcairo-1.16.5.ebuild @@ -3,7 +3,7 @@ EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_NAME="cairo" diff --git a/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild index 58979b3170b3..76d6b6aeafc2 100644 --- a/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild +++ b/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_EXTRADOC="README.md" diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild index ecd747dd85fa..85aa662c9da3 100644 --- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild +++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" inherit ruby-ng-gnome2 diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild index 341d6ab3eb43..8bb8278c24ca 100644 --- a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild +++ b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" inherit ruby-ng-gnome2 diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild index 177fc7b8c9df..d8f7adf0af33 100644 --- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild +++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" inherit ruby-ng-gnome2 diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild index 2cb9544a2609..2d2bad37ef78 100644 --- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild +++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" inherit ruby-ng-gnome2 diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild index ed0b2a50186b..681c77dd5d37 100644 --- a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild +++ b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" inherit ruby-ng-gnome2 diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass index 1a684ef00a66..e24fd1875f47 100644 --- a/eclass/latex-package.eclass +++ b/eclass/latex-package.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: latex-package.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Matthew Turk <satai@gentoo.org> # Martin Ehmsen <ehmsen@gentoo.org> -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 7 # @BLURB: An eclass for easy installation of LaTeX packages # @DESCRIPTION: # This eClass is designed to be easy to use and implement. The vast majority of @@ -50,21 +50,21 @@ # signatures EVERY TIME. For this reason, if you are grabbing from the CTAN, # you must either grab each file individually, or find a place to mirror an # archive of them. (iBiblio) -# -# It inherits base and eutils in EAPI 5 and earlier. -case ${EAPI:-0} in - 0|1|2|3|4|5) inherit base eutils ;; -esac +if [[ -z ${_LATEX_PACKAGE_ECLASS} ]]; then +_LATEX_PACKAGE_ECLASS=1 RDEPEND="virtual/latex-base" DEPEND="${RDEPEND} >=sys-apps/texinfo-4.2-r5" + case ${EAPI:-0} in - 0|1|2|3|4|5|6) ;; - 7) BDEPEND="${DEPEND}"; DEPEND="" ;; - *) die "${ECLASS}: Unknown EAPI ${EAPI}" ;; + [0-6]) + die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; + 7) ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; esac + HOMEPAGE="http://www.tug.org/" TEXMF="/usr/share/texmf-site" @@ -81,14 +81,6 @@ SUPPLIER="misc" # must be set after inherit, as it gets automatically cleared otherwise. LATEX_DOC_ARGUMENTS="" -# Kept for backwards compatibility -latex-package_has_tetex_3() { - case ${EAPI:-0} in - 0|1|2|3|4|5) return 0 ;; - *) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;; - esac -} - # @FUNCTION: latex-package_src_doinstall # @USAGE: [ module ] # @DESCRIPTION: @@ -105,93 +97,94 @@ latex-package_src_doinstall() { # This actually follows the directions for a "single-user" system # at http://www.ctan.org/installationadvice/ modified for gentoo. - [ -z "$1" ] && latex-package_src_install all + [[ -z ${1} ]] && latex-package_src_install all - while [ "$1" ]; do - case $1 in + while [[ ${1} ]]; do + case ${1} in "sh") - for i in `find . -maxdepth 1 -type f -name "*.${1}"` - do - dobin $i || die "dobin $i failed" - done + while read -r -d '' i; do + dobin ${i} + done < <(find -maxdepth 1 -type f -name "*.${1}") ;; + "sty" | "cls" | "fd" | "clo" | "def" | "cfg") - for i in `find . -maxdepth 1 -type f -name "*.${1}"` - do + while read -r -d '' i; do insinto ${TEXMF}/tex/latex/${PN} - doins $i || die "doins $i failed" - done + doins ${i} + done < <(find -maxdepth 1 -type f -name "*.${1}") ;; + "dvi" | "ps" | "pdf") - for i in `find . -maxdepth 1 -type f -name "*.${1}"` - do + while read -r -d '' i; do insinto /usr/share/doc/${PF} - doins $i || die "doins $i failed" + doins ${i} dosym /usr/share/doc/${PF}/$(basename ${i}) ${TEXMF}/doc/latex/${PN}/${i} - case "${EAPI:-0}" in - 0|1|2|3) ;; - *) - # prevent compression of symlink target - docompress -x /usr/share/doc/${PF}/$(basename ${i}) - ;; - esac - done + docompress -x /usr/share/doc/${PF}/$(basename ${i}) + done < <(find -maxdepth 1 -type f -name "*.${1}") ;; + "tex" | "dtx") if ! in_iuse doc || use doc ; then - for i in `find . -maxdepth 1 -type f -name "*.${1}"` - do - [ -n "${LATEX_PACKAGE_SKIP}" ] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue - einfo "Making documentation: $i" - if pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i ; then - pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i || die + while read -r -d '' i; do + [[ -n ${LATEX_PACKAGE_SKIP} ]] && \ + has ${i##*/} ${LATEX_PACKAGE_SKIP} && \ + continue + + einfo "Making documentation: ${i}" + # some macros need compiler called twice, do it here. + set -- pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode ${i} + if "${@}"; then + "${@}" else einfo "pdflatex failed, trying texi2dvi" - texi2dvi -q -c --language=latex $i || die + texi2dvi -q -c --language=latex ${i} || die fi - done + done < <(find -maxdepth 1 -type f -name "*.${1}") fi ;; + "tfm" | "vf" | "afm") - for i in `find . -maxdepth 1 -type f -name "*.${1}"` - do + while read -r -d '' i; do insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN} - doins $i || die "doins $i failed" - done + doins ${i} + done < <(find -maxdepth 1 -type f -name "*.${1}") ;; + "pfb") - for i in `find . -maxdepth 1 -type f -name "*.pfb"` - do + while read -r -d '' i; do insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN} - doins $i || die "doins $i failed" - done + doins ${i} + done < <(find -maxdepth 1 -type f -name "*.pfb") ;; "ttf") - for i in `find . -maxdepth 1 -type f -name "*.ttf"` - do + while read -r -d '' i; do insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN} - doins $i || die "doins $i failed" - done + doins ${i} + done < <(find -maxdepth 1 -type f -name "*.ttf") ;; "bst") - for i in `find . -maxdepth 1 -type f -name "*.bst"` - do + while read -r -d '' i; do insinto ${TEXMF}/bibtex/bst/${PN} - doins $i || die "doins $i failed" - done + doins ${i} + done < <(find -maxdepth 1 -type f -name "*.bst") ;; + "styles") latex-package_src_doinstall sty cls fd clo def cfg bst ;; + "doc") latex-package_src_doinstall tex dtx dvi ps pdf ;; + "fonts") latex-package_src_doinstall tfm vf afm pfb ttf ;; + "bin") latex-package_src_doinstall sh ;; + "all") latex-package_src_doinstall styles fonts bin doc ;; @@ -206,11 +199,10 @@ latex-package_src_doinstall() { # relevant files that will be installed latex-package_src_compile() { debug-print function $FUNCNAME $* - for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"` - do - einfo "Extracting from $i" - latex --halt-on-error --interaction=nonstopmode $i || die - done + while read -r -d '' i; do + einfo "Extracting from ${i}" + latex --halt-on-error --interaction=nonstopmode ${i} || die + done < <(find -maxdepth 1 -type f -name "*.ins") } # @FUNCTION: latex-package_src_install @@ -219,9 +211,7 @@ latex-package_src_compile() { latex-package_src_install() { debug-print function $FUNCNAME $* latex-package_src_doinstall all - if [ -n "${DOCS}" ] ; then - dodoc ${DOCS} - fi + einstalldocs } # @FUNCTION: latex-package_pkg_postinst @@ -251,3 +241,5 @@ latex-package_rehash() { } EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm + +fi diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass index 593e88558710..2618cba2e1ac 100644 --- a/eclass/texlive-common.eclass +++ b/eclass/texlive-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: texlive-common.eclass @@ -12,14 +12,15 @@ # Purpose: Provide various functions used by both texlive-core and texlive # modules. # -# Note that this eclass *must* not assume the presence of any standard tex tool - -case "${EAPI:-0}" in - 0|1|2|3|4|5|6) - die "EAPI='${EAPI}' is not supported anymore" - ;; - *) - ;; +# Note that this eclass *must* not assume the presence of any standard tex too + +if [[ -z ${_TEXLIVE_COMMON_ECLASS} ]]; then +_TEXLIVE_COMMON_ECLASS=1 + +case ${EAPI:-0} in + [0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; + 7) ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; esac TEXMF_PATH=/usr/share/texmf @@ -35,17 +36,18 @@ TEXMF_VAR_PATH=/var/lib/texmf texlive-common_handle_config_files() { # Handle config files properly - [ -d "${ED}${TEXMF_PATH}" ] || return - cd "${ED}${TEXMF_PATH}" - for f in $(find . -name '*.cnf' -type f -o -name '*.cfg' -type f | sed -e "s:\./::g") ; do - if [ "${f#*config}" != "${f}" -o "${f#doc}" != "${f}" -o "${f#source}" != "${f}" -o "${f#tex}" != "${f}" ] ; then + [[ -d ${ED}${TEXMF_PATH} ]] || return + cd "${ED}${TEXMF_PATH}" || die + + while read -r -d '' i; do + if [[ ${f#*config} != ${f} || ${f#doc} != ${f} || ${f#source} != ${f} || ${f#tex} != ${f} ]] ; then continue fi dodir /etc/texmf/$(dirname ${f}).d einfo "Moving (and symlinking) ${EPREFIX}${TEXMF_PATH}/${f} to ${EPREFIX}/etc/texmf/$(dirname ${f}).d" mv "${ED}/${TEXMF_PATH}/${f}" "${ED}/etc/texmf/$(dirname ${f}).d" || die "mv ${f} failed." dosym /etc/texmf/$(dirname ${f}).d/$(basename ${f}) ${TEXMF_PATH}/${f} - done + done < <(find -name '*.cnf' -type f -o -name '*.cfg' -type f | sed -e "s:\./::g") } # @FUNCTION: texlive-common_is_file_present_in_texmf @@ -54,10 +56,14 @@ texlive-common_handle_config_files() { # Call it from the directory containing texmf and texmf-dist texlive-common_is_file_present_in_texmf() { - local mark="${T}/$1.found" - [ -d texmf ] && find texmf -name $1 -exec touch "${mark}" \; - [ -d texmf-dist ] && find texmf-dist -name $1 -exec touch "${mark}" \; - [ -f "${mark}" ] + local mark="${T}/${1}.found" + if [[ -d texmf ]]; then + find texmf -name ${1} -exec touch ${mark} {} + || die + fi + + if [[ -d texmf-dist ]]; then + find texmf-dist -name ${1} -exec touch ${mark} {} + || die + fi } # @FUNCTION: texlive-common_do_symlinks @@ -73,24 +79,22 @@ texlive-common_is_file_present_in_texmf() { # also do the fmtutil file parsing. texlive-common_do_symlinks() { - while [ $# != 0 ]; do - case $1 in + while [[ ${#} != 0 ]]; do + case ${1} in cont-??|metafun|mptopdf) - einfo "Symlink $1 skipped (special case)" + einfo "Symlink ${1} skipped (special case)" ;; mf) - einfo "Symlink $1 -> $2 skipped (texlive-core takes care of it)" + einfo "Symlink ${1} -> ${2} skipped (texlive-core takes care of it)" ;; *) - if [ $1 = $2 ]; - then - einfo "Symlink $1 -> $2 skipped" - elif [ -e "${ED}/usr/bin/$1" -o -L "${ED}/usr/bin/$1" ]; - then - einfo "Symlink $1 skipped (file exists)" + if [[ ${1} == ${2} ]]; then + einfo "Symlink ${1} -> ${2} skipped" + elif [[ -e ${ED}/usr/bin/${1} || -L ${ED}/usr/bin/${1} ]]; then + einfo "Symlink ${1} skipped (file exists)" else - einfo "Making symlink from $1 to $2" - dosym $2 /usr/bin/$1 + einfo "Making symlink from ${1} to ${2}" + dosym ${2} /usr/bin/${1} fi ;; esac @@ -123,11 +127,11 @@ etexlinks() { # correctly set for the file that it will point to. dobin_texmf_scripts() { - while [ $# -gt 0 ] ; do + while [[ ${#} -gt 0 ]] ; do local trg=$(basename ${1} | sed 's,\.[^/]*$,,' | tr '[:upper:]' '[:lower:]') einfo "Installing ${1} as ${trg} bin wrapper" - [ -x "${ED}/usr/share/${1}" ] || die "Trying to install a non existing or non executable symlink to /usr/bin: ${1}" - dosym ../share/${1} /usr/bin/${trg} || die "failed to install ${1} as $trg" + [[ -x ${ED}/usr/share/${1} ]] || die "Trying to install a non existing or non executable symlink to /usr/bin: ${1}" + dosym ../share/${1} /usr/bin/${trg} shift done } @@ -140,7 +144,7 @@ dobin_texmf_scripts() { etexmf-update() { if has_version 'app-text/texlive-core' ; then - if [ -z "${ROOT%/}" ] && [ -x "${EPREFIX}"/usr/sbin/texmf-update ] ; then + if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then "${EPREFIX}"/usr/sbin/texmf-update else ewarn "Cannot run texmf-update for some reason." @@ -158,9 +162,9 @@ etexmf-update() { efmtutil-sys() { if has_version 'app-text/texlive-core' ; then - if [ -z "${ROOT%/}" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then + if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/bin/fmtutil-sys ]] ; then einfo "Rebuilding formats" - "${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null + "${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null || die else ewarn "Cannot run fmtutil-sys for some reason." ewarn "Your formats might be inconsistent with your installed ${PN} version" @@ -168,3 +172,5 @@ efmtutil-sys() { fi fi } + +fi diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index 52b26cdca4dc..3f31f35e1abb 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: texlive-module.eclass @@ -68,13 +68,13 @@ # Information to display about the package. # e.g. for enabling/disabling a feature -case "${EAPI:-0}" in - 0|1|2|3|4|5|6) - die "EAPI='${EAPI}' is not supported anymore" - ;; - *) - inherit texlive-common - ;; +if [[ -z ${_TEXLIVE_MODULE_ECLASS} ]]; then +_TEXLIVE_MODULE_ECLASS=1 + +case ${EAPI:-0} in + [0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; + 7) inherit texlive-common ;; + *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; esac HOMEPAGE="http://www.tug.org/texlive/" @@ -97,14 +97,14 @@ for i in ${TEXLIVE_MODULE_CONTENTS}; do done # Forge doc SRC_URI -[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} doc? (" +[[ -n ${TEXLIVE_MODULE_DOC_CONTENTS} ]] && SRC_URI="${SRC_URI} doc? (" for i in ${TEXLIVE_MODULE_DOC_CONTENTS}; do SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" done -[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} )" +[[ -n ${TEXLIVE_MODULE_DOC_CONTENTS} ]] && SRC_URI="${SRC_URI} )" # Forge source SRC_URI -if [ -n "${TEXLIVE_MODULE_SRC_CONTENTS}" ] ; then +if [[ -n ${TEXLIVE_MODULE_SRC_CONTENTS} ]] ; then SRC_URI="${SRC_URI} source? (" for i in ${TEXLIVE_MODULE_SRC_CONTENTS}; do SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}" @@ -122,7 +122,7 @@ IUSE="${IUSE} doc" # A space separated list of Tex engines that can be made optional. # e.g. "luatex luajittex" -if [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] ; then +if [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] ; then for engine in ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ; do IUSE="${IUSE} +${engine}" done @@ -140,10 +140,12 @@ RELOC_TARGET=texmf-dist texlive-module_src_unpack() { unpack ${A} - grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" - { for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist" + grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" || die + { for i in $(<"${T}/reloclist"); do dirname ${i}; done; } | uniq > "${T}/dirlist" for i in $(<"${T}/dirlist"); do - [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}" + if [[ ! -d ${RELOC_TARGET}/${i} ]]; then + mkdir -p "${RELOC_TARGET}/${i}" || die + fi done for i in $(<"${T}/reloclist"); do mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})" @@ -161,14 +163,14 @@ texlive-module_add_format() { local name engine mode patterns options eval $@ einfo "Appending to format.${PN}.cnf for $@" - [ -d texmf-dist/fmtutil ] || mkdir -p texmf-dist/fmtutil - [ -f texmf-dist/fmtutil/format.${PN}.cnf ] || { echo "# Generated for ${PN} by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; } - [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled" - if [ "${mode}" = "disabled" ]; then - printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf + [[ -d texmf-dist/fmtutil ]] || mkdir -p texmf-dist/fmtutil || die + [[ -f texmf-dist/fmtutil/format.${PN}.cnf ]] || { echo "# Generated for ${PN} by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; } + [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled" + if [[ ${mode} = disabled ]]; then + printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf || die fi - [ -z "${patterns}" ] && patterns="-" - printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf + [[ -z ${patterns} ]] && patterns="-" + printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf || die } # @FUNCTION: texlive-module_make_language_def_lines @@ -180,13 +182,13 @@ texlive-module_make_language_def_lines() { local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial eval $@ einfo "Generating language.def entry for $@" - [ -z "$lefthyphenmin" ] && lefthyphenmin="2" - [ -z "$righthyphenmin" ] && righthyphenmin="3" - echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" - if [ -n "$synonyms" ] ; then + [[ -z ${lefthyphenmin} ]] && lefthyphenmin="2" + [[ -z ${righthyphenmin} ]] && righthyphenmin="3" + echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" || die + if [[ -n ${synonyms} ]]; then for i in $(echo $synonyms | tr ',' ' ') ; do einfo "Generating language.def synonym $i for $@" - echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" + echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" || die done fi } @@ -200,11 +202,11 @@ texlive-module_make_language_dat_lines() { local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial eval $@ einfo "Generating language.dat entry for $@" - echo "$name $file" >> "${S}/language.${PN}.dat" - if [ -n "$synonyms" ] ; then - for i in $(echo $synonyms | tr ',' ' ') ; do - einfo "Generating language.dat synonym $i for $@" - echo "=$i" >> "${S}/language.${PN}.dat" + echo "$name $file" >> "${S}/language.${PN}.dat" || die + if [[ -n ${synonyms} ]]; then + for i in $(echo ${synonyms} | tr ',' ' ') ; do + einfo "Generating language.dat synonym ${i} for $@" + echo "=${i}" >> "${S}/language.${PN}.dat" || die done fi } @@ -217,7 +219,7 @@ texlive-module_make_language_dat_lines() { texlive-module_synonyms_to_language_lua_line() { local prev="" for i in $(echo $@ | tr ',' ' ') ; do - printf "${prev} '%s'" $i + printf "${prev} '%s'" ${i} prev="," done } @@ -233,17 +235,27 @@ texlive-module_make_language_lua_lines() { local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial local dest="${S}/language.${PN}.dat.lua" eval $@ - [ -z "$lefthyphenmin" ] && lefthyphenmin="2" - [ -z "$righthyphenmin" ] && righthyphenmin="3" + [[ -z ${lefthyphenmin} ]] && lefthyphenmin="2" + [[ -z ${righthyphenmin} ]] && righthyphenmin="3" einfo "Generating language.dat.lua entry for $@" - printf "\t['%s'] = {\n" "$name" >> "$dest" - printf "\t\tloader = '%s',\n" "$file" >> "$dest" - printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "$lefthyphenmin" "$righthyphenmin" >> "$dest" - printf "\t\tsynonyms = {%s },\n" "$(texlive-module_synonyms_to_language_lua_line "$synonyms")" >> "$dest" - [ -n "$file_patterns" ] && printf "\t\tpatterns = '%s',\n" "$file_patterns" >> "$dest" - [ -n "$file_exceptions" ] && printf "\t\thyphenation = '%s',\n" "$file_exceptions" >> "$dest" - [ -n "$luaspecial" ] && printf "\t\tspecial = '%s',\n" "$luaspecial" >> "$dest" - printf "\t},\n" >> "$dest" + printf "\t['%s'] = {\n" "${name}" >> "${dest}" || die + printf "\t\tloader = '%s',\n" "${file}" >> "${dest}" || die + printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "${lefthyphenmin}" "${righthyphenmin}" >> "${dest}" || die + printf "\t\tsynonyms = {%s },\n" "$(texlive-module_synonyms_to_language_lua_line "${synonyms}")" >> "${dest}" || die + + if [[ -n ${file_patterns} ]]; then + printf "\t\tpatterns = '%s',\n" "${file_patterns}" >> "${dest}" || die + fi + + if [[ -n ${file_exceptions} ]]; then + printf "\t\thyphenation = '%s',\n" "${file_exceptions}" >> "${dest}" || die + fi + + if [[ -n ${luaspecial} ]]; then + printf "\t\tspecial = '%s',\n" "$luaspecial" >> "${dest}" || die + fi + + printf "\t},\n" >> "${dest}" || die } # @FUNCTION: texlive-module_src_compile @@ -263,7 +275,7 @@ texlive-module_src_compile() { # later for i in "${S}"/tlpkg/tlpobj/*; do - grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs" + grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs" || die done for i in $(<"${T}/jobs"); @@ -271,7 +283,7 @@ texlive-module_src_compile() { j="$(echo $i | tr '#' ' ')" command=${j%% *} parameter=${j#* } - case "${command}" in + case ${command} in addMap) echo "Map ${parameter}" >> "${S}/${PN}.cfg";; addMixedMap) @@ -283,14 +295,14 @@ texlive-module_src_compile() { addDvipdfmMap) echo "f ${parameter}" >> "${S}/${PN}-config";; AddHyphen) - texlive-module_make_language_def_lines "$parameter" - texlive-module_make_language_dat_lines "$parameter" - texlive-module_make_language_lua_lines "$parameter" + texlive-module_make_language_def_lines ${parameter} + texlive-module_make_language_dat_lines ${parameter} + texlive-module_make_language_lua_lines ${parameter} ;; AddFormat) - texlive-module_add_format "$parameter";; + texlive-module_add_format ${parameter};; BuildFormat) - einfo "Format $parameter already built.";; + einfo "Format ${parameter} already built.";; BuildLanguageDat) einfo "Language file $parameter already generated.";; *) @@ -304,10 +316,14 @@ texlive-module_src_compile() { # Build format files for i in texmf-dist/fmtutil/format*.cnf; do - if [ -f "${i}" ]; then + if [[ -f ${i} ]]; then einfo "Building format ${i}" - [ -d texmf-var ] || mkdir texmf-var - [ -d texmf-var/web2c ] || mkdir texmf-var/web2c + if [[ ! -d texmf-var ]]; then + mkdir texmf-var || die + fi + if [[ ! -d texmf-var/web2c ]]; then + mkdir texmf-var/web2c || die + fi VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}/texmf:${S}/texmf-dist:${S}/texmf-var"\ env -u TEXINPUTS $fmt_call --cnffile "${i}" --fmtdir "${S}/texmf-var/web2c" --all\ || die "failed to build format ${i}" @@ -326,50 +342,64 @@ texlive-module_src_compile() { texlive-module_src_install() { for i in texmf-dist/fmtutil/format*.cnf; do - [ -f "${i}" ] && etexlinks "${i}" + [[ -f ${i} ]] && etexlinks "${i}" done dodir /usr/share - if use doc; then - [ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/" + if use doc && [[ -d texmf-doc ]]; then + cp -pR texmf-doc "${ED}/usr/share/" || die else - [ -d texmf/doc ] && rm -rf texmf/doc - [ -d texmf-dist/doc ] && rm -rf texmf-dist/doc + if [[ -d texmf-dist/doc ]]; then + rm -rf texmf-dist/doc || die + fi + + if [[ -d texmf/doc ]]; then + rm -rf texmf/doc || die + fi + fi + + if [[ -d texmf ]]; then + cp -pR texmf "${ED}/usr/share/" || die + fi + + if [[ -d texmf-dist ]]; then + cp -pR texmf-dist "${ED}/usr/share/" || die fi - [ -d texmf ] && cp -pR texmf "${ED}/usr/share/" - [ -d texmf-dist ] && cp -pR texmf-dist "${ED}/usr/share/" - [ -d tlpkg ] && use source && cp -pR tlpkg "${ED}/usr/share/" + if [[ -d tlpkg ]] && use source; then + cp -pR tlpkg "${ED}/usr/share/" || die + fi insinto /var/lib/texmf - [ -d texmf-var ] && doins -r texmf-var/* + + [[ -d texmf-var ]] && doins -r texmf-var/. insinto /etc/texmf/updmap.d - [ -f "${S}/${PN}.cfg" ] && doins "${S}/${PN}.cfg" + [[ -f ${S}/${PN}.cfg ]] && doins "${S}/${PN}.cfg" insinto /etc/texmf/dvips.d - [ -f "${S}/${PN}-config.ps" ] && doins "${S}/${PN}-config.ps" + [[ -f ${S}/${PN}-config.ps ]] && doins "${S}/${PN}-config.ps" insinto /etc/texmf/dvipdfm/config - [ -f "${S}/${PN}-config" ] && doins "${S}/${PN}-config" + [[ -f ${S}/${PN}-config ]] && doins "${S}/${PN}-config" - if [ -f "${S}/language.${PN}.def" ] ; then + if [[ -f ${S}/language.${PN}.def ]] ; then insinto /etc/texmf/language.def.d doins "${S}/language.${PN}.def" fi - if [ -f "${S}/language.${PN}.dat" ] ; then + if [[ -f ${S}/language.${PN}.dat ]] ; then insinto /etc/texmf/language.dat.d doins "${S}/language.${PN}.dat" fi - if [ -f "${S}/language.${PN}.dat.lua" ] ; then + if [[ -f ${S}/language.${PN}.dat.lua ]] ; then insinto /etc/texmf/language.dat.lua.d doins "${S}/language.${PN}.dat.lua" fi - [ -n "${TEXLIVE_MODULE_BINSCRIPTS}" ] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} - if [ -n "${TEXLIVE_MODULE_BINLINKS}" ] ; then + [[ -n ${TEXLIVE_MODULE_BINSCRIPTS} ]] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS} + if [[ -n ${TEXLIVE_MODULE_BINLINKS} ]] ; then for i in ${TEXLIVE_MODULE_BINLINKS} ; do - [ -f "${ED}/usr/bin/${i%:*}" ] || die "Trying to install an invalid BINLINK. This should not happen. Please file a bug." + [[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK. This should not happen. Please file a bug." dosym ${i%:*} /usr/bin/${i#*:} done fi @@ -386,7 +416,7 @@ texlive-module_src_install() { texlive-module_pkg_postinst() { etexmf-update - [ -n "${TL_MODULE_INFORMATION}" ] && elog "${TL_MODULE_INFORMATION}" + [[ -n ${TL_MODULE_INFORMATION} ]] && elog "${TL_MODULE_INFORMATION}" } # @FUNCTION: texlive-module_pkg_postrm @@ -400,3 +430,5 @@ texlive-module_pkg_postrm() { } EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm + +fi diff --git a/games-emulation/desmume/metadata.xml b/games-emulation/desmume/metadata.xml index d906b044dcad..7b0fa88f32e9 100644 --- a/games-emulation/desmume/metadata.xml +++ b/games-emulation/desmume/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hanno@gentoo.org</email> - </maintainer> <maintainer type="project"> <email>games@gentoo.org</email> <name>Gentoo Games Project</name> diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild index f44a566e76f4..b2affae60d52 100644 --- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild +++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN" diff --git a/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch new file mode 100644 index 000000000000..f57b6110593f --- /dev/null +++ b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ + dnl 0. autoconf initialization + AC_INIT(sg, 1.0, mholst@math.ucsd.edu) + AC_CONFIG_SRCDIR(src/ogl/sg/ogl.h) +-AM_CONFIG_HEADER(src/aaa_inc/sgcf.h) ++AC_CONFIG_HEADERS(src/aaa_inc/sgcf.h) + AC_CONFIG_AUX_DIR(config) + AC_PREFIX_DEFAULT(${HOME}) + AC_CANONICAL_BUILD diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild index ba5e44642aa6..a172a6b00e68 100644 --- a/media-libs/sg/sg-1.5.ebuild +++ b/media-libs/sg/sg-1.5.ebuild @@ -1,57 +1,52 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils multilib +inherit autotools DESCRIPTION="Socket Graphics tool for displaying polygons" HOMEPAGE="http://fetk.org/codes/sg/index.html" SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz" +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -IUSE="doc static-libs" +IUSE="doc" RDEPEND=" dev-libs/maloc + media-libs/mesa[X(+)] virtual/glu + x11-libs/libGLw x11-libs/libXaw - x11-libs/motif - || ( - ( media-libs/mesa[X(+)] x11-libs/libGLw ) - media-libs/opengl-apple - )" -DEPEND=" - ${RDEPEND} + x11-libs/motif" +DEPEND="${RDEPEND}" +BDEPEND=" doc? ( - media-gfx/graphviz app-doc/doxygen - )" + media-gfx/graphviz + )" S="${WORKDIR}"/${PN} PATCHES=( "${FILESDIR}"/1.4-opengl.patch "${FILESDIR}"/1.4-doc.patch - ) + "${FILESDIR}"/1.4-AC_CONFIG_HEADERS.patch +) src_prepare() { - rm src/{gl,glu,glw} -rf || die - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die - autotools-utils_src_prepare + default + rm -r src/{gl,glu,glw} || die + + eautoreconf } src_configure() { - local sg_include - local sg_lib - local myeconfargs + local sg_include="${EPREFIX}"/usr/include + local sg_lib="${EPREFIX}"/usr/$(get_libdir) - sg_include="${EPREFIX}"/usr/include - sg_lib="${EPREFIX}"/usr/$(get_libdir) export FETK_LIBRARY="${sg_lib}" export FETK_MOTIF_LIBRARY="${sg_lib}" export FETK_GL_LIBRARY="${sg_lib}" @@ -63,13 +58,19 @@ src_configure() { export FETK_GL_INCLUDE="${sg_include}"/GL export FETK_MOTIF_INCLUDE="${sg_include}" - use doc || myeconfargs+=( --with-doxygen= --with-dot= ) + econf \ + --disable-static \ + --disable-triplet \ + --enable-glforce \ + --enable-gluforce \ + --enable-glwforce \ + --with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen "") \ + --with-dot=$(usex doc "${BROOT}"/usr/bin/dot "") +} - myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce ) +src_install() { + default - myeconfargs+=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - --disable-triplet - ) - autotools-utils_src_configure + # no static archives + find "${D}" -name '*.la' -delete || die } diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild index 917b4d62c93c..e149c88acbee 100644 --- a/media-sound/musescore/musescore-3.3.4.ebuild +++ b/media-sound/musescore/musescore-3.3.4.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine" REQUIRED_USE="portmidi? ( portaudio )" diff --git a/net-analyzer/siphon/files/siphon-666-fno-common.patch b/net-analyzer/siphon/files/siphon-666-fno-common.patch new file mode 100644 index 000000000000..c3b1addf1b04 --- /dev/null +++ b/net-analyzer/siphon/files/siphon-666-fno-common.patch @@ -0,0 +1,22 @@ +--- a/main.c ++++ b/main.c +@@ -12,6 +12,9 @@ + + #include <siphon.h> + ++char *device, *logfile; ++int verbose, back; ++ + void usage (char *); + void title(void); + +--- a/siphon.h ++++ b/siphon.h +@@ -51,5 +51,5 @@ + void *parse (void *); + void *siphon_log(void *); + +-char *device, *logfile; +-int verbose, back; ++extern char *device, *logfile; ++extern int verbose, back; diff --git a/net-analyzer/siphon/siphon-666-r2.ebuild b/net-analyzer/siphon/siphon-666-r2.ebuild new file mode 100644 index 000000000000..7921c66b9a14 --- /dev/null +++ b/net-analyzer/siphon/siphon-666-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +MY_P=${PN}-v.${PV} + +DESCRIPTION="A portable passive network mapping suite" +HOMEPAGE="http://siphon.datanerds.net/" +SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="net-libs/libpcap" +RDEPEND="${DEPEND}" +S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-log.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin ${PN} + insinto /etc + doins osprints.conf + dodoc README +} diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch index e23dc6020ee5..1624262e6982 100644 --- a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch +++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch @@ -7,7 +7,7 @@ index 0ee545cf..7f4b944e 100755 if(CMAKE_COMPILER_IS_GNUCXX) exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) - string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the # patch level, handle this here: if (NOT _gcc_version) diff --git a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch b/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch index 632ffa867613..a4aa3947f2ee 100644 --- a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch +++ b/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch @@ -9,7 +9,7 @@ index dc38d1b..801207e 100644 if(CMAKE_COMPILER_IS_GNUCXX) exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) - string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") -+ string(REGEX MATCH "[345678]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the # patch level, handle this here: if (NOT _gcc_version) |