diff --git a/hooks/ebuild_install_post/prune_libtool_files.bash b/hooks/ebuild_install_post/prune_libtool_files.bash index ce7a093..1e3f673 100644 --- a/hooks/ebuild_install_post/prune_libtool_files.bash +++ b/hooks/ebuild_install_post/prune_libtool_files.bash @@ -133,7 +133,9 @@ if [[ "${CATEGORY}/${PN}" != "sys-devel/gcc" && "${CATEGORY}/${PN}" != "dev-lang/clang" && "${CATEGORY}/${PN}" != "media-gfx/ImageMagick" && "${CATEGORY}/${PN}" != "sys-libs/libstdc++" && - "${CATEGORY}/${PN}" != "app-text/opensp" + "${CATEGORY}/${PN}" != "app-text/opensp" && + "${CATEGORY}/${PN}" != "x11-libs/graphite2" && + "${CATEGORY}/${PN}" != "dev-libs/expat" ]] ; then prune_libtool_files --all fi diff --git a/options.conf.d/python-abis.conf b/options.conf.d/python-abis.conf index 11ffeca..eb1616b 100644 --- a/options.conf.d/python-abis.conf +++ b/options.conf.d/python-abis.conf @@ -1,13 +1,13 @@ # python -*/* python_abis: 2.7 3.5 +*/* python_abis: 2.7 3.6 # exactly one of -app-virtualization/docker-compose python_abis: -* 3.5 -dev-lang/llvm python_abis: -* 3.5 -dev-libs/libxml2 python_abis: -* 3.5 -dev-python/Sphinx python_abis: -* 3.5 -dev-scm/subversion python_abis: -* 3.5 -dev-util/itstool python_abis: -* 3.5 +app-virtualization/docker-compose python_abis: -* 3.6 +dev-lang/llvm python_abis: -* 3.6 +dev-libs/libxml2 python_abis: -* 3.6 +dev-python/Sphinx python_abis: -* 3.6 +dev-scm/subversion python_abis: -* 3.6 +dev-util/itstool python_abis: -* 3.6 sys-process/ctop python_abis: -* 2.7 sys-apps/paludis python_abis: -* 2.7 app-editors/gvim python_abis: -* 2.7 @@ -15,11 +15,11 @@ app-editors/vim python_abis: -* 2.7 net-libs/miniupnpc python_abis: -* 2.7 # inox -app-speech/speechd python_abis: -* 3.5 +app-speech/speechd python_abis: -* 3.6 # redshift -x11-apps/redshift python_abis: -* 3.5 -gnome-desktop/gobject-introspection python_abis: -* 3.5 +x11-apps/redshift python_abis: -* 3.6 +gnome-desktop/gobject-introspection python_abis: -* 3.6 net-im/pidgin python_abis: -* 2.7 diff --git a/package_unmask.conf b/package_unmask.conf index 72cc4cf..6f8b0ab 100644 --- a/package_unmask.conf +++ b/package_unmask.conf @@ -58,5 +58,8 @@ dev-lang/ocaml games-strategy/openra:playtest +# blink +x11-libs/qtwebkit[<5.9] + # insecure, but unbreaks gnucash dev-lang/guile:1.8