diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0a7b9ae73079..97b7a0ffa24d 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 13f00bdff1ee..65152cbac062 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/dev-libs/boost-numpy/Manifest b/acct-group/sogo/Manifest
similarity index 100%
rename from dev-libs/boost-numpy/Manifest
rename to acct-group/sogo/Manifest
diff --git a/acct-group/sogo/metadata.xml b/acct-group/sogo/metadata.xml
new file mode 100644
index 000000000000..0cda0292b585
--- /dev/null
+++ b/acct-group/sogo/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnustep@gentoo.org
+ Gentoo GNUstep Project
+
+
diff --git a/acct-group/sogo/sogo-0.ebuild b/acct-group/sogo/sogo-0.ebuild
new file mode 100644
index 000000000000..8191b7e3ac4a
--- /dev/null
+++ b/acct-group/sogo/sogo-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for gnustep-apps/sogo"
+ACCT_GROUP_ID=475
diff --git a/acct-group/x2goprint/Manifest b/acct-group/x2goprint/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/x2goprint/metadata.xml b/acct-group/x2goprint/metadata.xml
new file mode 100644
index 000000000000..e7a96b9df4ec
--- /dev/null
+++ b/acct-group/x2goprint/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ voyageur@gentoo.org
+ Bernard Cafarelli
+
+
diff --git a/acct-group/x2goprint/x2goprint-0.ebuild b/acct-group/x2goprint/x2goprint-0.ebuild
new file mode 100644
index 000000000000..21c15f4074f2
--- /dev/null
+++ b/acct-group/x2goprint/x2goprint-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=292
diff --git a/acct-group/x2gouser/Manifest b/acct-group/x2gouser/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/x2gouser/metadata.xml b/acct-group/x2gouser/metadata.xml
new file mode 100644
index 000000000000..e7a96b9df4ec
--- /dev/null
+++ b/acct-group/x2gouser/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ voyageur@gentoo.org
+ Bernard Cafarelli
+
+
diff --git a/acct-group/x2gouser/x2gouser-0.ebuild b/acct-group/x2gouser/x2gouser-0.ebuild
new file mode 100644
index 000000000000..e614228b4b7d
--- /dev/null
+++ b/acct-group/x2gouser/x2gouser-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-misc/x2goserver"
+ACCT_GROUP_ID=291
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 766e01ba4d64..d67af2a8b021 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/sogo/Manifest b/acct-user/sogo/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/sogo/metadata.xml b/acct-user/sogo/metadata.xml
new file mode 100644
index 000000000000..0cda0292b585
--- /dev/null
+++ b/acct-user/sogo/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnustep@gentoo.org
+ Gentoo GNUstep Project
+
+
diff --git a/acct-user/sogo/sogo-0.ebuild b/acct-user/sogo/sogo-0.ebuild
new file mode 100644
index 000000000000..23b8230d7c51
--- /dev/null
+++ b/acct-user/sogo/sogo-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for gnustep-apps/sogo"
+ACCT_USER_ID=475
+ACCT_USER_GROUPS=( sogo )
+ACCT_USER_HOME="/var/lib/sogo"
+ACCT_USER_SHELL=/bin/bash
+
+acct-user_add_deps
diff --git a/acct-user/x2goprint/Manifest b/acct-user/x2goprint/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/x2goprint/metadata.xml b/acct-user/x2goprint/metadata.xml
new file mode 100644
index 000000000000..e7a96b9df4ec
--- /dev/null
+++ b/acct-user/x2goprint/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ voyageur@gentoo.org
+ Bernard Cafarelli
+
+
diff --git a/acct-user/x2goprint/x2goprint-0.ebuild b/acct-user/x2goprint/x2goprint-0.ebuild
new file mode 100644
index 000000000000..0efc65cb0bd4
--- /dev/null
+++ b/acct-user/x2goprint/x2goprint-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=292
+ACCT_USER_GROUPS=( x2goprint )
+ACCT_USER_HOME="/var/spool/x2goprint"
+
+acct-user_add_deps
diff --git a/acct-user/x2gouser/Manifest b/acct-user/x2gouser/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/x2gouser/metadata.xml b/acct-user/x2gouser/metadata.xml
new file mode 100644
index 000000000000..e7a96b9df4ec
--- /dev/null
+++ b/acct-user/x2gouser/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ voyageur@gentoo.org
+ Bernard Cafarelli
+
+
diff --git a/acct-user/x2gouser/x2gouser-0.ebuild b/acct-user/x2gouser/x2gouser-0.ebuild
new file mode 100644
index 000000000000..d2b9b79803e4
--- /dev/null
+++ b/acct-user/x2gouser/x2gouser-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-misc/x2goserver"
+ACCT_USER_ID=291
+ACCT_USER_GROUPS=( x2gouser )
+ACCT_USER_HOME="/var/lib/x2go"
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d83b3ca0500e..8715ce0cee6f 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 2641d910106a..71b725f3c031 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,6 +1,2 @@
-DIST puppet-agent_6.10.1-1stretch_amd64.deb 19712026 BLAKE2B 82f5d9d18a3171b230d0e6027b9b8409b51096e12c5fd88844643320a0f5f654bc79880b35565571a6367a2d95f7a8f90ac811c2df1f1ec6c1866508c7e112e0 SHA512 8b289f8690fb67d353bc004a281e3e32a118048523bb6c743fa8ff46f2583c155ddffc22a7898662b598128f5ef75d77fd9a99b43c4afb72a23a2bfa3959f0c6
-DIST puppet-agent_6.10.1-1stretch_i386.deb 20055310 BLAKE2B 31bb9bd40f5098b666d911545b565654d84a422625536eff954256851089d211ea2660dbdab7b73df370efc0bbc41875617df3012ee734ec586af87967e8bc02 SHA512 33348839a245bcda4c76feae214d72bb36c1959c1b6f5f9c2db084ad1bb0018393ab6bd94e16ed987a23b2f253baf31f1df0453ead1cc6860941954ff31930c2
DIST puppet-agent_6.11.1-1stretch_amd64.deb 19948710 BLAKE2B 256588922cfacb1d8146cd1142c43d893a55dfb67d7f70ca311df6178e7f9a82a0702d8306e0575d3f817e53c091fd3010027512cb4ce95956bdfa968372cc21 SHA512 90c39d55a8761185f82c9ac106d696ae48a170679e6043b6b3db32254e918b1b9c1b32c4e9721e5751189f84f002415f21a627daa22738a8c1ae3cb5df514eb3
DIST puppet-agent_6.11.1-1stretch_i386.deb 20327410 BLAKE2B c2a105139df97395f54bb54d7ac971d914dcd3b69614dca55fe443d9fe5360118b899610a6d2d85b96b8b45715864df608d0783a3aabad3a2ae5555a0d510a2e SHA512 5d1173534beb53325d3c7c2fd500a7bd82a389fa8cbc9e867f6acbb6c2647190339d3b096e8a054aff268f27c5bd7de65c371a474b9c8263e8fa36bab75452bd
-DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
-DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
diff --git a/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild
deleted file mode 100644
index c648209a4a7e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- app-portage/eix
- sys-apps/dmidecode
- sys-libs/glibc
- sys-libs/readline:0/7
- sys-libs/ncurses:0[tinfo]
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/pxp-agent
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/pxp-agent
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- systemd_dounit lib/systemd/system/puppet.service
- systemd_dounit lib/systemd/system/pxp-agent.service
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
deleted file mode 100644
index c648209a4a7e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- app-portage/eix
- sys-apps/dmidecode
- sys-libs/glibc
- sys-libs/readline:0/7
- sys-libs/ncurses:0[tinfo]
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/pxp-agent
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/pxp-agent
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- systemd_dounit lib/systemd/system/puppet.service
- systemd_dounit lib/systemd/system/pxp-agent.service
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 2a3030162f43..0fc04e5dd331 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,7 +1,4 @@
DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56
DIST puppet-6.11.1.tar.gz 2816525 BLAKE2B c4b188d5bf76b70a2748b86df78f1ca6ab99951cbc3a16377d3f2d38e165bc78ef8e5648cb09264a25ae81ac4d379b9323b1f2bbdea6679292c2cf38cabee662 SHA512 f44196206331448651e0ff0e865b09c6ccbb19115edeba4c58c8a29aa35e7d76676d5a3cb35c51cd511a44115c9c9434f1f90d5cbb0a5551a4004741d305c879
-DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
deleted file mode 100644
index 75759e0d00b6..000000000000
--- a/app-admin/puppet/puppet-5.5.14.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- >=dev-ruby/facter-3.0.0
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
- # can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
-
- # fix systemd path
- epatch "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- insinto /usr/lib/systemd/system
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
-
- for v in ${REPLACING_VERSIONS}; do
- if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
- elog
- elog "Please see the following url for the release notes for puppet-5"
- elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
- elog
- fi
- done
-}
diff --git a/app-admin/puppet/puppet-5.5.16.ebuild b/app-admin/puppet/puppet-5.5.16.ebuild
deleted file mode 100644
index b28efbe22bd9..000000000000
--- a/app-admin/puppet/puppet-5.5.16.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- >=dev-ruby/facter-3.0.0
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
- # can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
-
- # fix systemd path
- epatch "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- insinto /usr/lib/systemd/system
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
-
- for v in ${REPLACING_VERSIONS}; do
- if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
- elog
- elog "Please see the following url for the release notes for puppet-5"
- elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
- elog
- fi
- done
-}
diff --git a/app-admin/puppet/puppet-6.11.1.ebuild b/app-admin/puppet/puppet-6.11.1.ebuild
index 2fac345af4a8..477c81270a05 100644
--- a/app-admin/puppet/puppet-6.11.1.ebuild
+++ b/app-admin/puppet/puppet-6.11.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppet/puppet-6.9.0-r1.ebuild b/app-admin/puppet/puppet-6.9.0-r1.ebuild
deleted file mode 100644
index 3b0aed940aba..000000000000
--- a/app-admin/puppet/puppet-6.9.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- dev-ruby/semantic_puppet
- >=dev-ruby/facter-3.0.0
- dev-ruby/concurrent-ruby
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
- # can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
-
- # fix systemd path
- epatch "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- insinto /usr/lib/systemd/system
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
- elog "not already done so."
- elog
-}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index d90c2464fb20..52de874631a2 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,3 +1 @@
-DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
-DIST puppetdb-6.7.1.tar.gz 43563417 BLAKE2B 902397b2bedb64f4ccb2d6932d6dbfb7d67c479640fb8429aecf3de558ce31ab0017175f183ee3e66268d802fc9901f5473271b6598414a7b57182bc1788f1e3 SHA512 58c6f3db268885e603bb1219f89c2aeb237c042fe7eccc95ce5622cfc739f971d9d37e0cc37cae335552d0d9845fccfd9425381faf6ec3534b20991bd9f7db0e
DIST puppetdb-6.7.2.tar.gz 43566885 BLAKE2B b90376330cb084c2c14154d647ce334673c526e6f9b9d4430e0be4b420132a0c4c518a0c8ed98b15cfacc6716044f78c384123f3ff87ea1463736a352744b840 SHA512 2e32f7a5a3daf37d74082aa3a66c26fa23643e456dbf80cd16815687f289093c96defc9bfa10c3502f9a9f9a7674cef83b838163f11339c13d4b12c82f8e0664
diff --git a/app-admin/puppetdb/puppetdb-6.6.0.ebuild b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
deleted file mode 100644
index 77d1c1ca9cc4..000000000000
--- a/app-admin/puppetdb/puppetdb-6.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppetdb
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.7.1.ebuild b/app-admin/puppetdb/puppetdb-6.7.1.ebuild
deleted file mode 100644
index 77d1c1ca9cc4..000000000000
--- a/app-admin/puppetdb/puppetdb-6.7.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppetdb
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.7.2.ebuild b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.7.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+=">=virtual/jdk-1.8.0"
DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 0ec37aeabf71..cf8e7bbd5d64 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1 @@
-DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
-DIST puppetserver-6.7.1.tar.gz 59202711 BLAKE2B 9f88617811d05dc09ee568b40ff332f88e44998916df6d2c88a268fe443d35b62e4d94816acc49a87dd355925bb13e99f8694596831423013b96119a4e1a0727 SHA512 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df
DIST puppetserver-6.7.2.tar.gz 59340246 BLAKE2B 635312cb2ea2f638617c10e05b9e1e8efa58caf3da8786155f44081f040a7b167d923e2266c57b43d855feb4bfd5280da85b5100a188e7f0f7dfde847f5abc45 SHA512 e2015554648dc861d513b5778c274e2b09c4ea2ebd53141d152a5bba1046ac6ef163083296c176008a7606581b8368df99aa72907e0edd59e687aa9991209fb5
diff --git a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
deleted file mode 100644
index 19d3602bfcbc..000000000000
--- a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
- >=virtual/jdk-1.8.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- insinto /opt/puppetlabs/server/apps/puppetserver
- insopts -m0774
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppet-server-release.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/services.d
- doins ext/system-config/services.d/bootstrap.cfg
- doins ext/config/services.d/ca.cfg
- insinto /etc/puppetlabs/puppetserver/conf.d
- doins ext/config/conf.d/puppetserver.conf
- doins ext/config/conf.d/auth.conf
- doins ext/config/conf.d/global.conf
- doins ext/config/conf.d/web-routes.conf
- doins ext/config/conf.d/metrics.conf
- doins ext/config/conf.d/webserver.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
- doins ext/cli/ca
- doins ext/cli/irb
- doins ext/cli/foreground
- doins ext/cli/gem
- doins ext/cli/ruby
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetserver/cli
- doins ext/cli_defaults/cli-defaults.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/bin
- doins ext/bin/puppetserver
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
- # other sys stuff
- dodir /etc/puppetlabs/code
- # needed for systemd
- dodir /var/log/puppetlabs/puppetserver
- dodir /etc/puppetlabs/puppet/ssl
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
- fperms -R 771 /etc/puppetlabs/puppet/ssl
- # systemd type things
- insinto /etc/systemd/system/puppetserver.service.d/
- systemd_dounit ext/redhat/puppetserver.service
- insinto /etc/default
- newins ext/default puppetserver
- # normal init type tasks
- dosym ../default/puppetserver /etc/conf.d/puppetserver
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetserver.logrotate.conf puppetserver
- # cleanup
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
- fowners -R puppet:puppet /opt/puppetlabs/server/data
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver
- fperms -R 700 /var/log/puppetlabs/puppetserver
- insinto /opt/puppetlabs/server/data
- doins ext/build-scripts/jruby-gem-list.txt
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt
- insopts -m 0644
- insinto /usr/lib/tmpfiles.d
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
- elog "to install you may want to run the following:"
- elog
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
- elog "puppet config set --section master codedir /etc/puppetlabs/code"
- elog
- elog "# install puppetserver gems"
- elog "cd /opt/puppetlabs/server/apps/puppetserver"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.7.1.ebuild b/app-admin/puppetserver/puppetserver-6.7.1.ebuild
deleted file mode 100644
index 19d3602bfcbc..000000000000
--- a/app-admin/puppetserver/puppetserver-6.7.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
- >=virtual/jdk-1.8.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- insinto /opt/puppetlabs/server/apps/puppetserver
- insopts -m0774
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppet-server-release.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/services.d
- doins ext/system-config/services.d/bootstrap.cfg
- doins ext/config/services.d/ca.cfg
- insinto /etc/puppetlabs/puppetserver/conf.d
- doins ext/config/conf.d/puppetserver.conf
- doins ext/config/conf.d/auth.conf
- doins ext/config/conf.d/global.conf
- doins ext/config/conf.d/web-routes.conf
- doins ext/config/conf.d/metrics.conf
- doins ext/config/conf.d/webserver.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
- doins ext/cli/ca
- doins ext/cli/irb
- doins ext/cli/foreground
- doins ext/cli/gem
- doins ext/cli/ruby
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetserver/cli
- doins ext/cli_defaults/cli-defaults.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/bin
- doins ext/bin/puppetserver
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
- # other sys stuff
- dodir /etc/puppetlabs/code
- # needed for systemd
- dodir /var/log/puppetlabs/puppetserver
- dodir /etc/puppetlabs/puppet/ssl
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
- fperms -R 771 /etc/puppetlabs/puppet/ssl
- # systemd type things
- insinto /etc/systemd/system/puppetserver.service.d/
- systemd_dounit ext/redhat/puppetserver.service
- insinto /etc/default
- newins ext/default puppetserver
- # normal init type tasks
- dosym ../default/puppetserver /etc/conf.d/puppetserver
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetserver.logrotate.conf puppetserver
- # cleanup
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
- fowners -R puppet:puppet /opt/puppetlabs/server/data
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver
- fperms -R 700 /var/log/puppetlabs/puppetserver
- insinto /opt/puppetlabs/server/data
- doins ext/build-scripts/jruby-gem-list.txt
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt
- insopts -m 0644
- insinto /usr/lib/tmpfiles.d
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
- elog "to install you may want to run the following:"
- elog
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
- elog "puppet config set --section master codedir /etc/puppetlabs/code"
- elog
- elog "# install puppetserver gems"
- elog "cd /opt/puppetlabs/server/apps/puppetserver"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.7.2.ebuild b/app-admin/puppetserver/puppetserver-6.7.2.ebuild
index 45ac7ad8e73d..19d3602bfcbc 100644
--- a/app-admin/puppetserver/puppetserver-6.7.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.7.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2547cd943cb1..e52ff6e5f022 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index b49501c4ef34..421d23856006 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,6 +1,3 @@
-DIST rarlinux-5.7.1_p20190427.tar.gz 559019 BLAKE2B 34da59809bbd846ea8a4fc90daed48e18efacafecf4b254e5b40b549ea172f7a399e5dd038d84427430d35392b8c3713921496f46bb9d9ea2e603938cac543c5 SHA512 9819e31cbc016aafdbb6b127b3a9ce427ead65bb0ac685ca0ede5fe1e27626054c2f0e3188b22fb9e4235780bac67f5b514178137891ecd3688ccab58e97ed6b
DIST rarlinux-5.8.0_p20191205.tar.gz 564176 BLAKE2B 78251a10d995c47766d2d6f0b553aaf1230e3d47b0098a7f137d499d3e182bbebd3d1c35551032f5c88166c646037733f9be8833b05a1aef136918cf2b29b556 SHA512 0b8d2347a4b14e26285dd99add5fdf9c2f1a9d9e1bf7524e7b31052d9aac6337e592da02ed5dc4dc9ab9020587bf89de865b53a5632ac76097c9410ec7cf916a
-DIST rarlinux-x64-5.7.1_p20190427.tar.gz 546592 BLAKE2B 7ca3fcda8d4cba2595c82f6b14845427228904a0ba19e1cad6b812de3941b34f24a575e426198ff49db029f50420f68d693640a6e9fc71f01ccd78478a7e5b4a SHA512 818307bcfb6ed5879c505d085a0430a4b3d07aa2fa9c1f3e04964832e363ac6d2116511aa0cda20cb0d499358a819d1ed03b7db01ff68749da2764fa3487da4b
DIST rarlinux-x64-5.8.0_p20191205.tar.gz 551942 BLAKE2B 57fb02ee14571e508515b107adbce2055998cfc05c1c0b5d297fdb021c418c59c9e9cf594cdaa919c205193c7f4454af59d68c98559f85e3e8c3b00e7fec1c0b SHA512 625138adc3c9fb0ceca54c72ee53a0c260e9c9ca53df5c192386884474482dab34477b0efeba760366fd31c5c59cdb2baf6516977b5c61927606bbde146ee350
-DIST winrar-x64-5.7.1_p20190427.exe 3145336 BLAKE2B 2f0a70c789d0d3cb97513c712c8179952841752dea7fe0af68bae518cbf74c51ccb9c8d1fb02f56d1f5a43823b53609a3c3bbc42ca6833923988af851874bd84 SHA512 d23d47b66770af4e13a04265d9e4a46d5e62b93361d45b2ad6720b89d638a3e4d59eced1fd8f86d7711708a4158cd5487cf2509c2feb3e32cee368ab113afe91
DIST winrar-x64-5.8.0_p20191205.exe 3214504 BLAKE2B 41b23a157c0af9d024bbf404c134bad5d026d5668eb18c7bc21b9627b5b82ea2dcfd81cbbcae8a7150a5f3cf1b7982477e23eeed3640dc0dbf29ccb190176a6a SHA512 7b55ab2daaa9a11e32b9d7ff3df1c76de6786d415a8d3650cfae9b5cd27003b53b67336c8916ed138ccb996797392f9dbd2f49aeea9ba5cef04f6331a82c0e0b
diff --git a/app-arch/rar/rar-5.7.1_p20190427.ebuild b/app-arch/rar/rar-5.7.1_p20190427.ebuild
deleted file mode 100644
index e7514ff5be78..000000000000
--- a/app-arch/rar/rar-5.7.1_p20190427.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
- amd64? ( ${URI_amd64} )
- all_sfx? (
- ${URI_x86}
- ${URI_amd64}
- ${URI_w64}
- )"
-
-LICENSE="RAR BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S="${WORKDIR}/${PN}"
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
- opt/rar/default-elf32.sfx
- opt/rar/default-elf64.sfx
- opt/rar/default-win32.sfx
- opt/rar/default-win64.sfx
- opt/rar/WinCon.SFX
- opt/rar/WinCon64.SFX
- opt/rar/Zip.SFX
- opt/rar/Zip64.SFX
- opt/rar/unrar
- opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
- local _file
-
- for _file in ${A}; do
- if [[ "${_file}" == rarli* ]]; then
- if [[ "${_file}" =~ x64 ]]; then
- if ! use amd64; then
- continue
- fi
-
- unpack "${_file}"
- elif [[ ! "${_file}" =~ x64 ]]; then
- if ! use x86; then
- continue
- fi
-
- unpack "${_file}"
- else
- die "Unknown SRC file '${_file}'!"
- fi
- fi
- done
-
- rm -f "${S}"/license.txt
-
- if use all_sfx ; then
- mkdir sfx
- cd sfx
- for _file in ${A}; do
- if [[ "${_file}" == rarli* ]]; then
- unpack "${_file}"
- if [[ "${_file}" =~ x64 ]]; then
- mv rar/default.sfx default-elf64.sfx || die
- else
- mv rar/default.sfx default-elf32.sfx || die
- fi
- elif [[ "${_file}" == winrar* ]]; then
- ln -s "${DISTDIR}"/${_file} w64.rar || die
- unpack ./w64.rar
- mv Default.SFX default-win32.sfx || die
- mv Default64.SFX default-win64.sfx || die
- else
- die "Unknown SFX file '${_file}'!"
- fi
- done
- fi
-}
-
-src_compile() { :; }
-
-src_install() {
- exeinto /opt/rar
- doexe rar unrar
-
- dodir /opt/bin
- dosym ../rar/rar /opt/bin/rar
- dosym ../rar/unrar /opt/bin/unrar
-
- insinto /opt/rar
- if use all_sfx ; then
- doins "${WORKDIR}"/sfx/*.{sfx,SFX}
- else
- doins default.sfx
- fi
- doins rarfiles.lst
- dodoc *.txt
-}
diff --git a/app-arch/rar/rar-5.8.0_p20191205.ebuild b/app-arch/rar/rar-5.8.0_p20191205.ebuild
index 2c97cb3f6b5b..e7514ff5be78 100644
--- a/app-arch/rar/rar-5.8.0_p20191205.ebuild
+++ b/app-arch/rar/rar-5.8.0_p20191205.ebuild
@@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )
LICENSE="RAR BSD BSD-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE="all_sfx"
RESTRICT="mirror bindist"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 34acb08efd00..878c0f038935 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index d6c3d27f3c42..20d0b5f676b5 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
deleted file mode 100644
index bacd8da8b969..000000000000
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-qt/qtcore:5
- botan? ( dev-libs/botan:= )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
- $(qca_plugin_use botan)
- $(qca_plugin_use gcrypt)
- $(qca_plugin_use gpg gnupg)
- $(qca_plugin_use logger)
- $(qca_plugin_use nss)
- $(qca_plugin_use pkcs11)
- $(qca_plugin_use sasl cyrus-sasl)
- $(qca_plugin_use softstore)
- $(qca_plugin_use ssl ossl)
- -DBUILD_TESTS=$(usex test)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile || die
- dodoc -r apidocs/html
- popd >/dev/null || die
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index cbd6b1639a19..bacd8da8b969 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
RESTRICT="!test? ( test )"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 76d3603a42ab..7e049eda0e0c 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 5476d1ee6450..04eaf36719bc 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1 +1 @@
-DIST eclass-manpages-20191215.tar.xz 419924 BLAKE2B f179fa2380952383231dfe5af995da8f92531d942518f5d0c8a9e43fc4a664096f2830fbe37ca5b000886e50528756dc06f092644143731d29c68d77d0c25891 SHA512 61da27edef5fdda692448b352ebc7488b928029ec018097b2813763558e56f1c135ccf358f4a6d6df856a3632109e8d3045ec7e997eeab0e99d65d0aa66faa42
+DIST eclass-manpages-20191222.tar.xz 420228 BLAKE2B 52686a2d4df6abdb9178a3782a2e7cf30bd3c1ae76c9e1c630365e3b6da8c85246fe5e680c49ffe3cabcd58d434b7137f61a9ee137ce08c89ca8946335651cd6 SHA512 165aa03679dbbbe05bb178e7fd65bd7ba62b6356575ffd809294e73c2b264747b4b0aa4f9ce2a3c12a2cdf27e4904adb295153d778172cd3ff5e912d399aad5d
diff --git a/app-doc/eclass-manpages/eclass-manpages-20191215.ebuild b/app-doc/eclass-manpages/eclass-manpages-20191222.ebuild
similarity index 100%
rename from app-doc/eclass-manpages/eclass-manpages-20191215.ebuild
rename to app-doc/eclass-manpages/eclass-manpages-20191222.ebuild
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e0bff93ba9d8..7a93cf430747 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index cbaa2f792797..a3cbe6e106b8 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,2 +1 @@
-DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94
DIST gedit-plugins-3.32.2.tar.xz 1474264 BLAKE2B feb116ec201b9eb9630570818cc288f0044ecfc174fc84c7d812aa6dfba5cc3748b4e2351ffa2be0d3a593a58b2318c4296b54b84476fc887195ee27f27bb597 SHA512 2767bc766daba5e1c81ef5a00bc3589a301c02e0286a6622cf11a03b5b391ecbcf9456187563dad4f2916610ee9ddca4414ff4beb639820954385ee3f8091d2a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
similarity index 79%
rename from app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
rename to app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
index 21af002545cc..16e5dd757e2e 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.30.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
PYTHON_REQ_USE="xml"
VALA_MIN_API_VERSION="0.28"
@@ -13,7 +13,7 @@ DESCRIPTION="Official plugins for gedit"
HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE_plugins="charmap git terminal vala"
@@ -31,16 +31,18 @@ RDEPEND="
>=dev-libs/glib-2.32:2
>=dev-libs/libpeas-1.7.0[gtk]
>=x11-libs/gtk+-3.9:3
- >=x11-libs/gtksourceview-3.21.3:3.0
+ >=x11-libs/gtksourceview-4.0.2:4
python? (
${PYTHON_DEPS}
- >=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
- dev-libs/libpeas[python,${PYTHON_USEDEP}]
- >=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=app-editors/gedit-3.16[introspection,python,${PYTHON_SINGLE_USEDEP}]
+ dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+ >=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+ ')
>=x11-libs/gtk+-3.9:3[introspection]
- >=x11-libs/gtksourceview-3.14:3.0[introspection]
+ >=x11-libs/gtksourceview-4.0.2:4[introspection]
x11-libs/pango[introspection]
x11-libs/gdk-pixbuf:2[introspection]
)
@@ -50,9 +52,8 @@ RDEPEND="
vala? ( $(vala_depend) )
" # vte-0.52+ for feed_child API compatibility
DEPEND="${RDEPEND}
- >=dev-util/intltool-0.50.2
dev-util/itstool
- >=sys-devel/gettext-0.17
+ >=sys-devel/gettext-0.19.8
virtual/pkgconfig
"
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
new file mode 100644
index 000000000000..f4a22957480d
--- /dev/null
+++ b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
@@ -0,0 +1,71 @@
+From 49b6982336ad127b2b780d2ae7c1be1104d9dae5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Tue, 10 Apr 2018 20:31:38 +0200
+Subject: [PATCH] Fix build with QScintilla-2.10.3
+
+---
+ src/app/qsci/lexers/qscilexerada.h | 3 ---
+ src/app/qsci/lexers/qscilexerhaskell.h | 3 ---
+ src/app/qsci/lexers/qscilexerlisp.h | 3 ---
+ src/app/qsci/lexers/qscilexernsis.h | 3 ---
+ 4 files changed, 12 deletions(-)
+
+diff --git a/src/app/qsci/lexers/qscilexerada.h b/src/app/qsci/lexers/qscilexerada.h
+index 984f97e..30c6646 100644
+--- a/src/app/qsci/lexers/qscilexerada.h
++++ b/src/app/qsci/lexers/qscilexerada.h
+@@ -3,9 +3,6 @@
+
+ #include
+
+-// located in SciLexer.h
+-#define SCLEX_ADA 20
+-
+ #define SCE_ADA_DEFAULT 0
+ #define SCE_ADA_WORD 1
+ #define SCE_ADA_IDENTIFIER 2
+diff --git a/src/app/qsci/lexers/qscilexerhaskell.h b/src/app/qsci/lexers/qscilexerhaskell.h
+index 78c8978..56a3614 100644
+--- a/src/app/qsci/lexers/qscilexerhaskell.h
++++ b/src/app/qsci/lexers/qscilexerhaskell.h
+@@ -3,9 +3,6 @@
+
+ #include
+
+-// located in SciLexer.h
+-#define SCLEX_HASKELL 68
+-
+ #define SCE_HA_DEFAULT 0
+ #define SCE_HA_IDENTIFIER 1
+ #define SCE_HA_KEYWORD 2
+diff --git a/src/app/qsci/lexers/qscilexerlisp.h b/src/app/qsci/lexers/qscilexerlisp.h
+index 5b43d74..6e5dc32 100644
+--- a/src/app/qsci/lexers/qscilexerlisp.h
++++ b/src/app/qsci/lexers/qscilexerlisp.h
+@@ -3,9 +3,6 @@
+
+ #include
+
+-// located in SciLexer.h
+-#define SCLEX_LISP 21
+-
+ #define SCE_LISP_DEFAULT 0
+ #define SCE_LISP_COMMENT 1
+ #define SCE_LISP_NUMBER 2
+diff --git a/src/app/qsci/lexers/qscilexernsis.h b/src/app/qsci/lexers/qscilexernsis.h
+index 8b009ec..06efc40 100644
+--- a/src/app/qsci/lexers/qscilexernsis.h
++++ b/src/app/qsci/lexers/qscilexernsis.h
+@@ -3,9 +3,6 @@
+
+ #include
+
+-// located in SciLexer.h
+-#define SCLEX_NSIS 43
+-
+ #define SCE_NSIS_DEFAULT 0
+ #define SCE_NSIS_COMMENT 1
+ #define SCE_NSIS_STRINGDQ 2
+--
+2.17.0
+
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
index 97e18f2d896c..ef84d7ef4612 100644
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
-inherit cmake-utils vcs-snapshot xdg-utils
+inherit cmake-utils xdg
DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
HOMEPAGE="http://juffed.com/en/"
@@ -29,9 +29,12 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog README )
+S="${WORKDIR}/Mezomish-${PN}-5ba17f9"
+
PATCHES=(
"${FILESDIR}/${P}-qscintilla-2.10.patch"
"${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${P}-qscintilla-2.10.3.patch"
)
src_prepare() {
@@ -53,13 +56,3 @@ src_configure() {
)
cmake-utils_src_configure
}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index ef30f47b59b3..8a00164f5572 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 0d1562669df8..fe0f558fb98c 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,2 +1,3 @@
DIST nxml-gentoo-schemas-20180611.tar.xz 11572 BLAKE2B e8a573e79d9531d676b8c52ba9c2869f765e6bb0326f3f00c99dd3ecfd19af6eaedbb06ddf84ae541690962a5e67b87726d6cc90a3bf7dd6d805b5c2c96b6321 SHA512 8473233141a56935e41a9d0371501f3fe055b21600746db29e14ec91d12a43da595e500a876eea8cdddd885358df0825055143e901eb599a2fcbac7147a04fa8
DIST nxml-gentoo-schemas-20191214.tar.xz 9908 BLAKE2B 7cf16c68ed13026c9b5d980ac982afd6daa757db8c2b8860f881014c36821da9e47eb127be6900cad0b2c96fe73bec451757c2ac263653a709b178529413c8da SHA512 22aa519ba674d4abfb1b07d29a8a71a8919ca7f75acb7810087a79c3b1a3eb0db4d8f02f6c1a424c4941f9823cf7417cb3d6854a354b8af8479096f09ffc6a8d
+DIST nxml-gentoo-schemas-20191217.tar.xz 8752 BLAKE2B 42613ce535e6b65bf88fa0df307523ae50a43336af693c2744cc98b233980ce597ead0e8bc8023949c7d6f8fad0a25e899fc29196bb53aa3612e3afa363fdb4c SHA512 0cbda1d363f458cb7e4f7c4b9dc9db7cc58be8251128883c752cec10bd3c8882ade88fc61fe2627e242f0678e9d500a38436ebe305601e086f2e0511954b2665
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191217.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191217.ebuild
new file mode 100644
index 000000000000..440f9475ffb5
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191217.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+ insinto "${SITEETC}/${PN}"
+ doins schemas.xml *.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e267e323c1ed..8c79e268b331 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 015922624fc6..090171eacaed 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1 @@
-DIST diskimage-builder-2.29.1.tar.gz 426780 BLAKE2B cd5b9c2cce5c289ef7f76ad41bf4b51ba6319c782be91b97a82d828c177912696ce6f94774d7294aca0d4af401d4d4e0ddd5fdd6d799e4e560ab03f971498b03 SHA512 cb083024739486c7651ce97ab36a30461754aae226af23b2ce757eca7c71e0fec42af07b8973f9c8344012238c4ae9d6252189ce6288d6451e020302f2dc35bf
-DIST diskimage-builder-2.30.0.tar.gz 428448 BLAKE2B 4cb4c47c07885713f160a958aa2d80d57b9ae496961bce976beddab59f0760abadaaccc1db8c4f29458dd8f247d7d5c21164a34ef91a4d4b48212f1fa612dadd SHA512 4ed6e745b1184c0462ce0500fa5e5dc8754a7185b76a6b5963c5ca9e20ca0bce7f2a5166b4472ca69498cc5f00e8a6e7ae17fd3794e830679e4f3a22e74956c7
DIST diskimage-builder-2.32.0.tar.gz 435328 BLAKE2B 78f306430819d94045e3b8c424cdf7a0fee9a306a317e44cd363d53bbbcd1af1f06731b83b63e490bb8ad3903630daf84a544878b87d6c7f377786778229f276 SHA512 357b56aba979cabd7a857d6646412893361c05a83e4260d1ef468de1d6fb0fbc2582ab8bf37428c56a52fafcf708b86be470f2c885008b10368bc92a2b679a09
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
deleted file mode 100644
index 20cf3dfed3ae..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
- =dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
- >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
- =dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- app-emulation/qemu
- sys-block/parted
- sys-fs/multipath-tools
- sys-fs/dosfstools
- sys-apps/gptfdisk
- !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.30.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.30.0.ebuild
deleted file mode 100644
index 86d3bb124b34..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.30.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
- =dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
- >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
- =dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- app-emulation/qemu
- sys-block/parted
- sys-fs/multipath-tools
- sys-fs/dosfstools
- sys-apps/gptfdisk
- !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
index 86d3bb124b34..52eb22129918 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0"
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
deleted file mode 100644
index 2e917ddd8ca5..000000000000
--- a/app-emulation/wine-d3d9/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
-DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.1.tar.xz 21680916 BLAKE2B 1a040606e34e1aec6f63d9692c6cbf915f5b32c817116aed68203e6bdedb8cb129dad440f7e51e9fb2ebaf1aa537d1584333f06b8b2c5d68f9ff37921d5b8b95 SHA512 2b28fc82111552009a042d682ea8f4e54d90f14bb99f1fbe12732090e7562527c229683562630edada0b1f4143de226734337b20d1b23d711191dcc0a834e4dc
-DIST wine-d3d9-3.20.tar.gz 50539 BLAKE2B 53549364113f9dd9d7c9383ec74cc7eafec61dca5bf1943bd87e51b810e6d85d5d0f86f426a22042ee8a23eb21b6b13c691c43d67de19e66550dd0abc3c0319b SHA512 67d452d46807ee9ca44414326a9b2b90403b5c4c611e34ade03a9b624066b62b056f3adde2c0b6d6bdd73066775a1b3eb43d7cf52f82456eb979f788c3e591b4
-DIST wine-d3d9-3.21.tar.gz 50545 BLAKE2B fec93df7a464feba5ebd5c1f9f9b511a89065cc668122c4ddb2c91027b68e2aa93fe58832c4e143832c5b5f4ace57c640ab218525f0749bd5f1c632e80009660 SHA512 b2263d26b671b45a59c03ca5dc88aff35444e4d47caccf3de1493fa86ac834bb178819b9a80aa52838e510f814ed404e6c3ce9724aa6eea6a6d5f019253e6248
-DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d84bf12c4c0591e316d31987770d1d5e99837f1c63e91810db821a2cb76cba1b97c71d5fcee8060a48915e83d SHA512 98e2d4d47fdc376e4e8fed0624657d40ea0a077998baab1d89ef0320714e66f4899414b04fa747b78c172fb85732e9376553c0b20cfd1ae0807cb3de58cfe78a
-DIST wine-d3d9-4.1.tar.gz 50520 BLAKE2B 53f1c4a7fe077776d648a927e75f11a8fa627d3fa15b01e22c18da7a4489ebc883470901e75afc99e07b85201ec05132be4c357923b8ab2ce6ac5f0beedeadd0 SHA512 2e8e3dca86a919a6e6bbdf87f2ffa67f90febcd4ba11351a20785c8dcf732077e1ae1ec0f34f3a4743cb23bb3d8483fd67d9e746e2887d000dd9f0220404b672
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml
deleted file mode 100644
index 3116c6dc74c6..000000000000
--- a/app-emulation/wine-d3d9/metadata.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
- wine@gentoo.org
- Wine
-
- This package must be kept in sync with repo/proj/wine repository.
- Any changes need to be run past the maintainer to ensure the two repositories are kept in sync.
-
-
-
- sarnex@gentoo.org
- Nick Sarnie
-
-
-Wine is an Open Source implementation of the Windows API on top of X and Unix.
-
-Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
-
-This variant of the Wine packaging includes the Gallium Nine patchset.
-
-
-
- wine
- sarnex/wine-d3d9-patches
-
-
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
deleted file mode 100644
index b7f926def60f..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.3 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${pn_live_val} ]]; then
- if use d3d9; then
- eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
- eerror "cannot be used to set the commit. Instead, you may use the"
- eerror "environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
- fi
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- fi
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- if use d3d9; then
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- fi
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine register --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
deleted file mode 100644
index b7f926def60f..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.3 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${pn_live_val} ]]; then
- if use d3d9; then
- eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
- eerror "cannot be used to set the commit. Instead, you may use the"
- eerror "environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
- fi
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- fi
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- if use d3d9; then
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- fi
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine register --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
deleted file mode 100644
index 421d3c0d5108..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- MINOR_V=$(ver_cut 2)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.5 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${pn_live_val} ]]; then
- if use d3d9; then
- eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
- eerror "cannot be used to set the commit. Instead, you may use the"
- eerror "environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
- fi
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- fi
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- if use d3d9; then
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- fi
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine register --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
deleted file mode 100644
index 3a9f0461d366..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
+++ /dev/null
@@ -1,577 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.5 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${pn_live_val} ]]; then
- if use d3d9; then
- eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
- eerror "cannot be used to set the commit. Instead, you may use the"
- eerror "environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
- fi
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- fi
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- if use d3d9; then
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- fi
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine register --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
deleted file mode 100644
index 4128b502f603..000000000000
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.5 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${pn_live_val} ]]; then
- if use d3d9; then
- eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
- eerror "cannot be used to set the commit. Instead, you may use the"
- eerror "environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
- fi
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environment variables:"
- eerror " EGIT_OVERRIDE_COMMIT_WINE"
- eerror " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- fi
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- if use d3d9; then
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- fi
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine register --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- else
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 20ad91c7a55c..1c5729207876 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,4 +1,5 @@
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
+DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 018e0d7d63fe..e6f10b747502 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190511"
+GWP_V="20191222"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -162,9 +162,9 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
+ "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
)
PATCHES_BIN=()
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index b7438cc6f45a..28cf333f264e 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,5 +1,6 @@
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
+DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index ecb350c90718..cac165bc0973 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -24,7 +24,7 @@ else
fi
S="${WORKDIR}/${MY_P}"
-GWP_V="20190511"
+GWP_V="20191222"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -139,9 +139,9 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
+ "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
)
PATCHES_BIN=()
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 027c489d5a15..0282a65d08a5 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index e4302fea621e..1266859561d9 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,2 +1,3 @@
DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
DIST ruby.eselect-20190121.xz 2000 BLAKE2B d04f9230e428526fb7ac7f6c274d7ac1b47af9f9bbb33cbfcec72cccdbe553db73a320e8a86190b88b4f9ee9c27fe0e5dabce1e1c5edfd4373d9a4bfcb457957 SHA512 aca2c46e39d3e0806a0ab942e8afe755992e5df98c50f4f2e012c93b8d6339e2a8400376e73187744a3d42a77725e03eed48b300f7d4d2da546a434184988f52
+DIST ruby.eselect-20191222.xz 2000 BLAKE2B ec89dca67730ff3c6acba8906f9436866b45c3b7fc4c29be6614eddf7e5fbc1f9f9ff0bfe3ddfdc7309d242a5da6f8913cae738895fd6abcc39dc336f609d066 SHA512 72c3e3fe8c82474de25dbde9f1f63739e57be3e4e61a1f86e57c9dcaf92d72fd8d17263f8a326af771f64395febc82f5eb29e86b4b2a44af029b6c1fc41e43d2
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
new file mode 100644
index 000000000000..b670fc25a0b0
--- /dev/null
+++ b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ruby"
+SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 69dfbd1885af..f55783f1b94f 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 5b464843652d..48428be5834a 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,2 +1 @@
-DIST bijiben-3.26.2.tar.xz 865148 BLAKE2B 77bb78745295d414153e18491fd16faad29defabaff4ad979db7cc6e6fe075e042dd8b04d321282fbfbf163541818019bc2cbda0f8562010dfc32f275f3f54e8 SHA512 1db8c5e605b5c6a0fcd8743365a53b6ab2d986a18d501a3f02e892bcfc8ba91e9ca933b6f2a4318f71724b40f190d0ebc18eabfe1332de6765b9bca09d36718e
DIST bijiben-3.32.2.tar.xz 659988 BLAKE2B a155b3ad4d340b6efe039ae8458be6665f5ea37935b2040d8aa59f4b019a7ce2a9bb42c309fbc212b8f87cd2e3db533305b64d6987b3b527435ab9906165a7ff SHA512 71573ced01a5e984998fc5ce97ebbd4fcf04a91165465697ff29ea67076a31654b8f66a93c3ed79b30a8af2e38fad3ac4bfc3047106411078c6cbb67c20d5c5d
diff --git a/app-misc/bijiben/bijiben-3.26.2.ebuild b/app-misc/bijiben/bijiben-3.26.2.ebuild
deleted file mode 100644
index bece6e188913..000000000000
--- a/app-misc/bijiben/bijiben-3.26.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.53.4:2
- >=x11-libs/gtk+-3.11.4:3
- >=gnome-extra/evolution-data-server-3.13.90:=
- >=net-libs/webkit-gtk-2.10.0:4
- net-libs/gnome-online-accounts:=
- dev-libs/libxml2:2
- app-misc/tracker:=
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/intltool-0.50.1
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
diff --git a/app-misc/solaar/solaar-1.0.1-r1.ebuild b/app-misc/solaar/solaar-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..94e1cd084d96
--- /dev/null
+++ b/app-misc/solaar/solaar-1.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc"
+
+RDEPEND="
+ acct-group/plugdev
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]"
+
+S="${WORKDIR}"/Solaar-${PV}
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+ # don't autostart (bug #494608)
+ sed -i '/yield autostart_path/d' setup.py || die
+
+ # grant plugdev group rw access
+ sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ udev_dorules rules.d/*.rules
+
+ dodoc docs/devices.md
+ if use doc; then
+ dodoc -r docs/*
+ fi
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 738f0f14662b..b28ee10aa1fd 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1 @@
-DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3
diff --git a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
deleted file mode 100644
index 07d6ae9b649f..000000000000
--- a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik
-Date: Sun, 7 Oct 2018 11:40:41 +0300
-Subject: [PATCH 1/2] build: Fix libcue version comparison
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It currently performs a string comparison, as opposed to using
-version_compare(), which leads to results like
-“unknown >= 2.0.0 == True” when the dependency was not found.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32
-
-(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4273638dd..c30ada4ed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
-+conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
---
-2.17.0
-
-
-From ff6a076330ba1b5a383196795b18e2c069ac54c6 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield
-Date: Sun, 7 Oct 2018 23:42:28 +0200
-Subject: [PATCH 2/2] build: Fix breakage when libcue isn't found
-
-Commit 6e281037a5f0abc introduced a regression on systems where libcue
-is not available.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
-
-(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c30ada4ed..28072646a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0'))
-+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
---
-2.17.0
-
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
deleted file mode 100644
index 90a3454283d0..000000000000
--- a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
- >=dev-libs/glib-2.46:2
- >=app-misc/tracker-2.1.0:=
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
- !gstreamer? (
- ffmpeg? (
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= ) ) )
-
- >=sys-apps/dbus-1.3.1
- xmp? ( >=media-libs/exempi-2.1.0:= )
- flac? ( >=media-libs/flac-1.2.1 )
- raw? ( media-libs/gexiv2 )
- >=dev-libs/icu-4.8.1.2:=
- cue? ( media-libs/libcue:= )
- exif? ( >=media-libs/libexif-0.6 )
- gsf? ( >=gnome-extra/libgsf-1.14.24:= )
- xps? ( app-text/libgxps )
- iptc? ( media-libs/libiptcdata )
- jpeg? ( virtual/jpeg:0 )
- iso? ( >=sys-libs/libosinfo-0.2.10 )
- >=media-libs/libpng-1.2:0=
- seccomp? ( >=sys-libs/libseccomp-2.0 )
- tiff? ( media-libs/tiff:0 )
- xml? ( >=dev-libs/libxml2-2.6 )
- vorbis? ( >=media-libs/libvorbis-0.22 )
- pdf? ( >=app-text/poppler-0.16.0[cairo] )
- taglib? ( >=media-libs/taglib-1.6 )
- playlist? ( >=dev-libs/totem-pl-parser-3:= )
- upower? ( >=sys-power/upower-0.9.0 )
- sys-libs/zlib:0
- gif? ( media-libs/giflib:= )
-
- rss? ( >=net-libs/libgrss-0.7:0 )
- app-arch/gzip
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
-
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS}
- gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-openh264:1.0 ) ) )
-"
-# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29)
-
-PATCHES=(
- "${FILESDIR}"/${PV}-cue-meson-fixes.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
- if use gstreamer; then
- sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
- else
- sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
- fi
- xdg_src_prepare
- gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
- local media_extractor="none"
- if use gstreamer ; then
- media_extractor="gstreamer"
- elif use ffmpeg ; then
- media_extractor="libav"
- fi
-
- local emesonargs=(
- -Dtracker_core=system
-
- -Ddocs=true
- -Dextract=true
- $(meson_use test functional_tests)
- -Dminer_apps=true
- -Dminer_fs=true
- $(meson_use rss miner_rss)
- -Dwriteback=true
- -Dabiword=true
- -Ddvi=true
- -Dicon=true
- -Dmp3=true
- -Dps=true
- -Dtext=true
- -Dunzip_ps_gz_files=true # spawns gunzip
-
- -Dcue=$(usex cue enabled disabled)
- -Dexif=$(usex exif enabled disabled)
- -Dflac=$(usex flac enabled disabled)
- -Dgif=$(usex gif enabled disabled)
- -Dgsf=$(usex gsf enabled disabled)
- -Diptc=$(usex iptc enabled disabled)
- -Diso=$(usex iso enabled disabled)
- -Djpeg=$(usex jpeg enabled disabled)
- -Dpdf=$(usex pdf enabled disabled)
- -Dplaylist=$(usex playlist enabled disabled)
- -Dpng=enabled
- -Draw=$(usex raw enabled disabled)
- -Dtaglib=$(usex taglib enabled disabled)
- -Dtiff=$(usex tiff enabled disabled)
- -Dvorbis=$(usex vorbis enabled disabled)
- -Dxml=$(usex xml enabled disabled)
- -Dxmp=$(usex xmp enabled disabled)
- -Dxps=$(usex xps enabled disabled)
-
- -Dbattery_detection=$(usex upower upower none)
- -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
- -Dgeneric_media_extractor=${media_extractor}
- # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
- -Dsystemd_user_services="$(systemd_get_userunitdir)"
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index c7abcb9f1050..6c1a5714de8d 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,2 +1 @@
-DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
diff --git a/app-misc/tracker/files/2.1.8-doc-options.patch b/app-misc/tracker/files/2.1.8-doc-options.patch
deleted file mode 100644
index 9b25349f659f..000000000000
--- a/app-misc/tracker/files/2.1.8-doc-options.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From cff7f988fd2ed7894c3d16144e799d994637d3cf Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp
-Date: Wed, 13 Feb 2019 12:28:53 +0200
-Subject: [PATCH 1/5] build: Separate options for manpages install and gtk-doc
- generation
----
- docs/meson.build | 10 +++++++---
- meson.build | 6 +-----
- meson_options.txt | 6 ++++--
- 3 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index 76e59797e..5e1d541bd 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,3 +1,7 @@
--subdir('tools')
--subdir('manpages')
--subdir('reference')
-+if get_option('man')
-+ subdir('manpages')
-+endif
-+if get_option('gtk-doc')
-+ subdir('tools')
-+ subdir('reference')
-+endif
-diff --git a/meson.build b/meson.build
-index 7d61fe1a7..0fda24151 100644
---- a/meson.build
-+++ b/meson.build
-@@ -320,11 +320,7 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
- define_variable: [ 'libdir', libdir ])
-
- subdir('src')
--
--if get_option('docs')
-- subdir('docs')
--endif
--
-+subdir('docs')
- subdir('examples')
- subdir('utils')
-
-diff --git a/meson_options.txt b/meson_options.txt
-index b36ba1d1e..0eb48aac4 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,11 +1,13 @@
--option('docs', type: 'boolean', value: true,
-- description: 'Enable the documentation')
- option('fts', type: 'boolean', value: true,
- description: 'Enable the Tracker full-text search feature')
- option('functional_tests', type: 'boolean', value: true,
- description: 'Enable the Tracker functional test suite')
-+option('gtk-doc', type: 'boolean', value: true,
-+ description: 'Generate API documentation with gtk-doc')
- option('journal', type: 'boolean', value: true,
- description: 'Enable database journal backup mechanism')
-+option('man', type: 'boolean', value: true,
-+ description: 'Install man pages')
-
- option('network_manager', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto',
- description: 'Enable connection detection through NetworkManager')
---
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
deleted file mode 100644
index 85ddb6baa22b..000000000000
--- a/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d52a7bed9fdeef77bdcafd66c748adce14fde42d Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)"
-Date: Tue, 6 Nov 2018 07:11:37 +0000
-Subject: [PATCH 5/5] build: Restore right soversion to libraries
-
-The previous change did not leave the expected .0 symlinks.
-
-'soversion' is the actual version linked against. To match the scheme
-used by libtool, we need to give the libraries a 'version' as well.
-
-(cherry picked from commit 282cd5aa85852cc7f9e603dae435f6b528c4712a)
----
- meson.build | 3 ++-
- src/libtracker-control/meson.build | 1 +
- src/libtracker-miner/meson.build | 1 +
- src/libtracker-sparql-backend/meson.build | 1 +
- 4 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0fda24151..593b9db44 100644
---- a/meson.build
-+++ b/meson.build
-@@ -15,7 +15,8 @@ tracker_interface_age = 0
- tracker_binary_age = 100 * tracker_minor_version + tracker_micro_version - tracker_interface_age
-
- # This the .Z used in libtracker-sparql-2.0.so.Z
--soversion = '0.@0@.@1@'.format(tracker_binary_age - tracker_interface_age, tracker_interface_age)
-+soversion = '0'
-+libversion = '@0@.@1@.@2@'.format(soversion, tracker_binary_age - tracker_interface_age, tracker_interface_age)
-
- libdir = join_paths(get_option('prefix'), get_option('libdir'))
- datadir = join_paths(get_option('prefix'), get_option('datadir'))
-diff --git a/src/libtracker-control/meson.build b/src/libtracker-control/meson.build
-index 81578e306..533ac538e 100644
---- a/src/libtracker-control/meson.build
-+++ b/src/libtracker-control/meson.build
-@@ -10,6 +10,7 @@ libtracker_control = library('tracker-control-' + tracker_api_version,
- tracker_common_enum_header,
- c_args: tracker_c_args,
- soversion: soversion,
-+ version: libversion,
- install: true,
- install_rpath: tracker_internal_libs_dir,
- # This doesn't depend on tracker_common_dep because of
-diff --git a/src/libtracker-miner/meson.build b/src/libtracker-miner/meson.build
-index e53b21cf9..49c879057 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -60,6 +60,7 @@ libtracker_miner = library(
- miner_enums[0], miner_enums[1], miner_sources,
- c_args: tracker_c_args,
- soversion: soversion,
-+ version: libversion,
- install: true,
- install_rpath: tracker_internal_libs_dir,
- # This doesn't depend on tracker_common_dep because of
-diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
-index c8415efb8..e54333bec 100644
---- a/src/libtracker-sparql-backend/meson.build
-+++ b/src/libtracker-sparql-backend/meson.build
-@@ -8,6 +8,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
- 'tracker-backend.vala',
-
- soversion: soversion,
-+ version: libversion,
-
- install: true,
- install_rpath: tracker_internal_libs_dir,
---
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
deleted file mode 100644
index 1f25f115d419..000000000000
--- a/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4238b0a27a3621f4181d38821a4eaee9f0ac1244 Mon Sep 17 00:00:00 2001
-From: Andrea Azzarone
-Date: Fri, 18 Jan 2019 16:14:57 +0000
-Subject: [PATCH 3/5] tracker-monitor: Prevent stack smashing
-
-Make sure to use GPOINTER_TO_UINT when using g_hash_table_lookup_extended() to
-prevent stack smashing. This will make sure that in the architectures where
-sizeof(GFileMonitorEvent) < sizeof(gpointer), g_hash_table_lookup_extended()
-will not write more bytes than prev_event_type can hold.
-
-Bug-Upstream: https://gitlab.gnome.org/GNOME/tracker/issues/71
-Origin: upstream, commit:63c0a5d4413e53cb76089fda6f56b2d623c5de15
-Applied-Upstream: 2.2.0
----
- src/libtracker-miner/tracker-monitor.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
-index 54cd3e8fb..f2431b646 100644
---- a/src/libtracker-miner/tracker-monitor.c
-+++ b/src/libtracker-miner/tracker-monitor.c
-@@ -611,10 +611,12 @@ flush_cached_event (TrackerMonitor *monitor,
- GFile *file,
- gboolean is_directory)
- {
-- GFileMonitorEvent prev_event_type;
-+ gpointer value = NULL;
-
- if (g_hash_table_lookup_extended (monitor->priv->cached_events,
-- file, NULL, (gpointer*) &prev_event_type)) {
-+ file, NULL, &value)) {
-+ GFileMonitorEvent prev_event_type = GPOINTER_TO_UINT (value);
-+
- g_hash_table_remove (monitor->priv->cached_events, file);
- emit_signal_for_event (monitor, prev_event_type,
- is_directory, file, NULL);
---
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-test-fix.patch b/app-misc/tracker/files/2.1.8-test-fix.patch
deleted file mode 100644
index b3dedaa9e6ec..000000000000
--- a/app-misc/tracker/files/2.1.8-test-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 77059dd4b98f422c1e474b9ee53cc05dde875cce Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp
-Date: Wed, 13 Feb 2019 20:09:45 +0200
-Subject: [PATCH 2/5] libtracker-common: improve test_path_evaluate_name
- environment handling
-
-Under some environments $PWD might not point where we expect, so simply
-use g_get_current_dir() instead.
-g_getenv() is documented to return a pointer that may get overwritten
-by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after
-removing the second g_getenv, there's still g_setenv calls, take a copy.
----
- tests/libtracker-common/tracker-file-utils-test.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
-index d1ddf3004..71a82a5c8 100644
---- a/tests/libtracker-common/tracker-file-utils-test.c
-+++ b/tests/libtracker-common/tracker-file-utils-test.c
-@@ -131,14 +131,14 @@ test_path_list_filter_duplicates_with_exceptions ()
- static void
- test_path_evaluate_name (void)
- {
-- gchar *result, *expected;
-+ gchar *result, *expected, *pwd, *home;
-
-- const gchar *home = g_getenv ("HOME");
-- const gchar *pwd = g_getenv ("PWD");
-
- const gchar *test = "/one/two";
- gchar *parent_dir;
-
-+ home = g_strdup (g_getenv ("HOME"));
-+ pwd = g_get_current_dir ();
- g_setenv ("TEST_TRACKER_DIR", test, TRUE);
-
-
-@@ -216,6 +216,8 @@ test_path_evaluate_name (void)
- result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
- g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
-
-+ g_free (home);
-+ g_free (pwd);
- g_unsetenv ("TEST_TRACKER_DIR");
- }
-
---
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
deleted file mode 100644
index 85a7eeadc2ba..000000000000
--- a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e93ea9167dc4185b6c29b27abdab55b6bcd06c74 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho
-Date: Wed, 1 May 2019 13:38:34 +0200
-Subject: [PATCH] g-ir-merge: Avoid recursive includes
-
-Ensure the namespace is not part of the includes. This is a kludge and
-shouldn't ever happen, except it does (in continuous, induced by vala).
-
-The next big thing that would happen here is a rewrite of libtracker-sparql
-vala bits so we don't need this merging anymore, so I won't put much
-thought on it.
----
- utils/g-ir-merge/g-ir-merge | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/utils/g-ir-merge/g-ir-merge b/utils/g-ir-merge/g-ir-merge
-index ad79c2d29..321032a4a 100755
---- a/utils/g-ir-merge/g-ir-merge
-+++ b/utils/g-ir-merge/g-ir-merge
-@@ -89,12 +89,12 @@ def parse_inputs(files):
- return includes, namespaces, c_includes
-
-
--def merge_includes(all_includes):
-+def merge_includes(all_includes, namespace):
- merged = {}
- for element in all_includes:
- name = element.get('name')
- version = element.get('version')
-- if name not in merged:
-+ if name not in merged and name != namespace:
- merged[name] = element
- return list(merged.values())
-
-@@ -153,7 +153,7 @@ def main():
-
- all_includes, all_namespaces, all_c_includes = parse_inputs(args.files)
-
-- includes = merge_includes(all_includes)
-+ includes = merge_includes(all_includes, args.namespace)
-
- namespace_contents, identifier_prefixes, symbol_prefixes, shared_libraries \
- = merge_namespaces(all_namespaces)
---
-2.20.1
-
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
deleted file mode 100644
index 3b37db570e89..000000000000
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MAX_API_VERSION="0.44"
-
-inherit bash-completion-r1 eapi7-ver gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0"
-IUSE="gtk-doc +miners networkmanager stemmer"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-PV_SERIES=$(ver_cut 1-2)
-
-# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
-RDEPEND="
- >=dev-libs/glib-2.46:2
- >=sys-apps/dbus-1.3.2
- >=dev-libs/gobject-introspection-1.54:=
- >=dev-libs/icu-4.8.1.2:=
- >=dev-libs/json-glib-1.0
- >=net-libs/libsoup-2.40.1:2.4
- >=dev-libs/libxml2-2.7
- >=dev-db/sqlite-3.20.0
- networkmanager? ( >=net-misc/networkmanager-0.8 )
- stemmer? ( dev-libs/snowball-stemmer )
- sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/intltool-0.40.0
- $(vala_depend)
- gtk-doc? ( >=dev-util/gtk-doc-1.8
- app-text/docbook-xml-dtd:4.1.2 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- ${PYTHON_DEPS}
-" # g-ir-merge needs py3; functional tests need py2, so disabled for now due to mixup
-# intltool-merge manually called in meson.build in 2.1.7; properly gone by 2.2.0
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58
- "${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
- "${FILESDIR}"/${PV}-prevent-stack-smashing.patch
- "${FILESDIR}"/${PV}-fix-library-symlinks.patch
- "${FILESDIR}"/${PV}-vala-0.44-compat.patch # upstream commit e93ea9167dc
-)
-
-function inotify_enabled() {
- if linux_config_exists; then
- if ! linux_chkconfig_present INOTIFY_USER; then
- ewarn "You should enable the INOTIFY support in your kernel."
- ewarn "Check the 'Inotify support for userland' under the 'File systems'"
- ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
- die 'missing CONFIG_INOTIFY'
- fi
- else
- einfo "Could not check for INOTIFY support in your kernel."
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
- inotify_enabled
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dfts=true
- -Dfunctional_tests=false # python2, but g-ir-merge needs py3; https://gitlab.gnome.org/GNOME/tracker/merge_requests/40
- $(meson_use gtk-doc)
- -Dman=true
- -Dnetwork_manager=$(usex networkmanager yes no)
- -Dstemmer=$(usex stemmer yes no)
- -Dunicode_support=icu
- -Dbash_completion="$(get_bashcompdir)"
- -Dsystemd_user_services="$(systemd_get_userunitdir)"
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 334ec5c6d03d..141f1fd5229f 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index 89a82cdb0d2c..89a9c877a97e 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -76,7 +76,7 @@ pkg_postinst() {
cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
CATALOG "${EPREFIX}/etc/sgml/dsssl-docbook-stylesheets.cat"
EOF
- eend
+ eend ${?}
fi
sgml-catalog-r1_pkg_postinst
}
@@ -86,7 +86,7 @@ pkg_postrm() {
ebegin "Removing dsssl-docbook-stylesheets.cat from /etc/sgml/sgml-docbook.cat"
sed -i -e '/dsssl-docbook-stylesheets/d' \
"${EROOT}"/etc/sgml/sgml-docbook.cat
- eend
+ eend ${?}
if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
fi
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 04d8536f09b2..25df3d82d4e2 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -136,7 +136,7 @@ pkg_postinst() {
cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
CATALOG "${EPREFIX}/etc/sgml/${P}.cat"
EOF
- eend
+ eend ${?}
fi
sgml-catalog-r1_pkg_postinst
}
@@ -146,7 +146,7 @@ pkg_postrm() {
ebegin "Removing ${P}.cat from /etc/sgml/sgml-docbook.cat"
sed -i -e '/${P}/d' \
"${EROOT}"/etc/sgml/sgml-docbook.cat
- eend
+ eend ${?}
if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
fi
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index e1b921979e4c..1910a7b6edbf 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -73,7 +73,7 @@ pkg_postinst() {
cat >> "${EROOT}/etc/sgml/sgml-docbook.cat" <<-EOF
CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
EOF
- eend
+ eend ${?}
fi
sgml-catalog-r1_pkg_postinst
@@ -84,7 +84,7 @@ pkg_postrm() {
ebegin "Removing sgml-ent.cat from /etc/sgml/sgml-docbook.cat"
sed -i -e '/sgml-ent\.cat/d' \
"${EROOT}"/etc/sgml/sgml-docbook.cat
- eend
+ eend ${?}
if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
fi
diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
index 3de906698921..1e71263526d0 100644
--- a/app-text/u2ps/Manifest
+++ b/app-text/u2ps/Manifest
@@ -1 +1,2 @@
+DIST u2ps-1.1.tar.gz 110892 BLAKE2B af0dd92d47a8530e8434983132c3bf0f0e6b88ff14cc9d7e73e95c842b4c1dad1b900d91c22a34c8f94373e62382841329e5b2e6b3aa9b51f6e5d6d6d164b596 SHA512 44a470268aafe7b90c17e14a15864924d0ba78b0c8707b9bf076e13b262a9d43d71b6527c5a995f82741e52fe2d07eac6a2626921e7465127a57405d4b5babd3
DIST u2ps-full-0.8.4.tar.gz 5496922 BLAKE2B 416a206b768328cf1a268b4706578610e6bed45ee7475d52de515e112e51bbfcc777b2f21603826d52da42b9c6a3bd10dd4e95920e77c14e957ad4a6d0888984 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e
diff --git a/app-text/u2ps/files/u2ps-1.1-nostrip.patch b/app-text/u2ps/files/u2ps-1.1-nostrip.patch
new file mode 100644
index 000000000000..33ac79c4909e
--- /dev/null
+++ b/app-text/u2ps/files/u2ps-1.1-nostrip.patch
@@ -0,0 +1,14 @@
+diff -ruN u2ps-1.1.orig/Makefile u2ps-1.1/Makefile
+--- u2ps-1.1.orig/Makefile 2019-02-17 20:01:48.000000000 +0100
++++ u2ps-1.1/Makefile 2019-12-22 20:43:17.667058496 +0100
+@@ -18,8 +18,8 @@
+
+ install:
+ install -dm 0755 $(DESTDIR)$(bindir)
+- install -sm 0755 u2ps $(DESTDIR)$(bindir)/u2ps
+- install -sm 0755 psfrem $(DESTDIR)$(bindir)/psfrem
++ install -m 0755 u2ps $(DESTDIR)$(bindir)/u2ps
++ install -m 0755 psfrem $(DESTDIR)$(bindir)/psfrem
+ install -dm 0755 $(DESTDIR)$(basedir)
+ install -dm 0755 $(DESTDIR)$(basedir)/ProcSet
+ install -m 0644 res/*.ps $(DESTDIR)$(basedir)
diff --git a/app-text/u2ps/u2ps-0.8.4.ebuild b/app-text/u2ps/u2ps-0.8.4.ebuild
index 9ba7a301cae0..62fbac22b42b 100644
--- a/app-text/u2ps/u2ps-0.8.4.ebuild
+++ b/app-text/u2ps/u2ps-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${PN}-full-${PV}.tar.gz"
LICENSE="GPL-3 GPL-3-with-font-exception free-noncomm"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND="
diff --git a/app-text/u2ps/u2ps-1.1.ebuild b/app-text/u2ps/u2ps-1.1.ebuild
new file mode 100644
index 000000000000..c28a8ccdd0aa
--- /dev/null
+++ b/app-text/u2ps/u2ps-1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="https://github.com/arsv/u2ps"
+SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-nostrip.patch" )
+
+src_configure() {
+ # this isnt autoconf, so econf fails...
+ ./configure \
+ --prefix=/usr \
+ --datadir=/usr/share \
+ --mandir=/usr/share/man \
+ --with-gs=/usr/bin/gs \
+ || die 'configure failed'
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 822c73ffb9e3..3006418d3ec3 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index dc6c03ed0275..ccca92ebc7d8 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index 78ba8c159ba3..70a79def6121 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 656c0e61d531..eb7797e80caa 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/execline/metadata.xml b/dev-lang/execline/metadata.xml
index a3625cad2322..a7ad08494c85 100644
--- a/dev-lang/execline/metadata.xml
+++ b/dev-lang/execline/metadata.xml
@@ -5,10 +5,6 @@
williamh@gentoo.org
William Hubbs
-
- aranea@aixah.de
- Luis Ressel
-
samuel@sholland.org
Samuel Holland
diff --git a/dev-lang/micropython/micropython-1.9.4.ebuild b/dev-lang/micropython/micropython-1.9.4.ebuild
index ac529849faa7..0b1864dde7f3 100644
--- a/dev-lang/micropython/micropython-1.9.4.ebuild
+++ b/dev-lang/micropython/micropython-1.9.4.ebuild
@@ -47,6 +47,8 @@ src_install() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
popd > /dev/null || die
+ dobin "${S}/mpy-cross/mpy-cross"
+
# remove .git files
find tools -type f -name '.git*' -exec rm {} \; || die
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4526e5c40537..06a40cdfb4d9 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boost-numpy/boost-numpy-9999.ebuild b/dev-libs/boost-numpy/boost-numpy-9999.ebuild
deleted file mode 100644
index d7c8b5b6a0d6..000000000000
--- a/dev-libs/boost-numpy/boost-numpy-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Boost.Python interface for NumPy"
-HOMEPAGE="https://github.com/ndarray/Boost.NumPy"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ndarray/Boost.NumPy.git"
-else
- SRC_URI="https://dev.gentoo.org/~heroxbd/${P}.tar.xz"
-fi
-
-LICENSE="Boost-1.0"
-SLOT=0
-KEYWORDS=""
-
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
-
-
-
-
- heroxbd@gentoo.org
- Benda Xu
-
- It is intended as a replacement for the old numeric support in Boost.Python proper, which is now out-of-date and does not support C/C++ pointer access to the data.
-
- ndarray/Boost.NumPy
-
-
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild
index ca52c5105fe1..3417b408e432 100644
--- a/dev-libs/boost/boost-1.72.0.ebuild
+++ b/dev-libs/boost/boost-1.72.0.ebuild
@@ -56,6 +56,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
# Bug 703294, incomplete Boost.Serialization refactoring
"${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch
+ # Bug 703036, per python-impl Boost.MPI
+ "${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch
)
python_bindings_needed() {
@@ -217,7 +219,24 @@ multilib_src_install_all() {
rm -r "${ED}"/usr/include/boost/python/numpy* || die
fi
- if ! use python; then
+ if use python; then
+ if use mpi; then
+ move_mpi_py_into_sitedir() {
+ local pyver="${EPYTHON#python}"
+ python_moduleinto boost
+ python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so
+ rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die
+ dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so
+
+ # create a proper python package
+ touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die
+ python_optimize
+ }
+ python_foreach_impl move_mpi_py_into_sitedir
+ else
+ rm -r "${ED}"/usr/include/boost/mpi/python* || die
+ fi
+ else
rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
fi
diff --git a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch
new file mode 100644
index 000000000000..8fb164a6278b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch
@@ -0,0 +1,50 @@
+Tag Boost.MPI python impls properly to avoid name clash
+https://github.com/boostorg/mpi/issues/112
+
+--- a/boostcpp.jam
++++ b/boostcpp.jam
+@@ -185,7 +185,7 @@
+
+ rule tag ( name : type ? : property-set )
+ {
+- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
+ {
+ local args = $(.format-name-args) ;
+ if $(layout) = versioned
+@@ -223,7 +223,7 @@
+ {
+ local result = $(name) ;
+
+- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
+ {
+ # Add Python version suffix
+
+--- a/libs/mpi/build/Jamfile.v2
++++ b/libs/mpi/build/Jamfile.v2
+@@ -58,13 +58,13 @@
+ rule python-tag ( name : type ? : property-set )
+ {
+ local result = $(name) ;
+- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION
+ {
+ local version = [ $(property-set).get ] ;
+ local lib-suffix = [ version-suffix $(version) ] ;
+ result = $(result)$(lib-suffix) ;
+ }
+- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID)
+ {
+ result = $(result)-$(PYTHON_ID) ;
+ }
+@@ -168,6 +168,8 @@
+ shared:BOOST_PYTHON_DYN_LINK=1
+ shared shared
+ on:BOOST_DEBUG_PYTHON
++ -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
++ @$(__name__).python-tag
+ ;
+
+ mpi_python_libs = boost_mpi_python mpi ;
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index a14a94a5d969..499f5bcc9ef8 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,2 +1 @@
-DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
deleted file mode 100644
index 21b0e44ab968..000000000000
--- a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz
-Date: Fri, 23 Mar 2018 17:55:11 +0100
-Subject: [PATCH] inspect: Adapt to binding change of
- Signal.add_emission_hook() in vala 0.41
-
-https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
-
-Reviewed-by: Philip Withnall
----
- tools/inspect/signal-manager.vala | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
-index 4d1b6480..7c5b17a0 100644
---- a/tools/inspect/signal-manager.vala
-+++ b/tools/inspect/signal-manager.vala
-@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
- return false;
-
- ulong hook_id = Signal.add_emission_hook (signal_id,
-+#if VALA_0_42
-+ detail_quark, this.emission_hook_cb);
-+#else
- detail_quark, this.emission_hook_cb, null);
-+#endif
-
- /* Store the hook ID so we can list or remove it later */
- HashMap hook_ids =
---
-2.18.1
-
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
deleted file mode 100644
index 7b453ebf1a9f..000000000000
--- a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz
-Date: Wed, 30 May 2018 14:20:27 +0200
-Subject: [PATCH] tests: Use FileAttribute.* enumeration
-
----
- tests/folks/avatar-cache.vala | 2 +-
- tests/folks/object-cache.vala | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/folks/avatar-cache.vala b/tests/folks/avatar-cache.vala
-index d25245c0..ee32e9e4 100644
---- a/tests/folks/avatar-cache.vala
-+++ b/tests/folks/avatar-cache.vala
-@@ -78,7 +78,7 @@ public class AvatarCacheTests : Folks.TestCase
- {
- // Delete the files in the directory
- var enumerator =
-- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
-+ dir.enumerate_children (FileAttribute.STANDARD_NAME,
- FileQueryInfoFlags.NONE);
-
- FileInfo? file_info = enumerator.next_file ();
-diff --git a/tests/folks/object-cache.vala b/tests/folks/object-cache.vala
-index 62d208e6..f2a5188d 100644
---- a/tests/folks/object-cache.vala
-+++ b/tests/folks/object-cache.vala
-@@ -108,7 +108,7 @@ public class ObjectCacheTests : Folks.TestCase
- {
- // Delete the files in the directory
- var enumerator =
-- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
-+ dir.enumerate_children (FileAttribute.STANDARD_NAME,
- FileQueryInfoFlags.NONE);
-
- FileInfo? file_info = enumerator.next_file ();
---
-2.21.0
-
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
deleted file mode 100644
index 01e0bbbfc3f1..000000000000
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.42"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-# TODO: --enable-profiling
-# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth debug eds +telepathy test tracker utils"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
- $(vala_depend)
- >=dev-libs/glib-2.40:2
- dev-libs/dbus-glib
- >=dev-libs/gobject-introspection-1.30:=
- >=dev-libs/libgee-0.10:0.8[introspection]
- dev-libs/libxml2
- sys-libs/ncurses:0=
- sys-libs/readline:0=
-
- bluetooth? ( >=net-wireless/bluez-5 )
- eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
- telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
- tracker? ( >=app-misc/tracker-1:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
- net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50.0
- sys-devel/gettext
- virtual/pkgconfig
-
- test? (
- sys-apps/dbus
- bluetooth? (
- >=gnome-extra/evolution-data-server-3.9.1
- >=dev-libs/glib-2.40:2 ) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-vala-0.42-compat.patch
- "${FILESDIR}"/${PV}-vala-0.42-tests-compat.patch
-)
-
-src_prepare() {
- # Force re-generation of introspection files, otherwise it does not match installed libs
- find -name "*.vala" -exec touch {} \; || die
-
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # Rebuilding docs needs valadoc, which has no release
- gnome2_src_configure \
- $(use_enable bluetooth bluez-backend) \
- $(use_enable debug) \
- $(use_enable eds eds-backend) \
- $(use_enable eds ofono-backend) \
- $(use_enable telepathy telepathy-backend) \
- $(use_enable tracker tracker-backend) \
- $(use_enable utils inspect-tool) \
- $(use_enable test modular-tests) \
- --enable-vala \
- --enable-import-tool \
- --disable-docs \
- --disable-fatal-warnings \
- --disable-libsocialweb-backend
-}
-
-src_test() {
- dbus-launch virtx emake check
-}
diff --git a/dev-libs/libxls/libxls-1.5.2.ebuild b/dev-libs/libxls/libxls-1.5.2-r1.ebuild
similarity index 92%
rename from dev-libs/libxls/libxls-1.5.2.ebuild
rename to dev-libs/libxls/libxls-1.5.2-r1.ebuild
index 9fd4b6191e56..2272ad0499ea 100644
--- a/dev-libs/libxls/libxls-1.5.2.ebuild
+++ b/dev-libs/libxls/libxls-1.5.2-r1.ebuild
@@ -35,5 +35,5 @@ src_configure() {
src_install() {
default
- prune_libtool_files
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
index 4c386426e347..3c1fb36150cb 100644
--- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
LICENSE="BSD"
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index 993ae0503a73..d591c754323a 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -5,10 +5,6 @@
williamh@gentoo.org
William Hubbs
-
- aranea@aixah.de
- Luis Ressel
-
samuel@sholland.org
Samuel Holland
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index ea8437d8bd7b..8ebe5acdfac9 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 32e13a97a2f6..e9c34b494ccb 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,3 +1,4 @@
DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
DIST mailparse-3.0.3.tgz 940370 BLAKE2B 1454750a90e367a2c9ade2d689a0bd3290005db170e6c2f601c23790fd5de701061b8a9cd0dea64eb501e44b3d0a3e40ff75a58ce5bb633837bad682979c097c SHA512 8bc99cb1a3331ee5d40076abe20a15870deb6e28e2b0adb6227a36a01999648a9341168e05f1db96d2458394a13cad643ee1c5dce4d15669165d01c29d95417b
+DIST mailparse-3.0.4.tgz 940428 BLAKE2B e3e33ecfa953766744a6980e0c681bb9b473d4cbf46179c8099f5483e8da46f47bba30d953d1c3629ea6d1719fcdfb0cca8536de3c3159a979cb7b2cde9ff9a2 SHA512 71eaebc1dc8a4698e60e170facaba16a5a9314bcb21c375b2f9a3069d7f1da819bfabc736b244e3f87131149d4efd9363120e77d8a078a0ede15113123d13ce3
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild
new file mode 100644
index 000000000000..ba94254281ab
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+src_prepare() {
+ # Missing test source files in archive. Fixed upstream in next release.
+ rm tests/011.phpt tests/bug001.phpt || die
+ php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
index 410b4a954746..b752387adc1a 100644
--- a/dev-php/pecl-memcache/Manifest
+++ b/dev-php/pecl-memcache/Manifest
@@ -1,2 +1,2 @@
DIST memcache-3.0.8.tgz 70523 BLAKE2B 829c842ac2764327037c5ef620cd4759e16d56e22195c035eeed2722d8a499119489d3304ad5223cf1c89a8e3ab6f6830d67742958ec2a37e302bf8ea265dfb1 SHA512 916c6b21ab7c1021128626c0df35ef0b83cb76b6115fe7c45b003ca4f78ad9484bf3c998bc7ebdee19f84349ff1e56759f74e75aee5bc70b1de9a03c45a99bc3
-DIST memcache-4.0.5.1.tgz 75057 BLAKE2B 2a1b6ce557f9cce3fd7039db8017fc8e7aa0c7b35c2746af2b426aceac0330b56f0a9d3798325b72b07c1af560baa805e1e4db16c803f46bf26a8e4a39d16b77 SHA512 809351b086e5a96bca091e3f7bdbf845d4d549c47c84eaee0f87aed5421bbf8421a503db18593f8616e4c520c46c90c0c945895de685fd046eae64921acfdf10
+DIST memcache-4.0.5.2.tgz 75061 BLAKE2B fbf96fd182ff4b8764c4492edcdac53263176ebe6d63a27e9f3fb32110a016b221722c246e7c1ae49ee973a6e4cdff045876d1c6119f410f2fa3e796c0580e02 SHA512 93e163acf3a6c28f16b5f0982105f6f558cceeb314b3f09ad71655d8a5adf64d23959f1a2f3589eb7e7a7e18c88ba8132014e13f697a737cd570cf9405137384
diff --git a/dev-php/pecl-memcache/pecl-memcache-4.0.5.1.ebuild b/dev-php/pecl-memcache/pecl-memcache-4.0.5.2.ebuild
similarity index 100%
rename from dev-php/pecl-memcache/pecl-memcache-4.0.5.1.ebuild
rename to dev-php/pecl-memcache/pecl-memcache-4.0.5.2.ebuild
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5345df498aba..764ee444ad3f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 37fb1ef7f459..df625ed928fb 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,4 +1,2 @@
DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad4d97197fe87469e0a69e1db79c762965adfacdf92cc43d1bb2eb5e2790f6bdb7e8b288f0feade828bf8e30090 SHA512 9a16450d8fe2a7e94e182ebb03cc785c6de516e356251753abfb79af3958230043f2db59750cde0a6f1fd6cf5568eb8b7ae76d5a3fbcfe9f7807e02867973b55
-DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-DIST PyQt5_gpl-5.13.1.tar.gz 3162737 BLAKE2B 1242069b757ef7d9532375758ab29954f216f6d8b1fa18e433ab41cf56df13b7408547dd5c58eb0417a011d834ef9301aa090a4e88a9b10d48f15267eccbf6a3 SHA512 7b7001b16a8c730d7ff2d340fa1dd118868b53519e8f75e8c2ce00b44e3637ac6a31b41a7456fc610df11ff3928b924cb54c0c3712f22ed4df5058fd8bc77281
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
deleted file mode 100644
index f636c196bc02..000000000000
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
- SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNetworkAuth, QtNfc
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
- multimedia network opengl positioning printsupport sensors serialport sql svg
- testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( gui )
- declarative? ( gui network )
- designer? ( widgets )
- help? ( gui widgets )
- location? ( positioning )
- multimedia? ( gui network )
- opengl? ( gui widgets )
- positioning? ( gui )
- printsupport? ( gui widgets )
- sensors? ( gui )
- serialport? ( gui )
- sql? ( widgets )
- svg? ( gui widgets )
- testlib? ( widgets )
- webchannel? ( network )
- webengine? ( network widgets? ( printsupport webchannel ) )
- webkit? ( gui network printsupport widgets )
- websockets? ( network )
- widgets? ( gui )
- xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.9.4:5"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/sip-4.19.6:=[${PYTHON_USEDEP}]
- !dev-python/PyQt5-sip
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtxml-${QT_PV}
- bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-qt/qtdbus-${QT_PV}
- )
- declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- designer? ( >=dev-qt/designer-${QT_PV} )
- gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
- help? ( >=dev-qt/qthelp-${QT_PV} )
- location? ( >=dev-qt/qtlocation-${QT_PV} )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
- network? ( >=dev-qt/qtnetwork-${QT_PV} )
- opengl? ( >=dev-qt/qtopengl-${QT_PV} )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
- printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
- sensors? ( >=dev-qt/qtsensors-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- sql? ( >=dev-qt/qtsql-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- testlib? ( >=dev-qt/qttest-${QT_PV} )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
- webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
- webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] )
- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
- widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
- x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
- xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS} )
-
-PATCHES=(
- "${FILESDIR}/${P}-timeline.patch"
- "${FILESDIR}/${P}-fix-testlib.patch"
-)
-
-pyqt_use_enable() {
- use "$1" || return
-
- if [[ $# -eq 1 ]]; then
- echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
- else
- shift
- echo ${@/#/--enable=}
- fi
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- $(usex debug '--debug --qml-debug --trace' '')
- --verbose
- --confirm-license
- --qmake="$(qt5_get_bindir)"/qmake
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --sip-incdir="$(python_get_includedir)"
- --qsci-api
- --enable=QtCore
- --enable=QtXml
- $(pyqt_use_enable bluetooth)
- $(pyqt_use_enable dbus QtDBus)
- $(usex dbus '' --no-python-dbus)
- $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
- $(usex declarative '' --no-qml-plugin)
- $(pyqt_use_enable designer)
- $(usex designer '' --no-designer-plugin)
- $(pyqt_use_enable gui)
- $(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
- $(pyqt_use_enable help)
- $(pyqt_use_enable location)
- $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
- $(pyqt_use_enable network)
- $(pyqt_use_enable opengl QtOpenGL)
- $(pyqt_use_enable positioning)
- $(pyqt_use_enable printsupport QtPrintSupport)
- $(pyqt_use_enable sensors)
- $(pyqt_use_enable serialport QtSerialPort)
- $(pyqt_use_enable sql)
- $(pyqt_use_enable svg)
- $(pyqt_use_enable testlib QtTest)
- $(pyqt_use_enable webchannel QtWebChannel)
- $(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
- $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
- $(pyqt_use_enable websockets QtWebSockets)
- $(pyqt_use_enable widgets)
- $(pyqt_use_enable x11extras QtX11Extras)
- $(pyqt_use_enable xmlpatterns QtXmlPatterns)
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- eqmake5 -recursive ${MY_PN}.pro
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- local tmp_root=${D%/}/${PN}_tmp_root
- emake INSTALL_ROOT="${tmp_root}" install
-
- local bin_dir=${tmp_root}${EPREFIX}/usr/bin
- local exe
- for exe in pylupdate5 pyrcc5 pyuic5; do
- python_doexe "${bin_dir}/${exe}"
- rm "${bin_dir}/${exe}" || die
- done
-
- local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
- if python_is_python3; then
- rm -r "${uic_dir}"/port_v2 || die
- else
- rm -r "${uic_dir}"/port_v3 || die
- fi
-
- multibuild_merge_root "${tmp_root}" "${D}"
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.13.1.ebuild b/dev-python/PyQt5/PyQt5-5.13.1.ebuild
deleted file mode 100644
index fdf60501f5b9..000000000000
--- a/dev-python/PyQt5/PyQt5-5.13.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_PN=PyQt5
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
- SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
-IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
- network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
- testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( gui )
- declarative? ( gui network )
- designer? ( widgets )
- help? ( gui widgets )
- location? ( positioning )
- multimedia? ( gui network )
- networkauth? ( network )
- opengl? ( gui widgets )
- positioning? ( gui )
- printsupport? ( gui widgets )
- sensors? ( gui )
- serialport? ( gui )
- sql? ( widgets )
- svg? ( gui widgets )
- testlib? ( widgets )
- webchannel? ( network )
- webkit? ( gui network printsupport widgets )
- websockets? ( network )
- widgets? ( gui )
- xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.10:5"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/PyQt5-sip-4.19.19:=[${PYTHON_USEDEP}]
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtxml-${QT_PV}
- virtual/python-enum34[${PYTHON_USEDEP}]
- bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-qt/qtdbus-${QT_PV}
- )
- declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- designer? ( >=dev-qt/designer-${QT_PV} )
- gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
- help? ( >=dev-qt/qthelp-${QT_PV} )
- location? ( >=dev-qt/qtlocation-${QT_PV} )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
- network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
- networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
- opengl? ( >=dev-qt/qtopengl-${QT_PV} )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
- printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
- sensors? ( >=dev-qt/qtsensors-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- sql? ( >=dev-qt/qtsql-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- testlib? ( >=dev-qt/qttest-${QT_PV} )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
- webkit? ( dev-qt/qtwebkit:5[printsupport] )
- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
- widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
- x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
- xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- >=dev-python/sip-4.19.19[${PYTHON_USEDEP}]
- dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
- use "$1" || return
-
- if [[ $# -eq 1 ]]; then
- echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
- else
- shift
- echo ${@/#/--enable=}
- fi
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- $(usex debug '--debug --qml-debug --trace' '')
- --verbose
- --confirm-license
- --qmake="$(qt5_get_bindir)"/qmake
- --bindir="${EPREFIX}/usr/bin"
- --qsci-api
- --enable=QtCore
- --enable=QtXml
- $(pyqt_use_enable bluetooth)
- $(pyqt_use_enable dbus QtDBus)
- $(usex dbus '' --no-python-dbus)
- $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
- $(usex declarative '' --no-qml-plugin)
- $(pyqt_use_enable designer)
- $(usex designer '' --no-designer-plugin)
- $(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
- $(pyqt_use_enable gui)
- $(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
- $(pyqt_use_enable help)
- $(pyqt_use_enable location)
- $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
- $(pyqt_use_enable network)
- $(pyqt_use_enable networkauth QtNetworkAuth)
- $(pyqt_use_enable opengl QtOpenGL)
- $(pyqt_use_enable positioning)
- $(pyqt_use_enable printsupport QtPrintSupport)
- $(pyqt_use_enable sensors)
- $(pyqt_use_enable serialport QtSerialPort)
- $(pyqt_use_enable sql)
- $(usex ssl '' '--disable-feature=PyQt_SSL')
- $(pyqt_use_enable svg)
- $(pyqt_use_enable testlib QtTest)
- $(pyqt_use_enable webchannel QtWebChannel)
- $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
- $(pyqt_use_enable websockets QtWebSockets)
- $(pyqt_use_enable widgets)
- $(pyqt_use_enable x11extras QtX11Extras)
- $(pyqt_use_enable xmlpatterns QtXmlPatterns)
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- # Fix parallel install failure
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
- # Run eqmake to respect toolchain and build flags
- eqmake5 -recursive ${MY_PN}.pro
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- local tmp_root=${D}/${MY_PN}_tmp_root
- emake INSTALL_ROOT="${tmp_root}" install
-
- local bin_dir=${tmp_root}${EPREFIX}/usr/bin
- local exe
- for exe in pylupdate5 pyrcc5 pyuic5; do
- python_doexe "${bin_dir}/${exe}"
- rm "${bin_dir}/${exe}" || die
- done
-
- local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
- if python_is_python3; then
- rm -r "${uic_dir}"/port_v2 || die
- else
- rm -r "${uic_dir}"/port_v3 || die
- fi
-
- multibuild_merge_root "${tmp_root}" "${D}"
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/PyQt5/PyQt5-5.13.2.ebuild b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
index bf0d0d6170bc..d0702624228b 100644
--- a/dev-python/PyQt5/PyQt5-5.13.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
@@ -154,7 +154,13 @@ src_configure() {
"${myconf[@]}" || die
# Fix parallel install failure
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${PN}.pro || die
+ if python_is_python3; then
+ sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+ ${PN}.pro || die
+ else
+ sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
+ ${PN}.pro || die
+ fi
# Run eqmake to respect toolchain and build flags
eqmake5 -recursive ${PN}.pro
diff --git a/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch
deleted file mode 100644
index 38a20bc36d12..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Fabian Vogt
-Subject: QTest::waitForEvents() is internal only
-
-Must not be used, got removed with Qt 5.11.
-
-Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip
-===================================================================
---- a/sip/QtTest/qtestmouse.sip
-+++ b/sip/QtTest/qtestmouse.sip
-@@ -41,7 +41,6 @@ namespace QTest
- void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
- void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
- void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
-- void waitForEvents() /ReleaseGIL/;
- void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
- void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
- void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
diff --git a/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
deleted file mode 100644
index 857492266e01..000000000000
--- a/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
-index e40d12c..4419f2b 100644
---- a/sip/QtCore/QtCoremod.sip
-+++ b/sip/QtCore/QtCoremod.sip
-@@ -22,7 +22,7 @@
-
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
-
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
-
- %Platforms {WS_X11 WS_WIN WS_MACX}
-
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index a69c270de40d..d337ce9c4697 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -26,7 +26,6 @@
Build bindings for the QtSvg module
Build bindings for the QtTest module
Build bindings for the QtWebChannel module
- Build bindings for the QtWebEngine module
Build bindings for the QtWebKit module
Build bindings for the QtWebSockets module
Build bindings for the QtWidgets module
diff --git a/dev-python/asciimatics/asciimatics-1.10.0.ebuild b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
index 07362efd779c..73514c85cfa8 100644
--- a/dev-python/asciimatics/asciimatics-1.10.0.ebuild
+++ b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
dev-python/future[${PYTHON_USEDEP}]
dev-python/wcwidth[${PYTHON_USEDEP}]
dev-python/pyfiglet[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
src_prepare() {
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index d061a987d835..9b8140dcf245 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -10,3 +10,4 @@ DIST awscli-1.16.278.tar.gz 1509613 BLAKE2B 71799c760f9396d18c86c1fd7da79a115ad8
DIST awscli-1.16.283.tar.gz 1545412 BLAKE2B 98d72a103718def5d2678c36f7654bcb378a5e4df05d17bd545f8d981c571ae9c09412644e233848035041d3fc3fa7fff9dd5b2f98e92b1d1d0fe6897fb17c7e SHA512 5539a665c8997c1fa637bb9cc133888483becc9cd5fe424e8947a83d4448de376b0d7ee3a7a63d07f90c649c956a12f544646795cf4a8a12a09880a05da0d3d1
DIST awscli-1.16.292.tar.gz 1547260 BLAKE2B 3a1792f588b74826c847a78ee0e3db583d1932681256e36a78fe63b238e66e89a7f6cd4b2c8f7028ae3826506bca4d4e483adf48b7889c28732cbfd4d5640cc1 SHA512 f315ff5081865061168082ca74d87c9cbbd681f2b1d581a502f0b2bb3074e6cfa3eaaf9509d19986747677671b68bfbf4b48cb7a2ba1009e186bc85a7ff1664d
DIST awscli-1.16.300.tar.gz 1553269 BLAKE2B 7b22b58bc75bf522828b91b5d97872c9aedd35f3ee6ae29ccbdbfea7a3fc809b336f7abd7e512ab96e9d8ef9305c0ef6f32ae64d1d64920eee56d8f646b3d098 SHA512 78b398d1a19ac94ded67a1b2813cf16bd6b6e236e4207253884b228d7c16bd57b170a5262406bb57b4d17ac4610e9e5abdb5b68ceaed2c5bf094f445a757cd12
+DIST awscli-1.16.308.tar.gz 1612631 BLAKE2B e527704ec0d80f1d1af1ca9b3ca541873113eb0318c866eb193a6fbd830f4f46b62192739b235c3a858a78d7acc8b7b5841520dd4c67dc69d62904e1092294ad SHA512 bdbe22e16914822f08303d91a1f4b4bb3a37abb45ec6d84b027e511c16184cc34d0b26df632a5c5a82e328837d23db4c62d8289d31165be4761003f0f47e002d
diff --git a/dev-python/awscli/awscli-1.16.308.ebuild b/dev-python/awscli/awscli-1.16.308.ebuild
new file mode 100644
index 000000000000..ee40a5670c23
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.308.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-python/botocore-1.13.44[${PYTHON_USEDEP}]
+ =dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+ =3.0', 'setuptools>=17.1'],
-- pbr=True,
-- long_description_content_type='text/markdown; charset=UTF-8',
-- keywords=['munch', 'dict', 'mapping', 'container', 'collection'],
-+ find_packages(exclude=['tests']),
-+ version="%VERSION%"
- )
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 1f2c63f794a0..9bd9cb5a35ad 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,4 +1,2 @@
DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
-DIST mysqlclient-1.4.2-r2.tar.gz 85662 BLAKE2B 5e375c142d392d79ca3b119d52625c3c65a074fb90e71eabd2791823738995d390de90c50c20dced9df91e071d74d7a318cf09779c44387eb4103845486b48ad SHA512 d42969bc37b5148fed14b815280890f07058f75ef99390674f6ba3921f5dbaddc3ab2344f41e3b6d36f35229feffbc419a2ad31e2268e70165b1973356ec9c32
-DIST mysqlclient-1.4.5.tar.gz 86278 BLAKE2B 5ad1c6662c699dfa35e47734e211aa67bca2cb5c74194363b30a1d34a67bb5cd9d549448068aa9f912863e1457e13b42f765b7eaa95a9be0e8596dc550dcd977 SHA512 d6ea6c04618fd274544dccdefc8a7d8f94989a368404d0db1514710d03de5df5c8b864509d8a28feb1cd1d68d9b23967ae9a34f31dd5221b569e64d28a6be022
DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
deleted file mode 100644
index 0f3dc38003de..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- !dev-python/mysql-python
- virtual/mysql"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
- use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
deleted file mode 100644
index 2fff14463c38..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.post1.tar.gz -> ${PF}.tar.gz"
-S="${WORKDIR}/${P}.post1"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- !dev-python/mysql-python
- dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
- use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
deleted file mode 100644
index 11c48995f38d..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.4.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- !dev-python/mysql-python
- dev-db/mysql-connector-c:0="
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
- use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
index 9e86450ea650..11c48995f38d 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${PF}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 77cf6c59a6e6..30626b83b334 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1,3 @@
DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
DIST pygit2-1.0.0.tar.gz 501473 BLAKE2B 854f53113bda2ec5c1fd2ba7f2dfc4213d31d3e687fa17d8942b03dd685cd37df28fc8347bd63ede9650de00b980a4cf7aa1196b9feb9a2365e1fc118d187121 SHA512 33296f95aacbfc3cbce275f84c2025767499738495941408de15ac14f822de132995c05c713b815732dbfc3094edf64351d6240e7201e472b3c47035a7532eff
+DIST pygit2-1.0.1.tar.gz 501496 BLAKE2B 6a844a6ecab453f589f407acbd94aba46018a46374ba745ef50e72f4a5eda35103873287af7533ec963a297775eb3703151beec36984dfbcb68d751057c46c78 SHA512 c225204129cdfa41bcc50d76ff219602bfe910cdb77e246c49ecf5265b5a88c5c4803a7d107f4e00c4ec2f0b0d30e1a729d15413bdca8575d6ec23bb9420a90d
diff --git a/dev-python/pygit2/pygit2-1.0.1.ebuild b/dev-python/pygit2/pygit2-1.0.1.ebuild
new file mode 100644
index 000000000000..ade7039d9db1
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ =dev-libs/libgit2-0.28*
+ >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # unconditionally prevent it from using network
+ sed -i -e '/def no_network/a \
+ return True' test/utils.py || die
+
+ # we need to move them away to prevent pytest from forcing '..'
+ # for imports
+ mkdir hack || die
+ mv test hack/ || die
+ ln -s hack/test test || die
+}
+
+python_test() {
+ pytest -vv hack/test || die
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index c9fd8e685d59..afe4c275980f 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,2 @@
DIST QScintilla-2.11.3.tar.gz 3006383 BLAKE2B 6238aaff44d6136a64e8c38e38c4886357eb72aa4067f54eda1e876040c41ebce8577e244b81a062e9020c4d142439f5612ca88055d0ba87172ff5b8893938d7 SHA512 83406ef2f425c6288fcac52b01417853186ba860e33e14b236801271e034c327cbb00817cb7247e98bafc1844aeff9f24ec4878ac8ec4bd52d0d2d9778f6b884
DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
deleted file mode 100644
index e5efd8e7353c..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
- SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
- >=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- ~x11-libs/qscintilla-${PV}:=
-"
-DEPEND="${RDEPEND}
- >=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --pyqt=PyQt5
- --qmake="$(qt5_get_bindir)"/qmake
- $(usex debug '--debug --trace' '')
- --verbose
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- # Fix parallel install failure
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
-
- # Run eqmake to respect toolchain and build flags
- eqmake5 -recursive ${MY_PN}.pro
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake INSTALL_ROOT="${D}" install
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
index 6a5d22a15232..da865512a763 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc +html +ical +ini +subtitles +yaml"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 3e8aebf1140f..6b960b2fb081 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/assistant-5.13.2.ebuild b/dev-qt/assistant/assistant-5.13.2.ebuild
index cadf194bd845..101ef370f0aa 100644
--- a/dev-qt/assistant/assistant-5.13.2.ebuild
+++ b/dev-qt/assistant/assistant-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.13.2.ebuild b/dev-qt/designer/designer-5.13.2.ebuild
index a8b7efabad8f..2057cc12b543 100644
--- a/dev-qt/designer/designer-5.13.2.ebuild
+++ b/dev-qt/designer/designer-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~x86"
fi
IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
index 7204190e608c..07fbb71c9c1c 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.13.2.ebuild b/dev-qt/linguist/linguist-5.13.2.ebuild
index a68fc6456e49..2163d82be9b0 100644
--- a/dev-qt/linguist/linguist-5.13.2.ebuild
+++ b/dev-qt/linguist/linguist-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="Graphical tool for translating Qt applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.13.2.ebuild b/dev-qt/pixeltool/pixeltool-5.13.2.ebuild
index 3861b3e70819..d6b6997fe0c2 100644
--- a/dev-qt/pixeltool/pixeltool-5.13.2.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt screen magnifier"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.13.2.ebuild b/dev-qt/qdbus/qdbus-5.13.2.ebuild
index 80a36f33a37e..fdd7f20fa3a7 100644
--- a/dev-qt/qdbus/qdbus-5.13.2.ebuild
+++ b/dev-qt/qdbus/qdbus-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Interface to Qt applications communicating over D-Bus"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild
index d1825ded8fdb..8bbeb79dece5 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdoc/qdoc-5.13.2.ebuild b/dev-qt/qdoc/qdoc-5.13.2.ebuild
index 3e3eded14bab..06860e804591 100644
--- a/dev-qt/qdoc/qdoc-5.13.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt documentation generator"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild b/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild
index 59b734c2f95d..183df3622c70 100644
--- a/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild
@@ -54,7 +54,7 @@ HOMEPAGE="https://doc.qt.io/"
LICENSE="FDL-1.3"
SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
REQUIRED_USE="|| ( html qch )"
diff --git a/dev-qt/qt3d/qt3d-5.13.2.ebuild b/dev-qt/qt3d/qt3d-5.13.2.ebuild
index 04fba8cccf35..499aea900e53 100644
--- a/dev-qt/qt3d/qt3d-5.13.2.ebuild
+++ b/dev-qt/qt3d/qt3d-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="3D rendering module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
fi
# TODO: tools
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
index acf062b6f26b..00bc4a1b3056 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Bluetooth support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
index ce110c80f473..667214fe3b99 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild
index cb232869631c..23e235ffcda9 100644
--- a/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="icu systemd"
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
index f289a72e6c88..78d134ab2c34 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
LICENSE="GPL-3"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
fi
IUSE="gles2 qml"
diff --git a/dev-qt/qtdbus/qtdbus-5.13.2.ebuild b/dev-qt/qtdbus/qtdbus-5.13.2.ebuild
index 2c626b82a093..b645075e9de7 100644
--- a/dev-qt/qtdbus/qtdbus-5.13.2.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
index 2d8fdbbec0e4..effa16014aa7 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~x86"
fi
IUSE="gles2 +jit localstorage +widgets"
diff --git a/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild
index bb4dec7d3cb1..7e3762dc4f11 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Qt module to support gamepad hardware"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
fi
IUSE="evdev qml sdl"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild
index f7a45ea0a6e4..24d4ea6e8ee0 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2.ebuild
index 4a9803999039..260ba818a019 100644
--- a/dev-qt/qtgui/qtgui-5.13.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
# TODO: linuxfb
diff --git a/dev-qt/qthelp/qthelp-5.13.2.ebuild b/dev-qt/qthelp/qthelp-5.13.2.ebuild
index 00acac97fb08..a27890b67530 100644
--- a/dev-qt/qthelp/qthelp-5.13.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating online documentation into applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
index 22e2ac697b42..bee26a5b8224 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Additional format plugins for the Qt image I/O system"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE="mng"
diff --git a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
index 4369f40bc4b9..75ee52770e95 100644
--- a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
index ca2cd66cd4dc..ea0592623416 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
index 4cade9f80377..e018471ae827 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Network abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild
index e1cc7035381c..c51a4f715b7d 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
LICENSE="GPL-3"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtopengl/qtopengl-5.13.2.ebuild b/dev-qt/qtopengl/qtopengl-5.13.2.ebuild
index a6e28dc23986..4cd8a78fc39c 100644
--- a/dev-qt/qtopengl/qtopengl-5.13.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.13.2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.13.2.ebuild b/dev-qt/qtpaths/qtpaths-5.13.2.ebuild
index 7ad7beccf192..171082a33f8f 100644
--- a/dev-qt/qtpaths/qtpaths-5.13.2.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Command line client to QStandardPaths"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
index 02d835a235e4..6112dce08972 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
index d8b927f844cf..a442397138d2 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Printing support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild
index ccd667429662..44f052e334db 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~x86"
fi
IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild
index ea7dd3a42dd6..84ae70d7d229 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
IUSE="widgets"
diff --git a/dev-qt/qtscript/qtscript-5.13.2.ebuild b/dev-qt/qtscript/qtscript-5.13.2.ebuild
index 73bc2b0c6124..86e27f2c043d 100644
--- a/dev-qt/qtscript/qtscript-5.13.2.ebuild
+++ b/dev-qt/qtscript/qtscript-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/qtscxml-5.13.2.ebuild b/dev-qt/qtscxml/qtscxml-5.13.2.ebuild
index 791204621d4d..5585487c79e4 100644
--- a/dev-qt/qtscxml/qtscxml-5.13.2.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtsensors/qtsensors-5.13.2.ebuild b/dev-qt/qtsensors/qtsensors-5.13.2.ebuild
index 51f6e6ecadc6..32d1d36625ef 100644
--- a/dev-qt/qtsensors/qtsensors-5.13.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Hardware sensor access library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
# TODO: simulator
diff --git a/dev-qt/qtserialport/qtserialport-5.13.2.ebuild b/dev-qt/qtserialport/qtserialport-5.13.2.ebuild
index 2458b4e9b9a9..84b8dfca053a 100644
--- a/dev-qt/qtserialport/qtserialport-5.13.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Serial port abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.13.2.ebuild b/dev-qt/qtspeech/qtspeech-5.13.2.ebuild
index 72dedb54875e..9e7972000296 100644
--- a/dev-qt/qtspeech/qtspeech-5.13.2.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Text-to-speech library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
# TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/qtsql-5.13.2.ebuild b/dev-qt/qtsql/qtsql-5.13.2.ebuild
index ac072937a619..8a7633390361 100644
--- a/dev-qt/qtsql/qtsql-5.13.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.13.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
SLOT=5/$(ver_cut 1-3) # bug 639140
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.13.2.ebuild b/dev-qt/qtsvg/qtsvg-5.13.2.ebuild
index a8ddea6824a3..dde124f1d73c 100644
--- a/dev-qt/qtsvg/qtsvg-5.13.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qttest/qttest-5.13.2.ebuild b/dev-qt/qttest/qttest-5.13.2.ebuild
index 89869e72212b..84dcbf245ce3 100644
--- a/dev-qt/qttest/qttest-5.13.2.ebuild
+++ b/dev-qt/qttest/qttest-5.13.2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Unit testing library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.13.2.ebuild b/dev-qt/qttranslations/qttranslations-5.13.2.ebuild
index bc67622d9001..5cfc51deea40 100644
--- a/dev-qt/qttranslations/qttranslations-5.13.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Translation files for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild
index 2eeb80b9b8b0..6faeb3a7a8d3 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
# TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
index f5aabf62fdc8..3434a428debd 100644
--- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~x86"
fi
IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
index 1c0cb44e6246..72f4cd393064 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index e2b6c3c5783e..0f097f91df8a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
index 602d61e7739f..0470c9ca9563 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
index a5d628b6fcc5..a6e7d6daf9dc 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
# keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
index dd1d4fcf0251..2384a0aa7725 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.13.2.ebuild b/dev-qt/qtxml/qtxml-5.13.2.ebuild
index 2fd5bc2aa6b6..7db5da14f31d 100644
--- a/dev-qt/qtxml/qtxml-5.13.2.ebuild
+++ b/dev-qt/qtxml/qtxml-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild
index a358eb3e73f5..0239a962758e 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 64145af44931..27151ea452e7 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 3ae37e90cf0f..85f2415598da 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,3 +1 @@
-DIST puppetdb-termini_6.6.0-1stretch_all.deb 21210 BLAKE2B 366c5d0d97e3e1f63e61bc6a8d7d05b621c226cff872c4f780b4b08aac8db9ebcbbe5e5c81f9a79f11e1fc9cedb8c42d86e69055fb5af2195f07c59347699eda SHA512 b410322239933539b685c65c1f85ecca28269adaf94d4521b4ee6d0780701889c6aaec4c01fdcdce1338277544d249c597ac9c697bdacdeb943c53fd6538d348
-DIST puppetdb-termini_6.7.1-1stretch_all.deb 21284 BLAKE2B f56f9bfa97f711be08250cc525714af55b9defe2f12b17b2a5f3ec931d9f2f461f009bd0c3534eee848b45d3454752392479ae179695d27f42bc7e4747903dba SHA512 b03a3ebcc068ab7274abd7096821231dcafc1ce7064b6692f5834f28f3046905c855336c5aff4db1b031a2d06c616a75fa48860f45800bfc167c9045364bbcd4
DIST puppetdb-termini_6.7.2-1stretch_all.deb 21298 BLAKE2B 4f4af664b45385487061c26051060d2fae668e80841e48a7a2db899769ca7cdad84bd7956fd1806526db307a42604bb3fa3e686d6c960a3c7c760286f39e794c SHA512 7e3279b4e82ddece9350399cd1579bb0297f235c5003c93dc37aa23ae81bd1efd83739de5fc2634cc0fccfd222e8eb0603c622acabdce968fa05252c5ae8747f
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild
deleted file mode 100644
index 5dea78fa68fc..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
- insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
- doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.1.ebuild
deleted file mode 100644
index 5dea78fa68fc..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
- insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
- doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.2.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.2.ebuild
index 6d51b944dfdb..5dea78fa68fc 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.2.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
RDEPEND+=""
DEPEND+=""
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index d52a48bf00f9..87d75ebea273 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,2 +1,3 @@
DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
DIST rake-compiler-1.0.8.tar.gz 33547 BLAKE2B 542544543cd6d02a9ff964571244c65a0d748e09ea88027a514f25d13086463094aec29b0961881aa175f9553afcf14fc9f7c12dba0e96a07bf88e21f51e87bf SHA512 30b753d45a1180e034b520ad6385f2799098f0916d55e8b4729f5e3a29dabc1acfa292475edfb384c7809543e1c3e428e28db1bacb5383deb9f4bb31b18d6fe5
+DIST rake-compiler-1.0.9.tar.gz 34780 BLAKE2B 59b736dedf70de3daffdf30b74d251dc3b3d7588610dc57d3aa7e13b55dad2d637b1569beb31075a0e5336d9827adfe3b9f89c9a8b75b141c3012a1d48274d2a SHA512 8a5ccbc4bbe6a546634f939c1cbe42b35d952173bbe914e7a22eb78f3f2e85b48e207ff36b70432fe469a2d07d62b8e59c9827352181122fde76ba89bbc2aca0
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.9.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.9.ebuild
new file mode 100644
index 000000000000..bb6873915d02
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.0.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby24 ruby25 ruby26" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+ # Make sure the right rspec version is used in cucumber.
+ sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
+
+ # Avoid failing features for native gems, this also fails with rubygems
+ sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+}
+
+each_ruby_test() {
+ # Skip cucumber for new ruby versions (not ready yet)
+ case ${RUBY} in
+ **ruby24|*ruby25|*ruby26)
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ruby-ng_cucumber
+ ;;
+ *)
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ;;
+ esac
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7a49e4c9b87c..bf5f34351e37 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1d8d3cf7068e..02af216a2724 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,3 @@
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4
-DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
-DIST cmake-3.16.1.tar.gz 9106878 BLAKE2B f652290f7fcd7d4315d8d0311b021e359ca07c8f62f4f1fb4e67c38407487829320d0b8b9bbf005e241b0d4210bc8ccff091fcda8fe27654dc2217ce19f4dc05 SHA512 62a8c651b1c73648420611bed3e6911da10cc5ac9131f72ef76047cb5f6e78279dc2848044279f537d9c28bb1cfa36c53bb31d00b43fa80c83f6272a1a93f4a0
DIST cmake-3.16.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
diff --git a/dev-util/cmake/cmake-3.14.7.ebuild b/dev-util/cmake/cmake-3.14.7.ebuild
deleted file mode 100644
index befe8838ec4f..000000000000
--- a/dev-util/cmake/cmake-3.14.7.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/rhash
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=dev-libs/libuv-1.10.0:=
- >=net-misc/curl-7.21.5[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( >=app-editors/emacs-23.1:* )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- dev-python/requests
- dev-python/sphinx
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- # Next patch requires new work from prefix people
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
- if [[ $? -eq 0 ]] ; then
- par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' \
- Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # RunCMake.CompilerLauncher: also requires fortran
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
- # debugedit binary is not in the expected location
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest \
- -j "$(makeopts_jobs)" \
- --test-load "$(makeopts_loadavg)" \
- ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable Xcode hooks, bug #652134
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
- Source/cmGlobalXCodeGenerator.cxx || die
- fi
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
- cmake_src_bootstrap
- fi
-}
-
-src_configure() {
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- -DBUILD_CursesDialog="$(usex ncurses)"
- -DBUILD_TESTING=$(usex test)
- )
-
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/vim/syntax/cmake.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/vim/indent/cmake.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
- use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/cmake/cmake-3.15.5.ebuild b/dev-util/cmake/cmake-3.15.5.ebuild
deleted file mode 100644
index c5b28ea77208..000000000000
--- a/dev-util/cmake/cmake-3.15.5.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/rhash
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=dev-libs/libuv-1.10.0:=
- >=net-misc/curl-7.21.5[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( >=app-editors/emacs-23.1:* )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- dev-python/requests
- dev-python/sphinx
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- # Next patch requires new work from prefix people
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
- if [[ $? -eq 0 ]] ; then
- par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' \
- Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # RunCMake.CompilerLauncher: also requires fortran
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
- # debugedit binary is not in the expected location
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest \
- -j "$(makeopts_jobs)" \
- --test-load "$(makeopts_loadavg)" \
- ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable Xcode hooks, bug #652134
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
- Source/cmGlobalXCodeGenerator.cxx || die
- fi
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
- cmake_src_bootstrap
- fi
-}
-
-src_configure() {
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- -DBUILD_CursesDialog="$(usex ncurses)"
- -DBUILD_TESTING=$(usex test)
- )
-
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/vim/syntax/cmake.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/vim/indent/cmake.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
- use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/cmake/cmake-3.16.1.ebuild b/dev-util/cmake/cmake-3.16.1.ebuild
deleted file mode 100644
index 6eac2724fb1b..000000000000
--- a/dev-util/cmake/cmake-3.16.1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/rhash
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=dev-libs/libuv-1.10.0:=
- >=net-misc/curl-7.21.5[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( >=app-editors/emacs-23.1:* )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- dev-python/requests
- dev-python/sphinx
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- # Next patch requires new work from prefix people
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
- if [[ $? -eq 0 ]] ; then
- par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' \
- Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # RunCMake.CompilerLauncher: also requires fortran
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
- # debugedit binary is not in the expected location
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest \
- -j "$(makeopts_jobs)" \
- --test-load "$(makeopts_loadavg)" \
- ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable Xcode hooks, bug #652134
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
- Source/cmGlobalXCodeGenerator.cxx || die
- fi
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
- cmake_src_bootstrap
- fi
-}
-
-src_configure() {
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- -DBUILD_CursesDialog="$(usex ncurses)"
- -DBUILD_TESTING=$(usex test)
- )
-
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/vim/syntax/cmake.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/vim/indent/cmake.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
- use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/cmake/cmake-3.16.2.ebuild b/dev-util/cmake/cmake-3.16.2.ebuild
deleted file mode 100644
index 6eac2724fb1b..000000000000
--- a/dev-util/cmake/cmake-3.16.2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/rhash
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=dev-libs/libuv-1.10.0:=
- >=net-misc/curl-7.21.5[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( >=app-editors/emacs-23.1:* )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- dev-python/requests
- dev-python/sphinx
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- # Next patch requires new work from prefix people
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
- if [[ $? -eq 0 ]] ; then
- par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' \
- Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # RunCMake.CompilerLauncher: also requires fortran
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
- # debugedit binary is not in the expected location
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest \
- -j "$(makeopts_jobs)" \
- --test-load "$(makeopts_loadavg)" \
- ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable Xcode hooks, bug #652134
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
- Source/cmGlobalXCodeGenerator.cxx || die
- fi
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
- cmake_src_bootstrap
- fi
-}
-
-src_configure() {
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- -DBUILD_CursesDialog="$(usex ncurses)"
- -DBUILD_TESTING=$(usex test)
- )
-
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/vim/syntax/cmake.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/vim/indent/cmake.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
- use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 95f0fa04dfb8..684194243ee7 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,2 +1 @@
-DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
diff --git a/dev-util/redo/redo-0.41.ebuild b/dev-util/redo/redo-0.41.ebuild
deleted file mode 100644
index a979123b762f..000000000000
--- a/dev-util/redo/redo-0.41.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit multilib multiprocessing python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-BDEPEND="
- dev-python/beautifulsoup[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
-"
-RDEPEND="
- ${BDEPEND}
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() {
- ./do -j$(makeopts_jobs) build || die
-}
-
-src_test() {
- ./do -j$(makeopts_jobs) test || die
-}
-
-src_install() {
- DESTDIR="${D}" \
- DOCDIR="${D}/usr/share/doc/${PF}" \
- LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
- ./do -j$(makeopts_jobs) \
- install || die
-
- python_fix_shebang "${D}"
-
- sed -i \
- -e 's|/lib/|/'"$(get_libdir)"'/|g' \
- "${D}"/usr/bin/* || die
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 1445d48212e3..c3360d71fcd0 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 021f7ffb84f8..fa003fe9775e 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,3 +1,2 @@
-DIST rcs-5.8.2.tar.gz 1209822 BLAKE2B 48eb7f5dd0d1c1433acb85e7623c1a99a59d2e5fa8b6933b598cec5f20136dc8b370aaa3e3d5dac96e524a98b4380b85d7efd765049a8134d7b293980eeb7d74 SHA512 59bfdb57d1e361f01b6682aae99115e5b181ee429e4d49bf1eadd7c7d24abf8547f7368a608d5aac480ca2b8a095ca3d1b56723ba308c15aa5c612676088c374
DIST rcs-5.9.3.tar.xz 800736 BLAKE2B aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3 SHA512 99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
DIST rcs-5.9.4.tar.xz 801360 BLAKE2B 18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25 SHA512 c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
diff --git a/dev-vcs/rcs/rcs-5.8.2.ebuild b/dev-vcs/rcs/rcs-5.8.2.ebuild
deleted file mode 100644
index 837fd9e7c9f4..000000000000
--- a/dev-vcs/rcs/rcs-5.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="https://www.gnu.org/software/rcs/"
-SRC_URI="mirror://gnu/rcs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/diffutils"
-
-src_prepare() {
- sed -i \
- -e '/gets is a security hole/d' \
- lib/stdio.in.h || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS ChangeLog NEWS README
-
- if use doc; then
- emake DESTDIR="${D}" install-html
- rm -R "${ED}/usr/share/doc/rcs"
- dohtml -r doc/rcs.html/
- fi
-}
diff --git a/dev-vcs/rcsi/files/rcsi-0.5-makefile.patch b/dev-vcs/rcsi/files/rcsi-0.5-makefile.patch
new file mode 100644
index 000000000000..bf5a3d329ee2
--- /dev/null
+++ b/dev-vcs/rcsi/files/rcsi-0.5-makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -38,9 +38,6 @@
+ # Later ones are for the various architectures that I have
+ # successfully tested 'rcsi' on.
+
+-rcsi : rcsi.c
+- gcc -Wall -O2 -Xlinker -s -o rcsi rcsi.c
+-
+ sunos : rcsi
+
+ solaris irix osf1 : rcsi.c
diff --git a/dev-vcs/rcsi/rcsi-0.5.ebuild b/dev-vcs/rcsi/rcsi-0.5.ebuild
index cd4a10ad87e1..72d00168b457 100644
--- a/dev-vcs/rcsi/rcsi-0.5.ebuild
+++ b/dev-vcs/rcsi/rcsi-0.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
+
inherit toolchain-funcs
DESCRIPTION="A program to give information about RCS files"
@@ -11,20 +12,22 @@ SRC_URI="http://www.colinbrough.pwp.blueyonder.co.uk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="sys-apps/sed"
RDEPEND=">=dev-vcs/rcs-5.7-r2"
S=${WORKDIR}/${PN}
-src_compile() {
- $(tc-getCC) $CFLAGS $LDFLAGS rcsi.c -o rcsi || die "Compile failed"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+ tc-export CC
}
src_install() {
dobin rcsi
- doman rcsi.1
+
dodoc README
- dohtml README.html example{1,2}.png
+ docinto html
+ dodoc README.html example{1,2}.png
+ doman rcsi.1
}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index cd5d38e74847..6f6e56e51195 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index a4bff25f165a..b5ea21cb22bf 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -457,7 +457,7 @@ elisp-site-regen() {
# was actually no change.
# A case is a remerge where we have doubled output.
rm -f "${T}"/site-gentoo.el
- eend
+ eend 0
einfo "... no changes."
else
mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index cef31a087798..d9ea22ab2aca 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -198,7 +198,7 @@ llvm.org_src_unpack() {
tar -x -z -o --strip-components 1 \
-f "${DISTDIR}/${archive}" \
"${components[@]/#/llvm-project-${archive%.tar*}/}" || die
- eend
+ eend ${?}
else
local c archives
# TODO: optimize this
@@ -212,7 +212,7 @@ llvm.org_src_unpack() {
mkdir -p "${top_dir}" || die
tar -C "${top_dir}" -x -J -o --strip-components 1 \
-f "${DISTDIR}/${archives[0]}" "${sub_path}" || die
- eend
+ eend ${?}
done
fi
fi
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 8929a1869fc6..6d469564fa5c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1763,8 +1763,10 @@ gcc_do_make() {
toolchain_src_test() {
cd "${WORKDIR}"/build
- # enable verbose test run and result logging
- emake -k check
+ # 'asan' wants to be preloaded first, so does 'sandbox'.
+ # To make asan tests work disable sandbox for all of test suite.
+ # 'backtrace' tests also does not like 'libsandbox.so' presence.
+ SANDBOX_ON=0 LD_PRELOAD= emake -k check
}
#---->> src_install <<----
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 12863465be80..a6eb0590e2ee 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index 15911e7204d3..30b76d5b16ac 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,2 +1 @@
-DIST gnome-nibbles-3.24.1.tar.xz 1651024 BLAKE2B 99b3f4f2e0c3a2ec8b75cf137f6e73848461fb20cbed55e6aef216f357babd67dd449ec36fde87084acf3b8f014b813672a75e1dbe11d33ee8fcc3e52af2a903 SHA512 7f3d7240f64429398dae1cdee96d912a22a4f534752d656ab470bcaa8515e005c8b7015e93b162ba24c3b891a64f3b3b84639c2254c1c7e6c45aea229492cc02
DIST gnome-nibbles-3.32.0.tar.xz 495180 BLAKE2B dd7c14a1ec3900e25b64f92519c51eadedf5eac6faa9f8a35612876cf2bb796049f278e904e796aba427f579c5bda093a15dd5310141b9dd7be179b0ecf5b629 SHA512 f151b66edcde40e971113cdff7f3b92d740b2f04d943a168cc5471a18fabf5649d31d68beb3ad3ce29f91b36d34ff49725ce0c67f87184f6af1cafd0aed92349
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.24.1.ebuild
deleted file mode 100644
index 3361dbbd9313..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- dev-libs/libgee:0.8=
- dev-libs/libgnome-games-support:1=
- >=media-libs/clutter-1.22.0:1.0
- >=media-libs/clutter-gtk-1.4.0:1.0
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/gtk+-3.18.0:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50.2
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- gnome2_src_prepare
- vala_src_prepare
-}
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index bd1fef65183c..7a4d395ceb85 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,2 +1 @@
-DIST gnome-robots-3.22.3.tar.xz 540824 BLAKE2B 2f6943b97878d37da8c8a59cc7752b2c0eba35bc9eea1cf4b8a221fbae59ec4730af2ae71b25f2e946ee1edcabdb1a72a67cb1754350728b737fa26e3f9193e3 SHA512 d521527d9ceab16f4e3c64677044c87e46f38291ff126cc2280f69100750cb0317e6ad45e8a0abaa4dad38b67b958cac66653c33ba7760a410354f9190c02399
DIST gnome-robots-3.32.0.tar.xz 422684 BLAKE2B bf66057da9ed52ffe641d28aa522d7851a1ac7881369d1329507beffdeb3f9dc6a46988993c899783576e8c63730245dd340b62267809d1334515dabc2d599e4 SHA512 b037d576eea45843ae4c13ddf284a598931b295257688f6fa458fb4e33b987c01dd70d34007703b3f7bcb97cf8aa306e6473e4c24e5ee0253f1beaafcff1c6f7
diff --git a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild b/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
deleted file mode 100644
index c6c722054da7..000000000000
--- a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Avoid the robots and make them crash into each other"
-HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- dev-libs/libgnome-games-support:1=
- >=gnome-base/librsvg-2.36.2:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index de296c20ae6d..ed140f0c7515 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest
index ae133a0ea7a5..849df408cc26 100644
--- a/games-board/four-in-a-row/Manifest
+++ b/games-board/four-in-a-row/Manifest
@@ -1,2 +1 @@
-DIST four-in-a-row-3.28.0.tar.xz 740784 BLAKE2B f5d2af3514e7629026da5f1aedf22945eddb44b6917922d175f4e5aa160ea7266e0ab101866c1d5220d0e835e60544e4ec8fc6016d908e580a7b1057fc8db7f0 SHA512 a13d6db2c32cc19e8504c1e8baa7b0e28f59e3fc604940d51742d3fd2b266ac90a92e638df2449bcca5e828923c7ee9ff1424a095a98fd5e1d76426a444d7ede
DIST four-in-a-row-3.32.0.tar.xz 507596 BLAKE2B 8253c1f44d7c3e27d2e3fe64984aff5485569496d85a77a48b2fd67fee065377f4667b92524481838787c0b7f27e16250b0aa1bc53ff470624f9da92187b7e44 SHA512 f74dcb072c4da03b8cfc274d92a0eda8ca1fbea4b216b4add793155ae63bd8cc1c784ea2b553a198616dbc2254bb1d5567ddc1608f027eaf6e0a594741a2ab96
diff --git a/games-board/four-in-a-row/four-in-a-row-3.28.0.ebuild b/games-board/four-in-a-row/four-in-a-row-3.28.0.ebuild
deleted file mode 100644
index 5da5cd26831d..000000000000
--- a/games-board/four-in-a-row/four-in-a-row-3.28.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Make lines of the same color to win"
-HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
-
-# Code is GPL-2+ but most themes are GPL-3+ and we install them unconditionally, CC-BY-SA-3.0 is user help license in v3.22.1
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib:2
- >=gnome-base/librsvg-2.32
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index db2b1dbd5145..6e768cae226c 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,2 +1 @@
-DIST gnome-chess-3.30.1.tar.xz 1699668 BLAKE2B 5cb445248f3e223354f5145ee6e652b05d2ced44cbe63705fd54514d7848b5932b3aced35e3e6b72944f0e1e2c2b73ff8b9ad2b0c38fa0e90de5e59bf1da36e5 SHA512 ddf1b62b189adb01e9874606fa45b77b00bb5ca52609db60c58b6c0bca5340786f37a8ef813bb82213c8f7335117d2b896420826cae131db13e77d72e8ad5804
DIST gnome-chess-3.34.0.tar.xz 648464 BLAKE2B c06474fbdaeb9dfc26fbadaa6f5dc83179cdc6d09b8007b2dfcd88a4af4a6113913cffa8f00ada7a788585d723c5917f7ad7944bf466411119e7979545f40f29 SHA512 dcd4c2cfb0ebb5d3481bb6f722ac847cb8976e31352286a245457a62291445f50ad86ce26a37c222112801dc807bb567ed4d71d2d6ccb1628c2cab0767445012
diff --git a/games-board/gnome-chess/gnome-chess-3.30.1.ebuild b/games-board/gnome-chess/gnome-chess-3.30.1.ebuild
deleted file mode 100644
index 435522543d8c..000000000000
--- a/games-board/gnome-chess/gnome-chess-3.30.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.44"
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=x11-libs/gtk+-3.20.0:3
- >=gnome-base/librsvg-2.32.0:2[vala]
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- dev-libs/appstream-glib
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-DOC_CONTENTS="For being able to play against computer you will
-need to install a chess engine like, for example, games-board/gnuchess"
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-src_install() {
- meson_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index f0c95dd352d3..44dae70c9b64 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,2 +1 @@
-DIST gnome-mahjongg-3.22.0.tar.xz 4323836 BLAKE2B 7bd009e744ed4a6f8247206292d7a63d3cdc9cb14c0ac31e86d379272a14248b2b22e51fc3605d7ade3d928f23ba920d3aed4e2d8bc044d04ba2f8c51ec1b869 SHA512 3941eedb8df2f20913839fafa458ef3000a24269d7515c65a24162e0d4ff4a2a8f130f7ee27e66bde08ccf8a87ee207e96e8179757e0d557965f8aa20fe59c6a
DIST gnome-mahjongg-3.34.0.tar.xz 3065320 BLAKE2B a0e706a6e12c9cea7fa35a106b6b9f104af42fecc01b5f84aa07b1d12ccd9fe80e06accbe64681676fb2a081fc6dd232807f0f3e1b3f49cac46529194128a2ba SHA512 3dbd1953f88cd454ddfa84e9976ca5848dbac0d0fc426738d2e98117d12fe90b1875365071fc4299c02bd298ce27ecfcae709aa2ef7399c41f217a2548521f61
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.22.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.22.0.ebuild
deleted file mode 100644
index b1a78c2822f6..000000000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.22.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40:2
- >=gnome-base/librsvg-2.32:2
- >=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- virtual/pkgconfig
-"
-
-src_prepare() {
- gnome2_src_prepare
- vala_src_prepare
-}
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index fd29dc6ceb72..210cae124ea6 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,3 +1,2 @@
DIST gnome-mines-3.20.1.tar.xz 3147092 BLAKE2B 899a66905a95a41f007f0b74f8b4054c505b4b46eff6c0ebbefaf1826d36093307a9bbc55e42b6c1abd8a0f9a419a3d1822deb113414bd5eadcba1c3a9896614 SHA512 cdde771736b9110a416ec68d6e4ce2ce10e3de36915b57905f6f5d86a937c75a2dbfafd1ecc0c5f31dd5e267d13444a8a95d38815f400d4597e2fe73a908bd13
-DIST gnome-mines-3.30.1.1.tar.xz 369132 BLAKE2B 0b773ff7198335256a5133410458e16ead8596f930b9cd1efa7aa806fc3a19521eb2ca235e522ce03437925ffbc4a816d6b36414c618b83bd50c8b66fd399c72 SHA512 796a17b63cb5cec6fab8b7b5a5c995ac940cc49e1cb1254bab32598b0cd7fb4da03e7a80db117977a78cee94a79f0d8cf3222de5e63424348666c65b51045d6f
DIST gnome-mines-3.34.0.tar.xz 272448 BLAKE2B 9c290293117ff7a843794636f5af90bc0a9956d39c4cfd5fa516b8f6ffff99165d60cc93bf0e7c5fa1b92c4c0e8c4a9c6801d5f9ad9fda5e4d151949d6c530a8 SHA512 90486f28427d51b9c1a4f959bd3f0f41087c881486d9cd3e130fd3371a4375c844ca650d9850c43878da6e95d366137ca99003b5a9ae7699f17e1d7719f81ce1
diff --git a/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild b/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
deleted file mode 100644
index 2f20a5a7cef2..000000000000
--- a/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40:2
- dev-libs/libgee:0.8
- >=x11-libs/gtk+-3.12:3
- dev-libs/libgnome-games-support:1=
- >=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-libs/appstream-glib
- dev-libs/libxml2:2
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index 551b437482b3..3873c910fe21 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1,2 +1 @@
-DIST iagno-3.30.0.tar.xz 750432 BLAKE2B 073353cb1dd732b07949536410d2746fc15462bb1ab9f0174d0a3e22a7b221ba8a13a57eb197192384f83e9d1e4c9373fef88e42e8aa1a454c30748294719ec9 SHA512 8acbcb6c03f46cd59555cd759d4291db671de76ca365416d21b6a0a7b3796fc03aeb4a4d2ef1fb69c17f8941262bb9e8403b19fd526e22e9ed2dc2e854834ca1
DIST iagno-3.32.0.tar.xz 500636 BLAKE2B 0c2995bcec9a1861ef0822fc71917b54a2633384279b547269174e262837d2a4b0cd4537b8cffd7d655e7e7f13a1dfca62cef41f7f3e76ef6b293a7640ad6da1 SHA512 596e8a0bc7afcb711b77da7ee1c6acdd45fdf2c845af393f5173362ae5ca53c029190b21918e50ed1715a2701fcabc1ce169417760a2424093d219a44fd9960b
diff --git a/games-board/iagno/iagno-3.30.0.ebuild b/games-board/iagno/iagno-3.30.0.ebuild
deleted file mode 100644
index c99f14968435..000000000000
--- a/games-board/iagno/iagno-3.30.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.40:2
- >=gnome-base/librsvg-2.32.0:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/gtk+-3.15:3
-"
-RDEPEND="${COMMON_DEPEND}
- !=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure VALAC="$(type -P true)"
-}
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 15eefabbbfbf..4feff4b8ac7b 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,2 +1 @@
-DIST tali-3.22.0.tar.xz 1716728 BLAKE2B 74420b49f9b7c44220fce4a4e692a35a6cd9c566eac6bc96615aba184c8bd05001871dc5973da1ad14db81bcbe9f7f45cc4c25f884304c6a8b89989c56dcd226 SHA512 63b50e6a27115fa9502fb86112ac02a987faff40e3eec8f0dc654bea2f001c0a252a6e1331ee3515d7194befe4e27dcde6d704a0f8a777d29e813c454a583ed0
DIST tali-3.32.1.tar.xz 1636032 BLAKE2B 2d8ea2bac7c0a74833a3cd6768bb5cd394c4b02ee5a7fad151d662f417a536b5cc4784ad4338435d80bdc9db025da2a258c05cbb54b7edd038a37b0c990889ca SHA512 78abdfca84a86100be94a1509f0bd00bb84d9f97bfed87f6378e55adedb0c8d7349a9ebead6d8eac8b9c52b52ae6e7b2a868ac9a2262dffafc4e5ad23a455e7d
diff --git a/games-board/tali/tali-3.22.0.ebuild b/games-board/tali/tali-3.22.0.ebuild
deleted file mode 100644
index 089bc788d043..000000000000
--- a/games-board/tali/tali-3.22.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Beat the odds in a poker-style dice game"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib:2
- >=gnome-base/librsvg-2.32:2
- >=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 11edf31a7b6c..fa8e23bd83b5 100644
Binary files a/games-kids/Manifest.gz and b/games-kids/Manifest.gz differ
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 35a7333c05cb..657ef5316634 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,2 +1 @@
-DIST gcompris-qt-0.96.tar.xz 73221940 BLAKE2B e6d81d1630d962709a1ab27c8735ac42ce67182440f3e78a7d3f39b59b28617211dddf3f6d62a323ee5af7f147e2dc784ff0b305bee7b345d1e59d3ed576ef1a SHA512 980bac743d786d3b35c28cec90bd785d568177c9299f5460918124d111565609fbcd35ec76412776151f6fe12ba9ab3efc77bc5cb05895e54dc7822f9862214c
DIST gcompris-qt-0.97.tar.xz 75362060 BLAKE2B e6bc429ba4a8a622792935c9b2e68149f5c1f4d9aae4cac84ca517ebe83e59a9b4307f6ce84b36e658256cad5c8bd37b7cbc60a058b6d65be372ad1934cf666f SHA512 23cc807238121a6ea3abb8816795b2f3b243c3be1acf782705468d92758a2032a8cb5393c3c30028877d174ff53ebc3a62f69e9045bc70a5281d1d245b6e4eba
diff --git a/games-kids/gcompris/gcompris-0.96.ebuild b/games-kids/gcompris/gcompris-0.96.ebuild
deleted file mode 100644
index aba03db4d756..000000000000
--- a/games-kids/gcompris/gcompris-0.96.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="https://gcompris.net/"
-SRC_URI="https://gcompris.net/download/qt/src/gcompris-qt-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgraphicaleffects:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[qml]
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtsensors:5[qml]
- dev-qt/qtsvg:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-qt-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- # TODO: add box2d support
- -DQML_BOX2D_MODULE=disabled
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- domenu org.kde.gcompris.desktop
-}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 86d296558459..ef7c0ecc0314 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index fea8fac297cd..0637946416ca 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,3 +1,2 @@
DIST five-or-more-3.28.0.tar.xz 1507188 BLAKE2B 992bc75847b7e51cb5b5a23c3d3aad89a6daee00546711cf1d273663d2ebf8c2801c7a42f2aae1154114715d56ab1395def074beb30944762e9c560311880377 SHA512 33bf396426401dde2b326af8e7d137c23679589568e78f8b7e0020c074169318ba7925ecbd23bc18a2cfe0abecfca05c3090b78f1f86801c84e6fa385ca23f8b
-DIST five-or-more-3.30.0.tar.xz 1445044 BLAKE2B c26e1cf781f32e74d3fb65757cfef3f4dbf078e2dc047e49d12de3d03850c6395f98f90368bb0df4bfeee22db0da76580e3c1c62ff26cc5236e37acb9fca84e5 SHA512 20c5b089c00808f3d170dae514da35b02dd007feb6daa3e818c435bf09b012b343839aad82a9cb022bc0247388bde387d35e8d428b2f561c4a7ae43073bed469
DIST five-or-more-3.32.0.tar.xz 1238080 BLAKE2B ce810414ff58dff833560f1540f533aaa9fccf20af4a0b6ce42d6c4dafc21c72c210c0b710e1ae1ff04fa33f1e23ffbcc498a547169d216d26d02fd1fabbc1a4 SHA512 7a2eeed345754e8d27e626a63eb6ea00b22dd600e405899543c402490b953d3675597fa2c2df6f661108ac818664f82682f710652cfb2a0058c1da753d21df80
diff --git a/games-puzzle/five-or-more/five-or-more-3.30.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.30.0.ebuild
deleted file mode 100644
index 5da398c241c5..000000000000
--- a/games-puzzle/five-or-more/five-or-more-3.30.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Remove colored balls from the board by forming lines"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=x11-libs/gtk+-3.20:3
- dev-libs/libgnome-games-support:=
- >=gnome-base/librsvg-2.32:2
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index dcfa4734ea4f..035c62ad8a95 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,2 +1 @@
-DIST gnome-klotski-3.22.3.tar.xz 664380 BLAKE2B 3c5ca5da9baa30921796a8701fcd2e1f5214fe19070895390fd26617af6eac7dbe12c92e643cfd2b3b5b1bbb0303e4272e338100f23a79011939506a433be014 SHA512 d86b39c60b545abfe6fce2366dd40e2d603e635f4b33c42e76a4447b845981c51fadfdb8f9f073e515ccd9772c9ee5f29258ac63b6620acff03150cc52a51d0d
DIST gnome-klotski-3.34.0.tar.xz 846780 BLAKE2B 9928b79b0963078cb046eda5d776080fa61c6b2bf09af3da5da1e15ee7385771d792522dc44c63c1b4b3f0d218e4fe41b09fa35a86e90ae15b39a5fddf066667 SHA512 6a21588895594abe772d0a4cac3bc4049586078b35514647d1d9847472cae809c1a916a8bcd12775df5331a58058936e9723f0fd5e80844df2b362596e0694c5
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
deleted file mode 100644
index 14f34f774e13..000000000000
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Slide blocks to solve the puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- dev-libs/libgee:0.8=
- dev-libs/libgnome-games-support:1=
- >=gnome-base/librsvg-2.32.0:2
- >=x11-libs/gtk+-3.19.0:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- gnome2_src_prepare
- vala_src_prepare
-}
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 1152f6564d7d..82fc43335215 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,2 +1 @@
-DIST gnome-sudoku-3.30.0.tar.xz 430480 BLAKE2B ddf5462ae9e37d1428ca96468dc8fc5f6a157c541f79cac2a96fbbcc082d4bda8adc3539add48f7cb248caa722c21bc14bdabce54a94ae6cfbfd62d2be18c500 SHA512 ca1b830279b89bb35c281eec275af758cae32c0caec7b09a02790efc272701fa03aafb61000dcabc0ac78c7b04d886290c75bd79d6a3d8a89565dc0b122862c4
DIST gnome-sudoku-3.34.1.tar.xz 355424 BLAKE2B fcf8a175e1b2dbbb4498d185ee4b628766fe4c112c5126d253ecf16430a8e1b647fd9b4779b8dea24fb6bd8460d2b8824f087b077c7b91d8764ddfae97d72d46 SHA512 a1967098d10a28fd5e49e6e63c9c0aec7f2c80dbe5973ef4fafe175f39e3d885c4c428953e528ee0fa3eea05c644f0aafea133b195acdf7e495314fe3d8d090c
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild
deleted file mode 100644
index 8c5504ead34b..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.36"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40:2
- dev-libs/libgee:0.8=[introspection]
- dev-libs/json-glib
- >=dev-libs/qqwing-1.3.4
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.19.0:3[introspection]
- x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-libs/appstream-glib
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-
- # Make build compatible with vala release <0.38
- sed -e "s/\(--vapidir.*\)/\1, '--target-glib=2.38'/" -i meson.build || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index d6067e707506..d83d9bac9e13 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,2 +1 @@
-DIST gnome-taquin-3.30.0.tar.xz 4553892 BLAKE2B f397dddb8d8564fc403b971f044e1d39bd779af370670f45469490aa0f9f8da857d6b216f8378346d835d9b13c57d47bd960a993cc1eb3d33e705f82b5474f30 SHA512 77c500c7871440abd18cc34d64bfba1b89d7067557cfd12306f887ea1a8138dc040b00203ae6515755ec3bb13beed8a523b039c00112fce7f8e80f3ab34398f2
DIST gnome-taquin-3.32.0.tar.xz 5234188 BLAKE2B c302cc24385161d7cb12f77a8278399ef0e08322912d1afa0fce92a8064ccf8320de570f5995a84354db92179f697e31a600ad2144d44d9d006f539a1135428b SHA512 b874d38ca3a3d31fecabe0f0661d0410e69d744e06192c037f8a71da11e963e2a557780eb1a7fe9c75dd64a969b8d39c3ec1318ffe6a99c4248652ff5a416418
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.30.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.30.0.ebuild
deleted file mode 100644
index 635595621ca3..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.30.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Move tiles so that they reach their places"
-HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40:2
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/gtk+-3.15:3
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources (xml-stripblanks and to-pixdata)
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-libs/libxml2:2
- >=dev-util/intltool-0.50
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- x11-libs/gdk-pixbuf:2
-"
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 50c8b1689881..058bf4485b5d 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,2 +1 @@
-DIST gnome-tetravex-3.22.0.tar.xz 2170464 BLAKE2B 43ee2d93a8d8b2a1f9515ee23a85a77be3f30b299652f2b5192d5f97bf3064d6a636f10e78438aee329ad91d1f0b7fed6ec2109593397b7c849c36ec727692d2 SHA512 d4497fae7e2c95f6d6e26b72690c86ec12250ccc6136f02436a53fa285215415a471d91f2ded10690faced6f6f856218750eb76313d368863a7a31afd02a9d2d
DIST gnome-tetravex-3.34.1.tar.xz 914192 BLAKE2B 2bf9dd70d3c8bd71d7f6f4cc8412ad0ef1f89191890910253b8986b633a8d02660867d4be088d27ff50551c5de14448f4026689230984de213cd2c46d69a091b SHA512 bdf39318b093b10e4a018cd7ef4d8acc65013325bb5406347024f870be2758a42b6b9cdd01d6098d06372cef8967eb948857453f951f8fb54f469bb534642059
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
deleted file mode 100644
index 292f7923c60f..000000000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Complete the puzzle by matching numbered tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.40:2
- >=x11-libs/gtk+-3.13.4:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- gnome2_src_prepare
- vala_src_prepare
-}
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 9e0934e783a7..cb38c62b0bc6 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,2 +1 @@
-DIST hitori-3.22.4.tar.xz 471136 BLAKE2B e9581f9588ab307fba781b3907c1e5d5a34db462a9fa050cf6b2438efbae76ed74fc69623de28a2ec59c4340f487df68156dee453a314adab7cb6846edc347ef SHA512 8c75824d29918c096f3a33283dcb2e49e227c8259d37a4ae5e77d420d4a18a2760f789e12f32cfb8ffc16bfdf19e4aca26d93719d6b762c15b9ac4dbfca93e1a
DIST hitori-3.34.0.tar.xz 163152 BLAKE2B a52446fe62c2d09e9f1f97e77dc82a2902c05013e6c13d64ef58c4b9fcb500cc8533ea094bc91c1c933f5923e3dc889b5db23b1050d8809c0f405ba81917bfe2 SHA512 f4c67da619fdefe03492dacee81bb7972ec40e003c51a1363c19b6eb2690505a0a14e7402ddb61ef0487605d91a7674654ecc470e01febe649b25e173a889354
diff --git a/games-puzzle/hitori/hitori-3.22.4.ebuild b/games-puzzle/hitori/hitori-3.22.4.ebuild
deleted file mode 100644
index 33183ab94665..000000000000
--- a/games-puzzle/hitori/hitori-3.22.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Logic puzzle game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=x11-libs/gtk+-3.22:3
- >=x11-libs/cairo-1.4
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 7ed46ec77c13..1d77959a4c36 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,2 +1 @@
-DIST lightsoff-3.30.0.tar.xz 714072 BLAKE2B 9e8c2354b2ccedc10a00e32f9809f2c7ad653da8cb3d6af2156ad701f64b8e9405c705a2424ca549f475d57182981d536a225075f5b8c2bc7596f28317ae40e7 SHA512 b7868b26d81c1dc91dbfbb25ed260c35fef5ad63310818c68716cabbbc583d6f22697de50d6aa739852ab0f42b217bd2a670e3774e1c541bfc5e16a2c46ac1e2
DIST lightsoff-3.34.0.tar.xz 683944 BLAKE2B bd9c1c8cd29ac46e40bb164a9d5fdea66d2933b0b9ebb8022a7c1370f572da9b89bd5e70cd8bd01aad32c6cc43d5a2e10542c91f42bfb811d85598329847bafe SHA512 dafdb121810f931dcc795decf6d94f3b9fb4c67b0ea2362451f1a73fe96ff8278682ac32dd3db4d0653d530e75ec4b37effa6ee55c916b72ea8d3de618ecf7a9
diff --git a/games-puzzle/lightsoff/lightsoff-3.30.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.30.0.ebuild
deleted file mode 100644
index 0cdbf07e9567..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.30.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.38.0:2
- >=x11-libs/gtk+-3.13.4:3
- >=media-libs/clutter-1.14.0:1.0
- >=media-libs/clutter-gtk-1.5.5:1.0
- >=gnome-base/librsvg-2.32.0:2
-"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-libs/libxml2:2
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- $(vala_depend)
- gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
- mv data/icons/hicolor/symbolic/apps/lightsoff-symbolic{,.svg} || die # fixed upstream in commit 360bfb9564
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index a3129ebea83b..ab2de70e33bb 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,2 +1 @@
-DIST quadrapassel-3.22.0.tar.xz 1737252 BLAKE2B fb3d611f59b4b42d1e3278e562b5d537bbd3fa5de9d433d8445c291971a777b674ec384d7faf6c3b09fd6187555fc448fb38d2a379ea3c2bb7f7b321e6a9346a SHA512 82cbac9b8bc1e7d0bc7958807037893c2dd0286fdc63c2f35ffc7fdcfd839cc6ddd115bada057aa9a3694fbb2736c0c7b852e0156be6fd59a85f6eb06f6f9a84
DIST quadrapassel-3.32.0.tar.xz 478332 BLAKE2B c685ecdc542ea29dea145fb93409d951a058a7451cc0f6795a6c7e61387d891f6941e8569f4e61b4f473f72b4045d348669920d5847ba6165e891fac58bfa42c SHA512 c618d4b35888122fcdecb6085773d30198907d09dd234283650c96f1e7a5994f51e1ef33f7df2732c1ab28cf73f5fb3a4e35bd8780e782714c3faeb0eb46d24d
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
deleted file mode 100644
index 8cb616260546..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib:2
- >=gnome-base/librsvg-2.32.0:2
- >=media-libs/clutter-1:1.0
- >=media-libs/clutter-gtk-0.91.6:1.0
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- gnome2_src_prepare
- vala_src_prepare
-}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 8b4ebbd1c0d3..ad5038773428 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,2 +1 @@
-DIST swell-foop-3.30.0.tar.xz 1117832 BLAKE2B 4cbf829140bd3ff14c09c83b8ebf8a82a00e97d8f73f82ad3fe11220d9ef89a1bdd116ec28235e5ae02bf258021ff6fceb968f1e39598ea606a4c613e0a43f8f SHA512 233ffd2acec9590e97d410a4084e2fa6f9e1b9dc80aec643c8a20de008410930a3cbda901dee63180c6ea469c91db489d513d9bc34edc4e3448cc53a3c76e029
DIST swell-foop-3.34.1.tar.xz 732008 BLAKE2B e41527ce485fc7d41b3b8667fba1100fc79a1683adbe7948ecb0f73b418f5e8bcd8c5eeb15c1083cfcbb0237294016ea49510ae6103e2cfc6bc93b508a61a02f SHA512 53625882a755959349f259f5527a48f926e6b8e0493eb81ac257fed6869b87d48e789e4a2141bee7aa8910fb061ca9d7541ceef7f3bdb7a5138068cc6dd16b81
diff --git a/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild
deleted file mode 100644
index 3e9411eb7bc5..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- >=x11-libs/gtk+-3.12:3
- >=media-libs/clutter-1.14:1.0
- >=media-libs/clutter-gtk-1.5:1.0
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- $(vala_depend)
-"
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 350b26a2d5d6..1a7377ce8fae 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
index 03051c1c15b9..6b5909353887 100644
--- a/games-roguelike/nethack/metadata.xml
+++ b/games-roguelike/nethack/metadata.xml
@@ -5,14 +5,6 @@
games@gentoo.org
Gentoo Games Project
-
- aranea@aixah.de
- Luis Ressel
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
nethack
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 01c0ca816629..cc047301e525 100644
Binary files a/gnustep-apps/Manifest.gz and b/gnustep-apps/Manifest.gz differ
diff --git a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild b/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
index 673668b295a7..918d44818cf7 100644
--- a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
+++ b/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,8 +17,7 @@ DEPEND="dev-libs/libcdio
dev-libs/libcdio-paranoia
gnustep-apps/cynthiune
dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}
- !gnustep-libs/cddb"
+RDEPEND="${DEPEND}"
src_prepare() {
sed -e "s#cdda.h#paranoia/cdda.h#" \
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 16315838c6e1..86d4b4b6568c 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,3 +1 @@
-DIST sogo-4.0.7.tar.gz 34455581 BLAKE2B 471ae8fc503fb2282cbd585286c0eede4e91e14bd9314a02089ffb0c69a8453538902cc26a4ebfdcacdce3d90f2d640221e1b452ad4b6a8064de89b1694eee7e SHA512 8e7eb946ab6ad8c47e6b612723675704602199b530c760ded5325f1230d89e7a812a61d9e652c7eca3050ed0bd0dd33d95faf2478f58a82dcba745cce4906675
-DIST sogo-4.0.8.tar.gz 34439405 BLAKE2B 603ef52d305c13e2d5d200b53143771ceb762c97f4f6e09aff31091f482bb43fa2638f88fcd676770b55da6e85c072dbf884c8cce20d2a71c8d62d0a98e30089 SHA512 7f8d7e3af2c92d7684f2ce3343fd9c079d567e2f09fc5ae1405e46b8eee460ab8e4349c03020bc8e55993472021633f9e37d3d8c3136a485dff1d32f45ba200a
DIST sogo-4.1.1.tar.gz 34492410 BLAKE2B 43c15991eede15b58d22681297d7d2d8031ee189e4b843af7c44e52a915d89d30c181dc52c25e4784b0e9011f5d6f22bf070b9125491fe37360ced2b623c0f86 SHA512 e24d4b7f71eeed05dcb694ee07a03df6ac9a63d7fb9455f972add9c251f85e1418683a95de5b584b0db3a471d593c8595b343db1345fcb95235ba59a09235d5a
diff --git a/gnustep-apps/sogo/sogo-4.0.7.ebuild b/gnustep-apps/sogo/sogo-4.0.7.ebuild
deleted file mode 100644
index 874bd00ce788..000000000000
--- a/gnustep-apps/sogo/sogo-4.0.7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="activesync gnutls libressl +ssl"
-
-RDEPEND="
- dev-libs/libmemcached
- net-misc/curl
- net-misc/memcached
- >=gnustep-libs/sope-${PV}[ldap]
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- >=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-pkg_setup() {
- enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
- gnustep-base_src_prepare
- sed -e "s/validateArgs$//" -i configure \
- || die
- if use activesync; then
- sed -e '/^SUBPROJECTS =/a\\tActiveSync \\' \
- -i GNUmakefile || die
- fi
-
- default
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- ./configure \
- --disable-strip \
- --prefix=/usr \
- --with-ssl="${ssl_provider}" \
- $(use_enable debug) \
- || die "configure failed"
-}
-
-src_install() {
- gnustep-base_src_install
-
- newconfd "${FILESDIR}"/sogod.confd sogod
- newinitd "${FILESDIR}"/sogod.initd sogod
-
- insinto /etc/logrotate.d
- newins Scripts/logrotate sogo
- newdoc Apache/SOGo.conf SOGo-Apache.conf
-
- insinto /etc/sogo
- doins Scripts/sogo.conf
-
- insinto /etc/cron.d
- newins Scripts/sogo.cron sogo
- keepdir /var/log/sogo
-
- fowners sogo:sogo /var/log/sogo
- fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
- gnustep-base_pkg_postinst
- elog "SOGo documentation is available online at:"
- elog "http://www.sogo.nu/downloads/documentation.html"
- elog
- elog "Apache sample configuration file is available in:"
- elog "/usr/share/doc/${PF}"
- if use activesync; then
- ewarn "In order to use the SOGo ActiveSync support code in production environments,"
- ewarn "you need to get a proper usage license. Check the documentation for details."
- fi
-}
diff --git a/gnustep-apps/sogo/sogo-4.0.8.ebuild b/gnustep-apps/sogo/sogo-4.1.1-r1.ebuild
similarity index 94%
rename from gnustep-apps/sogo/sogo-4.0.8.ebuild
rename to gnustep-apps/sogo/sogo-4.1.1-r1.ebuild
index eb6d96d450d2..70930df687f4 100644
--- a/gnustep-apps/sogo/sogo-4.0.8.ebuild
+++ b/gnustep-apps/sogo/sogo-4.1.1-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit gnustep-2 user vcs-snapshot
+inherit gnustep-2 vcs-snapshot
DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
HOMEPAGE="http://www.sogo.nu"
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="activesync gnutls libressl +ssl"
RDEPEND="
+ acct-user/sogo
dev-libs/libmemcached
net-misc/curl
net-misc/memcached
@@ -36,11 +37,6 @@ pkg_pretend() {
fi
}
-pkg_setup() {
- enewgroup sogo
- enewuser sogo -1 /bin/bash /var/lib/sogo sogo
-}
-
src_prepare() {
gnustep-base_src_prepare
sed -e "s/validateArgs$//" -i configure \
diff --git a/gnustep-apps/terminal/terminal-0.9.8.ebuild b/gnustep-apps/terminal/terminal-0.9.8.ebuild
index a81ab56d9e5f..9627d3a7c879 100644
--- a/gnustep-apps/terminal/terminal-0.9.8.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -15,6 +15,3 @@ LICENSE="GPL-2"
KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE=""
-
-RDEPEND="!=gnustep-base/gnustep-make-2.6.0"
+DEPEND="${RDEPEND}"
src_install() {
dosbin gnustep-updater
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
index ed46e3113de1..8c71ceca708d 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:GNUstep"
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index 84c4908f6280..1fc42582cb9c 100644
Binary files a/gnustep-libs/Manifest.gz and b/gnustep-libs/Manifest.gz differ
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index 08fe84d8fe2a..b9b6cb120a4f 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -1,3 +1 @@
-DIST sope-4.0.7.tar.gz 2200743 BLAKE2B 1ab31ca92821b5febbcfa7776292a565216e40d6fdbe9afdf8bb97bb445a654716d3abd4736821b881cb464c3b7e46353910ab38fd853f89581eb248db0155d3 SHA512 6d723278f714f01b215e7b0cf046008b6448c84daddde4ad1f3434b8154a8bcede3adaa11c980b4f4b9c4950a07d545185483cf8ba75a8bac91e86437dc6e74b
-DIST sope-4.0.8.tar.gz 2201872 BLAKE2B e0838fcf462bdd143a9b42aba0c775e414769f04f351073238f3554d24c95103f8fc781dcb57c540e295af6d92586e2c3da3e730952155f063dd7e8844959e04 SHA512 6ecf9b473e3b8e556578efc74036e60fb4b07cad837df034471f56dfc08507332470b2ced2db6c5206adbf73cf27c1743b57fa8fc154d9bd7a7865f68c1fa98c
DIST sope-4.1.1.tar.gz 2202428 BLAKE2B 551306a5d722442d60f68d132a21023bd7acf2fb2dcefdfcb0e1a053c03bf3c5af3afc954ec4b76e4db56799ff8cdd931ca8038fb7b3c41e5dff915858e49013 SHA512 fe672ba3b6b42bcc67f98efcb49bbe7f61f3e2fa9a0b2c571b60978425714916fe35f43283f27efaf8d568e53e6e0b6b1f80a7a63cf5b3df001e1d591cb386df
diff --git a/gnustep-libs/sope/sope-4.0.7-r1.ebuild b/gnustep-libs/sope/sope-4.0.7-r1.ebuild
deleted file mode 100644
index cbe33b68f8f9..000000000000
--- a/gnustep-libs/sope/sope-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:= )
- xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- # Non-standard configure script
- ./configure \
- --disable-strip \
- $(use_enable debug) \
- $(use_enable ldap openldap) \
- $(use_enable mysql) \
- $(use_enable postgres postgresql) \
- $(use_enable xml) \
- --with-ssl="${ssl_provider}" \
- --with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sope/sope-4.0.8.ebuild b/gnustep-libs/sope/sope-4.0.8.ebuild
deleted file mode 100644
index cbe33b68f8f9..000000000000
--- a/gnustep-libs/sope/sope-4.0.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:= )
- xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- # Non-standard configure script
- ./configure \
- --disable-strip \
- $(use_enable debug) \
- $(use_enable ldap openldap) \
- $(use_enable mysql) \
- $(use_enable postgres postgresql) \
- $(use_enable xml) \
- --with-ssl="${ssl_provider}" \
- --with-gnustep || die "configure failed"
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index ecb77f647064..d84b8ad892b0 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kig/kig-19.08.3-r1.ebuild b/kde-apps/kig/kig-19.08.3-r1.ebuild
index a6d0fcc0ec55..85958fef5962 100644
--- a/kde-apps/kig/kig-19.08.3-r1.ebuild
+++ b/kde-apps/kig/kig-19.08.3-r1.ebuild
@@ -16,7 +16,7 @@ https://edu.kde.org/kig/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
IUSE="geogebra scripting"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index fb976add60cc..d487b58b2bcc 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild
index 274381af26aa..449719c671c5 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.64.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
DESCRIPTION="Library for interfacing with calendars"
LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
IUSE=""
BDEPEND="
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch
new file mode 100644
index 000000000000..17968ff6cdb8
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch
@@ -0,0 +1,39 @@
+From 04edc7738cc3dc675c3896f4a8de0851b174d4ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?=
+Date: Fri, 22 Nov 2019 12:39:48 +0100
+Subject: Ftp ioslave: Fix ProxyUrls parameter passing
+
+Summary:
+QVariant stored in mapConfig always contain QByteArray values.
+So QVariant needs to be converted string before splitting to StringList
+
+Relates to D25432
+
+Reviewers: trufanov, #frameworks
+
+Reviewed By: trufanov
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D25438
+---
+ src/ioslaves/ftp/ftp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp
+index 8cd58c9..4266a6c 100644
+--- a/src/ioslaves/ftp/ftp.cpp
++++ b/src/ioslaves/ftp/ftp.cpp
+@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u
+ qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user;
+
+ m_proxyURL.clear();
+- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList();
++ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
+ qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls;
+
+ if (m_host != _host || m_port != _port ||
+--
+cgit v1.1
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
new file mode 100644
index 000000000000..54f9755092f2
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
@@ -0,0 +1,38 @@
+From 48b8cab8da5e264f233d59cf2aff2b981255f6bf Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Sat, 23 Nov 2019 20:11:21 +0100
+Subject: Repair FTP/HTTP proxy querying for the case of no proxy
+
+---
+ src/ioslaves/ftp/ftp.cpp | 2 +-
+ src/ioslaves/http/http.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp
+index 4266a6c..f310871 100644
+--- a/src/ioslaves/ftp/ftp.cpp
++++ b/src/ioslaves/ftp/ftp.cpp
+@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u
+ qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user;
+
+ m_proxyURL.clear();
+- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
++ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts);
+ qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls;
+
+ if (m_host != _host || m_port != _port ||
+diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
+index aca847b..5f9cd7c 100644
+--- a/src/ioslaves/http/http.cpp
++++ b/src/ioslaves/http/http.cpp
+@@ -2161,7 +2161,7 @@ bool HTTPProtocol::httpOpenConnection()
+
+ // Get proxy information...
+ if (m_request.proxyUrls.isEmpty()) {
+- m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
++ m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts);
+ qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls;
+ }
+
+--
+cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.64.0-r1.ebuild b/kde-frameworks/kio/kio-5.64.0-r2.ebuild
similarity index 82%
rename from kde-frameworks/kio/kio-5.64.0-r1.ebuild
rename to kde-frameworks/kio/kio-5.64.0-r2.ebuild
index a2219fc56636..acdc1c902734 100644
--- a/kde-frameworks/kio/kio-5.64.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.64.0-r2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="Framework providing transparent file and data management"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
IUSE="acl +handbook kerberos +kwallet X"
RDEPEND="
@@ -70,15 +70,19 @@ PDEPEND="
# tests hang
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${P}-fix-http-proxy-settings.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-fix-http-proxy-settings.patch"
+ "${FILESDIR}/${P}-fix-ftp-proxy-settings.patch"
+ "${FILESDIR}/${P}-fix-no-proxy-settings.patch"
+)
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package acl ACL)
- $(cmake-utils_use_find_package handbook KF5DocTools)
- $(cmake-utils_use_find_package kerberos GSSAPI)
- $(cmake-utils_use_find_package kwallet KF5Wallet)
- $(cmake-utils_use_find_package X X11)
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
)
ecm_src_configure
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.65.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.65.0-r1.ebuild
similarity index 80%
rename from kde-frameworks/kquickcharts/kquickcharts-5.65.0.ebuild
rename to kde-frameworks/kquickcharts/kquickcharts-5.65.0-r1.ebuild
index fdf72d78ec08..5d1619820609 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.65.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.65.0-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
ECM_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
QTMIN=5.12.3
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -21,6 +22,11 @@ DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ examples? (
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kdeclarative-${PVCUT}:5
+ >=kde-frameworks/kirigami-${PVCUT}:5
+ )
"
RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild
index f917fa757d64..c5e56faf09c8 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.65.0.ebuild
@@ -24,5 +24,5 @@ src_test() {
-E "(convertertest)"
)
- ecm_src_test
+ LC_NUMERIC="C" ecm_src_test # bug 694804
}
diff --git a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
index a4438e2b1b30..7a7b6a6f8e09 100644
--- a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
+++ b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
IUSE="+dolphin +kaccounts"
DEPEND="
diff --git a/kde-frameworks/purpose/purpose-5.65.0.ebuild b/kde-frameworks/purpose/purpose-5.65.0.ebuild
index 409caa0c2954..49100275b1f8 100644
--- a/kde-frameworks/purpose/purpose-5.65.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.65.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+dolphin +kaccounts"
DEPEND="
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 7859d05f7076..31f47a90f76d 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
index 2514f78b89ea..58a8699bc828 100644
--- a/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Bluetooth stack for KDE Plasma"
HOMEPAGE="https://cgit.kde.org/bluedevil.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild
index 7d3e5d9c86d3..e8f7fc312913 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
LICENSE="GPL-3+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild
index 48251401a142..a73440b7cf30 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
index 9918bf0331ee..93c70d79cfcf 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
LICENSE="GPL-2+ GPL-3+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/breeze-5.17.4.ebuild b/kde-plasma/breeze/breeze-5.17.4.ebuild
index 9f66845b542f..a7a95482c50b 100644
--- a/kde-plasma/breeze/breeze-5.17.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Breeze visual style for the Plasma desktop"
HOMEPAGE="https://cgit.kde.org/breeze.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="wayland X"
# drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
diff --git a/kde-plasma/discover/discover-5.17.4.ebuild b/kde-plasma/discover/discover-5.17.4.ebuild
index 4e6efe95f7d5..ad9b9eebf7b2 100644
--- a/kde-plasma/discover/discover-5.17.4.ebuild
+++ b/kde-plasma/discover/discover-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma resources management GUI"
HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="+firmware"
# libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
index 7ce8e1352926..38cf5f71bef5 100644
--- a/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="X"
RDEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild
index e35dba437e3b..1259495df284 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
index 65f153aa12be..0177a644d52f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="kdesu X"
REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
index d05a47d6624a..871b2cc9b8a0 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
LICENSE="GPL-3"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild
index 4e7e55a40e91..0d80a8f2171c 100644
--- a/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
DESCRIPTION="Plugin based library to create window decorations"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
index 4aefd7d8ea4d..3f793af92091 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="share webengine"
DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild
deleted file mode 100644
index 5d6cf315bc28..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="share webengine"
-
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kross-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
- webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
- >=kde-plasma/plasma-workspace-${PVCUT}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package share KF5Purpose)
- $(cmake_use_find_package webengine Qt5WebEngine)
- )
-
- ecm_src_configure
-}
diff --git a/kde-plasma/kgamma/kgamma-5.17.4.ebuild b/kde-plasma/kgamma/kgamma-5.17.4.ebuild
index 41fa4beff6a6..200a03300656 100644
--- a/kde-plasma/kgamma/kgamma-5.17.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
DESCRIPTION="Screen gamma values kcontrol module"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
index 8a49dd5ad90d..6d02928bacf4 100644
--- a/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma workspace hotkey module"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
index 623f1de3c619..d7a631cf4e52 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/KInfoCenter"
SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="gles2 ieee1394 +opengl +pci wayland"
REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild
index 2bbfbb01aacc..19e68cbc55fb 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma menu editor"
HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="+hotkeys"
RDEPEND="
diff --git a/kde-plasma/kscreen/kscreen-5.17.4.ebuild b/kde-plasma/kscreen/kscreen-5.17.4.ebuild
index abed1c8573d8..cdfc562821ae 100644
--- a/kde-plasma/kscreen/kscreen-5.17.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/kscreen.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild
index 036f9d065d8b..dd40dfbd9a5b 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org pam
DESCRIPTION="Library and components for secure lock screen architecture"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="consolekit +pam seccomp"
REQUIRED_USE="seccomp? ( pam )"
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild
index 4709b97d6146..e9ba62d4e34c 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild
@@ -10,20 +10,43 @@ inherit ecm kde.org
DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kwallet-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
"
RDEPEND="${DEPEND}"
+pkg_setup() {
+ ecm_pkg_setup
+
+ local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
+ local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
+ if [[ -f "${EROOT}"${srcfile} ]]; then
+ local md5=$(md5sum "${EROOT}"${srcfile})
+ if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
+ elog "Existing modified "${EPREFIX}"${srcfile} detected."
+ elog "Copying to "${EPREFIX}"${newfile}..."
+ cp -v "${EROOT}"${srcfile} "${T}"/ || die
+ fi
+ fi
+}
+
+src_prepare() {
+ ecm_src_prepare
+ if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
+ cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
+ fi
+}
+
src_install() {
ecm_src_install
@@ -34,17 +57,22 @@ src_install() {
pkg_postinst() {
ecm_pkg_postinst
+ elog "In order to have ssh-agent start with Plasma 5,"
+ elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and uncomment the lines enabling ssh-agent."
+ elog
+ elog "If you do so, do not forget to uncomment the respective"
+ elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+ elog "to properly kill the agent when the session ends."
+ elog
elog "${PN} has been installed as your default askpass application"
elog "for Plasma 5 sessions."
elog "If that's not desired, select the one you want to use in"
- elog
- elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh (ATTN: Path moved!)"
- elog
- elog "In order to have ssh-agent start with Plasma 5, do the following:"
- elog " * Copy the necessary files to your home directory:"
- elog " - cp /etc/plasma/startup/10-agent-startup.sh ~/.config/plasma-workspace/env/"
- elog " - cp /etc/plasma/shutdown/10-agent-shutdown.sh ~/.config/plasma-workspace/shutdown/"
- elog " * Edit 10-agent-startup.sh and uncomment the lines enabling ssh-agent."
- elog " * In 10-agent-shutdown.sh uncomment the respective lines to properly kill"
- elog " the agent when the session ends."
+ elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+ # Clean up pre-5.17.4 script
+ if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
+ rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
+ fi
}
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
index 0783b56da640..2fd49af949f0 100644
--- a/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="caps lm-sensors"
DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild
index 2bbe2356d0d4..9ca8be7204d5 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
DESCRIPTION="KWallet PAM module to not enter password again"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild
index 6874a1a4a047..616a4e7f8d0e 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/kwin/kwin-5.17.4-r1.ebuild b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
index c3c1312bc8da..8ab59a2c9557 100644
--- a/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="caps gles2 multimedia"
COMMON_DEPEND="
diff --git a/kde-plasma/kwin/kwin-5.17.4.ebuild b/kde-plasma/kwin/kwin-5.17.4.ebuild
deleted file mode 100644
index 00d2247339c1..000000000000
--- a/kde-plasma/kwin/kwin-5.17.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5=
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5=
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kdecoration-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[gles2=]
- >=dev-qt/qtscript-${QTMIN}:5
- >=dev-qt/qtsensors-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-libs/libinput-1.9
- >=dev-libs/wayland-1.2
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libepoxy
- media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
- virtual/libudev:=
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libdrm
- >=x11-libs/libxcb-1.10
- >=x11-libs/libxkbcommon-0.7.0
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- caps? ( sys-libs/libcap )
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtvirtualkeyboard-${QTMIN}:5
- multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
-"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
- ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
- # Access violations, bug #640432
- sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
- -i CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package caps Libcap)
- )
-
- ecm_src_configure
-}
diff --git a/kde-plasma/kwrited/kwrited-5.17.4.ebuild b/kde-plasma/kwrited/kwrited-5.17.4.ebuild
index bca843b587d5..d77ed34883de 100644
--- a/kde-plasma/kwrited/kwrited-5.17.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.17.4.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild
index 88df6421a869..15bfef5050ae 100644
--- a/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
DESCRIPTION="Plasma screen management library"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
index 84405639255f..cfb3af8ead83 100644
--- a/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
DESCRIPTION="Task management and system monitoring library"
LICENSE="LGPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="minimal webengine X"
RDEPEND="
@@ -55,3 +55,7 @@ src_configure() {
ecm_src_configure
}
+
+src_test() {
+ LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild
index 623419ba9675..123fca5f9095 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/kde-plasma/milou/milou-5.17.4.ebuild b/kde-plasma/milou/milou-5.17.4.ebuild
index 57c0f1e814e5..a3e8619af643 100644
--- a/kde-plasma/milou/milou-5.17.4.ebuild
+++ b/kde-plasma/milou/milou-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/milou.git"
LICENSE="GPL-2 LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.17.4.ebuild b/kde-plasma/oxygen/oxygen-5.17.4.ebuild
index 9191bcf82348..637b1bedbac0 100644
--- a/kde-plasma/oxygen/oxygen-5.17.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Oxygen visual style for the Plasma desktop"
HOMEPAGE="https://cgit.kde.org/oxygen.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="wayland"
COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild
index aa837c81e606..9bd8801df422 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
LICENSE="GPL-3+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r1.ebuild
index f0f08a65f980..e85132f7a2ac 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r1.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma desktop"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild
deleted file mode 100644
index 5b462420fb94..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
- >=kde-frameworks/attica-${KFMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kemoticons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/plasma-workspace-${PVCUT}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- media-libs/phonon[qt5(+)]
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxcb[xkb]
- x11-libs/libxkbfile
- fontconfig? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- ibus? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- app-i18n/ibus
- dev-libs/glib:2
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
- )
- scim? ( app-i18n/scim )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
- mouse? (
- x11-drivers/xf86-input-evdev
- x11-drivers/xf86-input-libinput
- )
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=kde-plasma/oxygen-${PVCUT}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- sys-apps/util-linux
- x11-apps/setxkbmap
- !=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[dbus]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libXcursor
- x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
- media-fonts/hack
- media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild
index fd2333e96884..28283de5f1fd 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
LICENSE="metapackage"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover
+display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam
plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
index 5c93da84cba4..77b94c3f843c 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="KDE Plasma applet for NetworkManager"
LICENSE="GPL-2 LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="modemmanager openconnect teamd"
DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild
index ad02fe12f0a1..d92c2fa8fd86 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.17.4-r1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.4-r1.ebuild
index 391c2f2a6199..edd4cbfeb890 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.17.4-r1.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.17.4-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.17.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.4.ebuild
deleted file mode 100644
index 9ceb21c00c3d..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.17.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="optional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
index 179fc24cbc8c..7c086a8ba5c6 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
LICENSE="LGPL-3"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="networkmanager"
DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
index f57a44c91be5..abee8f43a0cd 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE=""
BDEPEND="
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
index 981850375fc9..d1821bb98a65 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
REQUIRED_USE="gps? ( geolocation )"
@@ -130,15 +130,42 @@ PATCHES=(
RESTRICT+=" test"
-# used for agent scripts migration
-OLDST=/etc/plasma/startup/10-agent-startup.sh
-NEWST=/etc/xdg/plasma-workspace/env/10-agent-startup.sh
-OLDSH=/etc/plasma/shutdown/10-agent-shutdown.sh
-NEWSH=/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+pkg_setup() {
+ ecm_pkg_setup
+
+ local md5
+ local srcfile=/etc/plasma/XX/10-agent-XX.sh
+ local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+ if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+ if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+ elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+ cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+ fi
+ fi
+
+ if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+ md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+ if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+ elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+ elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+ cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+ fi
+ fi
+}
src_prepare() {
ecm_src_prepare
+ if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+ cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+ fi
+ if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+ cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+ fi
+
cmake_comment_add_subdirectory libkworkspace
# delete colliding libkworkspace translations
if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -166,41 +193,28 @@ src_install() {
ecm_src_install
# default startup and shutdown scripts
- insinto "$(dirname ${NEWST})"
- doins "${FILESDIR}/$(basename ${NEWST})"
+ insinto /etc/xdg/plasma-workspace/env
+ doins "${T}"/10-agent-startup.sh
- insinto "$(dirname ${NEWSH})"
- doins "${FILESDIR}/$(basename ${NEWSH})"
- fperms +x "${NEWSH}"
-}
-
-pkg_preinst() {
- ecm_pkg_preinst
-
- # migrate existing agent scripts to new layout if no files there yet
- if [[ -r "${EROOT}${OLDST}" && ! -f "${EROOT}${NEWST}" ]]; then
- mkdir -p "${EROOT}$(dirname ${NEWST})" && cp "${EROOT}${OLDST}" "${EROOT}${NEWST}" && \
- elog "${EROOT}${OLDST} has been migrated to ${EROOT}${NEWST}, please delete old file."
- fi
- if [[ -r "${EROOT}${OLDSH}" && ! -f "${EROOT}${NEWSH}" ]]; then
- mkdir -p "${EROOT}$(dirname ${NEWSH})" && cp "${EROOT}${OLDSH}" "${EROOT}${NEWSH}" && \
- chmod +x "${EROOT}${NEWSH}" && \
- elog "${EROOT}${OLDSH} has been migrated to ${EROOT}${NEWSH}, please delete old file."
- fi
+ insinto /etc/xdg/plasma-workspace/shutdown
+ doins "${T}"/10-agent-shutdown.sh
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
}
pkg_postinst () {
ecm_pkg_postinst
- # warn about any leftover user scripts
- if [[ -d "${EROOT}"/etc/plasma/startup && -n "$(ls "${EROOT}"/etc/plasma/startup)" ]] || \
- [[ -d "${EROOT}"/etc/plasma/shutdown && -n "$(ls "${EROOT}"/etc/plasma/shutdown)" ]]; then
- elog "You appear to have scripts in ${EROOT}/etc/plasma/{startup,shutdown}."
- elog "They will no longer work since plasma-workspace-5.17"
+ # Clean up pre-5.17.4 scripts
+ if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+ rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+ fi
+ if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+ rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+ elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
fi
- elog " * Edit ${EROOT}${NEWST} and uncomment"
- elog " the lines enabling ssh-agent."
- elog " * Edit ${EROOT}${NEWSH} uncomment"
- elog " the respective lines to properly kill the agent when the session ends."
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild
deleted file mode 100644
index b522d47f4492..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- media-libs/phonon[qt5(+)]
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- qalculate? ( sci-libs/libqalculate:= )
- qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-apps/kio-extras-19.04.3:5
- >=kde-plasma/ksysguard-${PVCUT}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- >=dev-qt/qdbus-${QTMIN}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- app-text/iso-codes
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- systemd? ( sys-apps/dbus[user-session] )
- !systemd? ( sys-apps/dbus )
- !=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
- "${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
-)
-
-RESTRICT+=" test"
-
-# used for agent scripts migration
-OLDST=/etc/plasma/startup/10-agent-startup.sh
-NEWST=/etc/xdg/plasma-workspace/env/10-agent-startup.sh
-OLDSH=/etc/plasma/shutdown/10-agent-shutdown.sh
-NEWSH=/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory libkworkspace
- # delete colliding libkworkspace translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package qalculate Qalculate)
- $(cmake_use_find_package qrcode KF5Prison)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- )
-
- use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto "$(dirname ${NEWST})"
- doins "${FILESDIR}/$(basename ${NEWST})"
-
- insinto "$(dirname ${NEWSH})"
- doins "${FILESDIR}/$(basename ${NEWSH})"
- fperms +x "${NEWSH}"
-}
-
-pkg_preinst() {
- ecm_pkg_preinst
-
- # migrate existing agent scripts to new layout if no files there yet
- if [[ -r "${EROOT}${OLDST}" && ! -f "${EROOT}${NEWST}" ]]; then
- mkdir -p "${EROOT}$(dirname ${NEWST})" && cp "${EROOT}${OLDST}" "${EROOT}${NEWST}" && \
- elog "${EROOT}${OLDST} has been migrated to ${EROOT}${NEWST}, please delete old file."
- fi
- if [[ -r "${EROOT}${OLDSH}" && ! -f "${EROOT}${NEWSH}" ]]; then
- mkdir -p "${EROOT}$(dirname ${NEWSH})" && cp "${EROOT}${OLDSH}" "${EROOT}${NEWSH}" && \
- chmod +x "${EROOT}${NEWSH}" && \
- elog "${EROOT}${OLDSH} has been migrated to ${EROOT}${NEWSH}, please delete old file."
- fi
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- # warn about any leftover user scripts
- if [[ -d "${EROOT}"/etc/plasma/startup && -n "$(ls "${EROOT}"/etc/plasma/startup)" ]] || \
- [[ -d "${EROOT}"/etc/plasma/shutdown && -n "$(ls "${EROOT}"/etc/plasma/shutdown)" ]]; then
- elog "You appear to have scripts in ${EROOT}/etc/plasma/{startup,shutdown}."
- elog "They will no longer work since plasma-workspace-5.17"
- fi
-
- elog " * Edit ${EROOT}${NEWST} and uncomment"
- elog " the lines enabling ssh-agent."
- elog " * Edit ${EROOT}${NEWSH} uncomment"
- elog " the respective lines to properly kill the agent when the session ends."
-}
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild
index d390caeb19d5..31f758101bca 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild
index aa768daaf33e..4ca2953b42ae 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="PolKit agent module for KDE Plasma"
HOMEPAGE="https://kde.org/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild
index 5a82f68a1a4e..13217c2cf3a8 100644
--- a/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Power management for KDE Plasma Shell"
HOMEPAGE="https://cgit.kde.org/powerdevil.git"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="brightness-control +wireless"
DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild
index 81512ea852ef..cf177affaa3c 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
index 54ffd396b902..f33b1039c611 100644
--- a/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="Control Center to configure KDE Plasma desktop"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/user-manager/user-manager-5.17.4.ebuild b/kde-plasma/user-manager/user-manager-5.17.4.ebuild
index ca0484843177..d8c6be55b629 100644
--- a/kde-plasma/user-manager/user-manager-5.17.4.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.17.4.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="Simple system settings module to manage the users of your system"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild
index 3fa3551aeb31..9bb3b36aaa2a 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
LICENSE="LGPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="screencast"
COMMON_DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
index f0e14f08c6f9..7f4929f6181e 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
DEPEND="
>=dev-qt/qtcore-${QTMIN}:5
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a1602310f3b0..d3ad5102df4b 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 8eac95d28a37..c519579e5513 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -110,117 +110,62 @@ DIST thunderbird-60.9.1-uk.xpi 684182 BLAKE2B b964c0c4b82362d5c82a7f39a5a7319a5c
DIST thunderbird-60.9.1-vi.xpi 637210 BLAKE2B 5677487708a657b1dc0584ab3975a45407fc1a22474be0ab0af534643bf5dadbdb2b5511b5aeacd46f9f9a3524fa1dcc70065c97f80f7d352998b31ee0c0a27d SHA512 199d05c6c44fd64efd94e5faa5a8d74732da4ee1cdf1975a7e11143589e7660ec602a4acd71ead3027ee27e23639f0268fcd525e3ffb0dd10840d3b321dc3d77
DIST thunderbird-60.9.1-zh-CN.xpi 626310 BLAKE2B d480da15430837a5f3093d9269f8f9d058a897ded8066d0d2fe3e308e208f30bc2a57b73a4c3ff80988b5053833020f936532a8a15974a5a3e9969b6ecdb82ef SHA512 af1f65d0dec16812209ac72b1a5561118d2e2a80fa286df2ec545db9794181db75a0d56e39843bc2d7429d2a5d609ec30611a92589e89e8b7ae7bc8dceb5bcc4
DIST thunderbird-60.9.1-zh-TW.xpi 626218 BLAKE2B fc7830951630ee6339bc13aad7dab0d5a1a211f39c0916c7bc9aacfe186b857997f882f0bf0a48d6f9574e4ef98a8d40a12279231258bcffa9a8d4f4e206c143 SHA512 a033b5551546aaa10a3cb92b8f0505a4cd7df7bddaeed36328548cf86d4271594be74838a91b4ce3ade5202ffcb5832e1164bcc89d1d5d192cdae357d379f1cf
-DIST thunderbird-68.2.2-ar.xpi 617164 BLAKE2B 9c241614721d5802cbf612e7f5a21b1416bf40848d1fe9bb5611be74c013efafa2843856d6ab5a00bf9d1dd9c249a8517dda07ddf4434d5d597d496311e0fc31 SHA512 751310b75772d6a028d2866e7c9397ff2157f1069912533393f0eec44b713d1140a754cf01ceec98d961c0d2e99eeef8c15ecb1cdd8f99390531b9ae91602d67
-DIST thunderbird-68.2.2-ast.xpi 551297 BLAKE2B d67cb8b324f1161ea0e6dd423923b5caea40c2a40797b63edc871e85040a778565b827ddfec1f339c6627a2175ff62e14e1f27d6eab7bc088d0db97e63cee38d SHA512 70c39b128df9d30d109959ef939cf80d29ff26d8c08c8cd7b28e7509bff7f70059955b394fca24362026fe1df0ab93908f288736514e58728c1663f91b9774d3
-DIST thunderbird-68.2.2-be.xpi 646279 BLAKE2B 26f55579d80abd3fe0797ee7d8719c541a45124111b8855d0aebbceff38fbe69b5add1784640c305cd1bd25acae81525ea69c1b9ad259f82eb27513cc2d934cc SHA512 bd3e01aa4767e68b6e77f5556464cff3fc32e415bf713b4ccaaf20305057e988e6286ba55ed57ff9a6d80869e383c4fdd8233d777437b75151ad2b7763b3e0f3
-DIST thunderbird-68.2.2-bg.xpi 646226 BLAKE2B c73fc55c51123fb959ac4a72bd7658322f246ce76f8cec363b9058bb98505acce0c161d0343523cd95ba15dfa046dc688800e367be221e8ee0cc5fdc9ed7ad0e SHA512 b4d6754e774cc84c62729fee44a6b8f1779726bf9566a3e83babf389d7c1386d4a843c8e9cc8462d4e37b0152c8778004526290429085d8fdc575bcbc010c668
-DIST thunderbird-68.2.2-br.xpi 574851 BLAKE2B 1685362672e0fffa0bc2cd7c6f749f6d502454acb8fea13272977ed79840e01f2d9b5ecca981d704455710a2096b918a0cc91c0dc559c8fa28f2f16abbf16259 SHA512 ad22ff063fa03298aeff11468f9e1e5dbc4c011f09eecb447670c7c13b784f65571149b4cdca60fb4af570d24ab500b8807f7270384d5e9f4d47b31336c3b480
-DIST thunderbird-68.2.2-ca.xpi 578438 BLAKE2B 2d74f61f842511f44d3f4cfa250630c055fbe27106819ba033d10923d2d13072069d4fab6aceb7f13a8079733bac7cf6a28861ec4ab946323078c69915977d91 SHA512 aa87b07d24d458b630a663125836eb1aebde27202a674e392d0b38805b632f169b75530642d7c5d9972cfe0adb2704130e06fc7df6c031b9f7151f3173a4af6f
-DIST thunderbird-68.2.2-cs.xpi 603041 BLAKE2B fe8014571155ac829a7171a69543077b4bd1b0a4fc69067243ff811bff04d2e16e5a9e09b486d81f74de12be3f979c0edd305917851a89803f93a4b59bcf25be SHA512 647229741fd329aea4b6eea6f22c5f87a6bedd572abaaca0fe8ebad87d0f383b2a3e68fd481277093dfe01b48e895f8c3643673f0aa1edf4aba6285c3a1afd0c
-DIST thunderbird-68.2.2-cy.xpi 589901 BLAKE2B cba6f2e3cb668e2c0f4e1961c009f3f6e02358a1d616d39fc679ab7ca91c13cf1f6921d0f73c095f846628b4485849588c03cb97ba301c721aa1294820479f00 SHA512 f2c188c650ec4856a728a443f9a17c36424c2bd782b436a0faa1cfbf10e86038ece967a2ddadd6b6273acc665832c79ce2095d5c980ea0e647a8f2068148e1d8
-DIST thunderbird-68.2.2-da.xpi 588348 BLAKE2B 15e90b3b3e06df14a0895ecaf9152ca484f4cc92079df28828ec8321c4746d5783c1c4384a37e51ca3111fb63687967c99025f16ba639682f14f33fb4de6c819 SHA512 b68c46f4e7961a0894a5304c0bb71d57e997f24bbfa77d20a7218ace19d8f393edd484cbdb046c0c79dcfcdd2162b03a57c93c003796e4bd965a7498404562b8
-DIST thunderbird-68.2.2-de.xpi 597802 BLAKE2B a15a4ca6a8269d287f93d3855d3441c99b8856fb59171237d08c8f9afae34b1fcd9559f08145b3df7cff9263fcc383aefc6aca300508a4621cb0ab1caa698374 SHA512 c6ca9374d67e5b6009d1ca070d984ac4246f15b5fb20c7bb8291ba801724c448db51dac05fcfb2c8907e1b6b6541a51abdd198c6ebd13b0176e852339ef9466d
-DIST thunderbird-68.2.2-el.xpi 699223 BLAKE2B bdc299c0872724118127a16e3402ba1285af765cb92f28e729effed63644001f35e5165e7d2909e2011c65db45c829c0f509e09ed72a8394f3eec032d6a9c4d1 SHA512 77d234822d0a87d83b5312d791542cffa1e31f045908a9fb7b92032dbcae139a0b1b24083bec04cd4e9a88851ea855c5c9d7c807eae5310ff0d993467428badc
-DIST thunderbird-68.2.2-en-GB.xpi 556402 BLAKE2B b0533af1bc0d32288d3a606b3ef40e0e8c1155c3ed8f6fa5943d72ae2519b3e96ea5af29179bcbaf0269cb431b22e435865cc32e9a3996dccef5335061d7c51c SHA512 49cd5803bb1c287ae3a4cfa374f64964adb3c1ba95437d472ae3883dc46303bc11022a4407515f1e2b564eb3c079b5c013c90f5192e531909f52dd9c37aeb865
-DIST thunderbird-68.2.2-es-AR.xpi 596550 BLAKE2B b4771b661ec447854078d57ab0d76eec9475ba60e984bb5131671e44d5351b952fcc7593d6c5d5f14a2ccae1ff96b3482a716cd0fe60b7fc4a1b106c80fe1dab SHA512 001c4f60cf155d050935b00c70eef7d62c1a8fb330aa6fa8bbf1b442d04a19e62c3bcdc481de3b79bad2a37a7909cc7d4d33a7f73d066aeee02dbe7a60b596a1
-DIST thunderbird-68.2.2-es-ES.xpi 518351 BLAKE2B ea31698e96f66f083b2e465addc89ab3cd0d87a21e03828512fc2b8583b9838265f2cbe3b496bcc4fb88af000a568aead419baa078b425fd6616aa42e5b5d696 SHA512 1b9f2d9c0f77814e8d39033b338610609bc91d73e594d24d091d2ffc60fae0409abda7329a4ffc030afc019711e0efc49d261a45bfe91d28fef3faa3edc1c653
-DIST thunderbird-68.2.2-et.xpi 573580 BLAKE2B 1ac94dc7b4c20457185658d642e0992f5bd3fce54bc3ae29117927f156060a41b65ddebc3117d3888a36c20469c707859c815227cfb866df4fe1ed301ae01313 SHA512 57997e5bca9bea1d863db0d0eb043b05c331917cd044321615d2537b0947b5481b7b714dcdd28754d9133249b4a0ebfd973a5c6825af0563d6fb2dcae68fe892
-DIST thunderbird-68.2.2-eu.xpi 579944 BLAKE2B 4d75057110258dfac4313c0a6583bcb21fd76db48631ffd243091354d0b4ba86aa94a801925102e091ebf97c7573176d3d6411dbc0a9f2764628dd0b108fb19d SHA512 3047dcbc46c023d1897b724243f4993820b0e4f9380c355c075e1237151f699359a998d371ca7441201cf4cd1060b9b241caa5a8b7c18503f7e5035be32776d7
-DIST thunderbird-68.2.2-fi.xpi 578416 BLAKE2B adcae84f5bdd25387c9053f52860f6b5e09b2816cd8628983de18a531ce51436f43ca4a72cd2b55960097df537b056e68f2e8b4d201aa9654c710c20a022f05e SHA512 b6dcf0624c84bf19192caabcdcc4b22fc9946d1b3541613dfd23c31041e039dd24208db550fec36c5e85d4807c4efcaab4b949936848297bac1bf43049525a09
-DIST thunderbird-68.2.2-fr.xpi 607809 BLAKE2B 2dfb08d9de21e885cf1863e3340a7b2dc67c98ad408e129592c70f6a6aaaa9b81a9dccfaeab91b89ab77b64627dea6bbc078313e3ee6def319398719cc89573e SHA512 acf16ebab0eed05b99ec55e0a47d6a43817be6e25b55b1b5b99ac0c766e4e9c7d1cbde5631b320c6b9e57c7274a755d3ac8efbcdde5568038f4400fedaea59b8
-DIST thunderbird-68.2.2-fy-NL.xpi 594466 BLAKE2B 4615677160a4d3c8197d6fcf26561513a3cf473ae127f02a37654c2e420cb1c6de7b542fd73adcf14286221209832a0d3e52a30a850dccf3502613dcf3452386 SHA512 ca3f459a782e43edd36cf8f446e3c364cd93c9a3d724f45ebe73e36e5e6fbb460311d3652fb0a88e82ca9b819e5c90be4102ca39ab33da5ab87673a539136346
-DIST thunderbird-68.2.2-ga-IE.xpi 588709 BLAKE2B c7141c8f672324e36e712adb03b5d613e894b5f2540261238b61cd11c8fb2d851f8a17d80c51aeaa97864bc4c9290ee824fe7c9fa1865123bc25eed218bba6b6 SHA512 1cfe403df401b3d6fb0de4ade1eaf545c917023b287cd87d5392a0a9cbf802b84c7ef90a667cccffefe7e9662843b5df1e52f366e06f564ba22cb47aa63b74f0
-DIST thunderbird-68.2.2-gd.xpi 587108 BLAKE2B 2729261acc0ef9a671d6284328dab07606a746c301cf1ec76704b98a0a72a528ca167bb86a3b8e0727a14fedc85070d1e8f6967a5bef3d59260fb2b69d90b623 SHA512 b206f8a11c021ce38bd80ebee47f6e541802b0adbb3ee2350524ced62d096db7757db637b3b0e53adf43a03376d792c35d9740b84ad10371689f71911d96d97b
-DIST thunderbird-68.2.2-gl.xpi 568395 BLAKE2B 53a3a758802d5b0f65699c0008de4240026500a5b531ac12383a06d6a8e1b5cae0f5a257d03726cfbdf4cde93fd561698128cd798ef2b9fbba4b08538dbbeced SHA512 a1257e57ec4f2dcf27d0f48b4e06c7b2cc8e8712eb68f0d8bd7ec51d2800b8f28208a94228c010525beddd8cae8a55751d9c280c44d1184692cbe9872fcc38ee
-DIST thunderbird-68.2.2-he.xpi 604786 BLAKE2B 9957413334fe3d645f65f792f89a6070dfcea97deb7562ea102baacd65b44ad920d85b2a49f4d62a82fc9cb3550f53b3f70bfacb2735cd806728fa2024ee25fd SHA512 627aecba77024e47f178acacb90f47672e61b4974482a4c647d578205f22bf18c87a4701ebdf6c1912eb3c12c99129d1cf08814eb39c379b8db0e174269e356c
-DIST thunderbird-68.2.2-hr.xpi 583782 BLAKE2B f9cb82fe1941d238b914ab86e1fea9f56b62ca54462f6ed06cec0565ba48198d70eb68277ad5bb1d8e9b5ab3ec5162ff5402c54e021cc921613ec926600293d7 SHA512 267f10ab9e6fe45a66a4b86f42e46d5d79a568f1d237d4e0efc175cdd8754c0bb2b676a9f2fa8ac07da6fd2949dcb0ef378f04a29a25bab4a621f07e532c511e
-DIST thunderbird-68.2.2-hsb.xpi 616034 BLAKE2B 9841109ea8794b0422f7968ae1e857274b96c985102aa233361d37570144ad4b4911c6226ef5b914eaa0a025c49ab4bd4b385a12b37bdbebaa4037ab652f304c SHA512 7cfc5ed7db2b8a25f30e4346862befb50d902fc83fb111040c238308a347ef44c92d7ec2f7e8a456ca024fc02d268d49ee65ad3c62e7f59bd22e12b32ae40ce9
-DIST thunderbird-68.2.2-hu.xpi 618153 BLAKE2B 80377f937fc9874b8b9bf65a882bfdc0abce827a32b155fb99252492657b7d32f345cd0e8db13f7050660b82899f0f9591e36f8d23582084f90c354f25bc578d SHA512 6bf5c5d7f65b1eb54aad1ac7e4bae899ed4a7b6fc3bc5070071150eedf2294f8a48eb94beed6f79fdaec819b40ec079d21f2283e0afe97b8fef47c6f7a05134b
-DIST thunderbird-68.2.2-hy-AM.xpi 630522 BLAKE2B 61685a681309428cd7c6f0359a7227fcb6712afa4b0d069c21aab120783826bca7b529d7f939655bb074b2852d381f5fbef757306c15b788b1e791f51155103c SHA512 c52fdde76e05c154ac5f40ef17f040311347a367387f25bf5c7b4a691d38c9eb98e157a640ab3f3a25c2adc19c7cac650471ae95cc4c97a76289a9057aedcd27
-DIST thunderbird-68.2.2-id.xpi 567746 BLAKE2B 8acc16378fe4c43c1370412a8fae81bde4857a199fd29f72dfc3780921a8c3e0d6f5d60c0098b5ee9c585f7a8d9f7025fb172ba211556525df2d378f9dce2b66 SHA512 639fc48c6dd4827477868205e5e83bbd059abdb04d9d66305fa19ced20befbb78299737079267ab487581c2728ae5f0f028cef5f65213cd6f477b3cce0a52c3e
-DIST thunderbird-68.2.2-is.xpi 575439 BLAKE2B ac38e8dd4a0ef66c7e7e1e6fd19b37a96a873838261f619d57abdcacd58012054d201fa5f33d4dfb88c5fad78be1383c4b19d91955c916acb48d3f9470cdb8c7 SHA512 4d3fc6d846b547fa1f43102a24858d0934700fb94b9c755715c040470731402d278c695a57eaaa2211669278e26aa91e1c0404b027dcfa81ebefed200fef8201
-DIST thunderbird-68.2.2-it.xpi 489519 BLAKE2B 0b6a7ee731fb7941694ff87fa9e4b588d772b760c335283458a3f18368f115318e1553004bbe6bf8f354959c4dd3b15a1731c4b3989ca3a1192baedc05250958 SHA512 b23149ee8f1bc99ad8a62daae2d5560abf7ccd506dd65e955cc4251f1cf0a5e39ca7609a070f66617883b9ca643e023bb1e45ff7c523e41bedd2b017819e892a
-DIST thunderbird-68.2.2-ja.xpi 643574 BLAKE2B 12305f8201e75acbf7e84e8bd2d4f6d4ee50b2672e491d8c241895bf7ab1b81f7cb1c4b8f09d4567bc2c368d192db7d32f63d4b53299e1effeedfb357be3c219 SHA512 8b2019e74f323447571686f0e97e4bbbc3e9973b25e91b5604a3becadeddf3f03c2bdaca29ae0bec88121a23c12d737b199c17efe05d3add448e5dc94ef59cd9
-DIST thunderbird-68.2.2-ko.xpi 620528 BLAKE2B c4c196521661d3ac2c44004d6de36ac203db15e124f056905627f1f9c721d558bca2b8cc8fd72ff24ad779b14d38ddefea56f56462c702735f8dadaabfca7edf SHA512 c6a6b964eba1a9132d6c4d64d142071f8da60566373e1ff6e7335a379f6233d2935fad49775ff5c9a06934b13698022a5d9f6c015ee8dc7e960f3de495bc9e3a
-DIST thunderbird-68.2.2-lt.xpi 603844 BLAKE2B 6582c6ffb7cee0a49601aeef088279eddb2ea71803027b474b377ce8d985b935b02b3148d42c386e5571bac3e1703f016d8c80660b27cd876d2aceef2bc1b5e0 SHA512 b5b79b34c140816a8ce31aaad0d4f6830096e37888819a18aea10d44401b7b889cf4871c915ed8d32bb26dfae45366b0228a1caeac21db78bc549cf877702305
-DIST thunderbird-68.2.2-nb-NO.xpi 574019 BLAKE2B e062c51eeff5f693c4076afc0b536c77ff6ff98da1cc7f8363049b0a7eae27a15c0012a5efa50395cbb6256170afe2e52a29dc6f71f96677c04e58d4ce301081 SHA512 144a2c75479dbb76bb3d2a1ad3520bcc08aa9ef97373d831e552424a7ea0a47dfdfcd5a4b9815c65df6ebc73e359091326702f440b45dc79ba4a2f6c8f442fab
-DIST thunderbird-68.2.2-nl.xpi 581354 BLAKE2B 9b3cd9f3ddaa20bbe2e05aac07da5db1ced6cdb248a54ba7ccd8588890e7702b327a9f9c61b6e292ad2429e76eb15845d6efd34fb494d410ff6df8ee85d3c79f SHA512 2fcf5681efc36f73181d927b94782075a774f06cf5b5949caf8ae17481b299c8a63ce6c5ec3c1f2f9ed3eaea8e02638177b229adcdd58fb7aae92fc5ff4a4688
-DIST thunderbird-68.2.2-nn-NO.xpi 574947 BLAKE2B 8c2fbb9f70ba4a969f76a8421c4fc39aae78def3e86f2323c8d53ce938a709b41b189ba7c4e9b3b3e819acc9b03cd3b9fb71df8ad11157ce4c189a45c6b37e0f SHA512 4abdeefcfbfada72b459437a19f72f390dd03989fc057c6d375132527f4c298ed6fcd5b9aa9705976b6fb163de7d8581a7958c18c5626487b697e7e8d132e02b
-DIST thunderbird-68.2.2-pl.xpi 576084 BLAKE2B e9517677ce1eea31135d5edcf92355e94b74655433b10e0e1c3f410c5e4ccf388f82a0ff886477b73759bc4596f11f4f3e61f81ef32b3671b3e59c3f8efd3ce1 SHA512 ccb03e1b18ac2226cfd40e854697121f0710c8955afedc32efb4182d1f846bf15c4988dc18a8a8710f3c0812697956dc890efa3ff8afdf819c6cb96af7dbc7fd
-DIST thunderbird-68.2.2-pt-BR.xpi 589835 BLAKE2B a03592a60d33883cee4c2a324cf52b3055358fbd4a60f5d9fd8ec76b7e85b3a6a7267634643636e4ccd743cc062ae2ee71dfdabd0668a0fa656190b71240733b SHA512 6955ec5002e3ae0f411e2ef641be457a0476bc14662d24f180db8067cb13cb1f82248bf08bef70382e34d40dda02798f379aef54119de250ef2715e58168ad1d
-DIST thunderbird-68.2.2-pt-PT.xpi 588100 BLAKE2B f0d4338aabcd7f6a8c40ee15a7a4acd7b81dd6b2609fe153c266c130abe9c2bb41e75545ffe984e0350ef6dfb9d6d946167b5b8bbd427be36b5a3a3a2bc63803 SHA512 3cd8186f492b06e5c7374bd7f6974d96b0e291deaf4d74a13d9411387e71f1ea25e0aeeb8c146d8244ca69f137112ca61883a2b99fe3f978a67dd05ace3b5fae
-DIST thunderbird-68.2.2-rm.xpi 578048 BLAKE2B e257e69809a4a541bb479777cd602d0c03afac7949b494c484dcb495954a5628938f9c51d7ee4dad251646f86e7d69dea55e69af930810685ddd7c2e68e6ab0e SHA512 a3fe6f53206e35589c6c63431ea661f086a1fe588d6bbf33a2331ec3814dda9f0e70f1da3110fa39ba4aa6a141c3c17021749fece2c65c690e079b062b3589b5
-DIST thunderbird-68.2.2-ro.xpi 594840 BLAKE2B 68f39e47f9764680409852c4e4f12ddf044ce85e91cb6cda7a6882f949d1332fd5f4b40765a8bd25595731c4fb8b35e34506457067194142281b9442df94793f SHA512 9a5ab66c2ca6bf55597c9d28a264e403a77065ee0de2cc9903343165865d5d76e804b5fedb58d07a23b0cc710292a9b193d60fccf01628872c94b7b2dbd3b5cf
-DIST thunderbird-68.2.2-ru.xpi 683324 BLAKE2B dbf6ee21fc68ba08fbf2046f09d5ea2124df81129c716742aacb08621ace4e5123b5b50bff1a1e2a98ee11b5624770e21eb0cf87c0ff48e7d4d3185666f4f4bd SHA512 c5f7226a648daf6ed3e1e44d219f26cc3c991b8ef299b29a8e267c7ca4bb8da60b4e93b3a8f0fd77b9887d8803933539abfaf9be59a3b4986c526917296c21ae
-DIST thunderbird-68.2.2-si.xpi 637404 BLAKE2B 9c2f6338d2d2042cef81b98bb3dd91ee1e271a5b2d9f25f1c217f2eb365277ff500fa84045e940524dcbca4e1d0ee7a759de7a18186e6351111a8c91f3037c6e SHA512 46219b4e19767b1cf2d6e7f9a2a00a10bc2a60feead67531c64b6ef6c4cc7a6136d0e7c2e1dd9a879fe2a3f0fce311cac0e508239c579bd0f8eccd76aecb717d
-DIST thunderbird-68.2.2-sk.xpi 609751 BLAKE2B 4e305568ca189ca8e1a3ead7d5137dd23f28a04381b4d40b42d9e8b34ba4536c1a8d8bad4ff15446e835a0129db1945fa031d452ede73c5cc66adf8f27dc0097 SHA512 6c53639ccb3d645f7ad8760b5372521204299bd2b4e477ab33ee9dd193af1ed2028f138944613e4f05c9615318183bed91c384ad9a2571030eb02021eae0aa3b
-DIST thunderbird-68.2.2-sl.xpi 590627 BLAKE2B 5feb5883f89684ff100b6a38aa5aac0454ca062a0af162bfd3a74a367a07b960bc9286d8fb78e835a48f88e7fc7391d92790d7ff456c3a0ce84345b3a040f8c2 SHA512 fed6d4e780d122529c7164bbec07d04b81dc374b44cc156d70d1353cf4f3d321a3c3dae33f71f028069e710578a31a6287392cb4cfbe10779a241e8ea2726f61
-DIST thunderbird-68.2.2-sq.xpi 598898 BLAKE2B 3d89133ec517b1790cb81295d46d9f9cba344f50fc0717c729655fc4a34e42f9e53f42164da898e5b562bcc7298467268bfa6a9bc6012bcc310acf00505f6213 SHA512 db2cc0657e71c03f6cf4668f950b4d2739ebaa7eef01a21146639225fff0a627d71fa4155b1d7830ace8008d342b282730785e89c2c11e1a1b48d0e1d54c0852
-DIST thunderbird-68.2.2-sr.xpi 624895 BLAKE2B ffca8df7e7004b7687ca9c69fcdc4a3333f144588f308ddfb58b9c6417c80aa3100f10781a8a93ab021bd91319d304b9c9068208086d25769a500ccc7f0bf51d SHA512 a6a8bad2bd3d234be269f4d36802b2253d17eed20c1e2fa8056f3d6fea155a4027409cc6c735c3b496c84a8432c6aba0abe49d0096dbbfe3c1c932c6e589ef0d
-DIST thunderbird-68.2.2-sv-SE.xpi 591594 BLAKE2B 38243595e5555db6457a38c2ec8716084a4ef5ce660e864fbf93e97dd0970d7c686aef6462d5850a930316f78002caced0e818e9b69d60c8e9b56f7904e57ed6 SHA512 c9fd588754e99247c767038bf833b82ce8f01d288f961bb5314f0aa634be954feadbce2965f2a879c0682bbe4e82d5da4514976b0fd5d370dcbb510f278265db
-DIST thunderbird-68.2.2-tr.xpi 599706 BLAKE2B ff4fc3bc17197c2c5798ea46d54c87576ff4a5c420b751b44ece906aa6188ee677fd15018c239a97428b635eb1becd4a95fb2fdc349b4ba73deccafbf2756221 SHA512 340ff1145ca10b828ba6eb584c98247949bec467a748e31e2d691bc3960a66b805a772b048ff0f96a69fb7d4ef1c47dd3200ab26388d8a0f5e9a03e403037f14
-DIST thunderbird-68.2.2-uk.xpi 671452 BLAKE2B 06996c4bf847d33491a92c7282deafb4eb24cc34cf4b4fa4823e0165a889f0ebca0c34744083ba36bfd502fbdf268bf8ef9b6c6a4c2215fd82dea6af6504119c SHA512 3e6498afaf10cbe2fe36c807440d2d56ac19a4af308d7aab98960d4f992c705b23560f3728bb74a7b24794240491dae208061c6161eb507067a593d717aafc84
-DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e1bf1a0ac6133d2d5e6ee4254d20e0726a81d8d6c1ec01d2e50e5b1e0d0ac6dfba0e1c05e5bbb57cf857b3a9230db4a SHA512 b613ffafe4fc240d82f50b086f186e4149835a168c8a931fa5547e1ee87e930d1fbbbef90045bab1264f810aee51f7dda492fa133b0f6f89d274a4bd349171f5
-DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
-DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
-DIST thunderbird-68.3.0-ar.xpi 617166 BLAKE2B 81e86d3aa7dcf0e59f2746e92a8673a325325016206ae528b7aee7b710115fcea8b6b5cc7a27721069f4f5d047e8537956ea1c7c42c598f54f9e90544789f485 SHA512 eef8b1830ec2fce91c1adf8c3c6dcaa632de94d7ce7e48724d0026c4105a4b8e057b5bac62207ae24ad8733a8621e0ae9a13f1cb94d92d84f7eb0423eb23ac8a
-DIST thunderbird-68.3.0-ast.xpi 551298 BLAKE2B 30417f8854fe6d08e3cf6e8c0926734cf5197dda8075b413bfd86ffe441cfdef8a9cc60910a7bd30c02c79ae5534af7abb8dae77850d3eae4f35e85c49a216fe SHA512 08e6486b25e715991aeb28c3ee47f0216b1183d7aee7883f314e6b24c32ef34a6529dc960ea8452d2d3798ee7f24cf588a536a69d019d1f6fc85a101dcf5610a
-DIST thunderbird-68.3.0-be.xpi 646279 BLAKE2B 52285690a1891766dfe56a6f8f4aca8bd5b31f3e66d7a091eb74336ea35490e9258ad16908cd4ef519415518162a330708b9bb00b4b423b4426f25c01ea04a84 SHA512 d5d2cf16dadb1a3db3d4b5d00819142cd1e2b9fd6e2b908739f82f85c89c7af8813e68fbb3a382cd319b15107b9f948b54147bc777245db9ccbf1f149db72dde
-DIST thunderbird-68.3.0-bg.xpi 646226 BLAKE2B e2f0322c6d2eff45d93615b8a8bc6bece96cff3e908946703c37c2b03a7b8d1360ed520efde966720dab0eced6028e20c369d1ec400a5419126b8c89272a058b SHA512 99e8af121c42fdcd1fe734ef472e4eac6b5d1df8ff461f89dfb8a055a7fc8f7663cd99c0b2633ed719028014ebc0ffc80eb31267061ec8008874bcfb908e7dea
-DIST thunderbird-68.3.0-br.xpi 574850 BLAKE2B f9e8866b9839bada5fdb9f23c1e77fa70a0e0ccb17e73be6e0fa7f4119c329345ba35d09e82b073cc6c1a3bd6e04870dbec526d51d301588cb450e16c40421b2 SHA512 5b44fc79fd7adec90192b4b426e5a00d836f61d7c2271ba3276d4adbe761dad267d921760807316300ff74651953ef5be93bba80a3b24955e27e9fdda9d21e8b
-DIST thunderbird-68.3.0-ca.xpi 578439 BLAKE2B 479cda688b7756105e5e1b9063228fae6e357e635927e438fd20ccf71a80746aefaadfa897204378142f8af60c5904515b41747c1ee839cffd5099fec692c6a0 SHA512 0238989d3f310784cdf53a95b6ef1c873a241922f89cc8c66261e1f002e9f04d7f25d3234cf42979fe23841200af6f3af871122a471e4b8717ec9db5538a73e2
-DIST thunderbird-68.3.0-cs.xpi 603041 BLAKE2B af4ee01bfed89227b64c075191df822d5040a3c411bf6b303fe835419615b1aec1512188eb04f52780d826586d1d689d0b586affc2c3aed35d2526fc994987bf SHA512 bfb30e99456197158c1a715d2f468c97d990361916fc82f79cd28e94433ed2d669645d1285e8f614d8b19c9506a861ee9258fae0a28f90d59b871ae5b1277be9
-DIST thunderbird-68.3.0-cy.xpi 589901 BLAKE2B 08aed0d086b847c28e1845a06fd97700965d5c3325758c3959b045d1142df8c3be645e647b4f216d8e950ee064fa66ccdead3d35192443b000ef8965e920e3a4 SHA512 8d5ff3e083a9d22f03eda8d1e987f180d93b80c35920fc3a6596326cf202e449c808b01cfec2e9af84fbec496de679b92d53797c6fcf94f7c3bbab3b025c1f97
-DIST thunderbird-68.3.0-da.xpi 588349 BLAKE2B c7aac916287b574d9295e4010db7fa63a97b327c56aeb598e6781d8cec6d0ebd55d9cd02cc1e2e111d53ee377faf517f7b9cb754abee3d2a230bd03c3ae1a8bb SHA512 e1e1fe202bc0331b6ce6d34b590bc3baded447a4b1498e2219ac775a1a61403db391b30e2cc88bc3f84a29b539bb007880e194117c4a3779eb6a5ffd5ce4fd9a
-DIST thunderbird-68.3.0-de.xpi 597803 BLAKE2B 5e399b0c8ecf45d837437d9c1bb4d5bb2c8e8f4af027673fcfa25425371f109c39b67143effb44b866e614e175118c72f8d7d0dcd7afcd98c6ae6481343da02e SHA512 540a3d998a9e075dc0de3a82268b1c7e892b407a31be1fc4d0ac0af368306194ee4a86c191ee12ee024cb3268e9c77aed8e48462e36b4aca74dcd1be7d2b6cb5
-DIST thunderbird-68.3.0-el.xpi 699221 BLAKE2B eec5d10d16c84714f2a98b8ab25ad7a99bcedeabfecb217d3d17d353bb3b3b5569a7a7c0d6c260654a95e17fd9280ce62ad025adae0fb8b88f5a09a71a0fb1c9 SHA512 222687f2a4dfee344d06c3d66ec8f3718a9f59542889e4092de7e75873c03864b2fb820d8a268669b28d9e73532a35070e214a62bacbe47d1cd82c00651d18c3
-DIST thunderbird-68.3.0-en-GB.xpi 556402 BLAKE2B 95a1d459925ada987a3980e8745f885468574be08f448011750eb444053eb8863e8ddc03099c3226345430d12c6cffecd605d275043ec1fa599327addb26fc64 SHA512 45c7329aae7456e8dbb2a83db398e191f2589d518877af7762bb60dda8003cf7a04bb25e49d0155fee5fede87847d68075e8047b1ad11e251358fe7f8851b4b3
-DIST thunderbird-68.3.0-es-AR.xpi 596551 BLAKE2B 7b42bc7e3dc42c04bb52ee0f3282c42ba6c88208d474a6db345bc985f627949f6b5c7ed9b3fb55d13f229e5f60d80fe3dd73e801986ca67b5bc5ca4ba2c9b5a8 SHA512 c344fba459bfaae9dd09e89990832795c7f96335e4a15387bef172971e5952f231198a374e3c113fdd47be3d06c6d0101fa9dfd56cc31e592fef2990425df4d0
-DIST thunderbird-68.3.0-es-ES.xpi 518350 BLAKE2B 5fda6fe7f2ef0975ce9e239789e222eb1f28a80b9e39139bd180716aa5f675526932c584f73c43ffc742c8095aa30b28d425ab2dbd866a68433bdc4e3c8e4009 SHA512 118deaca4f293e611634d18d91662423573848b5e7a1cbf235f5c99b1914697c10b225ce2a72eb8b68f79f2416670b9dae1c0c562ba5c4f48783a4cc3c86bf92
-DIST thunderbird-68.3.0-et.xpi 573580 BLAKE2B 1e2aa2442b9222d1dc4d425a3178d6bbce27414fd1704b085d36a8c541671af9f5fe6f41669b7f9b130326cf473649d0321a21721214cecac2af642d63a70931 SHA512 8e1e07a3d824bb2bbfd5a1c631f561dae133026f853525bac9c4a6947a84ff4c287e724c8799dbb59cc06f73d90acb2a5809bb8cc279f20e7c90d7e8cfcef939
-DIST thunderbird-68.3.0-eu.xpi 579944 BLAKE2B d69724f69720613f82ca2471764ec9e664f9eebeffb95053517173f5eca7868e4477ba6706996afbd9a3f068db18387e054a9a770196b02461274cb2398069a4 SHA512 6986925ba9292815732d7e905e621011abe86f6b38605257e9497855033595a1d3175885cc54b6843d515732630bc5e4f4990ddbcfce371fefa1f98f8e80553e
-DIST thunderbird-68.3.0-fi.xpi 578417 BLAKE2B e14604c80a020b2d7ea789510a6d44114a1348390a2bd3094e526e9adee5f2bd031cbd6a8d1bddd766fc6c81b3d6ee12281af85c4fca6d85ebc6f277b222629a SHA512 2dc58cabd19dfd338f6e0331cd3b9b786096c368e706172a1863b06b9ae70cb56b858910e9da7e64fe33c4ac99f6c7fa35cc2beb138c1ace382b40cdb6e65792
-DIST thunderbird-68.3.0-fr.xpi 607809 BLAKE2B c204b9602918bffc8507283be28cd8c430a37320e30f9ea1911a5c2101a227cf7e61c22257da68c0bfa31a9e8bbc31dbd7a0b90ec3a47f6dc41918363b998b0c SHA512 5e9504b0285b2b5cf7f24a5080af49ec6826d65c528e68a3fae8114296a08b0a27edeabb0b2e023813ac07bfb81a13bcbce650fdc0e8e143f0226429e4aa808d
-DIST thunderbird-68.3.0-fy-NL.xpi 594466 BLAKE2B 800f464cf2db9ff8c3e80f224637b7c13a109b21f1d1c864d3aadda923cfbf722f7213a03438e263f2ab35e6d40a5e62f2aff89cb467982ec837132aacae747f SHA512 221a25f721207248567c85369cc13956ed0383fb9e5d39ead8e8680280970922e33ef719d674f3eca2aa6eba2b38086a9e4d17044bc9e6e1d0094f3276817b9f
-DIST thunderbird-68.3.0-ga-IE.xpi 588708 BLAKE2B 7ed184030e233c2a2454ccce81399830f8a352ab485e31f13a6ef2bcd0013810c05c1248989f155631a55a4c7565e6a1cef38ccec9383ca47e26c5666409c55a SHA512 544f1c28f0e3b92b32a999d08b98afff592f5266c9ba6bf2d1e4a9d931cf8fccd0eba0cc302ca60dd792449ee7545e153afa5d0d02247630675cfa5a070fc97a
-DIST thunderbird-68.3.0-gd.xpi 587108 BLAKE2B 9670e3bafc8aa5687ef3001a42e84f9eab2e172f689bbe73b29e4d9483969b5401b0a6c94ddcaf2659e769ed26e43422ff0952ad5cf82f084126816b52df844a SHA512 f501fb064b42e3d76e184899a8e5844b529c98153416c0496ebe07ca98bce90af52ffb6a7718587b8c4eb193b48a5f414f718845bf021a6dd2068d9f44560365
-DIST thunderbird-68.3.0-gl.xpi 568395 BLAKE2B c9de15881f5fccfcb8ff3126f9d7d53b805efd56a40791c3385ddf2085d897065b1cedd69a88ebf18a75a7fae4aab69bd8b0d1795bfc35e5dd39b4ecb793699f SHA512 383cff75476af0cb186254668f41d5141f8f211e776e26e5acd63a004ac798488774149c6218908b002e29e8bf0428dca82e6980200bab3c2e56ddad6a71f247
-DIST thunderbird-68.3.0-he.xpi 604786 BLAKE2B b14342ebb77aacb071196f0d4877a71c0429878cb2888742bf1d12c22a8b55cd9f32478e6d0dbb1c7911375d8a78f19aa39f75037345e8b091b6172d4ad646d7 SHA512 df4d77f6b6a71da7e4fbdf0599fff72aa59c2f366880018d6733b8e5ec02a520db2b9e036e02c6d0469d0a70ecb6d68746cd833f61c1d669a0ad403ea1143ff6
-DIST thunderbird-68.3.0-hr.xpi 583783 BLAKE2B f1975b0db4b4ced78365b6ba899552d1caf7d3e0a2af3f92d17ddd343d1dbd6d177ef91ebd29f548fcdbbb59602ba45d3a0056b1f98eec2591456f30b3125db4 SHA512 1545275fcaac9a6f76de634f6c3dc87579df8ac1600fb4eec937fc1425107007cac500225a56cec696e3d42d4fce4f505a277dcdaf31d04189c19f1912147c84
-DIST thunderbird-68.3.0-hsb.xpi 616033 BLAKE2B ad43045ce5b0c6c78c3f486a0d605d01e075f84aacb16651008654ebcacc2f5a62069dd62846380b96a0972cbd4efaa3d4cd41a57e300657bbcc49bbbc1d5b6d SHA512 51f4b53b82bd091e78c91e4cb1a1d7912ff01b9e28aaf7cb8b72ab2d6769bb147c249236563764532e44e42dfc733e467fae4d1277f11133cf00c5ff788aa20a
-DIST thunderbird-68.3.0-hu.xpi 618153 BLAKE2B 71e613cf955e75196f2768bd26d5f152189c9b0a1d4a715d58591d9e6bdb03a7fb11e523ce5cbf62085d50e7685ec700e86cb170860b68ef940346b847ecfa35 SHA512 3334539638c7bf627d71163b1d2cd22f23c380c5c041a2c1da613dbdb373b8e77deb1fff4ad5ae645bde3d076febf7a4287da1b2db7a53f87582f89189ddec7a
-DIST thunderbird-68.3.0-hy-AM.xpi 630522 BLAKE2B facb4ef4218a13defbb5ae768167af672981dd96ebbf0d51ff2dd684f2df13a4c37bdab30e639203c86fdbae50167a1e459d1b2cbc43e44e1d170dae55a2172f SHA512 704d58e597809ebbd36f947be136044e6cb00e0e1453b1308e53e4bf6f81c3be6ab021b2877fd6efd25cb9b2c2429a3c0def7e530420975e221bd720f68db61a
-DIST thunderbird-68.3.0-id.xpi 567746 BLAKE2B e52cb1c3fd595c1f6da9f84b63acf489476c35ff7a1f0ffd4090e59332adcb3a313bf799cb17dd85648874a5f26a4b5df1ba77a366eae5503450ab5338b181bd SHA512 4f611802354100e7ddc2a8c229deca1263213c33dd03abc00fb156af8f88a63b9f4f6212bba5e9e92ec9914f366af9380527e7e9c4adcb28512e1ee81cc60d9e
-DIST thunderbird-68.3.0-is.xpi 575439 BLAKE2B 9e9f62fa1db1cdb0e82e403e10a4197c17f039c293cf8a997ac1ac47a8f7f7a7b8881889b1180eef40def6117ee96c0e336725e42edbe5a16fea32e03431fccd SHA512 cf2eb20457709c4ef3597945efcb4629737fc6099ec5a40d627a36a4f74981010c9aafa2b15951319330f2a11c393f9092c909cbeb603c75edb1e3d8f8495b9b
-DIST thunderbird-68.3.0-it.xpi 489517 BLAKE2B 8b93474ff218f9edbada61065f82023852e51da8dd2ec244140b92d3bc29780c8b5e409b515d50bda2e3f0e0613134446261b44ef10209704e4d85475402b4d1 SHA512 c6a2583e5462b00846779ffc0ddef2833050ca4a4b3ad00310eca9169102e7e8914f482facfdf8f3c466d0b0ef49871a66cb040e9371cb54588497276c548153
-DIST thunderbird-68.3.0-ja.xpi 643574 BLAKE2B a9824ccc6a0c0fd319d2c2fea7f2c27f44d3c0fc6e1dbc2a2a729c1248f52e09badd15d29621ce9ceaaf675f65469b0836ed7a4a5554f016a465ba779f4b574c SHA512 d267b54fb2bd8448d7af659a363fdb9c622ea2ebd52377a1ca2e590be968350e9f2ac3d654821a90c835fb0f24454335cbab14d8088acb43ad3f1d9abeab83a3
-DIST thunderbird-68.3.0-ko.xpi 620527 BLAKE2B 5631ae1e44a0bd5c5ee44879aab50c35eefee28b74a18741f100631b942baaaf7902639c7ba1cd2905c9341bc67eb463d49fb39b996c4ac0e72839c5b96099da SHA512 166faf8d5e8592339d2f5fa357f7853ef903cb9f95918141129729a8831344fd8dc4d1aa7209b99d4ad71ef01958829414a0e77b94cf1010a98752b073e556f5
-DIST thunderbird-68.3.0-lt.xpi 603844 BLAKE2B 0e4ea29e0ba7b82852aa35ce0d47ac6e0a8a388bec9b5e532d41dec8cccfe169e3a15dd6212d6e7896fd93bf16f186337048948c4912978ccbc8c9df41b83a46 SHA512 06383a5eed292280c32280e631d72f9f26f451689651fd2f559c47205848b7b092ede326fd31f86bdad4c9e1bc093e83b6e3dbd8a02a9f0034d708736f61b77c
-DIST thunderbird-68.3.0-nb-NO.xpi 574020 BLAKE2B 752f053aa132439df58cc616f550e9ffa5809517c29c51c2c560d006768088f25e16be5c8247a75b2ced36a2125f3842dd2aab0091f707d80149cf14d35e4e6e SHA512 5ccf2e9e75f8d4b9761f7ce74305334ead26d9f44269a62f71c4085166dd4ed6b1af9e6147e3362b85cbc3d4cca409b1ffaa66b73682064af2113dbede3b9787
-DIST thunderbird-68.3.0-nl.xpi 581354 BLAKE2B 9e8f41d64a6c6ec581b22ce72a0d4326d1e5a61f2d2cb388874a08456196e41adaa76bb1889fd99681c32b40ea681f6ac403026c15d2d1abfac91252467e0616 SHA512 3d0e0ec787e78d69e3126dd52b1732f2e8e28c03d6173e96fb098cc24efc275a0706ff7c2dc58c275b934934aa7e24b6682f37067408b1228029439fd0609b49
-DIST thunderbird-68.3.0-nn-NO.xpi 574948 BLAKE2B 965223512bb4b923dbbb2d2dc7bde978d78c412bc0ca03a80a40adaf4e4e391e25ab66f266c1896b786b9178cffc51684dc0f69918488598defad88bdf716a9a SHA512 6e1e094588bfb1fd79188ef6334c5a2bd8617f2fb244ad8b8b14f925d1ba91614a565c6fcd8db56dc1d0404294d815d4411c096fdce7f464ba3195334aef53dd
-DIST thunderbird-68.3.0-pl.xpi 576084 BLAKE2B 1363605c702178199ab23e60b206617cbd72ec2ed8c5c2f2b28e301c4d7507c5a90bac427d440b71b5393c12e1f590dafbd267bd613fc8a8772842787548fbfb SHA512 89b54b8266e18b5696502d1ba6cab8e53bd1444f9677270e6fcbba597d73f0cc684b6f5ffe17f37064f4205bbad7b8ce559ae16b18e2825eb009cabc612a1fc4
-DIST thunderbird-68.3.0-pt-BR.xpi 589835 BLAKE2B c1e88c5907bbdfcb2a0e2fa97bb4abd56bd595bd7967d8fb5c1e2207624c0d7e2d8d06e81e5d08790eb56a3b21f923216d72194c43c4958180141d276ba884fc SHA512 d215892fd20f4f74bc9408de37e0caef2b53d4f9106fb8a9e751c247338a79d6b54957f104cb0172ced70ee86f199bd546d46ea7a38b98190bc82099ef123f7f
-DIST thunderbird-68.3.0-pt-PT.xpi 588101 BLAKE2B afe21532c5b6e3df6e9d21737f18495c0a17199f23d3598ed7f062de14c26577a75564b58121e6b3ed5b1e1d272a45d123210c9452e9550a894ebcf1f1317929 SHA512 aeeac645c17e62c233a737a1d673e229655d0f3e4768a52ce2657723b1874852c714a2f48a76a5db558870bd4645457afd9b38d6d3b3580450114db889e14fa3
-DIST thunderbird-68.3.0-rm.xpi 578048 BLAKE2B dcca59d4743ded7c7a8e90812135ed0ba1d73dfd8bbbcbe87d4553f4f3f01c5dfaac07dd5486b95db11b231822646fcaeb0ce363e85d04218784102cb03b080e SHA512 62f35e9cfc070f211a06c863e089365f773e40f4624905704c6a16db64a312e1560691b90db0a27ac029c41aff58c343af8b7441290d241eb394a53c11891376
-DIST thunderbird-68.3.0-ro.xpi 594840 BLAKE2B 2bb66a8532587711aea456e488f59e9e7cd8493bc8b56d95a9c541395709c6893738275579dde826bd006aa45ce57d963345372644aa8cf75f4da5fe0025a7b2 SHA512 3eef81b97a7f5cb1efb84a1685cc1cd023f2c2bd35f8a285fdb7bee56eddd0a12750aec38d3aa067a79dd32807ce997bb6694bf727eeff9dc55f2faac3d5fcbc
-DIST thunderbird-68.3.0-ru.xpi 683325 BLAKE2B 046b48b78753b9e421d3fa1e38115f433af12d6d9e48182656ca1de7142f7857b53bcfa464065da82a7c7caa35a61e8b02d14c84cbf22cc827e5e710240275e9 SHA512 31ab532dfc99df92f97d0b818477f23ed06fa3967de418f756c26c02a4a270b501560fca359bf91c61ec643e1ac3c185cbd49bb74f6dc194a9856af4d6bad76e
-DIST thunderbird-68.3.0-si.xpi 637404 BLAKE2B 288fa89fd0384127adb4308fd4243420ceb3fa8bbbac2e5e2aab374f820b393a8d23dc9cf806450635364b0b5c670ea8fd082a14bcb8db95f69d700021a0e7e9 SHA512 a2cb64f388a3a1f43585d8ed213718d10f88456a7e98ece05999850afb38490a05f7c8ee6ebf67565b0054217260c23782928370e6830c02c5abb869226629bd
-DIST thunderbird-68.3.0-sk.xpi 609751 BLAKE2B b370af76d4feb8286281c1b224813ccf77ae1881e6d305fc4477a59f4d3bb49e27bd52af80c7b02ed0f79f48094463d68062d092dfb81e21e12803db851d204e SHA512 148d483cb276d145c290789371a7473fc6df168866adb9c19ed9ed77c01214ff164271ea799021d2f50562c51703e0dacf5f4ea2d24019ab77d539440cc71fca
-DIST thunderbird-68.3.0-sl.xpi 590627 BLAKE2B cdf9222020d50262a11650d43f4b41b2fc40057bbc9b8bd7d1c9c58350b945d2dc70c6f854ca156270f765ef15b560f50d3709875df0f162342b95ff42e90cfe SHA512 982989131ed30d2765a140861208db58a8b87dc04c89da687d8e1e534b3221980a470c8944875bc4dabeec42258b705730ad31d9b7ed7b3bb8403bf8344006ae
-DIST thunderbird-68.3.0-sq.xpi 598899 BLAKE2B 42b9540a34a2ab14d5cbfb5b69b303edbb11c5597426b5af7d0936f0971e77c1397a7c9fc19aadf59929730247215f1ad27eb984622039f0a29eadb2ae1d3a67 SHA512 9c154f646af00d5ffe880f9bb32e185746cfa7edc9163b9081a201c4a94bf6be77e6d9d8926ffa08ea42987b7fe3c81d4927b5a4b7cdeccb66120d81a3be75b8
-DIST thunderbird-68.3.0-sr.xpi 624895 BLAKE2B 6316b26f8f9f604cd0a374ad4a39a2cc637420dab452e583a4a419061033658ea7bf60bb8e2355a0b6c6a08f295c50f85fce835362f050f5804cc8aea6115e5f SHA512 70b2aa3be55fb87c54e3d1b5ac237b5130784261060a24f824f1bc5df2777238b1d60f9493cd381876c0faa102414f6aff7ecd873f767e9cbcd1080d771a0815
-DIST thunderbird-68.3.0-sv-SE.xpi 591594 BLAKE2B 80919193b0cbad15f45995692c3600c89ae354f46e3d914c0cdb380fcd09a6b79e4c05c39c1a873a2e5ee24c8c3d72e03813e32c328e20b707e86920901d0fe4 SHA512 54132d25d21f4703415f222e1cae92f70052b6a59b8322fd14fae39a3bb34e4cb88f76011052bba583c770e14bc98535e45f79a50820da2ca853b7682d71b3b5
-DIST thunderbird-68.3.0-tr.xpi 599706 BLAKE2B adfbb20401c27fea4615f4dbf51b0b58a928d111c8c720bfdd03581d68077ca6de405f51d4a6e46acb6089df318ce93080ffb890ce6605d38c589d138f11f31a SHA512 2fd9ad18c6756fafd2227f258c1511df9d7b34715640c4e6b2473b4e3b0cdf1952f995d5ae1caabcfc7c9d3714e03c1d91a2e7c5cecaa16e4adb485bbe22f0b4
-DIST thunderbird-68.3.0-uk.xpi 671452 BLAKE2B 8d9d86cf679e873d5d185609dda6f73932bfb704a912549c9377d8bc445fef76bc40e1d24f5e3e0dc2b1c9d42347e91dba14d15f2b42600deb0c07266599b42c SHA512 21f24d163a8c250b3d329f152f0fa0ff8a5c69835810a81640cfaadce01a1b8214f7644719f1f63d531eac7cabee8e04d3beb55b826c4829033b1b01c98a9be2
-DIST thunderbird-68.3.0-vi.xpi 623422 BLAKE2B 33c456c98384ba76c83013a2ead8f15783dff7a12a33104a5576d111b4417afdc4908ad17d74651acc6601f5dcf59ebe1dd2c62dd829126ef124d52786454b4a SHA512 d6f9fe7daaf2552acec59c924daaf55bd5690ef83e0c9e0b1090c73bdf85ea5675ae5ed58858ec90a04b347c224fb13c588cbf25d601b9ddbc6fdb18ca780dea
-DIST thunderbird-68.3.0-zh-CN.xpi 626818 BLAKE2B ee3f4579e747a1e3938adc81ccc11512d12e3c928bd91353c61d2f0cb89ad76d06a154ec6e33a75f1e39609dcb51e7045e0a314975607f7f28231a7436e45ac9 SHA512 c42ea1b005a40ce56d8f7e40ee66e978f5a9fed68087ffc1e14f489cd585ff0522d084cdf9c1be2d34b615c23b97aa1e392775963f85c2c1a5fa9b06260b5024
-DIST thunderbird-68.3.0-zh-TW.xpi 627474 BLAKE2B c23263e7fe4674d4dd74a6caf10f67d94f35421fd9dee8449c39ac6d1384fb0f8cebd848f18f59fc3d8352ef0e47439167c5e1cc65cc4730ac669ca2b4e247a4 SHA512 b244d06d4a30ee404caa18cea07882eea3b3ac87315b376a669b4fe33129df641f9eabb4e7a304dbc2c2f8698814ab19471ca729f02fd8c40269c09d1cf85a2e
+DIST thunderbird-68.3.1-ar.xpi 617167 BLAKE2B fffa85505d911f9863862e93250b3a16e5a54921774691587fd6447cef4278cc273ecf028bd4852992d6680a07f90ac17766427706f7d91303465a22d82fd8cd SHA512 ae0540082ec73799e73cedd855ab054ce2b1fab9e89b13ca45bbd2c5960143427921e5681da61cc6bf869ad1cc4cff27501c8e1f575e7c98dbb41e654cd2fab8
+DIST thunderbird-68.3.1-ast.xpi 551298 BLAKE2B 0ea77ad0eab79f2504d13696389dfa27297778abdab8ef2bd57311c61955a9114b77e1e2fc28350d6b9fcb6230d32ed0ffb9f19ed5661b4ae37cedf8913da623 SHA512 c93fa6319c58ccfb229e73781a0de7d050fb03d503e2ca91873680529c138ac404bc46850f32b549a6300d1b91ab809d7525fe5d3db20cd0d72bbf6bd163f9b8
+DIST thunderbird-68.3.1-be.xpi 646279 BLAKE2B 14beecf16085c661d31252e959c69bdea5eab9ddfb56d85dccdab28f57e2fe53830ee3deb4d3f48f38ae45f67403c7fc364feb67bf4c4d0b17f0f544ec720a01 SHA512 02000332fe0471b347023d130b30878806d7254dbe20b28f47e52245870db9ab23970fb9161c87c7e9143fb47720b6931ff2895f3261e89e5d3f65639b5700cf
+DIST thunderbird-68.3.1-bg.xpi 646227 BLAKE2B 327e7b4a7d70bdb062334ef53dcab9ed3615424aff74e46046c7666aa540992f00d3c01864036cb7ed9fc220357d18b927f01fbfed6ace8029e09a4fc34ebfb2 SHA512 4539a13495cd8eb5d7822322147f2db24a2a17bb5e0fd23629d27b3ea7e1fba55c005722ed77e4cb053df1cc6eac170a1ab99b4f44951cef1069bb7de8df5b73
+DIST thunderbird-68.3.1-br.xpi 574851 BLAKE2B e5c0ae2dec3c2b8515fc0c2011f68229eb77aced56d421271464f0b01fcd4692e6a368f26c9694b727713600ea496fe688c9e4c1831d6dd3dccc5f769885a357 SHA512 eb07e1374984553aa877f4c99eb460041d73b5d316a45a5f8f314c1166f2479b1d7a32baa1c4599bb635b47dffca47968367041ebdc109ada2d7708aeb593edb
+DIST thunderbird-68.3.1-ca.xpi 578438 BLAKE2B 9e448fa1a4431632a0e725f2b3df74af3f07b94a0eded49e1992479931fc43393c9a40c08a2431a403c049a5527bd88528debcb8e75b390c6f45d507ab7bd46a SHA512 53057eda4068d8572da349536a6245d241b690bfe6945d17e723e48b4b3e86c4258f4ee2a1ea734defef2b9a0fe67eea726368e12835de807877e7521d1d22dd
+DIST thunderbird-68.3.1-cs.xpi 603041 BLAKE2B 8f0ba016fff80a7fcc232c2ec43a7656b058e28e45f971640a92f46dd41e0e16116711801e0f42ec7821902e8d12418c55d25cc05ed0715faf694074ad4dcdee SHA512 51042694f774a9909dfac1ce1869850f0d0a0048326559d722a851d91aecf1955f09619da1dbc88ec0c938ffaa91ffae6727f7d32befa05b1b6a01897e6ebf03
+DIST thunderbird-68.3.1-cy.xpi 589902 BLAKE2B b125630ef47c7d67b705d38fc3f68af526ed3ca0588beb12010520cac4598fb4226fed40b70a0d050e9e6e22914a0a7e06837f47a352c5ba1952b6463be6b862 SHA512 d34a2aec8f9c31befdfad9aa44e04e28e8ff49803d74e305d64b9013a1df2e1e79f3da3709ee38bdc72eb7301eb28d723628c7a6fcf151ab937c30de11763974
+DIST thunderbird-68.3.1-da.xpi 588350 BLAKE2B 39c2f1108d53f6b24fee61f5f15335192b15633e0d6d4106634fe5dee6b8ab88155f648680ee7c0849b262696f74a59b5730594cbb4069086be3c9487c42673c SHA512 0a0f01a73918b63a88b872c4b3c975d711a559287b192f2ce1be41172328023b00b7655096f41522019e6d76d625b0a5453ab096c6f88465299c14d77158fa91
+DIST thunderbird-68.3.1-de.xpi 597801 BLAKE2B 30864a048e825cc824b83a27fa88c4146aa26c47586fdb0f8e90900e47915edc54ab67da8f632fcd1b461d9d3accd0b69b8515e9889f992cf75fb7783c2006b3 SHA512 fb94fafa63087166a538e82734fff444d6f54390d2f38e74abd3f090cadc426f503d98e5755b1dad83e37a3d2dba49847b10faf19956befb951abfb8bb08c104
+DIST thunderbird-68.3.1-el.xpi 699222 BLAKE2B 2c1e2e386c4ed48e261104e16aa0359bfafcaa4d46861332e04d2089226b9fc142275a9f5ce1ed530bff5ce893d2a230133e67afc008299ce63afef7f0d332ba SHA512 542f73e33c7a3f39e982d0b67a4e6dcb8ee851eae5f03b75875f1b79c55851ce67d00bc3f0f1c0d36c0a9856a29e94e3556de091e8aefb32f5ebc7900e98c814
+DIST thunderbird-68.3.1-en-GB.xpi 556403 BLAKE2B 72a4677fc59704de4b79181a79718b277d47718ee3a5ffe2e5af8ef69bbeb8a71f517e47a7b9ce18f291d92b71e6770e2e4410e738a8fcd4bff4bb6217e8922e SHA512 ee4ab262bb960969e19d73bcb47b9f569d9ddb4314145573ba34c3a34f744e06b9f0bb54a9529b4b0b06ac85b1e4f5599dff495649a29e5f49a2d4ea0cde2ca8
+DIST thunderbird-68.3.1-es-AR.xpi 596551 BLAKE2B ccd9027cd578eb11cde175151cdf0e8eece6d3f4faf73e84dd69c5ffc844534f413ca1d8d2198d7cbef6a68e10ded4f30a5077c75e3a78cf769253bcc4ef4a57 SHA512 dc4fdac2ee61b0514e18140c3cae1170fe63a495a984b54e356a402ebac5f50853a67208d64883597863bf03b4445e528b4a8c622b0f24a8fb5e23617a35052a
+DIST thunderbird-68.3.1-es-ES.xpi 518351 BLAKE2B 6434495c30d986695c72e25df8a78246adfb60ff6cd2c4b7d2df1bf421e5837c23ba04fd67f2bbb44bb46a76734b5e656036e9fed75a64cf22db7de65ddc383b SHA512 668d8720b91e3f088377835b445850820ecddb46eadfc7e325de400c6424bd30dcdd08c35c9056551293bd23f400c23c14dad165b256f21fea3295fce9bf8166
+DIST thunderbird-68.3.1-et.xpi 573581 BLAKE2B 326c80e9407d8e6a4ee63f460219d2431284913b9ea7fa4547e7f667a3b9b29576c5aaed7f789d9d4282012f9f6768b26f7f916745c63c4048d20900f2596947 SHA512 02cfab746872cf03aff0d32202fe55d7f1252554337e5e8189edaf2b3e49e4a91eb9139915fcf991281fe6da79ffa7a83f48d06a822850222c506336f53b9b7c
+DIST thunderbird-68.3.1-eu.xpi 579945 BLAKE2B 770329b3f6a1be9f3380d72c58cb725b6bd1324ceeadd6b004da668d2e61c51c024b2d3ea98dac1faacb0bb94dd74355ca6f4f4b8c1c761bff19bdc884e6d55b SHA512 5a4713a42218940c12163cd1d83ece756cb3dc26ba265b32935e53581494ff31b15886d036970a371a4cadf0b4414904164f1859ca166e0ad5c8c656b4b1d7ef
+DIST thunderbird-68.3.1-fi.xpi 578418 BLAKE2B 4f2d15165e247032c0c16d80f072c700c63fa65d17f4d329dedf8db62bab87ef89831c892f1505e20dffdd3a82267e985e8ee59589f3f6c53a681d319d55c281 SHA512 f410db97997f8ced27dd7701788d58130f2e7875356e6140603c3a9f2969b86e3b9294cda1c85fc10655a21cc457252b3be855d342c064571e242e28a44e5a39
+DIST thunderbird-68.3.1-fr.xpi 607810 BLAKE2B ea94ebf2ae7d9ef29a2292e0a4f6828b68cb648916d0e948e049e6f65b52b7775a7d3139627b39ea641d4ee24f77cb6697ed81c24af5c81c998de93dd9959abe SHA512 9bb2fdcada34b5135ec7702acb1dd9330346f8b0f955465cfc3ad5c41028f29c4d756b80453c791bdbe0354ca96abc1591be4cc194c17ff7b55d5e1c4ee43e76
+DIST thunderbird-68.3.1-fy-NL.xpi 594466 BLAKE2B b692fd90fe51b39dd4c9210097f54fa14312bb3daef65353f3de2a19153bc244a2713bb3c535f9fa0b0d34ec0940ef256f4615ae23e9efb3d3405c800c02ffcd SHA512 07fb7ecd722c1760a55c7955389b169ba4af8d7160cc7b94fb1c0c19f80a99f8e8721030ce59fbaff4d28db7f1c7b9a16c78481e6dfde5aa7b427e06b794b060
+DIST thunderbird-68.3.1-ga-IE.xpi 588709 BLAKE2B d2056e75ab9b87c9676a8dc24d85bcac6fada12d37e04bcefb228844bff5d1b972c1505aec4e6d59c5b17bfc717878fe78c011fec3a534a818cd7f1341a99105 SHA512 16d9a60e2fbb27bfb44822abcac8e7f5fd7890bb54b171ffc978ea0e77ee625b4a15f05334bec623e6c804323d8de22a6271c2d7a38052a00e0f56e732a2dd49
+DIST thunderbird-68.3.1-gd.xpi 587109 BLAKE2B eafe1f9cb3237cdfe11e0c4802c8b623425ba7f3ab7b7910e6fd49f341ca51bb37c5513be9f4bf6a7d54c11d73888245037eaf3d369f3127ec73f696db6e88fd SHA512 efb3efcea9dde6ec6dbcfadedb38d953a07b0796b27b8698bd6e02d59f5a18cdfacbfeba90fbe8547dd03a68eb32083253d1f7969927699a969985dd4caaea09
+DIST thunderbird-68.3.1-gl.xpi 568396 BLAKE2B 2f53eeee533210d5173cc2bfe682cc30f298de5e685bc9afb05e4c2eee5956c9782422900479976f3103de4bd321dc26467ed1934923b4f808f634b475981dd2 SHA512 fb22509b22618e946d289a0831efb3a7fd313ab42514909f4def5859ffafdfd99f5ab6df1971b18e0926a3b4b9e840475fd0c7d1863d11a28b178af02c27615f
+DIST thunderbird-68.3.1-he.xpi 604787 BLAKE2B 4447844090d31b9a19d2073704e1e4cd402d5fa7e55eac7294fa2310cbb585bf053886e9a46e43f7ab709d3059e79880bd30ca9e10984969995ac0b08a5e4f73 SHA512 1d26607ec07491d9ca828eecfdbbae3f76c952d582eaaf7fac3d80520a80103db2e6508b20accf1793012c08d240590627f4ae2adff7b45f7887824897ea2556
+DIST thunderbird-68.3.1-hr.xpi 583783 BLAKE2B 4c7006079628d8d28f560e582bb577e41bae1bae4c320526ae66285178aa528b03b11fdb24e7899bf69ca8c695dbf751f00ac7c296002ad10f8f4e7f79d40104 SHA512 1259eeba52bd1866d65730fe9a0648d95b01328587554204ddf32a5e964aa37eff6375122f4658b9a70507652988800c9bfecf8b773ccda7d5354acd6b8b07d8
+DIST thunderbird-68.3.1-hsb.xpi 616036 BLAKE2B 4dd43fbc7b77cee0a0d0bee8cc063e8d780b608752868878ff98cb36f6501c2a134967a7a22ca3a0c86de2806973c72e447ff02a3dcea99488c26d5eba1368cb SHA512 a1bf7e850efcb2c3ecdecb6c4bcca2764a427112f6cb5d75f101204e34747390cff8227a3b41c80dc0f2f98b6f3c9ce2941169eea6cd69d8eca83d93e130f9cd
+DIST thunderbird-68.3.1-hu.xpi 618153 BLAKE2B 4aa0ce38f9659afd00b07efe28c58e438fde3b2e3581f633ea3724f9a572d21a51076d18e786cd39c0fc8ecf9d1375b702a35c1369f4a16cf0185f1f8a0b70c6 SHA512 26aae5b9fe2bd626039edac18fabf381370b962854c9d6dae4bc083bb04032ae54bbffc1ce6074521512beed9763b0fddf8ccf189caffb8e652b876cb3ac392c
+DIST thunderbird-68.3.1-hy-AM.xpi 631976 BLAKE2B a51d53e0d0ab64db25fad7f9e2c608584a6900329959f115d361fab3b01f826590d264f242ac1189be0e8c733297fe99ab580508c6a45ce60d3120061d71c6a8 SHA512 5b9dcb2e4894e4c858c5df4bfbcd9073b91887b49fab13b0e793f0d2f523c62bef4892d9e977109c8957da01b17ef6efc2c87abb61c4cc29f8f8bf5a8921a5a3
+DIST thunderbird-68.3.1-id.xpi 567745 BLAKE2B a886b60a954c85d73cb3edb0dec87f67b9ba95a970a59f08747f6aea62b618e8a491c0293711d4ba43484cebc791b6b77ec40f07284359976cd4494dc745619a SHA512 1ec7f1f367a1552561fa2e176bea6ed5597b3565ff839b80d50a07084e2ec64dbc4d58ff75611f41a86507a9b01d7144992dd75fbaf5248a10f5253126769b79
+DIST thunderbird-68.3.1-is.xpi 575441 BLAKE2B 73ac92632cd67766e1bc242ed7489e965fba4d9fe72630135e1a001022994a1db892138672950761972c32a99df884e9cce494b6cab7ca8805b02cabcdfc5be4 SHA512 251b79e495124a81c69d779684734ac9970a178564e53215c7daca9673381995b8598f85569cf1e984594d741786ea6905da7223feca22ba7d9805ad3e422a86
+DIST thunderbird-68.3.1-it.xpi 489519 BLAKE2B 918bd9e7f07cf75000fb54866ccd4acab85045302289ff6be48ddaab61a9e87233a02c5ef82d303e552a6e6a20600a062d654fab8be774c1d2701c2b935ebcb2 SHA512 160e8b7111c850d4908d370a77aed4f6d389253c049a626f59400cd3b7196c9f6142685cf670acdf8cbfce06b658699e3ce65e7626fbabe5297c47801f722c43
+DIST thunderbird-68.3.1-ja.xpi 643575 BLAKE2B cce38e0709ae522e9645fa2cefefbf621f23569c65a5cdeeb820401ec1da2c5c2a7318d7414cc91a42d0163d8a96b48f082dccd26dc9a16354dc18a6d3e1a1d1 SHA512 517fbf1e7fc609e345d396181913c1dc15aeff59c1165f014ba7027b7233e9bb1463a16a83fc110b9131f7002fce7026dc3d7716bd1e3ed3821a3d83dc44c5a9
+DIST thunderbird-68.3.1-ko.xpi 620527 BLAKE2B 3a0f8e33d5a872b2a9b1511e34fa375b0c6e4bd0bfde385fcc589989be8bab859cf835ab4e57b89e95ce90908ce4b390bbc7ce0dfac8a18275a60eaef188ccef SHA512 a237328f6a8053e27af31cbf71300493b3482b08630f20663f4f6d4ccc2c5142928b2e02c2d9136f863a476309a95a142db2d2097d8b6606df2a168500889fb0
+DIST thunderbird-68.3.1-lt.xpi 603845 BLAKE2B a6bed563e8857e681506fb17a1b169c4f98c68a2567f576636448f160966e048f4e9f999dabb19bffb4e394570610424b7489a7cd2eea3059c9d7c6e1357a5b3 SHA512 0a3445adb168bc45e78b1655d6937970b2666767924e56fcdbb537da9dfe289dfdf281e54d88aa7656b1543fe4f5efd490d3fb8587b541d2f43d372d08fe820a
+DIST thunderbird-68.3.1-nb-NO.xpi 574020 BLAKE2B a05265acd67f607f4690f6699cf4525c6bb99e154fd0120f03892b4e7f04da95e1c92d848a06cd4b8713f3141a7fddc280d226bfef8e3a2aefc6e587efcdd5d7 SHA512 d810add1c8ea53641a7749571344499676111184a5c33440acdcd4ace589a63a109a01c6962cfb5f0a5e00b766a9a37cf3eac3b7db9088bbc6b715b953f35bb2
+DIST thunderbird-68.3.1-nl.xpi 581354 BLAKE2B 41dd90a0a6b4d2d3e430ae3f61ab7c8927eb37c2d4a4feb375f0c19deb825d31d93f556306c6509d24e4d8a928f4b57ef7b9d10efdb9a3a42ed8204b24ca9f23 SHA512 d2b372de686ea90b7152b2e65359c1d4c3578ccbfd1c393fb5efab182d231283a17de0643db761327270329b1551918810719a786db9aea8577127210e6b3c82
+DIST thunderbird-68.3.1-nn-NO.xpi 574948 BLAKE2B 5bc523164c2609f869da86f61ca03d9a068d83199ecf5eea9d50288ed53d379fb8f1ff096afa441ae4c494be0f62e5478486e2f9fc64ea2de9fd73a01a97d9bb SHA512 3de15eb90afcf1da756b042324d40f4a2361d45152b4ed59af15fd967eae098e6a69e9ac9712c9bd89e733fc569043b1fb73f2b977386f3ccf8c3b5a325358bd
+DIST thunderbird-68.3.1-pl.xpi 576085 BLAKE2B 64973a65544ed8695e938bea8d2714e81cbf92b0bf77cc0ab80e9a162fb700880b96aec08c928b4b507f91d31d9fdbab945209d85205e0b2a6267b94339bf771 SHA512 82586fec065f032fbf9e9a43372209c178ba98de164de8f9997295778a30a177925551ad873816168e49ac79832adf68e7a5c1ec712afe80268a8a33302bb5b9
+DIST thunderbird-68.3.1-pt-BR.xpi 589836 BLAKE2B f1a713515d019186294dac002fd9d05c0fdd095a925c51eefd6d13eb4bbfeddce76d9ed7e04698d63c6b4708a7733db518a052cc2beca75735bb2ea10dedf868 SHA512 eeb4ca95feae849751697a24a23c89ef3c42f1b785114a6b1dc5658ea074ee3eadd04f535eeba5ea3b059abd3035e400f6239d1260006fb71c3548d0c788bae0
+DIST thunderbird-68.3.1-pt-PT.xpi 588100 BLAKE2B f508d82b3fcbd3bd50fb31e044c79e34d0c2ab1715990d36ce95c5db434a384aad6023bbad31fa06f0c6cc653cb646d2507ec88f2e8a81a97e9bccb3ca260125 SHA512 d190f4a7ba3e1959d894c8d4a3125802d036f266775668e2ea6dbcc609dd0e254138fb9f79e2abb5a3555ff82815e41b8c631c8ea39bf964ff0d74c30f573d43
+DIST thunderbird-68.3.1-rm.xpi 578050 BLAKE2B 05a0ce154c34105a356dcf7145bc6983d55313489c2183c7cdf5946ca00850be78e0b1125c17fe3abc6dfd6923509dfce3afc00390d4430b4fa0bdbd149df726 SHA512 b21cc8d77eb36ef21e896770768ac6f3073298271e932b7c3050bd0f57c31954ea9832a01d73263166d5670f8b31b5e34a0414c218e4df80c6a9a2f17f601e8e
+DIST thunderbird-68.3.1-ro.xpi 594840 BLAKE2B b33adcb45c1bd2fe659c59c6a0ff2a8b458b1a1c077ba77303cb91dae381abc5135edbbdf41dd95a58c78d4207cfddb444f98b819a1c5b03faf14feb48506a03 SHA512 4e1feac588928773dced285844d347c77f7ac32b07059f2828e777ff42b8e9d2e02a3357a6453adf71989203893c323b96182848712bc7c8d02722f1fe87edd8
+DIST thunderbird-68.3.1-ru.xpi 683325 BLAKE2B 5587b5e129cf7d58961253fc4736231fe7d44e4d428964d57e0fb94b5c33fbe885b82d83016c5abeecc1f7496e89e7fac4b25f88baf0305930de87dbfc7419a4 SHA512 eb2fa165289fcb8e16ec45e5e4bb9ae45c887a8af3dd7d7b3f45db9e91754e21fb27c547f355bab7c51d1aa9b357f735c52f1cbb6dae6ee1227311aa499e53a1
+DIST thunderbird-68.3.1-si.xpi 637404 BLAKE2B ed2605a79d28703389081bc71b8ef1e8008bfd3d08ad15b85cb9b77ec7cfeec6bb912da21572d7b8072b1c482e173e5359a4d04e1ba4a91fe24d3ad0d23f5857 SHA512 e96234a7e8863704f2e8bc1695e4e89ac8fc0f362d4c99e064a1a1aa96a243ca56386db46f349ac865768379984147dbee75524af21e27b9f950aca41977589a
+DIST thunderbird-68.3.1-sk.xpi 609752 BLAKE2B 238e18166b807c0dd0d0fef655fa8c51645b6b37355c8aa8aac7acd26ef40bd2c43199b18ccb7f03dff91a66ea6b40674cc4577afa3a37f7eebfbf486a81115a SHA512 5cde418609787f781f9d66e57cc8f43e3a20e5fc9ca77faf15944170b078a0d5c8e2417413e6a88d122c021e752eb2df98281282996783c1779a0be057505c4a
+DIST thunderbird-68.3.1-sl.xpi 590629 BLAKE2B a306935f2ed671279d7adf623b21f6b4310041c6b80792f2034d71450aab82b250e34e799a7c1483df0b65a73c0df23d289a660ef7e9c7d237f42a9a5269bcf1 SHA512 cdf28f1e94ba77258d89d6aaf9a8474ef60a70dbf7865f3ea68670d7d962d8431f4e01a0a713e93c3bb77e691a2667579b35ca2ec12b2fc1c06c5b22d661ab6b
+DIST thunderbird-68.3.1-sq.xpi 598900 BLAKE2B 2ceb841a2eecfbc4909e18a54515f595a96485d68dd54e96efbdc3366dc820ad8d6c68137ddd11014496b39304bd23e966fc9c247ca993faa071f09aa268076f SHA512 a4918f7ac008526841c4d957b1d3671ca7558889b8b9e054b9512ed04024e93463a4a2bdb3215ecd945fae0f128d89fb10a136baac16c6e92086cab61c9915bd
+DIST thunderbird-68.3.1-sr.xpi 624895 BLAKE2B 3f02436499496eebddb52620efa4a0dc9b0a8287a414f84e0843ef2f2d4454988ba510148bffba5c56d312251a708145e7c43e238d55ced91c4718ea6cf8d211 SHA512 e3b3216f531792dcd8c034d0e5675e5d9cfc865b5f130fbabe227b0aead4c6221c94011ec9bf91190d5bacbc00936efc51b1dee11db44060138cd16c9ec13e1d
+DIST thunderbird-68.3.1-sv-SE.xpi 591593 BLAKE2B 2d2f74c101c4dde66c9c03d720a76f60ab7fbd228bc75134d5afb3e8ae29b67846408fd1582a0404c28fbb0e109be2d31ec827601323927784dd37a187bdd42f SHA512 24f44c35d21815870be3971f0c77a886699eb8d7f98f40e18c00d675a086723296c44781a9d6797e560ae98c8b0984f9788b8a08e69dd31a6a7c97cab5b279f5
+DIST thunderbird-68.3.1-tr.xpi 599706 BLAKE2B eff66d67870a9b217ca8caa725432a9238a79845e71e2d66e66fc8e8a46d8ee5394b03f60387c6233b9122d9dc8ac6ad868a648c5d0392379acf10657adf4e07 SHA512 817fa66f5dbb59e358a8b61f96be00a43863f77c68ae62a0a2ca5b777a6f3e74c7d66cb0ad26564e8e9dce20fbaaf553f38c2d4792dd1e2b21469cb5f6aa4a91
+DIST thunderbird-68.3.1-uk.xpi 671453 BLAKE2B 0abe55012afd57bcf03564b3002100a464362aeff3b39417b67c9e9fa19330d11c22cedb78ec35300e0b4e8d522a164be7fa8d8f1e854761d4ae54c58a9ff0cb SHA512 cad22417ec43a340b36293421741892bbf2321b3b53191eaed1a90bb6c38cff2558399971565520542eb8e1a1f7bd9e3369210c35af780abf979fcb7f15cf63b
+DIST thunderbird-68.3.1-vi.xpi 623421 BLAKE2B 02372e88860749c761fdf760733000dab447c338324071c5f6fe3cc00f4b3abf2483e4a00632a3c457304f9b38f49c7aa4a6b2ce62ddfcf3230b75cea74731b7 SHA512 5f052a01b83291fa5c045e1a8d122e3645e8be7a307c83b73a40f68731066d8a5b6ae0b82e0591bcee1c905afee99dc0eff6a38af7f3ce10e20b446114eb704f
+DIST thunderbird-68.3.1-zh-CN.xpi 626818 BLAKE2B 8ae5ef94f82197ec4e494817217ce3a12c22ea6177f91a8b11cb7b11d025ad5343003f367fc0f7590e2274f6fe78b492a5f17f70bd28723bbfeacd818d83cf71 SHA512 bf12406a4a170d7503dc8d2bffb8c7c57c6e110428398f175c0095ec36aac30f6f0b208543fddabbd9d7891751e1fa5c9b136e98a73fa2d13f7258126ef3dbbd
+DIST thunderbird-68.3.1-zh-TW.xpi 627473 BLAKE2B 6639239c7029e485ee64c3c9f8c2cd9d0b145a872c333fbe4b22a17a4ee8987e2164faad7d6d4524ba267528255806f88490e2972420b6a39332468560e162d1 SHA512 a17d91846945a5672d452f2220e96fd23957ae0f938d2c7b647d90dd8ce3940935384ec872f2c8104d21e5908d22bc618baa526d19b6602304bb63b5f05248ca
DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
DIST thunderbird-bin_i686-60.9.1.tar.bz2 52700511 BLAKE2B 9852b88de97e439729ec9cfbbcf2aaf942e0992ea5f05fb8a3ff715a1e4ac8138769e7336ac826afdc90971277be5702af846753e0deb24f01133297a4d828dd SHA512 707d48e10ce34363a339ce7db40d4a5b3ad2e56401ab335edf916ebf74e46fa3d81364f2cdeedc8f0f5829adbcb1ba56001399bd278a249d71827c93dd171b9a
-DIST thunderbird-bin_i686-68.2.2.tar.bz2 57255096 BLAKE2B a3f8c2b52d0c4366f016cbe566c01faaf92ea715383951d69a1d1060e023dec83cc49baaf439d0cb4600e23edcde1f5396c457ddae1ae8c9f57797de0a16cbc4 SHA512 cde3ac5e798a9471ea6108a4d4e333eeecede61af22b63723aa849b9a3aaf6fceea5dcd4be73bceab1bef28030fb264573264b93d52caa44105d11b3531d3427
-DIST thunderbird-bin_i686-68.3.0.tar.bz2 57943234 BLAKE2B 2ea917ce9eac5e50f51852083635eb1e33de76fb8b0aa4027f7e6a876b2d50125d2ebebc72d4891428be2cb2bec4f957e6172f40fd80c595c7dc2c330482773e SHA512 9173c566663b1e2e00e60538019e35b663ab14a54b1c2ff7a37c9897f83015975bee0296831d95ba34b51e9fd65ae3ec5c967edceed5fc79e3cad904ee4d2e9b
+DIST thunderbird-bin_i686-68.3.1.tar.bz2 58052823 BLAKE2B 1cb0c26a6efd038e31d315209cc31ab39adc677531f1df6b6a2dae1251eab294f9db4022fb1f1df8c2bdc4c2599e4415abc209c2d014746768d20ffdc233732e SHA512 413614f1508befe9f5b518125bdb53791d2fc86acabf899f7d48ff645f02f09d74e751671be4e1a5aba8d816d3f45fd5f3cf5490fc037d87596a10574301af43
DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
DIST thunderbird-bin_x86_64-60.9.1.tar.bz2 50500044 BLAKE2B 37bdc0437cc955db334535a04eb484277fff5a2bdd3c6ee06b04a1d642677ef368272e446f59c8d84aaef7f7715e7fdeb75e05be678c5d5fb594085cba9b6a32 SHA512 109ae1a376a6e65ede652c85fda7ebd497b781717cef65d0e0462a4c3d76dcca69163b96acaf1259e347ede8826a647dea3c739c2cf38f214c2628f2b9b7fe19
-DIST thunderbird-bin_x86_64-68.2.2.tar.bz2 54734632 BLAKE2B b501663dd64c82d08b67dfaa2b7afefbad3d5df34c4a3be646bbe3155d14e89fd6e33eaad40ada45cb4684f8eea239de00773b13e25c68b2bf31f7d91a8975ec SHA512 3c410d90e2157fce862b189f566774dfe141947a562a5e3a5781896ad1d0ba3ef7b978557fadb94f69108aa1e3674339dc0ef2189f6cdf251285fcae04de909c
-DIST thunderbird-bin_x86_64-68.3.0.tar.bz2 55368896 BLAKE2B cf001a82c9b357c66cea573245d2398fc8861626da586c413dbde6c8452fe73288e1742b595cea163ac04cea8ae80b66e5e875cbbc420998a8f0de8d9c2aef60 SHA512 1dfdbcc84d1df6c7e1864b26f2fe25c253d6108f3661280fc29cff1ae77d42962322b224f3fc9f409a17e28167f38293427c5c1bd8fad674bb70c2019368ef13
+DIST thunderbird-bin_x86_64-68.3.1.tar.bz2 55359687 BLAKE2B aab2fc6afc13f0e424195939d79587912683877470c7a4c65428f9e7eaf0324e6cd0cef2754911ac0e0e8c6b04a42bd31f67b24a93bf8051029e607f897fab57 SHA512 6c8dd662d2e2d998476828247e5455219fce61c251a37d08ddfea4b5d78e236c85c61dd3304038d274ebbcfb442c15b94080df57fb002a3627961b204cf8954d
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild
deleted file mode 100644
index fa8c278a92e8..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="68.0b6"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
-nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
-uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
- amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
- x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
- https://dev.gentoo.org/~juippis/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz"
-# the below only works when upstream releases the xpi with all locales bundled
-# ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="https://www.thunderbird.net/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip
- app-arch/zip"
-
-RDEPEND="dev-libs/atk
- >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- >=dev-libs/glib-2.26:2
- >=media-libs/alsa-lib-1.0.16
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10:2
- virtual/freedesktop-icon-theme
- >=x11-libs/cairo-1.10[X]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/pango-1.22.0
- pulseaudio? ( !/dev/null
- rm -f "${emxpi}" || die
-
- # Install language packs for calendar
- mozlinguas_xpistage_langpacks \
- "${WORKDIR}/${emid}" \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- # roll a .xpi that mimicks what upstream would roll
- pushd "${WORKDIR}/${emid}" &>/dev/null || die
- zip -9 -q -r "${emxpi}" * || die
- popd &>/dev/null || die
- eend 0
- fi
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
- local size sizes icon_path icon name
- sizes="16 22 24 32 48 128"
- icon_path="${S}/chrome/icons/default"
- icon="${PN}-icon"
- name="Thunderbird"
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
- domenu "${FILESDIR}"/icon/${PN}.desktop
-
- # Install thunderbird in /opt
- dodir ${MOZILLA_FIVE_HOME%/*}
- mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
- cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
-
- # Install language packs
- MOZEXTENSION_TARGET="distribution/extensions" \
- mozlinguas_src_install
-
- # Create /usr/bin/thunderbird-bin
- local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
- newbin - thunderbird-bin <<- _EOF_
- #!/bin/sh
- unset LD_PRELOAD
- LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
- exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
- _EOF_
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/10${PN}
-
- # Enable very specific settings for thunderbird
- insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
- newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
-
- # Plugins dir
- share_plugins_dir
-
- pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-
- use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
- use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.2.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.3.1.ebuild
similarity index 100%
rename from mail-client/thunderbird-bin/thunderbird-bin-68.2.2.ebuild
rename to mail-client/thunderbird-bin/thunderbird-bin-68.3.1.ebuild
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9617652eae37..8d09c2157133 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -61,114 +61,6 @@ DIST thunderbird-52.9.1-vi.xpi 637163 BLAKE2B 95c18bab7d30dea4a8b2241290175c77a2
DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9dc2008c80c1ebeaf4d125d5c804755509b9b67dda3423cc9b9a9af3d29b386bb621b231e426bdd89879e2e620f2106dea SHA512 db0c8a338df861a43563c70fd73768a5db730ce39e7a8400de44ccada3edac1f7e3736edee5cff439df76ff17f2b4838701e95fa739f5aa04463539516a86f0b
DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
-DIST thunderbird-68.2.2-ar.xpi 617164 BLAKE2B 9c241614721d5802cbf612e7f5a21b1416bf40848d1fe9bb5611be74c013efafa2843856d6ab5a00bf9d1dd9c249a8517dda07ddf4434d5d597d496311e0fc31 SHA512 751310b75772d6a028d2866e7c9397ff2157f1069912533393f0eec44b713d1140a754cf01ceec98d961c0d2e99eeef8c15ecb1cdd8f99390531b9ae91602d67
-DIST thunderbird-68.2.2-ast.xpi 551297 BLAKE2B d67cb8b324f1161ea0e6dd423923b5caea40c2a40797b63edc871e85040a778565b827ddfec1f339c6627a2175ff62e14e1f27d6eab7bc088d0db97e63cee38d SHA512 70c39b128df9d30d109959ef939cf80d29ff26d8c08c8cd7b28e7509bff7f70059955b394fca24362026fe1df0ab93908f288736514e58728c1663f91b9774d3
-DIST thunderbird-68.2.2-be.xpi 646279 BLAKE2B 26f55579d80abd3fe0797ee7d8719c541a45124111b8855d0aebbceff38fbe69b5add1784640c305cd1bd25acae81525ea69c1b9ad259f82eb27513cc2d934cc SHA512 bd3e01aa4767e68b6e77f5556464cff3fc32e415bf713b4ccaaf20305057e988e6286ba55ed57ff9a6d80869e383c4fdd8233d777437b75151ad2b7763b3e0f3
-DIST thunderbird-68.2.2-bg.xpi 646226 BLAKE2B c73fc55c51123fb959ac4a72bd7658322f246ce76f8cec363b9058bb98505acce0c161d0343523cd95ba15dfa046dc688800e367be221e8ee0cc5fdc9ed7ad0e SHA512 b4d6754e774cc84c62729fee44a6b8f1779726bf9566a3e83babf389d7c1386d4a843c8e9cc8462d4e37b0152c8778004526290429085d8fdc575bcbc010c668
-DIST thunderbird-68.2.2-br.xpi 574851 BLAKE2B 1685362672e0fffa0bc2cd7c6f749f6d502454acb8fea13272977ed79840e01f2d9b5ecca981d704455710a2096b918a0cc91c0dc559c8fa28f2f16abbf16259 SHA512 ad22ff063fa03298aeff11468f9e1e5dbc4c011f09eecb447670c7c13b784f65571149b4cdca60fb4af570d24ab500b8807f7270384d5e9f4d47b31336c3b480
-DIST thunderbird-68.2.2-ca.xpi 578438 BLAKE2B 2d74f61f842511f44d3f4cfa250630c055fbe27106819ba033d10923d2d13072069d4fab6aceb7f13a8079733bac7cf6a28861ec4ab946323078c69915977d91 SHA512 aa87b07d24d458b630a663125836eb1aebde27202a674e392d0b38805b632f169b75530642d7c5d9972cfe0adb2704130e06fc7df6c031b9f7151f3173a4af6f
-DIST thunderbird-68.2.2-cs.xpi 603041 BLAKE2B fe8014571155ac829a7171a69543077b4bd1b0a4fc69067243ff811bff04d2e16e5a9e09b486d81f74de12be3f979c0edd305917851a89803f93a4b59bcf25be SHA512 647229741fd329aea4b6eea6f22c5f87a6bedd572abaaca0fe8ebad87d0f383b2a3e68fd481277093dfe01b48e895f8c3643673f0aa1edf4aba6285c3a1afd0c
-DIST thunderbird-68.2.2-cy.xpi 589901 BLAKE2B cba6f2e3cb668e2c0f4e1961c009f3f6e02358a1d616d39fc679ab7ca91c13cf1f6921d0f73c095f846628b4485849588c03cb97ba301c721aa1294820479f00 SHA512 f2c188c650ec4856a728a443f9a17c36424c2bd782b436a0faa1cfbf10e86038ece967a2ddadd6b6273acc665832c79ce2095d5c980ea0e647a8f2068148e1d8
-DIST thunderbird-68.2.2-da.xpi 588348 BLAKE2B 15e90b3b3e06df14a0895ecaf9152ca484f4cc92079df28828ec8321c4746d5783c1c4384a37e51ca3111fb63687967c99025f16ba639682f14f33fb4de6c819 SHA512 b68c46f4e7961a0894a5304c0bb71d57e997f24bbfa77d20a7218ace19d8f393edd484cbdb046c0c79dcfcdd2162b03a57c93c003796e4bd965a7498404562b8
-DIST thunderbird-68.2.2-de.xpi 597802 BLAKE2B a15a4ca6a8269d287f93d3855d3441c99b8856fb59171237d08c8f9afae34b1fcd9559f08145b3df7cff9263fcc383aefc6aca300508a4621cb0ab1caa698374 SHA512 c6ca9374d67e5b6009d1ca070d984ac4246f15b5fb20c7bb8291ba801724c448db51dac05fcfb2c8907e1b6b6541a51abdd198c6ebd13b0176e852339ef9466d
-DIST thunderbird-68.2.2-el.xpi 699223 BLAKE2B bdc299c0872724118127a16e3402ba1285af765cb92f28e729effed63644001f35e5165e7d2909e2011c65db45c829c0f509e09ed72a8394f3eec032d6a9c4d1 SHA512 77d234822d0a87d83b5312d791542cffa1e31f045908a9fb7b92032dbcae139a0b1b24083bec04cd4e9a88851ea855c5c9d7c807eae5310ff0d993467428badc
-DIST thunderbird-68.2.2-en-GB.xpi 556402 BLAKE2B b0533af1bc0d32288d3a606b3ef40e0e8c1155c3ed8f6fa5943d72ae2519b3e96ea5af29179bcbaf0269cb431b22e435865cc32e9a3996dccef5335061d7c51c SHA512 49cd5803bb1c287ae3a4cfa374f64964adb3c1ba95437d472ae3883dc46303bc11022a4407515f1e2b564eb3c079b5c013c90f5192e531909f52dd9c37aeb865
-DIST thunderbird-68.2.2-es-AR.xpi 596550 BLAKE2B b4771b661ec447854078d57ab0d76eec9475ba60e984bb5131671e44d5351b952fcc7593d6c5d5f14a2ccae1ff96b3482a716cd0fe60b7fc4a1b106c80fe1dab SHA512 001c4f60cf155d050935b00c70eef7d62c1a8fb330aa6fa8bbf1b442d04a19e62c3bcdc481de3b79bad2a37a7909cc7d4d33a7f73d066aeee02dbe7a60b596a1
-DIST thunderbird-68.2.2-es-ES.xpi 518351 BLAKE2B ea31698e96f66f083b2e465addc89ab3cd0d87a21e03828512fc2b8583b9838265f2cbe3b496bcc4fb88af000a568aead419baa078b425fd6616aa42e5b5d696 SHA512 1b9f2d9c0f77814e8d39033b338610609bc91d73e594d24d091d2ffc60fae0409abda7329a4ffc030afc019711e0efc49d261a45bfe91d28fef3faa3edc1c653
-DIST thunderbird-68.2.2-et.xpi 573580 BLAKE2B 1ac94dc7b4c20457185658d642e0992f5bd3fce54bc3ae29117927f156060a41b65ddebc3117d3888a36c20469c707859c815227cfb866df4fe1ed301ae01313 SHA512 57997e5bca9bea1d863db0d0eb043b05c331917cd044321615d2537b0947b5481b7b714dcdd28754d9133249b4a0ebfd973a5c6825af0563d6fb2dcae68fe892
-DIST thunderbird-68.2.2-eu.xpi 579944 BLAKE2B 4d75057110258dfac4313c0a6583bcb21fd76db48631ffd243091354d0b4ba86aa94a801925102e091ebf97c7573176d3d6411dbc0a9f2764628dd0b108fb19d SHA512 3047dcbc46c023d1897b724243f4993820b0e4f9380c355c075e1237151f699359a998d371ca7441201cf4cd1060b9b241caa5a8b7c18503f7e5035be32776d7
-DIST thunderbird-68.2.2-fi.xpi 578416 BLAKE2B adcae84f5bdd25387c9053f52860f6b5e09b2816cd8628983de18a531ce51436f43ca4a72cd2b55960097df537b056e68f2e8b4d201aa9654c710c20a022f05e SHA512 b6dcf0624c84bf19192caabcdcc4b22fc9946d1b3541613dfd23c31041e039dd24208db550fec36c5e85d4807c4efcaab4b949936848297bac1bf43049525a09
-DIST thunderbird-68.2.2-fr.xpi 607809 BLAKE2B 2dfb08d9de21e885cf1863e3340a7b2dc67c98ad408e129592c70f6a6aaaa9b81a9dccfaeab91b89ab77b64627dea6bbc078313e3ee6def319398719cc89573e SHA512 acf16ebab0eed05b99ec55e0a47d6a43817be6e25b55b1b5b99ac0c766e4e9c7d1cbde5631b320c6b9e57c7274a755d3ac8efbcdde5568038f4400fedaea59b8
-DIST thunderbird-68.2.2-fy-NL.xpi 594466 BLAKE2B 4615677160a4d3c8197d6fcf26561513a3cf473ae127f02a37654c2e420cb1c6de7b542fd73adcf14286221209832a0d3e52a30a850dccf3502613dcf3452386 SHA512 ca3f459a782e43edd36cf8f446e3c364cd93c9a3d724f45ebe73e36e5e6fbb460311d3652fb0a88e82ca9b819e5c90be4102ca39ab33da5ab87673a539136346
-DIST thunderbird-68.2.2-ga-IE.xpi 588709 BLAKE2B c7141c8f672324e36e712adb03b5d613e894b5f2540261238b61cd11c8fb2d851f8a17d80c51aeaa97864bc4c9290ee824fe7c9fa1865123bc25eed218bba6b6 SHA512 1cfe403df401b3d6fb0de4ade1eaf545c917023b287cd87d5392a0a9cbf802b84c7ef90a667cccffefe7e9662843b5df1e52f366e06f564ba22cb47aa63b74f0
-DIST thunderbird-68.2.2-gd.xpi 587108 BLAKE2B 2729261acc0ef9a671d6284328dab07606a746c301cf1ec76704b98a0a72a528ca167bb86a3b8e0727a14fedc85070d1e8f6967a5bef3d59260fb2b69d90b623 SHA512 b206f8a11c021ce38bd80ebee47f6e541802b0adbb3ee2350524ced62d096db7757db637b3b0e53adf43a03376d792c35d9740b84ad10371689f71911d96d97b
-DIST thunderbird-68.2.2-gl.xpi 568395 BLAKE2B 53a3a758802d5b0f65699c0008de4240026500a5b531ac12383a06d6a8e1b5cae0f5a257d03726cfbdf4cde93fd561698128cd798ef2b9fbba4b08538dbbeced SHA512 a1257e57ec4f2dcf27d0f48b4e06c7b2cc8e8712eb68f0d8bd7ec51d2800b8f28208a94228c010525beddd8cae8a55751d9c280c44d1184692cbe9872fcc38ee
-DIST thunderbird-68.2.2-he.xpi 604786 BLAKE2B 9957413334fe3d645f65f792f89a6070dfcea97deb7562ea102baacd65b44ad920d85b2a49f4d62a82fc9cb3550f53b3f70bfacb2735cd806728fa2024ee25fd SHA512 627aecba77024e47f178acacb90f47672e61b4974482a4c647d578205f22bf18c87a4701ebdf6c1912eb3c12c99129d1cf08814eb39c379b8db0e174269e356c
-DIST thunderbird-68.2.2-hr.xpi 583782 BLAKE2B f9cb82fe1941d238b914ab86e1fea9f56b62ca54462f6ed06cec0565ba48198d70eb68277ad5bb1d8e9b5ab3ec5162ff5402c54e021cc921613ec926600293d7 SHA512 267f10ab9e6fe45a66a4b86f42e46d5d79a568f1d237d4e0efc175cdd8754c0bb2b676a9f2fa8ac07da6fd2949dcb0ef378f04a29a25bab4a621f07e532c511e
-DIST thunderbird-68.2.2-hsb.xpi 616034 BLAKE2B 9841109ea8794b0422f7968ae1e857274b96c985102aa233361d37570144ad4b4911c6226ef5b914eaa0a025c49ab4bd4b385a12b37bdbebaa4037ab652f304c SHA512 7cfc5ed7db2b8a25f30e4346862befb50d902fc83fb111040c238308a347ef44c92d7ec2f7e8a456ca024fc02d268d49ee65ad3c62e7f59bd22e12b32ae40ce9
-DIST thunderbird-68.2.2-hu.xpi 618153 BLAKE2B 80377f937fc9874b8b9bf65a882bfdc0abce827a32b155fb99252492657b7d32f345cd0e8db13f7050660b82899f0f9591e36f8d23582084f90c354f25bc578d SHA512 6bf5c5d7f65b1eb54aad1ac7e4bae899ed4a7b6fc3bc5070071150eedf2294f8a48eb94beed6f79fdaec819b40ec079d21f2283e0afe97b8fef47c6f7a05134b
-DIST thunderbird-68.2.2-hy-AM.xpi 630522 BLAKE2B 61685a681309428cd7c6f0359a7227fcb6712afa4b0d069c21aab120783826bca7b529d7f939655bb074b2852d381f5fbef757306c15b788b1e791f51155103c SHA512 c52fdde76e05c154ac5f40ef17f040311347a367387f25bf5c7b4a691d38c9eb98e157a640ab3f3a25c2adc19c7cac650471ae95cc4c97a76289a9057aedcd27
-DIST thunderbird-68.2.2-id.xpi 567746 BLAKE2B 8acc16378fe4c43c1370412a8fae81bde4857a199fd29f72dfc3780921a8c3e0d6f5d60c0098b5ee9c585f7a8d9f7025fb172ba211556525df2d378f9dce2b66 SHA512 639fc48c6dd4827477868205e5e83bbd059abdb04d9d66305fa19ced20befbb78299737079267ab487581c2728ae5f0f028cef5f65213cd6f477b3cce0a52c3e
-DIST thunderbird-68.2.2-is.xpi 575439 BLAKE2B ac38e8dd4a0ef66c7e7e1e6fd19b37a96a873838261f619d57abdcacd58012054d201fa5f33d4dfb88c5fad78be1383c4b19d91955c916acb48d3f9470cdb8c7 SHA512 4d3fc6d846b547fa1f43102a24858d0934700fb94b9c755715c040470731402d278c695a57eaaa2211669278e26aa91e1c0404b027dcfa81ebefed200fef8201
-DIST thunderbird-68.2.2-it.xpi 489519 BLAKE2B 0b6a7ee731fb7941694ff87fa9e4b588d772b760c335283458a3f18368f115318e1553004bbe6bf8f354959c4dd3b15a1731c4b3989ca3a1192baedc05250958 SHA512 b23149ee8f1bc99ad8a62daae2d5560abf7ccd506dd65e955cc4251f1cf0a5e39ca7609a070f66617883b9ca643e023bb1e45ff7c523e41bedd2b017819e892a
-DIST thunderbird-68.2.2-ja.xpi 643574 BLAKE2B 12305f8201e75acbf7e84e8bd2d4f6d4ee50b2672e491d8c241895bf7ab1b81f7cb1c4b8f09d4567bc2c368d192db7d32f63d4b53299e1effeedfb357be3c219 SHA512 8b2019e74f323447571686f0e97e4bbbc3e9973b25e91b5604a3becadeddf3f03c2bdaca29ae0bec88121a23c12d737b199c17efe05d3add448e5dc94ef59cd9
-DIST thunderbird-68.2.2-ko.xpi 620528 BLAKE2B c4c196521661d3ac2c44004d6de36ac203db15e124f056905627f1f9c721d558bca2b8cc8fd72ff24ad779b14d38ddefea56f56462c702735f8dadaabfca7edf SHA512 c6a6b964eba1a9132d6c4d64d142071f8da60566373e1ff6e7335a379f6233d2935fad49775ff5c9a06934b13698022a5d9f6c015ee8dc7e960f3de495bc9e3a
-DIST thunderbird-68.2.2-lt.xpi 603844 BLAKE2B 6582c6ffb7cee0a49601aeef088279eddb2ea71803027b474b377ce8d985b935b02b3148d42c386e5571bac3e1703f016d8c80660b27cd876d2aceef2bc1b5e0 SHA512 b5b79b34c140816a8ce31aaad0d4f6830096e37888819a18aea10d44401b7b889cf4871c915ed8d32bb26dfae45366b0228a1caeac21db78bc549cf877702305
-DIST thunderbird-68.2.2-nb-NO.xpi 574019 BLAKE2B e062c51eeff5f693c4076afc0b536c77ff6ff98da1cc7f8363049b0a7eae27a15c0012a5efa50395cbb6256170afe2e52a29dc6f71f96677c04e58d4ce301081 SHA512 144a2c75479dbb76bb3d2a1ad3520bcc08aa9ef97373d831e552424a7ea0a47dfdfcd5a4b9815c65df6ebc73e359091326702f440b45dc79ba4a2f6c8f442fab
-DIST thunderbird-68.2.2-nl.xpi 581354 BLAKE2B 9b3cd9f3ddaa20bbe2e05aac07da5db1ced6cdb248a54ba7ccd8588890e7702b327a9f9c61b6e292ad2429e76eb15845d6efd34fb494d410ff6df8ee85d3c79f SHA512 2fcf5681efc36f73181d927b94782075a774f06cf5b5949caf8ae17481b299c8a63ce6c5ec3c1f2f9ed3eaea8e02638177b229adcdd58fb7aae92fc5ff4a4688
-DIST thunderbird-68.2.2-nn-NO.xpi 574947 BLAKE2B 8c2fbb9f70ba4a969f76a8421c4fc39aae78def3e86f2323c8d53ce938a709b41b189ba7c4e9b3b3e819acc9b03cd3b9fb71df8ad11157ce4c189a45c6b37e0f SHA512 4abdeefcfbfada72b459437a19f72f390dd03989fc057c6d375132527f4c298ed6fcd5b9aa9705976b6fb163de7d8581a7958c18c5626487b697e7e8d132e02b
-DIST thunderbird-68.2.2-pl.xpi 576084 BLAKE2B e9517677ce1eea31135d5edcf92355e94b74655433b10e0e1c3f410c5e4ccf388f82a0ff886477b73759bc4596f11f4f3e61f81ef32b3671b3e59c3f8efd3ce1 SHA512 ccb03e1b18ac2226cfd40e854697121f0710c8955afedc32efb4182d1f846bf15c4988dc18a8a8710f3c0812697956dc890efa3ff8afdf819c6cb96af7dbc7fd
-DIST thunderbird-68.2.2-pt-BR.xpi 589835 BLAKE2B a03592a60d33883cee4c2a324cf52b3055358fbd4a60f5d9fd8ec76b7e85b3a6a7267634643636e4ccd743cc062ae2ee71dfdabd0668a0fa656190b71240733b SHA512 6955ec5002e3ae0f411e2ef641be457a0476bc14662d24f180db8067cb13cb1f82248bf08bef70382e34d40dda02798f379aef54119de250ef2715e58168ad1d
-DIST thunderbird-68.2.2-pt-PT.xpi 588100 BLAKE2B f0d4338aabcd7f6a8c40ee15a7a4acd7b81dd6b2609fe153c266c130abe9c2bb41e75545ffe984e0350ef6dfb9d6d946167b5b8bbd427be36b5a3a3a2bc63803 SHA512 3cd8186f492b06e5c7374bd7f6974d96b0e291deaf4d74a13d9411387e71f1ea25e0aeeb8c146d8244ca69f137112ca61883a2b99fe3f978a67dd05ace3b5fae
-DIST thunderbird-68.2.2-rm.xpi 578048 BLAKE2B e257e69809a4a541bb479777cd602d0c03afac7949b494c484dcb495954a5628938f9c51d7ee4dad251646f86e7d69dea55e69af930810685ddd7c2e68e6ab0e SHA512 a3fe6f53206e35589c6c63431ea661f086a1fe588d6bbf33a2331ec3814dda9f0e70f1da3110fa39ba4aa6a141c3c17021749fece2c65c690e079b062b3589b5
-DIST thunderbird-68.2.2-ro.xpi 594840 BLAKE2B 68f39e47f9764680409852c4e4f12ddf044ce85e91cb6cda7a6882f949d1332fd5f4b40765a8bd25595731c4fb8b35e34506457067194142281b9442df94793f SHA512 9a5ab66c2ca6bf55597c9d28a264e403a77065ee0de2cc9903343165865d5d76e804b5fedb58d07a23b0cc710292a9b193d60fccf01628872c94b7b2dbd3b5cf
-DIST thunderbird-68.2.2-ru.xpi 683324 BLAKE2B dbf6ee21fc68ba08fbf2046f09d5ea2124df81129c716742aacb08621ace4e5123b5b50bff1a1e2a98ee11b5624770e21eb0cf87c0ff48e7d4d3185666f4f4bd SHA512 c5f7226a648daf6ed3e1e44d219f26cc3c991b8ef299b29a8e267c7ca4bb8da60b4e93b3a8f0fd77b9887d8803933539abfaf9be59a3b4986c526917296c21ae
-DIST thunderbird-68.2.2-si.xpi 637404 BLAKE2B 9c2f6338d2d2042cef81b98bb3dd91ee1e271a5b2d9f25f1c217f2eb365277ff500fa84045e940524dcbca4e1d0ee7a759de7a18186e6351111a8c91f3037c6e SHA512 46219b4e19767b1cf2d6e7f9a2a00a10bc2a60feead67531c64b6ef6c4cc7a6136d0e7c2e1dd9a879fe2a3f0fce311cac0e508239c579bd0f8eccd76aecb717d
-DIST thunderbird-68.2.2-sk.xpi 609751 BLAKE2B 4e305568ca189ca8e1a3ead7d5137dd23f28a04381b4d40b42d9e8b34ba4536c1a8d8bad4ff15446e835a0129db1945fa031d452ede73c5cc66adf8f27dc0097 SHA512 6c53639ccb3d645f7ad8760b5372521204299bd2b4e477ab33ee9dd193af1ed2028f138944613e4f05c9615318183bed91c384ad9a2571030eb02021eae0aa3b
-DIST thunderbird-68.2.2-sl.xpi 590627 BLAKE2B 5feb5883f89684ff100b6a38aa5aac0454ca062a0af162bfd3a74a367a07b960bc9286d8fb78e835a48f88e7fc7391d92790d7ff456c3a0ce84345b3a040f8c2 SHA512 fed6d4e780d122529c7164bbec07d04b81dc374b44cc156d70d1353cf4f3d321a3c3dae33f71f028069e710578a31a6287392cb4cfbe10779a241e8ea2726f61
-DIST thunderbird-68.2.2-sq.xpi 598898 BLAKE2B 3d89133ec517b1790cb81295d46d9f9cba344f50fc0717c729655fc4a34e42f9e53f42164da898e5b562bcc7298467268bfa6a9bc6012bcc310acf00505f6213 SHA512 db2cc0657e71c03f6cf4668f950b4d2739ebaa7eef01a21146639225fff0a627d71fa4155b1d7830ace8008d342b282730785e89c2c11e1a1b48d0e1d54c0852
-DIST thunderbird-68.2.2-sr.xpi 624895 BLAKE2B ffca8df7e7004b7687ca9c69fcdc4a3333f144588f308ddfb58b9c6417c80aa3100f10781a8a93ab021bd91319d304b9c9068208086d25769a500ccc7f0bf51d SHA512 a6a8bad2bd3d234be269f4d36802b2253d17eed20c1e2fa8056f3d6fea155a4027409cc6c735c3b496c84a8432c6aba0abe49d0096dbbfe3c1c932c6e589ef0d
-DIST thunderbird-68.2.2-sv-SE.xpi 591594 BLAKE2B 38243595e5555db6457a38c2ec8716084a4ef5ce660e864fbf93e97dd0970d7c686aef6462d5850a930316f78002caced0e818e9b69d60c8e9b56f7904e57ed6 SHA512 c9fd588754e99247c767038bf833b82ce8f01d288f961bb5314f0aa634be954feadbce2965f2a879c0682bbe4e82d5da4514976b0fd5d370dcbb510f278265db
-DIST thunderbird-68.2.2-tr.xpi 599706 BLAKE2B ff4fc3bc17197c2c5798ea46d54c87576ff4a5c420b751b44ece906aa6188ee677fd15018c239a97428b635eb1becd4a95fb2fdc349b4ba73deccafbf2756221 SHA512 340ff1145ca10b828ba6eb584c98247949bec467a748e31e2d691bc3960a66b805a772b048ff0f96a69fb7d4ef1c47dd3200ab26388d8a0f5e9a03e403037f14
-DIST thunderbird-68.2.2-uk.xpi 671452 BLAKE2B 06996c4bf847d33491a92c7282deafb4eb24cc34cf4b4fa4823e0165a889f0ebca0c34744083ba36bfd502fbdf268bf8ef9b6c6a4c2215fd82dea6af6504119c SHA512 3e6498afaf10cbe2fe36c807440d2d56ac19a4af308d7aab98960d4f992c705b23560f3728bb74a7b24794240491dae208061c6161eb507067a593d717aafc84
-DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e1bf1a0ac6133d2d5e6ee4254d20e0726a81d8d6c1ec01d2e50e5b1e0d0ac6dfba0e1c05e5bbb57cf857b3a9230db4a SHA512 b613ffafe4fc240d82f50b086f186e4149835a168c8a931fa5547e1ee87e930d1fbbbef90045bab1264f810aee51f7dda492fa133b0f6f89d274a4bd349171f5
-DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
-DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
-DIST thunderbird-68.2.2.source.tar.xz 334809520 BLAKE2B e532d8b48ea0872fc69a7b2fe418dca551b5dedf6276671dffb72ce5270fdcc7d63ef835ff4ddf92b870305267fc52dbbd3f3d00f154debd308b9a569ef00422 SHA512 96c9d7b7820091896b174e2c7924e426fa0fd2e6edfa8268ab502c1292a7456d3d864f97976cced0a5e9587bfa2dd92023df1a52f989729a92e0ca604e5ab5eb
-DIST thunderbird-68.3.0-ar.xpi 617166 BLAKE2B 81e86d3aa7dcf0e59f2746e92a8673a325325016206ae528b7aee7b710115fcea8b6b5cc7a27721069f4f5d047e8537956ea1c7c42c598f54f9e90544789f485 SHA512 eef8b1830ec2fce91c1adf8c3c6dcaa632de94d7ce7e48724d0026c4105a4b8e057b5bac62207ae24ad8733a8621e0ae9a13f1cb94d92d84f7eb0423eb23ac8a
-DIST thunderbird-68.3.0-ast.xpi 551298 BLAKE2B 30417f8854fe6d08e3cf6e8c0926734cf5197dda8075b413bfd86ffe441cfdef8a9cc60910a7bd30c02c79ae5534af7abb8dae77850d3eae4f35e85c49a216fe SHA512 08e6486b25e715991aeb28c3ee47f0216b1183d7aee7883f314e6b24c32ef34a6529dc960ea8452d2d3798ee7f24cf588a536a69d019d1f6fc85a101dcf5610a
-DIST thunderbird-68.3.0-be.xpi 646279 BLAKE2B 52285690a1891766dfe56a6f8f4aca8bd5b31f3e66d7a091eb74336ea35490e9258ad16908cd4ef519415518162a330708b9bb00b4b423b4426f25c01ea04a84 SHA512 d5d2cf16dadb1a3db3d4b5d00819142cd1e2b9fd6e2b908739f82f85c89c7af8813e68fbb3a382cd319b15107b9f948b54147bc777245db9ccbf1f149db72dde
-DIST thunderbird-68.3.0-bg.xpi 646226 BLAKE2B e2f0322c6d2eff45d93615b8a8bc6bece96cff3e908946703c37c2b03a7b8d1360ed520efde966720dab0eced6028e20c369d1ec400a5419126b8c89272a058b SHA512 99e8af121c42fdcd1fe734ef472e4eac6b5d1df8ff461f89dfb8a055a7fc8f7663cd99c0b2633ed719028014ebc0ffc80eb31267061ec8008874bcfb908e7dea
-DIST thunderbird-68.3.0-br.xpi 574850 BLAKE2B f9e8866b9839bada5fdb9f23c1e77fa70a0e0ccb17e73be6e0fa7f4119c329345ba35d09e82b073cc6c1a3bd6e04870dbec526d51d301588cb450e16c40421b2 SHA512 5b44fc79fd7adec90192b4b426e5a00d836f61d7c2271ba3276d4adbe761dad267d921760807316300ff74651953ef5be93bba80a3b24955e27e9fdda9d21e8b
-DIST thunderbird-68.3.0-ca.xpi 578439 BLAKE2B 479cda688b7756105e5e1b9063228fae6e357e635927e438fd20ccf71a80746aefaadfa897204378142f8af60c5904515b41747c1ee839cffd5099fec692c6a0 SHA512 0238989d3f310784cdf53a95b6ef1c873a241922f89cc8c66261e1f002e9f04d7f25d3234cf42979fe23841200af6f3af871122a471e4b8717ec9db5538a73e2
-DIST thunderbird-68.3.0-cs.xpi 603041 BLAKE2B af4ee01bfed89227b64c075191df822d5040a3c411bf6b303fe835419615b1aec1512188eb04f52780d826586d1d689d0b586affc2c3aed35d2526fc994987bf SHA512 bfb30e99456197158c1a715d2f468c97d990361916fc82f79cd28e94433ed2d669645d1285e8f614d8b19c9506a861ee9258fae0a28f90d59b871ae5b1277be9
-DIST thunderbird-68.3.0-cy.xpi 589901 BLAKE2B 08aed0d086b847c28e1845a06fd97700965d5c3325758c3959b045d1142df8c3be645e647b4f216d8e950ee064fa66ccdead3d35192443b000ef8965e920e3a4 SHA512 8d5ff3e083a9d22f03eda8d1e987f180d93b80c35920fc3a6596326cf202e449c808b01cfec2e9af84fbec496de679b92d53797c6fcf94f7c3bbab3b025c1f97
-DIST thunderbird-68.3.0-da.xpi 588349 BLAKE2B c7aac916287b574d9295e4010db7fa63a97b327c56aeb598e6781d8cec6d0ebd55d9cd02cc1e2e111d53ee377faf517f7b9cb754abee3d2a230bd03c3ae1a8bb SHA512 e1e1fe202bc0331b6ce6d34b590bc3baded447a4b1498e2219ac775a1a61403db391b30e2cc88bc3f84a29b539bb007880e194117c4a3779eb6a5ffd5ce4fd9a
-DIST thunderbird-68.3.0-de.xpi 597803 BLAKE2B 5e399b0c8ecf45d837437d9c1bb4d5bb2c8e8f4af027673fcfa25425371f109c39b67143effb44b866e614e175118c72f8d7d0dcd7afcd98c6ae6481343da02e SHA512 540a3d998a9e075dc0de3a82268b1c7e892b407a31be1fc4d0ac0af368306194ee4a86c191ee12ee024cb3268e9c77aed8e48462e36b4aca74dcd1be7d2b6cb5
-DIST thunderbird-68.3.0-el.xpi 699221 BLAKE2B eec5d10d16c84714f2a98b8ab25ad7a99bcedeabfecb217d3d17d353bb3b3b5569a7a7c0d6c260654a95e17fd9280ce62ad025adae0fb8b88f5a09a71a0fb1c9 SHA512 222687f2a4dfee344d06c3d66ec8f3718a9f59542889e4092de7e75873c03864b2fb820d8a268669b28d9e73532a35070e214a62bacbe47d1cd82c00651d18c3
-DIST thunderbird-68.3.0-en-GB.xpi 556402 BLAKE2B 95a1d459925ada987a3980e8745f885468574be08f448011750eb444053eb8863e8ddc03099c3226345430d12c6cffecd605d275043ec1fa599327addb26fc64 SHA512 45c7329aae7456e8dbb2a83db398e191f2589d518877af7762bb60dda8003cf7a04bb25e49d0155fee5fede87847d68075e8047b1ad11e251358fe7f8851b4b3
-DIST thunderbird-68.3.0-es-AR.xpi 596551 BLAKE2B 7b42bc7e3dc42c04bb52ee0f3282c42ba6c88208d474a6db345bc985f627949f6b5c7ed9b3fb55d13f229e5f60d80fe3dd73e801986ca67b5bc5ca4ba2c9b5a8 SHA512 c344fba459bfaae9dd09e89990832795c7f96335e4a15387bef172971e5952f231198a374e3c113fdd47be3d06c6d0101fa9dfd56cc31e592fef2990425df4d0
-DIST thunderbird-68.3.0-es-ES.xpi 518350 BLAKE2B 5fda6fe7f2ef0975ce9e239789e222eb1f28a80b9e39139bd180716aa5f675526932c584f73c43ffc742c8095aa30b28d425ab2dbd866a68433bdc4e3c8e4009 SHA512 118deaca4f293e611634d18d91662423573848b5e7a1cbf235f5c99b1914697c10b225ce2a72eb8b68f79f2416670b9dae1c0c562ba5c4f48783a4cc3c86bf92
-DIST thunderbird-68.3.0-et.xpi 573580 BLAKE2B 1e2aa2442b9222d1dc4d425a3178d6bbce27414fd1704b085d36a8c541671af9f5fe6f41669b7f9b130326cf473649d0321a21721214cecac2af642d63a70931 SHA512 8e1e07a3d824bb2bbfd5a1c631f561dae133026f853525bac9c4a6947a84ff4c287e724c8799dbb59cc06f73d90acb2a5809bb8cc279f20e7c90d7e8cfcef939
-DIST thunderbird-68.3.0-eu.xpi 579944 BLAKE2B d69724f69720613f82ca2471764ec9e664f9eebeffb95053517173f5eca7868e4477ba6706996afbd9a3f068db18387e054a9a770196b02461274cb2398069a4 SHA512 6986925ba9292815732d7e905e621011abe86f6b38605257e9497855033595a1d3175885cc54b6843d515732630bc5e4f4990ddbcfce371fefa1f98f8e80553e
-DIST thunderbird-68.3.0-fi.xpi 578417 BLAKE2B e14604c80a020b2d7ea789510a6d44114a1348390a2bd3094e526e9adee5f2bd031cbd6a8d1bddd766fc6c81b3d6ee12281af85c4fca6d85ebc6f277b222629a SHA512 2dc58cabd19dfd338f6e0331cd3b9b786096c368e706172a1863b06b9ae70cb56b858910e9da7e64fe33c4ac99f6c7fa35cc2beb138c1ace382b40cdb6e65792
-DIST thunderbird-68.3.0-fr.xpi 607809 BLAKE2B c204b9602918bffc8507283be28cd8c430a37320e30f9ea1911a5c2101a227cf7e61c22257da68c0bfa31a9e8bbc31dbd7a0b90ec3a47f6dc41918363b998b0c SHA512 5e9504b0285b2b5cf7f24a5080af49ec6826d65c528e68a3fae8114296a08b0a27edeabb0b2e023813ac07bfb81a13bcbce650fdc0e8e143f0226429e4aa808d
-DIST thunderbird-68.3.0-fy-NL.xpi 594466 BLAKE2B 800f464cf2db9ff8c3e80f224637b7c13a109b21f1d1c864d3aadda923cfbf722f7213a03438e263f2ab35e6d40a5e62f2aff89cb467982ec837132aacae747f SHA512 221a25f721207248567c85369cc13956ed0383fb9e5d39ead8e8680280970922e33ef719d674f3eca2aa6eba2b38086a9e4d17044bc9e6e1d0094f3276817b9f
-DIST thunderbird-68.3.0-ga-IE.xpi 588708 BLAKE2B 7ed184030e233c2a2454ccce81399830f8a352ab485e31f13a6ef2bcd0013810c05c1248989f155631a55a4c7565e6a1cef38ccec9383ca47e26c5666409c55a SHA512 544f1c28f0e3b92b32a999d08b98afff592f5266c9ba6bf2d1e4a9d931cf8fccd0eba0cc302ca60dd792449ee7545e153afa5d0d02247630675cfa5a070fc97a
-DIST thunderbird-68.3.0-gd.xpi 587108 BLAKE2B 9670e3bafc8aa5687ef3001a42e84f9eab2e172f689bbe73b29e4d9483969b5401b0a6c94ddcaf2659e769ed26e43422ff0952ad5cf82f084126816b52df844a SHA512 f501fb064b42e3d76e184899a8e5844b529c98153416c0496ebe07ca98bce90af52ffb6a7718587b8c4eb193b48a5f414f718845bf021a6dd2068d9f44560365
-DIST thunderbird-68.3.0-gl.xpi 568395 BLAKE2B c9de15881f5fccfcb8ff3126f9d7d53b805efd56a40791c3385ddf2085d897065b1cedd69a88ebf18a75a7fae4aab69bd8b0d1795bfc35e5dd39b4ecb793699f SHA512 383cff75476af0cb186254668f41d5141f8f211e776e26e5acd63a004ac798488774149c6218908b002e29e8bf0428dca82e6980200bab3c2e56ddad6a71f247
-DIST thunderbird-68.3.0-he.xpi 604786 BLAKE2B b14342ebb77aacb071196f0d4877a71c0429878cb2888742bf1d12c22a8b55cd9f32478e6d0dbb1c7911375d8a78f19aa39f75037345e8b091b6172d4ad646d7 SHA512 df4d77f6b6a71da7e4fbdf0599fff72aa59c2f366880018d6733b8e5ec02a520db2b9e036e02c6d0469d0a70ecb6d68746cd833f61c1d669a0ad403ea1143ff6
-DIST thunderbird-68.3.0-hr.xpi 583783 BLAKE2B f1975b0db4b4ced78365b6ba899552d1caf7d3e0a2af3f92d17ddd343d1dbd6d177ef91ebd29f548fcdbbb59602ba45d3a0056b1f98eec2591456f30b3125db4 SHA512 1545275fcaac9a6f76de634f6c3dc87579df8ac1600fb4eec937fc1425107007cac500225a56cec696e3d42d4fce4f505a277dcdaf31d04189c19f1912147c84
-DIST thunderbird-68.3.0-hsb.xpi 616033 BLAKE2B ad43045ce5b0c6c78c3f486a0d605d01e075f84aacb16651008654ebcacc2f5a62069dd62846380b96a0972cbd4efaa3d4cd41a57e300657bbcc49bbbc1d5b6d SHA512 51f4b53b82bd091e78c91e4cb1a1d7912ff01b9e28aaf7cb8b72ab2d6769bb147c249236563764532e44e42dfc733e467fae4d1277f11133cf00c5ff788aa20a
-DIST thunderbird-68.3.0-hu.xpi 618153 BLAKE2B 71e613cf955e75196f2768bd26d5f152189c9b0a1d4a715d58591d9e6bdb03a7fb11e523ce5cbf62085d50e7685ec700e86cb170860b68ef940346b847ecfa35 SHA512 3334539638c7bf627d71163b1d2cd22f23c380c5c041a2c1da613dbdb373b8e77deb1fff4ad5ae645bde3d076febf7a4287da1b2db7a53f87582f89189ddec7a
-DIST thunderbird-68.3.0-hy-AM.xpi 630522 BLAKE2B facb4ef4218a13defbb5ae768167af672981dd96ebbf0d51ff2dd684f2df13a4c37bdab30e639203c86fdbae50167a1e459d1b2cbc43e44e1d170dae55a2172f SHA512 704d58e597809ebbd36f947be136044e6cb00e0e1453b1308e53e4bf6f81c3be6ab021b2877fd6efd25cb9b2c2429a3c0def7e530420975e221bd720f68db61a
-DIST thunderbird-68.3.0-id.xpi 567746 BLAKE2B e52cb1c3fd595c1f6da9f84b63acf489476c35ff7a1f0ffd4090e59332adcb3a313bf799cb17dd85648874a5f26a4b5df1ba77a366eae5503450ab5338b181bd SHA512 4f611802354100e7ddc2a8c229deca1263213c33dd03abc00fb156af8f88a63b9f4f6212bba5e9e92ec9914f366af9380527e7e9c4adcb28512e1ee81cc60d9e
-DIST thunderbird-68.3.0-is.xpi 575439 BLAKE2B 9e9f62fa1db1cdb0e82e403e10a4197c17f039c293cf8a997ac1ac47a8f7f7a7b8881889b1180eef40def6117ee96c0e336725e42edbe5a16fea32e03431fccd SHA512 cf2eb20457709c4ef3597945efcb4629737fc6099ec5a40d627a36a4f74981010c9aafa2b15951319330f2a11c393f9092c909cbeb603c75edb1e3d8f8495b9b
-DIST thunderbird-68.3.0-it.xpi 489517 BLAKE2B 8b93474ff218f9edbada61065f82023852e51da8dd2ec244140b92d3bc29780c8b5e409b515d50bda2e3f0e0613134446261b44ef10209704e4d85475402b4d1 SHA512 c6a2583e5462b00846779ffc0ddef2833050ca4a4b3ad00310eca9169102e7e8914f482facfdf8f3c466d0b0ef49871a66cb040e9371cb54588497276c548153
-DIST thunderbird-68.3.0-ja.xpi 643574 BLAKE2B a9824ccc6a0c0fd319d2c2fea7f2c27f44d3c0fc6e1dbc2a2a729c1248f52e09badd15d29621ce9ceaaf675f65469b0836ed7a4a5554f016a465ba779f4b574c SHA512 d267b54fb2bd8448d7af659a363fdb9c622ea2ebd52377a1ca2e590be968350e9f2ac3d654821a90c835fb0f24454335cbab14d8088acb43ad3f1d9abeab83a3
-DIST thunderbird-68.3.0-ko.xpi 620527 BLAKE2B 5631ae1e44a0bd5c5ee44879aab50c35eefee28b74a18741f100631b942baaaf7902639c7ba1cd2905c9341bc67eb463d49fb39b996c4ac0e72839c5b96099da SHA512 166faf8d5e8592339d2f5fa357f7853ef903cb9f95918141129729a8831344fd8dc4d1aa7209b99d4ad71ef01958829414a0e77b94cf1010a98752b073e556f5
-DIST thunderbird-68.3.0-lt.xpi 603844 BLAKE2B 0e4ea29e0ba7b82852aa35ce0d47ac6e0a8a388bec9b5e532d41dec8cccfe169e3a15dd6212d6e7896fd93bf16f186337048948c4912978ccbc8c9df41b83a46 SHA512 06383a5eed292280c32280e631d72f9f26f451689651fd2f559c47205848b7b092ede326fd31f86bdad4c9e1bc093e83b6e3dbd8a02a9f0034d708736f61b77c
-DIST thunderbird-68.3.0-nb-NO.xpi 574020 BLAKE2B 752f053aa132439df58cc616f550e9ffa5809517c29c51c2c560d006768088f25e16be5c8247a75b2ced36a2125f3842dd2aab0091f707d80149cf14d35e4e6e SHA512 5ccf2e9e75f8d4b9761f7ce74305334ead26d9f44269a62f71c4085166dd4ed6b1af9e6147e3362b85cbc3d4cca409b1ffaa66b73682064af2113dbede3b9787
-DIST thunderbird-68.3.0-nl.xpi 581354 BLAKE2B 9e8f41d64a6c6ec581b22ce72a0d4326d1e5a61f2d2cb388874a08456196e41adaa76bb1889fd99681c32b40ea681f6ac403026c15d2d1abfac91252467e0616 SHA512 3d0e0ec787e78d69e3126dd52b1732f2e8e28c03d6173e96fb098cc24efc275a0706ff7c2dc58c275b934934aa7e24b6682f37067408b1228029439fd0609b49
-DIST thunderbird-68.3.0-nn-NO.xpi 574948 BLAKE2B 965223512bb4b923dbbb2d2dc7bde978d78c412bc0ca03a80a40adaf4e4e391e25ab66f266c1896b786b9178cffc51684dc0f69918488598defad88bdf716a9a SHA512 6e1e094588bfb1fd79188ef6334c5a2bd8617f2fb244ad8b8b14f925d1ba91614a565c6fcd8db56dc1d0404294d815d4411c096fdce7f464ba3195334aef53dd
-DIST thunderbird-68.3.0-pl.xpi 576084 BLAKE2B 1363605c702178199ab23e60b206617cbd72ec2ed8c5c2f2b28e301c4d7507c5a90bac427d440b71b5393c12e1f590dafbd267bd613fc8a8772842787548fbfb SHA512 89b54b8266e18b5696502d1ba6cab8e53bd1444f9677270e6fcbba597d73f0cc684b6f5ffe17f37064f4205bbad7b8ce559ae16b18e2825eb009cabc612a1fc4
-DIST thunderbird-68.3.0-pt-BR.xpi 589835 BLAKE2B c1e88c5907bbdfcb2a0e2fa97bb4abd56bd595bd7967d8fb5c1e2207624c0d7e2d8d06e81e5d08790eb56a3b21f923216d72194c43c4958180141d276ba884fc SHA512 d215892fd20f4f74bc9408de37e0caef2b53d4f9106fb8a9e751c247338a79d6b54957f104cb0172ced70ee86f199bd546d46ea7a38b98190bc82099ef123f7f
-DIST thunderbird-68.3.0-pt-PT.xpi 588101 BLAKE2B afe21532c5b6e3df6e9d21737f18495c0a17199f23d3598ed7f062de14c26577a75564b58121e6b3ed5b1e1d272a45d123210c9452e9550a894ebcf1f1317929 SHA512 aeeac645c17e62c233a737a1d673e229655d0f3e4768a52ce2657723b1874852c714a2f48a76a5db558870bd4645457afd9b38d6d3b3580450114db889e14fa3
-DIST thunderbird-68.3.0-rm.xpi 578048 BLAKE2B dcca59d4743ded7c7a8e90812135ed0ba1d73dfd8bbbcbe87d4553f4f3f01c5dfaac07dd5486b95db11b231822646fcaeb0ce363e85d04218784102cb03b080e SHA512 62f35e9cfc070f211a06c863e089365f773e40f4624905704c6a16db64a312e1560691b90db0a27ac029c41aff58c343af8b7441290d241eb394a53c11891376
-DIST thunderbird-68.3.0-ro.xpi 594840 BLAKE2B 2bb66a8532587711aea456e488f59e9e7cd8493bc8b56d95a9c541395709c6893738275579dde826bd006aa45ce57d963345372644aa8cf75f4da5fe0025a7b2 SHA512 3eef81b97a7f5cb1efb84a1685cc1cd023f2c2bd35f8a285fdb7bee56eddd0a12750aec38d3aa067a79dd32807ce997bb6694bf727eeff9dc55f2faac3d5fcbc
-DIST thunderbird-68.3.0-ru.xpi 683325 BLAKE2B 046b48b78753b9e421d3fa1e38115f433af12d6d9e48182656ca1de7142f7857b53bcfa464065da82a7c7caa35a61e8b02d14c84cbf22cc827e5e710240275e9 SHA512 31ab532dfc99df92f97d0b818477f23ed06fa3967de418f756c26c02a4a270b501560fca359bf91c61ec643e1ac3c185cbd49bb74f6dc194a9856af4d6bad76e
-DIST thunderbird-68.3.0-si.xpi 637404 BLAKE2B 288fa89fd0384127adb4308fd4243420ceb3fa8bbbac2e5e2aab374f820b393a8d23dc9cf806450635364b0b5c670ea8fd082a14bcb8db95f69d700021a0e7e9 SHA512 a2cb64f388a3a1f43585d8ed213718d10f88456a7e98ece05999850afb38490a05f7c8ee6ebf67565b0054217260c23782928370e6830c02c5abb869226629bd
-DIST thunderbird-68.3.0-sk.xpi 609751 BLAKE2B b370af76d4feb8286281c1b224813ccf77ae1881e6d305fc4477a59f4d3bb49e27bd52af80c7b02ed0f79f48094463d68062d092dfb81e21e12803db851d204e SHA512 148d483cb276d145c290789371a7473fc6df168866adb9c19ed9ed77c01214ff164271ea799021d2f50562c51703e0dacf5f4ea2d24019ab77d539440cc71fca
-DIST thunderbird-68.3.0-sl.xpi 590627 BLAKE2B cdf9222020d50262a11650d43f4b41b2fc40057bbc9b8bd7d1c9c58350b945d2dc70c6f854ca156270f765ef15b560f50d3709875df0f162342b95ff42e90cfe SHA512 982989131ed30d2765a140861208db58a8b87dc04c89da687d8e1e534b3221980a470c8944875bc4dabeec42258b705730ad31d9b7ed7b3bb8403bf8344006ae
-DIST thunderbird-68.3.0-sq.xpi 598899 BLAKE2B 42b9540a34a2ab14d5cbfb5b69b303edbb11c5597426b5af7d0936f0971e77c1397a7c9fc19aadf59929730247215f1ad27eb984622039f0a29eadb2ae1d3a67 SHA512 9c154f646af00d5ffe880f9bb32e185746cfa7edc9163b9081a201c4a94bf6be77e6d9d8926ffa08ea42987b7fe3c81d4927b5a4b7cdeccb66120d81a3be75b8
-DIST thunderbird-68.3.0-sr.xpi 624895 BLAKE2B 6316b26f8f9f604cd0a374ad4a39a2cc637420dab452e583a4a419061033658ea7bf60bb8e2355a0b6c6a08f295c50f85fce835362f050f5804cc8aea6115e5f SHA512 70b2aa3be55fb87c54e3d1b5ac237b5130784261060a24f824f1bc5df2777238b1d60f9493cd381876c0faa102414f6aff7ecd873f767e9cbcd1080d771a0815
-DIST thunderbird-68.3.0-sv-SE.xpi 591594 BLAKE2B 80919193b0cbad15f45995692c3600c89ae354f46e3d914c0cdb380fcd09a6b79e4c05c39c1a873a2e5ee24c8c3d72e03813e32c328e20b707e86920901d0fe4 SHA512 54132d25d21f4703415f222e1cae92f70052b6a59b8322fd14fae39a3bb34e4cb88f76011052bba583c770e14bc98535e45f79a50820da2ca853b7682d71b3b5
-DIST thunderbird-68.3.0-tr.xpi 599706 BLAKE2B adfbb20401c27fea4615f4dbf51b0b58a928d111c8c720bfdd03581d68077ca6de405f51d4a6e46acb6089df318ce93080ffb890ce6605d38c589d138f11f31a SHA512 2fd9ad18c6756fafd2227f258c1511df9d7b34715640c4e6b2473b4e3b0cdf1952f995d5ae1caabcfc7c9d3714e03c1d91a2e7c5cecaa16e4adb485bbe22f0b4
-DIST thunderbird-68.3.0-uk.xpi 671452 BLAKE2B 8d9d86cf679e873d5d185609dda6f73932bfb704a912549c9377d8bc445fef76bc40e1d24f5e3e0dc2b1c9d42347e91dba14d15f2b42600deb0c07266599b42c SHA512 21f24d163a8c250b3d329f152f0fa0ff8a5c69835810a81640cfaadce01a1b8214f7644719f1f63d531eac7cabee8e04d3beb55b826c4829033b1b01c98a9be2
-DIST thunderbird-68.3.0-vi.xpi 623422 BLAKE2B 33c456c98384ba76c83013a2ead8f15783dff7a12a33104a5576d111b4417afdc4908ad17d74651acc6601f5dcf59ebe1dd2c62dd829126ef124d52786454b4a SHA512 d6f9fe7daaf2552acec59c924daaf55bd5690ef83e0c9e0b1090c73bdf85ea5675ae5ed58858ec90a04b347c224fb13c588cbf25d601b9ddbc6fdb18ca780dea
-DIST thunderbird-68.3.0-zh-CN.xpi 626818 BLAKE2B ee3f4579e747a1e3938adc81ccc11512d12e3c928bd91353c61d2f0cb89ad76d06a154ec6e33a75f1e39609dcb51e7045e0a314975607f7f28231a7436e45ac9 SHA512 c42ea1b005a40ce56d8f7e40ee66e978f5a9fed68087ffc1e14f489cd585ff0522d084cdf9c1be2d34b615c23b97aa1e392775963f85c2c1a5fa9b06260b5024
-DIST thunderbird-68.3.0-zh-TW.xpi 627474 BLAKE2B c23263e7fe4674d4dd74a6caf10f67d94f35421fd9dee8449c39ac6d1384fb0f8cebd848f18f59fc3d8352ef0e47439167c5e1cc65cc4730ac669ca2b4e247a4 SHA512 b244d06d4a30ee404caa18cea07882eea3b3ac87315b376a669b4fe33129df641f9eabb4e7a304dbc2c2f8698814ab19471ca729f02fd8c40269c09d1cf85a2e
-DIST thunderbird-68.3.0.source.tar.xz 331088404 BLAKE2B b5de4bd1e3d21eac506d16f8085f70f22636eeaeb242ffe71bc22a3a9a20f0e93afade1509d34924ed7bb477cac0209e395694fd658acfa977ac4332af338e3a SHA512 94474f91a4e7b927b94698340c31015fda6f25533ec2a4aad0712bd6d2f9a528184345ed7ddb0ff25e207375391a5c6252506538e4a4992614cd152db28d8cd5
DIST thunderbird-68.3.1-ar.xpi 617167 BLAKE2B fffa85505d911f9863862e93250b3a16e5a54921774691587fd6447cef4278cc273ecf028bd4852992d6680a07f90ac17766427706f7d91303465a22d82fd8cd SHA512 ae0540082ec73799e73cedd855ab054ce2b1fab9e89b13ca45bbd2c5960143427921e5681da61cc6bf869ad1cc4cff27501c8e1f575e7c98dbb41e654cd2fab8
DIST thunderbird-68.3.1-ast.xpi 551298 BLAKE2B 0ea77ad0eab79f2504d13696389dfa27297778abdab8ef2bd57311c61955a9114b77e1e2fc28350d6b9fcb6230d32ed0ffb9f19ed5661b4ae37cedf8913da623 SHA512 c93fa6319c58ccfb229e73781a0de7d050fb03d503e2ca91873680529c138ac404bc46850f32b549a6300d1b91ab809d7525fe5d3db20cd0d72bbf6bd163f9b8
DIST thunderbird-68.3.1-be.xpi 646279 BLAKE2B 14beecf16085c661d31252e959c69bdea5eab9ddfb56d85dccdab28f57e2fe53830ee3deb4d3f48f38ae45f67403c7fc364feb67bf4c4d0b17f0f544ec720a01 SHA512 02000332fe0471b347023d130b30878806d7254dbe20b28f47e52245870db9ab23970fb9161c87c7e9143fb47720b6931ff2895f3261e89e5d3f65639b5700cf
diff --git a/mail-client/thunderbird/thunderbird-68.2.2.ebuild b/mail-client/thunderbird/thunderbird-68.2.2.ebuild
deleted file mode 100644
index 95b2bcfc9a80..000000000000
--- a/mail-client/thunderbird/thunderbird-68.2.2.ebuild
+++ /dev/null
@@ -1,778 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-68.0-patches-12"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
- MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=9
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
- +gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
- selinux startup-notification +system-av1 +system-harfbuzz +system-icu
- +system-jpeg +system-libevent +system-sqlite +system-libvpx
- +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )
- !test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
- https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
- lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
- ${PATCH_URIS[@]}"
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
- gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
- autotools mozlinguas-v2 virtualx multiprocessing
-
-CDEPEND="
- >=dev-libs/nss-3.44.1
- >=dev-libs/nspr-4.21
- dev-libs/atk
- dev-libs/expat
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3[X]
- x11-libs/gdk-pixbuf
- >=x11-libs/pango-1.22.0
- >=media-libs/libpng-1.6.35:0=[apng]
- >=media-libs/mesa-10.2:*
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10
- kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
- virtual/freedesktop-icon-theme
- dbus? ( >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72 )
- startup-notification? ( >=x11-libs/startup-notification-0.8 )
- >=x11-libs/pixman-0.19.2
- >=dev-libs/glib-2.26:2
- >=sys-libs/zlib-1.2.3
- >=virtual/libffi-3.0.10:=
- virtual/ffmpeg
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXt
- system-av1? (
- >=media-libs/dav1d-0.3.0:=
- >=media-libs/libaom-1.0.0:=
- )
- system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
- system-icu? ( >=dev-libs/icu-63.1:= )
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
- system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
- system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
- system-webp? ( >=media-libs/libwebp-1.0.2:0= )
- wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- net-misc/networkmanager ) )
- jack? ( virtual/jack )
- selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
- jack? ( virtual/jack )
- pulseaudio? ( || ( media-sound/pulseaudio
- >=media-sound/apulse-0.1.9 ) )
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
- app-arch/zip
- app-arch/unzip
- >=dev-util/cbindgen-0.8.7
- >=net-libs/nodejs-8.11.0
- >=sys-devel/binutils-2.30
- sys-apps/findutils
- || (
- (
- sys-devel/clang:9
- !clang? ( sys-devel/llvm:9 )
- clang? (
- =sys-devel/lld-9*
- sys-devel/llvm:9[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
- )
- )
- (
- sys-devel/clang:8
- !clang? ( sys-devel/llvm:8 )
- clang? (
- =sys-devel/lld-8*
- sys-devel/llvm:8[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
- )
- )
- (
- sys-devel/clang:7
- !clang? ( sys-devel/llvm:7 )
- clang? (
- =sys-devel/lld-7*
- sys-devel/llvm:7[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
- )
- )
- (
- sys-devel/clang:6
- !clang? ( sys-devel/llvm:6 )
- clang? (
- =sys-devel/lld-6*
- sys-devel/llvm:6[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
- )
- )
- )
- pulseaudio? ( media-sound/pulseaudio )
- >=virtual/rust-1.34.0
- wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
- amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
- x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
- !system-av1? (
- amd64? ( >=dev-lang/nasm-2.13 )
- x86? ( >=dev-lang/nasm-2.13 )
- )"
-
-REQUIRED_USE="wifi? ( dbus )
- pgo? ( lto )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
- GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang ; then
- if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use pgo ; then
- if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
- fi
-
- einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
- moz_pkgsetup
-
- if use pgo ; then
- if ! has usersandbox $FEATURES ; then
- die "You must enable usersandbox as X server can not run as root!"
- fi
- fi
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist ; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation."
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
- fi
-
- addpredict /proc/self/oom_score_adj
-
- llvm_pkg_setup
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
-
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply firefox patchset then apply thunderbird patches
- rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
- rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
- eapply "${WORKDIR}/firefox"
- pushd "${S}"/comm &>/dev/null || die
- eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
- popd &>/dev/null || die
-
- eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- local n_jobs=$(makeopts_jobs)
- if [[ ${n_jobs} == 1 ]]; then
- einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
- export MAKEOPTS=-j2
- fi
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
- if use ia64 ; then
- sed -i \
- -e '/^OS_LIBS += no_as_needed/d' \
- -e '/^OS_LIBS += as_needed/d' \
- "${S}"/widget/gtk/mozgtk/gtk2/moz.build \
- "${S}"/widget/gtk/mozgtk/gtk3/moz.build \
- || die "sed failed to drop --as-needed for ia64"
- fi
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/comm/mail/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- # Keep codebase the same even if not using official branding
- sed '/^MOZ_DEV_EDITION=1/d' \
- -i "${S}"/browser/branding/aurora/configure.sh || die
-
- # rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
- # However, when available, an unsupported version can cause problems, bug #669548
- sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
- "${S}"/build/moz.configure/rust.configure || die
-
- # Autotools configure is now called old-configure.in
- # This works because there is still a configure.in that happens to be for the
- # shell wrapper configure script
- eautoreconf old-configure.in
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf old-configure.in
-}
-
-src_configure() {
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- # Add information about TERM to output (build.log) to aid debugging
- # blessings problems
- if [[ -n "${TERM}" ]] ; then
- einfo "TERM is set to: \"${TERM}\""
- else
- einfo "TERM is unset."
- fi
-
- if use clang && ! tc-is-clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- strip-unsupported-flags
- elif ! use clang && ! tc-is-gcc ; then
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- strip-unsupported-flags
- fi
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- # common config components
- mozconfig_annotate 'system_libs' \
- --with-system-zlib \
- --with-system-bz2
-
- # Must pass release in order to properly select linker
- mozconfig_annotate 'Enable by Gentoo' --enable-release
-
- if use pgo ; then
- if ! has userpriv $FEATURES ; then
- eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
- fi
- fi
-
- # Don't let user's LTO flags clash with upstream's flags
- filter-flags -flto*
-
- if use lto ; then
- local show_old_compiler_warning=
-
- if use clang ; then
- # At this stage CC is adjusted and the following check will
- # will work
- if [[ $(clang-major-version) -lt 7 ]] ; then
- show_old_compiler_warning=1
- fi
-
- # Upstream only supports lld when using clang
- mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
- else
- if [[ $(gcc-major-version) -lt 8 ]] ; then
- show_old_compiler_warning=1
- fi
-
- # Bug 689358
- append-cxxflags -flto
-
- if ! use cpu_flags_x86_avx2 ; then
- local _gcc_version_with_ipa_cdtor_fix="8.3"
- local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
- if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
- # due to a GCC bug, GCC will produce AVX2 instructions
- # even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
- einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
- append-ldflags -fdisable-ipa-cdtor
- else
- einfo "No GCC workaround required, GCC version is already patched!"
- fi
- else
- einfo "No GCC workaround required, system supports AVX2"
- fi
-
- # Linking only works when using ld.gold when LTO is enabled
- mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
- fi
-
- if [[ -n "${show_old_compiler_warning}" ]] ; then
- # Checking compiler's major version uses CC variable. Because we allow
- # user to control used compiler via USE=clang flag, we cannot use
- # initial value. So this is the earliest stage where we can do this check
- # because pkg_pretend is not called in the main phase function sequence
- # environment saving is not guaranteed so we don't know if we will have
- # correct compiler until now.
- ewarn ""
- ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
- ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
- ewarn ""
- sleep 5
- fi
-
- mozconfig_annotate '+lto' --enable-lto=thin
-
- if use pgo ; then
- mozconfig_annotate '+pgo' MOZ_PGO=1
- fi
- else
- # Avoid auto-magic on linker
- if use clang ; then
- # This is upstream's default
- mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
- elif tc-ld-is-gold ; then
- mozconfig_annotate "linker is set to gold" --enable-linker=gold
- else
- mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
- fi
- fi
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- if use hardened ; then
- append-ldflags "-Wl,-z,relro,-z,now"
- mozconfig_use_enable hardened hardening
- fi
-
- # Modifications to better support ARM, bug 553364
- if use neon ; then
- mozconfig_annotate '' --with-fpu=neon
-
- if ! tc-is-clang ; then
- # thumb options aren't supported when using clang, bug 666966
- mozconfig_annotate '' --with-thumb=yes
- mozconfig_annotate '' --with-thumb-interwork=no
- fi
- fi
- if [[ ${CHOST} == armv*h* ]] ; then
- mozconfig_annotate '' --with-float-abi=hard
- if ! use system-libvpx ; then
- sed -i -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build
- fi
- fi
-
- mozconfig_use_enable !bindist official-branding
-
- mozconfig_use_enable debug
- mozconfig_use_enable debug tests
- if ! use debug ; then
- mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
- else
- mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
- fi
- # These are enabled by default in all mozilla applications
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
- --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --disable-crashreporter
- mozconfig_annotate 'Gentoo default' --with-system-png
- mozconfig_annotate '' --enable-system-ffi
- mozconfig_annotate '' --disable-gconf
- mozconfig_annotate '' --with-intl-api
- mozconfig_annotate '' --enable-system-pixman
- # Instead of the standard --build= and --host=, mozilla uses --host instead
- # of --build, and --target intstead of --host.
- # Note, mozilla also has --build but it does not do what you think it does.
- # Set both --target and --host as mozilla uses python to guess values otherwise
- mozconfig_annotate '' --target="${CHOST}"
- mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
- if use system-libevent ; then
- mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
- fi
-
- if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
- mozconfig_annotate '' --enable-rust-simd
- fi
-
- # use the gtk3 toolkit (the only one supported at this point)
- # TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
- if use wayland ; then
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
- else
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
- fi
-
- mozconfig_use_enable startup-notification
- mozconfig_use_enable system-sqlite
- mozconfig_use_with system-av1
- mozconfig_use_with system-harfbuzz
- mozconfig_use_with system-harfbuzz system-graphite2
- mozconfig_use_with system-icu
- mozconfig_use_with system-jpeg
- mozconfig_use_with system-libvpx
- mozconfig_use_with system-webp
- mozconfig_use_enable pulseaudio
- # force the deprecated alsa sound code if pulseaudio is disabled
- if use kernel_linux && ! use pulseaudio ; then
- mozconfig_annotate '-pulseaudio' --enable-alsa
- fi
-
- # Disable built-in ccache support to avoid sandbox violation, #665420
- # Use FEATURES=ccache instead!
- mozconfig_annotate '' --without-ccache
- sed -i -e 's/ccache_stats = None/return None/' \
- python/mozbuild/mozbuild/controller/building.py || \
- die "Failed to disable ccache stats call"
-
- mozconfig_use_enable dbus
-
- mozconfig_use_enable wifi necko-wifi
-
- # enable JACK, bug 600002
- mozconfig_use_enable jack
-
- # Other tb-specific settings
- mozconfig_annotate '' --with-user-appdir=.thunderbird
- mozconfig_annotate '' --enable-ldap
- mozconfig_annotate '' --enable-calendar
-
- # Enable/Disable eme support
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
- # Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
- mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
- # allow elfhack to work in combination with unstripped binaries
- # when they would normally be larger than 2GiB.
- append-ldflags "-Wl,--compress-debug-sections=zlib"
-
- if use clang ; then
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
- mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
- echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- mkdir -p "${S}"/third_party/rust/libloading/.deps
-
- # workaround for funky/broken upstream configure...
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- ./mach configure || die
-}
-
-src_compile() {
- local _virtx=
- if use pgo ; then
- _virtx=virtx
-
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- addpredict /root
- addpredict /etc/gconf
- fi
-
- GDK_BACKEND=x11 \
- MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
- MOZ_NOSPAM=1 \
- ${_virtx} \
- ./mach build --verbose \
- || die
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Copy our preference before omnijar is created.
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- # set dictionary path, to use system hunspell
- echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
- # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
- if use system-harfbuzz ; then
- echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- # force cairo as the canvas renderer on platforms without skia support
- if [[ $(tc-endian) == "big" ]] ; then
- echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
- done
-
- cd "${S}"
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- DESTDIR="${D}" ./mach install || die
-
- # Install language packs
- MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
- local size sizes icon_path icon
- if ! use bindist; then
- icon_path="${S}/comm/mail/branding/thunderbird"
- icon="${PN}-icon"
-
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- icon_path="${S}/comm/mail/branding/nightly"
- icon="${PN}-icon-unbranded"
-
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
- "${ED}"/usr/share/applications/${PN}.desktop
- fi
-
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}"/default48.png "${icon}".png
- # Install icons for menu entry
- sizes="16 22 24 32 48 256"
- for size in ${sizes}; do
- newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
- done
-
- # Disable built-in auto-update because we update firefox through package manager
- insinto ${MOZILLA_FIVE_HOME}/distribution/
- newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Don't install llvm-symbolizer from sys-devel/llvm package
- [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
- rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
- local emid
- # stage extra locales for lightning and install over existing
- emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
- rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
- insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
- doins -r "${T}/${emid}"
-
- if use lightning; then
- # move lightning out of distribution/extensions and into extensions for app-global install
- mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
- mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
- # stage extra locales for gdata-provider and install app-global
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
- "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
- emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
- # manifest.json does not allow the addon to load, put install.rdf in place
- # note, version number needs to be set properly
- cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
- sed -i -e '/em:version/ s/>[^<]*>4.1' "${T}/${emid}"/install.rdf
-
- insinto ${MOZILLA_FIVE_HOME}/extensions
- doins -r "${T}/${emid}"
- fi
-
- # thunderbird and thunderbird-bin are identical
- rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
- dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
- # Required in order to use plugins and even run thunderbird on hardened.
- pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
- # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # doesn't need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- einfo "APULSE found - Generating library symlinks for sound support"
- local lib
- pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # a quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if [[ ! -L ${lib##*/} ]] ; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-
- if ! use gmp-autoupdate && ! use eme-free ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-68.3.0.ebuild b/mail-client/thunderbird/thunderbird-68.3.0.ebuild
deleted file mode 100644
index 9ca623c2f8ff..000000000000
--- a/mail-client/thunderbird/thunderbird-68.3.0.ebuild
+++ /dev/null
@@ -1,779 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-68.0-patches-12"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
- MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=9
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
- +gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo
- pulseaudio selinux startup-notification +system-av1 +system-harfbuzz
- +system-icu +system-jpeg +system-libevent +system-sqlite
- +system-libvpx +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )
- !test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
- https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
- lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
- ${PATCH_URIS[@]}"
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
- gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
- autotools mozlinguas-v2 virtualx multiprocessing
-
-CDEPEND="
- >=dev-libs/nss-3.44.1
- >=dev-libs/nspr-4.21
- dev-libs/atk
- dev-libs/expat
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3[X]
- x11-libs/gdk-pixbuf
- >=x11-libs/pango-1.22.0
- >=media-libs/libpng-1.6.35:0=[apng]
- >=media-libs/mesa-10.2:*
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10
- kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
- virtual/freedesktop-icon-theme
- dbus? ( >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72 )
- startup-notification? ( >=x11-libs/startup-notification-0.8 )
- >=x11-libs/pixman-0.19.2
- >=dev-libs/glib-2.26:2
- >=sys-libs/zlib-1.2.3
- >=virtual/libffi-3.0.10:=
- virtual/ffmpeg
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXt
- system-av1? (
- >=media-libs/dav1d-0.3.0:=
- >=media-libs/libaom-1.0.0:=
- )
- system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
- system-icu? ( >=dev-libs/icu-63.1:= )
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
- system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
- system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
- system-webp? ( >=media-libs/libwebp-1.0.2:0= )
- wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- net-misc/networkmanager ) )
- jack? ( virtual/jack )
- selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
- jack? ( virtual/jack )
- pulseaudio? ( || ( media-sound/pulseaudio
- >=media-sound/apulse-0.1.9 ) )
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
- app-arch/zip
- app-arch/unzip
- >=dev-util/cbindgen-0.8.7
- >=net-libs/nodejs-8.11.0
- >=sys-devel/binutils-2.30
- sys-apps/findutils
- || (
- (
- sys-devel/clang:9
- !clang? ( sys-devel/llvm:9 )
- clang? (
- =sys-devel/lld-9*
- sys-devel/llvm:9[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
- )
- )
- (
- sys-devel/clang:8
- !clang? ( sys-devel/llvm:8 )
- clang? (
- =sys-devel/lld-8*
- sys-devel/llvm:8[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
- )
- )
- (
- sys-devel/clang:7
- !clang? ( sys-devel/llvm:7 )
- clang? (
- =sys-devel/lld-7*
- sys-devel/llvm:7[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
- )
- )
- (
- sys-devel/clang:6
- !clang? ( sys-devel/llvm:6 )
- clang? (
- =sys-devel/lld-6*
- sys-devel/llvm:6[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
- )
- )
- )
- pulseaudio? ( media-sound/pulseaudio )
- >=virtual/rust-1.34.0
- wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
- amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
- x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
- !system-av1? (
- amd64? ( >=dev-lang/nasm-2.13 )
- x86? ( >=dev-lang/nasm-2.13 )
- )"
-
-REQUIRED_USE="wifi? ( dbus )
- pgo? ( lto )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
- GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang ; then
- if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use pgo ; then
- if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
- fi
-
- einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
- moz_pkgsetup
-
- if use pgo ; then
- if ! has usersandbox $FEATURES ; then
- die "You must enable usersandbox as X server can not run as root!"
- fi
- fi
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist ; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation."
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
- fi
-
- addpredict /proc/self/oom_score_adj
-
- llvm_pkg_setup
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
-
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply firefox patchset then apply thunderbird patches
- rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
- rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
- eapply "${WORKDIR}/firefox"
- pushd "${S}"/comm &>/dev/null || die
- eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
- popd &>/dev/null || die
-
- eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- local n_jobs=$(makeopts_jobs)
- if [[ ${n_jobs} == 1 ]]; then
- einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
- export MAKEOPTS=-j2
- fi
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
- if use ia64 ; then
- sed -i \
- -e '/^OS_LIBS += no_as_needed/d' \
- -e '/^OS_LIBS += as_needed/d' \
- "${S}"/widget/gtk/mozgtk/gtk2/moz.build \
- "${S}"/widget/gtk/mozgtk/gtk3/moz.build \
- || die "sed failed to drop --as-needed for ia64"
- fi
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/comm/mail/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- # Keep codebase the same even if not using official branding
- sed '/^MOZ_DEV_EDITION=1/d' \
- -i "${S}"/browser/branding/aurora/configure.sh || die
-
- # rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
- # However, when available, an unsupported version can cause problems, bug #669548
- sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
- "${S}"/build/moz.configure/rust.configure || die
-
- # Autotools configure is now called old-configure.in
- # This works because there is still a configure.in that happens to be for the
- # shell wrapper configure script
- eautoreconf old-configure.in
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf old-configure.in
-}
-
-src_configure() {
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- # Add information about TERM to output (build.log) to aid debugging
- # blessings problems
- if [[ -n "${TERM}" ]] ; then
- einfo "TERM is set to: \"${TERM}\""
- else
- einfo "TERM is unset."
- fi
-
- if use clang && ! tc-is-clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- strip-unsupported-flags
- elif ! use clang && ! tc-is-gcc ; then
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- strip-unsupported-flags
- fi
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- # common config components
- mozconfig_annotate 'system_libs' \
- --with-system-zlib \
- --with-system-bz2
-
- # Must pass release in order to properly select linker
- mozconfig_annotate 'Enable by Gentoo' --enable-release
-
- if use pgo ; then
- if ! has userpriv $FEATURES ; then
- eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
- fi
- fi
-
- # Don't let user's LTO flags clash with upstream's flags
- filter-flags -flto*
-
- if use lto ; then
- local show_old_compiler_warning=
-
- if use clang ; then
- # At this stage CC is adjusted and the following check will
- # will work
- if [[ $(clang-major-version) -lt 7 ]] ; then
- show_old_compiler_warning=1
- fi
-
- # Upstream only supports lld when using clang
- mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
- else
- if [[ $(gcc-major-version) -lt 8 ]] ; then
- show_old_compiler_warning=1
- fi
-
- # Bug 689358
- append-cxxflags -flto
-
- if ! use cpu_flags_x86_avx2 ; then
- local _gcc_version_with_ipa_cdtor_fix="8.3"
- local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
- if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
- # due to a GCC bug, GCC will produce AVX2 instructions
- # even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
- einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
- append-ldflags -fdisable-ipa-cdtor
- else
- einfo "No GCC workaround required, GCC version is already patched!"
- fi
- else
- einfo "No GCC workaround required, system supports AVX2"
- fi
-
- # Linking only works when using ld.gold when LTO is enabled
- mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
- fi
-
- if [[ -n "${show_old_compiler_warning}" ]] ; then
- # Checking compiler's major version uses CC variable. Because we allow
- # user to control used compiler via USE=clang flag, we cannot use
- # initial value. So this is the earliest stage where we can do this check
- # because pkg_pretend is not called in the main phase function sequence
- # environment saving is not guaranteed so we don't know if we will have
- # correct compiler until now.
- ewarn ""
- ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
- ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
- ewarn ""
- sleep 5
- fi
-
- mozconfig_annotate '+lto' --enable-lto=thin
-
- if use pgo ; then
- mozconfig_annotate '+pgo' MOZ_PGO=1
- fi
- else
- # Avoid auto-magic on linker
- if use clang ; then
- # This is upstream's default
- mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
- elif tc-ld-is-gold ; then
- mozconfig_annotate "linker is set to gold" --enable-linker=gold
- else
- mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
- fi
- fi
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- if use hardened ; then
- append-ldflags "-Wl,-z,relro,-z,now"
- mozconfig_use_enable hardened hardening
- fi
-
- # Modifications to better support ARM, bug 553364
- if use cpu_flags_arm_neon ; then
- mozconfig_annotate '' --with-fpu=neon
-
- if ! tc-is-clang ; then
- # thumb options aren't supported when using clang, bug 666966
- mozconfig_annotate '' --with-thumb=yes
- mozconfig_annotate '' --with-thumb-interwork=no
- fi
- fi
-
- if [[ ${CHOST} == armv*h* ]] ; then
- mozconfig_annotate '' --with-float-abi=hard
- if ! use system-libvpx ; then
- sed -i -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build
- fi
- fi
-
- mozconfig_use_enable !bindist official-branding
-
- mozconfig_use_enable debug
- mozconfig_use_enable debug tests
- if ! use debug ; then
- mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
- else
- mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
- fi
- # These are enabled by default in all mozilla applications
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
- --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --disable-crashreporter
- mozconfig_annotate 'Gentoo default' --with-system-png
- mozconfig_annotate '' --enable-system-ffi
- mozconfig_annotate '' --disable-gconf
- mozconfig_annotate '' --with-intl-api
- mozconfig_annotate '' --enable-system-pixman
- # Instead of the standard --build= and --host=, mozilla uses --host instead
- # of --build, and --target intstead of --host.
- # Note, mozilla also has --build but it does not do what you think it does.
- # Set both --target and --host as mozilla uses python to guess values otherwise
- mozconfig_annotate '' --target="${CHOST}"
- mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
- if use system-libevent ; then
- mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
- fi
-
- if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
- mozconfig_annotate '' --enable-rust-simd
- fi
-
- # use the gtk3 toolkit (the only one supported at this point)
- # TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
- if use wayland ; then
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
- else
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
- fi
-
- mozconfig_use_enable startup-notification
- mozconfig_use_enable system-sqlite
- mozconfig_use_with system-av1
- mozconfig_use_with system-harfbuzz
- mozconfig_use_with system-harfbuzz system-graphite2
- mozconfig_use_with system-icu
- mozconfig_use_with system-jpeg
- mozconfig_use_with system-libvpx
- mozconfig_use_with system-webp
- mozconfig_use_enable pulseaudio
- # force the deprecated alsa sound code if pulseaudio is disabled
- if use kernel_linux && ! use pulseaudio ; then
- mozconfig_annotate '-pulseaudio' --enable-alsa
- fi
-
- # Disable built-in ccache support to avoid sandbox violation, #665420
- # Use FEATURES=ccache instead!
- mozconfig_annotate '' --without-ccache
- sed -i -e 's/ccache_stats = None/return None/' \
- python/mozbuild/mozbuild/controller/building.py || \
- die "Failed to disable ccache stats call"
-
- mozconfig_use_enable dbus
-
- mozconfig_use_enable wifi necko-wifi
-
- # enable JACK, bug 600002
- mozconfig_use_enable jack
-
- # Other tb-specific settings
- mozconfig_annotate '' --with-user-appdir=.thunderbird
- mozconfig_annotate '' --enable-ldap
- mozconfig_annotate '' --enable-calendar
-
- # Enable/Disable eme support
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
- # Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
- mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
- # allow elfhack to work in combination with unstripped binaries
- # when they would normally be larger than 2GiB.
- append-ldflags "-Wl,--compress-debug-sections=zlib"
-
- if use clang ; then
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
- mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
- echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- mkdir -p "${S}"/third_party/rust/libloading/.deps
-
- # workaround for funky/broken upstream configure...
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- ./mach configure || die
-}
-
-src_compile() {
- local _virtx=
- if use pgo ; then
- _virtx=virtx
-
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- addpredict /root
- addpredict /etc/gconf
- fi
-
- GDK_BACKEND=x11 \
- MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
- MOZ_NOSPAM=1 \
- ${_virtx} \
- ./mach build --verbose \
- || die
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Copy our preference before omnijar is created.
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- # set dictionary path, to use system hunspell
- echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
- # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
- if use system-harfbuzz ; then
- echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- # force cairo as the canvas renderer on platforms without skia support
- if [[ $(tc-endian) == "big" ]] ; then
- echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
- done
-
- cd "${S}"
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- DESTDIR="${D}" ./mach install || die
-
- # Install language packs
- MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
- local size sizes icon_path icon
- if ! use bindist; then
- icon_path="${S}/comm/mail/branding/thunderbird"
- icon="${PN}-icon"
-
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- icon_path="${S}/comm/mail/branding/nightly"
- icon="${PN}-icon-unbranded"
-
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
- "${ED}"/usr/share/applications/${PN}.desktop
- fi
-
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}"/default48.png "${icon}".png
- # Install icons for menu entry
- sizes="16 22 24 32 48 256"
- for size in ${sizes}; do
- newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
- done
-
- # Disable built-in auto-update because we update firefox through package manager
- insinto ${MOZILLA_FIVE_HOME}/distribution/
- newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Don't install llvm-symbolizer from sys-devel/llvm package
- [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
- rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
- local emid
- # stage extra locales for lightning and install over existing
- emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
- rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
- insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
- doins -r "${T}/${emid}"
-
- if use lightning; then
- # move lightning out of distribution/extensions and into extensions for app-global install
- mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
- mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
- # stage extra locales for gdata-provider and install app-global
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
- "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
- emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
- # manifest.json does not allow the addon to load, put install.rdf in place
- # note, version number needs to be set properly
- cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
- sed -i -e '/em:version/ s/>[^<]*>4.1' "${T}/${emid}"/install.rdf
-
- insinto ${MOZILLA_FIVE_HOME}/extensions
- doins -r "${T}/${emid}"
- fi
-
- # thunderbird and thunderbird-bin are identical
- rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
- dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
- # Required in order to use plugins and even run thunderbird on hardened.
- pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
- # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # doesn't need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- einfo "APULSE found - Generating library symlinks for sound support"
- local lib
- pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # a quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if [[ ! -L ${lib##*/} ]] ; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-
- if ! use gmp-autoupdate && ! use eme-free ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-68.3.1.ebuild b/mail-client/thunderbird/thunderbird-68.3.1.ebuild
index 84f9331b5786..9ca623c2f8ff 100644
--- a/mail-client/thunderbird/thunderbird-68.3.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.3.1.ebuild
@@ -36,7 +36,7 @@ LLVM_MAX_SLOT=9
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="https://www.mozilla.org/thunderbird"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index da002771ef29..67474ce729ee 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gnuclad/gnuclad-0.2.4.ebuild b/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
index 9d9826b28d99..198306e40753 100644
--- a/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
+++ b/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://launchpad.net/gnuclad/trunk/0.2/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples"
DEPEND=""
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index edeb0befd84a..4d23e1202de0 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,7 +1,6 @@
-
jer@gentoo.org