Merge remote-tracking branch 'origin/laptop' into laptop

This commit is contained in:
Your Name 2017-07-14 01:19:59 +02:00
commit 0d3136ba1e
3 changed files with 16 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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