From 801cf8fb4f156cd5c0d2c8102ea609a4519eedd0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 1 Jul 2016 16:10:13 +0300 Subject: [PATCH] Sync with portage [Fri Jul 1 16:10:13 MSK 2016]. --- app-admin/hddtemp/files/hddgentoo.db | 6 + .../sagan/files/json_header_location.patch | 26 -- app-admin/salt/files/api-initd-3 | 14 - app-admin/salt/files/master-initd-3 | 14 - app-admin/salt/files/minion-initd-3 | 15 - .../files/salt-2014.7.5-archive-test.patch | 15 - .../files/salt-2015.5.0-archive-test.patch | 15 - ...015.5.1-skip-libvirt-test-on-nonroot.patch | 20 - ...-2015.8.0-remove-pydsl-includes-test.patch | 107 ----- .../files/salt-2015.8.4-boto-vpc-test.patch | 13 - app-admin/salt/files/syndic-initd-3 | 14 - ...check-role_set_expand-libsepol-2.1.0.patch | 24 -- .../files/fix-implicit-def-fstat.patch | 13 - ...setools3-userspace-2.4-compatibility.patch | 114 ------ .../sshguard-1.5-day-starts-with-0.patch | 11 - .../testdisk/files/fix_rare_crash-6.14.patch | 227 ---------- app-admin/testdisk/files/install-gentoo.patch | 25 -- ...webapp-config-1.50.16-absolute-paths.patch | 42 -- .../webapp-config-1.50.16-apache-move.patch | 13 - .../webapp-config-1.50.16-baselayout2.patch | 13 - ...app-config-1.50.16-fix-unicode-tests.patch | 39 -- ...webapp-config-1.50.16-htdocs-symlink.patch | 13 - ...webapp-config-1.50.16-update-servers.patch | 80 ---- .../webapp-config-1.51-fix-indentation.patch | 25 -- app-admin/xstow/files/xstow-0.5.1-gcc43.patch | 67 --- app-emulation/libvirt/Manifest | 2 - app-emulation/libvirt/libvirt-1.3.1-r1.ebuild | 385 ----------------- app-emulation/libvirt/libvirt-1.3.4.ebuild | 386 ------------------ app-emulation/libvirt/libvirt-1.3.5-r1.ebuild | 2 +- app-officeext/ooofbtools/Manifest | 2 +- ...ols-2.43.ebuild => ooofbtools-2.44.ebuild} | 0 app-text/cherrytree/Manifest | 2 +- ...6.9-r1.ebuild => cherrytree-0.37.0.ebuild} | 14 +- app-text/htmltidy/htmltidy-20090325-r2.ebuild | 2 +- dev-libs/sway/Manifest | 2 +- .../sway/{sway-0.6.ebuild => sway-0.8.ebuild} | 0 dev-libs/wlc/Manifest | 2 +- .../{wlc-0.0.2.ebuild => wlc-0.0.3.ebuild} | 0 dev-python/libvirt-python/Manifest | 2 - .../libvirt-python-1.3.1.ebuild | 44 -- .../libvirt-python-1.3.4.ebuild | 44 -- .../libvirt-python-1.3.5.ebuild | 2 +- dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild | 2 +- games-puzzle/tanglet/tanglet-1.3.1.ebuild | 3 +- media-libs/gd/gd-2.2.2.ebuild | 2 +- media-video/ffmpeg/Manifest | 2 +- ...{ffmpeg-3.1.ebuild => ffmpeg-3.1.1.ebuild} | 0 metadata/dtd/timestamp.chk | 2 +- metadata/glsa/glsa-201504-05.xml | 1 + metadata/glsa/timestamp.chk | 2 +- .../md5-cache/app-emulation/libvirt-1.3.1-r1 | 14 - .../md5-cache/app-emulation/libvirt-1.3.4 | 14 - .../md5-cache/app-emulation/libvirt-1.3.5-r1 | 4 +- .../{ooofbtools-2.43 => ooofbtools-2.44} | 2 +- ...cherrytree-0.36.9-r1 => cherrytree-0.37.0} | 10 +- .../md5-cache/app-text/htmltidy-20090325-r2 | 4 +- .../md5-cache/dev-libs/{sway-0.6 => sway-0.8} | 2 +- .../dev-libs/{wlc-0.0.2 => wlc-0.0.3} | 2 +- .../md5-cache/dev-python/libvirt-python-1.3.1 | 15 - .../md5-cache/dev-python/libvirt-python-1.3.4 | 15 - .../md5-cache/dev-python/libvirt-python-1.3.5 | 4 +- .../md5-cache/dev-ruby/tidy-ext-0.1.14-r3 | 4 +- metadata/md5-cache/games-puzzle/tanglet-1.3.1 | 6 +- metadata/md5-cache/media-libs/gd-2.2.2 | 4 +- .../media-video/{ffmpeg-3.1 => ffmpeg-3.1.1} | 2 +- metadata/md5-cache/net-im/jabberd2-2.3.3-r2 | 4 +- metadata/md5-cache/sys-cluster/ceph-9.2.1-r2 | 4 +- ...onkeror-1.0_pre20141005 => conkeror-1.0.3} | 6 +- .../www-client/conkeror-1.0_pre20150227 | 11 - metadata/md5-cache/x11-misc/gpaste-3.18.3 | 4 +- metadata/md5-cache/x11-misc/gpaste-3.20.3 | 4 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- metadata/xml-schema/timestamp.chk | 2 +- net-im/jabberd2/jabberd2-2.3.3-r2.ebuild | 2 +- profiles/package.mask | 10 + sys-cluster/ceph/ceph-9.2.1-r2.ebuild | 2 +- www-client/conkeror/Manifest | 3 +- ...e20150227.ebuild => conkeror-1.0.3.ebuild} | 12 +- .../conkeror/conkeror-1.0_pre20141005.ebuild | 59 --- x11-misc/gpaste/gpaste-3.18.3.ebuild | 3 +- x11-misc/gpaste/gpaste-3.20.3.ebuild | 1 + 84 files changed, 86 insertions(+), 2021 deletions(-) delete mode 100644 app-admin/sagan/files/json_header_location.patch delete mode 100644 app-admin/salt/files/api-initd-3 delete mode 100644 app-admin/salt/files/master-initd-3 delete mode 100644 app-admin/salt/files/minion-initd-3 delete mode 100644 app-admin/salt/files/salt-2014.7.5-archive-test.patch delete mode 100644 app-admin/salt/files/salt-2015.5.0-archive-test.patch delete mode 100644 app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch delete mode 100644 app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch delete mode 100644 app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch delete mode 100644 app-admin/salt/files/syndic-initd-3 delete mode 100644 app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch delete mode 100644 app-admin/setools/files/fix-implicit-def-fstat.patch delete mode 100644 app-admin/setools/files/setools3-userspace-2.4-compatibility.patch delete mode 100644 app-admin/sshguard/files/sshguard-1.5-day-starts-with-0.patch delete mode 100644 app-admin/testdisk/files/fix_rare_crash-6.14.patch delete mode 100644 app-admin/testdisk/files/install-gentoo.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch delete mode 100644 app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch delete mode 100644 app-admin/xstow/files/xstow-0.5.1-gcc43.patch delete mode 100644 app-emulation/libvirt/libvirt-1.3.1-r1.ebuild delete mode 100644 app-emulation/libvirt/libvirt-1.3.4.ebuild rename app-officeext/ooofbtools/{ooofbtools-2.43.ebuild => ooofbtools-2.44.ebuild} (100%) rename app-text/cherrytree/{cherrytree-0.36.9-r1.ebuild => cherrytree-0.37.0.ebuild} (79%) rename dev-libs/sway/{sway-0.6.ebuild => sway-0.8.ebuild} (100%) rename dev-libs/wlc/{wlc-0.0.2.ebuild => wlc-0.0.3.ebuild} (100%) delete mode 100644 dev-python/libvirt-python/libvirt-python-1.3.1.ebuild delete mode 100644 dev-python/libvirt-python/libvirt-python-1.3.4.ebuild rename media-video/ffmpeg/{ffmpeg-3.1.ebuild => ffmpeg-3.1.1.ebuild} (100%) delete mode 100644 metadata/md5-cache/app-emulation/libvirt-1.3.1-r1 delete mode 100644 metadata/md5-cache/app-emulation/libvirt-1.3.4 rename metadata/md5-cache/app-officeext/{ooofbtools-2.43 => ooofbtools-2.44} (99%) rename metadata/md5-cache/app-text/{cherrytree-0.36.9-r1 => cherrytree-0.37.0} (75%) rename metadata/md5-cache/dev-libs/{sway-0.6 => sway-0.8} (93%) rename metadata/md5-cache/dev-libs/{wlc-0.0.2 => wlc-0.0.3} (93%) delete mode 100644 metadata/md5-cache/dev-python/libvirt-python-1.3.1 delete mode 100644 metadata/md5-cache/dev-python/libvirt-python-1.3.4 rename metadata/md5-cache/media-video/{ffmpeg-3.1 => ffmpeg-3.1.1} (99%) rename metadata/md5-cache/www-client/{conkeror-1.0_pre20141005 => conkeror-1.0.3} (74%) delete mode 100644 metadata/md5-cache/www-client/conkeror-1.0_pre20150227 rename www-client/conkeror/{conkeror-1.0_pre20150227.ebuild => conkeror-1.0.3.ebuild} (87%) delete mode 100644 www-client/conkeror/conkeror-1.0_pre20141005.ebuild diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db index 079816aa8fd1..1565e405f6b9 100644 --- a/app-admin/hddtemp/files/hddgentoo.db +++ b/app-admin/hddtemp/files/hddgentoo.db @@ -235,3 +235,9 @@ "Hitachi HTS547575A9E384" 190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB" "WDC WD30PURX-64P6ZY0" 194 C "Western Digital Purple 3TB 64MB Cache" "WDC WD10EZEX-00BN5A0" 194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB" +"WDC WD1003FZEX-00MK2A0" 194 C "Western Digital Black 1TB SATA3 7200RPM 64MB" +"SAMSUNG MZHPV128HDGM-00000" 194 C "Samsung SSD 128 GB PCIe Gen3 8Gb/s x4 M.2" +"CT960BX200SSD1" 194 C "Crucial BX200 960GB SSD" +"CT480BX200SSD1" 194 C "Crucial BX200 480GB SSD" +"CT240BX200SSD1" 194 C "Crucial BX200 240GB SSD" +"Crucial_CT256M550SSD1" 194 C "Crucial M550 256GB SSD" diff --git a/app-admin/sagan/files/json_header_location.patch b/app-admin/sagan/files/json_header_location.patch deleted file mode 100644 index 78a34886a73d..000000000000 --- a/app-admin/sagan/files/json_header_location.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -194,7 +194,7 @@ - if test "$LOGNORM" = "yes"; then - AC_MSG_RESULT([------- liblognorm support is enabled -------]) - AC_CHECK_HEADER([liblognorm.h]) -- AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable. -+ AC_CHECK_HEADERS([json-c/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable. - This library is important for the correlation aspects of Sagan! Please see - https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature - use the --disable-lognorm flag.])]) -diff --git a/src/sagan-liblognorm.c b/src/sagan-liblognorm.c ---- a/src/sagan-liblognorm.c -+++ b/src/sagan-liblognorm.c -@@ -40,9 +40,7 @@ - #include - - #if defined(HAVE_JSON_JSON_H) --# include --#else --# include -+# include - #endif - - #include "sagan.h" diff --git a/app-admin/salt/files/api-initd-3 b/app-admin/salt/files/api-initd-3 deleted file mode 100644 index 8a6f026e1170..000000000000 --- a/app-admin/salt/files/api-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-api" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-api.pid" -name="SALT API daemon" - -depend() { - use net logger -} diff --git a/app-admin/salt/files/master-initd-3 b/app-admin/salt/files/master-initd-3 deleted file mode 100644 index c0cfeade0e75..000000000000 --- a/app-admin/salt/files/master-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-master" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-master.pid" -name="SALT master daemon" - -depend() { - use net logger -} diff --git a/app-admin/salt/files/minion-initd-3 b/app-admin/salt/files/minion-initd-3 deleted file mode 100644 index 2a1aa12b72ff..000000000000 --- a/app-admin/salt/files/minion-initd-3 +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-minion" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-minion.pid" -name="SALT minion daemon" - -depend() { - need net - use logger -} diff --git a/app-admin/salt/files/salt-2014.7.5-archive-test.patch b/app-admin/salt/files/salt-2014.7.5-archive-test.patch deleted file mode 100644 index f7ff561efd62..000000000000 --- a/app-admin/salt/files/salt-2014.7.5-archive-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index a7f3005..bb0bc45 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -78,9 +78,7 @@ class ArchiveTest(TestCase): - running_as = 'root' - filename = os.path.join( - tmp_dir, -- 'files/test/_tmp{0}_test_archive.tar'.format( -- '' if running_as == 'root' else '_{0}'.format(running_as) -- ) -+ 'files/test/_tmp_test_archive.tar' - ) - for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): - ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/files/salt-2015.5.0-archive-test.patch b/app-admin/salt/files/salt-2015.5.0-archive-test.patch deleted file mode 100644 index c47422326974..000000000000 --- a/app-admin/salt/files/salt-2015.5.0-archive-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index 588ec1a..acd53fa 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -78,9 +78,7 @@ class ArchiveTest(TestCase): - running_as = 'root' - filename = os.path.join( - tmp_dir, -- 'files/test/_tmp{0}_test_archive_.tar'.format( -- '' if running_as == 'root' else '_{0}'.format(running_as) -- ) -+ 'files/test/_tmp_test_archive_.tar' - ) - for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): - ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch b/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch deleted file mode 100644 index acb8a091ac48..000000000000 --- a/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/unit/states/libvirt_test.py b/tests/unit/states/libvirt_test.py -index ec09542..477e5c3 100644 ---- a/tests/unit/states/libvirt_test.py -+++ b/tests/unit/states/libvirt_test.py -@@ -4,6 +4,7 @@ - ''' - # Import Python libs - from __future__ import absolute_import -+import os - - # Import Salt Testing Libs - from salttesting import skipIf, TestCase -@@ -27,6 +28,7 @@ libvirt.__opts__ = {} - - - @skipIf(NO_MOCK, NO_MOCK_REASON) -+@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test') - class LibvirtTestCase(TestCase): - ''' - Test cases for salt.states.libvirt diff --git a/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch deleted file mode 100644 index 469e0d27e101..000000000000 --- a/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py -index 2f39a41..2052f55 100644 ---- a/tests/unit/pydsl_test.py -+++ b/tests/unit/pydsl_test.py -@@ -445,102 +445,6 @@ class PyDSLRendererTestCase(CommonTestCaseBoilerplate): - shutil.rmtree(dirpath, ignore_errors=True) - - --class PyDSLRendererIncludeTestCase(CommonTestCaseBoilerplate): -- -- def test_rendering_includes(self): -- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) -- if not os.path.isdir(dirpath): -- self.skipTest( -- 'The temporary directory {0!r} was not created'.format( -- dirpath -- ) -- ) -- output = os.path.join(dirpath, 'output') -- try: -- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- yyy = include('yyy') -- -- # ensure states in xxx are run first, then those in yyy and then those in aaa last. -- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal')) -- extend(state('.start').stateconf.require(stateconf='yyy::goal')) -- -- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}')) -- -- __pydsl__.set(ordered=True) -- -- yyy.hello('red', 1) -- yyy.hello('green', 2) -- yyy.hello('blue', 3) -- '''.format(output))) -- -- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\ -- #!stateconf -os yaml . jinja -- -- include: -- - yyy -- -- extend: -- yyy::start: -- stateconf.set: -- - require: -- - stateconf: .goal -- -- yyy::Y1: -- cmd.run: -- - name: 'echo Y1 extended >> {0}' -- -- .X1: -- cmd.run: -- - name: echo X1 >> {1} -- - cwd: / -- .X2: -- cmd.run: -- - name: echo X2 >> {2} -- - cwd: / -- .X3: -- cmd.run: -- - name: echo X3 >> {3} -- - cwd: / -- -- '''.format(output, output, output, output))) -- -- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- __pydsl__.set(ordered=True) -- -- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/') -- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/') -- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/') -- -- def hello(color, number): -- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/') -- '''.format(output, output, output, output))) -- -- self.state_highstate({'base': ['aaa']}, dirpath) -- expected = textwrap.dedent('''\ -- X1 -- X2 -- X3 -- Y1 extended -- Y2 extended -- Y3 -- hello red 1 -- hello green 2 -- hello blue 3 -- ''') -- -- with salt.utils.fopen(output, 'r') as f: -- self.assertEqual(sorted(f.read()), sorted(expected)) -- -- finally: -- shutil.rmtree(dirpath, ignore_errors=True) -- -- - def write_to(fpath, content): - with salt.utils.fopen(fpath, 'w') as f: - f.write(content) diff --git a/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch b/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch deleted file mode 100644 index ca18f47acf79..000000000000 --- a/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py -index 0768790..bb89d47 100644 ---- a/tests/unit/modules/boto_vpc_test.py -+++ b/tests/unit/modules/boto_vpc_test.py -@@ -493,7 +493,7 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): - - vpc_properties = dict(id=vpc.id, - cidr_block=six.text_type(cidr_block), -- is_default=False, -+ is_default=None, - state=u'available', - tags={u'Name': u'test', u'test': u'testvalue'}, - dhcp_options_id=u'dopt-7a8b9c2d', diff --git a/app-admin/salt/files/syndic-initd-3 b/app-admin/salt/files/syndic-initd-3 deleted file mode 100644 index 5e9339bb4679..000000000000 --- a/app-admin/salt/files/syndic-initd-3 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -command="/usr/bin/salt-syndic" -command_args="${SALT_OPTS}" -command_background="1" -pidfile="/var/run/salt-syndic.pid" -name="SALT syndic daemon" - -depend() { - use net logger -} diff --git a/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch b/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch deleted file mode 100644 index 548f60b7dc88..000000000000 --- a/app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur setools-3.3.7.orig/configure.ac setools-3.3.7/configure.ac ---- setools-3.3.7.orig/configure.ac 2011-08-12 19:20:32.651000078 +0200 -+++ setools-3.3.7/configure.ac 2011-08-12 19:20:42.224000036 +0200 -@@ -503,7 +503,7 @@ - [AC_LANG_SOURCE([ - #include - int main () { -- return role_set_expand(NULL, NULL, NULL, NULL); -+ return role_set_expand(NULL, NULL, NULL, NULL, NULL); - }])], - sepol_new_user_role_mapping="yes", - sepol_new_user_role_mapping="no") -diff -ur setools-3.3.7.orig/libqpol/src/policy_define.c setools-3.3.7/libqpol/src/policy_define.c ---- setools-3.3.7.orig/libqpol/src/policy_define.c 2011-08-12 19:20:32.657000013 +0200 -+++ setools-3.3.7/libqpol/src/policy_define.c 2011-08-12 19:20:53.907005864 +0200 -@@ -2133,7 +2133,7 @@ - - /* This ebitmap business is just to ensure that there are not conflicting role_trans rules */ - #ifdef HAVE_SEPOL_USER_ROLE_MAPPING -- if (role_set_expand(&roles, &e_roles, policydbp, NULL)) -+ if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL)) - #else - if (role_set_expand(&roles, &e_roles, policydbp)) - #endif diff --git a/app-admin/setools/files/fix-implicit-def-fstat.patch b/app-admin/setools/files/fix-implicit-def-fstat.patch deleted file mode 100644 index 72764320a252..000000000000 --- a/app-admin/setools/files/fix-implicit-def-fstat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur setools-3.3.7.orig/libqpol/src/policy.c setools-3.3.7/libqpol/src/policy.c ---- setools-3.3.7.orig/libqpol/src/policy.c 2011-08-12 19:48:13.793000029 +0200 -+++ setools-3.3.7/libqpol/src/policy.c 2011-08-12 19:49:32.880001229 +0200 -@@ -36,6 +36,9 @@ - #include - #include - #include -+#include -+#include -+#include - #include - - #include diff --git a/app-admin/setools/files/setools3-userspace-2.4-compatibility.patch b/app-admin/setools/files/setools3-userspace-2.4-compatibility.patch deleted file mode 100644 index c8fc3f52905d..000000000000 --- a/app-admin/setools/files/setools3-userspace-2.4-compatibility.patch +++ /dev/null @@ -1,114 +0,0 @@ -From f1e5b208d507171968ca4d2eeefd7980f1004a3c Mon Sep 17 00:00:00 2001 -From: Chris PeBenito -Date: Thu, 12 Feb 2015 08:55:12 -0500 -Subject: [PATCH] Update for 2015-02-02 Userspace release (2.4) - -SETools now requires libsepol 2.4 and libselinux 2.4. ---- - configure.ac | 6 +++--- - libqpol/src/policy_define.c | 4 ++-- - libqpol/src/policy_extend.c | 4 ++-- - libqpol/src/syn_rule_query.c | 6 +++--- - secmds/replcon.cc | 2 +- - 5 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 80395e6..ae20da7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,9 +25,9 @@ libseaudit_version=4.5 - setoolsdir='${prefix}/share/setools-3.3' - javadir='${prefix}/share/java' - --version_min_sepol_major=1 --version_min_sepol_minor=12 --version_min_sepol_patch=27 -+version_min_sepol_major=2 -+version_min_sepol_minor=4 -+version_min_sepol_patch=0 - - dnl *** end of tunable values *** - -diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c -index 229779c..15f70ba 100644 ---- a/libqpol/src/policy_define.c -+++ b/libqpol/src/policy_define.c -@@ -1661,7 +1661,7 @@ int define_compute_type_helper(int which, avrule_t ** rule) - goto bad; - } - class_perm_node_init(perm); -- perm->class = i + 1; -+ perm->tclass = i + 1; - perm->data = datum->s.value; - perm->next = avrule->perms; - avrule->perms = perm; -@@ -1901,7 +1901,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule) - goto out; - } - class_perm_node_init(cur_perms); -- cur_perms->class = i + 1; -+ cur_perms->tclass = i + 1; - if (!perms) - perms = cur_perms; - if (tail) -diff --git a/libqpol/src/policy_extend.c b/libqpol/src/policy_extend.c -index 5325a87..1417271 100644 ---- a/libqpol/src/policy_extend.c -+++ b/libqpol/src/policy_extend.c -@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_ - for (class_node = rule->perms; class_node; class_node = class_node->next) { - key.rule_type = rule->specified; - key.source_val = key.target_val = i + 1; -- key.class_val = class_node->class; -+ key.class_val = class_node->tclass; - key.cond = cond; - if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) - goto err; -@@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_ - key.rule_type = rule->specified; - key.source_val = i + 1; - key.target_val = j + 1; -- key.class_val = class_node->class; -+ key.class_val = class_node->tclass; - key.cond = cond; - if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) - goto err; -diff --git a/libqpol/src/syn_rule_query.c b/libqpol/src/syn_rule_query.c -index 3e63204..d7578f1 100644 ---- a/libqpol/src/syn_rule_query.c -+++ b/libqpol/src/syn_rule_query.c -@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter) - return NULL; - } - -- return db->class_val_to_struct[srcs->cur->class - 1]; -+ return db->class_val_to_struct[srcs->cur->tclass - 1]; - } - - static int syn_rule_class_state_next(qpol_iterator_t * iter) -@@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const qpol_policy_t * policy, const qpol_syn_a - } - - for (node = internal_rule->perms; node; node = node->next) { -- for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) { -+ for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) { - if (!(node->data & (1 << i))) - continue; -- tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i)); -+ tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i)); - if (tmp) { - tmp++; /* remove prepended space */ - for (cur = 0; cur < perm_list_sz; cur++) -diff --git a/secmds/replcon.cc b/secmds/replcon.cc -index 34f7c1a..307c39f 100644 ---- a/secmds/replcon.cc -+++ b/secmds/replcon.cc -@@ -60,7 +60,7 @@ static struct option const longopts[] = { - {NULL, 0, NULL, 0} - }; - --extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak)); -+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak)); - - /** - * As that setools must work with older libselinux versions that may diff --git a/app-admin/sshguard/files/sshguard-1.5-day-starts-with-0.patch b/app-admin/sshguard/files/sshguard-1.5-day-starts-with-0.patch deleted file mode 100644 index a8f9ad090019..000000000000 --- a/app-admin/sshguard/files/sshguard-1.5-day-starts-with-0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/parser/attack_scanner.l -+++ b/src/parser/attack_scanner.l -@@ -72,7 +72,7 @@ - - - MONTH (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) --DAYNO [1-9][0-9]? -+DAYNO [0-9][0-9]? - HOUR (0|1)[0-9]|2[0-4] - MINPS [0-5][0-9] - WORD [a-zA-Z0-9][-_a-zA-Z0-9]+ diff --git a/app-admin/testdisk/files/fix_rare_crash-6.14.patch b/app-admin/testdisk/files/fix_rare_crash-6.14.patch deleted file mode 100644 index 913be7e32ebd..000000000000 --- a/app-admin/testdisk/files/fix_rare_crash-6.14.patch +++ /dev/null @@ -1,227 +0,0 @@ -From a2676d349a975a142f1119c0aecb435e1b0db8b8 Mon Sep 17 00:00:00 2001 -From: Christophe Grenier -Date: Sat, 14 Jun 2014 12:08:59 +0200 -Subject: TestDisk: fix rare crash when listing NTFS directories - - -diff --git a/src/ntfs_dir.c b/src/ntfs_dir.c -index d416cea..b51c63d 100644 ---- a/src/ntfs_dir.c -+++ b/src/ntfs_dir.c -@@ -167,7 +167,15 @@ static int ntfs_td_list_entry( struct ntfs_dir_struct *ls, const ntfschar *name - const MFT_REF mref, const unsigned dt_type) - { - int result = 0; -- char *filename = (char *)calloc (1, MAX_PATH); -+ char *filename; -+ ntfs_inode *ni; -+ ntfs_attr_search_ctx *ctx_si = NULL; -+ file_info_t *new_file=NULL; -+ /* Keep FILE_NAME_WIN32 and FILE_NAME_POSIX */ -+ if ((name_type & FILE_NAME_WIN32_AND_DOS) == FILE_NAME_DOS) -+ return 0; -+ -+ filename = (char *)calloc (1, MAX_PATH); - if (!filename) - { - log_critical("ntfs_td_list_entry calloc failed\n"); -@@ -178,118 +186,111 @@ static int ntfs_td_list_entry( struct ntfs_dir_struct *ls, const ntfschar *name - if (ntfs_ucstoutf8(ls->cd, name, name_len, &filename, MAX_PATH) < 0 && - ntfs_ucstombs (name, name_len, &filename, MAX_PATH) < 0) { - log_error("Cannot represent filename in current locale.\n"); -- goto free; -+ goto freefn; - } - #else - if (ntfs_ucstombs (name, name_len, &filename, MAX_PATH) < 0) { - log_error("Cannot represent filename in current locale.\n"); -- goto free; -+ goto freefn; - } - #endif - - result = 0; /* These are successful */ - if (MREF(mref) < FILE_first_user && filename[0] == '$') /* Hide system file */ -- goto free; -- /* Keep FILE_NAME_WIN32 and FILE_NAME_POSIX */ -- if ((name_type & FILE_NAME_WIN32_AND_DOS) == FILE_NAME_DOS) -- goto free; -- { -- ntfs_inode *ni; -- ntfs_attr_search_ctx *ctx_si = NULL; -- file_info_t *new_file=NULL; -+ goto freefn; -+ result = -1; /* Everything else is bad */ - -- result = -1; /* Everything else is bad */ -+ ni = ntfs_inode_open(ls->vol, mref); -+ if (!ni) -+ goto freefn; -+ new_file=(file_info_t*)MALLOC(sizeof(*new_file)); -+ new_file->status=0; -+ new_file->st_ino=MREF(mref); -+ new_file->st_uid=0; -+ new_file->st_gid=0; - -- ni = ntfs_inode_open(ls->vol, mref); -- if (!ni) -- goto release; -- new_file=(file_info_t*)MALLOC(sizeof(*new_file)); -- new_file->status=0; -- td_list_add_tail(&new_file->list, &ls->dir_list->list); -- new_file->st_ino=MREF(mref); -- new_file->st_uid=0; -- new_file->st_gid=0; -- -- ctx_si = ntfs_attr_get_search_ctx(ni, ni->mrec); -- if (ctx_si) -+ ctx_si = ntfs_attr_get_search_ctx(ni, ni->mrec); -+ if (ctx_si) -+ { -+ if (ntfs_attr_lookup(AT_STANDARD_INFORMATION, AT_UNNAMED, 0, CASE_SENSITIVE, 0, NULL, 0, ctx_si)==0) - { -- if (ntfs_attr_lookup(AT_STANDARD_INFORMATION, AT_UNNAMED, 0, CASE_SENSITIVE, 0, NULL, 0, ctx_si)==0) -+ const ATTR_RECORD *attr = ctx_si->attr; -+ const STANDARD_INFORMATION *si = (const STANDARD_INFORMATION*)((const char*)attr + -+ le16_to_cpu(attr->value_offset)); -+ if(si) - { -- const ATTR_RECORD *attr = ctx_si->attr; -- const STANDARD_INFORMATION *si = (const STANDARD_INFORMATION*)((const char*)attr + -- le16_to_cpu(attr->value_offset)); -- if(si) -- { -- new_file->td_atime=td_ntfs2utc(sle64_to_cpu(si->last_access_time)); -- new_file->td_mtime=td_ntfs2utc(sle64_to_cpu(si->last_data_change_time)); -- new_file->td_ctime=td_ntfs2utc(sle64_to_cpu(si->creation_time)); -- } -+ new_file->td_atime=td_ntfs2utc(sle64_to_cpu(si->last_access_time)); -+ new_file->td_mtime=td_ntfs2utc(sle64_to_cpu(si->last_data_change_time)); -+ new_file->td_ctime=td_ntfs2utc(sle64_to_cpu(si->creation_time)); - } -- ntfs_attr_put_search_ctx(ctx_si); - } -+ ntfs_attr_put_search_ctx(ctx_si); -+ } -+ { -+ ATTR_RECORD *rec; -+ int first=1; -+ ntfs_attr_search_ctx *ctx = NULL; -+ if (dt_type == NTFS_DT_DIR) - { -- ATTR_RECORD *rec; -- int first=1; -- ntfs_attr_search_ctx *ctx = NULL; -- if (dt_type == NTFS_DT_DIR) -+ new_file->name=strdup(filename); -+ new_file->st_mode = LINUX_S_IFDIR| LINUX_S_IRUGO | LINUX_S_IXUGO; -+ new_file->st_size=0; -+ td_list_add_tail(&new_file->list, &ls->dir_list->list); -+ first=0; -+ } -+ ctx = ntfs_attr_get_search_ctx(ni, ni->mrec); -+ /* A file has always an unnamed date stream and -+ * may have named alternate data streams (ADS) */ -+ while((rec = find_attribute(AT_DATA, ctx))) -+ { -+ const s64 filesize = ntfs_get_attribute_value_length(ctx->attr); -+ if(rec->name_length && -+ (ls->dir_data->param & FLAG_LIST_ADS)!=FLAG_LIST_ADS) -+ continue; -+ if(first==0) - { -- new_file->name=strdup(filename); -- new_file->st_mode = LINUX_S_IFDIR| LINUX_S_IRUGO | LINUX_S_IXUGO; -- new_file->st_size=0; -- td_list_add_tail(&new_file->list, &ls->dir_list->list); -- first=0; -+ const file_info_t *old_file=new_file; -+ new_file=(file_info_t *)MALLOC(sizeof(*new_file)); -+ memcpy(new_file, old_file, sizeof(*new_file)); - } -- ctx = ntfs_attr_get_search_ctx(ni, ni->mrec); -- /* A file has always an unnamed date stream and -- * may have named alternate data streams (ADS) */ -- while((rec = find_attribute(AT_DATA, ctx))) -+ new_file->st_mode = LINUX_S_IFREG | LINUX_S_IRUGO; -+ new_file->st_size=filesize; -+ if (rec->name_length) - { -- const s64 filesize = ntfs_get_attribute_value_length(ctx->attr); -- if(rec->name_length && -- (ls->dir_data->param & FLAG_LIST_ADS)!=FLAG_LIST_ADS) -- continue; -- if(first==0) -- { -- const file_info_t *old_file=new_file; -- new_file=(file_info_t *)MALLOC(sizeof(*new_file)); -- memcpy(new_file, old_file, sizeof(*new_file)); -- } -- new_file->st_mode = LINUX_S_IFREG | LINUX_S_IRUGO; -- new_file->st_size=filesize; -- if (rec->name_length) -+ char *stream_name=NULL; -+ new_file->status=FILE_STATUS_ADS; -+ new_file->name = (char *)MALLOC(MAX_PATH); -+ if (ntfs_ucstombs((ntfschar *) ((char *) rec + le16_to_cpu(rec->name_offset)), -+ rec->name_length, &stream_name, 0) < 0) - { -- char *stream_name=NULL; -- new_file->status=FILE_STATUS_ADS; -- new_file->name = (char *)MALLOC(MAX_PATH); -- if (ntfs_ucstombs((ntfschar *) ((char *) rec + le16_to_cpu(rec->name_offset)), -- rec->name_length, &stream_name, 0) < 0) -- { -- log_error("ERROR: Cannot translate name into current locale.\n"); -- snprintf(new_file->name, MAX_PATH, "%s:???", filename); -- } -- else -- { -- snprintf(new_file->name, MAX_PATH, "%s:%s", filename, stream_name); -- } -- free(stream_name); -+ log_error("ERROR: Cannot translate name into current locale.\n"); -+ snprintf(new_file->name, MAX_PATH, "%s:???", filename); - } - else - { -- new_file->name=strdup(filename); -+ snprintf(new_file->name, MAX_PATH, "%s:%s", filename, stream_name); - } -- td_list_add_tail(&new_file->list, &ls->dir_list->list); -- first=0; -+ free(stream_name); - } -- ntfs_attr_put_search_ctx(ctx); -+ else -+ { -+ new_file->name=strdup(filename); -+ } -+ td_list_add_tail(&new_file->list, &ls->dir_list->list); -+ first=0; -+ } -+ ntfs_attr_put_search_ctx(ctx); -+ if(first) -+ { -+ free(new_file); - } -- -- result = 0; --release: -- /* close the inode. */ -- if (ni) -- ntfs_inode_close(ni); - } --free: -+ -+ result = 0; -+ /* close the inode. */ -+ if (ni) -+ ntfs_inode_close(ni); -+freefn: - free (filename); - return result; - } --- -cgit v0.10.2 - diff --git a/app-admin/testdisk/files/install-gentoo.patch b/app-admin/testdisk/files/install-gentoo.patch deleted file mode 100644 index 08a3944e68cc..000000000000 --- a/app-admin/testdisk/files/install-gentoo.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.am-original 2015-04-20 11:31:03.000000000 -0600 -+++ Makefile.am 2015-04-20 13:27:01.000000000 -0600 -@@ -1,9 +1,8 @@ - SUBDIRS = icons man src - --EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.sh \ -+EXTRA_DIST = compile.sh \ - progsreiserfs-journal.patch progsreiserfs-file-read.patch \ - darwin/readme_mac_powerpc.txt darwin/readme_mac_intel.txt \ -- documentation.html \ - dos/readme.txt \ - linux/testdisk.spec.in \ - linux/qphotorec.desktop \ -@@ -24,9 +23,9 @@ - - AUTOMAKE_OPTIONS = gnits - -+dist_doc_DATA = AUTHORS COPYING ChangeLog NEWS INFO INSTALL README THANKS documentation.html -+ - install-data-hook: -- $(mkinstalldirs) $(DESTDIR)$(docdir) -- $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(docdir) - if USEQT - $(mkinstalldirs) $(DESTDIR)$(datadir)/applications - $(INSTALL_DATA) $(top_srcdir)/linux/qphotorec.desktop $(DESTDIR)$(datadir)/applications diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch deleted file mode 100644 index c74fff9b2079..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: webapp-config-1.50.16/WebappConfig/config.py -=================================================================== ---- webapp-config-1.50.16.orig/WebappConfig/config.py -+++ webapp-config-1.50.16/WebappConfig/config.py -@@ -204,6 +204,7 @@ class Config: - pass - - self.__d = { -+ 'allow_absolute' : 'no', - 'config_protect' : wrapper.config_protect, - # Necessary to load the config file - 'my_etcconfig' : '/etc/vhosts/webapp-config', -@@ -870,8 +871,13 @@ class Config: - # - # this makes sure we don't write rubbish into the installs list - -- installpath = self.config.get('USER', 'g_htdocsdir') + '/' + \ -- self.config.get('USER', 'g_installdir') -+ g_installdir = self.config.get('USER', 'g_installdir') -+ -+ if (os.path.isabs(g_installdir) -+ and self.config.get('USER', 'allow_absolute') == 'yes'): -+ installpath = g_installdir -+ else: -+ installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir - - installpath = re.compile('/+').sub('/', self.__root + installpath) - -Index: webapp-config-1.50.16/config/webapp-config -=================================================================== ---- webapp-config-1.50.16.orig/config/webapp-config -+++ webapp-config-1.50.16/config/webapp-config -@@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w" - - vhost_perms_installdir="0755" - -+# Allow specifying absolute path names using the -d option? -+allow_absolute="no" -+ - - # ======================================================================== - # END OF USER-EDITABLE SETTINGS diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch deleted file mode 100644 index 6f9a30e7a689..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: webapp-config-1.50.16/WebappConfig/server.py -=================================================================== ---- webapp-config-1.50.16.orig/WebappConfig/server.py -+++ webapp-config-1.50.16/WebappConfig/server.py -@@ -300,7 +300,7 @@ class Apache(Basic): - - name = 'Apache' - desc = 'supports installation on Apache 1 & 2' -- dep = '>=net-www/apache-1.3' -+ dep = '>=www-servers/apache-1.3' - - def set_server_user(self): - self.vhost_server_uid = get_user('apache') diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch deleted file mode 100644 index 24f000413479..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: webapp-config-1.50.16/sbin/webapp-cleaner -=================================================================== ---- webapp-config-1.50.16.orig/sbin/webapp-cleaner -+++ webapp-config-1.50.16/sbin/webapp-cleaner -@@ -11,7 +11,7 @@ CMD="emerge -Cav" - WEBAPP_DIR="/usr/share/webapps" - WEBAPP_CONFIG= - --[[ -z ${RC_GOT_FUNCTIONS} ]] && source /sbin/functions.sh -+[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh - - function help() { - echo "Remove obsolete and unused versions of web applications" diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch deleted file mode 100644 index cad75a2e517f..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -Make strings unicode to fix test failures - -Python enables unicode by default. Various quoted strings used -in tests were not declared as unicode and so caused false failures. -This patch addresses this issue. - -Signed-off-by: Matthew Thode -Signed-off-by: Anthony G. Basile - -diff -rupN webapp-config-1.50.16/WebappConfig.orig/db.py webapp-config-1.50.16/WebappConfig/db.py ---- webapp-config-1.50.16/WebappConfig.orig/db.py 2012-06-17 11:10:15.964264617 -0500 -+++ webapp-config-1.50.16/WebappConfig/db.py 2012-06-17 11:11:05.364265831 -0500 -@@ -186,7 +186,7 @@ class WebappDB(AppHierarchy): - >>> sb = [i[1] for i in b.list_locations().items()] - >>> sb.sort(lambda x,y: cmp(x[0]+x[1],y[0]+y[1])) - >>> sb -- [['gallery', '1.4.4_p6'], ['gallery', '2.0_rc2'], ['horde', '3.0.5'], ['phpldapadmin', '0.9.7_alpha4']] -+ [[u'gallery', u'1.4.4_p6'], [u'gallery', u'2.0_rc2'], [u'horde', u'3.0.5'], [u'phpldapadmin', u'0.9.7_alpha4']] - - >>> c = WebappDB(here + '/tests/testfiles/webapps', - ... package = 'horde', version = '3.0.5') -@@ -572,7 +572,7 @@ class WebappSource(AppHierarchy): - ... 'horde', '3.0.5') - >>> d = a.get_source_directories('htdocs') - >>> [i for i in d if i != '.svn'] -- ['dir1', 'dir2'] -+ [u'dir1', u'dir2'] - ''' - dirs = [] - -@@ -604,7 +604,7 @@ class WebappSource(AppHierarchy): - >>> a = WebappSource(here + '/tests/testfiles/share-webapps', - ... 'horde', '3.0.5') - >>> a.get_source_files('htdocs') -- ['test1', 'test2'] -+ [u'test1', u'test2'] - ''' - - files = [] diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch deleted file mode 100644 index a7421b9b2c21..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: webapp-config-1.50.16/WebappConfig/server.py -=================================================================== ---- webapp-config-1.50.16.orig/WebappConfig/server.py -+++ webapp-config-1.50.16/WebappConfig/server.py -@@ -158,7 +158,7 @@ class Basic: - - # is the installation directory empty? - -- if not os.listdir(self.__destd): -+ if not os.listdir(self.__destd) and os.path.isdir(self.__destd): - if not self.__p: - os.rmdir(self.__destd) - else: diff --git a/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch b/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch deleted file mode 100644 index f6e7bbd54144..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- WebappConfig/config.py 2006-12-30 13:38:36.000000000 -0500 -+++ config.py 2009-05-28 12:08:53.000000000 -0400 -@@ -1289,8 +1289,9 @@ - - allowed_servers = {'apache' : WebappConfig.server.Apache, - 'lighttpd' : WebappConfig.server.Lighttpd, -- 'aolserver': WebappConfig.server.Aolserver, -- 'cherokee' : WebappConfig.server.Cherokee} -+ 'cherokee' : WebappConfig.server.Cherokee, -+ 'nginx' : WebappConfig.server.Nginx, -+ 'gatling' : WebappConfig.server.Gatling} - - server = self.config.get('USER', 'vhost_server') - ---- WebappConfig/server.py 2009-05-28 12:06:48.000000000 -0400 -+++ server.py 2009-05-28 12:10:54.000000000 -0400 -@@ -316,16 +316,6 @@ - self.vhost_server_uid = get_user('lighttpd') - self.vhost_server_gid = get_group('lighttpd') - --class Aolserver(Basic): -- -- name = 'Aolserver' -- desc = 'supports installation on Aolserver' -- dep = 'www-servers/aolserver' -- -- def set_server_user(self): -- self.vhost_server_uid = get_user('aolserver') -- self.vhost_server_gid = get_group('aolserver') -- - class Cherokee(Basic): - - name = 'Cherokee' -@@ -336,9 +326,30 @@ - self.vhost_server_uid = get_user('cherokee') - self.vhost_server_gid = get_group('cherokee') - -+class Nginx(Basic): -+ -+ name = 'Nginx' -+ desc = 'supports installation on Nginx' -+ dep = 'www-servers/nginx' -+ -+ def set_server_user(self): -+ self.vhost_server_uid = get_user('nginx') -+ self.vhost_server_gid = get_group('nginx') -+ -+class Gatling(Basic): -+ -+ name = 'Gatling' -+ desc = 'supports installation on Gatling' -+ dep = 'www-servers/gatling' -+ -+ def set_server_user(self): -+ self.vhost_server_uid = get_user('gatling') -+ self.vhost_server_gid = get_group('gatling') -+ - def listservers(): - - OUT.notice('\n'.join(['apache', -- 'aolserver', - 'lighttpd', -- 'cherokee'])) -+ 'cherokee', -+ 'nginx', -+ 'gatling'])) ---- config/webapp-config 2006-12-30 13:39:13.000000000 -0500 -+++ webapp-config 2009-05-28 12:11:24.000000000 -0400 -@@ -65,9 +65,10 @@ - # your choices are: - # - # apache --# aolserver - # lighttpd - # cherokee -+# nginx -+# gatling - # - # you can override this setting by using the -s switch to webapp-config - diff --git a/app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch b/app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch deleted file mode 100644 index 27a11aa83372..000000000000 --- a/app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1bc28049300625a3b24a632e2aacb5776937c19b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Manuel=20R=C3=BCger?= -Date: Tue, 6 Aug 2013 03:59:31 +0200 -Subject: [PATCH] WebappConfig/config.py: fix indentation - ---- - WebappConfig/config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/WebappConfig/config.py b/WebappConfig/config.py -index bf55d1e..bb86a55 100644 ---- a/WebappConfig/config.py -+++ b/WebappConfig/config.py -@@ -962,7 +962,7 @@ class Config: - OUT.die('You need to specify at least the application you' - ' would like to handle!') - else: -- return self.config.get('USER', 'pn') -+ return self.config.get('USER', 'pn') - - def check_version_set(self): - if not self.config.has_option('USER', 'pvr'): --- -1.8.1.5 - diff --git a/app-admin/xstow/files/xstow-0.5.1-gcc43.patch b/app-admin/xstow/files/xstow-0.5.1-gcc43.patch deleted file mode 100644 index ded9e32cc577..000000000000 --- a/app-admin/xstow/files/xstow-0.5.1-gcc43.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- xstow-0.5.1.orig/src/format.h -+++ xstow-0.5.1/src/format.h -@@ -648,17 +648,17 @@ - - switch( num_of_args ) - { -- case 1: n = std::snprintf( buffer, buffer_size, format.c_str(), -+ case 1: n = snprintf( buffer, buffer_size, format.c_str(), - D( a ) ); break; -- case 2: n = std::snprintf( buffer, buffer_size, format.c_str(), -+ case 2: n = snprintf( buffer, buffer_size, format.c_str(), - D( a ), D( b ) ); break; -- case 3: n = std::snprintf( buffer, buffer_size, format.c_str(), -+ case 3: n = snprintf( buffer, buffer_size, format.c_str(), - D( a ), D( b ), D( c ) ); break; -- case 4: n = std::snprintf( buffer, buffer_size, format.c_str(), -+ case 4: n = snprintf( buffer, buffer_size, format.c_str(), - D( a ), D( b ), D( c ), D( d ) ); break; -- case 5: n = std::snprintf( buffer, buffer_size, format.c_str(), -+ case 5: n = snprintf( buffer, buffer_size, format.c_str(), - D( a ), D( b ), D( c ), D( d ), D( e ) ); break; -- case 6: n = std::snprintf( buffer, buffer_size, format.c_str(), -+ case 6: n = snprintf( buffer, buffer_size, format.c_str(), - D( a ), D( b ), D( c ), D( d ), D( e ), D( f ) ); break; - } - ---- xstow-0.5.1.orig/src/main.cpp -+++ xstow-0.5.1/src/main.cpp -@@ -1,3 +1,4 @@ -+#include - #include - - #include "local_config.h" ---- xstow-0.5.1.orig/src/cppdir.cpp -+++ xstow-0.5.1/src/cppdir.cpp -@@ -1,6 +1,8 @@ - #include "cppdir.h" - #include "debug.h" - -+#include -+ - #define OUT(level) DEBUG_OUT( level, MODULE_CPPDIR) - - extern "C" { ---- xstow-0.5.1.orig/src/setup.cpp -+++ xstow-0.5.1/src/setup.cpp -@@ -5,6 +5,8 @@ - #include "debug.h" - #include "nignore.h" - -+#include -+ - #undef OUT - - #define OUT( level ) DEBUG_OUT( level, MODULE_SETUP ) ---- xstow-0.5.1.orig/src/tree.cpp -+++ xstow-0.5.1/src/tree.cpp -@@ -26,6 +26,7 @@ - - - #include -+#include - - #define OUT(level) DEBUG_OUT(level, MODULE_TREE) - - - diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index c416f0f85813..7e8e347d9fe0 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,5 +1,3 @@ DIST libvirt-1.2.21-20151222.tar.xz 1684 SHA256 6c97f288470ec58bcbe98507563c6a191892c6f8813a7b9688c09b823934cbe5 SHA512 4fd43f0e12434b78ac3e671ad8eb0e402d384cff6278f6d0db322a068c2c8807c7c7f7e5774aa9d19e2a85e49f6d9888908b32fca5fc04980134edaccba0afe2 WHIRLPOOL 2bfbc3cbf1ca44a2bb06ddf2e8eabeb116165560b9c73d649d7b8cc9baba851f5e9246414bfc2c4740f27d0d0d42b6176eaec43b05e8c1e54de2804150c2cde1 DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650 -DIST libvirt-1.3.1.tar.gz 29900143 SHA256 a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a SHA512 a109c09d947f7c5e924fdbc9c9b6c0a9d6ff64d9411aedd9a3e710d20f749b088ff9895e882dd888b88bfea7724a8933534be4078f16cb9d2047da761515e804 WHIRLPOOL 62fb8486bfa53d55b397d9a90750d32a83f0a73cf2e6685f296489390abf9c62efc69fecd6d011fc51e9f562f75f5b8ce03208c350e98d20de0a5560721c675e -DIST libvirt-1.3.4.tar.gz 30493908 SHA256 e2396ebebb3f3fdb50429ce8faa99559f6e8e3cc0493d5fa0c1999db189c25bd SHA512 6f85e4cd8a696da729bb88368c608694119258c6ab7f9b99f41c34a6cc4492d9ad90b8ff1574fd4ee6c78c674a3a501db60d1d3ba898f7013321ecc996612919 WHIRLPOOL af4a8a0e3d746f50e0f9d95e3920c023c5bbec0d7c641f43aea580db9b95a793027f7579ecd94625a68b7e3662c328d94b7b2d243afea60a8d2f31cab1cc9319 DIST libvirt-1.3.5.tar.gz 35109092 SHA256 93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8 SHA512 6c6a09623d3d4d426311bfa7039f5e39584d5f891b8e761bbdb3022601ea066b8e1c3f8d609326e8ba4081ae40b7b03086fbc8ba5759d218b8616ec98200a89d WHIRLPOOL 88ac308cc461efff842c27e40263a3b25ce0bc0ca310fb6e9def9126ab893fe43aed01bda9fc3615439ee797c36e2800f741b346e0b3d96aac64e7909c269879 diff --git a/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild deleted file mode 100644 index a0220273a821..000000000000 --- a/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild +++ /dev/null @@ -1,385 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils user autotools-utils linux-info systemd readme.gentoo - -BACKPORTS="" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" - SRC_URI="" - KEYWORDS="" - SLOT="0" -else - # Versions with 4 numbers are stable updates: - if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then - SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz" - else - SRC_URI="http://libvirt.org/sources/${P}.tar.gz" - fi - SRC_URI+=" ${BACKPORTS:+ - https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz - https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" - KEYWORDS="amd64 x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \ - lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ - selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \ - xen" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - uml? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - app-misc/scrub - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - >=net-analyzer/netcat6-1.0-r2 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - avahi? ( >=net-dns/avahi-0.6[dbus] ) - caps? ( sys-libs/libcap-ng ) - firewalld? ( net-firewall/firewalld ) - fuse? ( >=sys-fs/fuse-2.8.6 ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) - lxc? ( !systemd? ( sys-power/pm-utils ) ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - openvz? ( sys-kernel/openvz-sources:* ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2 - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-0.13.0 - dev-libs/yajl - !systemd? ( sys-power/pm-utils ) - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - systemd? ( sys-apps/systemd ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - app-emulation/xen - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - )" - -DEPEND="${RDEPEND} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - virtual/pkgconfig" - -pkg_setup() { - enewgroup qemu 77 - enewuser qemu 77 -1 -1 qemu kvm - - # Some people used the masked ebuild which was not adding the qemu - # user to the kvm group originally. This results in VMs failing to - # start for some users. bug #430808 - egetent group kvm | grep -q qemu - if [[ $? -ne 0 ]]; then - gpasswd -a qemu kvm - fi - - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~DEVPTS_MULTIPLE_INSTANCES - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - if [[ ${PV} = *9999* ]]; then - # git checkouts require bootstrapping to create the configure script. - # Additionally the submodules must be cloned to the right locations - # bug #377279 - ./bootstrap || die "bootstrap failed" - ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf - ) >.git-module-status - fi - - epatch \ - "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ - "${FILESDIR}"/${P}-fix_paths_for_apparmor.patch \ - "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch - - [[ -n ${BACKPORTS} ]] && - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ - EPATCH_SOURCE="${WORKDIR}/patches" epatch - - epatch_user - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \ - -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ - -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - AUTOTOOLS_AUTORECONF=true - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with avahi) - $(use_with caps capng) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with libvirtd) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with phyp) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with systemd systemd-daemon) - $(usex systemd --with-init-script=systemd '') - $(use_with udev) - $(use_with uml) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen) - $(use_with xen xen-inotify) - $(usex xen --with-libxl '') - - --without-hal - --without-netcf - --without-sanlock - --without-xenapi - --with-esx - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --with-html-subdir=${PF}/html - --localstatedir=/var - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - autotools-utils_src_configure - - if [[ ${PV} = *9999* ]]; then - # Restore gnulib's config.sub and config.guess - # bug #377279 - (cd .gnulib && git reset --hard > /dev/null) - fi - - # Workaround: Sometimes this subdirectory is missing and leads to a - # build failure. - mkdir -p "${BUILD_DIR}"/docs/internals -} - -src_test() { - # Explicitly allow parallel build of tests - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" -} - -src_install() { - autotools-utils_src_compile install \ - DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var/cache - rm -rf "${D}"/var/run - rm -rf "${D}"/var/log - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - use systemd && systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then - FORCE_PRINT_ELOG=true - fi - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-1.3.4.ebuild b/app-emulation/libvirt/libvirt-1.3.4.ebuild deleted file mode 100644 index de27d80bf55a..000000000000 --- a/app-emulation/libvirt/libvirt-1.3.4.ebuild +++ /dev/null @@ -1,386 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils user autotools-utils linux-info systemd readme.gentoo - -BACKPORTS="" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt.git" - SRC_URI="" - KEYWORDS="" - SLOT="0" -else - # Versions with 4 numbers are stable updates: - if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then - SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz" - else - SRC_URI="http://libvirt.org/sources/${P}.tar.gz" - fi - SRC_URI+=" ${BACKPORTS:+ - https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz - https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" - KEYWORDS="amd64 x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \ - lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \ - selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \ - xen" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - uml? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - app-misc/scrub - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - avahi? ( >=net-dns/avahi-0.6[dbus] ) - caps? ( sys-libs/libcap-ng ) - firewalld? ( net-firewall/firewalld ) - fuse? ( >=sys-fs/fuse-2.8.6 ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) - lxc? ( !systemd? ( sys-power/pm-utils ) ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - openvz? ( sys-kernel/openvz-sources:* ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2 - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-0.13.0 - dev-libs/yajl - !systemd? ( sys-power/pm-utils ) - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - systemd? ( sys-apps/systemd ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - app-emulation/xen - app-emulation/xen-tools:= - ) - udev? ( - virtual/udev - >=x11-libs/libpciaccess-0.10.9 - )" - -DEPEND="${RDEPEND} - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - virtual/pkgconfig" - -pkg_setup() { - enewgroup qemu 77 - enewuser qemu 77 -1 -1 qemu kvm - - # Some people used the masked ebuild which was not adding the qemu - # user to the kvm group originally. This results in VMs failing to - # start for some users. bug #430808 - egetent group kvm | grep -q qemu - if [[ $? -ne 0 ]]; then - gpasswd -a qemu kvm - fi - - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~DEVPTS_MULTIPLE_INSTANCES - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" - - if [[ ${PV} = *9999* ]]; then - # git checkouts require bootstrapping to create the configure script. - # Additionally the submodules must be cloned to the right locations - # bug #377279 - ./bootstrap || die "bootstrap failed" - ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf - ) >.git-module-status - fi - - epatch \ - "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ - "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ - "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch \ - "${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch \ - "${FILESDIR}"/${P}-glibc-2.23.patch - - [[ -n ${BACKPORTS} ]] && - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ - EPATCH_SOURCE="${WORKDIR}/patches" epatch - - epatch_user - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \ - -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ - -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" - - AUTOTOOLS_AUTORECONF=true - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_with apparmor) - $(use_with apparmor apparmor-profiles) - $(use_with audit) - $(use_with avahi) - $(use_with caps capng) - $(use_with firewalld) - $(use_with fuse) - $(use_with glusterfs) - $(use_with glusterfs storage-gluster) - $(use_with iscsi storage-iscsi) - $(use_with libvirtd) - $(use_with lvm storage-lvm) - $(use_with lvm storage-mpath) - $(use_with lxc) - $(use_with macvtap) - $(use_enable nls) - $(use_with numa numactl) - $(use_with numa numad) - $(use_with openvz) - $(use_with parted storage-disk) - $(use_with pcap libpcap) - $(use_with phyp) - $(use_with policykit polkit) - $(use_with qemu) - $(use_with qemu yajl) - $(use_with rbd storage-rbd) - $(use_with sasl) - $(use_with selinux) - $(use_with systemd systemd-daemon) - $(usex systemd --with-init-script=systemd '') - $(use_with udev) - $(use_with uml) - $(use_with vepa virtualport) - $(use_with virt-network network) - $(use_with wireshark-plugins wireshark-dissector) - $(use_with xen) - $(use_with xen xen-inotify) - $(usex xen --with-libxl '') - - --without-hal - --without-netcf - --without-sanlock - --without-xenapi - --with-esx - --with-qemu-group=$(usex caps qemu root) - --with-qemu-user=$(usex caps qemu root) - --with-remote - --with-storage-fs - --with-vmware - - --disable-static - --disable-werror - - --with-html-subdir=${PF}/html - --localstatedir=/var - ) - - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ ) - else - myeconfargs+=( $(use_with virtualbox vbox) ) - fi - - autotools-utils_src_configure - - if [[ ${PV} = *9999* ]]; then - # Restore gnulib's config.sub and config.guess - # bug #377279 - (cd .gnulib && git reset --hard > /dev/null) - fi - - # Workaround: Sometimes this subdirectory is missing and leads to a - # build failure. - mkdir -p "${BUILD_DIR}"/docs/internals -} - -src_test() { - # Explicitly allow parallel build of tests - export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" -} - -src_install() { - autotools-utils_src_compile install \ - DESTDIR="${D}" \ - SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" - - find "${D}" -name '*.la' -delete || die - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var/cache - rm -rf "${D}"/var/run - rm -rf "${D}"/var/log - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - use systemd && systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then - FORCE_PRINT_ELOG=true - fi - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild index dcff0fd71c05..1ba6a8487585 100644 --- a/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild +++ b/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild @@ -24,7 +24,7 @@ else SRC_URI+=" ${BACKPORTS:+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" SLOT="0/${PV}" fi diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest index 9a9b275d8b1c..dfab814fca86 100644 --- a/app-officeext/ooofbtools/Manifest +++ b/app-officeext/ooofbtools/Manifest @@ -1,4 +1,4 @@ DIST OOoFBTools-2.38.zip 4833754 SHA256 ee039cf7ae2767916cc79b25d5b852a54089773db458aa695b064e3d803da757 SHA512 2ff6bb251b5913cb7ceb430aba6ee47a5b2e2c7b78be8b291d67410903d3679ef8e01554f504cd86993fb717173d2a9c4080b5059f3e1064be075e67766c07d5 WHIRLPOOL 52fcd3bc82eab952080c6e1b18ed12b1568e4dd7299b55b2433efc8f5420f304ae32bbc3a9fe191c9a614f42aa5e04da976758cf9262e94adc238b887d6ecb9e DIST OOoFBTools-2.39.zip 4835702 SHA256 cff2a0ab17e4c77a7f3411007a5adf43144088e576f06ac49910419b2ca8e3c0 SHA512 95e66ba9f788902fa54e1c11d867c5e71b0280442fd5f1b75d1b524f24cf34fa2a270b68ebe30676fe5c4edb02033c7de59810ee96d4682bf68d231e8b277117 WHIRLPOOL 14d44d11806b3c717f1fa4e8d2d7fd319cd0fdbe2c2f5cbffdfbe5ef4fbe73e6fdea903a9e4428b3f02ef7b56d9f7b218ab830aecc5ae0f15a18b6898c0cec6c DIST OOoFBTools-2.42.zip 4837516 SHA256 c31a73a862734395a4c6ad45e3ff5aa36d0ec5acfd26d6d3e1c27de4ce7c24fc SHA512 a6945dd003c1b6a5be77c224e47d7b30b54ce28ea4a1aeada71ed401a0a6e9afacc08394da908d1f2765e8f4766e55479ed51a98067829bde950732ab27df302 WHIRLPOOL 5f9744331dd0d269b3ac1b6cce29316b7623fe719bd2d685ca75d2a021930d1fdd6c2b657597b69ead86814372da3f74ff342a19f2d0803e2af3acce93c9f872 -DIST OOoFBTools-2.43.zip 5758883 SHA256 1f441255c4f2bf013fcf34d7c25a5442824cb0323aff89f01b5f77849fa4b7a6 SHA512 ac6368ae2cf9a6ad8b1401138d838384389d408c3516a3a4819ed23945149ffc3fa011c1c9ca5fb30cb2d68c89fba4747a6e03dcbc7e95d759af316635ab031a WHIRLPOOL e171fa6974301f9108d634000146a8dbd73680687caa534bf739a7bc86032bd6dee52a7a77629a2de23e14dadd7cfecc572ebf382aa6d4012df7f52ce94c5e5a +DIST OOoFBTools-2.44.zip 5990155 SHA256 8339088c46516735d0079d6e5a2593f4173aabac284b34e52fc956cd03762e14 SHA512 5d4937643b63a6f5b003560e797ddbf7d419f6454e0ecf99d3f1abebb5039f1b30d61226434f1ae3a0f7e007172a42d6aff14af245f6b8fd1bfd269888245f77 WHIRLPOOL e6bb27e3acd4a7fddde0cbfd5138da0b1cff6956c89edab760fd3f36033e0ac00b00ad1607e1189a9b03b69fbaf05864a7eb74b652fa4f852b9bbd48ebfdb371 diff --git a/app-officeext/ooofbtools/ooofbtools-2.43.ebuild b/app-officeext/ooofbtools/ooofbtools-2.44.ebuild similarity index 100% rename from app-officeext/ooofbtools/ooofbtools-2.43.ebuild rename to app-officeext/ooofbtools/ooofbtools-2.44.ebuild diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest index 6b782004a4a2..67e9c361c16d 100644 --- a/app-text/cherrytree/Manifest +++ b/app-text/cherrytree/Manifest @@ -1 +1 @@ -DIST cherrytree-0.36.9.tar.gz 8725402 SHA256 37314cd9ba3e9bb87fb8ef9384da95db583543f2421f5243f7470d9903b3d8bf SHA512 fca9679dc1508b5db1fea9b10f3434f24b4545a53c9a586f1b21298e134242705e4ecc050e0ebffc972caca63c5f2803245b1e65191eed19b82a9cbdec3a40aa WHIRLPOOL edec306131fc09bde6f470c7e8bb1f795d7e54e3d1d0093c421bf515724f8f7d48fc3d024569279ee6db2e46b270db68d41fa4a1f816dfb1f8c9df40380d350d +DIST cherrytree-0.37.0.tar.gz 8888703 SHA256 fa51071c8060fe337bf3092ab75188ce0bbd2ab1b34092607806787b116e54ed SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5 WHIRLPOOL 59a8e68c9f2c031bf2acbee827dc73923f0e8f49ab9bf3a40f8b89683f0f2c343466783575b70a13821fc7409f47710fe089bbfcc4bc310a64cd78e68a25c319 diff --git a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0.ebuild similarity index 79% rename from app-text/cherrytree/cherrytree-0.36.9-r1.ebuild rename to app-text/cherrytree/cherrytree-0.37.0.ebuild index 3d8fa897cf6b..2b296530f482 100644 --- a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild +++ b/app-text/cherrytree/cherrytree-0.37.0.ebuild @@ -7,7 +7,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) DISTUTILS_SINGLE_IMPL=true -inherit fdo-mime distutils-r1 +inherit xdg distutils-r1 DESCRIPTION='A hierarchical note taking application' HOMEPAGE='http://www.giuspen.com/cherrytree' @@ -34,6 +34,8 @@ PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN' inherit l10n python_prepare_all() { + xdg_src_prepare + if use nls ; then l10n_find_plocales_changes 'locale' '' '.po' @@ -43,17 +45,11 @@ python_prepare_all() { l10n_for_each_disabled_locale_do rm_loc fi - sed -i '\|update-desktop-database|d' 'setup.py' || die + sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die distutils-r1_python_prepare_all } python_configure_all() { - use nls || mydistutilsargs+=( '--without-gettext' ) - distutils-r1_python_configure_all -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update + use nls || mydistutilsargs+=( --without-gettext ) } diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild index 3a747c523c58..76c40af968cc 100644 --- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild +++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug doc static-libs" DEPEND="doc? ( app-doc/doxygen )" diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index cafdebc0ff97..8aeec70c17eb 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1 +1 @@ -DIST sway-0.6.tar.gz 10995907 SHA256 a9159033ca3e976383cc9485bcb10fe89485711c4577d8c7414d8f23c56e54ea SHA512 b38455183b8a488fd5f2721356864bd4d28a4bcb5f0ce54f1a6b1c013e75c758fb2a429f549d8f78a2284a79721048333003fd040b70d26169c5eb900b20acd2 WHIRLPOOL 1df951d1d962f8951471613a2c4eeccfd2c4561565297eb077776c38ee42aeea9bbbe702454d8a4ef06f36b21d3dfaf56d4461565cb8b522adb5af71a899e66e +DIST sway-0.8.tar.gz 11002027 SHA256 eb229098f87b242ab9259d3057e7e9a8cad610659546988b73ffa866ec62f7fd SHA512 922b36cb484d2dbfd2b9309c5a65debc36e2a2304f9fbd980eba4c19ca1147d48fa01cf9f64e55cff2fd7ef6f7efaf87ef8145bda5b5ca76e2b1bded60e4aa64 WHIRLPOOL 5a70997bcf68141f6fba13eaa45655eee168d2bbe5e45329a49e95567a07476afe4a63d5afb3ef59511207ac689b6dba3633dba2e08dfa192761ae5003075f01 diff --git a/dev-libs/sway/sway-0.6.ebuild b/dev-libs/sway/sway-0.8.ebuild similarity index 100% rename from dev-libs/sway/sway-0.6.ebuild rename to dev-libs/sway/sway-0.8.ebuild diff --git a/dev-libs/wlc/Manifest b/dev-libs/wlc/Manifest index 68054045e6bb..c98c3a5dfd06 100644 --- a/dev-libs/wlc/Manifest +++ b/dev-libs/wlc/Manifest @@ -1 +1 @@ -DIST wlc-0.0.2.tar.bz2 206832 SHA256 f430c81197a2157487c597206c1020eab81788b2673929c6118b95376af5e7cd SHA512 fc79d1bc41143d41d4f04f4a08f1e85231d8796273ea1b6e22e9e78a2bb403dde39532bb7f5676a361427072752ecdea0c4378ac93b5a580d9eb8abedb5dce22 WHIRLPOOL 58cf3fffc7cb3b9529f5b348f1d2331eb9e05dd70674230d9267943a0b6eb31c87376dcde72d6de1b2463742212c185284ab200fce15f5d70b50f638fe8e7d90 +DIST wlc-0.0.3.tar.bz2 206972 SHA256 086556f97e635469afd1f73e191ac57c888925f4480d526346946350273ebb3f SHA512 e1e3c7d80d8888a8fe3102e8ea891d4c52fa160f99fdb3fb837c6ff69ef3468ca2ec2b1f850cfac3d64a7df0e426f1113963395a562ef252c096af48b55c99d4 WHIRLPOOL c59b51b37a6fe9bcc580cd3aa4ecae224f680be507a160a0cb88d5ce68de1c31fedd1e236e8a19c84175364aa26987f1b053b4d41fee2ecd5b1f9d470da544fa diff --git a/dev-libs/wlc/wlc-0.0.2.ebuild b/dev-libs/wlc/wlc-0.0.3.ebuild similarity index 100% rename from dev-libs/wlc/wlc-0.0.2.ebuild rename to dev-libs/wlc/wlc-0.0.3.ebuild diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest index e5718e0fc18b..8168a0cb4283 100644 --- a/dev-python/libvirt-python/Manifest +++ b/dev-python/libvirt-python/Manifest @@ -1,4 +1,2 @@ DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e -DIST libvirt-python-1.3.1.tar.gz 171221 SHA256 7143b922a9bd66a5e199b13316fa4266cbffc23db01c99bce37216a1eb9118f7 SHA512 f980d6aec1c83422d01c8ff02915357f4903f8c2a8ea9538da35e7313f6d491ebb4646e642097269a6be2996da879e7594c5e166cf2cc0bd96745eace7ce7567 WHIRLPOOL 3fe0ecba5f618eab1059c5e4ac4ef8789ed6684f36aee336f2e366198805560706c41d67ddceb328a0ad66867145a103aa15665b646b7bc5a5b058b02755ce11 -DIST libvirt-python-1.3.4.tar.gz 172808 SHA256 badd2f51b07d5b03be7c01c45d8f52fea181ba9386ced5b12241ffdcf7e4f7a7 SHA512 18063021edf28b6c7b6b407590ec94eda45272c6b976ef560b4e81a8b212a5c7d2c1ce844e066855cda0a1bca4e98028936314c58e12261952783bd606501f59 WHIRLPOOL 73e2a9a1327efad4e448bb08814ddbe5c8958bcdbe596ea539be39e3a34ff9ffed141aac40bd90d4c0b841e1ddd42f6d7905245499efa774dca6f99c16305814 DIST libvirt-python-1.3.5.tar.gz 168780 SHA256 a0508a57637fd18a3584fb9d2322fb172f65708c9db16e0438a70eb0f36fa5c2 SHA512 e1241e71dc0c574b14c6ecb101ec611f0c8caab6a5f82268882febb7b1382752d350ee0f6c2d648c30c6af3f19ef5b91bb518d8a0bd6ab967807b82dd4cf893f WHIRLPOOL 83a861fd425320214c43b80053444cc273c761e88b2530a10d2e8bfe898b19e1563d9f3b182deabe7fc8a7f445c303fa495123bb28d41caa88954cceff40c453 diff --git a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild deleted file mode 100644 index 1f38cff44f52..000000000000 --- a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -AUTOTOOLIZE=yes - -MY_P="${P/_rc/-rc}" - -inherit eutils distutils-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt-python.git" - SRC_URI="" - KEYWORDS="" - RDEPEND="app-emulation/libvirt:=[-python(-)]" -else - SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" - RDEPEND="app-emulation/libvirt:0/${PV}" -fi -S="${WORKDIR}/${P%_rc*}" - -DESCRIPTION="libvirt Python bindings" -HOMEPAGE="http://www.libvirt.org" -LICENSE="LGPL-2" -SLOT="0" -IUSE="test" - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-python/lxml[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] )" - -# testsuite is currently not included in upstream tarball -RESTRICT="test" - -python_test() { - esetup.py test -} diff --git a/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild deleted file mode 100644 index 1f38cff44f52..000000000000 --- a/dev-python/libvirt-python/libvirt-python-1.3.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -AUTOTOOLIZE=yes - -MY_P="${P/_rc/-rc}" - -inherit eutils distutils-r1 - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://libvirt.org/libvirt-python.git" - SRC_URI="" - KEYWORDS="" - RDEPEND="app-emulation/libvirt:=[-python(-)]" -else - SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" - RDEPEND="app-emulation/libvirt:0/${PV}" -fi -S="${WORKDIR}/${P%_rc*}" - -DESCRIPTION="libvirt Python bindings" -HOMEPAGE="http://www.libvirt.org" -LICENSE="LGPL-2" -SLOT="0" -IUSE="test" - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-python/lxml[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] )" - -# testsuite is currently not included in upstream tarball -RESTRICT="test" - -python_test() { - esetup.py test -} diff --git a/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild index cc59d1ba63b0..1f38cff44f52 100644 --- a/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild +++ b/dev-python/libvirt-python/libvirt-python-1.3.5.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then RDEPEND="app-emulation/libvirt:=[-python(-)]" else SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" RDEPEND="app-emulation/libvirt:0/${PV}" fi S="${WORKDIR}/${P%_rc*}" diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild index b50c873755af..c31b03bae9f6 100644 --- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild +++ b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/carld/tidy" LICENSE="HTML-Tidy" SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86" IUSE="" RUBY_PATCHES=( 11CVE-2015-5522.patch ) diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1.ebuild index b4fa5377b838..1a13197e57f7 100644 --- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild +++ b/games-puzzle/tanglet/tanglet-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,6 +18,7 @@ IUSE="" DEPEND="sys-libs/zlib dev-qt/qtcore:5 + dev-qt/qtwidgets:5 dev-qt/qtgui:5" RDEPEND=${DEPEND} diff --git a/media-libs/gd/gd-2.2.2.ebuild b/media-libs/gd/gd-2.2.2.ebuild index 68863ffdfeb9..91847330fa26 100644 --- a/media-libs/gd/gd-2.2.2.ebuild +++ b/media-libs/gd/gd-2.2.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" LICENSE="gd IJG HPND BSD" SLOT="2/3" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib" # fontconfig has prefixed font paths, details see bug #518970 diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 23e68e86ad5f..24479e8cb8ff 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -2,4 +2,4 @@ DIST ffmpeg-2.8.6.tar.bz2 8582420 SHA256 40611e329bc354592c6f8f1deb033c31b91f80e DIST ffmpeg-2.8.7.tar.bz2 8581128 SHA256 8777ce4a335640fdd13680ba423ef6da330ff5071bfbe27cdbb452379167efe5 SHA512 26c7e50b76c89c606f4a3894c7c42bf1dc70b1778df879ba66723b0b29bfb7a206004bd3e9da29a27f57cf870ce395eb8b7ff1d53d7ba7b3c620d956b1c4cb06 WHIRLPOOL 361a3ef9c664b3b5f489b871071a1ce581cfef089a6a1014988e6c7463d45533d3a8af9b3e49ddb7e2257cef06205771d8e584a090d65e3c645421e963346a35 DIST ffmpeg-3.0.1.tar.bz2 8879122 SHA256 f7f7052c120f494dd501f96becff9b5a4ae10cfbde97bc2f1e9f0fd6613a4984 SHA512 417ceba9ca3e179ee0c3c4fead7c55f4b6f074bc156516dd61dae0bee0f8f7b2fe79c06c7aa7a748fecba48b8ff96cc4c24d395a833064f1962698ac5fd5a9ad WHIRLPOOL cbb28a851b6df518ae06d89b021a9363183c8b7c59a53125038fd7b32b4954dc1852edd35dde1d05c535631e13512652dea07e75d60b13992ee3653902ecfe9c DIST ffmpeg-3.0.2.tar.bz2 8883140 SHA256 30e3c77c2f4c358ed087869455a7496cbd7753a5e1b98d20ba49c1004009fd36 SHA512 67697334899b57efd6cfaebca1bb7450635034af34daae1caf77c57239116a7d2854eef3da967d3d1be4b89f346c79e970dc221543ab6181088172460807bc91 WHIRLPOOL f8aab8adb24a420bd6435454a84bc4a8e5068dea82a8282b4037470a9c9131f41d476dea0fdd9b659e9f91f2a835b19cc2bd9d70aa81bcbe861ec32ce954903a -DIST ffmpeg-3.1.tar.bz2 9329359 SHA256 2100fca81627e6cbe937fd6a071ae89277c02350538944b2b0c3c2cc71d9402a SHA512 7be60c27513d449d07bd06d6f78147a00113fa83411010fd49c23c71dc4c9647df3bb8d5e4577d53ef36b94741b27b6bf1ef4e0947484081fd199dee152de21d WHIRLPOOL 89755cdf4e9080df550827da20ee04838b89f7a550963795539ac4518aae58bacaf7d3fa981ef3b44ac63ad689262911626645cfabe833ff2e4a2ff4c00707dd +DIST ffmpeg-3.1.1.tar.bz2 9327512 SHA256 a5bca50a90a37b983eaa17c483a387189175f37ca678ae7e51d43e7610b4b3b4 SHA512 b5b4b2d518affa708b05f72201d5ac20446c88b5fb4dd8586cdc29d1132c678be94898e4f5ad27bef4ac987557305838133f45e94ff55d65f22a76f4f312888a WHIRLPOOL cb4cd3505a3b35f41023f6a87e3d724eed14e9c6e786bdc84d9e9c5c24d37ec0590ab130858107cd05c0522ceedd8e2d899b05a58d7cc52e384faaffe805dc13 diff --git a/media-video/ffmpeg/ffmpeg-3.1.ebuild b/media-video/ffmpeg/ffmpeg-3.1.1.ebuild similarity index 100% rename from media-video/ffmpeg/ffmpeg-3.1.ebuild rename to media-video/ffmpeg/ffmpeg-3.1.1.ebuild diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index fc635ad6f21b..6d08585ccaf7 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Fri, 01 Jul 2016 07:10:52 +0000 +Fri, 01 Jul 2016 12:40:46 +0000 diff --git a/metadata/glsa/glsa-201504-05.xml b/metadata/glsa/glsa-201504-05.xml index 4482ce493d83..538c65d03ca5 100644 --- a/metadata/glsa/glsa-201504-05.xml +++ b/metadata/glsa/glsa-201504-05.xml @@ -19,6 +19,7 @@ 10.0.16 + 5.5.49 10.0.16 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index fc635ad6f21b..6d08585ccaf7 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Fri, 01 Jul 2016 07:10:52 +0000 +Fri, 01 Jul 2016 12:40:46 +0000 diff --git a/metadata/md5-cache/app-emulation/libvirt-1.3.1-r1 b/metadata/md5-cache/app-emulation/libvirt-1.3.1-r1 deleted file mode 100644 index 5175b674611f..000000000000 --- a/metadata/md5-cache/app-emulation/libvirt-1.3.1-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test -DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=C toolkit to manipulate virtual machines -EAPI=5 -HOMEPAGE=http://www.libvirt.org/ -IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen -KEYWORDS=amd64 x86 -LICENSE=LGPL-2.1 -RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) -REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd ) -SLOT=0/1.3.1 -SRC_URI=http://libvirt.org/sources/libvirt-1.3.1.tar.gz -_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs e886935aae2b45a545665444ab0667cf user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=00f858b3b3a09d1bd95684d3a3c1342a diff --git a/metadata/md5-cache/app-emulation/libvirt-1.3.4 b/metadata/md5-cache/app-emulation/libvirt-1.3.4 deleted file mode 100644 index 74255a03a5ea..000000000000 --- a/metadata/md5-cache/app-emulation/libvirt-1.3.4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare setup test -DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=C toolkit to manipulate virtual machines -EAPI=5 -HOMEPAGE=http://www.libvirt.org/ -IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen -KEYWORDS=amd64 x86 -LICENSE=LGPL-2.1 -RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) -REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd ) -SLOT=0/1.3.4 -SRC_URI=http://libvirt.org/sources/libvirt-1.3.4.tar.gz -_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs e886935aae2b45a545665444ab0667cf user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=6cae3da2e54c71bf0b104a2bf5631bd0 diff --git a/metadata/md5-cache/app-emulation/libvirt-1.3.5-r1 b/metadata/md5-cache/app-emulation/libvirt-1.3.5-r1 index 2c0099fb02e6..57b8d3c6bb46 100644 --- a/metadata/md5-cache/app-emulation/libvirt-1.3.5-r1 +++ b/metadata/md5-cache/app-emulation/libvirt-1.3.5-r1 @@ -4,11 +4,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines EAPI=5 HOMEPAGE=http://www.libvirt.org/ IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=LGPL-2.1 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd ) SLOT=0/1.3.5 SRC_URI=http://libvirt.org/sources/libvirt-1.3.5.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs e886935aae2b45a545665444ab0667cf user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=1d26ad978e914a47e30530be2afaf92c +_md5_=45ca583145a1b73dbc7542c3cf7cc421 diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.43 b/metadata/md5-cache/app-officeext/ooofbtools-2.44 similarity index 99% rename from metadata/md5-cache/app-officeext/ooofbtools-2.43 rename to metadata/md5-cache/app-officeext/ooofbtools-2.44 index 0130710ab192..f09e7f4603f4 100644 --- a/metadata/md5-cache/app-officeext/ooofbtools-2.43 +++ b/metadata/md5-cache/app-officeext/ooofbtools-2.44 @@ -9,6 +9,6 @@ LICENSE=GPL-3 RDEPEND=dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) ) REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice ) SLOT=0 -SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.43.zip +SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.44.zip _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 office-ext-r1 60f5f222dd37820c823e1451bbd621cf toolchain-funcs e886935aae2b45a545665444ab0667cf _md5_=e0ad431f213c1ea83ec1763133660520 diff --git a/metadata/md5-cache/app-text/cherrytree-0.36.9-r1 b/metadata/md5-cache/app-text/cherrytree-0.37.0 similarity index 75% rename from metadata/md5-cache/app-text/cherrytree-0.36.9-r1 rename to metadata/md5-cache/app-text/cherrytree-0.37.0 index 0718df989c81..fd304cdc4934 100644 --- a/metadata/md5-cache/app-text/cherrytree-0.36.9-r1 +++ b/metadata/md5-cache/app-text/cherrytree-0.37.0 @@ -1,5 +1,5 @@ -DEFINED_PHASES=compile configure install postinst prepare setup test -DEPEND=x11-libs/libX11 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.16:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] nls? ( sys-devel/gettext ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=x11-libs/libX11 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.16:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] nls? ( sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] DESCRIPTION=A hierarchical note taking application EAPI=6 HOMEPAGE=http://www.giuspen.com/cherrytree @@ -9,6 +9,6 @@ LICENSE=GPL-3 RDEPEND=x11-libs/libX11 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.16:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] REQUIRED_USE=python_targets_python2_7 SLOT=0 -SRC_URI=https://github.com/giuspen/cherrytree/archive/0.36.9.tar.gz -> cherrytree-0.36.9.tar.gz -_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d fdo-mime 92d07846ea8ea54172f8c0112a47ae3d l10n e26ea0642846685782f1813642e7ff0f multilib d062ae4ba2fc40a19c11de2ad89b6616 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=e74f7e02334d8c4e55c85b945ab30d08 +SRC_URI=https://github.com/giuspen/cherrytree/archive/0.37.0.tar.gz -> cherrytree-0.37.0.tar.gz +_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d l10n e26ea0642846685782f1813642e7ff0f multilib d062ae4ba2fc40a19c11de2ad89b6616 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs e886935aae2b45a545665444ab0667cf xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 +_md5_=0d26f5c1a342f900e3c27f676b79a111 diff --git a/metadata/md5-cache/app-text/htmltidy-20090325-r2 b/metadata/md5-cache/app-text/htmltidy-20090325-r2 index 33b593de2c3c..e89d34d3b9ae 100644 --- a/metadata/md5-cache/app-text/htmltidy-20090325-r2 +++ b/metadata/md5-cache/app-text/htmltidy-20090325-r2 @@ -4,9 +4,9 @@ DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents EAPI=5 HOMEPAGE=http://tidy.sourceforge.net/ IUSE=debug doc static-libs -KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=GPL-2 SLOT=0 SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2 _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=26dd8c40127a007d3c4e7949485e21b6 +_md5_=07a68c8fbf583a1768396787bc112c9c diff --git a/metadata/md5-cache/dev-libs/sway-0.6 b/metadata/md5-cache/dev-libs/sway-0.8 similarity index 93% rename from metadata/md5-cache/dev-libs/sway-0.6 rename to metadata/md5-cache/dev-libs/sway-0.8 index d2185efbb4aa..b1b88ede1111 100644 --- a/metadata/md5-cache/dev-libs/sway-0.6 +++ b/metadata/md5-cache/dev-libs/sway-0.8 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 LICENSE=MIT RDEPEND=dev-libs/wlc[systemd=] dev-libs/json-c dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) SLOT=0 -SRC_URI=https://github.com/SirCmpwn/sway/archive/0.6.tar.gz -> sway-0.6.tar.gz +SRC_URI=https://github.com/SirCmpwn/sway/archive/0.8.tar.gz -> sway-0.8.tar.gz _eclasses_=cmake-utils ac5bd012586c6cf0d9826400d9de2830 eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=e17953a579ca224b96f858c9ec39c65b diff --git a/metadata/md5-cache/dev-libs/wlc-0.0.2 b/metadata/md5-cache/dev-libs/wlc-0.0.3 similarity index 93% rename from metadata/md5-cache/dev-libs/wlc-0.0.2 rename to metadata/md5-cache/dev-libs/wlc-0.0.3 index a6836af970a4..6c2b023ef670 100644 --- a/metadata/md5-cache/dev-libs/wlc-0.0.2 +++ b/metadata/md5-cache/dev-libs/wlc-0.0.3 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 LICENSE=MIT ZLIB RDEPEND=virtual/opengl media-libs/mesa[wayland,gbm,gles2,egl] x11-libs/libdrm x11-libs/pixman x11-libs/libxkbcommon dev-libs/libinput dev-libs/wayland X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/libXfixes ) systemd? ( sys-apps/systemd sys-apps/dbus ) SLOT=0 -SRC_URI=https://github.com/Cloudef/wlc/releases/download/v0.0.2/wlc-0.0.2.tar.bz2 +SRC_URI=https://github.com/Cloudef/wlc/releases/download/v0.0.3/wlc-0.0.3.tar.bz2 _eclasses_=cmake-utils ac5bd012586c6cf0d9826400d9de2830 eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=d98946c9d0998a6d91b33f8e4612f3f5 diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.3.1 b/metadata/md5-cache/dev-python/libvirt-python-1.3.1 deleted file mode 100644 index e0b78dbd8dfc..000000000000 --- a/metadata/md5-cache/dev-python/libvirt-python-1.3.1 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=app-emulation/libvirt:0/1.3.1 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] -DESCRIPTION=libvirt Python bindings -EAPI=5 -HOMEPAGE=http://www.libvirt.org -IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 -KEYWORDS=amd64 x86 -LICENSE=LGPL-2 -RDEPEND=app-emulation/libvirt:0/1.3.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] -REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) -RESTRICT=test -SLOT=0 -SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.3.1.tar.gz -_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=e42cda756da32b19a3a06d513a019822 diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.3.4 b/metadata/md5-cache/dev-python/libvirt-python-1.3.4 deleted file mode 100644 index 32f1ad366601..000000000000 --- a/metadata/md5-cache/dev-python/libvirt-python-1.3.4 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=app-emulation/libvirt:0/1.3.4 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] -DESCRIPTION=libvirt Python bindings -EAPI=5 -HOMEPAGE=http://www.libvirt.org -IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 -KEYWORDS=amd64 x86 -LICENSE=LGPL-2 -RDEPEND=app-emulation/libvirt:0/1.3.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] -REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) -RESTRICT=test -SLOT=0 -SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.3.4.tar.gz -_eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=e42cda756da32b19a3a06d513a019822 diff --git a/metadata/md5-cache/dev-python/libvirt-python-1.3.5 b/metadata/md5-cache/dev-python/libvirt-python-1.3.5 index 2fcb4d80949f..2461b8f7d334 100644 --- a/metadata/md5-cache/dev-python/libvirt-python-1.3.5 +++ b/metadata/md5-cache/dev-python/libvirt-python-1.3.5 @@ -4,7 +4,7 @@ DESCRIPTION=libvirt Python bindings EAPI=5 HOMEPAGE=http://www.libvirt.org IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=LGPL-2 RDEPEND=app-emulation/libvirt:0/1.3.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.3.5.tar.gz _eclasses_=distutils-r1 3a17743abcc9335483329f33c87b472d eutils 792f83d5ec9536cb5ccef375469d8bde multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=42bb13a23da097efe3ec195427c005f5 +_md5_=e42cda756da32b19a3a06d513a019822 diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 index 25f6d8d844a9..a277b9314688 100644 --- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 +++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 @@ -4,11 +4,11 @@ DESCRIPTION=W3C HTML Tidy library implemented as a Ruby extension EAPI=5 HOMEPAGE=https://github.com/carld/tidy IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test -KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 +KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 LICENSE=HTML-Tidy RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ) SLOT=0 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib d062ae4ba2fc40a19c11de2ad89b6616 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs e886935aae2b45a545665444ab0667cf versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=a3b99ceaa43f8b80a726d2a819542243 +_md5_=b680a7afc74c09e7e5ba9cd16f61ade6 diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.3.1 b/metadata/md5-cache/games-puzzle/tanglet-1.3.1 index 1ab82e4747b8..8f56c363930c 100644 --- a/metadata/md5-cache/games-puzzle/tanglet-1.3.1 +++ b/metadata/md5-cache/games-puzzle/tanglet-1.3.1 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 >=sys-apps/sed-4 +DEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 >=sys-apps/sed-4 DESCRIPTION=A single player word finding game based on Boggle EAPI=5 HOMEPAGE=http://gottcode.org/tanglet/ KEYWORDS=amd64 ~x86 LICENSE=GPL-3 -RDEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 games-misc/games-envd +RDEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 games-misc/games-envd SLOT=0 SRC_URI=http://gottcode.org/tanglet/tanglet-1.3.1-src.tar.bz2 _eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde games 2cf0d67d765e6358b435ccda30c13ad8 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib d062ae4ba2fc40a19c11de2ad89b6616 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs e886935aae2b45a545665444ab0667cf user 906f3c8eb3a2350a4f1191a89baa3e46 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=89dc80a1147eec7860d9f2490cc242a3 +_md5_=1b42386a3c0f2e1c70f64679da5f13f8 diff --git a/metadata/md5-cache/media-libs/gd-2.2.2 b/metadata/md5-cache/media-libs/gd-2.2.2 index fe6d80248c41..7dea5ed4ecb3 100644 --- a/metadata/md5-cache/media-libs/gd-2.2.2 +++ b/metadata/md5-cache/media-libs/gd-2.2.2 @@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation EAPI=6 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/ IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris LICENSE=gd IJG HPND BSD RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) REQUIRED_USE=prefix? ( fontconfig ) SLOT=2/3 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.2/libgd-2.2.2.tar.xz _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=10181015ff4160249c842c7c53b47dd0 +_md5_=9faffbae06559f4d46b02524014e7db4 diff --git a/metadata/md5-cache/media-video/ffmpeg-3.1 b/metadata/md5-cache/media-video/ffmpeg-3.1.1 similarity index 99% rename from metadata/md5-cache/media-video/ffmpeg-3.1 rename to metadata/md5-cache/media-video/ffmpeg-3.1.1 index dbc43097356b..59c0d9e23cda 100644 --- a/metadata/md5-cache/media-video/ffmpeg-3.1 +++ b/metadata/md5-cache/media-video/ffmpeg-3.1.1 @@ -10,6 +10,6 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) RESTRICT=encode? ( faac? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) SLOT=0/55.57.57 -SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.1.tar.bz2 +SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.1.1.tar.bz2 _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs e886935aae2b45a545665444ab0667cf _md5_=68991b0f6fa3a32a8f4b3de56c8fe4d8 diff --git a/metadata/md5-cache/net-im/jabberd2-2.3.3-r2 b/metadata/md5-cache/net-im/jabberd2-2.3.3-r2 index cd2904156afd..e549a73e6bf9 100644 --- a/metadata/md5-cache/net-im/jabberd2-2.3.3-r2 +++ b/metadata/md5-cache/net-im/jabberd2-2.3.3-r2 @@ -4,7 +4,7 @@ DESCRIPTION=Open Source Jabber Server EAPI=5 HOMEPAGE=http://jabberd2.org IUSE=berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib -KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd +KEYWORDS=amd64 ~ppc ~sparc x86 ~x86-fbsd LICENSE=GPL-2 RDEPEND=dev-libs/expat net-libs/udns net-dns/libidn virtual/gsasl berkdb? ( >=sys-libs/db-4.1.25:* ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 ) zlib? ( sys-libs/zlib ) >=net-im/jabber-base-0.01 REQUIRED_USE=memdebug? ( debug ) @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/jabberd2/jabberd2/releases/download/jabberd-2.3.3/jabberd-2.3.3.tar.xz _eclasses_=db-use a4966c7f4f7df444ead1212848c13cc9 eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 toolchain-funcs e886935aae2b45a545665444ab0667cf versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=593234e2d4a4264bc6608ef529b2ad9a +_md5_=8a97115d6b9cd3e93b26afe0ce4df9f4 diff --git a/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2 b/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2 index 14eb04fcc873..488a08ffe72a 100644 --- a/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2 +++ b/metadata/md5-cache/sys-cluster/ceph-9.2.1-r2 @@ -4,11 +4,11 @@ DESCRIPTION=Ceph distributed filesystem EAPI=5 HOMEPAGE=http://ceph.com/ IUSE=babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs python_targets_python2_7 -KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 LICENSE=LGPL-2.1 RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sys-apps/hdparm dev-python/flask[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] REQUIRED_USE=python_targets_python2_7 ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) SLOT=0 SRC_URI=http://ceph.com/download/ceph-9.2.1.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs e886935aae2b45a545665444ab0667cf udev 73058269b3e70e34e084fa3981282338 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=47eb890393035e190f71daf54a6d0769 +_md5_=a5fda3c8bf7e4326343caaf5245bb4b7 diff --git a/metadata/md5-cache/www-client/conkeror-1.0_pre20141005 b/metadata/md5-cache/www-client/conkeror-1.0.3 similarity index 74% rename from metadata/md5-cache/www-client/conkeror-1.0_pre20141005 rename to metadata/md5-cache/www-client/conkeror-1.0.3 index 4bcb25a808ba..e80eef92a7d8 100644 --- a/metadata/md5-cache/www-client/conkeror-1.0_pre20141005 +++ b/metadata/md5-cache/www-client/conkeror-1.0.3 @@ -1,11 +1,11 @@ DEFINED_PHASES=compile install postinst postrm unpack DESCRIPTION=A Mozilla-based web browser whose design is inspired by GNU Emacs -EAPI=5 +EAPI=6 HOMEPAGE=http://conkeror.org/ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0 RDEPEND=|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 ) SLOT=0 -SRC_URI=https://dev.gentoo.org/~ulm/distfiles/conkeror-1.0_pre20141005.tar.gz https://dev.gentoo.org/~ulm/distfiles/conkeror.png +SRC_URI=https://dev.gentoo.org/~ulm/distfiles/conkeror-1.0.3.tar.xz https://dev.gentoo.org/~ulm/distfiles/conkeror.png _eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde fdo-mime 92d07846ea8ea54172f8c0112a47ae3d multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=ad0ea19f4cb53b705e397abbc29ed986 +_md5_=c6c542c882e3d61bf828ba8e67d5c44e diff --git a/metadata/md5-cache/www-client/conkeror-1.0_pre20150227 b/metadata/md5-cache/www-client/conkeror-1.0_pre20150227 deleted file mode 100644 index 6755f90da321..000000000000 --- a/metadata/md5-cache/www-client/conkeror-1.0_pre20150227 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm unpack -DESCRIPTION=A Mozilla-based web browser whose design is inspired by GNU Emacs -EAPI=5 -HOMEPAGE=http://conkeror.org/ -KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0 -RDEPEND=|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 ) -SLOT=0 -SRC_URI=https://dev.gentoo.org/~ulm/distfiles/conkeror-1.0_pre20150227.tar.gz https://dev.gentoo.org/~ulm/distfiles/conkeror.png -_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde fdo-mime 92d07846ea8ea54172f8c0112a47ae3d multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf -_md5_=8af4be9b6271431d880fd5b666d820a3 diff --git a/metadata/md5-cache/x11-misc/gpaste-3.18.3 b/metadata/md5-cache/x11-misc/gpaste-3.18.3 index 54d989c362f3..e62d58333133 100644 --- a/metadata/md5-cache/x11-misc/gpaste-3.18.3 +++ b/metadata/md5-cache/x11-misc/gpaste-3.18.3 @@ -1,5 +1,5 @@ DEFINED_PHASES=configure install postinst postrm preinst prepare unpack -DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.46.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/gtk+-3.18:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) dev-util/intltool virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 +DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.46.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/gtk+-3.18:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) dev-util/intltool virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] ) ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 DESCRIPTION=Clipboard management system EAPI=5 HOMEPAGE=https://github.com/Keruspe/GPaste @@ -10,4 +10,4 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46:2 >=dev-libs/gobject-intros SLOT=0 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.18.3.tar.gz -> gpaste-3.18.3.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf vala 7541b78609c301de4ea866a8cc1b53a6 vcs-snapshot b45be87e7012be0af8424e8a5644da1d xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=91f931397e76cb22c8ed2c54152b246d +_md5_=bf63406815742afcb3c283303dd8a654 diff --git a/metadata/md5-cache/x11-misc/gpaste-3.20.3 b/metadata/md5-cache/x11-misc/gpaste-3.20.3 index 25103e6662b8..f8e1bf853389 100644 --- a/metadata/md5-cache/x11-misc/gpaste-3.20.3 +++ b/metadata/md5-cache/x11-misc/gpaste-3.20.3 @@ -1,5 +1,5 @@ DEFINED_PHASES=configure install postinst postrm preinst prepare unpack -DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) dev-util/intltool virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 +DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) dev-util/intltool virtual/pkgconfig vala? ( || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] ) ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 DESCRIPTION=Clipboard management system EAPI=5 HOMEPAGE=https://github.com/Keruspe/GPaste @@ -10,4 +10,4 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-intros SLOT=0 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.20.3.tar.gz -> gpaste-3.20.3.tar.gz _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs e886935aae2b45a545665444ab0667cf vala 7541b78609c301de4ea866a8cc1b53a6 vcs-snapshot b45be87e7012be0af8424e8a5644da1d xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=5d1b27803aed36527b0f679912c91ff9 +_md5_=1ed035f22835289b4af8ac43600e0117 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index fc635ad6f21b..6d08585ccaf7 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Fri, 01 Jul 2016 07:10:52 +0000 +Fri, 01 Jul 2016 12:40:46 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 47c5b0abb50d..bf73cb46c275 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Fri Jul 1 07:09:57 UTC 2016 +Fri Jul 1 12:39:51 UTC 2016 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 0fb8d83923eb..a553f1f4fadd 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Fri, 01 Jul 2016 07:30:01 +0000 +Fri, 01 Jul 2016 13:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 7f1ded457536..39119904f47f 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1467357001 Fri 01 Jul 2016 07:10:01 AM UTC +1467376801 Fri 01 Jul 2016 12:40:01 PM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index fc635ad6f21b..6d08585ccaf7 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Fri, 01 Jul 2016 07:10:52 +0000 +Fri, 01 Jul 2016 12:40:46 +0000 diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild index 1389115fcb12..96337dd786b5 100644 --- a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild +++ b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/ja LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd" IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib" REQUIRED_USE="memdebug? ( debug )" diff --git a/profiles/package.mask b/profiles/package.mask index 7b980f16ec9a..ba32a7d4d09f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,16 @@ #--- END OF EXAMPLES --- +# Michał Górny (1 Jul 2016) +# Unmaintained upstream, superseded by gnome-base/gnome-shell built-in +# recording capabilities. Removal in 30 days, #587494. +media-video/istanbul + +# Michał Górny (1 Jul 2016) +# No maintainer, multiple QA violations, dead upstream since 2011. +# Removal in 30 days, #587278. +net-misc/mknbi + # Hans de Graaff (1 Jul 2016) # With the release of Rails 5.0 versions older than 4.2 are no longer # supported. Mask Rails 3.2 and related packages for removal in 30 days. diff --git a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild index 494094e8e251..6f0e932eed68 100644 --- a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild +++ b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild @@ -14,7 +14,7 @@ if [[ $PV = *9999* ]]; then else SRC_URI="http://ceph.com/download/${P}.tar.gz" fi -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd versionator ${scm_eclass} diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest index 753c2b22bb88..8eedfcf46be8 100644 --- a/www-client/conkeror/Manifest +++ b/www-client/conkeror/Manifest @@ -1,5 +1,4 @@ +DIST conkeror-1.0.3.tar.xz 243360 SHA256 ee85cea9a46602fd6b3fb0a937016df45721617e8af96fb6837a97243e8476a1 SHA512 ce5fae1037fbadc639f5bdf37c627dd03f32a2a41db40aa640348f4a8c63e8775d4fa90f06a5488133e5739e7e64a60e2a3de11de389b67290eddf12628f4e5a WHIRLPOOL fa928c44b49f8e95904725359c070c8b0fc3581a05d735bb899ac67a771d2979584d4f244fa033c5506ceacdad1d384602166d3a12e4b9842d8ff22d773f0e60 DIST conkeror-1.0_pre20140212.tar.gz 310931 SHA256 ecc434ed3c7703fe78c3413402ebb8b0ad7453d3ac65345a5ece329f615b0d32 SHA512 08174a50b5aca69a76ee1686c460cd62bc51d75030c067202be5acb947e6ebfb209adf5797be0096256eef913e688c401cdccd5afa1e738390458b244378c41e WHIRLPOOL 25c6eeb676d3e4238d27884b13bc298dd263811bbc19df3afbf833c5359283bb40a15e63725dbc2d7f9b990963fde4c1e070c1f44a06132b99ca2d6d951bb0cb -DIST conkeror-1.0_pre20141005.tar.gz 313907 SHA256 46bd153cd98381ab2f073af984a00aa0b2b612b587136b092efa3909e2bb5f28 SHA512 229c21e3001dd54a7e5c23db0458052c2c559ee45e851fff1d7db61b1fd7893d7c0ec53159b333a7908c356f025a8e9e01f9ef608cffd7b3dd0c01c07eac754d WHIRLPOOL 20d6198441c1ca03419ada61611f08711ffcd6cfc13f39c7bda889396643713bfc31937aa85ca60399b6dadc944e13fc7c662fce68b7fd6507dec93b536dad88 -DIST conkeror-1.0_pre20150227.tar.gz 314449 SHA256 b0da5b9215d730fe997156cdbd010fe8a738fd5c9bbe8facf7e33e2abd3229da SHA512 01f10f1b2c26b7f6a1cd6871c103d977e9df5a57a447e778e55491e420183f1c6522792515e4e6ea05f3bf9db4612af4fa67c4c07152aa71f8704fda9c595485 WHIRLPOOL a11e56eba16f8ac40e0d0f598f87169445513d2309fb1125cafc8e37ca3b4111c0f4fb532a331a57e6d071c6126efc6e69ff228f2af766e57984c73508b0b523 DIST conkeror-1.0_pre20150519.tar.xz 242676 SHA256 8fdbb65acf44ea71b98449ec6540bd58ba90e4ab052fa43c07209a0e318819ce SHA512 49a3758baeb38c238aca253df0938cf308f6403d4237013dc23e9255affa23d516d1edb6fed31b0f705173e6441294d6602d575cfaeb3bb947ae7d0ac1cbaee9 WHIRLPOOL cc759843951c531d4899dba35dee5cec4acb504dd442e8fd0550d8f98bb526eb383ed889c889339a965071db64a5687d11b6b8a9e2167c06f4959db5dcbfc352 DIST conkeror.png 5105 SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667 SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f WHIRLPOOL 3fe3ea1f7f1caaa737ed3777b6b8cb6e10f971b5853a0a89de65c78e75323e8f01f01ea46d01fbff47dd97452e7a114b353322b4d8764a4d2bacf755c8fa3c66 diff --git a/www-client/conkeror/conkeror-1.0_pre20150227.ebuild b/www-client/conkeror/conkeror-1.0.3.ebuild similarity index 87% rename from www-client/conkeror/conkeror-1.0_pre20150227.ebuild rename to www-client/conkeror/conkeror-1.0.3.ebuild index 6850008f4c45..cf493bda4821 100644 --- a/www-client/conkeror/conkeror-1.0_pre20150227.ebuild +++ b/www-client/conkeror/conkeror-1.0.3.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs fdo-mime DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs" HOMEPAGE="http://conkeror.org/" -# snapshot from http://repo.or.cz/w/conkeror.git +# snapshot from git://repo.or.cz/conkeror.git # conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz +SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz https://dev.gentoo.org/~ulm/distfiles/${PN}.png" # CC-BY-SA-3.0 for conkeror.png @@ -23,7 +23,7 @@ RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )" S="${WORKDIR}/${PN}" src_unpack() { - unpack ${P}.tar.gz + unpack ${P}.tar.xz cp "${DISTDIR}/${PN}.png" . || die } @@ -47,7 +47,7 @@ src_install() { doicon "${WORKDIR}/conkeror.png" doman contrib/man/conkeror.1 - dodoc CREDITS + dodoc CREDITS README } pkg_postinst() { diff --git a/www-client/conkeror/conkeror-1.0_pre20141005.ebuild b/www-client/conkeror/conkeror-1.0_pre20141005.ebuild deleted file mode 100644 index 579d8a8ac6cf..000000000000 --- a/www-client/conkeror/conkeror-1.0_pre20141005.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs fdo-mime - -DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs" -HOMEPAGE="http://conkeror.org/" -# snapshot from http://repo.or.cz/w/conkeror.git -# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz - https://dev.gentoo.org/~ulm/distfiles/${PN}.png" - -# CC-BY-SA-3.0 for conkeror.png -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )" - -S="${WORKDIR}/${PN}" - -src_unpack() { - unpack ${P}.tar.gz - cp "${DISTDIR}/${PN}.png" . || die -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - insinto /usr/share/${PN} - doins -r branding chrome components content defaults help locale modules \ - search-engines style tests - doins application.ini *.manifest Info.plist - - exeinto /usr/libexec/${PN} - doexe conkeror-spawn-helper - dosym ../../libexec/${PN}/conkeror-spawn-helper \ - /usr/share/${PN}/conkeror-spawn-helper - - newbin "${FILESDIR}/conkeror-r2.sh" conkeror - domenu "${FILESDIR}/conkeror.desktop" - doicon "${WORKDIR}/conkeror.png" - - doman contrib/man/conkeror.1 - dodoc CREDITS -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/x11-misc/gpaste/gpaste-3.18.3.ebuild b/x11-misc/gpaste/gpaste-3.18.3.ebuild index f84b180a7718..b7cb042b50e9 100644 --- a/x11-misc/gpaste/gpaste-3.18.3.ebuild +++ b/x11-misc/gpaste/gpaste-3.18.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 +VALA_MIN_API_VERSION="0.30" VALA_USE_DEPEND="vapigen" inherit eutils autotools gnome2-utils vala vcs-snapshot diff --git a/x11-misc/gpaste/gpaste-3.20.3.ebuild b/x11-misc/gpaste/gpaste-3.20.3.ebuild index 227ca8d2096b..277eb6742890 100644 --- a/x11-misc/gpaste/gpaste-3.20.3.ebuild +++ b/x11-misc/gpaste/gpaste-3.20.3.ebuild @@ -4,6 +4,7 @@ EAPI=5 +VALA_MIN_API_VERSION="0.30" VALA_USE_DEPEND="vapigen" inherit eutils autotools gnome2-utils vala vcs-snapshot