diff options
| -rw-r--r-- | eclass/python-utils-r1.eclass | 12 | ||||
| -rw-r--r-- | media-libs/faac/faac-1.29.9.2.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/faad2/faad2-2.8.8.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/libexif/libexif-0.6.21-r2.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/tiff/tiff-4.0.9-r4.ebuild | 2 | ||||
| -rw-r--r-- | profiles/package.mask | 11 |
7 files changed, 6 insertions, 27 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 6bcbe2e5a09f..e3cf82b4b58f 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1043,21 +1043,11 @@ python_wrapper_setup() { nonsupp+=( 2to3 python-config "python${pyver}-config" ) fi - # block all other interpreters as incompatible - local orig_EPYTHON=${EPYTHON} local x - for x in "${_PYTHON_ALL_IMPLS[@]}"; do - python_export "${x}" EPYTHON - [[ ${EPYTHON} == ${orig_EPYTHON} ]] && continue - - nonsupp+=( "${EPYTHON}" ) - [[ ${EPYTHON} == python* ]] && nonsupp+=( "${EPYTHON}-config" ) - done - for x in "${nonsupp[@]}"; do cat >"${workdir}"/bin/${x} <<-_EOF_ || die #!/bin/sh - echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${orig_EPYTHON} (PYTHON_COMPAT)" >&2 + echo "${ECLASS}: ${FUNCNAME}: ${x} is not supported by ${EPYTHON} (PYTHON_COMPAT)" >&2 exit 127 _EOF_ chmod +x "${workdir}"/bin/${x} || die diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild index 384836d70d7c..52fbb4bb6ba2 100644 --- a/media-libs/faac/faac-1.29.9.2.ebuild +++ b/media-libs/faac/faac-1.29.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1 MPEG-4" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="static-libs" DEPEND="${RDEPEND}" diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild index 61871bf219a2..3d1b221e3481 100644 --- a/media-libs/faad2/faad2-2.8.8.ebuild +++ b/media-libs/faad2/faad2-2.8.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="digitalradio static-libs" RDEPEND="" diff --git a/media-libs/libexif/libexif-0.6.21-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild index 268199851425..8c6ab0a0fa38 100644 --- a/media-libs/libexif/libexif-0.6.21-r2.ebuild +++ b/media-libs/libexif/libexif-0.6.21-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="doc nls static-libs" RDEPEND="nls? ( virtual/libintl )" diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild index bc7b2a72e452..fb59074ec723 100644 --- a/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild +++ b/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild @@ -19,7 +19,7 @@ fi LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="alsa minimal sqlite static-libs test" RDEPEND=" diff --git a/media-libs/tiff/tiff-4.0.9-r4.ebuild b/media-libs/tiff/tiff-4.0.9-r4.ebuild index 25c34ed45b9f..2a7acc685da0 100644 --- a/media-libs/tiff/tiff-4.0.9-r4.ebuild +++ b/media-libs/tiff/tiff-4.0.9-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz LICENSE="libtiff" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx jbig jpeg lzma static-libs test zlib" RDEPEND=" diff --git a/profiles/package.mask b/profiles/package.mask index 9e42318b62b7..3e294b30302b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -376,20 +376,9 @@ media-libs/libglvnd >=dev-db/mysql-connector-c++-8.0.0 # Jeroen Roovers <jer@gentoo.org> (6 Apr 2018) -# Requires >=dev-libs/icu-61.1 -# https://bugs.gentoo.org/651698 -=net-libs/nodejs-9.11* - -# Jeroen Roovers <jer@gentoo.org> (6 Apr 2018) # Requires >=dev-libs/openssl-1.1.0 =net-libs/nodejs-10* -# Lars Wendler <polynomial-c@gentoo.org> (27 Mar 2018) -# Breaks a couple of revdeps. See tracker bug at -# https://bugs.gentoo.org/651698 ->=dev-libs/icu-61.1 ->=dev-libs/icu-layoutex-61.1 - # Tony Vroon <chainsaw@gentoo.org> (24 Mar 2018) # This is a vulnerable version of Asterisk and should not be used except # to troubleshoot a purported memory leak in the 11.25.3 release. |