updates

merged: gentoo-staging: 06a1fd99a3ce1dd33724e11ae9f81c5d0364985e kit-fixups: a4e04fedb391b4043e2458114c6454bd565234a3
funtoo · Aug 24, 2017 · 573056d · 573056d
1 parent 71ee308
commit 573056d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 16 deletions.
diff --git a/app-admin/ego/Manifest b/app-admin/ego/Manifest
@@ -1,2 +1,2 @@
 DIST ego-1.1.2.tar.gz 10582 SHA256 06a7b5370557334347c7c720516a0c268e2385e285411ac679861385492fdf87 SHA512 4f978e092174b2455cdb0e3fb2975febf9f0956e4cafc6e13a1ae4f7a32c2ed0df3c6f50603aaa1665f5ff474801208a96e1ef0ae558a7f42817c4e8ffb69dd3 WHIRLPOOL 0b313bc510c830d1fc9c894cebbff8521e57fed92782c30da6fa8e22fcbdc3ba803716ba5edae68853d9589ec03a745040756d7d6efb9cd57eae291ee1c9af39
-DIST ego-1.1.3-r4.tar.gz 12381 SHA256 021908ca5cb0c36b64c5a7303edb504dde344622da0e574b38088a4bedca2afb SHA512 543d719c6ecd21e5c9b6168defe8673c05a238a3157160195668569a6b7f76f18ce1487df87661f8865a93a9627a2815d036f01a85ff8a430ee8e0e059f8cdd9 WHIRLPOOL 1315ab199c801bd8c9673aaba5b8ccec1379107d88c8fb223290a089ebbaa470348e8f91ebf8909759c26b59a6141e9b374c4d067b593598c6b64f7e309e5704
+DIST ego-1.1.3-r5.tar.gz 12385 SHA256 d9f244e46dfc71ff3724713c03ab581705f5ba637d87ab5da1517b59e9aedcf3 SHA512 e2f0c79b6b56084731db955297629735da8611b3de9ced814317b84acc3de28b4329c7eac75ffd0e2a1dbae8d9f340f81b123b367ecf737137136cff7e029dcc WHIRLPOOL e1d204309fbcf5c7b38fb98d54b6dc2b7e6a37983b2a6b191c2d4d7c949290a201fb81410fd2043566d3708211e78819c89011f6f259fb3c20cad637d96c0f0c
diff --git a/app-admin/ego/ego-1.1.3-r4.ebuild → app-admin/ego/ego-1.1.3-r5.ebuild b/app-admin/ego/ego-1.1.3-r4.ebuild → app-admin/ego/ego-1.1.3-r5.ebuild
diff --git a/metadata/md5-cache/app-admin/ego-1.1.3-r4 → metadata/md5-cache/app-admin/ego-1.1.3-r5 b/metadata/md5-cache/app-admin/ego-1.1.3-r4 → metadata/md5-cache/app-admin/ego-1.1.3-r5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/python-3* dev-python/appi:0/0.1
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://www.github.com/funtoo/ego/tarball/1.1.3-r4 -> ego-1.1.3-r4.tar.gz
+SRC_URI=https://www.github.com/funtoo/ego/tarball/1.1.3-r5 -> ego-1.1.3-r5.tar.gz
 _md5_=def95ad20bd7cac8a6f24723a04b782d
diff --git a/profiles/funtoo/1.0/linux-gnu/make.defaults b/profiles/funtoo/1.0/linux-gnu/make.defaults
@@ -12,10 +12,6 @@ USE_EXPAND="CPU_FLAGS_X86 OSS_CARDS APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES
 # Nginx variables
 USE_EXPAND="${USE_EXPAND} NGINX_MODULES_EXTERNAL NGINX_MODULES_HTTP NGINX_MODULES_MAIL"
 
-# This value should be kept in synchronization with _PYTHON_GLOBALLY_NONDEFAULT_ABIS variable set in python.eclass by funtoo/scripts/merge.py.
-PYTHON_TARGETS="python2_7 python3_4"
-PYTHON_SINGLE_TARGET="python3_4"
-
 # This setting should be kept in sync with a >=dev-lang/php-5.x mask,
 # so that PHP_TARGETS always refers to the latest unmasked x.y version
 # of PHP.

diff --git a/profiles/funtoo/1.0/linux-gnu/mix-ins/gnome/package.use b/profiles/funtoo/1.0/linux-gnu/mix-ins/gnome/package.use
@@ -10,7 +10,6 @@ media-libs/gegl cairo raw
 # for gnome-3.20
 >=virtual/libintl-0-r2 abi_x86_32
 >=dev-libs/libpcre-8.39 abi_x86_32
->=media-video/totem-3.18.0 python_single_target_python2_7 -python_single_target_python3_4 -python_single_target_python3_5
 x11-wm/mutter -kms deprecated-background
 
 # for 3.16

diff --git a/profiles/funtoo/kits/python-kit/master/package.use/python-use b/profiles/funtoo/kits/python-kit/master/package.use/python-use
@@ -3,12 +3,12 @@ dev-util/itstool python_single_target_python2_7
 dev-vcs/git python_single_target_python2_7
 net-wireless/bluez python_single_target_python2_7
 sys-apps/usbutils python_single_target_python2_7
-=sys-apps/util-linux-2.28.2 python_single_target_python2_7
 =sys-apps/util-linux-9999 python_single_target_python2_7
 =sys-apps/util-linux-2.26.2 python_single_target_python2_7
-=sys-apps/util-linux-2.29.2 python_single_target_python2_7
-=sys-apps/util-linux-2.29.1-r1 python_single_target_python2_7
+=sys-apps/util-linux-2.28.2 python_single_target_python2_7
 =sys-apps/util-linux-2.29.2-r1 python_single_target_python2_7
+=sys-apps/util-linux-2.29.1-r1 python_single_target_python2_7
+=sys-apps/util-linux-2.29.2 python_single_target_python2_7
 =sys-boot/boot-update-1.7.8 python_single_target_python2_7
 =sys-boot/boot-update-1.7.9 python_single_target_python3_4 python_targets_python3_4
 sys-devel/llvm python_single_target_python2_7

diff --git a/profiles/package.use/funtoo-use b/profiles/package.use/funtoo-use
@@ -4,9 +4,6 @@ mail-client/mutt tokyocabinet -berkdb -gdbm
 # QA-473: enable text USE for app-text/xmlto
 app-text/xmlto text
 
-# FL-2672: set python_single_target_python3.3 in gnome-music.
-media-sound/gnome-music python_single_target_python3_3 -python_single_target_python3_4
-
 # FL-2625: enable virt-network in libvirt to ease networking setup
 app-emulation/libvirt virt-network
 
@@ -22,9 +19,6 @@ media-video/mjpegtools -v4l
 # FL-1437
 media-video/ffmpeg threads
 
-# FL-1867, enable python single target for intel-gpu-utils
-x11-apps/intel-gpu-tools python_single_target_python3_3
-
 # FL-1808, enable xft USE in rxvt-unicode by default:
 x11-terms/rxvt-unicode xft