[gentoo-commits] repo/gentoo:master commit in: media-video/yle-dl/

2020-11-21 Thread Joonas Niilola
commit: aa5693ec7d7e706eea4afa42a100a1ead32162e7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 22 07:42:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 22 07:50:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5693ec

media-video/yle-dl: stabilize 20201022 on x86

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/yle-dl/yle-dl-20201022.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/yle-dl/yle-dl-20201022.ebuild 
b/media-video/yle-dl/yle-dl-20201022.ebuild
index 31cb79f4836..046c9b24c66 100644
--- a/media-video/yle-dl/yle-dl-20201022.ebuild
+++ b/media-video/yle-dl/yle-dl-20201022.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: app-misc/chkcrontab/

2020-11-21 Thread Joonas Niilola
commit: 980d806dce8deb71410023985ba6756a25b9d1ac
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 22 07:51:28 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 22 07:51:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980d806d

app-misc/chkcrontab: stabilize 1.7-r1 on amd64

Closes: https://bugs.gentoo.org/755992
Signed-off-by: Joonas Niilola  gentoo.org>

 app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild 
b/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
index a9facacc2c1..e5d5ef95ce9 100644
--- a/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-video/yle-dl/

2020-11-21 Thread Joonas Niilola
commit: cdc51172cd28557426a936ca97f7d79e776ee202
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 22 07:47:42 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 22 07:50:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc51172

media-video/yle-dl: stabilize 20201022 on amd64

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/yle-dl/yle-dl-20201022.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/yle-dl/yle-dl-20201022.ebuild 
b/media-video/yle-dl/yle-dl-20201022.ebuild
index 046c9b24c66..45ce4632daf 100644
--- a/media-video/yle-dl/yle-dl-20201022.ebuild
+++ b/media-video/yle-dl/yle-dl-20201022.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



[gentoo-commits] repo/gentoo:master commit in: media-video/yle-dl/

2020-11-21 Thread Joonas Niilola
commit: c464469e2731c3ec84aa118820384702734c8d30
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 22 07:50:51 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 22 07:50:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c464469e

media-video/yle-dl: remove old 2020-08-07

Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/yle-dl/Manifest   |  1 -
 media-video/yle-dl/yle-dl-20200807.ebuild | 57 ---
 2 files changed, 58 deletions(-)

diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 174e3f7af46..0159c87b2cf 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,2 +1 @@
-DIST yle-dl-20200807.tar.gz 62699 BLAKE2B 
9f92e8e37385c8936f39443179251f60fa01fcb2ad623852cebb4bc26aa111689d8132ca1871e914162399c26ea575d02a7811fcb6b55e27b1d942db428377cc
 SHA512 
fa38e0acb84fe968086a831c9d090a1a1387e58db0ca753aa25af65e42928542ea71b6a22988dd5e6a728b31de1da4d7dde02d2836bddec0bf52ec6dcbfa72ff
 DIST yle-dl-20201022.tar.gz 63423 BLAKE2B 
af79aa27528b9cfafcf297497fe5711d7c9260c5fd245bb556ff340bad3938bf48dac74e1875ae2013346c546d3dc745b2c552b1c32c15cc47106183a6d8cb82
 SHA512 
14d1bb7e814355dad48a02c240103baec39d831de9a08fb8f1eecdeb13522fd55d891bc519d8303dc156f2b0e300a7c8c4a42feba29b3d7c80c906edc9aadc89

diff --git a/media-video/yle-dl/yle-dl-20200807.ebuild 
b/media-video/yle-dl/yle-dl-20200807.ebuild
deleted file mode 100644
index 97fd2cbc398..000
--- a/media-video/yle-dl/yle-dl-20200807.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl";
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-# FEATURES="-network-sandbox" to test.
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   media-video/ffmpeg
-   net-misc/wget
-   >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-   >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-   dev-python/future[${PYTHON_USEDEP}]
-   dev-python/lxml[${PYTHON_USEDEP}]
-   dev-python/progress[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="test? (
-   ${RDEPEND}
-   media-video/ffmpeg[gnutls]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   )"
-BDEPEND="${PYTHON_DEPS}"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-   docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-   distutils-r1_src_install
-}
-
-pkg_postinst() {
-   elog "Sample configuration file has been installed to "
-   elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample"
-   elog ""
-   elog "Optional download engines: "
-   optfeature "youtube-dl download engine" net-misc/youtube-dl
-}



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-21 Thread Joonas Niilola
commit: 14aafce628dfaacc8e13e79df10516e5f385222b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 22 07:54:02 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 22 07:54:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14aafce6

package.mask: last-rite app-accessibility/simon

Bug: https://bugs.gentoo.org/752456
Signed-off-by: Joonas Niilola  gentoo.org>

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index ee2d34144a6..1498c6c521c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Joonas Niilola  (2020-11-22)
+# Abandoned upstream, unbuildable, unkeyworded in ::gentoo. 
+# Removal in 14 days. Bug #https://bugs.gentoo.org/752456
+app-accessibility/simon
+
 # Andreas Sturmlechner  (2020-11-21)
 # Dead upstream, depends on deprecated kde-frameworks/kmediaplayer
 # Masked for removal in 30 days.



[gentoo-commits] proj/portage: New tag: portage-3.0.10

2020-11-21 Thread Zac Medico
commit: 
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 06:48:01 2020 +

New tag: portage-3.0.10




[gentoo-commits] proj/portage:master commit in: /

2020-11-21 Thread Zac Medico
commit: 32889cc8ae09e19d65f9a2b7e1f196dd5a310c07
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov 22 06:32:36 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 06:32:46 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=32889cc8

Updates for portage-3.0.10 release

Signed-off-by: Zac Medico  gentoo.org>

 RELEASE-NOTES | 7 +++
 setup.py  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a5de85dd..61c3c3d16 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,13 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-3.0.10
+==
+* Bug Fixes:
+- Bug 753497 profiles should not inherit deprecated messages
+- Bug 754903 minimize use of installed packages to break cycles
+- Bug 755950 compare_files: handle missing xattr support
+
 portage-3.0.9
 ==
 * Bug Fixes:

diff --git a/setup.py b/setup.py
index 869cf9992..443b94422 100755
--- a/setup.py
+++ b/setup.py
@@ -655,7 +655,7 @@ class build_ext(_build_ext):
 
 setup(
name = 'portage',
-   version = '3.0.9',
+   version = '3.0.10',
url = 'https://wiki.gentoo.org/wiki/Project:Portage',
author = 'Gentoo Portage Development Team',
author_email = 'dev-port...@gentoo.org',



[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

2020-11-21 Thread Zac Medico
commit: b723fb347408dcd76ab4121f9cf94b0c51d48223
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov 22 06:43:39 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 06:47:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b723fb34

sys-apps/portage: Bump to version 3.0.10

 #753497 profiles should not inherit deprecated messages
 #754903 minimize use of installed packages to break cycles
 #755950 compare_files: handle missing xattr support

Bug: https://bugs.gentoo.org/753497
Bug: https://bugs.gentoo.org/754903
Bug: https://bugs.gentoo.org/755950
Bug: https://bugs.gentoo.org/756028
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-3.0.10.ebuild | 267 +
 2 files changed, 268 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d7c26d10983..37d756e3aaa 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,6 @@
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 
7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f
 SHA512 
6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B 
dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8
 SHA512 
176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
+DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 
9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77
 SHA512 
d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 
6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0
 SHA512 
7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 
662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666
 SHA512 
5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 
44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd
 SHA512 
01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618

diff --git a/sys-apps/portage/portage-3.0.10.ebuild 
b/sys-apps/portage/portage-3.0.10.ebuild
new file mode 100644
index 000..28cd3d04cca
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.10.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info tmpfiles prefix
+
+DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/sed-4.0.5 sys-devel/patch
+   doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+   apidoc? (
+   dev-python/sphinx
+   dev-python/sphinx-epytext
+   )"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+   app-arch/zstd
+   >=app-arch/tar-1.27
+   dev-lang/python-exec:2
+   >=sys-apps/findutils-4.4
+   !build? (
+   >=sys-apps/sed-4.0.5
+   app-shells/bash:0[readline]
+   >=app-admin/eselect-1.2
+   rsync-verify? (
+   >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+   >=app-crypt/openpgp-keys-gentoo-release-20180706
+   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+   )
+   )
+   elibc_gli

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/nokogumbo/

2020-11-21 Thread Hans de Graaff
commit: 6c313ffab605e9ac2020fee120ddae7f128aeb4c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Nov 22 06:46:19 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov 22 06:46:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c313ffa

dev-ruby/nokogumbo: add 2.0.3

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/nokogumbo/Manifest   |  1 +
 dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild | 49 +++
 2 files changed, 50 insertions(+)

diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index 234c2b7fbd5..ade4bd0e5dd 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1 +1,2 @@
 DIST nokogumbo-2.0.2.tar.gz 295558 BLAKE2B 
ce52794eb3359ad34234d8f5faad4aff7c197326f6449a09a2264cb1a3d920886377f805e055980224644223d31a6621300c583a04f48ce8a8abe275b2614470
 SHA512 
fd115e072d2763ff63c46dc6f6117bb841b2c2ac28df0180d44a581a2a46f0b7b90ec17ae1b629e3e7c2f8a2cade53031cc118c8a946bbfb7e9e8600efefd67c
+DIST nokogumbo-2.0.3.tar.gz 297394 BLAKE2B 
f1afcf516c5c47b15c8404e8c218af1f2ca0bce022fefacb39842527be7be38cbaf9d2fe0572afd8d9c1893a82428b903ccb8d4506043f766305d4d43aaf066b
 SHA512 
b44af7394f0b2c7159b34ead2aa15e39cd08348c1e3d7c4d9a2830c0920ae1a0d22ff9ac32db8fa1bd69c8ce55bc4a32069572944b53ef0d743f8a40560bcb47

diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild 
b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
new file mode 100644
index 000..43462c380e4
--- /dev/null
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
+HOMEPAGE="https://github.com/rubys/nokogumbo";
+SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Contains a bundled and patched version of dev-libs/gumbo.
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
+
+all_ruby_prepare() {
+   # Define rakehome in scope
+   sed -i -e "1irakehome=File.expand_path('../../')" 
ext/nokogumbo/extconf.rb || die
+
+   sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} 
|| die
+}
+
+each_ruby_configure() {
+   ${RUBY} -Cext/nokogumbo extconf.rb || die
+   sed -i -e 's:-Wl,--no-undefined::' ext/nokogumbo/Makefile || die
+}
+
+each_ruby_compile() {
+   emake -Cext/nokogumbo V=1
+   cp ext/nokogumbo/nokogumbo.so lib/nokogumbo/ || die
+}
+
+each_ruby_test() {
+   ${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}



[gentoo-commits] proj/portage:master commit in: lib/portage/util/

2020-11-21 Thread Zac Medico
commit: a2e7bf7d1c7d518fe8d7cf2c0e6cb30020b8aa94
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov 21 21:13:27 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 06:17:29 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2e7bf7d

compare_files: handle missing xattr support

Bug: https://bugs.gentoo.org/755950
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/util/_compare_files.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/portage/util/_compare_files.py 
b/lib/portage/util/_compare_files.py
index de97a9d9d..60d43aefa 100644
--- a/lib/portage/util/_compare_files.py
+++ b/lib/portage/util/_compare_files.py
@@ -45,7 +45,8 @@ def compare_files(file1, file2, skipped_types=()):
if "device_number" not in skipped_types and file1_stat.st_rdev != 
file2_stat.st_rdev:
differences.append("device_number")
 
-   if "xattr" not in skipped_types and sorted(xattr.get_all(file1, 
nofollow=True)) != sorted(xattr.get_all(file2, nofollow=True)):
+   if (xattr.XATTRS_WORKS and "xattr" not in skipped_types and
+   sorted(xattr.get_all(file1, nofollow=True)) != 
sorted(xattr.get_all(file2, nofollow=True))):
differences.append("xattr")
 
if "atime" not in skipped_types and file1_stat.st_atime_ns != 
file2_stat.st_atime_ns:



[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/portage/tests/resolver/

2020-11-21 Thread Zac Medico
commit: 5095c2023595a75e2848f1ad3dbe25b5fb451a44
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Nov 16 05:55:54 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 03:19:29 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5095c202

find_smallest_cycle: enhance search prioritization

Enhance the find_smallest_cycle function to prioritize its
search so that it will minimize the use of installed packages
to break cycles. When installed packages must be used to
break cycles, it will now prefer to do this for runtime
dependencies over buildtime dependencies, since it's
preferable to build against latest versions of buildtime
dependencies whenever possible. This should solve some cases
of bug 199856 which have been triggered by unsafe reliance
on installed packages to break cycles.

The included unit test case demonstrates correct merge order
for a dependency calculation involving 6 independent cycles.
This test case fails with the master branch, due to a buildtime
dependency cycle of 3 packages being merged earlier than cycles
of 2 packages. We can generalize this to say that the master
branch may use an installed package to break an arbitrarily
sized cycle in a somewhat random location, even though that
cycle may be composed of smaller independent cycles which
would be safer to break individually.

Bug: https://bugs.gentoo.org/754903
Signed-off-by: Zac Medico  gentoo.org>

 lib/_emerge/DepPriorityNormalRange.py  |  2 +
 lib/_emerge/DepPrioritySatisfiedRange.py   | 53 --
 lib/_emerge/depgraph.py| 43 -
 lib/portage/tests/resolver/test_merge_order.py | 10 +
 4 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/lib/_emerge/DepPriorityNormalRange.py 
b/lib/_emerge/DepPriorityNormalRange.py
index 5f3f3da70..10f205a3b 100644
--- a/lib/_emerge/DepPriorityNormalRange.py
+++ b/lib/_emerge/DepPriorityNormalRange.py
@@ -14,6 +14,7 @@ class DepPriorityNormalRange:
"""
MEDIUM  = 3
MEDIUM_SOFT = 2
+   MEDIUM_POST = 2
SOFT= 1
NONE= 0
 
@@ -37,6 +38,7 @@ class DepPriorityNormalRange:
 
ignore_medium  = _ignore_runtime
ignore_medium_soft = _ignore_runtime_post
+   ignore_medium_post = _ignore_runtime_post
ignore_soft= _ignore_optional
 
 DepPriorityNormalRange.ignore_priority = (

diff --git a/lib/_emerge/DepPrioritySatisfiedRange.py 
b/lib/_emerge/DepPrioritySatisfiedRange.py
index e056e676f..fb0d7db4e 100644
--- a/lib/_emerge/DepPrioritySatisfiedRange.py
+++ b/lib/_emerge/DepPrioritySatisfiedRange.py
@@ -8,17 +8,18 @@ class DepPrioritySatisfiedRange:
 
not satisfied and buildtimeHARD
not satisfied and runtime  7   MEDIUM
-   not satisfied and runtime_post 6   MEDIUM_SOFT
-   satisfied and buildtime_slot_op5   SOFT
-   satisfied and buildtime4   SOFT
-   satisfied and runtime  3   SOFT
-   satisfied and runtime_post 2   SOFT
+   satisfied and buildtime_slot_op6   MEDIUM_SOFT
+   satisfied and buildtime5   MEDIUM_SOFT
+   satisfied and runtime  4   MEDIUM_SOFT
+   runtime_post   3   MEDIUM_POST
+   satisfied and runtime_post 2   MEDIUM_POST
optional   1   SOFT
(none of the above)0   NONE
"""
MEDIUM  = 7
MEDIUM_SOFT = 6
-   SOFT= 5
+   MEDIUM_POST = 3
+   SOFT= 1
NONE= 0
 
@classmethod
@@ -35,42 +36,51 @@ class DepPrioritySatisfiedRange:
return True
if not priority.satisfied:
return False
+   if priority.buildtime or priority.runtime:
+   return False
return bool(priority.runtime_post)
 
@classmethod
-   def _ignore_satisfied_runtime(cls, priority):
+   def _ignore_runtime_post(cls, priority):
if priority.__class__ is not DepPriority:
return False
if priority.optional:
return True
-   if not priority.satisfied:
+   if priority.buildtime or priority.runtime:
return False
-   return not priority.buildtime
+   return bool(priority.runtime_post)
 
@classmethod
-   def _ignore_satisfied_buildtime(cls, priority):
+   def _ignore_satisfied_runtime(cls, priority):
if priority.__class__ is not DepPriority:
return False
if priority.optional:
return True
-   if priority.buildtime_slot_op:
+ 

[gentoo-commits] repo/proj/guru:dev commit in: www-apps/uwebsockets/

2020-11-21 Thread Aisha Tammy
commit: 3e7ec3cd687cb0126493cdc995ab3ad081804cf2
Author: epsilonKNOT  aisha  cc>
AuthorDate: Sun Nov 22 01:51:31 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Nov 22 01:52:03 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3e7ec3cd

www-apps/uwebsockets: version bump to 18.15.0

Signed-off-by: Aisha Tammy  aisha.cc>

 www-apps/uwebsockets/Manifest   |  1 +
 www-apps/uwebsockets/uwebsockets-18.15.0.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/www-apps/uwebsockets/Manifest b/www-apps/uwebsockets/Manifest
index afd5b919..7ee94b3d 100644
--- a/www-apps/uwebsockets/Manifest
+++ b/www-apps/uwebsockets/Manifest
@@ -1,2 +1,3 @@
 DIST uwebsockets-18.13.0.tar.gz 270125 BLAKE2B 
236dbda4458649710bd0b5144ce6ecbd589e251774e84d8673e05c3acaab444ef6e68d66e3fff840e7c4de56d3631ed734820ea4f6b5e253bf87a5a2a5b01544
 SHA512 
5a05480191ac7dd8948090a1bb8565eef6b14c8b32b5d7b5f082f5d51afc5eb5b15cf7eb1c91f6b4d2956bae10d4eeb5498cfa211cbbd54366d98ac0fe1c00a2
 DIST uwebsockets-18.14.0.tar.gz 271448 BLAKE2B 
739bf75e6494b40ad7f09337400337cf52e9f69fa294cda11eaa7211715c19ffa736e6bcc0d09c738de766bbe75e5a11dacb7ed761e8804688986f3a1e996b22
 SHA512 
43238c4bdff512817dc1a09100bc0efc7c941808ca250c52d9527e7255dd0a96bd57c7b52e721412a98cc0818877548692a93ac702e4b09d3623e07df098057b
+DIST uwebsockets-18.15.0.tar.gz 271485 BLAKE2B 
77e661abdf82728dbe3c52689d42b8fe98314c9e7bc1e8700a935114608771fa26d272bd30dd03ede870a1b4dc63a4dc91e816f1df7b402a2f85bff09de12c7a
 SHA512 
b49a3f4ce446b9c113bfb567fe9598cdc6c453ac5dc4556e11d74ef5d702cb480d53488e2650f765f8c95e0de980d586be62982bed9c5728fee974e7e287f143

diff --git a/www-apps/uwebsockets/uwebsockets-18.15.0.ebuild 
b/www-apps/uwebsockets/uwebsockets-18.15.0.ebuild
new file mode 100644
index ..2738b66d
--- /dev/null
+++ b/www-apps/uwebsockets/uwebsockets-18.15.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="ultra fast, simple, secure & standards compliant web I/O"
+HOMEPAGE="https://github.com/uNetworking/uWebSockets";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/uNetworking/uWebSockets.git";
+else
+   
SRC_URI="https://github.com/uNetworking/uWebSockets/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/uWebSockets-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RDEPEND=">=net-libs/usockets-0.4.1"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-src_Loop.h.patch"
+)
+
+src_prepare() {
+   default
+   mv src uWebSockets
+}
+
+src_compile() {
+   return 0
+}
+
+src_install() {
+   doheader -r uWebSockets
+}



[gentoo-commits] proj/sci:master commit in: profiles/

2020-11-21 Thread Aisha Tammy
commit: 2888a7a8f1c19e732f87768e273b10e28e05a488
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Nov 22 01:17:14 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Nov 22 01:17:14 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=2888a7a8

profiles/package.mask: mask more reverse deps

Signed-off-by: Aisha Tammy  aisha.cc>

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 99e38f028..1f9458c22 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -49,6 +49,7 @@ sci-biology/BBmap
 sci-biology/beagle
 sci-biology/blue
 sci-biology/cd-hit-auxtools
+sci-biology/cegma
 sci-biology/cgview-bin
 sci-biology/clover
 sci-biology/cnrun
@@ -90,11 +91,13 @@ sci-biology/mavid
 sci-biology/MeV
 sci-biology/MolBioLib
 sci-biology/mreps
+sci-biology/mRNAmarkup
 sci-biology/mrsfast
 sci-biology/MuSeqBox
 sci-biology/NGSEPcore-bin
 sci-biology/NGSEPplugin-bin
 sci-biology/OBO-Edit
+sci-biology/ONTO-PERL
 sci-biology/ORFcor
 sci-biology/pairagon
 sci-biology/polyphen
@@ -116,6 +119,7 @@ sci-biology/staden_doc
 sci-biology/subread
 sci-biology/swissknife
 sci-biology/tablet-bin
+sci-biology/TransDecoder
 sci-biology/trim_galore
 sci-biology/twinscan
 sci-biology/vague-bin
@@ -131,6 +135,7 @@ sci-chemistry/mddnmr
 sci-chemistry/modelfree
 sci-chemistry/nmrpipe
 sci-chemistry/polygon
+sci-chemistry/relion
 sci-chemistry/smmp
 sci-chemistry/talosn
 sci-chemistry/trajng



[gentoo-commits] proj/sci:master commit in: profiles/

2020-11-21 Thread Aisha Tammy
commit: 9b1dbbcb8f3c41e154c1b87508c3cfec9e726d29
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Nov 22 00:52:22 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Nov 22 00:52:22 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9b1dbbcb

profiles/package.mask: remove duplicate masks

Signed-off-by: Aisha Tammy  aisha.cc>

 profiles/package.mask | 66 +++
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 0b30ebda0..99e38f028 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,51 +34,20 @@
 # mask unfetchable packages until someone fixes.
 app-doc/scalapack-docs
 dev-java/jgraphx
-dev-java/jgraphx
-dev-java/jgraphx
 dev-lang/conceptual
 dev-lang/pgi
 dev-ml/lacaml
 dev-perl/Bio-EnsEMBL
 dev-python/PyVISA-py
-dev-python/PyVISA-py
 dev-python/snakemake
 dev-python/xgboost
 dev-util/f90cache
-sci-biology/BBmap
-sci-biology/BBmap
-sci-biology/BBmap
-sci-biology/BBmap
-sci-biology/BBmap
-sci-biology/EBARDenovo
-sci-biology/ESTate
-sci-biology/FLASH
-sci-biology/GAL
-sci-biology/ICC
-sci-biology/IMAGE
-sci-biology/KING
-sci-biology/MagicViewer
-sci-biology/MeV
-sci-biology/MolBioLib
-sci-biology/MuSeqBox
-sci-biology/NGSEPcore-bin
-sci-biology/NGSEPplugin-bin
-sci-biology/OBO-Edit
-sci-biology/OBO-Edit
-sci-biology/ORFcor
-sci-biology/RSeQC
-sci-biology/SPAdes
-sci-biology/SPAdes
-sci-biology/SnpEff
-sci-biology/VelvetOptimiser
 sci-biology/aghermann
 sci-biology/argo-bin
-sci-biology/argo-bin
-sci-biology/bambino
 sci-biology/bambino
+sci-biology/BBmap
 sci-biology/beagle
 sci-biology/blue
-sci-biology/blue
 sci-biology/cd-hit-auxtools
 sci-biology/cgview-bin
 sci-biology/clover
@@ -87,12 +56,16 @@ sci-biology/conrad
 sci-biology/cortex_var
 sci-biology/cross_genome
 sci-biology/dawg
-sci-biology/ePCR
+sci-biology/EBARDenovo
 sci-biology/ensembl-tools
+sci-biology/ePCR
+sci-biology/ESTate
 sci-biology/estscan
 sci-biology/eval
 sci-biology/ffindex
+sci-biology/FLASH
 sci-biology/fsa
+sci-biology/GAL
 sci-biology/gap2caf
 sci-biology/geneid
 sci-biology/generecon
@@ -101,18 +74,28 @@ sci-biology/gfftools
 sci-biology/glean
 sci-biology/graf-bin
 sci-biology/hydra-sv
+sci-biology/ICC
+sci-biology/IMAGE
 sci-biology/jannovar
-sci-biology/jtreeview-bin
 sci-biology/jtreeview
+sci-biology/jtreeview-bin
 sci-biology/kat
-sci-biology/kat
+sci-biology/KING
 sci-biology/kraken
 sci-biology/lucy
+sci-biology/MagicViewer
 sci-biology/manatee-igs
 sci-biology/manatee-jcvi
 sci-biology/mavid
+sci-biology/MeV
+sci-biology/MolBioLib
 sci-biology/mreps
 sci-biology/mrsfast
+sci-biology/MuSeqBox
+sci-biology/NGSEPcore-bin
+sci-biology/NGSEPplugin-bin
+sci-biology/OBO-Edit
+sci-biology/ORFcor
 sci-biology/pairagon
 sci-biology/polyphen
 sci-biology/primerD
@@ -120,20 +103,23 @@ sci-biology/prokka
 sci-biology/pysamstats
 sci-biology/quast
 sci-biology/reptile
+sci-biology/RSeQC
 sci-biology/scaffold_builder
 sci-biology/sgp2
 sci-biology/skewer-bin
 sci-biology/smalt
+sci-biology/SnpEff
 sci-biology/snphylo
+sci-biology/SPAdes
 sci-biology/sra_sdk
 sci-biology/staden_doc
-sci-biology/staden_doc
 sci-biology/subread
 sci-biology/swissknife
 sci-biology/tablet-bin
 sci-biology/trim_galore
 sci-biology/twinscan
 sci-biology/vague-bin
+sci-biology/VelvetOptimiser
 sci-biology/wcd
 sci-biology/wgs_tools
 sci-chemistry/camshift
@@ -147,13 +133,11 @@ sci-chemistry/nmrpipe
 sci-chemistry/polygon
 sci-chemistry/smmp
 sci-chemistry/talosn
-sci-chemistry/talosn
 sci-chemistry/trajng
-sci-libs/amber99sb_phipsi
 sci-libs/amber99sbnmr-ildn
+sci-libs/amber99sb_phipsi
 sci-libs/ccif
 sci-libs/etsf_io
-sci-libs/etsf_io
 sci-libs/factory
 sci-libs/fdlibm
 sci-libs/fgsl
@@ -161,15 +145,13 @@ sci-libs/libfac
 sci-libs/lwpr
 sci-libs/modglue
 sci-libs/superlu_dist
-sci-mathematics/Macaulay2
 sci-mathematics/freefem++
 sci-mathematics/lattE-macchiato
+sci-mathematics/Macaulay2
 sci-mathematics/pff
 sci-misc/kaldi
-sci-misc/kaldi
 sci-misc/kotus-sanalista
 sci-physics/fullprof-bin
 sci-physics/openmx
-sci-physics/openmx
 sci-physics/uproot
 x11-libs/tr



[gentoo-commits] proj/sci:master commit in: profiles/

2020-11-21 Thread Aisha Tammy
commit: 93e5fa46472c9eb577ccb2430babe235e839d6e6
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Nov 22 00:48:27 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Nov 22 00:48:27 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=93e5fa46

profiles/package.mask: mask unfetchable

Signed-off-by: Aisha Tammy  aisha.cc>

 profiles/package.mask | 144 ++
 1 file changed, 144 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index d39812beb..0b30ebda0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,3 +29,147 @@
 ## app-misc/some-package
 
 #--- END OF EXAMPLES ---
+
+# Aisha Tammy  (2020-11-19)
+# mask unfetchable packages until someone fixes.
+app-doc/scalapack-docs
+dev-java/jgraphx
+dev-java/jgraphx
+dev-java/jgraphx
+dev-lang/conceptual
+dev-lang/pgi
+dev-ml/lacaml
+dev-perl/Bio-EnsEMBL
+dev-python/PyVISA-py
+dev-python/PyVISA-py
+dev-python/snakemake
+dev-python/xgboost
+dev-util/f90cache
+sci-biology/BBmap
+sci-biology/BBmap
+sci-biology/BBmap
+sci-biology/BBmap
+sci-biology/BBmap
+sci-biology/EBARDenovo
+sci-biology/ESTate
+sci-biology/FLASH
+sci-biology/GAL
+sci-biology/ICC
+sci-biology/IMAGE
+sci-biology/KING
+sci-biology/MagicViewer
+sci-biology/MeV
+sci-biology/MolBioLib
+sci-biology/MuSeqBox
+sci-biology/NGSEPcore-bin
+sci-biology/NGSEPplugin-bin
+sci-biology/OBO-Edit
+sci-biology/OBO-Edit
+sci-biology/ORFcor
+sci-biology/RSeQC
+sci-biology/SPAdes
+sci-biology/SPAdes
+sci-biology/SnpEff
+sci-biology/VelvetOptimiser
+sci-biology/aghermann
+sci-biology/argo-bin
+sci-biology/argo-bin
+sci-biology/bambino
+sci-biology/bambino
+sci-biology/beagle
+sci-biology/blue
+sci-biology/blue
+sci-biology/cd-hit-auxtools
+sci-biology/cgview-bin
+sci-biology/clover
+sci-biology/cnrun
+sci-biology/conrad
+sci-biology/cortex_var
+sci-biology/cross_genome
+sci-biology/dawg
+sci-biology/ePCR
+sci-biology/ensembl-tools
+sci-biology/estscan
+sci-biology/eval
+sci-biology/ffindex
+sci-biology/fsa
+sci-biology/gap2caf
+sci-biology/geneid
+sci-biology/generecon
+sci-biology/genomeview-bin
+sci-biology/gfftools
+sci-biology/glean
+sci-biology/graf-bin
+sci-biology/hydra-sv
+sci-biology/jannovar
+sci-biology/jtreeview-bin
+sci-biology/jtreeview
+sci-biology/kat
+sci-biology/kat
+sci-biology/kraken
+sci-biology/lucy
+sci-biology/manatee-igs
+sci-biology/manatee-jcvi
+sci-biology/mavid
+sci-biology/mreps
+sci-biology/mrsfast
+sci-biology/pairagon
+sci-biology/polyphen
+sci-biology/primerD
+sci-biology/prokka
+sci-biology/pysamstats
+sci-biology/quast
+sci-biology/reptile
+sci-biology/scaffold_builder
+sci-biology/sgp2
+sci-biology/skewer-bin
+sci-biology/smalt
+sci-biology/snphylo
+sci-biology/sra_sdk
+sci-biology/staden_doc
+sci-biology/staden_doc
+sci-biology/subread
+sci-biology/swissknife
+sci-biology/tablet-bin
+sci-biology/trim_galore
+sci-biology/twinscan
+sci-biology/vague-bin
+sci-biology/wcd
+sci-biology/wgs_tools
+sci-chemistry/camshift
+sci-chemistry/cpmgfit
+sci-chemistry/ctffind
+sci-chemistry/curvefit
+sci-chemistry/dssp2pdb
+sci-chemistry/mddnmr
+sci-chemistry/modelfree
+sci-chemistry/nmrpipe
+sci-chemistry/polygon
+sci-chemistry/smmp
+sci-chemistry/talosn
+sci-chemistry/talosn
+sci-chemistry/trajng
+sci-libs/amber99sb_phipsi
+sci-libs/amber99sbnmr-ildn
+sci-libs/ccif
+sci-libs/etsf_io
+sci-libs/etsf_io
+sci-libs/factory
+sci-libs/fdlibm
+sci-libs/fgsl
+sci-libs/libfac
+sci-libs/lwpr
+sci-libs/modglue
+sci-libs/superlu_dist
+sci-mathematics/Macaulay2
+sci-mathematics/freefem++
+sci-mathematics/lattE-macchiato
+sci-mathematics/pff
+sci-misc/kaldi
+sci-misc/kaldi
+sci-misc/kotus-sanalista
+sci-physics/fullprof-bin
+sci-physics/openmx
+sci-physics/openmx
+sci-physics/uproot
+x11-libs/tr



[gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/

2020-11-21 Thread Sam James
commit: d54d3c8b2f510d7977c0059f594c3ca5e8cf6d27
Author: Wade Cline  hotmail  com>
AuthorDate: Sat Nov 21 08:37:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:35:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d54d3c8b

net-irc/inspircd: Add 3.8.1

Signed-off-by: Wade Cline  hotmail.com>

Bug: https://bugs.gentoo.org/755854
Signed-off-by: Sam James  gentoo.org>

 net-irc/inspircd/Manifest  |   1 +
 net-irc/inspircd/inspircd-3.8.1.ebuild | 121 +
 2 files changed, 122 insertions(+)

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 769c1225abd..4406840cca7 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,4 @@
 DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B 
bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2
 SHA512 
83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 
6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a
 SHA512 
871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
 DIST inspircd-3.8.0.tar.gz 849843 BLAKE2B 
6233d697329d50df272af904a00bde844c2b8121d75638894cda05f4e6b6d04321c969a293b82bff17f0254bed897574bb2a56acc9283c0b9223b0a8b4747ddc
 SHA512 
efb382b5aa744d42712f9f4ad41d3b939b83bbf702aace2daaff257a96480aa1244a20a63a33b8755e9bab6f15fc39ddde910b1d92022ebcca2ab43af7b4f04e
+DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B 
aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86
 SHA512 
be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa

diff --git a/net-irc/inspircd/inspircd-3.8.1.ebuild 
b/net-irc/inspircd/inspircd-3.8.1.ebuild
new file mode 100644
index 000..60448a5f4f9
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.8.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/";
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix 
regex-stdlib sqlite ssl sslrehashsignal tre"
+
+RDEPEND="
+   acct-group/inspircd
+   acct-user/inspircd
+   dev-lang/perl
+   gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+   ldap? ( net-nds/openldap )
+   maxminddb? ( dev-libs/libmaxminddb )
+   mbedtls? ( net-libs/mbedtls:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   pcre? ( dev-libs/libpcre )
+   postgres? ( dev-db/postgresql:= )
+   re2? ( dev-libs/re2:= )
+   sqlite? ( >=dev-db/sqlite-3.0 )
+   ssl? ( dev-libs/openssl:= )
+   tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${PN}-3.7.0-fix-path-builds.patch )
+
+src_prepare() {
+   default
+
+   # Patch the inspircd launcher with the inspircd user
+   sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
+}
+
+src_configure() {
+   local extras=""
+
+   use gnutls && extras+="m_ssl_gnutls.cpp,"
+   use ldap && extras+="m_ldap.cpp,"
+   use maxminddb && extras+="m_geo_maxmind.cpp,"
+   use mbedtls && extras+="m_ssl_mbedtls.cpp,"
+   use mysql && extras+="m_mysql.cpp,"
+   use pcre && extras+="m_regex_pcre.cpp,"
+   use postgres && extras+="m_pgsql.cpp,"
+   use re2 && extras+="m_regex_re2.cpp,"
+   use regex-posix && extras+="m_regex_posix.cpp,"
+   use regex-stdlib && extras+="m_regex_stdlib.cpp,"
+   use sqlite && extras+="m_sqlite3.cpp,"
+   use ssl && extras+="m_ssl_openssl.cpp,"
+   use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
+   use tre && extras+="m_regex_tre.cpp,"
+
+   # The first configuration run enables certain "extra" InspIRCd
+   # modules, the second run generates the actual makefile.
+   if [[ -n "${extras}" ]]; then
+   ./configure --disable-interactive --enable-extras=${extras%,}
+   fi
+
+   local myconf=(
+   --disable-interactive
+   --disable-auto-extras
+   --prefix="/usr/$(get_libdir)/${PN}"
+   --config-dir="/etc/${PN}"
+   --data-dir="/var/lib/${PN}/data"
+   --log-dir="/var/log/${PN}"
+   --binary-dir="/usr/bin"
+   --module-dir="/usr/$(get_libdir)/${PN}/modules"
+   

[gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/

2020-11-21 Thread Sam James
commit: 02a985abeacea6af0dd01efe967ae40e96ec79a3
Author: Wade Cline  hotmail  com>
AuthorDate: Sat Nov 21 08:42:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:35:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a985ab

net-irc/inspircd: Drop 3.8.0

Signed-off-by: Wade Cline  hotmail.com>

Bug: https://bugs.gentoo.org/755854
Closes: https://github.com/gentoo/gentoo/pull/18347
Signed-off-by: Sam James  gentoo.org>

 net-irc/inspircd/Manifest  |   1 -
 net-irc/inspircd/inspircd-3.8.0.ebuild | 121 -
 2 files changed, 122 deletions(-)

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 4406840cca7..c650dfb20e9 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,4 +1,3 @@
 DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B 
bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2
 SHA512 
83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 
6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a
 SHA512 
871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
-DIST inspircd-3.8.0.tar.gz 849843 BLAKE2B 
6233d697329d50df272af904a00bde844c2b8121d75638894cda05f4e6b6d04321c969a293b82bff17f0254bed897574bb2a56acc9283c0b9223b0a8b4747ddc
 SHA512 
efb382b5aa744d42712f9f4ad41d3b939b83bbf702aace2daaff257a96480aa1244a20a63a33b8755e9bab6f15fc39ddde910b1d92022ebcca2ab43af7b4f04e
 DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B 
aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86
 SHA512 
be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa

diff --git a/net-irc/inspircd/inspircd-3.8.0.ebuild 
b/net-irc/inspircd/inspircd-3.8.0.ebuild
deleted file mode 100644
index 60448a5f4f9..000
--- a/net-irc/inspircd/inspircd-3.8.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/";
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix 
regex-stdlib sqlite ssl sslrehashsignal tre"
-
-RDEPEND="
-   acct-group/inspircd
-   acct-user/inspircd
-   dev-lang/perl
-   gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-   ldap? ( net-nds/openldap )
-   maxminddb? ( dev-libs/libmaxminddb )
-   mbedtls? ( net-libs/mbedtls:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   pcre? ( dev-libs/libpcre )
-   postgres? ( dev-db/postgresql:= )
-   re2? ( dev-libs/re2:= )
-   sqlite? ( >=dev-db/sqlite-3.0 )
-   ssl? ( dev-libs/openssl:= )
-   tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${PN}-3.7.0-fix-path-builds.patch )
-
-src_prepare() {
-   default
-
-   # Patch the inspircd launcher with the inspircd user
-   sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
-}
-
-src_configure() {
-   local extras=""
-
-   use gnutls && extras+="m_ssl_gnutls.cpp,"
-   use ldap && extras+="m_ldap.cpp,"
-   use maxminddb && extras+="m_geo_maxmind.cpp,"
-   use mbedtls && extras+="m_ssl_mbedtls.cpp,"
-   use mysql && extras+="m_mysql.cpp,"
-   use pcre && extras+="m_regex_pcre.cpp,"
-   use postgres && extras+="m_pgsql.cpp,"
-   use re2 && extras+="m_regex_re2.cpp,"
-   use regex-posix && extras+="m_regex_posix.cpp,"
-   use regex-stdlib && extras+="m_regex_stdlib.cpp,"
-   use sqlite && extras+="m_sqlite3.cpp,"
-   use ssl && extras+="m_ssl_openssl.cpp,"
-   use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
-   use tre && extras+="m_regex_tre.cpp,"
-
-   # The first configuration run enables certain "extra" InspIRCd
-   # modules, the second run generates the actual makefile.
-   if [[ -n "${extras}" ]]; then
-   ./configure --disable-interactive --enable-extras=${extras%,}
-   fi
-
-   local myconf=(
-   --disable-interactive
-   --disable-auto-extras
-   --prefix="/usr/$(get_libdir)/${PN}"
-   --config-dir="/etc/${PN}"
-   --data-dir="/var/lib/${PN}/data"
-   --log-dir="/var/log/${PN}"
-   --binary-dir="/usr/bin"
-   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/

2020-11-21 Thread Sam James
commit: 28a54c97ec55e5d6638e3c442cfc71fabeea32bd
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:27:23 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:27:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a54c97

sys-apps/systemd-tmpfiles: Stabilize 246 arm, #755983

Signed-off-by: Sam James  gentoo.org>

 sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild 
b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index f6775ff9b13..3fee51a51fb 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/

2020-11-21 Thread Sam James
commit: b258f6e8dace835af59b4d8e6b10f4c12f753865
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:26:48 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:26:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b258f6e8

net-vpn/tor: Stabilize 0.4.4.6 amd64, #754156

Signed-off-by: Sam James  gentoo.org>

 net-vpn/tor/tor-0.4.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/tor/tor-0.4.4.6.ebuild b/net-vpn/tor/tor-0.4.4.6.ebuild
index a18f47b0d0f..1dc0bc5c471 100644
--- a/net-vpn/tor/tor-0.4.4.6.ebuild
+++ b/net-vpn/tor/tor-0.4.4.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux +server systemd 
tor-hardening test zstd"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/

2020-11-21 Thread Sam James
commit: a6e78621916cc8bf7a37a0205d71fdb94809b7a9
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:25:09 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:25:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e78621

www-client/chromium: Stabilize 87.0.4280.66 arm64, #755227

Signed-off-by: Sam James  gentoo.org>

 www-client/chromium/chromium-87.0.4280.66.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/chromium/chromium-87.0.4280.66.ebuild 
b/www-client/chromium/chromium-87.0.4280.66.ebuild
index 15978621574..40f01bffb8c 100644
--- a/www-client/chromium/chromium-87.0.4280.66.ebuild
+++ b/www-client/chromium/chromium-87.0.4280.66.ebuild
@@ -21,7 +21,7 @@ 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon +hangouts headless 
+js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux 
+suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 REQUIRED_USE="



[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/

2020-11-21 Thread Sam James
commit: 39e18702e0947035d9e83c9955e175220dc5bcc1
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:24:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:24:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e18702

sys-apps/systemd-tmpfiles: Stabilize 246 arm64, #755983

Signed-off-by: Sam James  gentoo.org>

 sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild 
b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 0eef1890fbb..f6775ff9b13 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/

2020-11-21 Thread Sam James
commit: 211ca40e4c23886ec45afe3dea4b73d0f7ad765b
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:23:14 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:23:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211ca40e

x11-wm/mutter: Stabilize 3.36.7 amd64, #755848

Signed-off-by: Sam James  gentoo.org>

 x11-wm/mutter/mutter-3.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/mutter/mutter-3.36.7.ebuild 
b/x11-wm/mutter/mutter-3.36.7.ebuild
index 4bceba78428..f5dc0a1d9f9 100644
--- a/x11-wm/mutter/mutter-3.36.7.ebuild
+++ b/x11-wm/mutter/mutter-3.36.7.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for 
org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland



[gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/

2020-11-21 Thread Sam James
commit: e1122b49e91967b153066eb59f30e182ea5b30e4
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:25:10 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:25:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1122b49

dev-libs/re2: Stabilize 0.2020.11.01 arm64, #755227

Signed-off-by: Sam James  gentoo.org>

 dev-libs/re2/re2-0.2020.11.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild 
b/dev-libs/re2/re2-0.2020.11.01.ebuild
index de9d5582c9e..48b29137b04 100644
--- a/dev-libs/re2/re2-0.2020.11.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.11.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions/

2020-11-21 Thread Sam James
commit: f62b649f40815439fcbfc73ca888d2c889586082
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:23:16 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:23:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62b649f

gnome-extra/gnome-shell-extensions: Stabilize 3.36.7 amd64, #755848

Signed-off-by: Sam James  gentoo.org>

 gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild 
b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
index 91d0ab905bc..6711e1f3fd7 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.36.7.ebuild
@@ -10,7 +10,7 @@ 
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions";
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
>=dev-libs/glib-2.26:2



[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/

2020-11-21 Thread Sam James
commit: 716158a136b3050b6c31b7ef8a6fe3559a1f208a
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:23:15 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:23:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716158a1

gnome-base/gnome-shell: Stabilize 3.36.7 amd64, #755848

Signed-off-by: Sam James  gentoo.org>

 gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
index 11693ec69c8..b50d1082d08 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
@@ -16,7 +16,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus 
+networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include 

 # FIXME:



[gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/

2020-11-21 Thread Sam James
commit: 1448a873c67ec4a230f3dd02c9aca161d3330bba
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 22 03:24:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 22 03:24:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1448a873

dev-libs/re2: Stabilize 0.2020.11.01 arm, #755227

Signed-off-by: Sam James  gentoo.org>

 dev-libs/re2/re2-0.2020.11.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild 
b/dev-libs/re2/re2-0.2020.11.01.ebuild
index 73ac80054b9..de9d5582c9e 100644
--- a/dev-libs/re2/re2-0.2020.11.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.11.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xdot/

2020-11-21 Thread Matt Turner
commit: bdbd36aa17f157079a461974d6e3eb55bbad5621
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov 22 02:25:44 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov 22 02:31:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbd36aa

media-gfx/xdot: Remove unneeded src_prepare()

The line that the sed invocation removed was removed upstream before
v1.0.

Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/xdot/xdot-.ebuild | 8 
 1 file changed, 8 deletions(-)

diff --git a/media-gfx/xdot/xdot-.ebuild b/media-gfx/xdot/xdot-.ebuild
index 2ffae424d79..692ff0fe0f4 100644
--- a/media-gfx/xdot/xdot-.ebuild
+++ b/media-gfx/xdot/xdot-.ebuild
@@ -32,11 +32,3 @@ DEPEND="
media-gfx/graphviz
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-   eapply_user
-
-   # Don't require graphviz python(2) supprt, which xdot doesn't use. This 
allows xdot to support python3.
-   # For more info, see https://bugs.gentoo.org/643126
-   sed -i "/install_requires=\['graphviz'\],/d" setup.py || die
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xdot/

2020-11-21 Thread Matt Turner
commit: a1c2a01bb23ff577d6146734062abe0f31793211
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov 22 02:23:21 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov 22 02:31:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c2a01b

media-gfx/xdot: Remove unnecessary src_unpack()

Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/xdot/xdot-.ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/media-gfx/xdot/xdot-.ebuild b/media-gfx/xdot/xdot-.ebuild
index 6c478652275..2ffae424d79 100644
--- a/media-gfx/xdot/xdot-.ebuild
+++ b/media-gfx/xdot/xdot-.ebuild
@@ -33,11 +33,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-   default
-   [[ $PV = * ]] && git-r3_src_unpack
-}
-
 src_prepare() {
eapply_user
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xdot/

2020-11-21 Thread Matt Turner
commit: 597b2e531822de42bc65bc08264129dd99e949b7
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov 22 01:42:52 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov 22 02:31:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597b2e53

media-gfx/xdot: Version bump to 1.2

Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/xdot/Manifest|  1 +
 media-gfx/xdot/xdot-1.2.ebuild | 34 ++
 2 files changed, 35 insertions(+)

diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 21627c23715..cd71aba9c7f 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1 +1,2 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B 
e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47
 SHA512 
d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
+DIST xdot-1.2.tar.gz 136057 BLAKE2B 
484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3d6b96795d3b7c203db922
 SHA512 
b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda

diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild
new file mode 100644
index 000..0b806d65584
--- /dev/null
+++ b/media-gfx/xdot/xdot-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+MY_PN=xdot.py
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}";
+
+if [[ ${PV} = * ]]; then
+   GIT_ECLASS="git-r3"
+   SRC_URI=""
+else
+   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+   MY_P="${MY_PN}-${PV}"
+   S="${WORKDIR}/${MY_P}"
+   SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1
+
+DESCRIPTION="Interactive viewer for Graphviz dot files"
+HOMEPAGE="https://github.com/jrfonseca/xdot.py";
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+DEPEND="
+   dev-python/pycairo[${PYTHON_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   media-gfx/graphviz
+"
+RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/xdot/

2020-11-21 Thread Matt Turner
commit: 02fd141401ac0e59790bada845408900b62a9c9d
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov 22 02:30:12 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov 22 02:31:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02fd1414

media-gfx/xdot: Use DISTUTILS_USE_SETUPTOOLS=rdepend

The package uses entry_points=... in setup.py.

Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/xdot/xdot-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xdot/xdot-.ebuild b/media-gfx/xdot/xdot-.ebuild
index 692ff0fe0f4..0b806d65584 100644
--- a/media-gfx/xdot/xdot-.ebuild
+++ b/media-gfx/xdot/xdot-.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}";
@@ -28,7 +29,6 @@ SLOT="0"
 DEPEND="
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
media-gfx/graphviz
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/

2020-11-21 Thread Aaron W. Swenson
commit: 2c956077fddbe4631c52ee557ca90e1bff483d8a
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sun Nov 22 02:28:06 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sun Nov 22 02:28:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c956077

dev-db/pgbouncer: Bump to 1.15.0

Migrate to acct-user.

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pgbouncer/Manifest|  1 +
 dev-db/pgbouncer/pgbouncer-1.15.0.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 6c798a5fad8..9ecb47e5a65 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -2,4 +2,5 @@ DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B 
a0c1dadc48f38cfe0ba2641791b4734da84c
 DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 
044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6
 SHA512 
2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115
 DIST pgbouncer-1.12.0.tar.gz 567465 BLAKE2B 
866a877478a417b3854e6e2a724fcd06c04bd94893e5d79f8bf250fa9391407c5b7cd00bf2771af18b162dfd2b7bdced00be15c44ba74cf842e3d98c561991e3
 SHA512 
017d150f865df231861cda4678963ad7e63a0cd238f5ece5679c920484e01c53ab27af63bf47e6227d66b7dc94b4d59ca41ac49c26f60aba74d40b43cad55664
 DIST pgbouncer-1.14.0.tar.gz 578955 BLAKE2B 
49e1e22b2fa604410111ac19b7c0c2c15f6739274d642e7100a9988379e828e8546454766ae32edb65ab7299b82693bcec32938621923bfbf99d946f5dc17f4a
 SHA512 
506810c9896a45d67fbc97c3027572278b3857635c222cfaa53b4f3893069cfbee2ec92facd6f387de217bb3170045410b88a7cea09a45686661a2d2ccc85271
+DIST pgbouncer-1.15.0.tar.gz 588042 BLAKE2B 
3dac09303e1c86126dd9cb44823c6f3fca4195e3155b360719c736c6e1327cc10d05e7f1e45c08d14c1dd0cb5c074b32263eee3be9e6350db9a8c5cbdfe61aa1
 SHA512 
5f78018ab80ab8d81f20ef3df1314ffc9557f1c6469d485d11ac822f596e3d4b554743fd9e9fe19b008a8aaf93bcf3673b42a8fb82bbd9611bd735cd2cbb98c6
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 
466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514
 SHA512 
b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9

diff --git a/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild 
b/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
new file mode 100644
index 000..050a21fdea6
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="https://www.pgbouncer.org/";
+SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz";
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+c-ares debug doc pam ssl systemd -udns"
+
+# At-most-one-of, one can be enabled but not both
+REQUIRED_USE="?? ( c-ares udns )"
+
+RDEPEND="
+   >=dev-libs/libevent-2.0:=
+   >=sys-libs/glibc-2.10
+   acct-user/pgbouncer
+   c-ares? ( >=net-dns/c-ares-1.10 )
+   ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
+   systemd? ( sys-apps/systemd )
+   udns? ( >=net-libs/udns-0.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+# Tests require a local database server, wants to fiddle with iptables,
+# and doesn't support overriding.
+RESTRICT="test"
+
+src_prepare() {
+   eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
+
+   default
+}
+
+src_configure() {
+   # --enable-debug is only used to disable stripping
+   econf \
+   --docdir=/usr/share/doc/${PF} \
+   --enable-debug \
+   $(use_with c-ares cares) \
+   $(use_enable debug cassert) \
+   $(use_with pam) \
+   $(use_with ssl openssl) \
+   $(use_with systemd) \
+   $(use_with udns)
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   dodoc AUTHORS
+   use doc && dodoc doc/*.rst
+
+   newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
+   newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
+
+   insinto /etc
+   doins etc/pgbouncer.ini
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+   if [[ -z ${REPLACING_VERSIONS} ]] ; then
+   einfo "Please read the config.txt for Configuration Directives"
+   einfo
+   einfo "For Administration Commands, see:"
+   einfo "man pgbouncer"
+   einfo
+   einfo "By default, PgBouncer does not have access to any 
database."
+   einfo "GRANT the permissions needed for your application and 
make sure that it"
+   einfo "exists in PgBouncer's auth_file."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/pg_top/

2020-11-21 Thread Aaron W. Swenson
commit: ee889f7b7cd28a7c824a9ed597f0b443d9ddfc50
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sun Nov 22 02:19:28 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sun Nov 22 02:19:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee889f7b

dev-db/pg_top: Bump to 4.0.0

Bump EAPI to 7. Use CMake instead of Autotools. Home moved to
https://pg_top.gitlab.io/.

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pg_top/Manifest|  1 +
 dev-db/pg_top/pg_top-4.0.0.ebuild | 20 
 2 files changed, 21 insertions(+)

diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest
index f72bfcdce72..262011dad3c 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -1 +1,2 @@
 DIST pg_top-3.7.0.tar.bz2 236076 BLAKE2B 
87a29d0237aad48b683c17ba56fdbc4a90f854f4f497057ffc978be1797d978f02694781e83d296fca82e03c8bc737f7cfd74e996987eea0bd8d6a66ae433ce0
 SHA512 
509cd3ce65a9b549097eaab5ae27106fa469cdeb4f37950564654f3df01390e1a771c8fa4f5858c3e4c1e76470b6c0fd9b07e8268564f59285e30bf824d7c4ec
+DIST pg_top-4.0.0.tar.xz 117920 BLAKE2B 
5c13fd868804492ccce3b660875602df958f065126f9dc17f45ebcac7961384cd1d3d3313da49832a1219ea7e86ae78cbbdb975467b13b32d5f836f5cd33a443
 SHA512 
b7a016137495ceecdcf0ac0e95c73b7eca20b57264f7b63b0a38c3f31db742c704ed0094e07f6df051bce9bc26214f5a8f66ced1e923bb66e0c86fff1e2ffc19

diff --git a/dev-db/pg_top/pg_top-4.0.0.ebuild 
b/dev-db/pg_top/pg_top-4.0.0.ebuild
new file mode 100644
index 000..f0d4e2ea16a
--- /dev/null
+++ b/dev-db/pg_top/pg_top-4.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="'top' for PostgreSQL"
+HOMEPAGE="https://pg_top.gitlab.io/";
+SRC_URI="https://pg_top.gitlab.io/source/${P}.tar.xz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}"
+
+DOCS=( HISTORY.rst README.rst TODO Y2K )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/concurrencykit/, dev-libs/concurrencykit/files/

2020-11-21 Thread Conrad Kostecki
commit: d9e2dd79d860822c8ee78b6844511472a2bbcc6a
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Nov 22 01:47:55 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Nov 22 01:50:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e2dd79

dev-libs/concurrencykit: fixed several bugs

This is a overhaul of the whole ebuild. Nothing will change for the
user, so I will keep the stable keyword for amd64, as I will drop 0.7.0
afterwards.

Fixes:
1) Fixed calling AR - upstream accepted patch.
2) Failing tests on x86 - Setting PROFILE correctly.
3) Disabling static libs - upstream accepted patch.
4) Updated patches to use from upstreams git.

Closes: https://bugs.gentoo.org/721926
Closes: https://bugs.gentoo.org/733170
Closes: https://bugs.gentoo.org/726398
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../concurrencykit/concurrencykit-0.7.0-r1.ebuild  |  40 
 .../files/concurrencykit-0.7.0-ar.patch| 112 +
 .../files/concurrencykit-0.7.0-glibc-2.30.patch|  54 ++
 .../files/concurrencykit-0.7.0-gzip.patch  |  58 +++
 .../files/concurrencykit-0.7.0-static-libs.patch   |  75 ++
 5 files changed, 339 insertions(+)

diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild 
b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
new file mode 100644
index 000..3a87fe43a08
--- /dev/null
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="ck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library with concurrency related algorithms and data structures 
in C"
+HOMEPAGE="http://concurrencykit.org";
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+# The 'libck.so' has a name collision.
+# See #616762 for more information.
+RDEPEND="!sys-cluster/charm"
+
+PATCHES=(
+   "${FILESDIR}/${P}-ar.patch"
+   "${FILESDIR}/${P}-glibc-2.30.patch"
+   "${FILESDIR}/${P}-gzip.patch"
+   "${FILESDIR}/${P}-static-libs.patch"
+)
+
+src_configure() {
+   tc-export AR CC LD
+   export PROFILE="x86$(usex amd64 '_64' '')"
+
+   local myeconfargs=(
+   "--disable-static"
+   )
+
+   GZIP="" $(usex x86 'PROFILE=x86' '') econf ${myeconfargs[@]}
+}

diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch 
b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
new file mode 100644
index 000..70dd46a113f
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
@@ -0,0 +1,112 @@
+From c6a2f41369bb4549bfaadf1120ccacd884b0b70f Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki 
+Date: Sun, 22 Nov 2020 00:55:36 +0100
+Subject: [PATCH] Add support for setting AR
+
+By default, the command 'ar' is called. Is should be possible, as with
+'CC', to override that value and set an own AR.
+
+Signed-off-by: Conrad Kostecki 
+---
+ configure   | 11 +++
+ src/Makefile.in |  2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 1b85d113..78535332 100755
+--- a/configure
 b/configure
+@@ -146,6 +146,7 @@ generate_stdout()
+   echo "   SRC_DIR = $BUILD_DIR"
+   echo "SYSTEM = $SYSTEM"
+   echo "   PROFILE = $PROFILE"
++  echo "AR = $AR"
+   echo "CC = $CC"
+   echo "  COMPILER = $COMPILER"
+   echo "CFLAGS = $CFLAGS"
+@@ -215,6 +216,7 @@ for option; do
+   echo "  --cores=NSpecify number of cores 
available on target machine"
+   echo
+   echo "The following environment variables may be used:"
++  echo "   AR   AR archiver command"
+   echo "   CC   C compiler command"
+   echo "   CFLAGS   C compiler flags"
+   echo "   LDFLAGS  Linker flags"
+@@ -645,6 +647,15 @@ if test ! -x "${CC}"; then
+ fi
+ assert "$CC" "not found"
+ 
++printf "Finding suitable archiver"
++if test ! -x "${AR}"; then
++  AR=`pathsearch "${AR:-ar}"`
++  if test -z "$AR" -o ! -x "$AR"; then
++  AR=`pathsearch "${AR:-ar}"`
++  fi
++fi
++assert "$AR" "not found"
++
+ cat << EOF > .1.c
+ #include 
+ int main(void) {
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 0b7ae7b6..73788497 100644
+--- a/src/Makefile.in
 b/src/Makefile.in
+@@ -25,7 +25,7 @@ libck.so: $(OBJECTS)
+   $(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS)
+ 
+ libck.a: $(OBJECTS)
+-  ar rcs $(TARGET_DIR)/libck.a $(OBJECTS)
++  $(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS)
+ 
+ ck_array.o: $(INCLUDE_DIR)/ck_array.h $(

[gentoo-commits] repo/gentoo:master commit in: dev-libs/concurrencykit/, dev-libs/concurrencykit/files/

2020-11-21 Thread Conrad Kostecki
commit: e0f1d58281363a0f2be384ecfa395e065119bd50
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Nov 22 01:50:14 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Nov 22 01:50:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f1d582

dev-libs/concurrencykit: drop old version

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../concurrencykit/concurrencykit-0.7.0.ebuild | 28 
 .../concurrencykit/files/concurrencykit-doc.patch  | 24 --
 .../files/concurrencykit-glibc-2.30.patch  | 37 --
 3 files changed, 89 deletions(-)

diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild 
b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
deleted file mode 100644
index 24f79b72508..000
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library with concurrency related algorithms and data structures 
in C"
-HOMEPAGE="http://concurrencykit.org";
-SRC_URI="https://github.com/concurrencykit/ck/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-# libck.so name collision #616762
-# these packages have nothing in common
-RDEPEND="!sys-cluster/charm"
-
-# https://github.com/concurrencykit/ck/issues/147
-# https://github.com/concurrencykit/ck/issues/150
-PATCHES=(
-   "${FILESDIR}/${PN}-glibc-2.30.patch"
-   "${FILESDIR}/${PN}-doc.patch"
-)
-
-S="${WORKDIR}/${MY_P}"

diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch 
b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
deleted file mode 100644
index 40aa466bb4e..000
--- a/dev-libs/concurrencykit/files/concurrencykit-doc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index cbad704..f476925 100644
 a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -1,7 +1,7 @@
- .PHONY: clean install uninstall
- 
- MANDIR=@MANDIR@
--GZIP=@GZIP@
-+GZIP=/bin/echo
- GZIP_SUFFIX=.3@GZIP_SUFFIX@
- BUILD_DIR=@BUILD_DIR@
- SRC_DIR=@SRC_DIR@
-@@ -206,7 +206,9 @@ refcheck:
- 
- install:
-   mkdir -p $(DESTDIR)/$(MANDIR)/man3 || exit
--  cp *$(GZIP_SUFFIX) $(DESTDIR)/$(MANDIR)/man3 || exit
-+  for target in $(OBJECTS); do\
-+  cp -v $$target $(DESTDIR)/$(MANDIR)/man3/$$target.3 || exit; \
-+  done
- 
- uninstall:
-   for target in $(OBJECTS); do  \

diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch 
b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
deleted file mode 100644
index 452421c6312..000
--- a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/regressions/common.h b/regressions/common.h
-index 6e53483d..9cdc690a 100644
 a/regressions/common.h
-+++ b/regressions/common.h
-@@ -267,13 +267,11 @@ struct affinity {
- #define AFFINITY_INITIALIZER {0, 0}
- 
- #ifdef __linux__
--#ifndef gettid
- static pid_t
--gettid(void)
-+common_gettid(void)
- {
-   return syscall(__NR_gettid);
- }
--#endif /* gettid */
- 
- CK_CC_UNUSED static int
- aff_iterate(struct affinity *acb)
-@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb)
-   CPU_ZERO(&s);
-   CPU_SET(c % CORES, &s);
- 
--  if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
-+  if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
-   perror("WARNING: Could not affine thread");
-   
- return 0;
-@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core)
-   CPU_ZERO(&s);
-   CPU_SET((*core) % CORES, &s);
- 
--  if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
-+  if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
-   perror("WARNING: Could not affine thread");
-   
- return 0;



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

2020-11-21 Thread Thomas Deutschmann
commit: 671902081cd0a3582d57b7b3999422ec03aea435
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 22 01:08:43 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 22 01:08:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67190208

net-firewall/ipset: bump to v7.9

Closes: https://bugs.gentoo.org/754963
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/ipset-7.9.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.9.ebuild 
b/net-firewall/ipset/ipset-7.9.ebuild
index b0de78dae51..3cdf4582eb7 100644
--- a/net-firewall/ipset/ipset-7.9.ebuild
+++ b/net-firewall/ipset/ipset-7.9.ebuild
@@ -29,7 +29,8 @@ IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 BUILD_TARGETS="modules"
 MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
 MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
-for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set};
 do
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
 done
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

2020-11-21 Thread Thomas Deutschmann
commit: 93310947230b265b694b6f38f9e622a5e68ee16a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 22 00:34:34 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 22 00:34:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93310947

net-firewall/ipset: bump to v7.9

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest |   1 +
 net-firewall/ipset/ipset-7.9.ebuild | 111 
 2 files changed, 112 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index c4ce8dc3615..1ac9213bd43 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -3,3 +3,4 @@ DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
 DIST ipset-7.7.tar.bz2 678424 BLAKE2B 
330eb82ee3cff8a2b09704e6f90a4a1376f6154753a8e386f52ee934b7e1b402d8b9293962563d50501f31540d651374d7899961739bef50ee2f3096fd1b0bfd
 SHA512 
1c8f969eb402ae56eb4c747d89eb5dcbf068004c3c0ae171eb4eddd948f7d8dd14d6e3dc8b713d2909f220359e6760fce3848a4e12f59a575b747f6c38ad80db
+DIST ipset-7.9.tar.bz2 679273 BLAKE2B 
0e6d216be5c1f51598f74cce8b1166168644152924354d777fc4a0b5433d68d5e04925bf2c88d4a6abf86d7f707795c3f828bf7d00e6a034326c4c3131768f0a
 SHA512 
53d52aa9c0aba728fd620a7b9e232e5366fa45322d3d23150192b53e311877c61175577b6a0fbde95eaa1fb12deca3251a682fd74c3443558e34a1fe2247309e

diff --git a/net-firewall/ipset/ipset-7.9.ebuild 
b/net-firewall/ipset/ipset-7.9.ebuild
new file mode 100644
index 000..b0de78dae51
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="http://ipset.netfilter.org/";
+SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+BUILD_TARGETS="modules"
+MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset"
+MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set};
 do
+   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   # It does still build without NET_NS, but it may be needed in future.
+   #CONFIG_CHECK="${CONFIG_CHECK} NET_NS"
+   #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in 
your kernel."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   if linux_config_src_exists && linux_chkconfig_builtin "MODULES" 
; then
+   if linux_chkconfig_present "IP_NF_SET" || \
+   linux_chkconfig_present "IP_SET"; then #274577
+   eerror "There is IP{,_NF}_SET or 
NETFILTER_XT_SET support in your kernel."
+   eerror "Please either build ipset with modules 
USE flag disabled"
+   eerror "or rebuild kernel without IP_SET 
support and make sure"
+   eerror "there is NO kernel ip_set* modules in 
/lib/modules//... ."
+   die "USE=modules and in-kernel ipset support 
detected."
+   else
+   einfo "Modular kernel detected. Gonna build 
kernel modules..."
+   build_modules=1
+   fi
+   else
+   eerror "Nonmodular kernel detected, but USE=modules. 
Either 

[gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/, lib/portage/package/ebuild/_config/

2020-11-21 Thread Zac Medico
commit: 309e28b2da9a7e98039b45e7555833fe6a4bc2f9
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Nov  9 02:41:36 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 00:45:46 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=309e28b2

emerge: Disable profile deprecation warning inheritance (bug 753497)

According to PMS, a deprecated profile warning is not inherited. Since
the current profile node may have been inherited by a user profile
node, the deprecation warning may be relevant even if it is not a
top-level profile node. Therefore, consider the deprecated warning
to be irrelevant when the current profile node belongs to the same
repo as the previous profile node.

Bug: https://bugs.gentoo.org/753497
Signed-off-by: Zac Medico  gentoo.org>

 .../package/ebuild/_config/LocationsManager.py | 30 --
 .../package/ebuild/deprecated_profile_check.py |  9 ---
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/portage/package/ebuild/_config/LocationsManager.py 
b/lib/portage/package/ebuild/_config/LocationsManager.py
index b90b9227c..327400ad6 100644
--- a/lib/portage/package/ebuild/_config/LocationsManager.py
+++ b/lib/portage/package/ebuild/_config/LocationsManager.py
@@ -30,7 +30,9 @@ _PORTAGE1_DIRECTORIES = frozenset([
 
 _profile_node = collections.namedtuple('_profile_node',
('location', 'portage1_directories', 'user_config',
-   'profile_formats', 'eapi', 'allow_build_id'))
+   'profile_formats', 'eapi', 'allow_build_id',
+   'show_deprecated_warning',
+))
 
 _allow_parent_colon = frozenset(
["portage-2"])
@@ -132,7 +134,7 @@ class LocationsManager:
if self.profile_path:
try:

self._addProfile(os.path.realpath(self.profile_path),
-   repositories, known_repos)
+   repositories, known_repos, ())
except ParseError as e:
if not portage._sync_mode:
writemsg(_("!!! Unable to parse 
profile: '%s'\n") % self.profile_path, noiselevel=-1)
@@ -154,7 +156,9 @@ class LocationsManager:
('profile-bashrcs', 'profile-set'),
read_corresponding_eapi_file(
custom_prof + os.sep, default=None),
-   True))
+   True,
+   show_deprecated_warning=False,
+   ))
del custom_prof
 
self.profiles = tuple(self.profiles)
@@ -167,7 +171,7 @@ class LocationsManager:
noiselevel=-1)
raise DirectoryNotFound(var)
 
-   def _addProfile(self, currentPath, repositories, known_repos):
+   def _addProfile(self, currentPath, repositories, known_repos, 
previous_repos):
current_abs_path = os.path.abspath(currentPath)
allow_directories = True
allow_parent_colon = True
@@ -176,8 +180,8 @@ class LocationsManager:
current_formats = ()
eapi = None
 
-   intersecting_repos = [x for x in known_repos
-   if current_abs_path.startswith(x[0])]
+   intersecting_repos = tuple(x for x in known_repos
+   if current_abs_path.startswith(x[0]))
if intersecting_repos:
# Handle nested repositories. The longest path
# will be the correct one.
@@ -214,6 +218,14 @@ class LocationsManager:
for x in layout_data['profile-formats'])
current_formats = tuple(layout_data['profile-formats'])
 
+   # According to PMS, a deprecated profile warning is not 
inherited. Since
+   # the current profile node may have been inherited by a user 
profile
+   # node, the deprecation warning may be relevant even if it is 
not a
+   # top-level profile node. Therefore, consider the deprecated 
warning
+   # to be irrelevant when the current profile node belongs to the 
same
+   # repo as the previous profile node.
+   show_deprecated_warning = \
+   tuple(x[0] for x in previous_repos) != tuple(x[0] for x 
in intersecting_repos)
 
if compat_mode:
offenders = 
_PORTAGE1_DIRECTORIES.intersection(os.listdir(currentPath))
@@ -256,7 +268,7 @@ class LocationsManager:
parentPath = 
os.path.realpath(parentPath)
 
if exists_raise_eaccess(parentPath):
-   self._addProfile(parent

[gentoo-commits] proj/portage:master commit in: man/, lib/_emerge/, lib/portage/util/, lib/portage/package/ebuild/_config/, ...

2020-11-21 Thread Zac Medico
commit: 222adeecbd72f070eaa05e39b0951cabd6ba8026
Author: Petr Šabata  redhat  com>
AuthorDate: Sat Nov  7 11:55:46 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Nov 22 00:35:49 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=222adeec

Typofix: Use just one definite article

I first noticed this in make.conf(5) but it turned out there were many
more occurences of these; fixed with find & sed.

Closes: https://github.com/gentoo/portage/pull/634
Signed-off-by: Petr Šabata  redhat.com>
Signed-off-by: Zac Medico  gentoo.org>

 doc/package/ebuild/eapi/4.docbook | 2 +-
 lib/_emerge/depgraph.py   | 2 +-
 lib/portage/cache/template.py | 2 +-
 lib/portage/package/ebuild/_config/KeywordsManager.py | 2 +-
 lib/portage/package/ebuild/_config/UseManager.py  | 4 ++--
 lib/portage/package/ebuild/config.py  | 2 +-
 lib/portage/util/netlink.py   | 2 +-
 man/make.conf.5   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/package/ebuild/eapi/4.docbook 
b/doc/package/ebuild/eapi/4.docbook
index 8dd0f1487..9120c0ff0 100644
--- a/doc/package/ebuild/eapi/4.docbook
+++ b/doc/package/ebuild/eapi/4.docbook
@@ -153,7 +153,7 @@ This new REQUIRED_USE metadata key is used to specify what 
USE flag combinations
 It's a semi common occurrence that an ebuild may need to state that they 
disallow USE flags in specific combinations- either mysql or sqlite for 
example, but not both.
 
 
-Existing solutions rely on checking the the USE configuration in pkg_setup 
which is non-optimal due to pkg_setup being ran potentially hours after the 
initial emerge -p invocation.
+Existing solutions rely on checking the USE configuration in pkg_setup which 
is non-optimal due to pkg_setup being ran potentially hours after the initial 
emerge -p invocation.
 
 
 Current versions of EAPI4 support a phase hook pkg_pretend that is intended to 
move pre-build checks to just after resolution. It has been proposed that 
pkg_pretend should continue the tradition of adhoc shell code validating the 
USE state- this too is non optimal for the following reasons-

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 6aaacfe44..a994caea7 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -10061,7 +10061,7 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, 
myparams, spinner):
 
# If this package was pulled in by a parent
# package scheduled for merge, removing this
-   # package may cause the the parent package's
+   # package may cause the parent package's
# dependency to become unsatisfied.
for parent_node, atom in \

mydepgraph._dynamic_config._parent_atoms.get(pkg, []):

diff --git a/lib/portage/cache/template.py b/lib/portage/cache/template.py
index 31a4acc44..55b8dc40c 100644
--- a/lib/portage/cache/template.py
+++ b/lib/portage/cache/template.py
@@ -293,7 +293,7 @@ def serialize_eclasses(eclass_dict, chf_type='mtime', 
paths=True):
"""takes a dict, returns a string representing said dict"""
"""The "new format", which causes older versions of 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/

2020-11-21 Thread Thomas Deutschmann
commit: 7df7c6a5aa1a981c3c63172fa67ba96e0a9d3d38
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 22 00:31:38 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 22 00:31:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df7c6a5

sys-apps/systemd-tmpfiles: x86 stable (bug #755983)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild 
b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 4c6ac9a06cb..0eef1890fbb 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-misc/chkcrontab/

2020-11-21 Thread Thomas Deutschmann
commit: cf5f305dfe9919ee9c1a8f1431e100023ea4c6e5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 22 00:31:11 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 22 00:31:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5f305d

app-misc/chkcrontab: x86 stable (bug #755992)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild 
b/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
index 7be8fc3caca..a9facacc2c1 100644
--- a/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

2020-11-21 Thread Andreas K. Hüttel
commit: c4e92b5385ba95aa763f1225f74a0d4ce464d292
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Nov 22 00:16:17 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Nov 22 00:16:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e92b53

app-office/libreoffice: Fix metainfo location, bug 709450

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  | 5 +
 app-office/libreoffice/libreoffice-7.0..ebuild | 5 +
 app-office/libreoffice/libreoffice-.ebuild | 5 +
 3 files changed, 15 insertions(+)

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 3e988d5940d..0ead7020099 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -638,6 +638,11 @@ EOF
dosym ../../../../${loprogdir}/__pycache__/${pyc} 
$(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name 
${py/.py/*.pyc} -print0)
done
+
+   # bug 709450
+   mkdir -p "${ED}"/usr/share/metainfo || die
+   mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+   rmdir "${ED}"/usr/share/appdata || die
 }
 
 pkg_postinst() {

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
index 79ca095f21b..c04d5929a50 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -634,6 +634,11 @@ EOF
dosym ../../../../${loprogdir}/__pycache__/${pyc} 
$(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name 
${py/.py/*.pyc} -print0)
done
+
+   # bug 709450
+   mkdir -p "${ED}"/usr/share/metainfo || die
+   mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+   rmdir "${ED}"/usr/share/appdata || die
 }
 
 pkg_postinst() {

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index b85e0f6e397..816e95d62a1 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -634,6 +634,11 @@ EOF
dosym ../../../../${loprogdir}/__pycache__/${pyc} 
$(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name 
${py/.py/*.pyc} -print0)
done
+
+   # bug 709450
+   mkdir -p "${ED}"/usr/share/metainfo || die
+   mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+   rmdir "${ED}"/usr/share/appdata || die
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: games-fps/doomsday/

2020-11-21 Thread Andreas Sturmlechner
commit: d0031e9954e3c20500f025edd648fe0b929aec8f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 22 00:09:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 22 00:12:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0031e99

games-fps/doomsday: Set QMAKE directly w/ qmake-utils, drop QT_SELECT

Closes: https://bugs.gentoo.org/755974
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-fps/doomsday/doomsday-2.1.1-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild 
b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
index eb08301295e..8aa9456f575 100644
--- a/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1-r1.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake python-any-r1 readme.gentoo-r1
+inherit cmake python-any-r1 qmake-utils readme.gentoo-r1
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="https://www.dengine.net";
 
SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz";
+
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -31,8 +32,7 @@ RDEPEND="
tools? ( sys-libs/ncurses:0= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-   ${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
 "
 PDEPEND="
@@ -52,11 +52,11 @@ src_prepare() {
 }
 
 src_configure() {
-   export QT_SELECT=qt5
local mycmakeargs=(
-DDENG_ASSIMP_EMBEDDED="OFF"
-DDENG_ENABLE_TOOLS="$(usex tools)"
-DPYTHON_EXECUTABLE="${PYTHON}"
+   -DQMAKE=$(qt5_get_bindir)/qmake
)
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/files/

2020-11-21 Thread Lars Wendler
commit: 93884e60b2171f2119605aaee57656abe8fe9bd1
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov 21 23:59:54 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov 21 23:59:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93884e60

sys-apps/hdparm: Forgot to add patch description

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/hdparm/files/hdparm-9.60-build.patch | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/hdparm/files/hdparm-9.60-build.patch 
b/sys-apps/hdparm/files/hdparm-9.60-build.patch
index 7decf805c53..3cc1a7564e3 100644
--- a/sys-apps/hdparm/files/hdparm-9.60-build.patch
+++ b/sys-apps/hdparm/files/hdparm-9.60-build.patch
@@ -1,3 +1,7 @@
+* drop hardcoded -O2 flag from CFLAGS
+* fix hardcoded `make` and hardcoded -j4 flags
+* respect CFLAGS when linking
+
 --- hdparm-9.60/Makefile
 +++ hdparm-9.60/Makefile
 @@ -13,7 +13,7 @@



[gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/

2020-11-21 Thread Lars Wendler
commit: 11e883711eadc5ad73e290873f0f094fe65779df
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov 21 23:55:32 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov 21 23:55:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e88371

sys-apps/hdparm: Removed old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/hdparm/Manifest   |  1 -
 sys-apps/hdparm/hdparm-9.56.ebuild | 43 --
 2 files changed, 44 deletions(-)

diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index f34a07566b7..e5b6718b411 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,3 +1,2 @@
-DIST hdparm-9.56.tar.gz 137213 BLAKE2B 
ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd
 SHA512 
5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 
29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46
 SHA512 
42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
 DIST hdparm-9.60.tar.gz 155220 BLAKE2B 
c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0
 SHA512 
e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed

diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild 
b/sys-apps/hdparm/hdparm-9.56.ebuild
deleted file mode 100644
index acb642f6568..000
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/";
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc 
x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
-   default
-   use static && append-ldflags -static
-}
-
-src_configure() {
-   tc-export CC
-   export STRIP=:
-}
-
-src_install() {
-   into /
-   dosbin hdparm contrib/idectl
-
-   newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-   newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-   doman hdparm.8
-   dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-   docinto wiper
-   dodoc wiper/{README.txt,wiper.sh}
-   docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/

2020-11-21 Thread Lars Wendler
commit: 5dc71f632945c43eaaae16f04c1eb333ed70cda6
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov 21 23:54:48 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov 21 23:55:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc71f63

sys-apps/hdparm: Bump to version 9.60

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/hdparm/Manifest  |  1 +
 sys-apps/hdparm/files/hdparm-9.60-build.patch | 28 +
 sys-apps/hdparm/hdparm-9.60.ebuild| 43 +++
 3 files changed, 72 insertions(+)

diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 8f621eb7d10..f34a07566b7 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,2 +1,3 @@
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B 
ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd
 SHA512 
5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 
29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46
 SHA512 
42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
+DIST hdparm-9.60.tar.gz 155220 BLAKE2B 
c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0
 SHA512 
e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed

diff --git a/sys-apps/hdparm/files/hdparm-9.60-build.patch 
b/sys-apps/hdparm/files/hdparm-9.60-build.patch
new file mode 100644
index 000..7decf805c53
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.60-build.patch
@@ -0,0 +1,28 @@
+--- hdparm-9.60/Makefile
 hdparm-9.60/Makefile
+@@ -13,7 +13,7 @@
+ CC ?= gcc
+ STRIP ?= strip
+ 
+-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith 
-Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -fkeep-inline-functions -Wwrite-strings 
-Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
++CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith 
-Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes 
-Wmissing-declarations -fkeep-inline-functions -Wwrite-strings 
-Waggregate-return -Wnested-externs -Wtrigraphs
+ 
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
+@@ -22,14 +22,13 @@
+ 
+ OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o 
fwdownload.o dvdspeed.o wdidle3.o apt.o
+ 
+-all:
+-  $(MAKE) -j4 hdparm
++all: hdparm
+ 
+ static:
+   LDFLAGS=-static $(MAKE)
+ 
+ hdparm: Makefile hdparm.h sgio.h $(OBJS)
+-  $(CC) $(LDFLAGS) -o hdparm $(OBJS)
++  $(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS)
+   $(STRIP) hdparm
+ 
+ hdparm.o: hdparm.h sgio.h

diff --git a/sys-apps/hdparm/hdparm-9.60.ebuild 
b/sys-apps/hdparm/hdparm-9.60.ebuild
new file mode 100644
index 000..1bfffb80b2f
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.60.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/";
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-9.60-build.patch
+)
+
+src_prepare() {
+   default
+   use static && append-ldflags -static
+}
+
+src_configure() {
+   tc-export CC
+   export STRIP=:
+}
+
+src_install() {
+   into /
+   dosbin hdparm contrib/idectl
+
+   newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+   newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+   doman hdparm.8
+   dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+   docinto wiper
+   dodoc wiper/{README.txt,wiper.sh}
+   docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/concurrencykit/

2020-11-21 Thread Conrad Kostecki
commit: d782e27811a35e9d86d130a3d13b6b7b20cc7a85
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 21 23:39:51 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 21 23:40:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d782e278

dev-libs/concurrencykit: taking ownership

I am taking now ownership, as the proxy-maintainer told me by mail, that
he is going to put this package into m-n too.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/concurrencykit/metadata.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-libs/concurrencykit/metadata.xml 
b/dev-libs/concurrencykit/metadata.xml
index 5acb2fa5df3..8600ab81dac 100644
--- a/dev-libs/concurrencykit/metadata.xml
+++ b/dev-libs/concurrencykit/metadata.xml
@@ -2,12 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   hydrapo...@gmail.com
-   Tomáš Mózes
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
+   conik...@gentoo.org
+   Conrad Kostecki


concurrencykit/ck



[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/sysbench/

2020-11-21 Thread Conrad Kostecki
commit: 263519702defe555db9a6ca109c371fba469e508
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 21 23:37:17 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 21 23:40:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26351970

app-benchmarks/sysbench: drop old version

Also dropping live ebuild, as there is no use as of now.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-benchmarks/sysbench/Manifest   |  1 -
 app-benchmarks/sysbench/sysbench-1.0.19.ebuild | 61 --
 app-benchmarks/sysbench/sysbench-.ebuild   | 58 
 3 files changed, 120 deletions(-)

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index ee2da7a10fb..080ffb7c134 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,3 +1,2 @@
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B 
d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac
 SHA512 
ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
-DIST sysbench-1.0.19.tar.gz 1509412 BLAKE2B 
ac52c22bad2e7fb38ac53dbcf8df10c8aa2e1ab30cafa4ec747ad7442ed519c15e693314ae60371b2f4d8a9fe455047982121465fe54c3d02524934daca3e387
 SHA512 
1e88cb8dc679fa2b71dc3310fe058bcce7a154bcbc9d5e9b1936d61a11a27e4b6784157cefb1e3540f6abac5142aad4bbf4b470941cf4f1c6d55a967262c07be
 DIST sysbench-1.0.20.tar.gz 1509630 BLAKE2B 
9b63c1c2703fc2311e03561c8dde2c39b249b6aadffebddfd99cdcfb5319606a484132e9dcb23a4365aecfc1148c5c5c56c918ac8c363ffcb1beece26aaf15c7
 SHA512 
510453f26c4304eee74cff82a99356b668478f97eaf942fa3654a27692743b52d39dda526fa8d136568b5ad136157c8658ae5eb2ae4e8593b161dcd49621f24f

diff --git a/app-benchmarks/sysbench/sysbench-1.0.19.ebuild 
b/app-benchmarks/sysbench/sysbench-1.0.19.ebuild
deleted file mode 100644
index bad79a67a16..000
--- a/app-benchmarks/sysbench/sysbench-1.0.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pax-utils
-
-DESCRIPTION="System performance benchmark"
-HOMEPAGE="https://github.com/akopytov/sysbench";
-SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aio mysql postgres test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="aio? ( dev-libs/libaio )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-lang/luajit:2"
-DEPEND="${RDEPEND}
-   dev-libs/concurrencykit
-   dev-libs/libxslt
-   test? ( dev-util/cram )"
-BDEPEND="sys-devel/libtool
-   virtual/pkgconfig"
-
-src_prepare() {
-   default
-
-   # remove bundled libs
-   rm -r third_party/luajit/luajit third_party/concurrency_kit/ck 
third_party/cram || die
-
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable aio)
-   $(use_with mysql)
-   $(use_with postgres pgsql)
-   --without-attachsql
-   --without-drizzle
-   --without-oracle
-   --with-system-luajit
-   --with-system-ck
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_test() {
-   emake check test
-}
-
-src_install() {
-   default
-
-   pax-mark m "${ED}"/usr/bin/${PN}
-}

diff --git a/app-benchmarks/sysbench/sysbench-.ebuild 
b/app-benchmarks/sysbench/sysbench-.ebuild
deleted file mode 100644
index 20702594cf1..000
--- a/app-benchmarks/sysbench/sysbench-.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3 pax-utils
-
-DESCRIPTION="System performance benchmark"
-HOMEPAGE="https://github.com/akopytov/sysbench";
-EGIT_REPO_URI="https://github.com/akopytov/sysbench.git";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS=""
-IUSE="aio mysql postgres test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="aio? ( dev-libs/libaio )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-lang/luajit:="
-DEPEND="${RDEPEND}
-   dev-libs/concurrencykit
-   dev-libs/libxslt
-   sys-devel/libtool
-   virtual/pkgconfig
-   test? ( dev-util/cram )"
-
-src_prepare() {
-   default
-
-   # remove bundled libs
-   rm -r third_party/luajit/luajit third_party/concurrency_kit/ck 
third_party/cram || die
-
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable aio)
-   $(use_with mysql)
-   $(use_with postgres pgsql)
-   --with-system-luajit
-   --with-system-ck
-   )
-
- 

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/sysbench/

2020-11-21 Thread Conrad Kostecki
commit: a8a9794db2acefa40251362931ffa69fbf154a7c
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Nov 21 23:35:33 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Nov 21 23:40:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a9794d

app-benchmarks/sysbench: bump to version 1.0.20

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-benchmarks/sysbench/Manifest   |  1 +
 app-benchmarks/sysbench/metadata.xml   |  5 +-
 app-benchmarks/sysbench/sysbench-1.0.20.ebuild | 72 ++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 3e90424065d..ee2da7a10fb 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,2 +1,3 @@
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B 
d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac
 SHA512 
ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
 DIST sysbench-1.0.19.tar.gz 1509412 BLAKE2B 
ac52c22bad2e7fb38ac53dbcf8df10c8aa2e1ab30cafa4ec747ad7442ed519c15e693314ae60371b2f4d8a9fe455047982121465fe54c3d02524934daca3e387
 SHA512 
1e88cb8dc679fa2b71dc3310fe058bcce7a154bcbc9d5e9b1936d61a11a27e4b6784157cefb1e3540f6abac5142aad4bbf4b470941cf4f1c6d55a967262c07be
+DIST sysbench-1.0.20.tar.gz 1509630 BLAKE2B 
9b63c1c2703fc2311e03561c8dde2c39b249b6aadffebddfd99cdcfb5319606a484132e9dcb23a4365aecfc1148c5c5c56c918ac8c363ffcb1beece26aaf15c7
 SHA512 
510453f26c4304eee74cff82a99356b668478f97eaf942fa3654a27692743b52d39dda526fa8d136568b5ad136157c8658ae5eb2ae4e8593b161dcd49621f24f

diff --git a/app-benchmarks/sysbench/metadata.xml 
b/app-benchmarks/sysbench/metadata.xml
index e21737e9dfe..42ddffecca2 100644
--- a/app-benchmarks/sysbench/metadata.xml
+++ b/app-benchmarks/sysbench/metadata.xml
@@ -6,7 +6,10 @@
Conrad Kostecki


-   Enable libaio support
+   Add support for AIO.
+   Add support for AttachSQL.
+   Add support for Drizzles.
+   Add support for large files.


akopytov/sysbench

diff --git a/app-benchmarks/sysbench/sysbench-1.0.20.ebuild 
b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
new file mode 100644
index 000..3d882dede76
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="A scriptable multi-threaded benchmark tool based on LuaJIT"
+HOMEPAGE="https://github.com/akopytov/sysbench";
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aio attachsql drizzle +largefile mysql postgres test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-lang/luajit:2
+   aio? ( dev-libs/libaio )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   test? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+   dev-libs/concurrencykit
+   dev-libs/libxslt
+   test? (
+   $(python_gen_cond_dep '
+   dev-util/cram[${PYTHON_USEDEP}]
+   ')
+   )
+   ${RDEPEND}
+"
+BDEPEND="
+   sys-devel/libtool
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   default
+
+   rm -r third_party/{concurrency_kit/ck,cram,luajit/luajit} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # Current versions of 'dev-db/oracle-instantclient' aren't supported.
+   # See: https://github.com/akopytov/sysbench/issues/390.
+   local myeconfargs=(
+   --disable-rpath
+   $(use_enable aio)
+   $(use_enable largefile)
+   $(use_with attachsql)
+   $(use_with drizzle)
+   $(use_with mysql)
+   $(use_with postgres pgsql)
+   --with-system-ck
+   --with-system-luajit
+   --without-oracle
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_test() {
+   emake check test
+}



[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

2020-11-21 Thread Andreas K. Hüttel
commit: f9e9a8666cd4b64a01bf3f6dcf585e8c4e1dec14
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Nov 21 23:24:25 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Nov 21 23:27:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e9a866

app-office/libreoffice: Brute-force compiler settings (clang/gcc)

Bug: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  | 26 +-
 app-office/libreoffice/libreoffice-7.0..ebuild | 26 +-
 app-office/libreoffice/libreoffice-.ebuild | 26 +-
 3 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 695c9c5f0f6..e561517b8f5 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -393,41 +393,35 @@ src_configure() {
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
 
# Show flags set at the beginning
-   einfo "Current CFLAGS:${CFLAGS}"
-   einfo "Current LDFLAGS:   ${LDFLAGS}"
+   einfo "Preset CFLAGS:${CFLAGS}"
+   einfo "Preset LDFLAGS:   ${LDFLAGS}"
 
-   local have_switched_compiler=
-   if use clang && ! tc-is-clang ; then
+   if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
-   have_switched_compiler=yes
AR=llvm-ar
CC=${CHOST}-clang
CXX=${CHOST}-clang++
NM=llvm-nm
RANLIB=llvm-ranlib
-   elif ! use clang && ! tc-is-gcc ; then
+   LDFLAGS+=" -fuse-ld=lld"
+   strip-unsupported-flags
+   else
# Force gcc
-   have_switched_compiler=yes
einfo "Enforcing the use of gcc due to USE=-clang ..."
AR=gcc-ar
CC=${CHOST}-gcc
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+   strip-unsupported-flags
fi
export CLANG_CC=${CC}
export CLANG_CXX=${CXX}
 
-   if [[ -n "${have_switched_compiler}" ]] ; then
-   # Because we switched active compiler we have to ensure
-   # that no unsupported flags are set
-   strip-unsupported-flags
-   fi
-
-   # Show flags set at the beginning
-   einfo "   Used CFLAGS:${CFLAGS}"
-   einfo "   Used LDFLAGS:   ${LDFLAGS}"
+   # Show flags set at the end
+   einfo "  Used CFLAGS:${CFLAGS}"
+   einfo "  Used LDFLAGS:   ${LDFLAGS}"
 
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
index b10bdb491e5..223d653facc 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -389,41 +389,35 @@ src_configure() {
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
 
# Show flags set at the beginning
-   einfo "Current CFLAGS:${CFLAGS}"
-   einfo "Current LDFLAGS:   ${LDFLAGS}"
+   einfo "Preset CFLAGS:${CFLAGS}"
+   einfo "Preset LDFLAGS:   ${LDFLAGS}"
 
-   local have_switched_compiler=
-   if use clang && ! tc-is-clang ; then
+   if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
-   have_switched_compiler=yes
AR=llvm-ar
CC=${CHOST}-clang
CXX=${CHOST}-clang++
NM=llvm-nm
RANLIB=llvm-ranlib
-   elif ! use clang && ! tc-is-gcc ; then
+   LDFLAGS+=" -fuse-ld=lld"
+   strip-unsupported-flags
+   else
# Force gcc
-   have_switched_compiler=yes
einfo "Enforcing the use of gcc due to USE=-clang ..."
AR=gcc-ar
CC=${CHOST}-gcc
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+   strip-unsupported-flags
fi
export CLANG_CC=${CC}
export CLANG_CXX=${CXX}
 
-   if [[ -n "${have_switched_compiler}" ]] ; then
-   # Because we switched active compiler we have to ensure
-   # that no unsupported flags are set
-   strip-unsupported-flags
-   fi
-
-   # Show flags set at the beginning
-   einfo "   Used CFLAGS:${CFLAGS}"
-   einfo "   Used LDFLAGS:   ${LDFLAGS}"
+   # Show flags set at the end
+   einfo "  Used CFLAGS:${CFLAGS}"
+   einfo "  Used LDFLAGS:

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

2020-11-21 Thread Andreas K. Hüttel
commit: 150aa3a64226a0caf51f1fbdc83816136f40e014
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Nov 21 23:26:41 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Nov 21 23:27:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=150aa3a6

app-office/libreoffice: Fix clang alternatives order

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  | 12 ++--
 app-office/libreoffice/libreoffice-7.0..ebuild | 12 ++--
 app-office/libreoffice/libreoffice-.ebuild | 12 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index e561517b8f5..3e988d5940d 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -184,15 +184,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
clang? (
|| (
-   (   sys-devel/clang:10
-   sys-devel/llvm:10
-   =sys-devel/lld-10*  )
-   (   sys-devel/clang:11
-   sys-devel/llvm:11
-   =sys-devel/lld-11*  )
(   sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12*  )
+   (   sys-devel/clang:11
+   sys-devel/llvm:11
+   =sys-devel/lld-11*  )
+   (   sys-devel/clang:10
+   sys-devel/llvm:10
+   =sys-devel/lld-10*  )
)
)
coinmp? ( sci-libs/coinor-mp )

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
index 223d653facc..79ca095f21b 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -184,15 +184,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
clang? (
|| (
-   (   sys-devel/clang:10
-   sys-devel/llvm:10
-   =sys-devel/lld-10*  )
-   (   sys-devel/clang:11
-   sys-devel/llvm:11
-   =sys-devel/lld-11*  )
(   sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12*  )
+   (   sys-devel/clang:11
+   sys-devel/llvm:11
+   =sys-devel/lld-11*  )
+   (   sys-devel/clang:10
+   sys-devel/llvm:10
+   =sys-devel/lld-10*  )
)
)
coinmp? ( sci-libs/coinor-mp )

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index 67ba6c45bbe..b85e0f6e397 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -184,15 +184,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
clang? (
|| (
-   (   sys-devel/clang:10
-   sys-devel/llvm:10
-   =sys-devel/lld-10*  )
-   (   sys-devel/clang:11
-   sys-devel/llvm:11
-   =sys-devel/lld-11*  )
(   sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12*  )
+   (   sys-devel/clang:11
+   sys-devel/llvm:11
+   =sys-devel/lld-11*  )
+   (   sys-devel/clang:10
+   sys-devel/llvm:10
+   =sys-devel/lld-10*  )
)
)
coinmp? ( sci-libs/coinor-mp )



[gentoo-commits] repo/gentoo:master commit in: media-video/shotcut/

2020-11-21 Thread Andreas Sturmlechner
commit: 676a5134c0b6389b4cfa7ffbba0980ccb9adeefc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 22:59:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:59:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676a5134

media-video/shotcut: Keep suppressing bogus warning

See also: https://github.com/gentoo/gentoo/pull/18117

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/shotcut/shotcut-20.10.31.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-video/shotcut/shotcut-20.10.31.ebuild 
b/media-video/shotcut/shotcut-20.10.31.ebuild
index 31be3e0e851..ee415787b81 100644
--- a/media-video/shotcut/shotcut-20.10.31.ebuild
+++ b/media-video/shotcut/shotcut-20.10.31.ebuild
@@ -41,6 +41,11 @@ RDEPEND="${COMMON_DEPEND}
virtual/jack
 "
 
+src_prepare() {
+   default
+   sed -i -e '/QT.*private/d' src/src.pro || die
+}
+
 src_configure() {
eqmake5 \
PREFIX="${EPREFIX}/usr" \



[gentoo-commits] repo/gentoo:master commit in: media-video/shotcut/

2020-11-21 Thread Andreas Sturmlechner
commit: 9836fb184aa8a2c0b3dc7aee0c419e507ea16123
Author: Felix Neumärker  posteo  de>
AuthorDate: Sat Nov  7 09:03:36 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:51:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9836fb18

media-video/shotcut: taking maintainership

Bug: https://bugs.gentoo.org/687148
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Felix Neumärker  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/18117
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/shotcut/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/shotcut/metadata.xml b/media-video/shotcut/metadata.xml
index 9fca7f80eba..f6e4473d5c5 100644
--- a/media-video/shotcut/metadata.xml
+++ b/media-video/shotcut/metadata.xml
@@ -2,8 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   reagen...@gmail.com
-   Dmitry Baranov
+   xdc...@posteo.de
+   Felix Neumärker


proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: media-video/shotcut/

2020-11-21 Thread Andreas Sturmlechner
commit: 0e5ddce239de8a73d82b1887b41c3c55971d4345
Author: Felix Neumärker  posteo  de>
AuthorDate: Fri Nov  6 08:22:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:51:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5ddce2

media-video/shotcut: version bump to 20.10.31

Closes: https://bugs.gentoo.org/688850
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Felix Neumärker  posteo.de>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/shotcut/Manifest|  1 +
 media-video/shotcut/shotcut-20.10.31.ebuild | 54 +
 2 files changed, 55 insertions(+)

diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 6d5634b3505..80c7c333657 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1 +1,2 @@
 DIST shotcut-20.07.11.tar.gz 5801379 BLAKE2B 
93f91fc0d31583e2f53576a7c768e9c0330da07ebcacf1a9d66020a826bbff430fc6032c48f288936ac14f8eaf5a592297c818c72bdde73253a90cc6ce304655
 SHA512 
8590855f252dbf1a1e4aed078da93ea730e4dec2c67420f57babf59e37a8f4d76c808a14872ae68fa400e5057e9be9d42c567c4f0db3e869eefd5115b814d30b
+DIST shotcut-20.10.31.tar.gz 5735908 BLAKE2B 
04b9bada177216c81950a551a9dc06624efe7fd50df9cc12cbe1b358436721700d7ecd49a89c48988ce33eee8a8bcdb9c58ccf74775ee2e2828090e53567ade0
 SHA512 
4d0109e87c86e3b7bb20aeb4b9a38fac175f90f00b8b13b605af9f5959578a2329da5a91d96891c814a84e7f23501ee5d3be9d2ca7a4bdd1a70af9894f0f7348

diff --git a/media-video/shotcut/shotcut-20.10.31.ebuild 
b/media-video/shotcut/shotcut-20.10.31.ebuild
new file mode 100644
index 000..31be3e0e851
--- /dev/null
+++ b/media-video/shotcut/shotcut-20.10.31.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="A free, open source, cross-platform video editor"
+HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/";
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5[widgets]
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsql:5
+   dev-qt/qtwebsockets:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   >=media-libs/mlt-6.22.1[ffmpeg,frei0r,jack,melt(+),qt5,sdl,xml]
+   media-video/ffmpeg
+"
+DEPEND="${COMMON_DEPEND}
+   dev-qt/qtconcurrent:5
+   dev-qt/qtx11extras:5
+"
+RDEPEND="${COMMON_DEPEND}
+   dev-qt/qtgraphicaleffects:5
+   dev-qt/qtquickcontrols:5
+   virtual/jack
+"
+
+src_configure() {
+   eqmake5 \
+   PREFIX="${EPREFIX}/usr" \
+   SHOTCUT_VERSION="${PV}" \
+   DEFINES+=SHOTCUT_NOUPGRADE
+}
+
+src_install() {
+   emake INSTALL_ROOT="${D}" install
+   einstalldocs
+}



[gentoo-commits] repo/gentoo:master commit in: media-video/shotcut/

2020-11-21 Thread Andreas Sturmlechner
commit: fec56e0dfda7b516cc06a5e395ce72f77a125697
Author: Felix Neumärker  posteo  de>
AuthorDate: Fri Nov  6 08:23:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:51:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec56e0d

media-video/shotcut: drop masked version

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Felix Neumärker  posteo.de>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/shotcut/Manifest|  1 -
 media-video/shotcut/shotcut-20.07.11.ebuild | 64 -
 2 files changed, 65 deletions(-)

diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 80c7c333657..3095439 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,2 +1 @@
-DIST shotcut-20.07.11.tar.gz 5801379 BLAKE2B 
93f91fc0d31583e2f53576a7c768e9c0330da07ebcacf1a9d66020a826bbff430fc6032c48f288936ac14f8eaf5a592297c818c72bdde73253a90cc6ce304655
 SHA512 
8590855f252dbf1a1e4aed078da93ea730e4dec2c67420f57babf59e37a8f4d76c808a14872ae68fa400e5057e9be9d42c567c4f0db3e869eefd5115b814d30b
 DIST shotcut-20.10.31.tar.gz 5735908 BLAKE2B 
04b9bada177216c81950a551a9dc06624efe7fd50df9cc12cbe1b358436721700d7ecd49a89c48988ce33eee8a8bcdb9c58ccf74775ee2e2828090e53567ade0
 SHA512 
4d0109e87c86e3b7bb20aeb4b9a38fac175f90f00b8b13b605af9f5959578a2329da5a91d96891c814a84e7f23501ee5d3be9d2ca7a4bdd1a70af9894f0f7348

diff --git a/media-video/shotcut/shotcut-20.07.11.ebuild 
b/media-video/shotcut/shotcut-20.07.11.ebuild
deleted file mode 100644
index a427a53ccc8..000
--- a/media-video/shotcut/shotcut-20.07.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils xdg
-
-DESCRIPTION="A free, open source, cross-platform video editor"
-HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/";
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5[widgets]
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtsql:5
-   dev-qt/qtwebkit:5
-   dev-qt/qtwebsockets:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   >=media-libs/mlt-6.18.0[ffmpeg,frei0r,jack,qt5,sdl,xml]
-   media-libs/webvfx
-   media-video/ffmpeg
-"
-DEPEND="${COMMON_DEPEND}
-   dev-qt/qtconcurrent:5
-   dev-qt/qtx11extras:5
-"
-RDEPEND="${COMMON_DEPEND}
-   dev-qt/qtgraphicaleffects:5
-   dev-qt/qtquickcontrols:5
-   virtual/jack
-"
-
-src_prepare() {
-   default
-
-   sed -i -e '/QT.*private/d' \
-   src/src.pro || die
-}
-
-src_configure() {
-   append-cxxflags -Wno-deprecated-declarations
-
-   eqmake5 \
-   PREFIX="${EPREFIX}/usr" \
-   SHOTCUT_VERSION="${PV}"
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-   einstalldocs
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/webvfx/, profiles/

2020-11-21 Thread Andreas Sturmlechner
commit: 58543cb3ab79bf81b35cfa1b71cdf8f55b837a8d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 22:49:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:49:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58543cb3

media-libs/webvfx: Remove last-rited package

Bug: https://bugs.gentoo.org/688850
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/webvfx/Manifest|  1 -
 media-libs/webvfx/metadata.xml| 18 --
 media-libs/webvfx/webvfx-1.2.0.ebuild | 64 ---
 profiles/package.mask |  5 ---
 4 files changed, 88 deletions(-)

diff --git a/media-libs/webvfx/Manifest b/media-libs/webvfx/Manifest
deleted file mode 100644
index a310ccc7467..000
--- a/media-libs/webvfx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST webvfx-1.2.0.txz 1178880 BLAKE2B 
7ef08f791b291897f39e170f0572db2fb98c78bced9ed3560b1b94cfe48bedf0af3af5e57381bd039f6cf3dc1d558fb07a6a959b28f1c6a380d0dd0f1bfc64fd
 SHA512 
84473df90553d2d85e1860eb98326fc65ebca02f1cbd8415b83e02ea032442d2aa42c000e366b6ca217bb59526b2b4409d85b169cc7e60d86443b79a1ff5614a

diff --git a/media-libs/webvfx/metadata.xml b/media-libs/webvfx/metadata.xml
deleted file mode 100644
index 3ca5303fe87..000
--- a/media-libs/webvfx/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   reagen...@gmail.com
-   Dmitry Baranov
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
-   
-   mltframework/webvfx
-   
-   
-   Install doxygen developer documentation
-   
-

diff --git a/media-libs/webvfx/webvfx-1.2.0.ebuild 
b/media-libs/webvfx/webvfx-1.2.0.ebuild
deleted file mode 100644
index 7ad5951c5e0..000
--- a/media-libs/webvfx/webvfx-1.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Video effects library based on web technologies"
-HOMEPAGE="https://github.com/mltframework/webvfx/";
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/${PV}/${P}.txz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-BDEPEND="
-   doc? ( app-doc/doxygen )
-"
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtopengl:5
-   dev-qt/qtquickcontrols:5[widgets]
-   dev-qt/qtwebkit:5
-   dev-qt/qtwidgets:5
-   >=media-libs/mlt-6.20.0
-   virtual/opengl
-"
-DEPEND="${RDEPEND}
-   dev-qt/qtnetwork:5
-"
-
-src_prepare() {
-   default
-
-   find -name "*.pro" -exec \
-   sed -i -e "s/\(system.*\)pkg-config/\1$(tc-getPKG_CONFIG)/" {} 
+ || die
-
-   sed -i -e "s/\(target.*path.*PREFIX.*\)lib/\1$(get_libdir)/" \
-   webvfx/webvfx.pro || die
-
-   sed -i -e "s/PROJECT_NUMBER=\`.*\`/PROJECT_NUMBER=${PV}/" \
-   all.pro || die
-}
-
-src_configure() {
-   append-cxxflags -Wno-deprecated-declarations
-
-   eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_compile() {
-   emake
-   use doc && emake doxydoc
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-
-   use doc && local HTML_DOCS=( doxydoc/. )
-   einstalldocs
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 9ea1deecdaa..2ee2a75e1ef 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -452,11 +452,6 @@ gnome-base/orbit
 # Bug #688850, security bug #744199. Removal in 30 days.
 media-video/shotcut
 
-# Andreas Sturmlechner  (2020-10-23)
-# Depends on deprecated QtWebKit with no work towards QtWebEngine port at all.
-# Bug #688850. Removal in 30 days.
-media-libs/webvfx
-
 # Michał Górny  (2020-10-23)
 # Fails to build.  Needs a dedicated maintainer and a version bump.
 # Removal in 30 days.  Bug #635592.



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-21 Thread Andreas Sturmlechner
commit: cacc9157d0aee9d04fd63fb62f361f9a0205cc3e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 22:56:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:56:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cacc9157

profiles: Drop obsolete media-video/shotcut package.mask

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 profiles/package.mask | 5 -
 1 file changed, 5 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 2ee2a75e1ef..ee2d34144a6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -447,11 +447,6 @@ gnome-base/libbonobo
 gnome-base/libgnome-keyring
 gnome-base/orbit
 
-# Andreas Sturmlechner  (2020-10-23)
-# Depends on deprecated QtWebKit, needs a new maintainer and version bump.
-# Bug #688850, security bug #744199. Removal in 30 days.
-media-video/shotcut
-
 # Michał Górny  (2020-10-23)
 # Fails to build.  Needs a dedicated maintainer and a version bump.
 # Removal in 30 days.  Bug #635592.



[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-21 Thread Andreas Sturmlechner
commit: c31c02177bb66b4a0713bf9b685b693aecd70a7b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 22:45:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:47:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31c0217

profiles: Mask media-video/kmplayer for removal

Last revdep of deprecated kde-frameworks/kmediaplayer.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 43127666161..9ea1deecdaa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner  (2020-11-21)
+# Dead upstream, depends on deprecated kde-frameworks/kmediaplayer
+# Masked for removal in 30 days.
+media-video/kmplayer
+
 # Michał Górny  (2020-11-19)
 # These packages are maintained by the Python project, or have
 # no maintainer.  They have not been ported to Python 3.8 yet.



[gentoo-commits] repo/gentoo:master commit in: dev-libs/tree-sitter/files/, dev-libs/tree-sitter/

2020-11-21 Thread Nick Sarnie
commit: 0cebacf7c18a287097492e86daff2665990d988b
Author: Ali Abdel-Qader  protonmail  com>
AuthorDate: Sat Nov 21 22:24:37 2020 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Sat Nov 21 22:28:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cebacf7

dev-libs/tree-sitter: create package

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ali Abdel-Qader  protonmail.com>
Signed-off-by: Nick Sarnie  gentoo.org>

 dev-libs/tree-sitter/Manifest  |  1 +
 .../files/tree-sitter-No-static-libs-gentoo.patch  | 21 +
 dev-libs/tree-sitter/metadata.xml  | 18 +++
 dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild | 26 ++
 dev-libs/tree-sitter/tree-sitter-.ebuild   | 26 ++
 5 files changed, 92 insertions(+)

diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
new file mode 100644
index 000..2959e6a352c
--- /dev/null
+++ b/dev-libs/tree-sitter/Manifest
@@ -0,0 +1 @@
+DIST tree-sitter-0.17.3.tar.gz 519006 BLAKE2B 
81eb9bdfc9f27e7b172b6c17333eece5515cf292d5b08eb5362f108db483e329ff6d309ccc40ef2de23d1a32c437cdbc1b9cf800146902a3d913feecf8b63269
 SHA512 
48a827d7bea184a84ad9f594bc5dc1869bad9aa2823f83d1ac7d58e6feaa092e7088e7eb0dcc6d3aa3810d25ff9f25ecb531751c77314ff7d07fa05f95b7a013

diff --git a/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch 
b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
new file mode 100644
index 000..dd898b05961
--- /dev/null
+++ b/dev-libs/tree-sitter/files/tree-sitter-No-static-libs-gentoo.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index 764f411a..86aaefd8 100644
+--- a/Makefile
 b/Makefile
+@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
+   PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+ endif
+ 
+-all: libtree-sitter.a libtree-sitter.$(SOEXTVER)
++all: libtree-sitter.$(SOEXTVER)
+ 
+ libtree-sitter.a: $(OBJ)
+   $(AR) rcs $@ $^
+@@ -53,7 +53,6 @@ libtree-sitter.$(SOEXTVER): $(OBJ)
+ 
+ install: all
+   install -d '$(DESTDIR)$(LIBDIR)'
+-  install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+   install -m755 libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
+   ln -sf libtree-sitter.$(SOEXTVER) 
'$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)

diff --git a/dev-libs/tree-sitter/metadata.xml 
b/dev-libs/tree-sitter/metadata.xml
new file mode 100644
index 000..dcfdb27e8a9
--- /dev/null
+++ b/dev-libs/tree-sitter/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   abdelqader...@protonmail.com
+   Ali Abdel-Qader
+   
+   
+   sar...@gentoo.org
+   Nick Sarnie
+   
+   
+   tree-sitter/tree-sitter
+   
+   
+   Tree-sitter is a parser generator tool and an incremental 
parsing library. It can build a concrete syntax tree for a source file and 
efficiently update the syntax tree as the source file is edited. 
+   
+

diff --git a/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild 
b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
new file mode 100644
index 000..b50d6429cd9
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.17.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing 
library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter";
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}";
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" 
LIBDIR="${EPREFIX}/usr/lib64" install
+}

diff --git a/dev-libs/tree-sitter/tree-sitter-.ebuild 
b/dev-libs/tree-sitter/tree-sitter-.ebuild
new file mode 100644
index 000..b50d6429cd9
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing 
library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter";
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}";
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATC

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

2020-11-21 Thread Andreas Sturmlechner
commit: 5030a027981dffc84b766bb93a76da25865856c5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 19:37:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:17:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5030a027

app-office/libreoffice: Fix build with ICU-68

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index b6573bba320..7d33a2c844c 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -286,14 +286,15 @@ else
 fi
 
 PATCHES=(
-   # backport from 7.0 branch
-   "${FILESDIR}/${PN}-7.0.3.1-fix-disable-pdfium-build.patch"
-
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+   # 7.0 branch
+   "${FILESDIR}/${P}-fix-disable-pdfium-build.patch"
+   "${FILESDIR}/${PN}-6.4.7.2-icu-68-1.patch" # bug 752021
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"



[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-11-21 Thread Andreas Sturmlechner
commit: 8f9ec592358a2d12a03a4e48fd91047dcd009e1f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 21 19:39:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 21 22:17:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9ec592

app-office/libreoffice: Fix Qt5 moc path detect, drop QT_SELECT

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libreoffice-7.0.3.1-qt5detect.patch  | 23 ++
 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  |  7 ++-
 app-office/libreoffice/libreoffice-7.0..ebuild |  7 ++-
 app-office/libreoffice/libreoffice-.ebuild |  7 ++-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
new file mode 100644
index 000..cc4e8e41df2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.3.1-qt5detect.patch
@@ -0,0 +1,23 @@
+Don't let PATH get in the way of proper Qt5 detection.
+It could lead to broken configure due to mismanaged qtchooser config.
+
+--- a/configure.ac 2020-11-21 16:35:58.433794709 +0100
 b/configure.ac 2020-11-21 18:02:41.835207197 +0100
+@@ -11819,7 +11819,7 @@
+ qt5_test_library="libQt5Widgets.so"
+ 
+ dnl Check for qmake5
+-AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH])
++AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin])
+ if test "$QMAKE5" = "no"; then
+ AC_MSG_ERROR([Qmake not found.  Please specify the root of your Qt5 
installation by exporting QT5DIR before running "configure".])
+ else
+@@ -11886,7 +11886,7 @@
+ 
+ dnl Check for Meta Object Compiler
+ 
+-AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname 
$qt5_libdir`/bin:$QT5DIR/bin:$PATH])
++AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
+ if test "$MOC5" = "no"; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QT5DIR before running 
"configure".])

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 7d33a2c844c..695c9c5f0f6 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -291,6 +291,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+   "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 
# 7.0 branch
"${FILESDIR}/${P}-fix-disable-pdfium-build.patch"
@@ -441,11 +442,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
 
-   if use kde; then
-   export QT_SELECT=5 # bug 639620 needs proper fix though
-   export QT5DIR="$(qt5_get_bindir)/../"
-   export MOC5="$(qt5_get_bindir)/moc"
-   fi
+   use kde && export QT5DIR="$(qt5_get_bindir)/.."
 
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
index 5040a3e0391..b10bdb491e5 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -291,6 +291,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+   "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -437,11 +438,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
 
-   if use kde; then
-   export QT_SELECT=5 # bug 639620 needs proper fix though
-   export QT5DIR="$(qt5_get_bindir)/../"
-   export MOC5="$(qt5_get_bindir)/moc"
-   fi
+   use kde && export QT5DIR="$(qt5_get_bindir)/.."
 
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index 1b78e99f05f..0bc93233961 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -291,6 +291,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+   "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -437,11 +438,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
 
-   if use kde; then
-

[gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/

2020-11-21 Thread Marek Szuba
commit: d4f8116af440c6c90e9acb73f46d2bec1fe9fa86
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 21:38:24 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 22:05:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f8116a

app-backup/borgmatic: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 app-backup/borgmatic/Manifest   |  1 -
 app-backup/borgmatic/borgmatic-1.5.9.ebuild | 71 -
 2 files changed, 72 deletions(-)

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 4f5713fb265..e4c21c5e949 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,2 +1 @@
 DIST borgmatic-1.5.10.tar.gz 71743 BLAKE2B 
b2b5f9135a15730ca7eaa7f621f82207f1dcf383c3be7459eb39dbffc85a310184a4ddce3fb0bd47aa213cb588eb3f3e2f73418659330a421b7da5b87698
 SHA512 
52436535810ce42f5ab30ae8a4705005e8c7a5d91d52520aab4160320215196cdc088dfae1a21a0d65d0161fb2bb3c9b984cfe2cb5204f7b9bd0ed27c3a38c5b
-DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B 
c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa
 SHA512 
a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a

diff --git a/app-backup/borgmatic/borgmatic-1.5.9.ebuild 
b/app-backup/borgmatic/borgmatic-1.5.9.ebuild
deleted file mode 100644
index e1682b5e20d..000
--- a/app-backup/borgmatic/borgmatic-1.5.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-   $(python_gen_cond_dep '
-   dev-python/colorama[${PYTHON_USEDEP}]
-   >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: app-backup/borgmatic/

2020-11-21 Thread Marek Szuba
commit: 753f5081372d7d31b23a58a56ce5f36b311cb255
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 21:53:06 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 22:05:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753f5081

app-backup/borgmatic: bump to 1.5.11

Signed-off-by: Marek Szuba  gentoo.org>

 app-backup/borgmatic/Manifest|  1 +
 app-backup/borgmatic/borgmatic-1.5.11.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index e4c21c5e949..1760b0e2d71 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1 +1,2 @@
 DIST borgmatic-1.5.10.tar.gz 71743 BLAKE2B 
b2b5f9135a15730ca7eaa7f621f82207f1dcf383c3be7459eb39dbffc85a310184a4ddce3fb0bd47aa213cb588eb3f3e2f73418659330a421b7da5b87698
 SHA512 
52436535810ce42f5ab30ae8a4705005e8c7a5d91d52520aab4160320215196cdc088dfae1a21a0d65d0161fb2bb3c9b984cfe2cb5204f7b9bd0ed27c3a38c5b
+DIST borgmatic-1.5.11.tar.gz 72985 BLAKE2B 
fac7e403a4338fc46955d3b82e12e0fc983a11edbb51dc74dcfb6c28818a655b50f7445b28033a966e7e27e2998b062967df97a51f4c362f0d7eac83a19386de
 SHA512 
a945d19bf2fbd617e7de5827d75c8a69f5902c6dfa5d33344b61e680e97636c4a5337d759a372a70b6d2c792a1e7fbc168eedef5e1ae64cac702d313329bca9e

diff --git a/app-backup/borgmatic/borgmatic-1.5.11.ebuild 
b/app-backup/borgmatic/borgmatic-1.5.11.ebuild
new file mode 100644
index 000..7ded25f08aa
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
+RESTRICT="test"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+   $(python_gen_cond_dep '
+   dev-python/colorama[${PYTHON_USEDEP}]
+   >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyqtgraph/

2020-11-21 Thread Marek Szuba
commit: 4c93cad59ded1be11f00850464d90b9a0faa1292
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 22:00:46 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 22:05:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c93cad5

dev-python/pyqtgraph: support python3_9

Changed with permission from mgorny on behalf of the Python project.

Closes: https://bugs.gentoo.org/754024
Signed-off-by: Marek Szuba  gentoo.org>

 dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild 
b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
index d6e54830b5a..c6a713fe7b5 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/zsync/

2020-11-21 Thread Sergei Trofimovich
commit: 20114d761cc2d7bc491a7b6e787981c1e083611c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov 21 22:01:31 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 21 22:01:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20114d76

net-misc/zsync: stable 0.6.2-r1 for ppc/ppc64

stable wrt bug #755275 (STABLEREQ)
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-misc/zsync/zsync-0.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild 
b/net-misc/zsync/zsync-0.6.2-r1.ebuild
index ca66b738bda..45f3f2729a6 100644
--- a/net-misc/zsync/zsync-0.6.2-r1.ebuild
+++ b/net-misc/zsync/zsync-0.6.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 ZLIB_S="${WORKDIR}/${ZLIB_P}"



[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/

2020-11-21 Thread Sergei Trofimovich
commit: c97552cb6715eb40ebe5b787924d49d2d265e7db
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov 21 21:59:33 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 21 21:59:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97552cb

games-strategy/freeciv: keyworded 2.6.2 for ppc64

keyworded wrt bug #748573 (KEYWORDREQ)
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-strategy/freeciv/freeciv-2.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild 
b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index 2b5d791692c..1b61b770630 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.freeciv.org/";
 
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2+"



[gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-gfx/

2020-11-21 Thread Sergei Trofimovich
commit: 96bc3bb75850ed55c1a2bfd88637268b9fbc6c2d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov 21 21:59:28 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 21 21:59:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96bc3bb7

media-libs/sdl2-gfx: keyworded 1.0.4 for ppc64

keyworded wrt bug #748573 (KEYWORDREQ)
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild 
b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
index b4e1c4ee1c0..860562eafdb 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.ferzkopp.net/Software/SDL2_gfx/${MY_P}.tar.gz";
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 DEPEND=">=media-libs/libsdl2-2.0.1-r1[video,${MULTILIB_USEDEP}]"



[gentoo-commits] repo/gentoo:master commit in: app-vim/vimoutliner/

2020-11-21 Thread Sergei Trofimovich
commit: f3a8bcaf61121bcb02ced8ec47621427d7f38056
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov 21 21:56:08 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 21 21:56:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a8bcaf

app-vim/vimoutliner: drop ~mips keywords

Bug: https://bugs.gentoo.org/717372
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild 
b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
index 19119a8ef09..b5f625af1cf 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner";
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ~mips ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="vimoutliner"
 VIM_PLUGIN_MESSAGES="filetype"



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyproject2setuppy/

2020-11-21 Thread Michał Górny
commit: 324da1a8e2de50dad547cdae0e13e9a801129513
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 21:49:31 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 21:51:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324da1a8

dev-python/pyproject2setuppy: Bump to v9

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyproject2setuppy/Manifest  |  1 +
 .../pyproject2setuppy/pyproject2setuppy-9.ebuild   | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/dev-python/pyproject2setuppy/Manifest 
b/dev-python/pyproject2setuppy/Manifest
index 5365acb67ad..995ccc31f86 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1 +1,2 @@
 DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B 
d0c168efa2742732710a7d967ce0783a942d4718ae2be75e6263bb560500527ee11260c9b7362d10cb059171475dc647c0bc97e284554f2e159f470e3eb7f569
 SHA512 
527e2de790fb02373150db834d1a007a63b71f87ae01fef1dd9fc86a51ac6cafeac28fa3f39a2d484e7a9f84549d0ba285894cf9201f3b2b2a47965be29913cc
+DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 
448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4
 SHA512 
bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93

diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild 
b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
new file mode 100644
index 000..516b3db0af3
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy";
+SRC_URI="
+   https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-python/immutables/

2020-11-21 Thread Michał Górny
commit: 89cf7b972dace744e5e4922027dfc38cb59d8983
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 21:12:51 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 21:51:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cf7b97

dev-python/immutables: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/immutables/Manifest   |  1 -
 dev-python/immutables/immutables-0.11.ebuild | 17 -
 2 files changed, 18 deletions(-)

diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 8f183842188..58d1be51347 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,2 +1 @@
-DIST immutables-0.11.tar.gz 76589 BLAKE2B 
64d7ac89dfe680d1fe78704c165a1fbb15559203980f1a8edd65fbd74589bf2038c799037189849a917555a67483e0cb352664b1d44f3ce161db6c88b878ae5a
 SHA512 
fceb1feb5fd8de681cb89c6692206042d0f8f404d78848c379ca3afbb07425e2ba875f7b7cdb42bf126ea0b9f682c0b873c4867c5266cc77da28d29f6ab5
 DIST immutables-0.14.tar.gz 79451 BLAKE2B 
b18b554536a92b6f23e4c8366161cd43c2bd75d81fc619bfc9760b265835c7fc729c797758f195bd50f81573c4c52d48449deabf19167321eabbbfdfd8961217
 SHA512 
244a1faab70d46333749abcc2a98f65802c656eb58b23353893a8d894aff4089ccf9ed43170aa0094d8ec2d59a0dc7014d8bf12ad1a044fc066b43ae968968ea

diff --git a/dev-python/immutables/immutables-0.11.ebuild 
b/dev-python/immutables/immutables-0.11.ebuild
deleted file mode 100644
index d2ef63b48f1..000
--- a/dev-python/immutables/immutables-0.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables";
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-db/pspg/

2020-11-21 Thread Aaron W. Swenson
commit: fc6dc17bec5279665c7f9c85bea6d9929f22eda1
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Nov 21 21:47:35 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sat Nov 21 21:49:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6dc17b

dev-db/pspg: Bump to 3.1.5

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pspg/pspg-3.1.5.ebuild | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/dev-db/pspg/pspg-3.1.5.ebuild b/dev-db/pspg/pspg-3.1.5.ebuild
new file mode 100644
index 000..4ea4a57c2c3
--- /dev/null
+++ b/dev-db/pspg/pspg-3.1.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/pspg";
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:*
+dev-db/postgresql:=
+sys-libs/readline:="
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-libs/glm/

2020-11-21 Thread Sergei Trofimovich
commit: 2be6d912c04587bf68ee612209f0ac36d475ff1f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov 21 21:47:57 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov 21 21:48:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be6d912

media-libs/glm: keyworded 0.9.9.8-r1 for ppc

keyworded wrt bug #670500 (KEYWORDREQ)
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/glm/glm-0.9.9.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild 
b/media-libs/glm/glm-0.9.9.8-r1.ebuild
index 23b762f4160..74788d45b6b 100644
--- a/media-libs/glm/glm-0.9.9.8-r1.ebuild
+++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx 
cpu_flags_x86_avx2"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/pspg/

2020-11-21 Thread Aaron W. Swenson
commit: 78f6b4003f4fd1022762c0f2e653960c9bba4b0e
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Sat Nov 21 21:43:33 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Sat Nov 21 21:43:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f6b400

dev-db/pspg: Cleanup

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pspg/Manifest  |  6 +-
 dev-db/pspg/pspg-1.6.5.ebuild | 15 ---
 dev-db/pspg/pspg-1.6.8.ebuild | 15 ---
 dev-db/pspg/pspg-2.5.4.ebuild | 17 -
 dev-db/pspg/pspg-2.5.5.ebuild | 17 -
 dev-db/pspg/pspg-2.6.6.ebuild | 17 -
 6 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 7a831a5f109..a12a114f52e 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,6 +1,2 @@
-DIST pspg-1.6.5.tar.gz 1005525 BLAKE2B 
2befb8a7081e1fcf5df60eca48f34b819d9de3d07920613b7f759887b4ddcccbc52e46ea8f407666a50a53bbfda582a10b1b2ca65d0c4452bc46db8cd971a802
 SHA512 
755e40dd6c68a01ad235e6fc2751af76c8ed63c2832bfa26356fa80e62bd59a076413cf7fc075685f9267bc7339fadf4975a695d681fc7821b7da0589805c1f0
-DIST pspg-1.6.8.tar.gz 1017316 BLAKE2B 
0150b4577365000b2fdd9de93307acbb5133915917c92affd1a598b3f16769ff0afa6e0b9c0d4639b771dcd62f1f7364a028a3b9d96cc6c40e3ac41c550a8d48
 SHA512 
337ae1eb9e92dc97ca32127322aaa3d0c5edb8766e5cab16e778148b3256119c7c5b1b2e4b6ab0b520113ede07c464d1c1c5e460c8efb7714f5a29acfa845e9d
-DIST pspg-2.5.4.tar.gz 1346559 BLAKE2B 
01c0a35a6372ccb7ad007595d01eb0c8380428722418a4f4b6040a549757d2eab601371ded51a762d81677adc259abf5f8af4311fca6427fb24244e0c33035d2
 SHA512 
2a9c677bbff4eb032403b90f44dbe9f62a46775c1cf180e90fc3df2853973c4b584b674fa11e2b3be844402f5c00777388ff05782fdecee3b27d92280fc288ff
-DIST pspg-2.5.5.tar.gz 1346896 BLAKE2B 
7b5b64affcc6ec52ae9712fab06089db3a8ae208d94190fa6695d2285d29a13ac2c5ca3854a1a13ec6907eed04dd6bb188b31cc6440963a069a2715ecf109eba
 SHA512 
74e8c8c5a156d9115a2bc6c9957d302b5e48182181c9560100c09dea765f9a382d78b5fe74ca11fdccd40bdd2f8a165218edf89ffd7713e479f0443a49766c4d
-DIST pspg-2.6.6.tar.gz 1355951 BLAKE2B 
134f6af029f070bac66e9f514fee985b7ce77f788b44280cc4df969801d2776a60aa9dd679ae848c4fe68ce58d593c10fd1e2305734d0f76e08f1d2e51ad17bd
 SHA512 
963a4bb3e93880c5dd8538b2ba777977585b2e9766a29001f1e5dd8d4692ccc333cf8bdcf0d7ae3f0cf02568e5645d4534cc58dc540d22df5debc5b4e034114c
 DIST pspg-3.1.2.tar.gz 1368987 BLAKE2B 
7eff4134ee97db4df4dfada08ede5e88ea0c37a681c95ba9529f30be98f05cb3a7805e5dcb165b34f5afc2d4d7ca6de0e705334967ade0fdb813636c73df658d
 SHA512 
1446200bdfe88787083da32629acaedab6eaee68b3dccbff3f52c82165029cb0f558790951d5103876c84562fcd6b5578042bca134f4ed37b9c5de96fdc5602f
+DIST pspg-3.1.5.tar.gz 1380515 BLAKE2B 
b9539347d1977a178468127df5f92f8b7be835b7e6edc49720131173b71b22e01b614bcde55e354d32a2ecf1665dcebd27502110786b7595411b5ec782391f01
 SHA512 
287d4794aebc867bf3c344c3747f1d058c1b93710dd0d86de66ae1e0d97961f4e3d511bc0f7df98c309bffc962aaf50b758faab1f8c6f0eb3374450e53ecdccb

diff --git a/dev-db/pspg/pspg-1.6.5.ebuild b/dev-db/pspg/pspg-1.6.5.ebuild
deleted file mode 100644
index 15ddb24f19d..000
--- a/dev-db/pspg/pspg-1.6.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg";
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"

diff --git a/dev-db/pspg/pspg-1.6.8.ebuild b/dev-db/pspg/pspg-1.6.8.ebuild
deleted file mode 100644
index fd99e424e3b..000
--- a/dev-db/pspg/pspg-1.6.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg";
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:*"
-RDEPEND="${DEPEND}"

diff --git a/dev-db/pspg/pspg-2.5.4.ebuild b/dev-db/pspg/pspg-2.5.4.ebuild
deleted file mode 100644
index e802ac47a29..000
--- a/dev-db/pspg/pspg-2.5.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/pspg";
-SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:*
-dev-db/postgresql:=
-sys-libs/readline:*"
-RDEPEND="${DEPEND}"

diff --git a/dev-db/pspg/pspg-2.5.5.ebuild b/dev-db/pspg/pspg-2.5.5.ebuild
deleted file mode 100644
index e802ac47a29..000
--

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/, net-libs/nodejs/

2020-11-21 Thread Marek Szuba
commit: 5d8c279936a29f2455ed9aa85ba735b77530cf7b
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 21:32:24 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 21:36:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8c2799

net-libs/nodejs: bump to 15.2.0

No PaX support yet, will be added separately.

Signed-off-by: Marek Szuba  gentoo.org>

 net-libs/nodejs/Manifest   |   1 +
 .../files/nodejs-15.2.0-global-npm-config.patch|  13 ++
 net-libs/nodejs/nodejs-15.2.1.ebuild   | 196 +
 3 files changed, 210 insertions(+)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index b981c6dec8b..87cfe291987 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,3 +1,4 @@
 DIST node-v12.19.1.tar.xz 23829692 BLAKE2B 
244ca8ef29e315ce027638d9d5c66469ac8cd69abec47d5bf6370b990da0d9d2a7af812963530e5187d273d3f20638be0d23ccb1c0409fbbd678677740939f4f
 SHA512 
7c628ca214d3b17b34658aae32e335ce863d90853c92f1cd4119e9a82b7097ddf47d0d4cc7c9bbdbfdd4b403811aa6ee08e844078a947f31a3adc78f569b931a
 DIST node-v14.15.0.tar.xz 33440584 BLAKE2B 
dda9fb44f163b2268db126dfcda34e80064eba24921e4f8e6c14c212deb9170c79f31f7b2be272c8fa7ca992d14540df490c6cad078833514bd348825934ad95
 SHA512 
2a0cd1b9d95e0ac228a90aca82cb04b9f4fc4d08ab86f0286eed7a519ca6e756081b37375ad5d14d7f0e09affdd27bad658c3e364237eb3c212fe5b5e27af96e
 DIST node-v14.15.1.tar.xz 33437304 BLAKE2B 
f08251d2a76e4030433001fd7f062c71193de190036d1147ade0ea36350df0d65df9e1b749fbac77837dd090cbeda6c133ff88099691c932bc29e75b7bfa2acc
 SHA512 
cbab757e370a09b73c29a9bcb310b4122e4424d6baeaeaf1b10919ed6b348bc6ddbfc0e0eaff99d8ebb4d3d74f0206f575e2656245151eda564dd2cd33ff823a
+DIST node-v15.2.1.tar.xz 33172472 BLAKE2B 
d63dbc138ec161253f996fb61c9f40db2eabb5a598804eca7f2446b654ae8a11164820d46ea3c2b41b6a891bb0a3f15fe67712988ed67c1344ab72e2e4749fac
 SHA512 
b05663131d6bb458fe49cf610a7296cdd169b6e957df3e5117ad5553de9891ed4cb71c7d3dc0dbb7774153c884cf245f49faecfa308736086fe6f041f83c8a57

diff --git a/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch 
b/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch
new file mode 100644
index 000..2b0705b1d71
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-15.2.0-global-npm-config.patch
@@ -0,0 +1,13 @@
+--- a/deps/npm/node_modules/@npmcli/config/lib/index.js
 b/deps/npm/node_modules/@npmcli/config/lib/index.js
+@@ -275,8 +275,9 @@
+ // default the globalconfig file to that location, instead of the default
+ // global prefix.  It's weird that `npm get globalconfig --prefix=/foo`
+ // returns `/foo/etc/npmrc`, but better to not change it at this point.
++// gentoo deviates wrt global config; store in /etc/npm
+ settableGetter(data, 'globalconfig', () =>
+-  resolve(this[_get]('prefix'), 'etc/npmrc'))
++  resolve('/etc', 'npmrc'))
+   }
+ 
+   loadHome () {

diff --git a/net-libs/nodejs/nodejs-15.2.1.ebuild 
b/net-libs/nodejs/nodejs-15.2.1.ebuild
new file mode 100644
index 000..a69a9626746
--- /dev/null
+++ b/net-libs/nodejs/nodejs-15.2.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/";
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz";
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl 
system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+   npm? ( ssl )
+   system-icu? ( icu )
+   system-ssl? ( ssl )"
+
+# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+   >=dev-libs/libuv-1.40.0:=
+   >=net-dns/c-ares-1.17.0
+   >=net-libs/nghttp2-1.41.0
+   sys-libs/zlib
+   system-icu? ( >=dev-libs/icu-67:= )
+   system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+   sys-apps/coreutils
+   systemtap? ( dev-util/systemtap )
+   test? ( net-misc/curl )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+)
+
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+   (use x86 && ! use cpu_flags_x86_sse2) && \
+   die "Your CPU doesn't support the required SSE2 instruction."
+}
+
+src_prepare() {
+   tc-export AR CC CXX PKG_CONFIG
+   export V=1
+   export BUILDTYPE=Release
+
+   # fix compilation on Darwin
+   # https://code.google.com/p/gyp/issues/detail?id=260
+   sed -i -e "/append('-arch/d" tools/gyp/pylib/gy

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

2020-11-21 Thread Marek Szuba
commit: 5d0894c50fc14b9ec5d1180c5bdfb8df89909885
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 21:36:00 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 21:36:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0894c5

net-libs/nodejs: add metadata note about assignment of PaX-related bugs

Signed-off-by: Marek Szuba  gentoo.org>

 net-libs/nodejs/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index f7299ab330d..db1b9aefa8e 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -8,8 +8,8 @@

mare...@gentoo.org
Marek Szuba
+   Do not Cc on bugs related to 
grsecurity/PaX

-   

Enable V8 inspector
Enable NPM package manager



[gentoo-commits] repo/gentoo:master commit in: sci-libs/mpfi/

2020-11-21 Thread David Seifert
commit: 5141be0b130e6706bee2869feaa8d7ee1c7cd3cf
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 21 21:21:08 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:21:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5141be0b

sci-libs/mpfi: bump to 1.5.4

Closes: https://bugs.gentoo.org/742560
Closes: https://github.com/gentoo/gentoo/pull/18327
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/mpfi/Manifest  |  1 +
 sci-libs/mpfi/mpfi-1.5.4.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index e8c03ff1f9a..6e2dfd16d37 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1 +1,2 @@
 DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 
67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c
 SHA512 
9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d
+DIST mpfi-1.5.4.tgz 261696 BLAKE2B 
264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d
 SHA512 
72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1

diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
new file mode 100644
index 000..7c513767c67
--- /dev/null
+++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Multiple precision interval arithmetic library based on MPFR"
+HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html";
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+   dev-libs/gmp:0=
+   dev-libs/mpfr:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf --disable-static
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/mopac7/files/

2020-11-21 Thread David Seifert
commit: c686715a25d808342ad192a74566ea58f0b73d3a
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 21 21:21:14 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:21:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c686715a

sci-chemistry/mopac7: update Makefile

Static libs support was dropped in
6462d72580431c13b96063e7a6935e4f89b281f4. Update the Makefile to reflect
changes. 'ar' is not being called anymore.

Closes: https://bugs.gentoo.org/724400
Closes: https://github.com/gentoo/gentoo/pull/18319
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-chemistry/mopac7/files/Makefile | 5 -
 1 file changed, 5 deletions(-)

diff --git a/sci-chemistry/mopac7/files/Makefile 
b/sci-chemistry/mopac7/files/Makefile
index 50370b3c278..bcada8b0a88 100644
--- a/sci-chemistry/mopac7/files/Makefile
+++ b/sci-chemistry/mopac7/files/Makefile
@@ -16,8 +16,3 @@ clean:
 libgmxmopac7: $(objects)
$(FC) -shared $(LDFLAGS) -Wl,-soname,libgmxmopac7.so.$(MAJOR) -o 
$@.so.$(VERSION) $^ $(LIBS)
ln -sf $@.so.$(VERSION) libgmxmopac7.so
-
-static: $(objects)
-   ar rcv libgmxmopac7.a *.o
-   ranlib libgmxmopac7.a
-



[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/procheck/

2020-11-21 Thread David Seifert
commit: 1e12ed2024d17b9dfae07efdcc1b179445d31650
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sat Nov 21 21:21:11 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:21:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e12ed20

sci-chemistry/procheck: update HOMEPAGE

Closes: https://bugs.gentoo.org/680404
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-chemistry/procheck/procheck-3.5.4-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild 
b/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
index cc536d671b8..1a700ee4110 100644
--- a/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
+++ b/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit fortran-2 multilib toolchain-funcs versionator
 
 DESCRIPTION="Checks the stereochemical quality of a protein structure"
-HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html";
+HOMEPAGE="https://www.ebi.ac.uk/thornton-srv/software/PROCHECK";
 SRC_URI="
${P}.tar.gz ${P}-README
doc? ( ${P}-manual.tar.gz )"
@@ -24,7 +24,7 @@ RESTRICT="fetch"
 S="${WORKDIR}/${PN}"
 
 pkg_nofetch() {
-   elog "Please visit 
http://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html";
+   elog "Please visit 
https://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html";
elog "and follow the instruction for downloading."
elog "Files should be renamed in the following way before being copied 
to your"
elog "DISTDIR directory:"



[gentoo-commits] repo/gentoo:master commit in: games-action/0verkill/, games-action/0verkill/files/

2020-11-21 Thread David Seifert
commit: 35ac0c893a3c15c90100033ed7962f63640b7fb7
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 21:01:48 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 21:01:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ac0c89

games-action/0verkill: Port to EAPI 7

Closes: https://bugs.gentoo.org/708718
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-action/0verkill/0verkill-0.16-r4.ebuild  | 17 +++--
 .../0verkill/files/0verkill-0.16-fno-common.patch  | 87 ++
 2 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild 
b/games-action/0verkill/0verkill-0.16-r4.ebuild
index e1b5419bf8c..39ebed3ca4c 100644
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -18,13 +18,14 @@ DEPEND="X? ( x11-libs/libXpm )"
 RDEPEND=${DEPEND}
 
 PATCHES=(
-   "${FILESDIR}"/${P}-docs.patch
-   "${FILESDIR}"/${P}-home-overflow.patch
-   "${FILESDIR}"/${P}-segv.patch
-   "${FILESDIR}"/${P}-gentoo-paths.patch
-   "${FILESDIR}"/${P}-ovflfix.patch
-   "${FILESDIR}"/${P}-CC.patch
-   "${FILESDIR}"/${P}-underflow-check.patch #136222
+   "${FILESDIR}"/${P}-docs.patch
+   "${FILESDIR}"/${P}-home-overflow.patch
+   "${FILESDIR}"/${P}-segv.patch
+   "${FILESDIR}"/${P}-gentoo-paths.patch
+   "${FILESDIR}"/${P}-ovflfix.patch
+   "${FILESDIR}"/${P}-CC.patch
+   "${FILESDIR}"/${P}-underflow-check.patch #136222
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {

diff --git a/games-action/0verkill/files/0verkill-0.16-fno-common.patch 
b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
new file mode 100644
index 000..bf03ff424e2
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-fno-common.patch
@@ -0,0 +1,87 @@
+--- a/bot.c
 b/bot.c
+@@ -104,7 +104,7 @@
+ 
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+ 
+ unsigned long_long game_start_offset; /* time difference between game start 
on this machine and on server */
+--- a/client.c
 b/client.c
+@@ -97,7 +97,7 @@
+ 
+ /* objects */
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ struct it* hero;
+ 
+ /* important sprites */
+--- a/data.c
 b/data.c
+@@ -13,6 +13,9 @@
+ #include "md5.h"
+ #include "error.h"
+ 
++unsigned char *weapon_name[ARMS];
++struct obj_attr_type obj_attr[N_TYPES];
++struct weapon_type weapon[ARMS];
+ 
+ #ifdef TRI_D
+ int tri_d=0;
+--- a/data.h
 b/data.h
+@@ -62,7 +62,7 @@
+ 
+ #define ARMS 5
+ 
+-unsigned char *weapon_name[ARMS];
++extern unsigned char *weapon_name[ARMS];
+ 
+ /* STATUS
+ 0: walk
+@@ -91,7 +91,8 @@
+ bit 1=server updates
+ bit 2=server sends updates to clients
+ */
+-}obj_attr[N_TYPES];
++};
++extern struct obj_attr_type obj_attr[N_TYPES];
+ 
+ 
+ /* weapon attribut table */
+@@ -107,7 +108,8 @@
+   unsigned char add_ammo;
+   unsigned char max_ammo;
+   my_double shell_xspeed,shell_yspeed;
+-}weapon[ARMS];
++};
++extern struct weapon_type weapon[ARMS];
+ 
+ 
+ /* object in the game */
+--- a/editor.c
 b/editor.c
+@@ -26,7 +26,7 @@
+ int oldx=0,oldy=0;  /* old cursor position */
+ 
+ struct object_list objects;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ int level_number;
+ 
+ 
+--- a/server.c
 b/server.c
+@@ -100,7 +100,7 @@
+ struct object_list objects;
+ 
+ struct player_list *last_player;
+-struct object_list *last_obj;
++extern struct object_list *last_obj;
+ 
+ 
+ #ifdef WIN32



[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

2020-11-21 Thread Andreas K. Hüttel
commit: f7c12bfa5c0ec0e2df860f498790b128de1accd2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Nov 21 20:59:49 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Nov 21 21:00:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c12bfa

app-office/libreoffice: Backport disable-pdfium fix from 7.0 branch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 ...reoffice-7.0.3.1-fix-disable-pdfium-build.patch | 82 ++
 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  |  3 +
 2 files changed, 85 insertions(+)

diff --git 
a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
new file mode 100644
index 000..346699d5527
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
@@ -0,0 +1,82 @@
+From b9e5d5347e5dece693fe56b88570abc07a30a8ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Thu, 29 Oct 2020 15:45:01 +
+Subject: [PATCH] fix --disable-pdfium build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105015
+Tested-by: Jenkins
+Tested-by: René Engelhard 
+Reviewed-by: René Engelhard 
+Reviewed-by: Noel Grandin 
+---
+ vcl/source/filter/ipdf/pdfread.cxx   |  2 +-
+ xmlsecurity/source/pdfio/pdfdocument.cxx | 11 +++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
+index 3066c4deba4a..bf11578089e0 100644
+--- a/vcl/source/filter/ipdf/pdfread.cxx
 b/vcl/source/filter/ipdf/pdfread.cxx
+@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector& rBi
+ (void)rBitmaps;
+ (void)nFirstPage;
+ (void)nPages;
+-(void)fResolutionDPI;
++(void)pSizeHint;
+ return 0;
+ #endif // HAVE_FEATURE_PDFIUM
+ }
+diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
+index c132d02cc2b0..b229206391f2 100644
+--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
 b/xmlsecurity/source/pdfio/pdfdocument.cxx
+@@ -138,10 +138,10 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
+ return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != 
rAllEOFs.end();
+ }
+ 
++#if HAVE_FEATURE_PDFIUM
+ /// Collects the checksum of each page of one version of the PDF.
+ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector& rPageChecksums)
+ {
+-#if HAVE_FEATURE_PDFIUM
+ auto pPdfium = vcl::pdf::PDFiumLibrary::get();
+ vcl::pdf::PDFiumDocument aPdfDocument(
+ FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), 
/*password=*/nullptr));
+@@ -158,10 +158,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vectorgetChecksum();
+ rPageChecksums.push_back(nPageChecksum);
+ }
+-#else
+-(void)rStream;
+-#endif
+ }
++#endif
+ 
+ /**
+  * Checks if incremental updates after singing performed valid modifications 
only.
+@@ -175,6 +173,7 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
+ return false;
+ }
+ 
++#if HAVE_FEATURE_PDFIUM
+ SvMemoryStream aSignatureStream;
+ sal_uInt64 nPos = rStream.Tell();
+ rStream.Seek(0);
+@@ -196,6 +195,10 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
+ // Fail if any page looks different after signing and at the end. 
Annotations/commenting doesn't
+ // count, though.
+ return aSignedPages == aAllPages;
++#else
++(void)rStream;
++return true;
++#endif
+ }
+ }
+ 
+-- 
+2.26.2
+

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 75e3660ccfa..b6573bba320 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -286,6 +286,9 @@ else
 fi
 
 PATCHES=(
+   # backport from 7.0 branch
+   "${FILESDIR}/${PN}-7.0.3.1-fix-disable-pdfium-build.patch"
+
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
# not upstreamable stuff



[gentoo-commits] repo/gentoo:master commit in: dev-python/tqdm/

2020-11-21 Thread Michał Górny
commit: c1f7a41ccdf7f50cebeb9b5a30981dfeb301e800
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 19:20:39 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 20:54:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f7a41c

dev-python/tqdm: Bump to 4.53.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/tqdm/Manifest   |  1 +
 dev-python/tqdm/tqdm-4.53.0.ebuild | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index bc2eddeb5c1..4dd88524253 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,3 +1,4 @@
 DIST tqdm-4.49.0.tar.gz 151935 BLAKE2B 
790e2912a402795af9aba2e4db80cf41a7cb08267dad5946d89b4d9fb8b8c7a1dd65f33dcaf315bbe82862c0c2934b2dd2b8cee894c592d5a61ac61dd8c5126f
 SHA512 
44197eb09b90551eb66c8b2e0dc97f6864fc91654465e7d478ece6ecd610242d8e378c6814f9d3e1cf05b2db1aa533743535051ad456ec5ef6d477be906ee217
 DIST tqdm-4.51.0.tar.gz 152976 BLAKE2B 
f9cef9de6a77c21e40394edd006fbd8fa913af4d3a9a8ac68bd9fde81b1eebc404f6fab90d9aadc57ce2ccfbc3a2f8d8879b151f6283dc34edc25d70f69ae6e1
 SHA512 
04bb2a173b9b79b76844fedbc14572fa955232d1dcb6ac55b7265c4cc7a4f712f2c2965ac3bcb9e10ea1bd041593230b047365816bf508d457d873a2d4830d3f
 DIST tqdm-4.52.0.tar.gz 180391 BLAKE2B 
f0dc1e991088deeb0160f227263c105dc0b2dd90be9be74eb0eecfc1195a6b831150d195ca6cfddeaef6deeef1b8c82df3240158792dfe9a238eb0c52730b570
 SHA512 
fe2161ac61528a4d3bf697dc6369fb06e2c0defb2275165a701a28b80bba98380ea156458b87a5c9c49d3fc6da56f05a54fbae935cf2a17d82eb5adaf79902f0
+DIST tqdm-4.53.0.tar.gz 179940 BLAKE2B 
022fd8eae70a38306d201981bd6c2e469791abc86e3e10bf2bcbe4936e4e6791dc24b3e064c6adb830fd908a1544389fdba8f7017bee17632925c1bcc3d42349
 SHA512 
ffb06058a71e31497ced0b6b5ce8671a7e958968e0a08e1b68dc9f3a9acac415c1708f6669d369ab484bbc07a8fc06716ed32fde70f22c0dbd8242417f95a713

diff --git a/dev-python/tqdm/tqdm-4.53.0.ebuild 
b/dev-python/tqdm/tqdm-4.53.0.ebuild
new file mode 100644
index 000..86b23f03a50
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.53.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/tqdm/tqdm";
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm";
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests pytest
+
+python_test() {
+   # Skip unpredictable performance tests
+   pytest -vv --ignore 'tests/tests_perf.py' ||
+   die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+   doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+   rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+   distutils-r1_python_install
+}
+
+python_install_all() {
+   if use examples; then
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+   distutils-r1_python_install_all
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/pyquery/

2020-11-21 Thread Michał Górny
commit: fe05ace8277a5c0e97dcf1e0ba972461018c22d5
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 19:18:38 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 20:54:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe05ace8

dev-python/pyquery: Bump to 1.4.3

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyquery/Manifest |  1 +
 dev-python/pyquery/pyquery-1.4.3.ebuild | 45 +
 2 files changed, 46 insertions(+)

diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index b4cd5f54f22..4f3ec79b219 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1 +1,2 @@
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B 
eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065
 SHA512 
e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
+DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 
32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda
 SHA512 
cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba

diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild 
b/dev-python/pyquery/pyquery-1.4.3.ebuild
new file mode 100644
index 000..cbc62b48fde
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="https://github.com/gawel/pyquery";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+   >=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+   >dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
+   >=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
+DEPEND="
+   test? ( ${RDEPEND}
+   dev-python/beautifulsoup[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/webtest[${PYTHON_USEDEP}]
+   )"
+
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}/pyquery-1.4.1-network-tests.patch"
+   "${FILESDIR}/pyquery-1.4.1-tests-pypy.patch"
+)
+
+python_test() {
+   # The suite, it appears, requires this hard setting of PYTHONPATH!
+   PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+   optfeature "Support for BeautifulSoup3 as a parser backend" 
dev-python/beautifulsoup
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/watchdog/

2020-11-21 Thread Michał Górny
commit: aff87319e77eca42065d05eb82f39595c45583fc
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 19:22:14 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 20:54:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff87319

dev-python/watchdog: Bump to 0.10.4

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/watchdog/Manifest   |  1 +
 dev-python/watchdog/watchdog-0.10.4.ebuild | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 5e0bb5bb29a..e6f603028d7 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,2 +1,3 @@
 DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B 
bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d31f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1
 SHA512 
6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
+DIST watchdog-0.10.4.tar.gz 90303 BLAKE2B 
0c057fe35383deaa6b7a66c24c07b2260153e94072b2769dd023210e0e5af90b4556ac18a4e8cab8af794c9dad8709205d9f48022458ee6c93fc0f2926b6f372
 SHA512 
abaadebd74dd869af545b5a3f10edc9d58f4f0f31f43aaf2244aed2c0ef56828f0b4cf9eda919727c832b20c79e95f50df7193dc8ea9d05d28a52dc322a3a497
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B 
d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932
 SHA512 
61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f

diff --git a/dev-python/watchdog/watchdog-0.10.4.ebuild 
b/dev-python/watchdog/watchdog-0.10.4.ebuild
new file mode 100644
index 000..44f305c9f08
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.10.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog";
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+   dev-python/argh[${PYTHON_USEDEP}]
+   dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+   test? (
+   >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+   )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+   sed -i -e '/--cov/d' setup.cfg || die
+   # broken when django is installed
+   sed -i -e 's:test_eventlet_monkey_patching:_&:' \
+   tests/test_skip_repeats_queue.py || die
+   default
+}
+
+pkg_postinst() {
+   optfeature "Bash completion" dev-python/argcomplete
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/virtualenv/

2020-11-21 Thread Michał Górny
commit: a057d214658485ce5ddd8fd6c138622a9065dd29
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 19:19:38 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 20:54:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a057d214

dev-python/virtualenv: Bump to 20.2.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/virtualenv/Manifest |  1 +
 dev-python/virtualenv/virtualenv-20.2.0.ebuild | 93 ++
 2 files changed, 94 insertions(+)

diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index f24f1608ab6..7d64807cd46 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 
42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c
 SHA512 
f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.0.35.tar.gz 8283086 BLAKE2B 
66d6b22d9928bf3925c8911e24fa1ba22d1276518c23e0d951c58cca0cb34f67e5053f27882ab9eafbdba040a893861eadb40497398d9deaacb45c461bfa01cc
 SHA512 
066cefbf9c6c77277a1c97c8cf555a8b4411784ad289c058f107872be15e9dd4ef9ac6e4ec64143e0b30512d9f454408e18e434ef8f9b2bfe3e6456fade71251
 DIST virtualenv-20.1.0.tar.gz 8284462 BLAKE2B 
4356c9c49f7bd2dbb6cf8998be5cd3970804bdec5e3c1223439700f4b5597cd843cdb17b722d54f0181094296247d1f2d4c27980679602b94020fdf1e95dd73f
 SHA512 
740bf8ba30d836c240d248dd2fa31a8702cfa8f96a6192dd6430dbeff3ebbf0fe67d4fd2439ed4961869731520b097783a29381eae3f81f6700b6050b75422c8
+DIST virtualenv-20.2.0.tar.gz 8286133 BLAKE2B 
79f14b54afb89c8c3d63f084d758d33f7672f533f346138f9a4f55aeada9cfc286136642245cef1617e2c6d5e968ad6b45c1e76da311748fd52d97cbbf8e4af0
 SHA512 
38d48c73230a71f308c807e34b78a80bd89a3a038afcbe6623b7ac3e7969689116870836a8e7980856077fc2eead0c14e16dfdc2d5ffb2976e0a9c4b13b5c2d0

diff --git a/dev-python/virtualenv/virtualenv-20.2.0.ebuild 
b/dev-python/virtualenv/virtualenv-20.2.0.ebuild
new file mode 100644
index 000..d04924a4c67
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.2.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+   https://virtualenv.pypa.io/en/stable/
+   https://pypi.org/project/virtualenv/
+   https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+   >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+   >=dev-python/filelock-3[${PYTHON_USEDEP}]
+   >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+   >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+   ' python3_{6,7} pypy3)
+   $(python_gen_cond_dep '
+   >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+   ' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
+   test? (
+   ${RDEPEND}
+   $(python_gen_cond_dep '
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/flaky[${PYTHON_USEDEP}]
+   >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+   >=dev-python/pytest-5[${PYTHON_USEDEP}]
+   >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+   >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+   ' 'python3*')
+   )"
+
+distutils_enable_sphinx docs \
+   dev-python/sphinx_rtd_theme \
+   dev-python/towncrier
+
+src_prepare() {
+   # we don't have xonsh
+   rm tests/unit/activation/test_xonsh.py || die
+   # require internet
+   sed -e 's:test_seed_link_via_app_data:_&:' \
+   -i tests/unit/seed/embed/test_bootstrap_link_via_app_data.py || 
die
+   # TODO: investigate
+   sed -e 's:test_cross_major:_&:' \
+   -i tests/unit/create/test_creator.py || die
+
+   distutils-r1_src_prepare
+}
+
+src_configure() {
+   export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+   if [[ ${EPYTHON} == pypy3 ]]; then
+   # TODO: skip

[gentoo-commits] repo/gentoo:master commit in: games-emulation/advancemame/, games-emulation/advancemame/files/

2020-11-21 Thread David Seifert
commit: 5615d9ee802541a4d6d1e6ffe77dddc4550806ac
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:07 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5615d9ee

games-emulation/advancemame: Add upstream patch for -fno-common

Closes: https://bugs.gentoo.org/706924
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-emulation/advancemame/advancemame-3.9.ebuild |  1 +
 .../files/advancemame-3.9-fno-common.patch | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild 
b/games-emulation/advancemame/advancemame-3.9.ebuild
index 61a5a35b78d..2759ceac28f 100644
--- a/games-emulation/advancemame/advancemame-3.9.ebuild
+++ b/games-emulation/advancemame/advancemame-3.9.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
"${FILESDIR}"/${P}-blank-flags.patch
"${FILESDIR}"/${P}-DESTDIR.patch
"${FILESDIR}"/${P}-FHS.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch 
b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch
new file mode 100644
index 000..c378b9aa919
--- /dev/null
+++ b/games-emulation/advancemame/files/advancemame-3.9-fno-common.patch
@@ -0,0 +1,33 @@
+From f8688cae05799a30cd5337e626a07fa9f004c0a3 Mon Sep 17 00:00:00 2001
+From: Andrea Mazzoleni 
+Date: Fri, 23 Oct 2020 21:29:41 +0200
+Subject: [PATCH] Fix build errors due new gcc 10 default for -fno-common
+
+---
+ src/drivers/cavepgm.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/drivers/cavepgm.c b/src/drivers/cavepgm.c
+index 38d3dae8..df6e97ab 100644
+--- a/src/drivers/cavepgm.c
 b/src/drivers/cavepgm.c
+@@ -287,7 +287,7 @@ IGS PCB NO-0136 (Riser)
+ #include "timer.h"
+ 
+ 
+-UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, 
*pgm_rowscrollram;
++extern UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, 
*pgm_videoregs, *pgm_rowscrollram;
+ static UINT8 *z80_mainram;
+ static UINT32 *arm7_shareram;
+ static UINT32 arm7_latch;
+@@ -852,8 +852,8 @@ static void expand_32x32x5bpp(void)
+ /* This function expands the sprite colour data (in the A Roms) from 3 pixels
+in each word to a byte per pixel making it easier to use */
+ 
+-UINT8 *pgm_sprite_a_region;
+-size_tpgm_sprite_a_region_allocate;
++extern UINT8 *pgm_sprite_a_region;
++extern size_t pgm_sprite_a_region_allocate;
+ 
+ static void expand_colourdata(void)
+ {



[gentoo-commits] repo/gentoo:master commit in: games-emulation/gens/, games-emulation/gens/files/

2020-11-21 Thread David Seifert
commit: 02744bab811337194c9f27182e6e912020034221
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:14 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02744bab

games-emulation/gens: Port to EAPI 7

Closes: https://bugs.gentoo.org/654420
Closes: https://bugs.gentoo.org/712982
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../gens/files/gens-2.15.5-fno-common.patch| 58 ++
 .../gens/files/gens-2.15.5-zlib-OF.patch   |  7 +++
 games-emulation/gens/gens-2.15.5-r1.ebuild | 48 --
 games-emulation/gens/gens-2.15.5-r2.ebuild | 50 +++
 4 files changed, 115 insertions(+), 48 deletions(-)

diff --git a/games-emulation/gens/files/gens-2.15.5-fno-common.patch 
b/games-emulation/gens/files/gens-2.15.5-fno-common.patch
new file mode 100644
index 000..b4493378e6f
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-fno-common.patch
@@ -0,0 +1,58 @@
+--- a/src/gens/gens_core/sound/ym2612.c
 b/src/gens/gens_core/sound/ym2612.c
+@@ -241,7 +241,7 @@
+  ***/
+ 
+ 
+-INLINE void
++void
+ CALC_FINC_SL (slot_ * SL, int finc, int kc)
+ {
+   int ksr;
+@@ -284,7 +284,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ CALC_FINC_CH (channel_ * CH)
+ {
+   int finc, kc;
+@@ -305,7 +305,7 @@
+  ***/
+ 
+ 
+-INLINE void
++void
+ KEY_ON (channel_ * CH, int nsl)
+ {
+   slot_ *SL = &(CH->SLOT[nsl]);   // on recupère le bon pointeur de slot
+@@ -331,7 +331,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ KEY_OFF (channel_ * CH, int nsl)
+ {
+   slot_ *SL = &(CH->SLOT[nsl]);   // on recupère le bon pointeur de slot
+@@ -351,7 +351,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ CSM_Key_Control ()
+ {
+   KEY_ON (&YM2612.CHANNEL[2], 0);
+--- a/src/gens/segacd/cd_aspi.c
 b/src/gens/segacd/cd_aspi.c
+@@ -55,7 +55,7 @@
+ DWORD (*Get_ASPI_Version) (void);
+ DWORD (*Send_ASPI_Command) (LPSRB);
+ int ASPI_Command_Running;
+-int CDROM_SPEED;
++extern int CDROM_SPEED;
+ int Num_CD_Drive;
+ int CUR_DEV; // a che serve?
+ int DEV_PAR[8][3];

diff --git a/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch 
b/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch
new file mode 100644
index 000..5a357cc633e
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch
@@ -0,0 +1,7 @@
+--- a/src/gens/util/file/unzip.h
 b/src/gens/util/file/unzip.h
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /* unzip.h -- IO for uncompress .zip files using zlib 
+Version 0.15 beta, Mar 19th, 1998,
+ 

diff --git a/games-emulation/gens/gens-2.15.5-r1.ebuild 
b/games-emulation/gens/gens-2.15.5-r1.ebuild
deleted file mode 100644
index de49e5ffa08..000
--- a/games-emulation/gens/gens-2.15.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="A Sega Genesis/CD/32X emulator"
-HOMEPAGE="https://sourceforge.net/projects/gens/";
-SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   virtual/opengl
-   >=media-libs/libsdl-1.2[joystick,video]
-   x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-   >=dev-lang/nasm-0.98
-"
-
-src_prepare() {
-   default
-   eapply \
-   "${FILESDIR}"/${P}-romsdir.patch \
-   "${FILESDIR}"/${P}-as-needed.patch \
-   "${FILESDIR}"/${P}-ovflfix.patch \
-   "${FILESDIR}"/${P}-gcc34.patch
-   sed -i -e '1i#define OF(x) x' src/gens/util/file/unzip.h || die
-   append-ldflags -Wl,-z,noexecstack
-}
-
-src_configure() {
-   use amd64 && multilib_toolchain_setup x86 #441876
-   econf \
-   --disable-gtktest \
-   --disable-sdltest
-}
-
-src_install() {
-   DOCS="AUTHORS BUGS README gens.txt history.txt" \
-   default
-   newicon pixmaps/gens_small.png ${PN}.png
-   make_desktop_entry "${PN}" "Gens"
-}

diff --git a/games-emulation/gens/gens-2.15.5-r2.ebuild 
b/games-emulation/gens/gens-2.15.5-r2.ebuild
new file mode 100644
index 000..7b8c385e9b0
--- /dev/null
+++ b/games-emulation/gens/gens-2.15.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_32 )
+
+inherit desktop flag-o-matic multilib-build
+
+DESCRIPTION="A Sega Genesis/CD/32X emulator"
+HOMEPAGE="https://sourceforge.net/projects/gens/";
+SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   media-libs/libsdl[${MULTILIB_USEDEP},joystick,video]
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   virt

[gentoo-commits] repo/gentoo:master commit in: games-rpg/daimonin-client/, games-rpg/daimonin-client/files/

2020-11-21 Thread David Seifert
commit: 7075cd03fb20c63fda4008b1cd7d50147a024663
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:17 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7075cd03

games-rpg/daimonin-client: Port to EAPI 7

Closes: https://bugs.gentoo.org/639304
Closes: https://bugs.gentoo.org/708788
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../daimonin-client/daimonin-client-0.10.8.ebuild  |  17 +--
 .../files/daimonin-client-0.10.8-fno-common.patch  | 128 +
 2 files changed, 138 insertions(+), 7 deletions(-)

diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild 
b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
index 3ee1bd720d7..4cd5b762386 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="A graphical 2D tile-based MMORPG"
 HOMEPAGE="http://daimonin.sourceforge.net/";
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip
+SRC_URI="
+   https://dev.gentoo.org/~soap/distfiles/${P}.zip
music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )"
 
 LICENSE="GPL-2"
@@ -22,10 +23,10 @@ RDEPEND="
media-libs/sdl-mixer[vorbis]
net-misc/curl
sys-libs/zlib:="
-DEPEND="${RDEPEND}
-   app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux
+S="${WORKDIR}/daimonin-code-8183-trunk/client/make/linux"
 
 src_unpack() {
unpack ${P}.zip
@@ -42,6 +43,7 @@ src_prepare() {
 
pushd ../../src >/dev/null || die
eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch
+   eapply "${FILESDIR}"/${PN}-0.10.8-fno-common.patch
popd >/dev/null || die
 
eapply_user
@@ -64,6 +66,7 @@ src_install() {
 
cd ../.. || die
dodoc README*
+
newicon bitmaps/pentagram.png "daimonin.png"
make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement"
 }

diff --git 
a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch 
b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch
new file mode 100644
index 000..d4369e5f3fb
--- /dev/null
+++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch
@@ -0,0 +1,128 @@
+--- a/dialog.c
 b/dialog.c
+@@ -581,7 +581,7 @@
+ /**
+  draws all options for the actual page.
+ **/
+-inline void optwin_draw_options(int x, int y)
++void optwin_draw_options(int x, int y)
+ {
+ #define LEN_NAME  111
+ int i = -1, pos = 0, max = 0;
+--- a/include/main.h
 b/include/main.h
+@@ -118,7 +118,7 @@
+ }
+ _bmaptype_table;
+ 
+-_bmaptype_table bmaptype_table[BMAPTABLE];
++extern _bmaptype_table bmaptype_table[BMAPTABLE];
+ 
+ extern int  bmaptype_table_size;
+ 
+@@ -306,7 +306,7 @@
+ double killhour;
+ } _statometer;
+ 
+-struct statometer statometer;
++extern struct statometer statometer;
+ 
+ extern time_t sleeptime;
+ 
+--- a/include/map.h
 b/include/map.h
+@@ -70,7 +70,7 @@
+ }
+ _mapdata;
+ 
+-struct MapCell
++typedef struct MapCell
+ {
+ short   faces[MAXFACES];
+ short   pos[MAXFACES];
+@@ -85,7 +85,7 @@
+ }
+ MapCell;
+ 
+-struct Map
++typedef struct Map
+ {
+ struct MapCell  cells[MAP_MAX_SIZE][MAP_MAX_SIZE];
+ }
+--- a/include/menu.h
 b/include/menu.h
+@@ -41,15 +41,15 @@
+ #define MENU_ALL (MENU_NO & MENU_KEYBIND & MENU_SPELL & MENU_STATUS & 
MENU_OPTION & MENU_NPC & MENU_BOOK & MENU_QUEST)
+ 
+ #define MENU_SOUND_VOL 40
+-struct _skill_list  skill_list[SKILL_LIST_MAX];
++extern struct _skill_list  skill_list[SKILL_LIST_MAX];
+ extern _dialog_list_set skill_list_set;
+ 
+-struct _spell_list  spell_list[SPELL_LIST_MAX]; /* skill list entries */
++extern struct _spell_list  spell_list[SPELL_LIST_MAX]; /* skill list 
entries */
+ extern _dialog_list_set spell_list_set;
+ 
+ extern _dialog_list_set option_list_set;
+ 
+-struct _bindkey_listbindkey_list[BINDKEY_LIST_MAX];
++extern struct _bindkey_listbindkey_list[BINDKEY_LIST_MAX];
+ extern _dialog_list_set bindkey_list_set;
+ 
+ extern _dialog_list_set create_list_set;
+--- a/include/wrapper.h
 b/include/wrapper.h
+@@ -118,7 +118,7 @@
+ extern int  parse_metaserver_data(char *info);
+ 
+ #if defined( __WIN_32)  || defined(__LINUX)
+-  FILE *msglog;
++  extern FILE *msglog;
+ #endif
+ 
+ #if defined(HAVE_STRNICMP)
+--- a/main.c
 b/main.c
+@@ -24,6 +24,10 @@
+ #inc

[gentoo-commits] repo/gentoo:master commit in: games-arcade/primateplunge/files/, games-arcade/primateplunge/

2020-11-21 Thread David Seifert
commit: 94d1d63f0c6234165b650f748b03af9f34238ac9
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:11 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d1d63f

games-arcade/primateplunge: Port to EAPI 7

Closes: https://bugs.gentoo.org/724414
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../files/primateplunge-1.1-fno-common.patch | 11 +++
 .../primateplunge/primateplunge-1.1-r2.ebuild| 20 +---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git 
a/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch 
b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
new file mode 100644
index 000..7905b0372e7
--- /dev/null
+++ b/games-arcade/primateplunge/files/primateplunge-1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/game.h
 b/src/game.h
+@@ -125,7 +125,7 @@
+ 
+ 
+ /* Glabals in main.c */
+-SDL_Surface *mainScreen;
++extern SDL_Surface *mainScreen;
+ 
+ /* Globals in game.c */
+ extern world* currentWorld;

diff --git a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild 
b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
index 4023588bfee..b14ba0d459b 100644
--- a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
+++ b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas"
@@ -11,22 +12,27 @@ SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz";
 LICENSE="Primate-Plunge"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist" #465850
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+   media-libs/libsdl[sound,video]
media-libs/sdl-mixer"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-AC_SUBST.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
default
-   eapply "${FILESDIR}"/${P}-AC_SUBST.patch
eautoreconf
 }
 
 src_install() {
default
dodoc TIPS
-   newicon graphics/idle.bmp ${PN}.bmp
-   make_desktop_entry ${PN} "Primate Plunge" /usr/share/pixmaps/${PN}.bmp
+
+   newicon graphics/idle.bmp primateplunge.bmp
+   make_desktop_entry primateplunge "Primate Plunge" 
/usr/share/pixmaps/primateplunge.bmp
 }



[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/, games-util/xqf/

2020-11-21 Thread David Seifert
commit: 279a598fceda81830fd5a42feb7f53581dbabeca
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:52 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279a598f

games-util/xqf: Port to EAPI 7

Closes: https://bugs.gentoo.org/633562
Closes: https://bugs.gentoo.org/708754
Closes: https://bugs.gentoo.org/739402
Closes: https://bugs.gentoo.org/741774
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/xqf/files/xqf-1.0.6.2-fno-common.patch | 21 +++
 games-util/xqf/files/xqf-1.0.6.2-underlink.patch  | 14 --
 games-util/xqf/xqf-1.0.6.2.ebuild | 31 +--
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch 
b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
new file mode 100644
index 000..15147ac6d91
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/filter.c
 b/src/filter.c
+@@ -88,6 +88,8 @@
+ const char* filter_quick_get(void);
+ void filter_quick_unset (void);
+ 
++unsigned int current_server_filter;
++
+ /* /QUICK FILTER */
+ 
+ struct filter filters[FILTERS_TOTAL] = {
+--- a/src/filter.h
 b/src/filter.h
+@@ -89,7 +89,6 @@
+ 
+ extern GArray* server_filters;
+ 
+-unsigned int current_server_filter;
+ extern unsigned int current_server_filter;
+ 
+ 

diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch 
b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index fe93c762467..a40961eb25f 100644
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,5 +1,5 @@
 xqf-xqf-1.0.6.2/src/Makefile.am
-+++ xqf-xqf-1.0.6.2/src/Makefile.am
+--- a/src/Makefile.am
 b/src/Makefile.am
 @@ -41,6 +41,7 @@
$(GEOIP_LIB) \
$(PACKAGE_LIBS) \
@@ -8,3 +8,13 @@
-lz -ldl
  
  xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map
+--- a/po/POTFILES.in
 b/po/POTFILES.in
+@@ -21,6 +21,7 @@
+ #src/rc.c
+ src/rcon.c
+ src/redial.c
++src/scripts.c
+ #src/server.c
+ #src/skin.c
+ #src/skin_pcx.c

diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild 
b/games-util/xqf/xqf-1.0.6.2.ebuild
index 5ea89476375..9c9510182f8 100644
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
 HOMEPAGE="http://xqf.github.io/en/";
@@ -13,26 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="bzip2 geoip nls"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+   x11-libs/gdk-pixbuf-xlib
+   x11-libs/gtk+:2
>=games-util/qstat-2.11
nls? ( virtual/libintl )
geoip? ( dev-libs/geoip )
bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-${P}
+S="${WORKDIR}/${PN}-${P}"
 
-# bug #288853
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-underlink.patch \
-   "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
-   sed -i \
-   -e '/Icon/s/.png//' \
-   xqf.desktop.in || die
+PATCHES=(
+   "${FILESDIR}"/${P}-underlink.patch
+   "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+   default
mv configure.{in,ac} || die
eautoreconf
 }



[gentoo-commits] repo/gentoo:master commit in: games-util/fteqcc/, games-util/fteqcc/files/

2020-11-21 Thread David Seifert
commit: 493e624738974512a14a9eef9391f4c9340f659d
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:58 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493e6247

games-util/fteqcc: Port to EAPI 7

Closes: https://bugs.gentoo.org/707434
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/fteqcc/files/fteqcc-2501-Makefile.patch |  61 ++
 .../fteqcc/files/fteqcc-2501-cleanup-source.patch  | 205 +
 games-util/fteqcc/fteqcc-2501.ebuild   |  31 ++--
 3 files changed, 240 insertions(+), 57 deletions(-)

diff --git a/games-util/fteqcc/files/fteqcc-2501-Makefile.patch 
b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
new file mode 100644
index 000..cc70e9be4d8
--- /dev/null
+++ b/games-util/fteqcc/files/fteqcc-2501-Makefile.patch
@@ -0,0 +1,61 @@
+--- a/Makefile
 b/Makefile
+@@ -1,51 +1,19 @@
+ QCC_OBJS=qccmain.o qcc_cmdlib.o qcc_pr_comp.o qcc_pr_lex.o comprout.o hash.o 
qcd_main.o
+ GTKGUI_OBJS=qcc_gtk.o qccguistuff.c
+ 
+-CC=gcc -Wall -DQCCONLY
+-
+-DO_CC=$(CC) $(BASE_CFLAGS) -o $@ -c $< $(CFLAGS)
+-
+ all: qcc
+ 
+-BASE_CFLAGS=-ggdb
+-CFLAGS =
+-
++CFLAGS += -Wall
++CPPFLAGS += -DQCCONLY
+ 
+ win_nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin 
-mwindows
++  $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin -mwindows
+ nocyg: $(QCC_OBJS) qccgui.c qccguistuff.c
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mno-cygwin
++  $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mno-cygwin
+ win: $(QCC_OBJS) qccgui.c qccguistuff.c
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 -s $(QCC_OBJS) -mwindows
++  $(CC) $(BASE_CFLAGS) -o fteqcc.exe $(QCC_OBJS) -mwindows
+ qcc: $(QCC_OBJS)
+-  $(CC) $(BASE_CFLAGS) -o fteqcc.bin -O3 -s $(QCC_OBJS)
+-
+-qccmain.o: qccmain.c qcc.h
+-  $(DO_CC)
+-
+-qcc_cmdlib.o: qcc_cmdlib.c qcc.h
+-  $(DO_CC)
+-
+-qcc_pr_comp.o: qcc_pr_comp.c qcc.h
+-  $(DO_CC)
+-
+-qcc_pr_lex.o: qcc_pr_lex.c qcc.h
+-  $(DO_CC)
+-
+-comprout.o: comprout.c qcc.h
+-  $(DO_CC)
+-
+-hash.o: hash.c qcc.h
+-  $(DO_CC)
+-
+-qcd_main.o: qcd_main.c qcc.h
+-  $(DO_CC)
+-
+-qccguistuff.o: qccguistuff.c qcc.h
+-  $(DO_CC)
+-
+-qcc_gtk.o: qcc_gtk.c qcc.h
+-  $(DO_CC) `pkg-config --cflags gtk+-2.0`
++  $(CC) $(BASE_CFLAGS) $(LDFLAGS) -o fteqcc.bin $(QCC_OBJS)
+ 
+ gtkgui: $(QCC_OBJS) $(GTKGUI_OBJS)
+-  $(CC) $(BASE_CFLAGS) -DQCCONLY -DUSEGUI -o fteqccgui.bin -O3 
$(GTKGUI_OBJS) $(QCC_OBJS) `pkg-config --libs gtk+-2.0`
++  $(CC) $(CFLAGS) $(LDFLAGS) -DUSEGUI -o fteqccgui.bin $(GTKGUI_OBJS) 
$(QCC_OBJS) $(GTK_LIBS)

diff --git a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch 
b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
index 35f3dcf100a..be8cccb074b 100644
--- a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
+++ b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
@@ -1,43 +1,5 @@
 qcc_pr_comp.c
-+++ qcc_pr_comp.c
-@@ -7322,7 +7322,7 @@
-   QCC_def_t   *def, *d;
-   QCC_function_t  *f;
-   QCC_dfunction_t *df;
--  int i;
-+  int i = 0;
-   pbool shared=false;
-   pbool externfnc=false;
-   pbool isconstant = false;
-@@ -8541,8 +8545,6 @@
-   struct qcc_includechunk_s *oldcurrentchunk;
-   extern struct qcc_includechunk_s *currentchunk;
- 
--  extern char qccmsourcedir[];
--
-   ocompilingfile = compilingfile;
-   os_file = s_file;
-   os_file2 = s_file2;
 hash.h
-+++ hash.h
-@@ -19,12 +19,12 @@
- int Hash_Key(char *name, int modulus);
- void *Hash_Get(hashtable_t *table, char *name);
- void *Hash_GetInsensative(hashtable_t *table, char *name);
--void *Hash_GetKey(hashtable_t *table, int key);
-+void *Hash_GetKey(hashtable_t *table, long key);
- void *Hash_GetNext(hashtable_t *table, char *name, void *old);
- void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old);
- void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck);
- void *Hash_AddInsensative(hashtable_t *table, char *name, void *data, 
bucket_t *buck);
- void Hash_Remove(hashtable_t *table, char *name);
- void Hash_RemoveData(hashtable_t *table, char *name, void *data);
--void Hash_RemoveKey(hashtable_t *table, int key);
--void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck);
-+void Hash_RemoveKey(hashtable_t *table, long key);
-+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck);
 hash.c
-+++ hash.c
+--- a/hash.c
 b/hash.c
 @@ -68,7 +68,7 @@
}
return NULL;
@@ -91,3 +53,166 @@
{
buck->next = buck->next->next;
return;
+--- a/hash.h
 b/hash.h
+@@ -19,12 +19,12 @@
+ int 

[gentoo-commits] repo/gentoo:master commit in: games-action/luola/, games-action/luola/files/

2020-11-21 Thread David Seifert
commit: 9212c96c491976f079b128f9c5e43bc285c564b9
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:55 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9212c96c

games-action/luola: Port to EAPI 7

Closes: https://bugs.gentoo.org/708664
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../luola/files/luola-1.3.2-fno-common.patch   | 33 ++
 games-action/luola/luola-1.3.2-r1.ebuild   | 32 -
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/games-action/luola/files/luola-1.3.2-fno-common.patch 
b/games-action/luola/files/luola-1.3.2-fno-common.patch
new file mode 100644
index 000..e0b191df831
--- /dev/null
+++ b/games-action/luola/files/luola-1.3.2-fno-common.patch
@@ -0,0 +1,33 @@
+--- a/src/pilot.c
 b/src/pilot.c
+@@ -43,6 +43,8 @@
+ #define PILOT_STD_RADIUS 4.1 /* Normal radius for pilot */
+ #define PILOT_PAR_RADIUS 8.0 /* Parachuting radius for pilot */
+ 
++struct Pilot Pilot;
++
+ /* List of active pilots */
+ struct dllist *pilot_list;
+ 
+--- a/src/pilot.h
 b/src/pilot.h
+@@ -45,7 +45,8 @@
+ int toofast;/* How long has the pilot been falling too 
fast */
+ struct Spring *rope;/* The ninjarope */
+ int ropectrl;   /* -1 retracts rope, 1 extends it */
+-} Pilot;
++};
++extern struct Pilot Pilot;
+ 
+ /* Rope length limits. Actual rope length is nodelen*nodecount */
+ static const double pilot_rope_minlen = 0.1;
+--- a/tools/im_vwing.c
 b/tools/im_vwing.c
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "im_vwing.h"

diff --git a/games-action/luola/luola-1.3.2-r1.ebuild 
b/games-action/luola/luola-1.3.2-r1.ebuild
index ff2ec53aa18..0a2f70c623d 100644
--- a/games-action/luola/luola-1.3.2-r1.ebuild
+++ b/games-action/luola/luola-1.3.2-r1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools desktop gnome2-utils
+inherit autotools desktop xdg
 
 DESCRIPTION="A 2D multiplayer arcade game resembling V-Wing"
 HOMEPAGE="http://freshmeat.sourceforge.net/projects/luola";
-SRC_URI="mirror://gentoo/${P}.tar.gz
+SRC_URI="
+   mirror://gentoo/${P}.tar.gz
mirror://gentoo/stdlevels-6.0.tar.gz
mirror://gentoo/nostalgia-1.2.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="media-libs/libsdl[X,sound,joystick,video]
+RDEPEND="
+   media-libs/libsdl[X,sound,joystick,video]
media-libs/sdl-gfx
media-libs/sdl-image[jpeg,png]
media-libs/sdl-mixer
@@ -25,6 +26,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${P}-underlink.patch
+   "${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
@@ -37,24 +39,14 @@ src_configure() {
 }
 
 src_install() {
-   emake DESTDIR="${D}" install
+   default
+
insinto /usr/share/${PN}/levels
doins "${WORKDIR}"/*.{lev,png}
-   dodoc AUTHORS ChangeLog DATAFILE FAQ LEVELFILE README TODO \
-   RELEASENOTES.txt ../README.Nostalgia
+
+   dodoc DATAFILE LEVELFILE RELEASENOTES.txt ../README.Nostalgia
newdoc ../README README.stdlevels
+
doicon -s 64 luola.png
make_desktop_entry luola Luola
 }
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   gnome2_icon_cache_update
-}



[gentoo-commits] repo/gentoo:master commit in: games-arcade/spout/, games-arcade/spout/files/

2020-11-21 Thread David Seifert
commit: 8e425bad1f85cff1d86e657e630c9b1d687bc7ec
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:01 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e425bad

games-arcade/spout: Port to EAPI 7

Closes: https://bugs.gentoo.org/707266
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../spout/files/spout-1.3-fno-common.patch | 18 
 games-arcade/spout/spout-1.3-r1.ebuild | 34 --
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/games-arcade/spout/files/spout-1.3-fno-common.patch 
b/games-arcade/spout/files/spout-1.3-fno-common.patch
new file mode 100644
index 000..37c1098b082
--- /dev/null
+++ b/games-arcade/spout/files/spout-1.3-fno-common.patch
@@ -0,0 +1,18 @@
+--- a/piece.c
 b/piece.c
+@@ -11,6 +11,7 @@
+ 
+ SDL_Surface *video, *layer;
+ SDL_Rect layerRect;
++int zoom, fullscreen;
+ 
+ unsigned char *vBuffer = NULL;
+ 
+--- a/piece.h
 b/piece.h
+@@ -53,4 +53,4 @@
+ 
+ int pcePadGet ();
+ 
+-int zoom, fullscreen;
++extern int zoom, fullscreen;

diff --git a/games-arcade/spout/spout-1.3-r1.ebuild 
b/games-arcade/spout/spout-1.3-r1.ebuild
index 876b18d5568..2057b0f1b3b 100644
--- a/games-arcade/spout/spout-1.3-r1.ebuild
+++ b/games-arcade/spout/spout-1.3-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop readme.gentoo-r1
 
 MY_P="spout-unix-${PV}"
+
 DESCRIPTION="Abstract Japanese caveflier / shooter"
 HOMEPAGE="http://freshmeat.net/projects/spout/";
 SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2";
@@ -12,31 +14,31 @@ SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2";
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.6"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-To play in fullscreen mode, do 'spout f'.
-To play in a greater resolution, do 'spout x', where
-x is an integer; the larger x is, the higher the resolution.
-
-To play:
-* Accelerate - spacebar, enter, z, x
-* Pause - escape
-* Exit - shift+escape
-* Rotate - left or right
-"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_install() {
dobin spout
+   einstalldocs
+
doicon spout.png
make_desktop_entry spout "Spout"
-   einstalldocs
+
+   local DOC_CONTENTS="
+   To play in fullscreen mode, do 'spout f'.
+   To play in a greater resolution, do 'spout x', where
+   x is an integer; the larger x is, the higher the resolution.
+
+   To play:
+   * Accelerate - spacebar, enter, z, x
+   * Pause - escape
+   * Exit - shift+escape
+   * Rotate - left or right"
readme.gentoo_create_doc
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-games/t4k-common/files/, dev-games/t4k-common/

2020-11-21 Thread David Seifert
commit: 74010217b98ba7f20211a93b53a34334893fa360
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:38:04 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:38:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74010217

dev-games/t4k-common: Port to EAPI 7

Closes: https://bugs.gentoo.org/707168
Closes: https://bugs.gentoo.org/715574
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../files/t4k-common-0.1.1-ICONV_CONST.patch   | 10 +++
 .../files/t4k-common-0.1.1-fno-common.patch| 11 
 .../t4k-common/files/t4k-common-0.1.1-libpng.patch |  4 +--
 dev-games/t4k-common/t4k-common-0.1.1.ebuild   | 33 +++---
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch 
b/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch
new file mode 100644
index 000..037d2acd292
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
 b/configure.ac
+@@ -39,6 +39,7 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_YACC
+ AC_PROG_LIBTOOL
++AM_ICONV
+ 
+ 
+ # ---

diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch 
b/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch
new file mode 100644
index 000..2bdf418649c
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/t4k_common.h
 b/src/t4k_common.h
+@@ -239,7 +239,7 @@
+ #define MAX_LINES 128 //!< Maximum lines to wrap.
+ #define MAX_LINEWIDTH 256 //!< Maximum characters of each line.
+ 
+-char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped 
lines.
++extern char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for 
wrapped lines.
+ 
+ //TODO separate headers for different areas a la SDL?
+ 

diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch 
b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
index 29991544ddb..fad91de2d20 100644
--- a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
@@ -1,5 +1,5 @@
 src/t4k_common-0.1.1/src/t4k_loaders.c 2011-04-08 05:46:07.0 
+0300
-+++ src.new/t4k_common-0.1.1/src/t4k_loaders.c 2012-05-02 10:35:41.836670434 
+0300
+--- a/src/t4k_loaders.c
 b/src/t4k_loaders.c
 @@ -1028,12 +1028,9 @@
{
  png_init_io(png_ptr, fi);

diff --git a/dev-games/t4k-common/t4k-common-0.1.1.ebuild 
b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
index 3c30d4d..e0a6d5009ab 100644
--- a/dev-games/t4k-common/t4k-common-0.1.1.ebuild
+++ b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A library of code shared between tuxmath and tuxtype"
 HOMEPAGE="https://github.com/tux4kids/t4kcommon";
@@ -11,9 +12,10 @@ 
SRC_URI="https://github.com/tux4kids/t4kcommon/archive/upstream/${PV}.tar.gz ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs svg"
+IUSE="svg"
 
-RDEPEND="dev-libs/libxml2:2
+RDEPEND="
+   dev-libs/libxml2:2
media-libs/libsdl
media-libs/sdl-image
media-libs/sdl-mixer
@@ -25,22 +27,33 @@ RDEPEND="dev-libs/libxml2:2
media-libs/libpng:0
x11-libs/cairo
)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+# need sys-devel/gettext for AM_ICONV in iconv.m4
+BDEPEND="
+   sys-devel/gettext
virtual/pkgconfig"
 
-S=${WORKDIR}/t4kcommon-upstream-${PV}
+S="${WORKDIR}/t4kcommon-upstream-${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-libpng.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+   "${FILESDIR}"/${P}-ICONV_CONST.patch
+)
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-libpng.patch
+   default
+   rm m4/iconv.m4 || die
+   eautoreconf
 }
 
 src_configure() {
econf \
-   $(usex svg "" "--without-rsvg") \
-   $(use_enable static-libs static)
+   --disable-static \
+   $(usex svg "" --without-rsvg)
 }
 
 src_install() {
default
-   use static-libs || prune_libtool_files --all
+   find "${ED}" -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

2020-11-21 Thread Marek Szuba
commit: 4b094fb3db96fe457eecee465812486cb7880e5a
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 20:16:13 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 20:26:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b094fb3

net-libs/nodejs: remove 12.18.4 and 14.2.0

Tickets pertaining to CVE-2020-8201, CVE-2020-8251, CVE-2020-8172,
CVE-2020-8174 and CVE-2020-15095 should now be safe to close.

Bug: https://bugs.gentoo.org/726836
Bug: https://bugs.gentoo.org/731654
Bug: https://bugs.gentoo.org/742893
Signed-off-by: Marek Szuba  gentoo.org>

 net-libs/nodejs/Manifest |   2 -
 net-libs/nodejs/nodejs-12.18.4-r1.ebuild | 216 ---
 net-libs/nodejs/nodejs-14.2.0.ebuild | 201 
 3 files changed, 419 deletions(-)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index bc8534112df..b981c6dec8b 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,5 +1,3 @@
-DIST node-v12.18.4.tar.xz 23679924 BLAKE2B 
14de3c83851b89f85f7d6f549d9e43e3e97c7a84de94eef8c3a2789e960595749726b8039fdff1be822377355ede2bb95bba4fd1d17c3e5165c844a80eb32e53
 SHA512 
07101a9acc8dee5189f8484746715b57d4227d819e38a79c100da33f803b0f061e7b37fbd4114ce2bc3eea647726f8786880d3096dfab187c177679f3e1c78e8
 DIST node-v12.19.1.tar.xz 23829692 BLAKE2B 
244ca8ef29e315ce027638d9d5c66469ac8cd69abec47d5bf6370b990da0d9d2a7af812963530e5187d273d3f20638be0d23ccb1c0409fbbd678677740939f4f
 SHA512 
7c628ca214d3b17b34658aae32e335ce863d90853c92f1cd4119e9a82b7097ddf47d0d4cc7c9bbdbfdd4b403811aa6ee08e844078a947f31a3adc78f569b931a
 DIST node-v14.15.0.tar.xz 33440584 BLAKE2B 
dda9fb44f163b2268db126dfcda34e80064eba24921e4f8e6c14c212deb9170c79f31f7b2be272c8fa7ca992d14540df490c6cad078833514bd348825934ad95
 SHA512 
2a0cd1b9d95e0ac228a90aca82cb04b9f4fc4d08ab86f0286eed7a519ca6e756081b37375ad5d14d7f0e09affdd27bad658c3e364237eb3c212fe5b5e27af96e
 DIST node-v14.15.1.tar.xz 33437304 BLAKE2B 
f08251d2a76e4030433001fd7f062c71193de190036d1147ade0ea36350df0d65df9e1b749fbac77837dd090cbeda6c133ff88099691c932bc29e75b7bfa2acc
 SHA512 
cbab757e370a09b73c29a9bcb310b4122e4424d6baeaeaf1b10919ed6b348bc6ddbfc0e0eaff99d8ebb4d3d74f0206f575e2656245151eda564dd2cd33ff823a
-DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 
7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842
 SHA512 
47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2

diff --git a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild 
b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
deleted file mode 100644
index c606807087a..000
--- a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 
toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/";
-SRC_URI="
-   https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl 
+system-ssl systemtap test"
-REQUIRED_USE="
-   inspector? ( icu ssl )
-   npm? ( ssl )
-   system-ssl? ( ssl )
-"
-
-RDEPEND="
-   >=app-arch/brotli-1.0.7
-   >=dev-libs/libuv-1.39.0:=
-   >=net-dns/c-ares-1.16.0
-   >=net-libs/http-parser-2.9.3:=
-   >=net-libs/nghttp2-1.40.0
-   sys-libs/zlib
-   icu? ( >=dev-libs/icu-64.2:= )
-   system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   sys-apps/coreutils
-   systemtap? ( dev-util/systemtap )
-   test? ( net-misc/curl )
-"
-DEPEND="
-   ${RDEPEND}
-"
-PATCHES=(
-   "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-   "${FILESDIR}"/${PN}--llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-   (use x86 && ! use cpu_flags_x86_sse2) && \
-   die "Your CPU doesn't support the required SSE2 instruction."
-
-   ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-   die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 
3.3 or newer."
-}
-
-src_prepare() {
-   tc-export CC CXX PKG_CONFIG
-   export V=1
-   export BUILDTYPE=Release
-
-   # fix compilation on Darwin
-   # https://code.google.com/p/gyp/issues/detail?id=260
-   sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || 
die
-
-   # less verbose install output (stating the same as portage, basically)
-   sed -i -e "/print/d" tools/install.py || die
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/execjs/

2020-11-21 Thread Marek Szuba
commit: 930e246410b9f585b6d6d54b57e9fe3fbbe5955d
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 21 20:21:58 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 21 20:26:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930e2464

dev-ruby/execjs-2.7.0: drop ppc keyword

The last net-libs/nodejs ebuild keyworded for ppc has just been
removed due to security vulnerabilties, and it didn't actually compile
on that arch anyway.

Bug: https://bugs.gentoo.org/754921
Signed-off-by: Marek Szuba  gentoo.org>

 dev-ruby/execjs/execjs-2.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/execjs/execjs-2.7.0.ebuild 
b/dev-ruby/execjs/execjs-2.7.0.ebuild
index 5d6a8fd9d8c..b67bdd792e2 100644
--- a/dev-ruby/execjs/execjs-2.7.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
 IUSE="test"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/

2020-11-21 Thread Jason Zaman
commit: 7e629b5a97b02d2d3427f69d76b1ee5f5e2d5766
Author: Jason Zaman  gentoo  org>
AuthorDate: Sat Nov 21 19:02:37 2020 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Nov 21 20:14:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e629b5a

sys-libs/libselinux: update  package

3.1 was updated with BDEPEND for EAPI7 fixes, apply them to the live
ebuild as well.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jason Zaman  gentoo.org>

 sys-libs/libselinux/libselinux-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libselinux/libselinux-.ebuild 
b/sys-libs/libselinux/libselinux-.ebuild
index 2f2a870f2d6..d28e9b76f0f 100644
--- a/sys-libs/libselinux/libselinux-.ebuild
+++ b/sys-libs/libselinux/libselinux-.ebuild
@@ -40,8 +40,8 @@ 
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
)
elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.9 )
ruby? ( >=dev-lang/swig-2.0.9 )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/

2020-11-21 Thread Jason Zaman
commit: 8353a4e7d519f0ef13004f1081bd2f2f1bcc5cdc
Author: Jason Zaman  gentoo  org>
AuthorDate: Sat Nov 21 19:03:30 2020 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Nov 21 20:14:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8353a4e7

sys-libs/libsemanage: update  package

3.1 was updated with BDEPEND for EAPI7 fixes, apply them to the live
ebuild as well.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jason Zaman  gentoo.org>

 sys-libs/libsemanage/libsemanage-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libsemanage/libsemanage-.ebuild 
b/sys-libs/libsemanage/libsemanage-.ebuild
index f41d7dffde0..a1f7982ff44 100644
--- a/sys-libs/libsemanage/libsemanage-.ebuild
+++ b/sys-libs/libsemanage/libsemanage-.ebuild
@@ -33,10 +33,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
-   >=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-   >=dev-lang/swig-2.0.4-r1
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/swig-2.0.4-r1
sys-devel/bison
sys-devel/flex
virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-pvr-mythtv/

2020-11-21 Thread Craig Andrews
commit: 67c8ae0b50fcd806644a06881e9ff1d31049b9d9
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Nov 21 19:46:56 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Nov 21 19:47:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c8ae0b

media-plugins/kodi-pvr-mythtv: 7.2.0 version bump

Closes: https://bugs.gentoo.org/755665
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Craig Andrews  gentoo.org>

 media-plugins/kodi-pvr-mythtv/Manifest |  1 +
 .../kodi-pvr-mythtv/kodi-pvr-mythtv-7.2.0.ebuild   | 36 ++
 2 files changed, 37 insertions(+)

diff --git a/media-plugins/kodi-pvr-mythtv/Manifest 
b/media-plugins/kodi-pvr-mythtv/Manifest
index d27826481c8..1a6dace3ae5 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1 +1,2 @@
 DIST kodi-pvr-mythtv-7.1.1.tar.gz 706444 BLAKE2B 
130dc700cbc3d95e5d5332caf5718ef965442f0e42a6922c000753da63a6d679352560ddb5f6ced03f993f12fecbd1e4e8d42618cb5110d65b5bf425d32d79c5
 SHA512 
9154924e7c433a8d0aa6c82a8e6b638310707d1df0607a19da7cc97431e66a38f11ab2d5e1c95ec05caf37f4a32ddce54efa4e94f07d19d2264422d38c4e6bad
+DIST kodi-pvr-mythtv-7.2.0.tar.gz 706467 BLAKE2B 
c426f9f040cc35e13ebb103cd93b4abc64ff101b50f84fe59c2582252c067a4a36b4052adeb7be294ab7d78f3fa5626cd3fd234445f70474bf9248e2fbe28a0f
 SHA512 
30a6cbe8adb5783553fac5869cbb4cda8b78637acffe5a43d06a89115d39f0391492f1c69ecd44e4eaf79d3b85b421d4a4851ef8433f3faa1d9d19c8348f5003

diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.2.0.ebuild 
b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.2.0.ebuild
new file mode 100644
index 000..3e6fb192fd6
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-7.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv";
+SRC_URI=""
+
+case ${PV} in
+)
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git";
+   inherit git-r3
+   ;;
+*)
+   CODENAME="Matrix"
+   KEYWORDS="~amd64 ~x86"
+   
SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+   ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+   sys-libs/zlib
+   =media-tv/kodi-19*
+   "
+RDEPEND="
+   ${DEPEND}
+   "



[gentoo-commits] proj/chromium-tools:master commit in: /

2020-11-21 Thread Stephan Hartmann
commit: 7e33e3e27556dd8c7774b5b2ec94250c4e687f50
Author: Stephan Hartmann  gentoo  org>
AuthorDate: Sat Nov 21 19:34:38 2020 +
Commit: Stephan Hartmann  gentoo  org>
CommitDate: Sat Nov 21 19:34:38 2020 +
URL:
https://gitweb.gentoo.org/proj/chromium-tools.git/commit/?id=7e33e3e2

Add alternative chrome bump script

Signed-off-by: Stephan Hartmann  gentoo.org>

 bump_chrome.py | 258 +
 1 file changed, 258 insertions(+)

diff --git a/bump_chrome.py b/bump_chrome.py
new file mode 100755
index 000..a046815
--- /dev/null
+++ b/bump_chrome.py
@@ -0,0 +1,258 @@
+#!/bin/env python3
+
+import argparse
+import json
+import os
+import shutil
+import sys
+import urllib.request
+
+from portage.dbapi.porttree import portdbapi
+from portage.versions import *
+from portage.package.ebuild import digestgen, config
+from portage.output import EOutput
+
+from git import Repo
+
+channels = ["stable", "beta", "dev"]
+pkg_data = \
+{
+"www-client" :
+{
+"stable" :
+{
+"pkg" : "google-chrome",
+"suffix"  : None,
+"version" : None,
+"bump": False,
+"stable"  : False
+},
+"beta"   :
+{
+"pkg" : "google-chrome-beta",
+"suffix"  : None,
+"version" : None,
+"bump": False,
+"stable"  : False
+},
+"dev":
+{
+"pkg" : "google-chrome-unstable",
+"suffix"  : None,
+"version" : None,
+"bump": False,
+"stable"  : False
+}
+},
+"www-plugins" :
+{
+"stable" :
+{
+"pkg" : "chrome-binary-plugins",
+"suffix"  : None,
+"version" : None,
+"bump": False,
+"stable"  : True
+},
+"beta" :
+{
+"pkg" : "chrome-binary-plugins",
+"suffix"  : "beta",
+"version" : None,
+"bump": False,
+"stable"  : False
+},
+"dev"  :
+{
+"pkg" : "chrome-binary-plugins",
+"suffix"  : "alpha",
+"version" : None,
+"bump": False,
+"stable"  : False
+}
+}
+}
+
+def getChromeVersionData(base_url, os):
+if not base_url.endswith("/"):
+url = base_url + "/"
+url += f"all.json?os={os}"
+
+response = urllib.request.urlopen(url)
+data = json.loads(response.read())
+return data[0]["versions"]
+
+def getChromeChannelVersion(versions, channel):
+for item in versions:
+if item["channel"] == channel:
+return item["current_version"]
+return None
+
+def isMajorBump(uversion, tversion):
+uv_list = uversion.split('.')
+tv_list = tversion.split('.')
+if int(uv_list[0]) > int(tv_list[0]):
+return True
+return False
+
+def getPrevChannel(channel):
+channel_list = channels + [channels[len(channels) - 1]]
+for i in range(0, len(channel_list) - 1):
+if channel_list[i] == channel:
+return channel_list[i + 1]
+raise ValueError(f"Unknown channel \"{channel}\".")
+
+def main():
+parser = argparse.ArgumentParser()
+parser.add_argument('--commit', '-c', action='store_true')
+parser.add_argument('--dry-run', '-n', action='store_true')
+args = parser.parse_args()
+
+output = EOutput()
+
+output.einfo("Fetching upstream version information ...")
+
+versions = getChromeVersionData(base_url="https://omahaproxy.appspot.com";,
+os="linux")
+
+chrome_info = {}
+for channel in channels:
+chrome_info[channel] = None
+
+for channel in channels:
+chrome_info[channel] = getChromeChannelVersion(versions=versions,
+   channel=channel)
+
+output.einfo("Looking up Chrome version information in tree ...")
+
+db = portdbapi()
+repo_path = db.getRepositoryPath(repository_id="gentoo")
+for category in pkg_data.keys():
+for channel in channels:
+pkg  = pkg_data[category][channel]["pkg"]
+cpvs = db.cp_list(mycp=f"{category}/{pkg}", mytree=repo_path)
+pkg_data[category][channel]["version"] = None
+for cpv in cpvs:
+(cp, version, rev) = pkgsplit(mypkg=cpv)
+suffix = pkg_data[category][channel]['suffix']
+if suffix is not None:
+suffix = "_" + suffix
+if version.endswith(suffix):
+pkg_data[category][channel]["version"] = 
version[:-len(suffix)]
+elif not "_" in version:
+pkg_data[category][channel]["version"] = version
+if pkg_data[category][channel]["version"] is None:
+output.ewarn

[gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-dl/

2020-11-21 Thread Michał Górny
commit: dcb86f84182a2d9dde1e766b8abf4d43cee59309
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov 21 19:09:45 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov 21 19:09:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb86f84

net-misc/youtube-dl: Bump to 2020.11.21.1

Signed-off-by: Michał Górny  gentoo.org>

 net-misc/youtube-dl/Manifest   |  1 +
 net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild | 72 ++
 2 files changed, 73 insertions(+)

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index cc7ee7f6835..e4cf35cd360 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -3,3 +3,4 @@ DIST youtube-dl-2020.11.01.1.tar.gz 3190146 BLAKE2B 
9f0a6d5041f12881d0f028459054
 DIST youtube-dl-2020.11.12.tar.gz 3188015 BLAKE2B 
17267ce8c3068f3a1aca20b23a77a964b005fe4a64a5c37fd3f1d97e4daae4978379ff81b6e4ac4b86fa1f3d27f01b1742dc26e42ea5b8522e3408bfe9f9e944
 SHA512 
7db373f6cc252635a3613ffe0b3b10640e262778105ebbd78b837fe019b0a2609032d2aeb81b239e000a86220aff99d2c018a9a6325adad6981a8ab64048131c
 DIST youtube-dl-2020.11.18.tar.gz 3186065 BLAKE2B 
1c27ffc59bbf7793c58e554923ea7ef8a528191e896f64e39ecb181582bcd9bfecf6de5622e70c873528b1b0b3a8335a12ab6a7b3ac71d603391ebbf83110b89
 SHA512 
110de857759b4c4bd0160242adebb3d8690bda2203a28a7b1a2ac1cdd9bca058702fd0b323010629e74bbb2df38f50c67b710bc2a6ad4cc907827ee013d0dbcf
 DIST youtube-dl-2020.11.19.tar.gz 3188309 BLAKE2B 
775700f26491257125eb68ce49c1ec062ae21568cb3f20463330430d225e2af4e02daed839e5c29cded9b92921a16f0a9611fedc748ca1cd6152c33a131d1503
 SHA512 
042b0fbe0f1100c338924c9278d4071aaf4cd27dfc7c9d951244aec91a9168358e7463352548a5b7c6a567b077a9db69776790c3a35e08bdf6552f465b4f735f
+DIST youtube-dl-2020.11.21.1.tar.gz 3193010 BLAKE2B 
a7c04f83815e5b7b6b75109863cf470ca2f756523c08fdfb65386756c9cbfea80e9ee2583f26cb41aa382f747b125543b86bf521a7c0973632a3ca331f48499c
 SHA512 
8f9b77eabe7821f952b706fff4db7ef4e0627dc8333fdfb5cfd0d1dfe4f3bab9ca54525c8c9ed7c285d75fe08c02060dd05744a9a82a526789c67040f8cbcd09

diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild 
b/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild
new file mode 100644
index 000..0839988f367
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/";
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz";
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+   dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+   sed -i -e '/flake8/d' Makefile || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   emake offlinetest
+}
+
+python_install_all() {
+   dodoc README.txt
+   doman ${PN}.1
+
+   newbashcomp ${PN}.bash-completion ${PN}
+
+   insinto /usr/share/zsh/site-functions
+   newins ${PN}.zsh _${PN}
+
+   insinto /usr/share/fish/vendor_completions.d
+   doins ${PN}.fish
+
+   distutils-r1_python_install_all
+
+   rm -r "${ED}"/usr/etc || die
+   rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+   elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+   elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+   elog
+   elog "${PN} works fine on its own on most sites. However, if you want"
+   elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+   elog "On some sites - most notably YouTube - videos can be retrieved in"
+   elog "a higher quality format without sound. ${PN} will detect whether"
+   elog "ffmpeg is present and automatically pick the best option."
+   elog
+   elog "Videos or video formats streamed via RTMP protocol can only be"
+   elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+   elog
+   elog "Downloading MMS and RTSP videos requires either mplayer"
+   elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+   elog
+   elog "If you want ${PN} to embed thumbnails from the metadata into the"
+   elog "resulting MP4 files, consider installing 
media-video/atomicparsley"
+}



[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

2020-11-21 Thread Andreas K. Hüttel
commit: 883a8fcde2ae0e61193132f7964978ec003cfb01
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Nov 21 19:01:19 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Nov 21 19:01:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883a8fcd

app-office/libreoffice: Enforce consistent llvm and clang

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  | 14 +++---
 app-office/libreoffice/libreoffice-7.0..ebuild | 14 +++---
 app-office/libreoffice/libreoffice-.ebuild | 14 +++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index b7f883af378..75e3660ccfa 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-wireless/bluez
)
clang? (
-   sys-devel/clang
-   sys-devel/llvm
-   sys-devel/lld
+   || (
+   (   sys-devel/clang:10
+   sys-devel/llvm:10
+   =sys-devel/lld-10*  )
+   (   sys-devel/clang:11
+   sys-devel/llvm:11
+   =sys-devel/lld-11*  )
+   (   sys-devel/clang:12
+   sys-devel/llvm:12
+   =sys-devel/lld-12*  )
+   )
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )

diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild 
b/app-office/libreoffice/libreoffice-7.0..ebuild
index 735ca0fa649..5040a3e0391 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-wireless/bluez
)
clang? (
-   sys-devel/clang
-   sys-devel/llvm
-   sys-devel/lld
+   || (
+   (   sys-devel/clang:10
+   sys-devel/llvm:10
+   =sys-devel/lld-10*  )
+   (   sys-devel/clang:11
+   sys-devel/llvm:11
+   =sys-devel/lld-11*  )
+   (   sys-devel/clang:12
+   sys-devel/llvm:12
+   =sys-devel/lld-12*  )
+   )
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index d114626a09d..1b78e99f05f 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-wireless/bluez
)
clang? (
-   sys-devel/clang
-   sys-devel/llvm
-   sys-devel/lld
+   || (
+   (   sys-devel/clang:10
+   sys-devel/llvm:10
+   =sys-devel/lld-10*  )
+   (   sys-devel/clang:11
+   sys-devel/llvm:11
+   =sys-devel/lld-11*  )
+   (   sys-devel/clang:12
+   sys-devel/llvm:12
+   =sys-devel/lld-12*  )
+   )
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )



  1   2   >