summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2019-03-21 18:52:32 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2019-03-21 18:52:32 +0000
commit95fd76c9e4d4e90b709ffb52a5e5223a1e321549 (patch)
tree971813d90ddba5ee134857d199c1fb37b33fadde
parent2019-03-21 18:04:56 UTC (diff)
parentpackage.mask: Last rite =dev-lang/python-3.4* (diff)
downloadgentoo-95fd76c9e4d4e90b709ffb52a5e5223a1e321549.tar.gz
gentoo-95fd76c9e4d4e90b709ffb52a5e5223a1e321549.tar.bz2
gentoo-95fd76c9e4d4e90b709ffb52a5e5223a1e321549.zip
Merge updates from master
-rw-r--r--app-portage/gpyutils/files/implementations.txt6
-rw-r--r--dev-python/curtsies/curtsies-0.3.0-r1.ebuild3
-rw-r--r--dev-python/pythondialog/Manifest1
-rw-r--r--dev-python/pythondialog/pythondialog-3.2.2.ebuild35
-rw-r--r--eclass/python-utils-r1.eclass6
-rw-r--r--media-gfx/blender/Manifest1
-rw-r--r--media-gfx/blender/blender-2.72b-r4.ebuild290
-rw-r--r--media-gfx/blender/files/blender-2.68-doxyfile.patch19
-rw-r--r--media-gfx/blender/files/blender-2.68-fix-install-rules.patch26
-rw-r--r--media-gfx/blender/files/blender-2.70-sse2.patch35
-rw-r--r--media-gfx/blender/files/blender-2.72-T42797.diff13
-rw-r--r--media-gfx/blender/files/blender-2.72b-fix-util_simd.patch10
-rw-r--r--media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch126
-rw-r--r--media-gfx/blender/metadata.xml34
-rw-r--r--media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild3
-rw-r--r--profiles/base/package.use.force3
-rw-r--r--profiles/desc/python_single_target.desc3
-rw-r--r--profiles/desc/python_targets.desc3
-rw-r--r--profiles/features/prefix/standalone/kernel-2.6.16+/use.mask2
-rw-r--r--profiles/package.mask6
-rw-r--r--profiles/prefix/windows/cygwin/use.mask3
-rw-r--r--sci-libs/libsigrokdecode/Manifest2
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild53
-rw-r--r--sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild54
-rw-r--r--sys-kernel/kergen/Manifest1
-rw-r--r--sys-kernel/kergen/kergen-0.1.3.ebuild17
-rw-r--r--www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild2
-rw-r--r--www-servers/uwsgi/uwsgi-2.0.17.1.ebuild2
-rw-r--r--www-servers/uwsgi/uwsgi-2.0.17.ebuild2
-rw-r--r--www-servers/uwsgi/uwsgi-2.0.18.ebuild2
30 files changed, 34 insertions, 729 deletions
diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index 63d7ec0b0f1e..0b48d49697dd 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -13,10 +13,10 @@ python3_0 3.0 dead 3.0
python3_1 3.1 dead 3.1
python3_2 3.2 dead 3.2
python3_3 3.3 dead 3.3
-python3_4 current 3.4
+python3_4 dead 3.4
python3_5 supported 3.5
-python3_6 supported 3.6
-python3_7 experimental 3.7
+python3_6 current 3.6
+python3_7 supported 3.7
pypy1_8 2.7-pypy-1.8 dead p1.8
pypy1_9 2.7-pypy-1.9 dead p1.9
diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
index b12c3e7ffddb..47f4f1a2b20a 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
@@ -19,8 +19,7 @@ IUSE="test"
RDEPEND="
>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
- python_targets_python2_7? ( dev-python/typing[python_targets_python2_7] )
- python_targets_python3_4? ( dev-python/typing[python_targets_python3_4] )
+ $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python{2_7,3_4})
"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index e3a5d959746c..72c71a8ac0b3 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,5 +1,4 @@
DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f5360b5c0753ac39d9472e6ac4d09ef01831a1d95a8fe9ccdfad80487452b2704e0fd237286d755e7f49188e388272c34ddbf47081 SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8
DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
-DIST python3-pythondialog-3.2.2.tar.bz2 1412368 BLAKE2B 2c20347a09720c15c696795826e9d24034a0f85b16936ff145511d50830e116436b30868bcd53fbe425929709f7bede0a422257ba8231a9f2846d3f15b3a7709 SHA512 58b84c0dd7b71ec9d1e60c4802cfc8e6cc72f79b8b6accd387553c685a92367d242746065bac6cb1c9d501ac291d9307cb2bb6b26694e9f24a3c5d6637a5bb8e
DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
diff --git a/dev-python/pythondialog/pythondialog-3.2.2.ebuild b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
deleted file mode 100644
index 69af5d8f70ed..000000000000
--- a/dev-python/pythondialog/pythondialog-3.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( examples/. )
- use doc && local HTML_DOCS=( doc/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e3cf82b4b58f..f8f51ecb694a 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -44,7 +44,7 @@ _PYTHON_ALL_IMPLS=(
jython2_7
pypy pypy3
python2_7
- python3_4 python3_5 python3_6 python3_7
+ python3_5 python3_6 python3_7
)
readonly _PYTHON_ALL_IMPLS
@@ -80,10 +80,10 @@ _python_impl_supported() {
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_7|python3_[4567]|jython2_7)
+ python2_7|python3_[567]|jython2_7)
return 0
;;
- pypy1_[89]|pypy2_0|python2_[56]|python3_[123])
+ pypy1_[89]|pypy2_0|python2_[56]|python3_[1234])
return 1
;;
pypy|pypy3)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 42826ca0c674..1255e093b898 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,2 @@
-DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild b/media-gfx/blender/blender-2.72b-r4.ebuild
deleted file mode 100644
index 9d68984d4e3c..000000000000
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## BUNDLED-DEPS:
-# extern/cuew
-# extern/Eigen3
-# extern/xdnd
-# extern/carve
-# extern/glew
-# extern/libmv
-# extern/clew
-# extern/colamd
-# extern/lzma
-# extern/gtest
-# extern/rangetree
-# extern/libredcode
-# extern/wcwidth
-# extern/binreloc
-# extern/recastnavigation
-# extern/bullet2
-# extern/lzo
-# extern/libopenjpeg
-# extern/libmv/third_party/msinttypes
-# extern/libmv/third_party/ceres
-# extern/libmv/third_party/gflags
-# extern/libmv/third_party/glog
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-#PATCHSET="1"
-
-inherit multilib gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-case ${PV} in
- *_p*)
- SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
- *)
- SRC_URI="https://download.blender.org/source/${P}.tar.gz" ;;
-esac
-
-if [[ -n ${PATCHSET} ]]; then
- SRC_URI+=" https://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
-fi
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 x86"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- player? ( game-engine )
- redcode? ( jpeg2k ffmpeg )
- cycles? ( boost openexr tiff )
- nls? ( boost )
- colorio? ( boost )
- openal? ( boost )
- game-engine? ( boost )
- ?? ( ffmpeg libav )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=media-libs/freetype-2.0:2
- media-libs/glew:0=
- media-libs/libpng:0
- media-libs/libsamplerate
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/libintl
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXxf86vm
- boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
- collada? ( >=media-libs/opencollada-1.6.18 )
- colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
- cycles? (
- media-libs/openimageio
- )
- ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] )
- libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg2k? ( media-libs/openjpeg:0 )
- ndof? (
- app-misc/spacenavd
- dev-libs/libspnav
- )
- nls? ( virtual/libiconv )
- openal? ( >=media-libs/openal-1.6.372 )
- openimageio? ( media-libs/openimageio )
- openexr? ( media-libs/ilmbase media-libs/openexr )
- sdl? ( media-libs/libsdl[sound,joystick] )
- sndfile? ( media-libs/libsndfile )
- tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen[-nodot(-),dot(+)]
- dev-python/sphinx
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.68-doxyfile.patch
- "${FILESDIR}"/${PN}-2.68-fix-install-rules.patch
- "${FILESDIR}"/${PN}-2.70-sse2.patch
- "${FILESDIR}"/${PN}-2.72-T42797.diff
- "${FILESDIR}"/${P}-fix-util_simd.patch
- "${FILESDIR}"/${P}-gcc6-fixes.patch
-)
-
-pkg_pretend() {
- if use openmp && ! tc-has-openmp; then
- eerror "You are using gcc built without 'openmp' USE."
- eerror "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
-
- if use doc; then
- CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # we don't want static glew, but it's scattered across
- # thousand files
- # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
- sed -i \
- -e '/-DGLEW_STATIC/d' \
- $(find . -type f -name "CMakeLists.txt") || die
-
- # linguas cleanup
- local i
- if ! use nls; then
- rm -r "${S}"/release/datafiles/locale || die
- else
- if [[ -n "${LINGUAS+x}" ]] ; then
- cd "${S}"/release/datafiles/locale/po
- for i in *.po ; do
- mylang=${i%.po}
- has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
- done
- fi
- fi
-}
-
-src_configure() {
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- append-flags -funsigned-char
- append-lfs-flags
- append-ldflags $(no-as-needed)
-
- # WITH_PYTHON_SECURITY
- # WITH_PYTHON_SAFETY
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX=/usr
- -DWITH_INSTALL_PORTABLE=OFF
- -DWITH_BOOST=$(usex boost ON OFF )
- -DWITH_CYCLES=$(usex cycles ON OFF )
- -DWITH_OPENCOLLADA=$(usex collada ON OFF )
- -DWITH_IMAGE_DDS=$(usex dds ON OFF )
- -DWITH_MOD_FLUID=$(usex elbeem ON OFF )
- -DWITH_CODEC_FFMPEG=$(usex ffmpeg ON OFF )
- -DWITH_FFTW3=$(usex fftw ON OFF )
- -DWITH_MOD_OCEANSIM=$(usex fftw ON OFF )
- -DWITH_GAMEENGINE=$(usex game-engine ON OFF )
- -DWITH_INTERNATIONAL=$(usex nls ON OFF )
- -DWITH_JACK=$(usex jack ON OFF )
- -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k ON OFF )
- -DWITH_OPENIMAGEIO=$(usex openimageio ON OFF )
- -DWITH_OPENAL=$(usex openal ON OFF )
- -DWITH_IMAGE_OPENEXR=$(usex openexr ON OFF )
- -DWITH_OPENMP=$(usex openmp ON OFF )
- -DWITH_OPENNL=$(usex opennl ON OFF )
- -DWITH_PLAYER=$(usex player ON OFF )
- -DWITH_IMAGE_REDCODE=$(usex redcode ON OFF )
- -DWITH_SDL=$(usex sdl ON OFF )
- -DWITH_CODEC_SNDFILE=$(usex sndfile ON OFF )
- -DWITH_RAYOPTIMIZATION=$(usex cpu_flags_x86_sse ON OFF )
- -DWITH_SSE2=$(usex cpu_flags_x86_sse2 ON OFF )
- -DWITH_BULLET=$(usex bullet ON OFF )
- -DWITH_IMAGE_TIFF=$(usex tiff ON OFF )
- -DWITH_OPENCOLORIO=$(usex colorio ON OFF )
- -DWITH_INPUT_NDOF=$(usex ndof ON OFF )
- -DWITH_CXX_GUARDEDALLOC=$(usex debug ON OFF )
- -DWITH_ASSERT_ABORT=$(usex debug ON OFF )
- -DWITH_PYTHON_INSTALL=OFF
- -DWITH_PYTHON_INSTALL_NUMPY=OFF
- -DWITH_STATIC_LIBS=OFF
- -DWITH_SYSTEM_GLEW=ON
- -DWITH_SYSTEM_OPENJPEG=ON
- -DWITH_SYSTEM_BULLET=OFF
- -DPYTHON_VERSION="${EPYTHON/python/}"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- # Workaround for binary drivers.
- cards=( /dev/ati/card* /dev/nvidia* )
- for card in "${cards[@]}"; do addpredict "${card}"; done
-
- einfo "Generating Blender C/C++ API docs ..."
- cd "${CMAKE_USE_DIR}"/doc/doxygen || die
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
-
- cd "${CMAKE_USE_DIR}" || die
- einfo "Generating (BPY) Blender Python API docs ..."
- "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
-
- cd "${CMAKE_USE_DIR}"/doc/python_api || die
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- fi
-}
-
-src_test() { :; }
-
-src_install() {
- local i
-
- # Pax mark blender for hardened support.
- pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
- if use doc; then
- docinto "html/API/python"
- dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
-
- docinto "html/API/blender"
- dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
- fi
-
- # fucked up cmake will relink binary for no reason
- emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
-
- # fix doc installdir
- docinto "html"
- dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
- rm -rf "${ED%/}"/usr/share/doc/blender
-
- python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
- python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- elog
- elog "Blender uses python integration. As such, may have some"
- elog "inherit risks with running unknown python scripting."
- elog
- elog "It is recommended to change your blender temp directory"
- elog "from /tmp to /home/user/tmp or another tmp file under your"
- elog "home directory. This can be done by starting blender, then"
- elog "dragging the main menu down do display all paths."
- elog
- ewarn
- ewarn "This ebuild does not unbundle the massive amount of 3rd party"
- ewarn "libraries which are shipped with blender. Note that"
- ewarn "these have caused security issues in the past."
- ewarn "If you are concerned about security, file a bug upstream:"
- ewarn " https://developer.blender.org/"
- ewarn
-
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/media-gfx/blender/files/blender-2.68-doxyfile.patch b/media-gfx/blender/files/blender-2.68-doxyfile.patch
deleted file mode 100644
index c11c793fda97..000000000000
--- a/media-gfx/blender/files/blender-2.68-doxyfile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 62308d9fc24bde22a50497816c44c8ca91f96f63
-Author: hasufell <hasufell@gentoo.org>
-Date: Fri Jul 19 18:36:34 2013 +0200
-
- remove hhc.exe reference
-
-diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
-index 397cc30..ac61756 100644
---- a/doc/doxygen/Doxyfile
-+++ b/doc/doxygen/Doxyfile
-@@ -1051,7 +1051,7 @@ CHM_FILE = blender.chm
- # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
- # the HTML help compiler on the generated index.hhp.
-
--HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe"
-+HHC_LOCATION =
-
- # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
- # controls if a separate .chi index file is generated (YES) or that
diff --git a/media-gfx/blender/files/blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch
deleted file mode 100644
index aa8ecc9f6174..000000000000
--- a/media-gfx/blender/files/blender-2.68-fix-install-rules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 94eed33f878e35a8c7b69b0c23b3b30026460f33
-Author: hasufell <hasufell@gentoo.org>
-Date: Fri Jul 19 18:50:08 2013 +0200
-
- remove stupid uninstall snippet
-
- whoever coded this... it is dangerous
- uninstall methods have NO PLACE in install rules
-
-diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index c84d944..2b9bf46 100644
---- a/source/creator/CMakeLists.txt
-+++ b/source/creator/CMakeLists.txt
-@@ -268,12 +268,6 @@ endif()
- # Install Targets (Generic, All Platforms)
-
-
--# important to make a clean install each time, else old scripts get loaded.
--install(
-- CODE
-- "file(REMOVE_RECURSE ${TARGETDIR_VER})"
--)
--
- if(WITH_PYTHON)
- # install(CODE "message(\"copying blender scripts...\")")
-
diff --git a/media-gfx/blender/files/blender-2.70-sse2.patch b/media-gfx/blender/files/blender-2.70-sse2.patch
deleted file mode 100644
index 6fc870ea3258..000000000000
--- a/media-gfx/blender/files/blender-2.70-sse2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6
-Author: hasufell <hasufell@gentoo.org>
-Date: Fri Jul 19 18:50:19 2013 +0200
-
- add option to explicitly control sse2 optimization
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78bb3c6..d5f4576 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -86,6 +86,7 @@
- #-----------------------------------------------------------------------------
- # Load some macros.
- include(build_files/cmake/macros.cmake)
-+include(CMakeDependentOption)
-
-
- #-----------------------------------------------------------------------------
-@@ -251,6 +252,7 @@
- # Misc
- option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
- option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
-+cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF)
- option(WITH_OPENNL "Enable use of Open Numerical Library" ON)
- if(UNIX AND NOT APPLE)
- option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
-@@ -1950,7 +1952,7 @@
- set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}")
- add_definitions(-D__SSE__ -D__MMX__)
- endif()
-- if(SUPPORT_SSE2_BUILD)
-+ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD)
- set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
- add_definitions(-D__SSE2__)
- if(NOT SUPPORT_SSE_BUILD) # dont double up
diff --git a/media-gfx/blender/files/blender-2.72-T42797.diff b/media-gfx/blender/files/blender-2.72-T42797.diff
deleted file mode 100644
index cef03853434c..000000000000
--- a/media-gfx/blender/files/blender-2.72-T42797.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/source/blender/blenfont/intern/blf_glyph.c
-+++ a/source/blender/blenfont/intern/blf_glyph.c
-@@ -262,8 +262,8 @@
- g->xoff = -1;
- g->yoff = -1;
- bitmap = slot->bitmap;
-- g->width = bitmap.width;
-- g->height = bitmap.rows;
-+ g->width = (int)bitmap.width;
-+ g->height = (int)bitmap.rows;
-
- if (g->width && g->height) {
- if (sharp) {
diff --git a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch b/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch
deleted file mode 100644
index 8c83ee096284..000000000000
--- a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/intern/cycles/util/util_simd.h 2014-10-20 12:58:22.000000000 +0500
-+++ b/intern/cycles/util/util_simd.h 2015-05-17 11:57:37.000000000 +0500
-@@ -19,6 +19,7 @@
- #define __UTIL_SIMD_TYPES_H__
-
- #include <limits>
-+#include <x86intrin.h>
-
- #include "util_debug.h"
- #include "util_types.h"
diff --git a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
deleted file mode 100644
index 1c4ab09e62cb..000000000000
--- a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -purN a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
---- a/source/blender/imbuf/intern/dds/ColorBlock.cpp 2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp 2016-09-22 15:50:25.359318967 +0100
-@@ -86,8 +86,8 @@ void ColorBlock::init(const Image *img,
-
- void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y)
- {
-- const uint bw = min(w - x, 4U);
-- const uint bh = min(h - y, 4U);
-+ const uint bw = MIN(w - x, 4U);
-+ const uint bh = MIN(h - y, 4U);
-
- // Blocks that are smaller than 4x4 are handled by repeating the pixels.
- // @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
-@@ -107,8 +107,8 @@ void ColorBlock::init(uint w, uint h, co
-
- void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y)
- {
-- const uint bw = min(w - x, 4U);
-- const uint bh = min(h - y, 4U);
-+ const uint bw = MIN(w - x, 4U);
-+ const uint bh = MIN(h - y, 4U);
-
- // Blocks that are smaller than 4x4 are handled by repeating the pixels.
- // @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
-@@ -124,10 +124,10 @@ void ColorBlock::init(uint w, uint h, co
- const uint idx = ((y + by) * w + x + bx);
-
- Color32 & c = color(e, i);
-- c.r = uint8(255 * clamp(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
-- c.g = uint8(255 * clamp(data[idx + 1 * srcPlane], 0.0f, 1.0f));
-- c.b = uint8(255 * clamp(data[idx + 2 * srcPlane], 0.0f, 1.0f));
-- c.a = uint8(255 * clamp(data[idx + 3 * srcPlane], 0.0f, 1.0f));
-+ c.r = uint8(255 * CLAMP(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
-+ c.g = uint8(255 * CLAMP(data[idx + 1 * srcPlane], 0.0f, 1.0f));
-+ c.b = uint8(255 * CLAMP(data[idx + 2 * srcPlane], 0.0f, 1.0f));
-+ c.a = uint8(255 * CLAMP(data[idx + 3 * srcPlane], 0.0f, 1.0f));
- }
- }
- }
-diff -purN a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h
---- a/source/blender/imbuf/intern/dds/Common.h 2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/Common.h 2016-09-22 15:47:31.327081239 +0100
-@@ -28,14 +28,14 @@
- #ifndef __COMMON_H__
- #define __COMMON_H__
-
--#ifndef min
--#define min(a,b) ((a) <= (b) ? (a) : (b))
-+#ifndef MIN
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- #endif
--#ifndef max
--#define max(a,b) ((a) >= (b) ? (a) : (b))
-+#ifndef MAX
-+#define MAX(a,b) ((a) >= (b) ? (a) : (b))
- #endif
--#ifndef clamp
--#define clamp(x,a,b) min(max((x), (a)), (b))
-+#ifndef CLAMP
-+#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b))
- #endif
-
- template<typename T>
-diff -purN a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
---- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp 2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp 2016-09-22 16:10:53.985775837 +0100
-@@ -1102,8 +1102,8 @@ void DirectDrawSurface::mipmap(Image *im
- // Compute width and height.
- for (uint m = 0; m < mipmap; m++)
- {
-- w = max(1U, w / 2);
-- h = max(1U, h / 2);
-+ w = MAX(1U, w / 2);
-+ h = MAX(1U, h / 2);
- }
-
- img->allocate(w, h);
-@@ -1223,9 +1223,9 @@ void DirectDrawSurface::readBlockImage(I
- readBlock(&block);
-
- // Write color block.
-- for (uint y = 0; y < min(4U, h-4*by); y++)
-+ for (uint y = 0; y < MIN(4U, h-4*by); y++)
- {
-- for (uint x = 0; x < min(4U, w-4*bx); x++)
-+ for (uint x = 0; x < MIN(4U, w-4*bx); x++)
- {
- img->pixel(4*bx+x, 4*by+y) = block.color(x, y);
- }
-@@ -1240,7 +1240,7 @@ static Color32 buildNormal(uint8 x, uint
- float ny = 2 * (y / 255.0f) - 1;
- float nz = 0.0f;
- if (1 - nx*nx - ny*ny > 0) nz = sqrt(1 - nx*nx - ny*ny);
-- uint8 z = clamp(int(255.0f * (nz + 1) / 2.0f), 0, 255);
-+ uint8 z = CLAMP(int(255.0f * (nz + 1) / 2.0f), 0, 255);
-
- return Color32(x, y, z);
- }
-@@ -1379,9 +1379,9 @@ uint DirectDrawSurface::mipmapSize(uint
-
- for (uint m = 0; m < mipmap; m++)
- {
-- w = max(1U, w / 2);
-- h = max(1U, h / 2);
-- d = max(1U, d / 2);
-+ w = MAX(1U, w / 2);
-+ h = MAX(1U, h / 2);
-+ d = MAX(1U, d / 2);
- }
-
- if (header.pf.flags & DDPF_FOURCC)
-diff -purN a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp
---- a/source/blender/imbuf/intern/dds/FlipDXT.cpp 2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp 2016-09-22 16:11:35.626829002 +0100
-@@ -246,8 +246,8 @@ int FlipDXTCImage(unsigned int width, un
-
- // mip levels are contiguous.
- data += block_bytes * blocks;
-- mip_width = max(1U, mip_width >> 1);
-- mip_height = max(1U, mip_height >> 1);
-+ mip_width = MAX(1U, mip_width >> 1);
-+ mip_height = MAX(1U, mip_height >> 1);
- }
-
- return 1;
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 9dd73dfe3522..14a1619c7d4c 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
+ <maintainer type="person">
<email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
- <maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
+ <maintainer type="person">
<email>agrigo2001@yahoo.com.au</email>
<name>Adrian Grigo</name>
</maintainer>
@@ -20,9 +20,6 @@
</longdescription>
<use>
- <flag name="boost">
- Enable features depending on boost.
- </flag>
<flag name="bullet">
Enable Bullet (Physics Engine).
</flag>
@@ -50,49 +47,42 @@
<flag name="elbeem">
Adds surface fluid simulation to Blender using El'Beem library.
</flag>
- <flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
+ <flag name="game-engine">
Adds Game Engine support to Blender.
</flag>
- <flag name="headless" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="headless">
Build without graphical support (renderfarm, server mode only).
</flag>
- <flag name="llvm" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="llvm">
Enable features depending on llvm.
</flag>
- <flag name="man" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="man">
Build and install man pages.
</flag>
<flag name="ndof">
Enable NDOF input devices (SpaceNavigator and friends).
</flag>
- <flag name="opencl" restrict="&lt;=media-gfx/blender-2.79">
+ <flag name="opencl">
Allow OpenCL Graphics Acceleration. This may
require extra graphics card drivers.</flag>
<flag name="openimageio">Enable OpenImageIO Support</flag>
- <flag name="opennl" restrict="&lt;=media-gfx/blender-2.73">
- Enable use of Open Numerical Library
- </flag>
- <flag name="opensubdiv" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="opensubdiv">
Add rendering support form OpenSubdiv from Dreamworks Animation
through <pkg>media-libs/opensubdiv</pkg>.
</flag>
- <flag name="openvdb" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="openvdb">
Add GPU preview rendering. Only works with nVidia cards.
</flag>
- <flag name="osl" restrict="&gt;=media-gfx/blender-2.79">
+ <flag name="osl">
Add support for OpenShadingLanguage scripting.
</flag>
<flag name="player">
Build the Blender Player. THis requires the Game engine.
</flag>
- <flag name="redcode" restrict="&lt;=media-gfx/blender-2.73">
- This flag add support for RED CODE camera digital format (5K HD
- images *.r3d) - EXPERIMENTAL.
- </flag>
- <flag name="test" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="test">
Build the provided unit tests.
</flag>
- <flag name="valgrind" restrict="&gt;=media-gfx/blender-2.77">
+ <flag name="valgrind">
Add support for memory debugging using
<pkg>dev-util/valgrind</pkg>
</flag>
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
index e410210bfa05..54b3db05c075 100644
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,6 @@ IUSE=""
DEPEND="
${PYTHON_DEPS}
- python_targets_python3_4? ( dev-python/configparser )
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 834d98c7952e..a4f67f42aa5b 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -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
# Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2019)
@@ -76,7 +76,6 @@ app-shells/bash:0 readline
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private
# API. Please remember to keep it in sync with python_targets.desc.
dev-lang/python-exec python_targets_python2_7
-dev-lang/python-exec python_targets_python3_4
dev-lang/python-exec python_targets_python3_5
dev-lang/python-exec python_targets_python3_6
dev-lang/python-exec python_targets_python3_7
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index 806875d947af..b6813fd288fd 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
python2_7 - Build for Python 2.7 only
-python3_4 - Build for Python 3.4 only
python3_5 - Build for Python 3.5 only
python3_6 - Build for Python 3.6 only
python3_7 - Build for Python 3.7 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index d338bba3b194..960c0f96e4d7 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
python2_7 - Build with Python 2.7
-python3_4 - Build with Python 3.4
python3_5 - Build with Python 3.5
python3_6 - Build with Python 3.6
python3_7 - Build with Python 3.7
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
index d465a4d7db12..b7f146f8d4a1 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask
@@ -1,5 +1,3 @@
# >=python-3 is masked
python_single_target_python3_5
-python_single_target_python3_4
python_targets_python3_5
-python_targets_python3_4
diff --git a/profiles/package.mask b/profiles/package.mask
index 5c01f8b6ff55..69ad20798265 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,12 @@
#--- END OF EXAMPLES ---
+# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
+# Upstream EOL-ed Python 3.4 on 2019-03-19. The last release fails
+# to build against openssl-1.1+.
+# Removal in 30 days. Bug #673960.
+=dev-lang/python-3.4*
+
# Andreas Sturmlechner <asturm@gentoo.org> (21 Mar 2019)
# Replaced by split packages: kde-apps/dolphin-plugins-bazaar,
# -dropbox, -git, -mercurial, -subversion. Masked for removal in 30 days.
diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index a443b8e0a5e2..392ef405f2e6 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Re-add Cygwin's libc
-elibc_Cygwin
# we do have only python-3.6 ready on cygwin
-python_targets_python3_4
python_targets_python3_5
python_targets_python3_7
diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 69da1b5e5717..d9c5436b9058 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -1,5 +1,3 @@
-DIST libsigrokdecode-0.3.0.tar.gz 607691 BLAKE2B d61f647ccfba0b47f20d57ec04d5e0c58d7e0b0cfb8c02eecfa4b8cb7e53715bbda0ebd1f7fe967b504fd74312c5f7043de0ba9ae645b214fc8f17826dff41b6 SHA512 d943091bdb1b20b11191f7a93ec8a305ba702e732247d7fbfd61fd9ae9fc4d61556bdec987c07bed11ddc20d3ab85ff8118ddc75161ebd9d9d1abe8cfc48ac19
-DIST libsigrokdecode-0.4.0.tar.gz 694223 BLAKE2B bf1cc0f78086b64ce029b794c3c90606a283606f5f2bfa51518f5c47175b814755247f61d7a630c3be690eb517c8775ed384a7cfa6d7e4a4026b12d56131e071 SHA512 54e8a3defb5f8b0cfc354e42a8c997d7515b70f40f0c069adf9ec0cc022835c5e77708e33588099878b5793f6a9acbb7e438f807ce6dabcaeca2fa17d208009b
DIST libsigrokdecode-0.4.1.tar.gz 751546 BLAKE2B b1625714a75e481d94956bd64af264c87b440c0a236f19ff02d18cc16964b701de8799a81943f4e9ec1181b1906c5e62deca98fbbbc30dfbdf8bff2208f86bc6 SHA512 b072001190e80a194986524fd4de4d32f4559d618b151a3dbfa2c63b292c8a490535cb7479cfa665c4e8d3798251a5d6f5ecfa456ca669237237ffced3e88272
DIST libsigrokdecode-0.5.0.tar.gz 790399 BLAKE2B a9d57ddfa72b96937a8ebb2f5009ab06d73a040778163fd24bc29d9379061aa7d9837277bc460ebaea65d266e4c53659c1e84e078b2fbffc7414925237b11058 SHA512 79d497f6c20efcffdf840b6f4a437b29e68fa49b9c6e73f66e5e2429d58033b83272a602289dd46ffe9f1115c36f2ad8c7d40e43f58494b027890bebcfe080a5
DIST libsigrokdecode-0.5.1.tar.gz 813809 BLAKE2B 6850d6a543917989e277ed93335005c9d802a33f7f3c1f5a5883d060b0063da797ae271847fc63b70b7dc2149926bd8e2a6387e5d488830096bc1924ca1f2205 SHA512 bda14475317863c06615f578f9d26e267da83f7d9fdd7cd24f4e1f23344694763fb78b3b77acfa83eafc792ecd8f4554a9bbdd24fa42bee760426df4a428be7a
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild
deleted file mode 100644
index 4fea25b910d5..000000000000
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_4 )
-inherit eutils python-single-r1 autotools
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="provide (streaming) protocol decoding functionality"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
-
-LICENSE="GPL-3"
-SLOT="0/2"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.24.0
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.3.0-configure-test.patch
- epatch "${FILESDIR}"/${PN}-0.3.0-no-check-linkage.patch
- eautoreconf
-
- # Only a test program (not installed, and not used by src_test)
- # is used by libsigrok, so disable it to avoid the compile.
- sed -i \
- -e '/build_runtc=/s:yes:no:' \
- configure || die
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild
deleted file mode 100644
index 23e0d8ba6904..000000000000
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit eutils python-single-r1
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="provide (streaming) protocol decoding functionality"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
-
-LICENSE="GPL-3"
-SLOT="0/3"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/glib-2.28.0
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- [[ ${PV} == "9999" ]] && eautoreconf
-
- # Only a test program (not installed, and not used by src_test)
- # is used by libsigrok, so disable it to avoid the compile.
- sed -i \
- -e '/build_runtc=/s:yes:no:' \
- configure || die
-
- eapply_user
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/sys-kernel/kergen/Manifest b/sys-kernel/kergen/Manifest
index 9514479bf35e..41ae24dbe657 100644
--- a/sys-kernel/kergen/Manifest
+++ b/sys-kernel/kergen/Manifest
@@ -1,2 +1 @@
-DIST kergen-0.1.3.tar.gz 109717 BLAKE2B c2847617cddb3db5be6a164f54b4ddc3fd562d03844bdc8454ec6069be4b89ab8921bb180b0b25397c1788a63830ad61659eea8dfbed5fcea7672a499ad520c8 SHA512 decc5cc832f8741bb7f2e058b23c165c458bc9bce0e854d46292e741f33aadc731a9c0f428567b9143134d874b6bdd20defeb1377eabc51b347c0de3066e4aae
DIST kergen-0.1.4.tar.gz 135566 BLAKE2B ae043f8b952423f66645be2f8c4286ceae07141420cfd1fab9d11a7ed76a89a028b7704f4659079bde7902702b129364b46752404a891868a3a2fea56a07dee7 SHA512 40140f66bf3072836dcd187a2b1a8e5ee19da853fbe6a3a3a7203a33332e8b4d3e871045aad187dcc23879f67d5ab11b832682c1ac0b788594b570da40a825d5
diff --git a/sys-kernel/kergen/kergen-0.1.3.ebuild b/sys-kernel/kergen/kergen-0.1.3.ebuild
deleted file mode 100644
index 2f948cd0ee0c..000000000000
--- a/sys-kernel/kergen/kergen-0.1.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernel config generator"
-HOMEPAGE="https://github.com/nichoski/kergen"
-SRC_URI="http://whatishacking.org/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index 08f75a25f172..865383e7054c 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
uwsgi_plugins_router_xmldir? ( xml !expat )
pypy? ( python_targets_python2_7 )
python? ( ${PYTHON_REQUIRED_USE} )
- python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+ python_asyncio? ( || ( $(python_gen_useflags -3) ) )
python_gevent? ( python )
expat? ( xml )"
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
index 953baaab672c..68b9e8da4660 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
uwsgi_plugins_router_xmldir? ( xml !expat )
pypy? ( python_targets_python2_7 )
python? ( ${PYTHON_REQUIRED_USE} )
- python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) python_gevent )
+ python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent )
python_gevent? ( python )
expat? ( xml )"
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
index 9b2f7f849142..13867675ceb2 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
uwsgi_plugins_router_xmldir? ( xml !expat )
pypy? ( python_targets_python2_7 )
python? ( ${PYTHON_REQUIRED_USE} )
- python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent )
+ python_asyncio? ( || ( $(python_gen_useflags -3) ) python_gevent )
python_gevent? ( python )
expat? ( xml )"
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 08f75a25f172..865383e7054c 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
uwsgi_plugins_router_xmldir? ( xml !expat )
pypy? ( python_targets_python2_7 )
python? ( ${PYTHON_REQUIRED_USE} )
- python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+ python_asyncio? ( || ( $(python_gen_useflags -3) ) )
python_gevent? ( python )
expat? ( xml )"