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

2020-04-17 Thread Michał Górny
commit: 832e3fefbc18adcedad4eb3b52ed68f264cf5b23
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Apr 18 05:51:22 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 18 05:55:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=832e3fef

dev-python/PyContracts: Mark ALLARCHES

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

 dev-python/PyContracts/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/PyContracts/metadata.xml 
b/dev-python/PyContracts/metadata.xml
index cdd65e542f7..091bede11c1 100644
--- a/dev-python/PyContracts/metadata.xml
+++ b/dev-python/PyContracts/metadata.xml
@@ -5,6 +5,7 @@
 pyt...@gentoo.org
 Python
   
+  
   
 PyContracts
 AndreaCensi/contracts



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

2020-04-17 Thread Michał Górny
commit: 169e61ff78b814453042e749b2bdc9ac469180cf
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Apr 18 05:44:46 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 18 05:55:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169e61ff

dev-python/PyContracts: Bump to 1.8.14

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

 dev-python/PyContracts/Manifest  |  1 +
 dev-python/PyContracts/PyContracts-1.8.14.ebuild | 32 
 2 files changed, 33 insertions(+)

diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index a086d948ef8..fbdd688b99f 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,3 +1,4 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 
5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526
 SHA512 
1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 
988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725
 SHA512 
7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 
083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758
 SHA512 
9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
+DIST PyContracts-1.8.14.tar.gz 92346 BLAKE2B 
507fdfb313347d6650f21326b6b70b73f17cd702f25d06d97e5d84f84c9bf7f23cceb48d918727158d02081115344a4194e307caed59510265dacbf267774ab4
 SHA512 
95f8c76e35cc7549fefa069d9c354fc1d4a55dcab0f3fd322cb86aed92c7bfa75a06eabb7540ff991d590a90cdec781906b856291002a82ee5ab0072cdcf6ccd

diff --git a/dev-python/PyContracts/PyContracts-1.8.14.ebuild 
b/dev-python/PyContracts/PyContracts-1.8.14.ebuild
new file mode 100644
index 000..0a7be7c3243
--- /dev/null
+++ b/dev-python/PyContracts/PyContracts-1.8.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Declare constraints on function parameters and return values"
+HOMEPAGE="https://andreacensi.github.com/contracts/ 
https://pypi.org/project/PyContracts/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+   dev-python/decorator[${PYTHON_USEDEP}]
+   dev-python/future[${PYTHON_USEDEP}]
+   dev-python/pyparsing[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+python_test() {
+   nosetests -v \
+   $(python_is_python3 || echo 
"--ignore-files=test_py3k_annotations.py") \
+   || die
+}



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

2020-04-17 Thread Hans de Graaff
commit: 410ead4164c95e0951fd22b35ff7ca6d3e58dc55
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:44:03 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:44:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410ead41

dev-ruby/rest-client: cleanup

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

 dev-ruby/rest-client/Manifest |  1 -
 dev-ruby/rest-client/rest-client-2.0.2.ebuild | 36 ---
 2 files changed, 37 deletions(-)

diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index 94e23e2b8eb..6d1b71d727f 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,2 +1 @@
-DIST rest-client-2.0.2.gem 149504 BLAKE2B 
839003255545ad8d67b0fd896f56b628d647a90fdf9eaf4e27f6c5d0179f15a1c17683e81ff7f288ffac55dcd523f5b01b4217a277b6c260bf45df8cef3998e2
 SHA512 
c132518a9ff0029e79826cf90de442b01f6f422b464e04914947c2f757cb7046b96c915f0248a82172f7980519fa9fe5f7bcb9dcfe28889abc62dbb48cee1030
 DIST rest-client-2.1.0.gem 147456 BLAKE2B 
602e3cea1bdb117ad8b783d30741f699b18085fd6dd4f0d26a8a8f3b658bc6f807357a7412eaae312566f1b4d5ee7e311f51d5fd4a8eb9063e8552335b019a2e
 SHA512 
fe5d44409dfe607566b4c0324441d9a3981776699027bfbc92283b1cd425f204211fc872593cb0784e0ca7a5e061e98793540eedfeb1891d9a8afd53a5ce01de

diff --git a/dev-ruby/rest-client/rest-client-2.0.2.ebuild 
b/dev-ruby/rest-client/rest-client-2.0.2.ebuild
deleted file mode 100644
index 9ebbe7baae6..000
--- a/dev-ruby/rest-client/rest-client-2.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="history.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
-HOMEPAGE="https://github.com/rest-client/rest-client;
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
-
-ruby_add_rdepend "
-   >=dev-ruby/http-cookie-1.0.2:0
-   >=dev-ruby/mime-types-1.16:* =dev-ruby/netrc-0.8:0
-   !!

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

2020-04-17 Thread Hans de Graaff
commit: e1d894a05ccdab1c126005950caae5c510c2161c
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:35:53 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:35:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d894a0

dev-ruby/compass: drop obsolete blocker

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

 dev-ruby/compass/compass-1.0.3-r1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-ruby/compass/compass-1.0.3-r1.ebuild 
b/dev-ruby/compass/compass-1.0.3-r1.ebuild
index cc402da8bb9..4bb9914b19e 100644
--- a/dev-ruby/compass/compass-1.0.3-r1.ebuild
+++ b/dev-ruby/compass/compass-1.0.3-r1.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=5
@@ -28,8 +28,7 @@ ruby_add_rdepend ">=dev-ruby/chunky_png-1.2
>=dev-ruby/compass-core-1.0.2:1.0
>=dev-ruby/compass-import-once-1.0.5:1.0
>=dev-ruby/rb-inotify-0.9
-   >=dev-ruby/sass-3.3.13:* =dev-ruby/sass-3.3.13:* 

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

2020-04-17 Thread Hans de Graaff
commit: 023a25270831ad6736b07eb7875b849dd4751c96
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:43:28 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:43:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023a2527

dev-ruby/addressable: cleanup

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

 dev-ruby/addressable/Manifest |  1 -
 dev-ruby/addressable/addressable-2.5.2.ebuild | 43 ---
 2 files changed, 44 deletions(-)

diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index c93f376d4ed..1025493d026 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,3 +1,2 @@
-DIST addressable-2.5.2.gem 103936 BLAKE2B 
c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc
 SHA512 
ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
 DIST addressable-2.6.0.gem 104448 BLAKE2B 
664365962533d31786e2a362b61879fee544867b7aadc2ceb1ae6709374015a7f0f5c0bd32a81c8f2ae711a4ce1a07cd8f84821e74c3b6aa56b7474800567737
 SHA512 
71aa0ce8b61a07c1d01298dcd29cb2ba73d06ed1578908cae60351214f7d0bc6c9b8b0db7a78044fb1bed258bf00f2f093aa4e2bcb32575f4db2a79ee36b2648
 DIST addressable-2.7.0.gem 104960 BLAKE2B 
4bca65d54ef1d3556cf4017ae68082635c0398b6f604eb3edc18da8f8e1e49e38b46485a8716da3c407fe0605dcc9a12c7a95be49a91c4198c2e2b1cab568805
 SHA512 
4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732

diff --git a/dev-ruby/addressable/addressable-2.5.2.ebuild 
b/dev-ruby/addressable/addressable-2.5.2.ebuild
deleted file mode 100644
index 8dd64c71c34..000
--- a/dev-ruby/addressable/addressable-2.5.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's 
standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable 
https://github.com/sporkmonger/addressable;
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:* 

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

2020-04-17 Thread Hans de Graaff
commit: 295c5f69dd01e9d437677b82ee1b4f5cedbcb1ba
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:41:32 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:41:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295c5f69

dev-ruby/launchy: drop obsolete blocker

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

 dev-ruby/launchy/launchy-2.5.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild 
b/dev-ruby/launchy/launchy-2.5.0.ebuild
index f2248b93216..8cf4802c944 100644
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ b/dev-ruby/launchy/launchy-2.5.0.ebuild
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-# File collision conflict with x11-misc/launchy, bug 545170
-ruby_add_rdepend ">=dev-ruby/addressable-2.7 !!x11-misc/launchy"
+ruby_add_rdepend ">=dev-ruby/addressable-2.7"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
 



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

2020-04-17 Thread Hans de Graaff
commit: 4acf49a5e92a11674ffe15f212ee12ae444121ad
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:39:40 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:39:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acf49a5

dev-ruby/compass: add ruby26

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

 dev-ruby/compass/compass-1.0.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/compass/compass-1.0.3-r1.ebuild 
b/dev-ruby/compass/compass-1.0.3-r1.ebuild
index 4bb9914b19e..d0f7e35f5fc 100644
--- a/dev-ruby/compass/compass-1.0.3-r1.ebuild
+++ b/dev-ruby/compass/compass-1.0.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/compass-import-once/

2020-04-17 Thread Hans de Graaff
commit: 570d5f47270c37872c4b049b698c25a4e741d72d
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:37:41 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:37:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570d5f47

dev-ruby/compass-import-once: add ruby26

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

 dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild 
b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
index 3138a33b49b..3115c37dff1 100644
--- a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
+++ b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 # Skip tests since they depend on sass-globbing which does not have a
 # license and where the last version is known to be broken.



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

2020-04-17 Thread Hans de Graaff
commit: 8d30b5d1d3f9217b2afbb3d757623175bb59c446
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:39:05 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d30b5d1

dev-ruby/compass-core: add ruby26

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

 dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild 
b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
index bbb42be8816..0d1c512aa3c 100644
--- a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
+++ b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 



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

2020-04-17 Thread Hans de Graaff
commit: 3e3bf0b2596dbd2fcf95f9cbcb6c737088cc4cc3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:33:37 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:33:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e3bf0b2

dev-ruby/power_assert: update github remote

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

 dev-ruby/power_assert/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/power_assert/metadata.xml 
b/dev-ruby/power_assert/metadata.xml
index 685de59d7fb..8478fc3e7db 100644
--- a/dev-ruby/power_assert/metadata.xml
+++ b/dev-ruby/power_assert/metadata.xml
@@ -6,6 +6,6 @@
 Gentoo Ruby Project
   
   
-k-tsj/power_assert
+ruby/power_assert
   
 



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

2020-04-17 Thread Hans de Graaff
commit: 9d04a40d4c05eb1ec7c6c0d26184faa995fe12cc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:32:01 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:32:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d04a40d

dev-ruby/power_assert: add 1.2.0

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

 dev-ruby/power_assert/Manifest  |  1 +
 dev-ruby/power_assert/power_assert-1.2.0.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 5c43b80e5dc..fede06b8f52 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,3 +1,4 @@
 DIST power_assert-1.1.5.tar.gz 17326 BLAKE2B 
bd5e0627b681ccebc546a8b95170a3fe20ba919ff19405552e47c8e8f7faebe0c638a71e303e63e04a88b7d48a6ccd3e1117fea863275abbd5182d66e9634db1
 SHA512 
bc1f98b9b8c3ac327a744a28c54c747177eef187cd998778244f3dce59d2909e94960a50179552a9a687b973bcef49f26fffa67d75e9b3b92ea9959d40b93298
 DIST power_assert-1.1.6.tar.gz 17331 BLAKE2B 
1165f092f7a6dea45c8f12d61e2ea77d30091e1a450cadceddaaf709f9e3dc6d805489780021d978ebfbe5dda15e302f0cbebc7a03e247d2e654fcd0eafd149a
 SHA512 
e2a42fe3c4dd5f51315d4076310971b2678605d448730855c53664f638b7e8b8926776d006be1c40ddaff59d5715838f601c5ed86635cd8a1bbb214e147b0ada
 DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 
54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336
 SHA512 
bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
+DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 
8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16
 SHA512 
2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c

diff --git a/dev-ruby/power_assert/power_assert-1.2.0.ebuild 
b/dev-ruby/power_assert/power_assert-1.2.0.ebuild
new file mode 100644
index 000..ae5e41b5fc6
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/ruby/power_assert;
+SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+   sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+   sed -i -e '1igem "test-unit"' \
+   -e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+   # Avoid git dependency
+   sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} 
|| die
+
+   # Avoid circular dependency on byebug when bootstrapping ruby
+   sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' 
test/test_helper.rb || die
+   rm test/test_core_ext_helper.rb test/trace_test.rb || die
+
+   # Avoid circular dependency on pry when bootstrapping ruby
+   sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^end/ s:^:#:' 
test/block_test.rb || die
+}



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

2020-04-17 Thread Hans de Graaff
commit: 5430f066c4d962788d13e14e9982784b7c3326ee
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Apr 18 05:27:54 2020 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Apr 18 05:27:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5430f066

dev-ruby/combustion: add 1.2.0

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

 dev-ruby/combustion/Manifest|  1 +
 dev-ruby/combustion/combustion-1.2.0.ebuild | 24 
 2 files changed, 25 insertions(+)

diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index 7ce06805858..b976e81f532 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,3 +1,4 @@
 DIST combustion-1.1.0.gem 18432 BLAKE2B 
32e3c124d21c9fe96e00bab6e600bb0fd40dc998fa72a5256f5f59fce96f6ea7070238b5d0e5668b828abdf6dee3a03b78d750d8695a6e48d1164d4207753320
 SHA512 
d948a0235fbf5dff32c7e448426ec7bf361bad63aeee771ead0030143914bbb33afe6a7e6092e227ff4684bf312ed9194f0f27d71c979b2abdfb13f0e5069158
 DIST combustion-1.1.1.gem 18432 BLAKE2B 
e9e5a8dd5e4bfd865be3ff168c7403b7fa7ff6af9b6bd380bbfb02d8ffbaf9e4f820ecfb71cba58256a6fda64ee702f2159c970c9031722ccc2a4d2f365eafaa
 SHA512 
559b34dfbc501c4be014fbfb6e3f8f61ca25b6ed2551da6bfc258be41161c5249e98e64faacbd9bd754d40c3a3f67d33eeadfe75624519cc4293f7528a7bea16
 DIST combustion-1.1.2.gem 18432 BLAKE2B 
0a8aa7b418b19cc5e75957850670cc01d3d400dd4073ce0771d3070d4a3f518ab8540b70a89eb5c345e2086418b12a807bc072b17ea83dfd10258bd8b2bdee95
 SHA512 
ab9358bb68b5797830c73c3b66021cbfebc71d927d581622909e47bff56240df7cbd1bb2f4b70743d13d1f178f27b9cd5ab6bf964704eeeff4367025b0991633
+DIST combustion-1.2.0.gem 18944 BLAKE2B 
b4851e19779849b0edbf9759052b7a3546ead143322b15267b02295dce6f6097aa84eee62dc9e36e3f1c7fc66642216e6ad6fd713c21014ff658ef79afc597f9
 SHA512 
3bb64441910cc2ce24bbaa3b05953c4b2b159a064478c03afe1aa9685fc22c7766e1d26c0cfc606a66d137dcdbe29457f0ba43218659678c52364560a50c01b9

diff --git a/dev-ruby/combustion/combustion-1.2.0.ebuild 
b/dev-ruby/combustion/combustion-1.2.0.ebuild
new file mode 100644
index 000..8577b3476b2
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion;
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "
+   >=dev-ruby/activesupport-3.0.0:*
+   >=dev-ruby/railties-3.0.0:*
+   >=dev-ruby/thor-0.14.6
+"



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

2020-04-17 Thread Jeroen Roovers
commit: 43c58e0b6e336055e246fb3479f8053bfe185ae4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 18 03:56:55 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 18 05:05:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c58e0b

profiles/package.mask: Fix entry date

Signed-off-by: Jeroen Roovers  gentoo.org>

 profiles/package.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 221479c9aeb..53810d4585d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,7 +39,7 @@
 # Masked for removal in 30 days (bug #717744).
 app-i18n/man-pages-fr
 
-# Jeroen Roovers  (2020-04-26)
+# Jeroen Roovers  (2020-04-16)
 # Breaks API, see https://bugs.gentoo.org/717728
 =dev-libs/libuv-1.36.0
 



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

2020-04-17 Thread Christoph Junghans
commit: 46a503722ae951c5ef45649cf9c57fce63fd61a6
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sat Apr 18 04:39:25 2020 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sat Apr 18 04:39:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a50372

sci-chemistry/votca-csg: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-chemistry/votca-csg/Manifest |  3 +
 sci-chemistry/votca-csg/votca-csg-1.6.ebuild | 92 
 2 files changed, 95 insertions(+)

diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 1a8fa87be35..f0803b227f2 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -2,14 +2,17 @@ DIST votca-csg-1.4.1.tar.gz 347702 BLAKE2B 
8c98804bafd75148fa72a9e119d4448ab9b04
 DIST votca-csg-1.4.tar.gz 346527 BLAKE2B 
8f0a41f9aa9fd865e2e544d5fd587d93d631edc2dabab8edfc3461582da2e0401a266a42be1c0f1e6647502cdcccee55b5bba891aa156394012b8b5e1b06f7e8
 SHA512 
26318644c7af2dfa1b81242b27ffac98f2180c3a1f05581bc50a00f644cec4b19ffbaf41c9d941a4714171b56ae93fe41f1a663cd0593ae2b0be2da379119d9b
 DIST votca-csg-1.5.1.tar.gz 708319 BLAKE2B 
2ea75cf08dc3005bd08ebe85113d95743fe85bae4b7ac3c2e2d9b64be64a7103ecf30b9edf45cffa86b7588d5c57a0256aef02f4590fa6031cb63881480bd0fd
 SHA512 
3559452182c325d5df72918ec6e12122c8214df9733d779c123ff199597fe47fc493fd75adf1f5dbc6b55016373863378ba3cc69fb6b61bc1531c6e591d8131c
 DIST votca-csg-1.5.tar.gz 429164 BLAKE2B 
da04bd9ce8e879e9a961006256e03d160fa49fe77aa2f1eff0986b338296b04137bb087ecfabb7f2fc855b0ccd83dc4fd65c43303bf5f2eef0519d27b0ec
 SHA512 
c5a77ded3c9b2582494bea55b464689d566d4155713af823dccc6999f98438444d51fae3948144f82c2aaf3914eee740fe21e8828af689d37ab0b5ffea0605fa
+DIST votca-csg-1.6.tar.gz 464175 BLAKE2B 
1871c7edc4b4e848a06049a7c687e906f166312777bdbf5c65be8efe8d5032582fdca9dc7eca453b7013901f409326b0583c79731c68fa2b4e6366f021958b0b
 SHA512 
76cda93023d46a66ae31edcec0ece709ddc70a9be9d098721b945006c197ed3b6cbd1e643158797be518c4fe66f7b23d3e8d8735cbd9e155db3db0d79929cfbe
 DIST votca-csg-1.6_rc1.tar.gz 479265 BLAKE2B 
c4ba3c81eefd375eea6f8c0b1cd60f9cc80898fb7e8e811ecc286f06d94bd4316edfca277649ec3f7f8b751b2f2928ca2dfe61cc3b1c3060a324ea783c62003f
 SHA512 
6622648ddc3308ca2f8e98d6dbcd28e33a4e0fb44d96ef94ebcaa2e87e5ba3ca2ab83dcc1de4fd0803dbc20ba7192f5fdd2c935b364ed4e2122b5948c10d4936
 DIST votca-csg-manual-1.4.1.pdf 1282641 BLAKE2B 
370b7c8997649555fd2360b999cf381c340a74c3747afda23d0e9d346367cc6d14d4e9a0e9ac82184945427d30050dd623dd1b6d8218c6ff3d2f17331987aaae
 SHA512 
e89f41af05eaeb9ea499e8625cc98e2632ec647ec2d8c9c9052dcd4d2935d082b29b51495514e3e06e73ce42b8cda7017fc523a013569378e2bc86bf88ad32d4
 DIST votca-csg-manual-1.4.pdf 1281983 BLAKE2B 
5659c2e327ba7bb00fac15adfb578288d546b509366863f593776a62dd3064662535d4fd525f1063f5ccaf47446822f13fefd7f66aa9d68cd1a4a7c99d66a790
 SHA512 
2e1f4a4375d83df9bd357d4d17e79d26a3a31c9177f008de86721427ffc6f43a5000ec840691108b52a8aecf962321ba6363cd975c7445d7230ee5b0b151b3fa
 DIST votca-csg-manual-1.5.1.pdf 1263719 BLAKE2B 
29e2ce27215787a1121e45ec1e88ce7c61ba81709a2519aa0959eede505498b9aaf4f38666bb1a4f97837c98b862e7ed02405da07294a7ec76cc80390fe72e0d
 SHA512 
7d9fb4c635383e1b9c9547691f8729e19f273fcafc4dab2a6b438b3ce98ea05bd31887d09bc4edc86ceb0b04d71a4371aed7aadc3ba6864f7be2ef3328ede642
 DIST votca-csg-manual-1.5.pdf 1273566 BLAKE2B 
edfa2adb942d968cf79499e89342b7aaab64edfbfb6e02f76a66201df0920a58acc17bf4e2e4846d104519df163223c27f283cc5798ec7b64d9317a7728ff8c4
 SHA512 
da298ab0c27000ccf7fb5793c4252c4e17a969709db2649a5acb56af6208b954312c46a2ea8399cdb879b699e72a0ded0b2fe1bcd26431c6625f36b09c0267a5
+DIST votca-csg-manual-1.6.pdf 1248178 BLAKE2B 
5213d55787041db81fe8563febbf130db6aed9233e569039b66d69cfb173131353d45bef824640ee7b0a3fed7821ede4d5a6ce6ffc14d1548499317afdc0248a
 SHA512 
e91d4b8397b67808c9671b9adbaad41fd9a0ede90066e220839d86f21a9bbcd4e433534faf1dfbca106d55af5a6cce0425a5bdfa3eb30ebe14469594da0129ca
 DIST votca-csg-manual-1.6_rc1.pdf 1248403 BLAKE2B 
b702eff4a36d27d592147f115f4e9080cbf580b6401141a14865395f0cb927c35f60035f92724e71e5edadbbe3e317f93989eb6f2e0a0e7b9f685e56851546d2
 SHA512 
2514bd2fee4bae787a3f8c07d1f1d90061a2b503255efe0730ed164bb002c7e7ad7309ccd3b5b931994f70b7ed99afde28955d9ea1b34c86df21bfcb8bfb39bb
 DIST votca-csg-tutorials-1.4.1.tar.gz 6339417 BLAKE2B 
e9acf8e421f6fce4d97be2d51fb559979c6fd3e6b042525cedf32cadeab1dddc5b1aaf80bbbfd387da3bce71672759c2e84d317c789f616dc71834c72a581fff
 SHA512 
896ec9d6b2537a06301046a74c1957708eb96d9854b3ec855fe3457208c142f6fb26a03e323a2644862a1efd0030fcceb1189f73655b984462f0f7127a02de90
 DIST votca-csg-tutorials-1.4.tar.gz 6348417 BLAKE2B 
612fcbc4457a57be74e5306bf86d6e031ea8cd55ebe3f4d246c0876e272e6e6dd535c8dd2f24f7593cb1ef31fbc18111269d29cb69120368ddef7b1b7d25825c
 SHA512 

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

2020-04-17 Thread Christoph Junghans
commit: fa5748e3323ecc56fec9745321bfdd402b5d6417
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sat Apr 18 05:01:12 2020 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sat Apr 18 05:01:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5748e3

sci-chemistry/votca-xtp: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-chemistry/votca-xtp/Manifest |  1 +
 sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild | 45 
 2 files changed, 46 insertions(+)

diff --git a/sci-chemistry/votca-xtp/Manifest b/sci-chemistry/votca-xtp/Manifest
index e8f2892c4ea..7a737a6f82f 100644
--- a/sci-chemistry/votca-xtp/Manifest
+++ b/sci-chemistry/votca-xtp/Manifest
@@ -2,6 +2,7 @@ DIST votca-xtp-1.4.1.tar.gz 15214413 BLAKE2B 
0f6e67179e2ee1fa8ab79ca0c2d810f9867
 DIST votca-xtp-1.4.tar.gz 15214266 BLAKE2B 
435ba1603495d904ccce20b4fa665d3a1c62fc04005ea89cf83b431240fb78f8a44f09ad619af331802e43ca3d05b20a4c60c75360940d4f786c0030fd7a
 SHA512 
ffc32260331862393e199f7ab643b1008ee4f800cd017f175550a079afaa20e5c929cb8599bc0c2a2328253051895de7b979f5fec044243abc680a0dc87a69b9
 DIST votca-xtp-1.5.1.tar.gz 14634849 BLAKE2B 
84ee9fc531a530ba276a6fd3eccc78dd25c27346db76871f33fe307dde451956bf091b636dd5594bf3b8b24a727fe7e5a730fb85cd2cbb0e5605705996e69bd2
 SHA512 
8fb6891e84d4d685e26287344554b705c607e7cb9f497c00ac9cd8328e50210c56706abdb7004b83d4addbfbc7b35c3526b4feabf75f681362b3b7a39c54b668
 DIST votca-xtp-1.5.tar.gz 14637712 BLAKE2B 
af04de706f0d100968928459a03b6a94a94a211b3f5bd056d123756d40760fb0ada70add429ed5b86e211dbdd3b91aa4cf12e51a260638766d04158e7b5a1201
 SHA512 
693f34004749edfbabcd0a19dc23b3de3c09858c7c0dfe1e420b92632397971e3687489c1074a489d4d2fd337ddc5749c419869db104c65736e7c01bf12cd140
+DIST votca-xtp-1.6.tar.gz 1404955 BLAKE2B 
1599281ea1cd6b5a93b1d91f69a793af7bb9cd2fbf70157e5d40a5bfc72f973f3d97338f92157c2c482ad041f8afda298282b1f83dda66d0bb189bdc07bb5a23
 SHA512 
cb99c31fe7f1af53b8ccf50cc9cc304ed5c5b5d1a165e1a72a456c0bbf5ac8bb9263c9eff829acc74be348192afbf80fd4d80a2c20d1dd5d7f909b1b50368670
 DIST votca-xtp-1.6_rc1.tar.gz 13586771 BLAKE2B 
d5b72a7389b77df0570eac0021870bba3fa66a89b3a2df1e08632b1c1827884d101ef8d972762dae35e44e53e7a9fe9278d3204eec09c35d091ab3427b055be4
 SHA512 
0b54eddcf944967b1d41f75f4887eba9edc3be18b94d319e93e795a24f58a2877d7f60afd806290eacb41d329d1b1206ebaab83874d6be2d5b026f06dbc19dfd
 DIST votca-xtp-manual-1.4.1.pdf 1066873 BLAKE2B 
8cbd4b55b013794a19a8b5867b929b8e2d9084e6780d777b2a2bbaea23006f4f4ec5b26bd4a07c59e1c6726f23471eb1756b668636e0c4e656a0807e64197586
 SHA512 
fdf1147f24785524f5e96020fcd29c32bbeef520eebf6afba32b59d7e777d586c452919478d2734c3f021e558b1147b945cdbc0833402be2b16e5af3a8e37f5f
 DIST votca-xtp-manual-1.4.pdf 1064006 BLAKE2B 
e4f0c20c6d40a5f58b863258cc122e5a7cf376b7138927c0a6bdd400841c330fc013287513258f6f68609e39f0bf39b965fd099171594c5e2730fba82a2488d4
 SHA512 
96d7f59dbcc3a6efdc297237025217d5a56d2c81e491d90680786ea4769a5ebbea379df3b06c4847307ee30accd7415e316dee4730361262f5aff73d2f5d387e

diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild 
b/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
new file mode 100644
index 000..9e3b8ca0fa6
--- /dev/null
+++ b/sci-chemistry/votca-xtp/votca-xtp-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils multilib
+
+IUSE=""
+if [ "${PV}" != "" ]; then
+   SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+   S="${WORKDIR}/${P#votca-}"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN/-//}.git;
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Votca excitation and charge properties module"
+HOMEPAGE="http://www.votca.org;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+   ~sci-libs/votca-tools-${PV}
+   >=dev-cpp/eigen-3.3
+   sci-libs/hdf5[cxx]
+   ~sci-chemistry/votca-csg-${PV}
+   sci-libs/libxc"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+DOCS=( README.md NOTICE CHANGELOG.md )
+
+pkg_postinst() {
+   einfo
+   einfo "Please read and cite:"
+   einfo "VOTCA-XTP, J. Chem. Theo. Comp. 14, 6353 (2018)"
+   einfo "https://doi.org/10.1021/acs.jctc.8b00617;
+   einfo
+}



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

2020-04-17 Thread Christoph Junghans
commit: f861b5c504b1598dbb541adeb3a63aac9de6ecb5
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sat Apr 18 04:40:10 2020 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sat Apr 18 04:40:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f861b5c5

sci-chemistry/votca-csgapps: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-chemistry/votca-csgapps/Manifest   |  1 +
 .../votca-csgapps/votca-csgapps-1.6.ebuild | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/sci-chemistry/votca-csgapps/Manifest 
b/sci-chemistry/votca-csgapps/Manifest
index 8a5af18b1c3..a10238a4b5e 100644
--- a/sci-chemistry/votca-csgapps/Manifest
+++ b/sci-chemistry/votca-csgapps/Manifest
@@ -2,4 +2,5 @@ DIST votca-csgapps-1.4.1.tar.gz 21066 BLAKE2B 
8e1d25957b7c62d2182872de4d0c50c90f
 DIST votca-csgapps-1.4.tar.gz 21072 BLAKE2B 
30c2f6692544741bfbec09efea2f68ae48cd4716e61e40d3da12a17ad941f2947cc6a8477229b80e420e217a95adff4152a07215e2e913e71736b61ba1ac226a
 SHA512 
325c99606f17d7bb00e2cc3b1545f31dd4cf1fbc0d216f2da2c48e06b2011c9f99096643a6c6efd794a169de056f803f791c156afec4a73e41c58bc4ca1055f9
 DIST votca-csgapps-1.5.1.tar.gz 26006 BLAKE2B 
8651978c15087fc7332fe229cfc33d8c4257faf46d72f7ac5fbaaf5f31133c4df3d97cae2b18730b5700e742c27e3db39696fdfe910ed884952ba0f832220c3d
 SHA512 
4f83a46f16eb0a4cb9acc6c0d9523fa746dcf670107355c95fc02daa6ca91fb4f8d5e48bc920d8c13a9445390a25415f7217979903ea86f890df1d4704944c28
 DIST votca-csgapps-1.5.tar.gz 25975 BLAKE2B 
185e759d658c6f763da2d26770766ec8ee05017b4c6a67e13915de04fbf2ecf268f2f800c5e18ef0f38c615340b0db163e886dc98a9395a69359f94dc8773f60
 SHA512 
20dda9d07ef2f33c9decff2766ece8f24cf2562993b4dfb7dd637d84325b835a6ecd30d34c5cfb9c428dbf72c2b5dfe9fd49d266182704b981db151c3c4ea2e4
+DIST votca-csgapps-1.6.tar.gz 20130 BLAKE2B 
0c34fba42a70f756043aae89f51b94cc0a9c9a85680ed78c56b4c05f834d94c74aff59e4adf6155e5fab81d057da58ec420d843532af57beeaa6e81f82432d92
 SHA512 
5a85abaf6b09a225604f33f2e0cfb774525159e9bce89efd7ebfc0c9c37342e472503ff51c3065be2a4b87e95671f55164c630477f404f94b0510a83e262352f
 DIST votca-csgapps-1.6_rc1.tar.gz 20138 BLAKE2B 
9374911f761fd78f01721e8e10f3b9c14f2ba894735735e4d09f5e29eb1d1b69f4fa081699d7a93abfad2ebe55d6439edbb6db547618e6d2cfbaf7bbc8a79ca8
 SHA512 
153bd6e537175c9908739c60ce80830ebf57c0686f11b21fc541995cb5355d4a3f7f7ee7d1707bb85f5fc859bf260a3a167450175ffe8feb92044e8018be996b

diff --git a/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild 
b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
new file mode 100644
index 000..463cba8e0e3
--- /dev/null
+++ b/sci-chemistry/votca-csgapps/votca-csgapps-1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils
+
+if [ "${PV}" != "" ]; then
+   SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+   S="${WORKDIR}/${P#votca-}"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN/-//}.git;
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Extra applications for votca-csg"
+HOMEPAGE="http://www.votca.org;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   >=dev-cpp/eigen-3.3
+   ~sci-chemistry/${PN%apps}-${PV}"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )



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

2020-04-17 Thread Christoph Junghans
commit: f79cae88988091a96dbcf4e7cd5112bbdc9c8fe7
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sat Apr 18 04:29:53 2020 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sat Apr 18 04:29:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79cae88

sci-libs/votca-tools: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-libs/votca-tools/Manifest   |  1 +
 sci-libs/votca-tools/votca-tools-1.6.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 5900ee36f7d..cff5b44d489 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -2,4 +2,5 @@ DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 
73dc726ea899ceb65d0406f3795f1df79a6
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B 
a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c
 SHA512 
7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B 
ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4
 SHA512 
c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 
2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11
 SHA512 
fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
+DIST votca-tools-1.6.tar.gz 109824 BLAKE2B 
e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19
 SHA512 
0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
 DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B 
d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d
 SHA512 
42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed

diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild 
b/sci-libs/votca-tools/votca-tools-1.6.ebuild
new file mode 100644
index 000..6088d1e095d
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils eutils multilib
+
+if [ "${PV}" != "" ]; then
+   SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+   S="${WORKDIR}/${P#votca-}"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN/-//}.git;
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   dev-libs/boost:=
+   dev-libs/expat
+   >=dev-cpp/eigen-3.3
+   sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+   >=app-text/txt2tags-2.5
+   virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+src_configure() {
+   mycmakeargs=(
+   -DWITH_RC_FILES=OFF
+   )
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-cpp/kokkos/

2020-04-17 Thread Christoph Junghans
commit: ea22e4e3b6f583f84f19ae96c18b467c52619842
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sat Apr 18 04:21:56 2020 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sat Apr 18 04:21:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea22e4e3

dev-cpp/kokkos: version bump

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans  gentoo.org>

 dev-cpp/kokkos/Manifest |  1 +
 dev-cpp/kokkos/kokkos-3.1.00.ebuild | 45 +
 2 files changed, 46 insertions(+)

diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index 44a82a67a70..20fd3f08d3b 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1 +1,2 @@
 DIST kokkos-3.0.00.tar.gz 1923287 BLAKE2B 
4a2935e9388b3d577d6ce8678cad37830970222e6ce8a9c3db67633cb521440f14fdb380f03d3c77cd5ade85abe94aef97e9cc4949cc3a140fae958e0c15fff8
 SHA512 
c9daf62a2c92462c815aa241934aca5720bac8f88195635ae5a3ff4111d289a48898d32358b91e120756d3412820050297a76f44828f4cbc0b2b837a736e84aa
+DIST kokkos-3.1.00.tar.gz 1972408 BLAKE2B 
47c3eb83526dd13430a3b7049a98169d15ef73c6d2b3943c5600a153d28a9c6a0d6ee0b8eda1aac5f1b53556c5cee1680ce92a90f97b1b2741e1e7f0c9222486
 SHA512 
7933542c24e137052d630a503d707912295022863f2d47c89c4a35a9c8a70514763d89e321c66a3878575e661461ede45ac44d74cf45eca2470e7f57840d5c0c

diff --git a/dev-cpp/kokkos/kokkos-3.1.00.ebuild 
b/dev-cpp/kokkos/kokkos-3.1.00.ebuild
new file mode 100644
index 000..1707ae8abba
--- /dev/null
+++ b/dev-cpp/kokkos/kokkos-3.1.00.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Kokkos C++ Performance Portability Programming EcoSystem"
+HOMEPAGE="https://github.com/kokkos;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+openmp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   sys-apps/hwloc
+   "
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+pkg_setup() {
+   if [[ ${MERGE_TYPE} != binary ]] && \
+   use openmp && ! tc-has-openmp ; then
+   die "Need an OpenMP capable compiler"
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
+   -DKokkos_ENABLE_TESTS=$(usex test)
+   -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
+   -DKokkos_ENABLE_DEPRECATED_CODE=ON
+   -DKokkos_ENABLE_SERIAL=ON
+   -DKokkos_ENABLE_HWLOC=ON
+   -DKokkos_HWLOC_DIR="${EPREFIX}/usr"
+   -DKokkos_ENABLE_OPENMP=$(usex openmp)
+   -DBUILD_SHARED_LIBS=ON
+   )
+
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/acme/

2020-04-17 Thread Matthew Thode
commit: e5b4d9163f99699190d0c57bbda64b36ecf9ab3b
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Apr 18 03:28:18 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Apr 18 03:28:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b4d916

app-crypt/acme: 1.3.0-r1 bump for regression caused by eclass change

fixes: 180fa85d7d00aea463c399f70348beaad9166eb7
Closes: https://bugs.gentoo.org/717970
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --force
Signed-off-by: Matthew Thode  gentoo.org>

 app-crypt/acme/{acme-1.3.0.ebuild => acme-1.3.0-r1.ebuild} | 1 +
 app-crypt/acme/acme-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-crypt/acme/acme-1.3.0.ebuild 
b/app-crypt/acme/acme-1.3.0-r1.ebuild
similarity index 98%
rename from app-crypt/acme/acme-1.3.0.ebuild
rename to app-crypt/acme/acme-1.3.0-r1.ebuild
index db4f214816d..279b634c175 100644
--- a/app-crypt/acme/acme-1.3.0.ebuild
+++ b/app-crypt/acme/acme-1.3.0-r1.ebuild
@@ -52,6 +52,7 @@ DEPEND="
 
 src_compile() {
python_foreach_impl run_in_build_dir default
+   distutils-r1_src_compile
if use doc ; then
cd docs || die
sphinx-build -b html -d _build/doctrees   . _build/html

diff --git a/app-crypt/acme/acme-.ebuild b/app-crypt/acme/acme-.ebuild
index 4aaf884c944..baec59de4e1 100644
--- a/app-crypt/acme/acme-.ebuild
+++ b/app-crypt/acme/acme-.ebuild
@@ -52,6 +52,7 @@ DEPEND="
 
 src_compile() {
python_foreach_impl run_in_build_dir default
+   distutils-r1_src_compile
if use doc ; then
cd docs || die
sphinx-build -b html -d _build/doctrees   . _build/html



[gentoo-commits] repo/gentoo:master commit in: app-crypt/gpgme/

2020-04-17 Thread Craig Andrews
commit: b977267dfc20dfedd7c65b8d1f76e14dccf1bdba
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Apr 18 02:53:37 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Apr 18 02:53:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b977267d

app-crypt/gpgme: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 app-crypt/gpgme/gpgme-1.13.0-r1.ebuild | 2 +-
 app-crypt/gpgme/gpgme-1.13.0.ebuild| 2 +-
 app-crypt/gpgme/gpgme-1.13.1.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild 
b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index 124db5b26b6..cc0b184d2ef 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs

diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild 
b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index 4f9a829ea5e..f4c1a7f8180 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs

diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild 
b/app-crypt/gpgme/gpgme-1.13.1.ebuild
index 18f3e6fe6ef..ebcbbf49ad9 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs



[gentoo-commits] repo/gentoo:master commit in: app-arch/brotli/

2020-04-17 Thread Craig Andrews
commit: 220190947cbf7362f5c09e1e289cb4d57209ae2b
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Apr 18 02:55:44 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Apr 18 02:55:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22019094

app-arch/brotli: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 app-arch/brotli/brotli-1.0.6-r1.ebuild | 2 +-
 app-arch/brotli/brotli-1.0.7.ebuild| 2 +-
 app-arch/brotli/brotli-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild 
b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index 6d37d76bc92..c05b47ef15e 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 

diff --git a/app-arch/brotli/brotli-1.0.7.ebuild 
b/app-arch/brotli/brotli-1.0.7.ebuild
index 4829a8723e7..8d1ac2a54db 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 

diff --git a/app-arch/brotli/brotli-.ebuild 
b/app-arch/brotli/brotli-.ebuild
index ba54348bd98..384742d7c7f 100644
--- a/app-arch/brotli/brotli-.ebuild
+++ b/app-arch/brotli/brotli-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/avahi/

2020-04-17 Thread Craig Andrews
commit: a257b2652cacf6027df7491950926a4c272b1f62
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Apr 18 02:59:26 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Apr 18 02:59:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a257b265

net-dns/avahi: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 net-dns/avahi/avahi-0.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild 
b/net-dns/avahi/avahi-0.8-r2.ebuild
index 9ffad96bdde..f08e3f2fba2 100644
--- a/net-dns/avahi/avahi-0.8-r2.ebuild
+++ b/net-dns/avahi/avahi-0.8-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="gdbm"
 inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd
 



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

2020-04-17 Thread Craig Andrews
commit: 9fbfd8802c73728123fda348cca622e3de186377
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Apr 18 02:49:59 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Apr 18 02:49:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbfd880

dev-python/mysqlclient: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 dev-python/mysqlclient/mysqlclient-1.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild 
b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
index 97f916e0e62..395719c1d1f 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/

2020-04-17 Thread Craig Andrews
commit: 5d50d82c6407fe431c069494b8e4b788e5013c88
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Apr 18 02:51:50 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Apr 18 02:51:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d50d82c

dev-java/java-config: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 dev-java/java-config/java-config-2.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild 
b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 2913a8f7f68..725ac6dc0e5 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1



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

2020-04-17 Thread Craig Andrews
commit: 35cc347cf88d64c2f88edf2c0be867983bee04ff
Author: Craig Andrews  gentoo  org>
AuthorDate: Sat Apr 18 01:29:30 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Sat Apr 18 01:34:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cc347c

sys-apps/pcsc-lite: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild | 2 +-
 sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild 
b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index 6b7d4505ff8..6f50b0b8345 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-single-r1 systemd udev multilib-minimal
 

diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild 
b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index 0cd633a0948..24f7453b035 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-single-r1 systemd udev multilib-minimal
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/R/

2020-04-17 Thread Michael Orlitzky
commit: de035788fb8ceddd4a7b3fd038537f2e530009f1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Apr 17 23:23:38 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Apr 18 01:31:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de035788

dev-lang/R: new revision that leaves more docs uncompressed.

The R interactive shell encourages users to read several documentation
files using functions like contributors() and RShowDoc() that rely on
the files being installed with their god-given names. This new revision
tries to fix a few of the more common ones with docompress -x.

Closes: https://bugs.gentoo.org/556706
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/R/{R-3.6.3.ebuild => R-3.6.3-r1.ebuild} | 32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev-lang/R/R-3.6.3.ebuild b/dev-lang/R/R-3.6.3-r1.ebuild
similarity index 86%
rename from dev-lang/R/R-3.6.3.ebuild
rename to dev-lang/R/R-3.6.3-r1.ebuild
index f797705dcd7..0f45bd0490e 100644
--- a/dev-lang/R/R-3.6.3.ebuild
+++ b/dev-lang/R/R-3.6.3-r1.ebuild
@@ -189,7 +189,37 @@ src_install() {
done
popd > /dev/null
fi
-   docompress -x 
/usr/share/doc/${PF}/{BioC_mirrors.csv,CRAN_mirrors.csv,KEYWORDS.db,NEWS.rds}
+
+   # Users are encouraged to access some of the the R documentation
+   # interactively, through functions like "contributors()" that
+   # tries to open the "AUTHORS" file. Other files can be accessed
+   # by name with RShowDoc(), and the documentation for e.g. license()
+   # and RShowDoc() suggests a few of these names. Here we try to
+   # collect as many names as possible that a user might actually
+   # try to view through R, because if we don't decompress them,
+   # then R doesn't know what to do with 'em. Bug #556706.
+   INTERACTIVE_DOCS=(
+   AUTHORS
+   COPYING
+   FAQ
+   NEWS
+   THANKS
+   )
+
+   # Other data sources that are shipped as "documentation," but which
+   # need to be accessible via their original unmolested filenames.
+   INTERACTIVE_DATA=(
+   BioC_mirrors.csv
+   CRAN_mirrors.csv
+   KEYWORDS.db
+   NEWS.rds
+   )
+
+   NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
+
+   for f in "${NOCOMPRESS_DOCS[@]}"; do
+   docompress -x "/usr/share/doc/${PF}/${f}"
+   done
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: acct-user/vault/

2020-04-17 Thread William Hubbs
commit: 7e718b45c79b1e87030bc784d778d4a42a698fdc
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Apr 17 23:18:27 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Apr 17 23:19:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e718b45

acct-user/consul: new user for vault (approved by zmedico)

Signed-off-by: William Hubbs  gentoo.org>

 acct-user/vault/metadata.xml   |  7 +++
 acct-user/vault/vault-0.ebuild | 12 
 2 files changed, 19 insertions(+)

diff --git a/acct-user/vault/metadata.xml b/acct-user/vault/metadata.xml
new file mode 100644
index 000..9a7ba2ff3c4
--- /dev/null
+++ b/acct-user/vault/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   zmed...@gentoo.org
+   
+

diff --git a/acct-user/vault/vault-0.ebuild b/acct-user/vault/vault-0.ebuild
new file mode 100644
index 000..baa71456228
--- /dev/null
+++ b/acct-user/vault/vault-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for vault"
+ACCT_USER_ID=410
+ACCT_USER_GROUPS=( vault )
+
+acct-user_add_deps



[gentoo-commits] repo/gentoo:master commit in: acct-group/vault/

2020-04-17 Thread William Hubbs
commit: f9612ad000218adf19e11ed3052c3c39b9720006
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Apr 17 23:12:29 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Apr 17 23:19:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9612ad0

acct-group/vault: new group for vault (approved by zmedico)

Signed-off-by: William Hubbs  gentoo.org>

 acct-group/vault/metadata.xml   | 7 +++
 acct-group/vault/vault-0.ebuild | 8 
 2 files changed, 15 insertions(+)

diff --git a/acct-group/vault/metadata.xml b/acct-group/vault/metadata.xml
new file mode 100644
index 000..9a7ba2ff3c4
--- /dev/null
+++ b/acct-group/vault/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   zmed...@gentoo.org
+   
+

diff --git a/acct-group/vault/vault-0.ebuild b/acct-group/vault/vault-0.ebuild
new file mode 100644
index 000..518aa5cb311
--- /dev/null
+++ b/acct-group/vault/vault-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=410



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

2020-04-17 Thread Craig Andrews
commit: 56eca011c12c6e9fe4d36f2661b647a06417355c
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Apr 17 23:13:28 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Apr 17 23:13:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56eca011

media-libs/alsa-lib: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 media-libs/alsa-lib/alsa-lib-1.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild 
b/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
index 498d94a753d..19216bb8736 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit autotools multilib multilib-minimal python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdns/

2020-04-17 Thread Sven Wegener
commit: 764183efafd56cee57815c5f899e32ea5a882720
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri Apr 17 22:32:34 2020 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri Apr 17 22:33:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764183ef

net-dns/pdns: Version bump to 4.2.2

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sven Wegener  gentoo.org>

 net-dns/pdns/Manifest  |   1 +
 net-dns/pdns/pdns-4.2.2.ebuild | 173 +
 2 files changed, 174 insertions(+)

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index ef27f7bcb00..153404b6b23 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,4 +1,5 @@
 DIST pdns-4.1.13.tar.bz2 1117990 BLAKE2B 
95fa26d872fe138d1cde7e586881010dd27211c4186d0a99693d2fd90bdc3fd939da09805898d469daec6fe8c3493166346cf18b528760f3b25274fe10f45ad2
 SHA512 
94d80b1c6b78e93dd856631d391225c521485c3fb6b4123b28f9f58e178a7f6eb03f24189eaa261873e7e29962761b513c1fcf092101d68ad81dac73249a54d4
 DIST pdns-4.2.0.tar.bz2 1249282 BLAKE2B 
56b3639004abd05ab9df4541cc46f155ce76426b35a29d9a4cedd16428c5852bf9306e14b77440b8239e823cb0603b4747a8ae7729f964f415a529f17706eb1f
 SHA512 
ee67c132458e539d522aaa5835237dc64d92ad546f51e0ef86366964f7105631f2bd1e6c5d19d85466d95e1982f6410aeb14932c265fddfd301e403e76542624
 DIST pdns-4.2.1.tar.bz2 1252829 BLAKE2B 
e5cfcdd0c3011fe43e5abe52e5308b5e6346d186c5d5046c862468ecf810db7e5ab64bd36a9c62f251fbf63948572c5193ed354b8e98d647111e9373578c54ef
 SHA512 
40b5533c755d7c0d41cfb273b704a45a3006dafc98c79bf41cae43d9e2d03bbd7a663996a7f209c390a89c5f7161f2f6246389beef18fbac48e95907e1b7936a
+DIST pdns-4.2.2.tar.bz2 1256587 BLAKE2B 
f0ada1a2acdfc49bc1b4f066402d2da1719ec4b1495922cd77927969bece7defdc483a4231e2f2ec58927e66f02d7be72de685b65628b30c5dff7878e5e440da
 SHA512 
b9d0daadd89f4ab009981305d2c323ab75e283b59b94f764d53c37984a2b6200debe4e514572eac49973fcba2034df65214afb949ce3b1b4ff57b07b07f6e608
 DIST pdns-4.3.0.tar.bz2 1211536 BLAKE2B 
3291597c4f0c39e23f793b128ef26b1ce3dc77640ddf6979242ab291b0e2780ae5c19b18591ea90f5282810044959feca265a245e27eca1f2ebacbdeeb8a3785
 SHA512 
0734dbfb83a2e5080dc54cfc016ceb3e1f7e15a2de2f33392b2f3c995357fa97f9e87ff21e969f148c3e881165471d3058eb2b9cf632117ebce0d7818e025fe2

diff --git a/net-dns/pdns/pdns-4.2.2.ebuild b/net-dns/pdns/pdns-4.2.2.ebuild
new file mode 100644
index 000..11a7e60ebb9
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/;
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx 
postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
+
+RDEPEND="
+   libressl? ( dev-libs/libressl:= )
+   !libressl? ( dev-libs/openssl:= )
+   >=dev-libs/boost-1.35:=
+   lua? (
+   !luajit? ( dev-lang/lua:= )
+   luajit? ( dev-lang/luajit:= )
+   )
+   lua-records? ( >=net-misc/curl-7.21.3 )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+   sqlite? ( dev-db/sqlite:3 )
+   opendbx? ( dev-db/opendbx )
+   geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+   sodium? ( dev-libs/libsodium:= )
+   tinydns? ( >=dev-db/tinycdb-0.77 )
+   protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+   acct-user/pdns
+   acct-group/pdns"
+
+BDEPEND="virtual/pkgconfig
+   doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+   local dynmodules="pipe bind" # the default backends, always enabled
+
+   #use db2 && dynmodules+=" db2"
+   use ldap && dynmodules+=" ldap"
+   use lua && dynmodules+=" lua"
+   use mydns && dynmodules+=" mydns"
+   use mysql && dynmodules+=" gmysql"
+   use opendbx && dynmodules+=" opendbx"
+   #use oracle && dynmodules+=" goracle oracle"
+   use postgres && dynmodules+=" gpgsql"
+   use remote && dynmodules+=" remote"
+   use sqlite && dynmodules+=" gsqlite3"
+   use tinydns && dynmodules+=" tinydns"
+   use geoip && dynmodules+=" geoip"
+   #use xdb && dynmodules+=" xdb"
+
+   econf \
+   --disable-static \
+   --sysconfdir=/etc/powerdns \
+   --libdir=/usr/$(get_libdir)/powerdns \
+   --with-modules= \
+   --with-dynmodules="${dynmodules}" \
+   

[gentoo-commits] repo/gentoo:master commit in: net-p2p/bittornado/

2020-04-17 Thread David Seifert
commit: dc8257403342df901190bdf0290cc80dc915439d
Author: David Seifert  gentoo  org>
AuthorDate: Fri Apr 17 22:29:35 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 17 22:29:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc825740

net-p2p/bittornado: Remove dev-python/pycrypto dependency

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 4.1_p20160925-r1.ebuild => bittornado-0.4.1_p20160925-r2.ebuild} | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild 
b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r2.ebuild
similarity index 93%
rename from net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
rename to net-p2p/bittornado/bittornado-0.4.1_p20160925-r2.ebuild
index 7bb9680339b..06c3058b021 100644
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r2.ebuild
@@ -23,10 +23,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-   || (
-   dev-python/pycryptodome[${PYTHON_USEDEP}]
-   dev-python/pycrypto[${PYTHON_USEDEP}]
-   )"
+   dev-python/pycryptodome[${PYTHON_USEDEP}]"
 # Block dev-python/pytest-testmon for bug #693508.
 DEPEND="test? (
dev-python/pytest[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: net-p2p/bittornado/, net-p2p/bittornado/files/

2020-04-17 Thread David Seifert
commit: 818dc9a671056757ee3743dc1d509fbe5c6abcdc
Author: David Seifert  gentoo  org>
AuthorDate: Fri Apr 17 22:29:32 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 17 22:29:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818dc9a6

net-p2p/bittornado: Remove old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 net-p2p/bittornado/Manifest|  1 -
 net-p2p/bittornado/bittornado-0.3.18-r4.ebuild | 56 --
 .../files/bittornado-0.3.18-wxversion.patch| 90 --
 3 files changed, 147 deletions(-)

diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 4e8b2ed3003..ebfe3739acc 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,2 +1 @@
-DIST BitTornado-0.3.18.tar.gz 189227 BLAKE2B 
96a273c6f1072a19a0853cb0f0c16165432670927588f3422e680580e7d31a76b1b06b8e8a806676eb2f0cdfe0d4c785c389f07cb7a4690feb57cbac9c45c28f
 SHA512 
61a55726d93ddb245e18e47f41dea982b8faa7d3296c3a7221d00e0fe71db772613c3ee113bb7df18390807dda8c77859ed7159a03535446ca417a1344e3c0d6
 DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 
34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014
 SHA512 
09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa

diff --git a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild 
b/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
deleted file mode 100644
index fe11296fb4d..000
--- a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# note: wxGTK interface has been removed wrt #391685. this ebuild is only for
-# cmdline tools as is.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=BitTornado
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/;
-SRC_URI="http://download2.bittornado.com/download/${MY_P}.tar.gz;
-# GPL-2 is just for the init script from FILESDIR.
-LICENSE="MIT GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux 
~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-   app-arch/unzip
-   >=sys-apps/sed-4.0.5"
-
-S=${WORKDIR}/${MY_PN}-CVS
-PIXMAPLOC=/usr/share/pixmaps/bittornado
-
-python_prepare_all() {
-   # fixes wrong icons path
-   sed -i 
"s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":"
 btdownloadgui.py
-   # Needs wxpython-2.6 only, bug #201247
-   eapply "${FILESDIR}"/${P}-wxversion.patch
-
-   distutils-r1_python_prepare_all
-}
-
-python_install() {
-   distutils-r1_python_install
-
-   # get rid of any reference to the not-installed gui version
-   rm "${ED%/}"/usr/bin/*gui.py || die
-   rm "${D}/$(python_get_scriptdir)"/*gui.py || die
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-
-   newconfd "${FILESDIR}"/bttrack.conf bttrack
-   newinitd "${FILESDIR}"/bttrack.rc bttrack
-}

diff --git a/net-p2p/bittornado/files/bittornado-0.3.18-wxversion.patch 
b/net-p2p/bittornado/files/bittornado-0.3.18-wxversion.patch
deleted file mode 100644
index 35739630348..000
--- a/net-p2p/bittornado/files/bittornado-0.3.18-wxversion.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur BitTornado-CVS-orig/btcompletedirgui.py 
BitTornado-CVS/btcompletedirgui.py
 BitTornado-CVS-orig/btcompletedirgui.py2006-12-23 12:20:52.0 
-0600
-+++ BitTornado-CVS/btcompletedirgui.py 2007-12-04 11:09:36.0 -0600
-@@ -19,12 +19,16 @@
- import sys
- from os import getcwd
- from os.path import join
-+
- try:
--from wxPython.wx import *
--except:
--print 'wxPython is either not installed or has not been installed 
properly.'
-+import wxversion
-+wxversion.select("2.6")
-+except Exception, e:
-+print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
- sys.exit(1)
- 
-+from wxPython.wx import *
-+
- try:
- True
- except:
-diff -Naur BitTornado-CVS-orig/btdownloadgui.py BitTornado-CVS/btdownloadgui.py
 BitTornado-CVS-orig/btdownloadgui.py   2007-12-04 11:06:58.0 
-0600
-+++ BitTornado-CVS/btdownloadgui.py2007-12-04 11:10:36.0 -0600
-@@ -18,10 +18,13 @@
- assert version >= '2', "Install Python 2.0 or greater"
- 
- try:
--from wxPython.wx import *
--except:
--print 'wxPython is either not installed or has not been installed 
properly.'
--exit(1)
-+import wxversion
-+wxversion.select("2.6")
-+except Exception, e:
-+print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
-+sys.exit(1)
-+
-+from wxPython.wx import *
- from 

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

2020-04-17 Thread David Seifert
commit: 47a64f0724389f66d42ef34815c8999c8b1734d3
Author: David Seifert  gentoo  org>
AuthorDate: Fri Apr 17 22:21:02 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 17 22:21:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a64f07

dev-python/pysnmp: Add py3.8

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 ...ysnmp-4.4.12.ebuild => pysnmp-4.4.12-r1.ebuild} | 30 +
 dev-python/pysnmp/pysnmp-99.ebuild | 31 +-
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/dev-python/pysnmp/pysnmp-4.4.12.ebuild 
b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
similarity index 65%
rename from dev-python/pysnmp/pysnmp-4.4.12.ebuild
rename to dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
index 4fd27129e43..4464b7b64c0 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
@@ -14,32 +15,25 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 IUSE="doc examples"
 
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
 RDEPEND="
>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
dev-python/pysmi[${PYTHON_USEDEP}]
-   || (
-   dev-python/pycryptodome[${PYTHON_USEDEP}]
-   dev-python/pycrypto[${PYTHON_USEDEP}]
-   )
+   dev-python/pycryptodome[${PYTHON_USEDEP}]
 "
 
-python_compile_all() {
-   default
+distutils_enable_sphinx docs/source
 
-   if use doc; then
-   touch docs/source/conf.py
-   emake -C docs html
-   fi
+python_prepare_all() {
+   touch docs/source/conf.py || die
+   distutils-r1_python_prepare_all
 }
 
 python_install_all() {
-   use doc && local HTML_DOCS=( docs/build/html/* )
-   docinto examples
-   use examples && dodoc -r examples/* docs/mibs
+   if use examples; then
+   docinto examples
+   dodoc -r examples/. docs/mibs
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
 
distutils-r1_python_install_all
 }

diff --git a/dev-python/pysnmp/pysnmp-99.ebuild 
b/dev-python/pysnmp/pysnmp-99.ebuild
index 92fe7946164..0141700d604 100644
--- a/dev-python/pysnmp/pysnmp-99.ebuild
+++ b/dev-python/pysnmp/pysnmp-99.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
@@ -11,35 +12,27 @@ EGIT_REPO_URI="https://github.com/etingof/pysnmp;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc examples"
 
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
 RDEPEND="
>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
dev-python/pysmi[${PYTHON_USEDEP}]
-   || (
-   dev-python/pycryptodome[${PYTHON_USEDEP}]
-   dev-python/pycrypto[${PYTHON_USEDEP}]
-   )
+   dev-python/pycryptodome[${PYTHON_USEDEP}]
 "
 
-python_compile_all() {
-   default
+distutils_enable_sphinx docs/source
 
-   if use doc; then
-   touch docs/source/conf.py
-   emake -C docs html
-   fi
+python_prepare_all() {
+   touch docs/source/conf.py || die
+   distutils-r1_python_prepare_all
 }
 
 python_install_all() {
-   use doc && local HTML_DOCS=( docs/build/html/* )
-   docinto examples
-   use examples && dodoc -r examples/* docs/mibs
+   if use examples; then
+   docinto examples
+   dodoc -r examples/. docs/mibs
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
 
distutils-r1_python_install_all
 }



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

2020-04-17 Thread David Seifert
commit: 3a0b585227f145223a90ffae2e18aaa65c2367d9
Author: David Seifert  gentoo  org>
AuthorDate: Fri Apr 17 22:20:59 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 17 22:20:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0b5852

dev-python/pysmi: Add py3.8

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 dev-python/pysmi/pysmi-0.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pysmi/pysmi-0.3.4.ebuild 
b/dev-python/pysmi/pysmi-0.3.4.ebuild
index c450bfffc39..36989ae4624 100644
--- a/dev-python/pysmi/pysmi-0.3.4.ebuild
+++ b/dev-python/pysmi/pysmi-0.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python Lex & Yacc"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/birdtray/

2020-04-17 Thread Marek Szuba
commit: b0c301e33766a9694633b99df9fe6cc0ccab9b20
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 17 22:18:10 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 17 22:18:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c301e3

x11-misc/birdtray: add  to metadata

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

 x11-misc/birdtray/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x11-misc/birdtray/metadata.xml b/x11-misc/birdtray/metadata.xml
index aadc931e6e8..31836f413ff 100644
--- a/x11-misc/birdtray/metadata.xml
+++ b/x11-misc/birdtray/metadata.xml
@@ -9,4 +9,7 @@
 mare...@gentoo.org
 Marek Szuba
   
+  
+gyunaev/birdtray
+  
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/birdtray/

2020-04-17 Thread Marek Szuba
commit: 4c1abb91d9a6c190a45d59569e749940e859e718
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 17 21:59:55 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 17 22:18:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c1abb91

x11-misc/birdtray: update XDG icon cache

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

 x11-misc/birdtray/birdtray-1.7.0.ebuild | 10 +-
 x11-misc/birdtray/birdtray-.ebuild  | 10 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/x11-misc/birdtray/birdtray-1.7.0.ebuild 
b/x11-misc/birdtray/birdtray-1.7.0.ebuild
index a3777b79577..27005bff4ed 100644
--- a/x11-misc/birdtray/birdtray-1.7.0.ebuild
+++ b/x11-misc/birdtray/birdtray-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg-utils
 
 DESCRIPTION="A new mail system tray notification icon for Thunderbird"
 HOMEPAGE="https://github.com/gyunaev/birdtray;
@@ -29,3 +29,11 @@ RDEPEND="dev-db/sqlite:=
x11-libs/libX11"
 
 DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+   xdg_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+}

diff --git a/x11-misc/birdtray/birdtray-.ebuild 
b/x11-misc/birdtray/birdtray-.ebuild
index a3777b79577..27005bff4ed 100644
--- a/x11-misc/birdtray/birdtray-.ebuild
+++ b/x11-misc/birdtray/birdtray-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg-utils
 
 DESCRIPTION="A new mail system tray notification icon for Thunderbird"
 HOMEPAGE="https://github.com/gyunaev/birdtray;
@@ -29,3 +29,11 @@ RDEPEND="dev-db/sqlite:=
x11-libs/libX11"
 
 DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+   xdg_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/birdtray/, x11-misc/birdtray/files/

2020-04-17 Thread Marek Szuba
commit: ab82fb36dce56d31663833d1e4d77ed31b940b42
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 17 22:07:25 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 17 22:18:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab82fb36

x11-misc/birdtray: remove deprecated category from the .desktop file

"Application" is not listed in the current Desktop Menu Specification.
Will be addressed by upstream if/when PR #315 has been merged so leave
the live ebuild be.

Revbump to propagate this and the previous commit to users, the latter
being more important of the two.

See-also: https://github.com/gyunaev/birdtray/pull/315
Signed-off-by: Marek Szuba  gentoo.org>

 .../birdtray/{birdtray-1.7.0.ebuild => birdtray-1.7.0-r1.ebuild} | 4 
 .../files/birdtray-1.7.0-desktop_file_deprecated_category.patch  | 9 +
 2 files changed, 13 insertions(+)

diff --git a/x11-misc/birdtray/birdtray-1.7.0.ebuild 
b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
similarity index 90%
rename from x11-misc/birdtray/birdtray-1.7.0.ebuild
rename to x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
index 27005bff4ed..39890d9c3e5 100644
--- a/x11-misc/birdtray/birdtray-1.7.0.ebuild
+++ b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild
@@ -30,6 +30,10 @@ RDEPEND="dev-db/sqlite:=
 
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.7.0-desktop_file_deprecated_category.patch
+)
+
 pkg_postinst() {
xdg_icon_cache_update
 }

diff --git 
a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch 
b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
new file mode 100644
index 000..104b24bf8de
--- /dev/null
+++ 
b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch
@@ -0,0 +1,9 @@
+--- a/src/res/com.ulduzsoft.Birdtray.desktop
 b/src/res/com.ulduzsoft.Birdtray.desktop
+@@ -28,5 +28,5 @@
+ X-MultipleArgs=false
+ Type=Application
+ Icon=com.ulduzsoft.Birdtray
+-Categories=Application;Network;Email;
++Categories=Network;Email;
+ StartupNotify=true



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

2020-04-17 Thread Patrick McLean
commit: ab5af86bb9051eb3c72c51c5b2fceb45625d95aa
Author: Patrick McLean  sony  com>
AuthorDate: Fri Apr 17 22:12:40 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 17 22:16:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5af86b

dev-libs/libfido2-1.4.0: Version bump, remove Werror (bug #717952)

Bug: https://bugs.gentoo.org/717952
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 dev-libs/libfido2/Manifest |  1 +
 .../libfido2/files/libfido2-1.4.0-cmakelists.patch | 34 
 dev-libs/libfido2/libfido2-1.4.0.ebuild| 46 ++
 3 files changed, 81 insertions(+)

diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index ce387f8e9a6..41a19ecc739 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,2 +1,3 @@
 DIST libfido2-1.3.0.tar.gz 1516842 BLAKE2B 
18a0036127a9f643ef7ca917dab909bfa344caecdfdef3f1f0881bd7c84b73ea8273a57a2daccc95cc448dc389a8f573f663895abd78c48b3340a45f7764
 SHA512 
9cfb872b898fb6659e0c5e377b5f80738c22dadc4768be02b8cb5e4f4932cb4edde360cd84aac78eb3e3a57d3bc10b4147740a4830d16adcdefe7c48fa460d36
 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B 
f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28
 SHA512 
fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
+DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B 
d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a
 SHA512 
5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513

diff --git a/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch 
b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
new file mode 100644
index 000..df34a85dacc
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.4.0-cmakelists.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0bb2e87..4d0ed00 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -128,13 +128,11 @@ else()
+
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+   check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+   if(HAVE_STACK_PROTECTOR_ALL)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 44e4a96..d04dacc 100644
+--- a/man/CMakeLists.txt
 b/man/CMakeLists.txt
+@@ -5,11 +5,6 @@
+ find_program(MANDOC_PATH mandoc)
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-  find_program(GZIP_PATH gzip)
+-  message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+-endif()
+-
+ list(APPEND MAN_SOURCES
+   eddsa_pk_new.3
+   es256_pk_new.3

diff --git a/dev-libs/libfido2/libfido2-1.4.0.ebuild 
b/dev-libs/libfido2/libfido2-1.4.0.ebuild
new file mode 100644
index 000..41493d5b2f7
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2;
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="libressl +static-libs"
+
+DEPEND="
+   dev-libs/libcbor:=
+   virtual/libudev:=
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/libfido2-1.4.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+   CONFIG_CHECK="
+   ~USB_HID
+   ~HIDRAW
+   "
+
+   check_extra_config
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if ! use static-libs; then
+   rm -f "${D}/$(get_libdir)"/*.a || die
+   fi
+
+   udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}



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

2020-04-17 Thread Patrick McLean
commit: b8dbca2ef7ab9dab03a51e2d99f92743d7b5b86e
Author: Patrick McLean  sony  com>
AuthorDate: Fri Apr 17 22:16:33 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 17 22:17:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8dbca2e

dev-libs/libfido2-1.3.1: Drop -Werror (bug #717952)

Closes: https://bugs.gentoo.org/717952
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch | 18 ++
 dev-libs/libfido2/libfido2-1.3.1.ebuild|  1 +
 2 files changed, 19 insertions(+)

diff --git a/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch 
b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
new file mode 100644
index 000..d2ebc1a54a1
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.3.1-no-werror.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9481c46..b347fab 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -107,13 +107,11 @@ else()
+ 
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+ 

diff --git a/dev-libs/libfido2/libfido2-1.3.1.ebuild 
b/dev-libs/libfido2/libfido2-1.3.1.ebuild
index bd76b061981..eb279f392c5 100644
--- a/dev-libs/libfido2/libfido2-1.3.1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.3.1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
+   "${FILESDIR}/libfido2-1.3.1-no-werror.patch"
 )
 
 pkg_pretend() {



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

2020-04-17 Thread Patrick McLean
commit: d086d33781e95fc0061b9236e0a42d8ffb20bbb5
Author: Patrick McLean  sony  com>
AuthorDate: Fri Apr 17 22:17:45 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 17 22:17:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d086d337

dev-libs/libfido2: remove old

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 dev-libs/libfido2/Manifest |  1 -
 dev-libs/libfido2/libfido2-1.3.0-r1.ebuild | 49 --
 2 files changed, 50 deletions(-)

diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 41a19ecc739..9439365cbe4 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,3 +1,2 @@
-DIST libfido2-1.3.0.tar.gz 1516842 BLAKE2B 
18a0036127a9f643ef7ca917dab909bfa344caecdfdef3f1f0881bd7c84b73ea8273a57a2daccc95cc448dc389a8f573f663895abd78c48b3340a45f7764
 SHA512 
9cfb872b898fb6659e0c5e377b5f80738c22dadc4768be02b8cb5e4f4932cb4edde360cd84aac78eb3e3a57d3bc10b4147740a4830d16adcdefe7c48fa460d36
 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B 
f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28
 SHA512 
fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
 DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B 
d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a
 SHA512 
5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513

diff --git a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild 
b/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
deleted file mode 100644
index ca7036d3d10..000
--- a/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils udev linux-info
-
-DESCRIPTION="Provides library functionality for FIDO 2.0"
-HOMEPAGE="https://github.com/Yubico/libfido2;
-SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="libressl +static-libs"
-
-DEPEND="
-   dev-libs/libcbor:=
-   virtual/libudev:=
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
-
-   # from upstream git, no longer needed with openssh-8.2
-   "${FILESDIR}/libfido2-1.3.0-remove-openssh-middleware.patch"
-)
-
-pkg_pretend() {
-   CONFIG_CHECK="
-   ~USB_HID
-   ~HIDRAW
-   "
-
-   check_extra_config
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if ! use static-libs; then
-   rm -f "${D}/$(get_libdir)"/*.a || die
-   fi
-
-   udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
-}



[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/

2020-04-17 Thread Craig Andrews
commit: b378e073cd1b2d15bcb340c96a551daefcd05552
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Apr 17 21:33:55 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Apr 17 21:34:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b378e073

sys-fs/btrfs-progs: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild  | 2 +-
 sys-fs/btrfs-progs/btrfs-progs-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild
index 87c21e1d5e8..e8b44f1ff9b 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 python-single-r1
 

diff --git a/sys-fs/btrfs-progs/btrfs-progs-.ebuild 
b/sys-fs/btrfs-progs/btrfs-progs-.ebuild
index 87c21e1d5e8..e8b44f1ff9b 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: net-fs/s3ql/

2020-04-17 Thread Patrick McLean
commit: 988cad3195cd1f177d096a54af6f4beb3e67f75f
Author: Patrick McLean  sony  com>
AuthorDate: Fri Apr 17 21:17:21 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Fri Apr 17 21:19:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988cad31

net-fs/s3ql: remove old

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean  gentoo.org>

 net-fs/s3ql/Manifest |  5 
 net-fs/s3ql/s3ql-2.24.ebuild | 54 ---
 net-fs/s3ql/s3ql-2.25.ebuild | 54 ---
 net-fs/s3ql/s3ql-2.26.ebuild | 54 ---
 net-fs/s3ql/s3ql-2.28.ebuild | 54 ---
 net-fs/s3ql/s3ql-2.32.ebuild | 55 
 6 files changed, 276 deletions(-)

diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index 6aef701b7ce..60d4c70326d 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -1,6 +1 @@
-DIST s3ql-2.24.tar.bz2 773766 BLAKE2B 
e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f
 SHA512 
20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc
-DIST s3ql-2.25.tar.bz2 770189 BLAKE2B 
d0d3c7656f93b7bdac97ab7b9afdb6b53c6e909a5fd4e5a1cf9e5c153d81349dfb809409f79ec45768297e7c7eb89a590338cb9726b2eda51b3ca02734fa1001
 SHA512 
e2aa9f5d68a00b36ae33a7d36bf4aa42f761fb7e2cfb8370c914a78d0ed54edab85dd224fa7ef08e9e240161f5c66e46c0cbe99b6c5451cab3a50f33c78bde36
-DIST s3ql-2.26.tar.bz2 775435 BLAKE2B 
e30d0108522e3bca2e3e16138c418af553d4a0cb502671b70dee689be2795c02bc4fb47a2aa5d225a1ad748c7fadc099ff28443c9dedba737d89e8efabb455a0
 SHA512 
5bdf89fba0a0d354dbdb84bdc3f31a2cefaf3bc701989b9f413c428cb2de9e7449255c3f7ed775fccd2f2fbe3bdb3156ecfb43de5a958dedb83ba63399427569
-DIST s3ql-2.28.tar.bz2 779646 BLAKE2B 
3ca734d6aac9118da03566080ae46514d83829a132f57741ffc509e6dfe80a2cbbdbe93f84598302c7dbebd188bd5148eda00a6e5dae378ff91742c026c9ef63
 SHA512 
089d0c47d9e507aa22a162ffbcb8703188d84cbc83d73c30629897250574603edc1ebbddc81682edf2cdd42b10cc6fe55e69d71339f68bfe537f862eeadbd883
-DIST s3ql-2.32.tar.bz2 1167243 BLAKE2B 
41107069e2f02b38c704e61bbd531c82fe7dde9aaf82dc6b400d27206456772fbbda41f13c3eee7d0a8eb7ae2a6855fefea3406d9295ceb309cb21317379e316
 SHA512 
c4c929f182ca06fea58edd26e9eb8044276af68607106bdf1df44f0eff86fa51c1d10f32a55717c300984c4d8cb956506cb195aa9e97842568934dcedff51369
 DIST s3ql-2.33.tar.bz2 845921 BLAKE2B 
914c8e029fd10c82eb932a4a68d3771905255763a9ebc88ee5503892d1eb5f1a9c355d2f041fef77afedc5a7237e79db931768667602d7987b41a7c6805a2fa7
 SHA512 
fbc3895008f19de43c8a90a0896631200e8d292027d8bebc8197271a5677c9922498a7762696b057c067e5b906830f2a88f87d5615d60f24fdfa58972fb367fb

diff --git a/net-fs/s3ql/s3ql-2.24.ebuild b/net-fs/s3ql/s3ql-2.24.ebuild
deleted file mode 100644
index e7ea8df0411..000
--- a/net-fs/s3ql/s3ql-2.24.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/;
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-   dev-python/defusedxml[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-   >=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-   >=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-   dev-python/pycrypto[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-   test? (
-   dev-python/pytest[${PYTHON_USEDEP}]
-   net-misc/rsync[xattr]
-   )"
-
-RESTRICT="test"
-
-python_test() {
-   addwrite /dev/fuse
-   py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-
-   if use contrib ; then
-   exeinto /usr/share/doc/${PF}/contrib
-   docompress -x /usr/share/doc/${PF}/contrib
-   doexe contrib/*.{py,sh}
-   doman contrib/*.1
-   fi
-
-   if use doc ; then
-   dodoc doc/manual.pdf
-   dodoc -r doc/html
-   fi
-}

diff --git a/net-fs/s3ql/s3ql-2.25.ebuild b/net-fs/s3ql/s3ql-2.25.ebuild
deleted file mode 100644
index e7ea8df0411..000
--- a/net-fs/s3ql/s3ql-2.25.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit 

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

2020-04-17 Thread David Seifert
commit: 9974d3369078cfde93e4f1e5e9df5d1050bd5f50
Author: David Seifert  gentoo  org>
AuthorDate: Fri Apr 17 21:11:02 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 17 21:11:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9974d336

sci-libs/matio: Remove old versions

Bug: https://bugs.gentoo.org/679476
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/matio/Manifest|  2 --
 sci-libs/matio/matio-1.5.13.ebuild | 46 --
 sci-libs/matio/matio-1.5.16.ebuild | 46 --
 3 files changed, 94 deletions(-)

diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 586c116c3d4..05e6aaa1418 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,3 +1 @@
-DIST matio-1.5.13.tar.gz 10037903 BLAKE2B 
8817fa3a1c050a84951c706922b32c5ed082ec057a35cb7fa20cc4d977316208a61604fcb6c0e09c96f592294a65d57a8a95844d15821987bdd337564345e778
 SHA512 
2db430dd47b8ceed850aaadf36c0fd3b405ba32db3eb2d5be320d007754983e2538ab99338d3ae8d69e8a531818c3bde0807c1f4a505eff7dd25d4a77934b737
-DIST matio-1.5.16.tar.gz 10050153 BLAKE2B 
de643c11371a931853c2d60347431a1fc3c46f80d5e3083376e634999ea9d10bb1f5f547ed9844654dcb8ff6ff9492d037b26f693cbced04228a6c5d603c0a86
 SHA512 
38039ddc897b9e44677af08d996dde960355b6d8c5598000fbb23dda5501361d1c2a9e82f0f3e6c1309f0784943976259e5d39d1030f00db323e1756e5bd144a
 DIST matio-1.5.17.tar.gz 10066268 BLAKE2B 
0852d1861bb4c43acd8a34d7114d29b7e15aa00e6f995d8516d22ff9420268cf7de7b82e08ee33978891bdfd02fcf3f8441aa1466e66e112a21f01abd6f3f0e0
 SHA512 
af8ff11c7c44fea9ea6886e381f49ef9186946f3def98ad9695f2d5d1df045c35e8f4ceac12a44be397f7bbd708b4803762b5ce54c45b60a9f446d551c04f5d2

diff --git a/sci-libs/matio/matio-1.5.13.ebuild 
b/sci-libs/matio/matio-1.5.13.ebuild
deleted file mode 100644
index d9f308de950..000
--- a/sci-libs/matio/matio-1.5.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for reading and writing matlab files"
-HOMEPAGE="https://sourceforge.net/projects/matio/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0/4" # subslot = soname version
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hdf5 sparse static-libs"
-
-RDEPEND="
-   sys-libs/zlib
-   hdf5? ( sci-libs/hdf5 )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool
-   doc? ( virtual/latex-base )"
-
-src_configure() {
-   econf \
-   $(use_enable hdf5 mat73) \
-   $(use_enable sparse extended-sparse) \
-   $(use_enable static-libs static)
-}
-
-src_compile() {
-   default
-   use doc && emake -C documentation pdf
-}
-
-src_install() {
-   default
-
-   use doc && dodoc documentation/matio_user_guide.pdf
-   if use examples; then
-   docinto examples
-   dodoc test/test*
-   insinto /usr/share/${PN}
-   doins share/test*
-   fi
-
-   find "${D}" -name "*.la" -delete || die
-}

diff --git a/sci-libs/matio/matio-1.5.16.ebuild 
b/sci-libs/matio/matio-1.5.16.ebuild
deleted file mode 100644
index d9f308de950..000
--- a/sci-libs/matio/matio-1.5.16.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for reading and writing matlab files"
-HOMEPAGE="https://sourceforge.net/projects/matio/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0/4" # subslot = soname version
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hdf5 sparse static-libs"
-
-RDEPEND="
-   sys-libs/zlib
-   hdf5? ( sci-libs/hdf5 )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool
-   doc? ( virtual/latex-base )"
-
-src_configure() {
-   econf \
-   $(use_enable hdf5 mat73) \
-   $(use_enable sparse extended-sparse) \
-   $(use_enable static-libs static)
-}
-
-src_compile() {
-   default
-   use doc && emake -C documentation pdf
-}
-
-src_install() {
-   default
-
-   use doc && dodoc documentation/matio_user_guide.pdf
-   if use examples; then
-   docinto examples
-   dodoc test/test*
-   insinto /usr/share/${PN}
-   doins share/test*
-   fi
-
-   find "${D}" -name "*.la" -delete || die
-}



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

2020-04-17 Thread Andreas Sturmlechner
commit: 25c7a82f1f1bc10c4069aab8af94d74378fa0ebe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 19:10:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:52:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c7a82f

app-misc/ca-certificates: python3_8 support

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

 app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild 
b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index 5e4f5479ce6..79af3785f29 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eutils python-any-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/

2020-04-17 Thread Andreas Sturmlechner
commit: 20075fcfb117c90a8d6651b3c3934fd61e42080d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 20:35:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:53:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20075fcf

dev-util/ninja: python3_8 support

Tests passed.

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

 dev-util/ninja/ninja-1.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ninja/ninja-1.10.0.ebuild 
b/dev-util/ninja/ninja-1.10.0.ebuild
index aed66121807..5ba3ad094ec 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/

2020-04-17 Thread Andreas Sturmlechner
commit: cfc11b6dae0587b3ce7dd174ff17f78fb307da7e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 20:22:59 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc11b6d

kde-frameworks/plasma: Drop 5.69.0 (r0)

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

 kde-frameworks/plasma/plasma-5.69.0.ebuild | 75 --
 1 file changed, 75 deletions(-)

diff --git a/kde-frameworks/plasma/plasma-5.69.0.ebuild 
b/kde-frameworks/plasma/plasma-5.69.0.ebuild
deleted file mode 100644
index 5ec5f8a..000
--- a/kde-frameworks/plasma/plasma-5.69.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only wayland X"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-   >=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-   >=dev-qt/qtquickcontrols-${QTMIN}:5
-   >=dev-qt/qtsql-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   =kde-frameworks/kactivities-${PVCUT}*:5
-   =kde-frameworks/karchive-${PVCUT}*:5
-   =kde-frameworks/kconfig-${PVCUT}*:5
-   =kde-frameworks/kconfigwidgets-${PVCUT}*:5
-   =kde-frameworks/kcoreaddons-${PVCUT}*:5
-   =kde-frameworks/kdeclarative-${PVCUT}*:5
-   =kde-frameworks/kglobalaccel-${PVCUT}*:5
-   =kde-frameworks/kguiaddons-${PVCUT}*:5
-   =kde-frameworks/ki18n-${PVCUT}*:5
-   =kde-frameworks/kiconthemes-${PVCUT}*:5
-   =kde-frameworks/kio-${PVCUT}*:5
-   =kde-frameworks/kirigami-${PVCUT}*:5
-   =kde-frameworks/knotifications-${PVCUT}*:5
-   =kde-frameworks/kpackage-${PVCUT}*:5
-   =kde-frameworks/kservice-${PVCUT}*:5
-   =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-   =kde-frameworks/kwindowsystem-${PVCUT}*:5
-   =kde-frameworks/kxmlgui-${PVCUT}*:5
-   !gles2-only? ( virtual/opengl )
-   wayland? (
-   =kde-frameworks/kwayland-${PVCUT}*:5
-   media-libs/mesa[egl]
-   )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   x11-libs/libxcb
-   )
-"
-DEPEND="${RDEPEND}
-   X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package !gles2-only OpenGL)
-   $(cmake_use_find_package wayland EGL)
-   $(cmake_use_find_package wayland KF5Wayland)
-   $(cmake_use_find_package X X11)
-   $(cmake_use_find_package X XCB)
-   )
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/

2020-04-17 Thread Andreas Sturmlechner
commit: cb4fb669b8ae79ade04cf3d8de395277a17cf309
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 19:42:14 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4fb669

net-irc/konversation: Port away from deprecated KWindowSystem API

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

 .../konversation-1.7.5-kf5windowsystem-5.63.patch  | 37 ++
 net-irc/konversation/konversation-1.7.5-r2.ebuild  |  3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git 
a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch 
b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
new file mode 100644
index 000..cf93b3b66de
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
@@ -0,0 +1,37 @@
+From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Thu, 28 Nov 2019 12:56:34 +0100
+Subject: Port away from deprecated KWindowSystem API (with ifdefs)
+
+---
+ src/application.cpp | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index 4667c24..538624b 100644
+--- a/src/application.cpp
 b/src/application.cpp
+@@ -50,6 +50,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ using namespace Konversation;
+ 
+@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& 
arguments)
+ 
+ newInstance(m_commandLineParser);
+ 
++#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0)
+ KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
++#else
++mainWindow->setAttribute(Qt::WA_NativeWindow, true);
++KStartupInfo::setNewStartupId(mainWindow->windowHandle(), 
KStartupInfo::startupId());
++#endif
+ mainWindow->show();
+ mainWindow->raise();
+ }
+-- 
+cgit v1.1
+

diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild 
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index f43ed032dde..9940dae7237 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
+KFMIN=5.63.0
 QTMIN=5.12.3
 inherit ecm kde.org
 
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
"${FILESDIR}"/${P}-missing-header.patch
"${FILESDIR}"/${P}-QElapsedTimer.patch
+   "${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/

2020-04-17 Thread Andreas Sturmlechner
commit: 217c7b8085ffb5ce72873dab745e18074ef5f856
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 20:22:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217c7b80

kde-frameworks/plasma: Fix crash w/ Qt-5.15 on panel right click

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

 .../plasma/files/plasma-5.69.0-qt-5.15-crash.patch | 60 +
 kde-frameworks/plasma/plasma-5.69.0-r1.ebuild  | 77 ++
 2 files changed, 137 insertions(+)

diff --git a/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch 
b/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch
new file mode 100644
index 000..f48b82f7223
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.69.0-qt-5.15-crash.patch
@@ -0,0 +1,60 @@
+From 0417bf61d53a61879702aa6e5bc64d1da557db27 Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Mon, 6 Apr 2020 12:21:45 +0100
+Subject: [configview] Simplify code / workaround Qt5.15 crash
+
+Summary:
+QQmlComponent::beginCreate and completeCreate are useful if you need to
+set properties on the object explicitly. We're not doing that here, we
+can just call create.
+
+Test Plan:
+On Qt5.15
+Right click a panel
+choose edit
+
+Reviewers: #plasma, apol
+
+Reviewed By: apol
+
+Subscribers: apol, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D28599
+---
+ src/plasmaquick/configview.cpp | 9 +
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/plasmaquick/configview.cpp b/src/plasmaquick/configview.cpp
+index ff43753..c5e2228 100644
+--- a/src/plasmaquick/configview.cpp
 b/src/plasmaquick/configview.cpp
+@@ -134,9 +134,13 @@ void ConfigViewPrivate::init()
+ 
+ q->setResizeMode(QQuickView::SizeViewToRootObject);
+ 
++auto plasmoid = 
applet.data()->property("_plasma_graphicObject").value();
++
q->engine()->rootContext()->setContextProperties({QQmlContext::PropertyPair{QStringLiteral("plasmoid"),
 QVariant::fromValue(plasmoid)},
++  
QQmlContext::PropertyPair{QStringLiteral("configDialog"), 
QVariant::fromValue(q)}});
++
+ //config model local of the applet
+ QQmlComponent *component = new QQmlComponent(q->engine(), 
applet.data()->kPackage().fileUrl("configmodel"), q);
+-QObject *object = component->beginCreate(q->engine()->rootContext());
++QObject *object = component->create(q->engine()->rootContext());
+ configModel = qobject_cast(object);
+ 
+ if (configModel) {
+@@ -172,9 +176,6 @@ void ConfigViewPrivate::init()
+ }
+ }
+ 
+-
q->engine()->rootContext()->setContextProperty(QStringLiteral("plasmoid"), 
applet.data()->property("_plasma_graphicObject").value());
+-
q->engine()->rootContext()->setContextProperty(QStringLiteral("configDialog"), 
q);
+-component->completeCreate();
+ delete component;
+ }
+ 
+-- 
+cgit v1.1
+

diff --git a/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild 
b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild
new file mode 100644
index 000..7d9816e2277
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.69.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+   >=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+   >=dev-qt/qtquickcontrols-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   =kde-frameworks/kactivities-${PVCUT}*:5
+   =kde-frameworks/karchive-${PVCUT}*:5
+   =kde-frameworks/kconfig-${PVCUT}*:5
+   =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+   =kde-frameworks/kcoreaddons-${PVCUT}*:5
+   =kde-frameworks/kdeclarative-${PVCUT}*:5
+   =kde-frameworks/kglobalaccel-${PVCUT}*:5
+   =kde-frameworks/kguiaddons-${PVCUT}*:5
+   =kde-frameworks/ki18n-${PVCUT}*:5
+   =kde-frameworks/kiconthemes-${PVCUT}*:5
+   =kde-frameworks/kio-${PVCUT}*:5
+   =kde-frameworks/kirigami-${PVCUT}*:5
+   =kde-frameworks/knotifications-${PVCUT}*:5
+   =kde-frameworks/kpackage-${PVCUT}*:5
+   =kde-frameworks/kservice-${PVCUT}*:5
+   =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+   =kde-frameworks/kwindowsystem-${PVCUT}*:5
+   

[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/

2020-04-17 Thread Andreas Sturmlechner
commit: e3f1778380f1d2f229b363165e60d51b0a83bc9f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 20:58:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f17783

kde-apps/krdc: Set ISE="+vnc"

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

 kde-apps/krdc/krdc-19.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild 
b/kde-apps/krdc/krdc-19.12.3-r1.ebuild
index b1956006882..bd5ed9467fa 100644
--- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild
+++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+rdp vnc"
+IUSE="+rdp +vnc"
 
 # drop kbookmarks subslot operator when KFMIN >= 5.69.0
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24



[gentoo-commits] repo/gentoo:master commit in: kde-apps/krdc/, kde-apps/krdc/files/

2020-04-17 Thread Andreas Sturmlechner
commit: 22184441bd9a176fde8c921f7b8432887305b0c6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 19:13:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:53:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22184441

kde-apps/krdc: Adapt the code to >=kde-frameworks/kbookmarks-5.69

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

 .../files/krdc-19.12.3-kf5bookmarks-5.69.patch | 48 +++
 kde-apps/krdc/krdc-19.12.3-r1.ebuild   | 55 ++
 2 files changed, 103 insertions(+)

diff --git a/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch 
b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
new file mode 100644
index 000..03dc0059147
--- /dev/null
+++ b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
@@ -0,0 +1,48 @@
+From 70e9d2728a4928dd2aeb170935d966e934315cf4 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Fri, 17 Apr 2020 15:52:15 +0200
+Subject: Adapt to changes in KBookmarks >= 5.69
+
+Test Plan:
+The Bookmarks menu is still added as expected and the actions still show
+in the configure shortcuts dialog. I couldn't test actually creating a
+bookmark as I have no access to remote servers.
+
+Reviewers: cfeck, uwolfer, murrant
+
+Reviewed By: cfeck
+
+Differential Revision: https://phabricator.kde.org/D28920
+---
+ bookmarkmanager.cpp | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/bookmarkmanager.cpp b/bookmarkmanager.cpp
+index 47ac779..a34cb2c 100644
+--- a/bookmarkmanager.cpp
 b/bookmarkmanager.cpp
+@@ -25,6 +25,7 @@
+ #include "mainwindow.h"
+ #include "krdc_debug.h"
+ 
++#include 
+ #include 
+ #include 
+ 
+@@ -41,7 +42,13 @@ BookmarkManager::BookmarkManager(KActionCollection 
*collection, QMenu *menu, Mai
+ 
+ m_manager = KBookmarkManager::managerForFile(file, QLatin1String("krdc"));
+ m_manager->setUpdate(true);
++
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
+ m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu, collection);
++#else
++m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu);
++collection->addActions(menu->actions());
++#endif
+ 
+ KBookmarkGroup root = m_manager->root();
+ KBookmark bm = root.first();
+-- 
+cgit v1.1
+

diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild 
b/kde-apps/krdc/krdc-19.12.3-r1.ebuild
new file mode 100644
index 000..b1956006882
--- /dev/null
+++ b/kde-apps/krdc/krdc-19.12.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.krdc;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+rdp vnc"
+
+# drop kbookmarks subslot operator when KFMIN >= 5.69.0
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
+DEPEND="
+   >=kde-frameworks/kbookmarks-${KFMIN}:5=
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdnssd-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   vnc? ( >=net-libs/libvncserver-0.9 )
+"
+RDEPEND="${DEPEND}
+   rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package vnc LibVNCServer)
+   )
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/

2020-04-17 Thread Andreas Sturmlechner
commit: 50aa962977df4cf074391356df6737c593aff7bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 19:54:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50aa9629

net-irc/konversation: Port to QElapsedTimer

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

 .../files/konversation-1.7.5-QElapsedTimer.patch   | 81 ++
 net-irc/konversation/konversation-1.7.5-r2.ebuild  | 81 ++
 2 files changed, 162 insertions(+)

diff --git a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch 
b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
new file mode 100644
index 000..74fd23e58d3
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
@@ -0,0 +1,81 @@
+From 0efede7857a86f729bec0fdfd1789f7faf23d957 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Thu, 28 Nov 2019 17:41:33 +0100
+Subject: Port to QElapsedTimer; remove unused default constructor
+
+Tested by printing out the value of age(), works like before.
+---
+ src/irc/ircqueue.cpp |  8 
+ src/irc/ircqueue.h   | 18 +++---
+ 2 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/src/irc/ircqueue.cpp b/src/irc/ircqueue.cpp
+index 1101623..3cc33a5 100644
+--- a/src/irc/ircqueue.cpp
 b/src/irc/ircqueue.cpp
+@@ -19,6 +19,14 @@
+ 
+ #include "server.h"
+ 
++IRCMessage::IRCMessage(const QString )
++: s(str) //, codec(QTextCodec::codecForName("utf8"))
++{
++t.start();
++}
++
++
++
+ int IRCQueue::EmptyingRate::nextInterval(int, int elapsed)
+ {
+ if (!isValid())
+diff --git a/src/irc/ircqueue.h b/src/irc/ircqueue.h
+index 3f7f0c8..7a91776 100644
+--- a/src/irc/ircqueue.h
 b/src/irc/ircqueue.h
+@@ -19,6 +19,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ class QTimer;
+ class Server;
+@@ -34,29 +35,24 @@ class Server;
+  */
+ struct IRCMessage
+ {
+-IRCMessage() : t(QTime::currentTime()) //, 
codec(QTextCodec::codecForName("utf8"))
+-{} ///< this constructor required for QValueList, do not use
+-
+ /**
+ Make a new IRCMessage with timestamp of QTime::currentTime().
+ 
+ Note the constructor takes a QString, not a const QString& or a 
QString *. If you want to modify the
+ contained text, put it back with setText.
+ */
+-IRCMessage(QString i) : s(i), t(QTime::currentTime()) //, 
codec(QTextCodec::codecForName("utf8"))
+-{}
++IRCMessage(const QString );
+ 
+-QString text() { return s; }
+-int age() { return t.elapsed(); }
+-QTime time() { return t; }
+-void setText(QString text) { s=text; }
++QString text() const { return s; }
++int age() const { return t.elapsed(); } // in milliseconds
++void setText(const QString ) { s=text; }
+ private:
+ QString s;
+-QTime t;
++QElapsedTimer t;
+ 
+ //FIXME wire this up
+ //QTextCodec* codec;
+-//operator const char * () const { return codec->fromUnicode(text()); }
++//operator QByteArray () const { return codec->fromUnicode(text()); }
+ 
+ };
+ 
+-- 
+cgit v1.1
+

diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild 
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
new file mode 100644
index 000..f43ed032dde
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org
+https://kde.org/applications/internet/org.kde.konversation;
+SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+crypt"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kcrash-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kemoticons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kidletime-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   

[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/

2020-04-17 Thread Andreas Sturmlechner
commit: 781ea43563979f3c99fb00cedd6063448fbe45dd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 19:40:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781ea435

net-irc/konversation: Adapt to >=kde-frameworks/kbookmarks-5.69

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

 .../konversation-1.7.5-kf5bookmarks-5.69.patch | 51 ++
 net-irc/konversation/konversation-1.7.5-r2.ebuild  |  4 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git 
a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch 
b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
new file mode 100644
index 000..2c36f69aa99
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
@@ -0,0 +1,51 @@
+From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Fri, 17 Apr 2020 13:14:26 +0200
+Subject: Adapt the code to KBookmarkMenu-5.69 changes
+
+Test Plan:
+Bookmarks menu still works, and the bookmark actions still show in the
+shortcuts editor dialog.
+
+Reviewers: #konversation, psn
+
+Reviewed By: #konversation, psn
+
+Subscribers: #konversation
+
+Differential Revision: https://phabricator.kde.org/D28911
+---
+ src/bookmarkhandler.cpp | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
+index 5a70591..74b51ff 100644
+--- a/src/bookmarkhandler.cpp
 b/src/bookmarkhandler.cpp
+@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer 
+ #include "connectionmanager.h"
+ #include "viewer/viewcontainer.h"
+ 
++#include 
++#include 
+ #include 
++#include 
+ #include 
+ 
+ 
+@@ -41,7 +44,12 @@ m_mainWindow(mainWindow)
+ manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false);
+ manager->setUpdate( true );
+ 
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
+ m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, 
m_mainWindow->actionCollection());
++#else
++m_bookmarkMenu = new KBookmarkMenu(manager, this, menu);
++m_mainWindow->actionCollection()->addActions(menu->actions());
++#endif
+ }
+ 
+ KonviBookmarkHandler::~KonviBookmarkHandler()
+-- 
+cgit v1.1
+

diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild 
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 9940dae7237..cb485212136 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5=
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -63,6 +63,8 @@ PATCHES=(
"${FILESDIR}"/${P}-missing-header.patch
"${FILESDIR}"/${P}-QElapsedTimer.patch
"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
+   # git master
+   "${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/

2020-04-17 Thread Andreas Sturmlechner
commit: b3474b35d60531d3c9d3174801b4b63a6e5a1f81
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 17 19:53:14 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 17 20:58:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3474b35

net-irc/konversation: Drop kde-frameworks/kemoticons dependency

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

 .../konversation-1.7.5-unused-kemoticons.patch | 112 +
 net-irc/konversation/konversation-1.7.5-r2.ebuild  |   2 +-
 2 files changed, 113 insertions(+), 1 deletion(-)

diff --git 
a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch 
b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
new file mode 100644
index 000..d856a17215a
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
@@ -0,0 +1,112 @@
+From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Mon, 16 Sep 2019 18:18:49 +0100
+Subject: Drop effectively unused kemoticons support
+
+Summary:
+Konversation only supported emoticons if config value EnableEmotIcons
+was true. This by default was false and there is no UI for configuring
+this, making it effectively unused.
+
+This appears to be deliberate from the code comments.
+
+This helps clear up some KEmoticon library usage for future KF6
+transitioning.
+
+UTF-8 emoticons work correctly.
+
+Test Plan: Compiles
+
+Differential Revision: https://phabricator.kde.org/D24000
+---
+ src/CMakeLists.txt   |  2 --
+ src/config/konversation.kcfg |  8 
+ src/viewer/ircview.cpp   |  3 ---
+ 3 files changed, 13 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c2077b3..89616a6 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -138,7 +138,6 @@ set(viewer_SRCS
+ viewer/topiclabel.cpp
+ viewer/awaylabel.cpp
+ viewer/editnotifydialog.cpp
+-viewer/emoticons.cpp
+ viewer/images.cpp
+ viewer/quickbutton.cpp
+ viewer/searchbar.cpp
+@@ -224,7 +223,6 @@ target_link_libraries(konversation
+ KF5::Bookmarks
+ KF5::ConfigWidgets
+ KF5::Crash
+-KF5::Emoticons
+ KF5::I18n
+ KF5::IdleTime
+ KF5::NotifyConfig
+diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg
+index 1d59eaf..3f0b7a6 100644
+--- a/src/config/konversation.kcfg
 b/src/config/konversation.kcfg
+@@ -844,14 +844,6 @@
+   
+   
+ 
+-
+-  false
+-  Enable emoticons
+-
+-
+-  Default
+-  Emoticons theme
+-
+   
+   
+ 
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
+index c129f61..15f78ca 100644
+--- a/src/viewer/ircview.cpp
 b/src/viewer/ircview.cpp
+@@ -20,7 +20,6 @@
+ #include "application.h"
+ #include "highlight.h"
+ #include "sound.h"
+-#include "emoticons.h"
+ #include "notificationhandler.h"
+ 
+ #include 
+@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const 
QString& defaultColor, const
+ QLatin1String("\">") + filteredLine + QLatin1String("");
+ }
+ 
+-filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
+-
+ return filteredLine;
+ }
+ 
+-- 
+cgit v1.1
+
+From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
+From: Peter Simonsson 
+Date: Tue, 7 Apr 2020 16:37:53 +0200
+Subject: Remove KEmoticons from dependencies as it's not used
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5315dbd..19facd8 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ CoreAddons
+ Crash
+ DocTools
+-Emoticons
+ I18n
+ IdleTime
+ NotifyConfig
+-- 
+cgit v1.1

diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild 
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index cb485212136..8c3b601c6cc 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -34,7 +34,6 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kemoticons-${KFMIN}:5
>=kde-frameworks/kglobalaccel-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
@@ -65,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
# git master
"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
+   "${FILESDIR}"/${P}-unused-kemoticons.patch
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, gnome-extra/evolution-data-server/

2020-04-17 Thread Sergei Trofimovich
commit: da159355e7edf0b8d28bc8f5edbfeeae673d9cbb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Apr 17 20:47:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 17 20:48:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da159355

profiles/arch/ia64/use.mask: unmask flags held by gnome-shell

Bug: https://bugs.gentoo.org/717550
Signed-off-by: Sergei Trofimovich  gentoo.org>

 gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild | 2 +-
 profiles/arch/ia64/use.mask   | 4 
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild 
b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
index 73fee6f5dba..1c26f9c18be 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
@@ -17,7 +17,7 @@ SLOT="0/62-24" # subslot = libcamel-1.2/libedataserver-1.2 
soname version
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap 
kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to 
handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, 
bug #519512

diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 0e94cbb4c03..7b5a830dc37 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -11,12 +11,8 @@ darcs
 # Sergei Trofimovich  (2020-04-12)
 # ruby-2.7 dropped ia64 support, mask ruby in Gentoo.
 ruby
-# - gnome-extra/evolution-data-server: depends on net-libs/webkit-gtk
-eds
 # - net-libs/gnome-online-accounts: depend on net-libs/webkit-gtk
 gnome-online-accounts
-# - gnome-base/gnome-shell: depends on gnome-extra/evolution-data-server
-gnome-shell
 
 # Mattéo Rossillol‑‑Laruelle  (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libindicate).



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

2020-04-17 Thread Michał Górny
commit: 5ee6d2db3ae368f4d2d5e605af12892df8a451d8
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Apr 17 20:27:18 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 17 20:33:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee6d2db

dev-python/pylibacl: Bump to 0.5.4_p20191217 snap

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

 dev-python/pylibacl/Manifest   |  1 +
 .../pylibacl/pylibacl-0.5.4_p20191217.ebuild   | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index dc3f852491c..3100c2755e0 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1 +1,2 @@
+DIST pylibacl-0.5.4_p20191217.tar.gz 40283 BLAKE2B 
dfe5baababe4cce24bc12dd61263c30160e93be7dc0625abdcad9e4daed19c5ac1ebf43351f9f5815884162258884cd8c7e2edb323ec9ce51247a43d53fea20e
 SHA512 
6d4a84e1885a2000226f956580a8e767216d6280d4b8ae1066e6a1c1f82708d06a4f2eacc3ae45ff7ae3b122125da9fb6afbaae038e117b63cd7d91ac95e2624
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 
005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef
 SHA512 
ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2

diff --git a/dev-python/pylibacl/pylibacl-0.5.4_p20191217.ebuild 
b/dev-python/pylibacl/pylibacl-0.5.4_p20191217.ebuild
new file mode 100644
index 000..bad633dc47b
--- /dev/null
+++ b/dev-python/pylibacl/pylibacl-0.5.4_p20191217.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+EGIT_COMMIT=2ae494bd2e3303141a703f32e44263e083c1ffb0
+DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
+HOMEPAGE="
+   https://pylibacl.k1024.org/
+   https://pypi.org/project/pylibacl/
+   https://github.com/iustin/pylibacl/;
+SRC_URI="
+   https://github.com/iustin/pylibacl/archive/${EGIT_COMMIT}.tar.gz
+   -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="sys-apps/acl"
+DEPEND=${RDEPEND}
+
+distutils_enable_tests pytest
+
+python_test() {
+   if ! pytest -vv; then
+   eerror
+   eerror "If you got the following errors:"
+   eerror "\"IOError: [Errno 95] Operation not supported\","
+   eerror "then you should remount the filesystem containing"
+   eerror "build directory with \"acl\" option enabled."
+   eerror
+   die "Tests fail with ${EPYTHON}"
+   fi
+}



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

2020-04-17 Thread Michał Górny
commit: 39b0da7972d0944231ad94d972f1d5a7be43e69d
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Apr 17 20:30:52 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 17 20:33:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b0da79

dev-python/pylibacl: Also bump to 0.5.4

0.5.4 is the last version to support Python 2.

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

 dev-python/pylibacl/Manifest  |  1 +
 dev-python/pylibacl/pylibacl-0.5.4.ebuild | 35 +++
 2 files changed, 36 insertions(+)

diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 3100c2755e0..def98125c96 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,2 +1,3 @@
 DIST pylibacl-0.5.4_p20191217.tar.gz 40283 BLAKE2B 
dfe5baababe4cce24bc12dd61263c30160e93be7dc0625abdcad9e4daed19c5ac1ebf43351f9f5815884162258884cd8c7e2edb323ec9ce51247a43d53fea20e
 SHA512 
6d4a84e1885a2000226f956580a8e767216d6280d4b8ae1066e6a1c1f82708d06a4f2eacc3ae45ff7ae3b122125da9fb6afbaae038e117b63cd7d91ac95e2624
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 
005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef
 SHA512 
ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
+DIST pylibacl-v0.5.4.tar.gz 35599 BLAKE2B 
7970e9c688e5c1983a761d733836197783646bd612585e78feced37bd00a677f4b63382a3619d3261bc7a95ed1d0c62e2d255bba13faeaa9a197ea175e8ca088
 SHA512 
41de72dd29ffd6a8ddde2008eb440fb34c151b2e77b5187af919909d9785e46d0eea3b605d1e39408a4e3c17a856958fef916c1f6e557fd11454e6ed8bf120e8

diff --git a/dev-python/pylibacl/pylibacl-0.5.4.ebuild 
b/dev-python/pylibacl/pylibacl-0.5.4.ebuild
new file mode 100644
index 000..26cae8f2707
--- /dev/null
+++ b/dev-python/pylibacl/pylibacl-0.5.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
+HOMEPAGE="
+   https://pylibacl.k1024.org/
+   https://pypi.org/project/pylibacl/
+   https://github.com/iustin/pylibacl/;
+SRC_URI="https://github.com/iustin/pylibacl/archive/${PN}-v${PV}.tar.gz;
+S=${WORKDIR}/${PN}-${PN}-v${PV}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="sys-apps/acl"
+DEPEND=${RDEPEND}
+
+python_test() {
+   if ! "${EPYTHON}" test/test_acls.py -v; then
+   eerror
+   eerror "If you got the following errors:"
+   eerror "\"IOError: [Errno 95] Operation not supported\","
+   eerror "then you should remount the filesystem containing"
+   eerror "build directory with \"acl\" option enabled."
+   eerror
+   die "Tests fail with ${EPYTHON}"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/ia64/17.0/desktop/gnome/, ...

2020-04-17 Thread Sergei Trofimovich
commit: 0c6226d4d1a0fa2c157709a55e09014428c86878
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Apr 17 20:13:43 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 17 20:24:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c6226d4

profiles/profiles.desc: revert "deprecate most ia64 profiles"

Ad basic gnome packages were rekeyworded let's keep gnome
profiles for now.

This reverts commits
- 9daa398509e9272186816e735249cfd5310213db.
- 584c9af2c54b39311205e51874a9c53ea3d5be73.

Bug: https://bugs.gentoo.org/717550
Signed-off-by: Sergei Trofimovich  gentoo.org>

 profiles/default/linux/ia64/17.0/desktop/deprecated   | 1 -
 profiles/default/linux/ia64/17.0/desktop/gnome/deprecated | 1 -
 profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated | 1 -
 profiles/default/linux/ia64/17.0/developer/deprecated | 1 -
 profiles/profiles.desc| 8 
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/profiles/default/linux/ia64/17.0/desktop/deprecated 
b/profiles/default/linux/ia64/17.0/desktop/deprecated
deleted file mode 100644
index 1600e06df7a..000
--- a/profiles/default/linux/ia64/17.0/desktop/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0
\ No newline at end of file

diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/deprecated 
b/profiles/default/linux/ia64/17.0/desktop/gnome/deprecated
deleted file mode 100644
index 1600e06df7a..000
--- a/profiles/default/linux/ia64/17.0/desktop/gnome/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0
\ No newline at end of file

diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated 
b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated
deleted file mode 100644
index 1600e06df7a..000
--- a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0
\ No newline at end of file

diff --git a/profiles/default/linux/ia64/17.0/developer/deprecated 
b/profiles/default/linux/ia64/17.0/developer/deprecated
deleted file mode 100644
index 1600e06df7a..000
--- a/profiles/default/linux/ia64/17.0/developer/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-default/linux/ia64/17.0
\ No newline at end of file

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 1dfe5ce2d48..04c889aeeff 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -112,10 +112,10 @@ hppadefault/linux/hppa/17.0/developer 
  exp
 # IA64 Profiles
 # @MAINTAINER: i...@gentoo.org
 ia64default/linux/ia64/17.0 stable
-ia64default/linux/ia64/17.0/desktop exp
-ia64default/linux/ia64/17.0/desktop/gnome   exp
-ia64default/linux/ia64/17.0/desktop/gnome/systemd   exp
-ia64default/linux/ia64/17.0/developer   exp
+ia64default/linux/ia64/17.0/desktop stable
+ia64default/linux/ia64/17.0/desktop/gnome   stable
+ia64default/linux/ia64/17.0/desktop/gnome/systemd   stable
+ia64default/linux/ia64/17.0/developer   stable
 
 # M68K Profiles
 # @MAINTAINER: m...@gentoo.org



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

2020-04-17 Thread Mart Raudsepp
commit: 53402c40b967d6ea8e55200cd5bcf50e779bdb5e
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Fri Apr 17 01:30:40 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 20:08:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53402c40

dev-libs/librdkafka: arm64 stable (bug #717704)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

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

diff --git a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild 
b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
index fb67297572d..feba68d45a7 100644
--- a/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.4.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"



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

2020-04-17 Thread Mart Raudsepp
commit: a14b83dd6dbddba8d73c6c39902b7268842cf72f
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Wed Apr 15 23:42:33 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 20:08:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14b83dd

net-misc/iputils: arm64 stable (bug #716594)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

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

diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild 
b/net-misc/iputils/iputils-20190709-r1.ebuild
index bb14366479f..9f1ae6cb177 100644
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ b/net-misc/iputils/iputils-20190709-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "" ]] ; then
 else
SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> 
${P}.tar.gz

https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz;
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"



[gentoo-commits] repo/proj/guru:dev commit in: media-video/kikoplay/

2020-04-17 Thread Rui Huang
commit: e5adee3b72f18178a3f361293ff775af4209888b
Author: Huang Rui  gmail  com>
AuthorDate: Fri Apr 17 20:12:59 2020 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Apr 17 20:12:59 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e5adee3b

media-video/kikoplay: fix patch annotation

Fix patch annotation for  ebuild

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Huang Rui  gmail.com>

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

diff --git a/media-video/kikoplay/kikoplay-.ebuild 
b/media-video/kikoplay/kikoplay-.ebuild
index 0823479..d91a296 100644
--- a/media-video/kikoplay/kikoplay-.ebuild
+++ b/media-video/kikoplay/kikoplay-.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.6.0-desktop.patch # Add a desktop file
-   "${FILESDIR}"/${PN}-0.6.0-home.patch # Add a desktop file
+   "${FILESDIR}"/${PN}-0.6.0-home.patch # Fix config file path
 )
 
 src_prepare() {



[gentoo-commits] repo/proj/guru:dev commit in: media-video/kikoplay/

2020-04-17 Thread Rui Huang
commit: 6f39c74722928b1d73bffb99793fdf87e3f92713
Author: Huang Rui  gmail  com>
AuthorDate: Fri Apr 17 20:14:28 2020 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Apr 17 20:14:28 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f39c747

media-video/kikoplay: fix patch annotation of 0.6.0

Fix patch annotation of 0.6.0 ebuild

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Huang Rui  gmail.com>

 media-video/kikoplay/kikoplay-0.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/kikoplay/kikoplay-0.6.0.ebuild 
b/media-video/kikoplay/kikoplay-0.6.0.ebuild
index 17438e0..7fb835f 100644
--- a/media-video/kikoplay/kikoplay-0.6.0.ebuild
+++ b/media-video/kikoplay/kikoplay-0.6.0.ebuild
@@ -50,7 +50,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-0.6.0-install.patch # Fix install problem
"${FILESDIR}"/${PN}-0.6.0-desktop.patch # Add a desktop file
-   "${FILESDIR}"/${PN}-0.6.0-home.patch # Add a desktop file
+   "${FILESDIR}"/${PN}-0.6.0-home.patch # Fix config file path
 )
 
 src_prepare() {



[gentoo-commits] data/api:master commit in: files/overlays/

2020-04-17 Thread Michał Górny
commit: 7b8ebb77743c89b1e57798b1b6d6d982fb5dabc9
Author: robert7k  users  noreply  github  com>
AuthorDate: Fri Apr 17 12:27:29 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 17 20:07:17 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=7b8ebb77

repositories: Update contact address for robert7k overlay

Closes: https://github.com/gentoo/api-gentoo-org/pull/268
Signed-off-by: Michał Górny  gentoo.org>

 files/overlays/repositories.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml
index 730fd20..90376b8 100644
--- a/files/overlays/repositories.xml
+++ b/files/overlays/repositories.xml
@@ -3855,7 +3855,7 @@
 personal overlay of robert7k
 https://github.com/robert7k/gentoo-overlay
 
-  gentoo.bugzilla.2...@r123.de
+  gentoo.2...@r123.de
 
 https://github.com/robert7k/gentoo-overlay.git
 https://github.com/robert7k/gentoo-overlay/commits/master.atom



[gentoo-commits] data/api:master commit in: files/overlays/

2020-04-17 Thread Michał Górny
commit: fa45416dd09ac993af1a70aef0f07a9a153b5c15
Author: archfeh  gmail  com>
AuthorDate: Wed Apr 15 06:21:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr 17 20:06:51 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=fa45416d

repositories: Add archfeh's overlay

Closes: https://github.com/gentoo/api-gentoo-org/pull/262
Signed-off-by: Michał Górny  gentoo.org>

 files/overlays/repositories.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml
index 8b963a2..730fd20 100644
--- a/files/overlays/repositories.xml
+++ b/files/overlays/repositories.xml
@@ -419,6 +419,18 @@
 
 http://git.art-software.fr/ArtSoftware/portageLocalRepo.git
   
+  
+ArchFeh
+ArchFeh's personal overlay
+https://github.com/ArchFeh/ArchFeh-overlay
+
+  guyu2...@gmail.com
+  ArchFeh
+
+https://github.com/ArchFeh/ArchFeh-overlay.git
+git+ssh://g...@github.com/ArchFeh/ArchFeh-overlay.git
+https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom
+  
   
 arx-libertatis
 Arx Libertatis Overlay



[gentoo-commits] repo/gentoo:master commit in: x11-libs/gl2ps/

2020-04-17 Thread Sergei Trofimovich
commit: 2cec954e8039ab046a0cddf5b3ac9098a37f4cdb
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 17 19:38:42 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 17 20:07:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cec954e

x11-libs/gl2ps: drop to ~hppa

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-libs/gl2ps/gl2ps-1.3.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild 
b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
index d46ef9b8827..e61f4896fc9 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz;
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="



[gentoo-commits] proj/catalyst:master commit in: targets/support/

2020-04-17 Thread Ben Kohler
commit: 25c158df771eecadefc0d1cb591938780a8cbf4d
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Apr 17 19:56:16 2020 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Apr 17 19:57:19 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=25c158df

create-iso.sh: actually fix du ESP size calculation on x86/amd64

Signed-off-by: Ben Kohler  gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 793ed606..01b06501 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -220,7 +220,7 @@ case ${clst_hostarch} in
mv "${clst_target_path}/boot/efi" 
"${clst_target_path}/boot/EFI"
fi
# prepare gentoo.efimg from clst_target_path 
/boot/EFI dir
-   iaSizeTemp=$(du -sk 
"${clst_target_path}/boot/EFI" 2>/dev/null)
+   iaSizeTemp=$(du -sk --apparent-size 
"${clst_target_path}/boot/EFI" 2>/dev/null)
iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
iaSize=$((${iaSizeB}+64)) # add slack, tested 
near minimum for overhead
echo "Creating loopback file of size 
${iaSize}kB"



[gentoo-commits] proj/catalyst:master commit in: doc/, catalyst/base/, catalyst/, etc/, /

2020-04-17 Thread Matt Turner
commit: 6565ad2eb90fe0840047d097fa5637d176a7d580
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 03:21:34 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 17:20:18 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6565ad2e

catalyst: Use hashlib instead of external tools

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

 README |   1 -
 catalyst/base/genbase.py   |  18 ++-
 catalyst/base/stagebase.py |   8 +--
 catalyst/hash_utils.py | 126 -
 catalyst/main.py   |  42 ++-
 doc/catalyst-config.5.txt  |   8 +--
 etc/catalyst.conf  |  18 +++
 7 files changed, 35 insertions(+), 186 deletions(-)

diff --git a/README b/README
index eb75ba67..1a039fca 100644
--- a/README
+++ b/README
@@ -20,7 +20,6 @@ Requirements
 - Python 3.6 or greater
 - An ebuild repository snapshot (or an ebuild tree to create one)
 - A generic stage3 tarball for your architecture
-- shash for digest support
 
 What is catalyst?
 

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 08076460..632ee0d9 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -1,4 +1,5 @@
 
+import hashlib
 import io
 import os
 
@@ -11,6 +12,20 @@ class GenBase():
 def __init__(self, myspec):
 self.settings = myspec
 
+@staticmethod
+def generate_hash(filepath, name):
+h = hashlib.new(name)
+
+with open(filepath, 'rb') as f:
+while True:
+data = f.read(8192)
+if not data:
+break
+h.update(data)
+
+filename = os.path.split(filepath)[1]
+return f'# {name.upper()} HASH\n{h.hexdigest()}  {filename}\n'
+
 def gen_contents_file(self, path):
 contents = path + ".CONTENTS"
 if os.path.exists(contents):
@@ -29,11 +44,10 @@ class GenBase():
 if os.path.exists(digests):
 os.remove(digests)
 if "digests" in self.settings:
-hash_map = self.settings["hash_map"]
 if os.path.exists(path):
 with io.open(digests, "w", encoding='utf-8') as myf:
 for f in [path, path + '.CONTENTS']:
 if os.path.exists(f):
 for i in self.settings["digests"].split():
-digest = hash_map.generate_hash(f, hash_=i)
+digest = self.generate_hash(f, name=i)
 myf.write(digest)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 5f3fa1d0..71bf1ef9 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -442,9 +442,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 # XXX: Is this even necessary if the previous check passes?
 if os.path.exists(self.settings["source_path"]):
 self.settings["source_path_hash"] = \
-self.settings["hash_map"].generate_hash(
-self.settings["source_path"],
-hash_="sha1")
+self.generate_hash(self.settings["source_path"], 
"sha1")
 log.notice('Source path set to %s', self.settings['source_path'])
 
 def set_dest_path(self):
@@ -469,9 +467,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 )
 log.info('SNAPSHOT_PATH set to: %s', self.settings['snapshot_path'])
 self.settings["snapshot_path_hash"] = \
-self.settings["hash_map"].generate_hash(
-self.settings["snapshot_path"],
-hash_="sha1")
+self.generate_hash(self.settings["snapshot_path"], "sha1")
 
 def set_snapcache_path(self):
 self.settings["snapshot_cache_path"] = \

diff --git a/catalyst/hash_utils.py b/catalyst/hash_utils.py
deleted file mode 100644
index 3aae890e..
--- a/catalyst/hash_utils.py
+++ /dev/null
@@ -1,126 +0,0 @@
-
-import os
-from collections import namedtuple
-from subprocess import Popen, PIPE
-
-from catalyst import log
-from catalyst.support import CatalystError
-
-
-# Use HashMap.fields for the value legend
-# fields = ["func", "cmd", "args", "id"]
-HASH_DEFINITIONS = {
-"adler32"  :["calc_hash2", "shash", ["-a", "ADLER32"], "ADLER32"],
-"blake2"   :["calc_hash",  "b2sum", [ ], "BLAKE2"],
-"crc32":["calc_hash2", "shash", ["-a", "CRC32"], "CRC32"],
-"crc32b"   :["calc_hash2", "shash", ["-a", "CRC32B"], "CRC32B"],
-"gost" :["calc_hash2", "shash", ["-a", "GOST"], "GOST"],
-"haval128" :["calc_hash2", "shash", ["-a", "HAVAL128"], "HAVAL128"],
-"haval160" :["calc_hash2", "shash", ["-a", "HAVAL160"], "HAVAL160"],
-"haval192" :["calc_hash2", "shash", ["-a", "HAVAL192"], "HAVAL192"],
-"haval224" :["calc_hash2", "shash", ["-a", "HAVAL224"], "HAVAL224"],
-

[gentoo-commits] proj/catalyst:master commit in: catalyst/base/

2020-04-17 Thread Matt Turner
commit: 907f5a20e28ef9fed45595bdc68daaebd36d5281
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 07:03:14 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 07:08:24 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=907f5a20

catalyst: Remove guard rails on duplicate digests

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

 catalyst/base/genbase.py | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index e75e6e3c..f55b113f 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -37,17 +37,13 @@ class GenBase():
 hash_map = self.settings["hash_map"]
 if os.path.exists(path):
 with io.open(digests, "w", encoding='utf-8') as myf:
-keys = {}
-for i in self.settings["digests"].split():
-keys[i] = 1
-array = sorted(keys.keys())
 for f in [path, path + '.CONTENTS']:
 if os.path.exists(f):
-if "all" in array:
+if "all" in self.settings["digests"].split():
 for k in list(hash_map.hash_map):
 digest = hash_map.generate_hash(f, hash_=k)
 myf.write(digest)
 else:
-for j in array:
+for j in self.settings["digests"].split():
 digest = hash_map.generate_hash(f, hash_=j)
 myf.write(digest)



[gentoo-commits] proj/catalyst:master commit in: catalyst/base/

2020-04-17 Thread Matt Turner
commit: 46e6f497dcd0c21cd5197e5d9cf1ef6e196af10a
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 05:37:42 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 05:51:15 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=46e6f497

catalyst: Generate array outside of loop

I'm going to change all of this code anyway, but I had to make this a
separate commit since I was so flabbergasted by the absurdity of it.
After digging through the history across multiple renames, I found that
this mistake was introduced in 2006.

Fixes: d128d2a554b0 (digests function uses raw output from hash function now)
Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/genbase.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 1164fd55..e75e6e3c 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -22,7 +22,7 @@ class GenBase():
 keys = {}
 for i in self.settings["contents"].split():
 keys[i] = 1
-array = sorted(keys.keys())
+array = sorted(keys.keys())
 for j in array:
 contents = contents_map.contents(path, j,
  
verbose=self.settings["VERBOSE"])
@@ -40,7 +40,7 @@ class GenBase():
 keys = {}
 for i in self.settings["digests"].split():
 keys[i] = 1
-array = sorted(keys.keys())
+array = sorted(keys.keys())
 for f in [path, path + '.CONTENTS']:
 if os.path.exists(f):
 if "all" in array:



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

2020-04-17 Thread Matt Turner
commit: 04aba402175bdcfb63c9ec7127e13b46998904ac
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 17:32:26 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 19:51:30 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=04aba402

catalyst: Raise an exception on invalid digest

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

 catalyst/main.py | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/catalyst/main.py b/catalyst/main.py
index c91fc8b6..7e2a6c06 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -347,11 +347,10 @@ def _main(parser, opts):
 
 # First validate all the requested digests are valid keys.
 if digests - valid_digests:
-log.critical(
-'These are not valid digest entries:\n%s\n'
-'Valid digest entries:\n%s',
-', '.join(sorted(digests - valid_digests)),
-', '.join(sorted(valid_digests)))
+raise CatalystError('These are not valid digest entries:\n%s\n'
+'Valid digest entries:\n%s' %
+', '.join(sorted(digests - valid_digests)),
+', '.join(sorted(valid_digests)))
 
 addlargs = {}
 



[gentoo-commits] proj/catalyst:master commit in: catalyst/, targets/stage1/, targets/support/

2020-04-17 Thread Matt Turner
commit: 80ec0abb4c0f801df3f604aea5fa3b51e9a9db54
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Apr 15 23:43:42 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Apr 15 23:43:42 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=80ec0abb

catalyst: Remove GNU sed detection

Was added in commit f3d246e24b5b (detect and use a configured sed
command for Gentoo/FreeBSD # 363577) for FreeBSD, but BSD support is now
gone.

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

 catalyst/defaults.py|  1 -
 catalyst/main.py|  6 --
 targets/stage1/chroot.sh| 10 +-
 targets/support/chroot-functions.sh | 10 +-
 targets/support/kmerge.sh   |  8 
 targets/support/livecdfs-update.sh  | 32 
 6 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 4f67878c..8e276500 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -52,7 +52,6 @@ confdefaults = {
 "PythonDir": "./catalyst",
 "repo_basedir": REPODIR[:],
 "repo_name": MAINREPO[:],
-"sed": "sed",
 "sharedir": "/usr/share/catalyst",
 "shdir": "/usr/share/catalyst/targets/",
 "snapshot_cache": "/var/tmp/catalyst/snapshot_cache",

diff --git a/catalyst/main.py b/catalyst/main.py
index 8603012d..0fb8a682 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -404,12 +404,6 @@ def _main(parser, opts):
 hash_map.hash_map[conf_values['hash_function']].cmd,
 conf_values['hash_function'])
 
-# detect GNU sed
-for sed in ('/usr/bin/gsed', '/bin/sed', '/usr/bin/sed'):
-if os.path.exists(sed):
-conf_values["sed"] = sed
-break
-
 addlargs = {}
 
 if myspecfile:

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 6e20027a..ac9d68ea 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -48,14 +48,14 @@ else
 fi
 
 # Clear USE
-[ -e ${clst_make_conf} ] && ${clst_sed} -i -e "/^USE=\"${BINDIST} ${USE}\"/d" 
${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" 
${clst_make_conf}
 make_destpath "${clst_root_path}"
 
 ## START BUILD
 # First, we drop in a known-good baselayout
 [ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
 run_merge "--oneshot --nodeps sys-apps/baselayout"
-${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
+sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
 
 echo "$locales" > /etc/locale.gen
 for etc in /etc "${clst_root_path}"/etc; do
@@ -87,10 +87,10 @@ locale-gen --destdir "${clst_root_path}"/ || die 
"locale-gen failed"
 # Why are we removing these? Don't we need them for final make.conf?
 for useexpand in ${clst_HOSTUSEEXPAND}; do
x="clst_${useexpand}"
-   ${clst_sed} -i "/${useexpand}=\"${!x}\"/d" \
+   sed -i "/${useexpand}=\"${!x}\"/d" \
${clst_make_conf}
 done
 
 # Clear USE
-[ -e ${clst_make_conf} ] && ${clst_sed} -i -e "/^CATALYST_USE/d" 
${clst_make_conf}
-[ -e ${clst_make_conf} ] && ${clst_sed} -i -e "/^USE=\"/s/\${CATALYST_USE} 
${USE} ${BOOTSTRAP_USE}//" ${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf}
+[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} 
${BOOTSTRAP_USE}//" ${clst_make_conf}

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2c256f06..2fe5ac00 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -102,7 +102,7 @@ setup_myfeatures(){
else
clst_root_path=/ run_merge --oneshot --noreplace 
sys-devel/distcc || exit 1
fi
-   ${clst_sed} -i '/USE="${USE} -avahi -gtk -gnome"/d' 
${clst_make_conf}
+   sed -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}
mkdir -p /etc/distcc
echo "${clst_distcc_hosts}" > /etc/distcc/hosts
 
@@ -191,7 +191,7 @@ setup_pkgmgr(){
echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"
[ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> 
"${clst_make_conf}"
run_merge --oneshot --update --newuse sys-apps/portage
-   ${clst_sed} -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
+   sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
else
run_merge --oneshot --update --newuse sys-apps/portage
fi
@@ -245,8 +245,8 @@ cleanup_stages() {
esac
 
# Remove bindist from use
-   ${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
-   ${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"
+   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+   sed -i "/USE=\"bindist\"/d" "${clst_make_conf}"
 
rm -f /var/log/emerge.log 

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

2020-04-17 Thread Matt Turner
commit: 0239c60e9a811f46b080fa96074ce9cf82cc55e0
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 03:41:24 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 03:42:51 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0239c60e

catalyst: Reformat some array definitions

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

 catalyst/defaults.py | 47 ---
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 8e276500..570fc4df 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -5,22 +5,47 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, 
LIST_XATTRS_OPTIONS
 
 
 # these should never be touched
-required_build_targets = ["targetbase", "generic_stage_target"]
+required_build_targets = [
+"generic_stage_target",
+"targetbase",
+]
 
 # new build types should be added here
-valid_build_targets = ["stage1_target", "stage2_target", "stage3_target",
-   "stage4_target", "livecd_stage1_target", 
"livecd_stage2_target",
-   "embedded_target", "snapshot_target", "netboot_target"
-   ]
+valid_build_targets = [
+"embedded_target",
+"livecd_stage1_target",
+"livecd_stage2_target",
+"netboot_target",
+"snapshot_target",
+"stage1_target",
+"stage2_target",
+"stage3_target",
+"stage4_target",
+]
 
-required_config_file_values = ["storedir", "sharedir", "distdir", "portdir"]
+required_config_file_values = [
+"distdir",
+"portdir",
+"sharedir",
+"storedir",
+]
 
 valid_config_file_values = required_config_file_values[:]
-valid_config_file_values.extend(["distcc", "envscript",
- "options", "DEBUG", "VERBOSE",
- "snapshot_cache", "hash_function", "digests", 
"contents", "compressor_arch",
- "compression_mode", "compressor_options", 
"decompressor_search_order",
- ])
+valid_config_file_values.extend([
+"compression_mode",
+"compressor_arch",
+"compressor_options",
+"contents",
+"DEBUG",
+"decompressor_search_order",
+"digests",
+"distcc",
+"envscript",
+"hash_function",
+"options",
+"snapshot_cache",
+"VERBOSE",
+])
 
 # set our base defaults here to keep
 # them in one location.



[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/

2020-04-17 Thread Matt Turner
commit: bcffd2ef3fc347d6ce346a1737ddbd0ed0b7dff6
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 17:27:08 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 18:55:23 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bcffd2ef

catalyst: Make conf_values['digests'] a set

This makes it automatically deduplicate values (which I honestly don't
really care about) but also makes it so users don't need to .split()
themselves.

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

 catalyst/base/genbase.py | 2 +-
 catalyst/main.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index bc7f9375..eb09a4e0 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -37,5 +37,5 @@ class GenBase():
 
 with io.open(path + '.DIGESTS', 'w', encoding='utf-8') as file:
 for f in [path, path + '.CONTENTS']:
-for i in self.settings['digests'].split():
+for i in self.settings['digests']:
 file.write(self.generate_hash(f, name=i))

diff --git a/catalyst/main.py b/catalyst/main.py
index d8e791c4..c91fc8b6 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -341,8 +341,9 @@ def _main(parser, opts):
 # TODO add capability to config/spec new definitions
 
 if "digests" in conf_values:
-digests = set(conf_values['digests'].split())
 valid_digests = hashlib.algorithms_available
+digests = set(conf_values['digests'].split())
+conf_values['digests'] = digests
 
 # First validate all the requested digests are valid keys.
 if digests - valid_digests:



[gentoo-commits] proj/catalyst:master commit in: catalyst/base/

2020-04-17 Thread Matt Turner
commit: f0e78af28a5e1c6275cd5b6b3f8c602e7fd16f7f
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 17:17:49 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 18:55:18 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f0e78af2

catalyst: Simplify GenBase

So much was wrong with this code. Deleting a file if it exists only to
open it with 'w' (which would have truncated it anyway!), checking for
presence of files that must exist and doing it in the wrong place, etc.

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

 catalyst/base/genbase.py | 36 
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 632ee0d9..bc7f9375 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -3,10 +3,9 @@ import hashlib
 import io
 import os
 
-
 class GenBase():
 """
-This class does generation of the contents and digests files.
+Generates CONTENTS and DIGESTS files.
 """
 
 def __init__(self, myspec):
@@ -27,27 +26,16 @@ class GenBase():
 return f'# {name.upper()} HASH\n{h.hexdigest()}  {filename}\n'
 
 def gen_contents_file(self, path):
-contents = path + ".CONTENTS"
-if os.path.exists(contents):
-os.remove(contents)
-
-contents_map = self.settings["contents_map"]
-if os.path.exists(path):
-with io.open(contents, "w", encoding='utf-8') as myf:
-contents = contents_map.contents(path, '',
- 
verbose=self.settings["VERBOSE"])
-if contents:
-myf.write(contents)
+c = self.settings['contents_map']
+
+with io.open(path + '.CONTENTS', 'w', encoding='utf-8') as file:
+file.write(c.contents(path, '', verbose=self.settings['VERBOSE']))
 
 def gen_digest_file(self, path):
-digests = path + ".DIGESTS"
-if os.path.exists(digests):
-os.remove(digests)
-if "digests" in self.settings:
-if os.path.exists(path):
-with io.open(digests, "w", encoding='utf-8') as myf:
-for f in [path, path + '.CONTENTS']:
-if os.path.exists(f):
-for i in self.settings["digests"].split():
-digest = self.generate_hash(f, name=i)
-myf.write(digest)
+if 'digests' not in self.settings:
+return
+
+with io.open(path + '.DIGESTS', 'w', encoding='utf-8') as file:
+for f in [path, path + '.CONTENTS']:
+for i in self.settings['digests'].split():
+file.write(self.generate_hash(f, name=i))



[gentoo-commits] proj/catalyst:master commit in: catalyst/, etc/, doc/, catalyst/base/

2020-04-17 Thread Matt Turner
commit: c6d5b3151d284f62f04fe2999b8c532e9b7323c7
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 03:38:42 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 17:03:47 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c6d5b315

catalyst: Remove 'contents' config option

This option seems completely absurd and on top of that has been
completely broken, since contents() has been passed 'j', which is the
mode, as the positional argument 'destination'. This only worked because
destination is not used in the contents generation and the actual mode
parameter has a default argument of 'auto'.

So the config option has not worked in a long time and no one has
noticed.

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

 catalyst/base/genbase.py  | 21 -
 catalyst/defaults.py  |  1 -
 catalyst/main.py  |  4 
 doc/catalyst-config.5.txt | 27 ---
 etc/catalyst.conf | 12 
 5 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 2dc8bad0..08076460 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -15,19 +15,14 @@ class GenBase():
 contents = path + ".CONTENTS"
 if os.path.exists(contents):
 os.remove(contents)
-if "contents" in self.settings:
-contents_map = self.settings["contents_map"]
-if os.path.exists(path):
-with io.open(contents, "w", encoding='utf-8') as myf:
-keys = {}
-for i in self.settings["contents"].split():
-keys[i] = 1
-array = sorted(keys.keys())
-for j in array:
-contents = contents_map.contents(path, j,
- 
verbose=self.settings["VERBOSE"])
-if contents:
-myf.write(contents)
+
+contents_map = self.settings["contents_map"]
+if os.path.exists(path):
+with io.open(contents, "w", encoding='utf-8') as myf:
+contents = contents_map.contents(path, '',
+ 
verbose=self.settings["VERBOSE"])
+if contents:
+myf.write(contents)
 
 def gen_digest_file(self, path):
 digests = path + ".DIGESTS"

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 570fc4df..e60980d3 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -35,7 +35,6 @@ valid_config_file_values.extend([
 "compression_mode",
 "compressor_arch",
 "compressor_options",
-"contents",
 "DEBUG",
 "decompressor_search_order",
 "digests",

diff --git a/catalyst/main.py b/catalyst/main.py
index 0fb8a682..ba6e3fcc 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -68,10 +68,6 @@ def parse_config(config_files):
 if key in myconf:
 conf_values[key] = myconf[key]
 
-if "contents" in myconf:
-# replace '-' with '_' (for compatibility with existing configs)
-conf_values["contents"] = myconf["contents"].replace("-", '_')
-
 if "envscript" in myconf:
 log.info('Envscript support enabled.')
 

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 76ac4a29..220bb528 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -26,7 +26,6 @@ and empty lines are interpreted as comments.  For example:
 # /etc/catalyst/catalyst.conf
 
 digests="auto"
-contents="auto"
 envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache snapcache"
 
@@ -57,32 +56,6 @@ supported options below.  Adding them all may take a long 
time.
 (example: `md5 sha1 sha512 whirlpool`).  See the *SUPPORTED HASHES*
 section for a list of supported hashes.
 
-*contents*::
-Create a `.CONTENTS` file listing the contents of the file.  If this
-variable is empty, no `.CONTENTS` will be generated at all.  Supported
-values:
-+
---
-auto::
-Strongly recommended
-
-tar-tv::
-Do `tar tvf FILE`
-
-tar-tvz::
-Do `tar tvzf FILE`
-
-tar-tvy::
-Do `tar tvyf FILE`
-
-isoinfo-l::
-Do `isoinfo -l -i FILE`
-
-isoinfo-f::
-Do `isoinfo -f -i FILE`.  'isoinfo-f' is the only option not chosen
-by the automatic algorithm.
---
-
 *envscript*::
 Environment script location, which allows users to set options such as
 HTTP proxies, `MAKEOPTS`, `GENTOO_MIRRORS`, or any other environment

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index dd34fae3..a3c22049 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -14,18 +14,6 @@
 # tiger160, whirlpool
 digests="blake2 sha512"
 
-# Creates a .CONTENTS file listing the contents of the file. Pick from any of
-# the supported options below:
-# auto - strongly recommended
-# tar_tv   - does 'tar tvf FILE'
-# tar_tvz  - does 'tar 

[gentoo-commits] proj/catalyst:master commit in: doc/, catalyst/base/, catalyst/, etc/

2020-04-17 Thread Matt Turner
commit: 45edc6510ce9cbf9cbe9ab5d2b7b8cd9f65f84cb
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 06:38:14 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 17:03:47 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=45edc651

catalyst: Remove the 'hash_function' config option

Switch to SHA1, which is plenty fast. The next commit switches from the
external shash/b2sum tools to Python's hashlib, and the removal of this
config option will simplify that since the crc32 hash is in a different
python module (zlib).

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

 catalyst/base/stagebase.py |  4 ++--
 catalyst/defaults.py   |  2 --
 catalyst/main.py   | 16 
 doc/catalyst-config.5.txt  |  6 --
 etc/catalyst.conf  | 10 --
 5 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f673382f..5f3fa1d0 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -444,7 +444,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 self.settings["source_path_hash"] = \
 self.settings["hash_map"].generate_hash(
 self.settings["source_path"],
-hash_=self.settings["hash_function"])
+hash_="sha1")
 log.notice('Source path set to %s', self.settings['source_path'])
 
 def set_dest_path(self):
@@ -471,7 +471,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 self.settings["snapshot_path_hash"] = \
 self.settings["hash_map"].generate_hash(
 self.settings["snapshot_path"],
-hash_=self.settings["hash_function"])
+hash_="sha1")
 
 def set_snapcache_path(self):
 self.settings["snapshot_cache_path"] = \

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index e60980d3..f292c211 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -40,7 +40,6 @@ valid_config_file_values.extend([
 "digests",
 "distcc",
 "envscript",
-"hash_function",
 "options",
 "snapshot_cache",
 "VERBOSE",
@@ -63,7 +62,6 @@ confdefaults = {
 "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'],
 "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
 "distdir": DISTDIR[:],
-"hash_function": "crc32",
 "icecream": "/var/cache/icecream",
 'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'],
 "local_overlay": REPODIR[:] + "/local",

diff --git a/catalyst/main.py b/catalyst/main.py
index ba6e3fcc..cb3cd3f7 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -384,22 +384,6 @@ def _main(parser, opts):
 # Now reload the config with our updated value.
 conf_values['digests'] = ' '.join(digests)
 
-if "hash_function" in conf_values:
-if conf_values["hash_function"] not in HASH_DEFINITIONS:
-log.critical(
-'%s is not a valid hash_function entry\n'
-'Valid hash_function entries:\n'
-'%s', conf_values["hash_function"], HASH_DEFINITIONS.keys())
-try:
-process.find_binary(
-hash_map.hash_map[conf_values["hash_function"]].cmd)
-except process.CommandNotFound:
-log.critical(
-'The "%s" binary needed by hash_function "%s" was not found. '
-'It needs to be in your system path.',
-hash_map.hash_map[conf_values['hash_function']].cmd,
-conf_values['hash_function'])
-
 addlargs = {}
 
 if myspecfile:

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 220bb528..d5e8c128 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -66,12 +66,6 @@ variables using POSIX shell notation:
 export FOO="bar"
 -
 
-*hash_function*::
-Internal hash function catalyst should use for things like autoresume,
-seedcache, etc.  The default and fastest is `crc32`.  You should not
-ever need to change this unless your OS does not support it.  See the
-*SUPPORTED HASHES* section for a list of supported hashes.
-
 **options*::
 Set different build-time options (example: `autoresume bindist
 kerncache pkgcache seedcache snapcache`).  Supported values:

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index a3c22049..4c4d491e 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -24,16 +24,6 @@ distdir="/var/cache/distfiles"
 # export FOO="bar"
 envscript="/etc/catalyst/catalystrc"
 
-# Internal hash function catalyst should use for things like autoresume,
-# seedcache, etc.  The default and fastest is crc32.  You should not ever need
-# to change this unless your OS does not support it.
-# Supported hashes:
-# adler32, blake2, crc32, crc32b, gost, haval128, haval160, haval192, haval224,
-# haval256, md2, md4, md5, ripemd128, ripemd160, ripemd256, 

[gentoo-commits] proj/catalyst:master commit in: doc/, catalyst/base/, catalyst/

2020-04-17 Thread Matt Turner
commit: bb21b8615e64cb31fa9aa9d533ef328dc1374e45
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 18:03:02 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 19:51:32 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bb21b861

catalyst: gzip the .CONTENTS file

Other algorithms give better compression ratios, but the difference is
not meaningful for a 2MiB text file. In my testing bzip2 gave a better
compression ratio of 15:1 vs gzip's 11:1, but that ends up being only a
size difference of 50KiB (136 vs 187) which is only an additional 2.5%
savings from the uncompressed input.

Choose gzip because transparent decompression is widely supported by web
servers and clients.

Closes: https://bugs.gentoo.org/630284
Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/genbase.py | 5 +++--
 catalyst/support.py  | 2 +-
 doc/HOWTO.txt| 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index eb09a4e0..3db20f84 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -2,6 +2,7 @@
 import hashlib
 import io
 import os
+import gzip
 
 class GenBase():
 """
@@ -28,7 +29,7 @@ class GenBase():
 def gen_contents_file(self, path):
 c = self.settings['contents_map']
 
-with io.open(path + '.CONTENTS', 'w', encoding='utf-8') as file:
+with gzip.open(path + '.CONTENTS.gz', 'w', encoding='utf-8') as file:
 file.write(c.contents(path, '', verbose=self.settings['VERBOSE']))
 
 def gen_digest_file(self, path):
@@ -36,6 +37,6 @@ class GenBase():
 return
 
 with io.open(path + '.DIGESTS', 'w', encoding='utf-8') as file:
-for f in [path, path + '.CONTENTS']:
+for f in [path, path + '.CONTENTS.gz']:
 for i in self.settings['digests']:
 file.write(self.generate_hash(f, name=i))

diff --git a/catalyst/support.py b/catalyst/support.py
index 654b23aa..988a81f5 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -65,7 +65,7 @@ def file_check(filepath, extensions=None, strict=True):
 files = glob.glob("%s.*" % filepath)
 # remove any false positive files
 files = [x for x in files if not x.endswith(
-".CONTENTS") and not x.endswith(".DIGESTS")]
+".CONTENTS") and not x.endswith(".CONTENTS.gz") and not 
x.endswith(".DIGESTS")]
 if len(files) == 1:
 return files[0]
 if len(files) > 1 and strict:

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index 960b5761..7b759121 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
@@ -22,7 +22,7 @@ Create a snapshot of your current Portage tree (you may want 
to
 # catalyst --snapshot 20130131
 # ls /var/tmp/catalyst/snapshots/
 portage-20130131.tar.bz2
-portage-20130131.tar.bz2.CONTENTS
+portage-20130131.tar.bz2.CONTENTS.gz
 portage-20130131.tar.bz2.DIGESTS
 
 where the storage location is relative to the default
@@ -44,7 +44,7 @@ For example,
 Grab the tarball and put it where catalyst will find it:
 
 # wget http://…/stage3-amd64-20121213.tar.bz2
-# wget http://…/stage3-amd64-20121213.tar.bz2.CONTENTS
+# wget http://…/stage3-amd64-20121213.tar.bz2.CONTENTS.gz
 # wget http://…/stage3-amd64-20121213.tar.bz2.DIGESTS.asc
 # sha512sum -c stage3-amd64-20121213.tar.bz2.DIGESTS.asc
 # gpg --verify stage3-amd64-20121213.tar.bz2.DIGESTS.asc
@@ -89,7 +89,7 @@ which will build the target and install something like:
 
 # ls /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.*
 /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2
-/var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2.CONTENTS
+/var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2.CONTENTS.gz
 /var/tmp/catalyst/builds/default/stage1-amd64-2013.1.tar.bz2.DIGESTS
 
 The name is an expansion of



[gentoo-commits] proj/catalyst:master commit in: catalyst/base/

2020-04-17 Thread Matt Turner
commit: fe133e8058ecfcad654ae80bdfbf7359237d4ec5
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 17 07:11:33 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 17 07:14:44 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fe133e80

catalyst: Remove dead 'all' digests case

Generating close to 30 digests is not a sensible thing to do in general,
but worse this code was not possible: 'all' was not a valid digest
option since it is not a key in HASH_DEFINITIONS.

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

 catalyst/base/genbase.py | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index f55b113f..2dc8bad0 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -39,11 +39,6 @@ class GenBase():
 with io.open(digests, "w", encoding='utf-8') as myf:
 for f in [path, path + '.CONTENTS']:
 if os.path.exists(f):
-if "all" in self.settings["digests"].split():
-for k in list(hash_map.hash_map):
-digest = hash_map.generate_hash(f, hash_=k)
-myf.write(digest)
-else:
-for j in self.settings["digests"].split():
-digest = hash_map.generate_hash(f, hash_=j)
-myf.write(digest)
+for i in self.settings["digests"].split():
+digest = hash_map.generate_hash(f, hash_=i)
+myf.write(digest)



[gentoo-commits] repo/gentoo:master commit in: acct-user/consul/

2020-04-17 Thread William Hubbs
commit: 3c6027f9fe0a33c3b99937cc94edc4fc21ec055f
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Apr 17 19:34:03 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Apr 17 19:50:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c6027f9

acct-user/consul: new user for consul (approved by zmedico)

Signed-off-by: William Hubbs  gentoo.org>

 acct-user/consul/consul-0.ebuild | 13 +
 acct-user/consul/metadata.xml|  7 +++
 2 files changed, 20 insertions(+)

diff --git a/acct-user/consul/consul-0.ebuild b/acct-user/consul/consul-0.ebuild
new file mode 100644
index 000..49c0d5a31b0
--- /dev/null
+++ b/acct-user/consul/consul-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for consul"
+ACCT_USER_HOME=/var/lib/consul
+ACCT_USER_ID=411
+ACCT_USER_GROUPS=( consul )
+
+acct-user_add_deps

diff --git a/acct-user/consul/metadata.xml b/acct-user/consul/metadata.xml
new file mode 100644
index 000..9a7ba2ff3c4
--- /dev/null
+++ b/acct-user/consul/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   zmed...@gentoo.org
+   
+



[gentoo-commits] repo/gentoo:master commit in: acct-group/consul/

2020-04-17 Thread William Hubbs
commit: 0871e0497e619f76a54585dd0cc3c7768facd056
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Apr 17 19:31:43 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Apr 17 19:50:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0871e049

acct-group/consul: new group for consul (approved by zmedico)

Signed-off-by: William Hubbs  gentoo.org>

 acct-group/consul/consul-0.ebuild | 8 
 acct-group/consul/metadata.xml| 7 +++
 2 files changed, 15 insertions(+)

diff --git a/acct-group/consul/consul-0.ebuild 
b/acct-group/consul/consul-0.ebuild
new file mode 100644
index 000..615defa305d
--- /dev/null
+++ b/acct-group/consul/consul-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=411

diff --git a/acct-group/consul/metadata.xml b/acct-group/consul/metadata.xml
new file mode 100644
index 000..9a7ba2ff3c4
--- /dev/null
+++ b/acct-group/consul/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   zmed...@gentoo.org
+   
+



[gentoo-commits] repo/gentoo:master commit in: app-arch/gnome-autoar/

2020-04-17 Thread Mart Raudsepp
commit: fdfdc57edd26d3ecdf21cd45800666580d626ed2
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 18:46:06 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfdc57e

app-arch/gnome-autoar: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-arch/gnome-autoar/Manifest  |  1 -
 app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild | 43 -
 2 files changed, 44 deletions(-)

diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index b0069c457dd..b1d6d031346 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,2 +1 @@
-DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 
37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97
 SHA512 
f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc
 DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 
20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1
 SHA512 
66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19

diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild 
b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
deleted file mode 100644
index ac9604b0ef6..000
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://git.gnome.org/browse/gnome-autoar;
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-   >=app-arch/libarchive-3.2.0
-   >=dev-libs/glib-2.35.6:2
-   gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-   introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}
-   >=dev-util/gtk-doc-am-1.14
-   gnome-base/gnome-common
-   virtual/pkgconfig
-   vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-   use vala && vala_src_prepare
-   gnome2_src_prepare
-}
-
-src_configure() {
-   gnome2_src_configure \
-   --disable-static \
-   $(use_enable introspection) \
-   $(use_enable vala) \
-   $(use_enable gtk)
-}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/gcr/

2020-04-17 Thread Mart Raudsepp
commit: c32053c617ca34c81a56e14b8f7e938fc8c98861
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:32:05 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32053c6

app-crypt/gcr: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-crypt/gcr/Manifest  |  1 -
 app-crypt/gcr/gcr-3.28.1.ebuild | 78 -
 2 files changed, 79 deletions(-)

diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 6a59782d2b1..22bd9c6e136 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,2 +1 @@
-DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B 
e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5
 SHA512 
ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B 
fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4
 SHA512 
9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093

diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
deleted file mode 100644
index 5b681cec74f..000
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr;
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-
-IUSE="debug gtk +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-   >=app-crypt/p11-kit-0.19
-   >=dev-libs/glib-2.38:2
-   >=dev-libs/libgcrypt-1.2.2:0=
-   >=dev-libs/libtasn1-1:=
-   >=sys-apps/dbus-1
-   gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-   introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}
-   !

[gentoo-commits] repo/gentoo:master commit in: app-text/enchant/

2020-04-17 Thread Mart Raudsepp
commit: 7da14b3d20dfa06c89b1616a6be4a9486e40119e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:43:55 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da14b3d

app-text/enchant: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-text/enchant/Manifest |  1 -
 app-text/enchant/enchant-2.2.7.ebuild | 42 ---
 2 files changed, 43 deletions(-)

diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 035cc86a7fc..59797f9d89b 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,3 +1,2 @@
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B 
d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3
 SHA512 
26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 
32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a
 SHA512 
696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
 DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 
50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af
 SHA512 
4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090

diff --git a/app-text/enchant/enchant-2.2.7.ebuild 
b/app-text/enchant/enchant-2.2.7.ebuild
deleted file mode 100644
index ffa052358fa..000
--- a/app-text/enchant/enchant-2.2.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/;
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, 
bug #629742
-RDEPEND="
-   >=dev-libs/glib-2.6:2
-   aspell? ( app-text/aspell )
-   hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-#  test? ( dev-libs/unittest++ )
-RESTRICT="test"
-
-src_configure() {
-   econf \
-   --datadir="${EPREFIX}"/usr/share/enchant-2 \
-   --disable-static \
-   $(use_with aspell) \
-   $(use_with hunspell) \
-   --without-hspell \
-   --without-voikko \
-   --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-   default
-   find "${D}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/

2020-04-17 Thread Mart Raudsepp
commit: d69df288bda3756a6d385bdda4ab2a36d7fc231e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:36:07 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69df288

dev-libs/totem-pl-parser: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-libs/totem-pl-parser/Manifest  |  1 -
 .../totem-pl-parser/totem-pl-parser-3.26.3.ebuild  | 66 --
 2 files changed, 67 deletions(-)

diff --git a/dev-libs/totem-pl-parser/Manifest 
b/dev-libs/totem-pl-parser/Manifest
index 12799cab2eb..455ab0bb8fd 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,2 @@
-DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 
24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d
 SHA512 
f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
 DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B 
a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce
 SHA512 
afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
 DIST totem-pl-parser-3.26.5.tar.xz 1318700 BLAKE2B 
18cea2edff1206ed9c77ac07fb018da0c9bc5550599b45e363d745166f4828adba6a2f77b763602af011c0a12e9f1f9765402fbafbe097fb69890ec7a9520825
 SHA512 
ce110d92f60da328272a8135a57ba60785ea4bca1fde3703a734969e7ba5b382ef19dc3b8930a5641d8f8effabf627f7e9b2727ee94e69e6144e0f085079e14d

diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild 
b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
deleted file mode 100644
index ee9851afbf0..000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/;
-
-LICENSE="LGPL-2+"
-SLOT="0/18"
-IUSE="archive crypt gtk-doc +introspection +quvi test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-   >=dev-libs/glib-2.36:2
-   quvi? ( >=media-libs/libquvi-0.9.1:0= )
-   archive? ( >=app-arch/libarchive-3:0= )
-   dev-libs/libxml2:2
-   crypt? ( dev-libs/libgcrypt:0= )
-   introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-util/glib-utils
-   gtk-doc? (
-   >=dev-util/gtk-doc-1.14
-   app-text/docbook-xml-dtd:4.3 )
-   >=sys-devel/gettext-0.19.8
-   virtual/pkgconfig
-   test? (
-   gnome-base/gvfs[http]
-   sys-apps/dbus )
-"
-
-src_prepare() {
-   # Disable tests requiring network access, bug #346127
-   # 3rd test fails on upgrade, not once installed
-   # Leio: I consider network tests important for ensuring full 
functionality, thus trying with them again */
-   #sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-   #   -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' 
\
-   #   -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
-   #   -i plparse/tests/parser.c || die "sed failed"
-
-   xdg_src_prepare
-}
-
-src_configure() {
-   # uninstalled-tests is abused to switch from loading live FS helper
-   # to in-build-tree helper, check on upgrades this is not having other
-   # consequences, bug #630242
-   local emesonargs=(
-   -Denable-quvi=$(usex quvi yes no)
-   -Denable-libarchive=$(usex archive yes no)
-   -Denable-libgcrypt=$(usex crypt yes no)
-   $(meson_use gtk-doc enable-gtk-doc)
-   $(meson_use introspection)
-   )
-   meson_src_configure
-}
-
-src_test() {
-   # This is required as told by upstream in bgo#629542
-   GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
-}



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

2020-04-17 Thread Mart Raudsepp
commit: c2048c192d4264aa34f8acfa95725a219fb32608
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:34:48 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2048c19

dev-libs/glib: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-libs/glib/Manifest  |   1 -
 dev-libs/glib/glib-2.60.7-r1.ebuild | 279 
 dev-libs/glib/glib-2.60.7.ebuild| 277 ---
 dev-libs/glib/glib-2.62.5.ebuild| 274 ---
 4 files changed, 831 deletions(-)

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 115723e3d8e..4b56247c250 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,4 +1,3 @@
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B 
a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15
 SHA512 
d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
-DIST glib-2.62.5.tar.xz 4702492 BLAKE2B 
03e04cb149b3301959013c5db20b1f3606951ed80105e0580d40177586a5834afb975ace0d25d5311fd63d29a48129128bdddf29a808e371f1400c00033be1a3
 SHA512 
2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 
0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276
 SHA512 
8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
 DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 
5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5
 SHA512 
1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc

diff --git a/dev-libs/glib/glib-2.60.7-r1.ebuild 
b/dev-libs/glib/glib-2.60.7-r1.ebuild
deleted file mode 100644
index dc87436af3a..000
--- a/dev-libs/glib/glib-2.60.7-r1.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib 
multilib-minimal python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/;
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux 
static-libs systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~amd64-linux ~x86-linux"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked 
to).
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-   !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-   >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-   >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-   kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-   selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-   xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] 
) )
-   virtual/libelf:0=
-   fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-   app-text/docbook-xsl-stylesheets
-   dev-libs/libxslt
-   >=sys-devel/gettext-0.19.8
-   gtk-doc? ( >=dev-util/gtk-doc-1.20
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xml-dtd:4.5 )
-   systemtap? ( >=dev-util/systemtap-1.3 )
-   ${PYTHON_DEPS}
-   test? ( >=sys-apps/dbus-1.2.14 )
-   virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify 
gio/tests/meson.build to use external gdbus-codegen
-

[gentoo-commits] repo/gentoo:master commit in: app-text/gtkspell/

2020-04-17 Thread Mart Raudsepp
commit: 3fa6355f4d6f0c9ea02aca3942aeff635937effb
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:46:47 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa6355f

app-text/gtkspell: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-text/gtkspell/Manifest  |  1 -
 app-text/gtkspell/gtkspell-3.0.9.ebuild | 46 -
 2 files changed, 47 deletions(-)

diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 78d160b5e3e..020f9dce8a9 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,3 +1,2 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B 
ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99
 SHA512 
7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B 
aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1
 SHA512 
3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
-DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 
01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250
 SHA512 
de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab

diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild 
b/app-text/gtkspell/gtkspell-3.0.9.ebuild
deleted file mode 100644
index a1f40688379..000
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 vala
-
-DESCRIPTION="Spell checking widget for GTK"
-HOMEPAGE="http://gtkspell.sourceforge.net/;
-MY_P="${PN}3-${PV}"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-   >=app-text/enchant-1.1.6:0
-   app-text/iso-codes
-   dev-libs/glib:2
-   x11-libs/gtk+:3[introspection?]
-   >=x11-libs/pango-1.8.0[introspection?]
-   introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
-   >=dev-util/gtk-doc-am-1.17
-   >=dev-util/intltool-0.35.0
-   virtual/pkgconfig
-   vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   use vala && vala_src_prepare
-   gnome2_src_prepare
-}
-
-src_configure() {
-   gnome2_src_configure \
-   --disable-static \
-   $(use_enable introspection) \
-   $(use_enable vala)
-}



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

2020-04-17 Thread Mart Raudsepp
commit: d6c3469b26dd1f75c7b98d7df542215ef9bee426
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:45:27 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c3469b

gnome-extra/gtkhtml: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild | 44 ---
 1 file changed, 44 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild 
b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
deleted file mode 100644
index e83b54fcb0e..000
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml;
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
-   >=x11-libs/gtk+-3.2:3
-   >=x11-libs/cairo-1.10:=
-   x11-libs/pango
-   >=app-text/enchant-1.1.7:0
-   gnome-base/gsettings-desktop-schemas
-   >=app-text/iso-codes-0.49
-   >=net-libs/libsoup-2.26.0:2.4
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-   sys-devel/gettext
-   dev-util/glib-utils
-   >=dev-util/intltool-0.40.0
-   virtual/pkgconfig
-"
-
-src_configure() {
-   gnome2_src_configure --disable-static
-}
-
-src_install() {
-   gnome2_src_install
-
-   # Don't collide with 3.14 slot
-   mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}



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

2020-04-17 Thread Mart Raudsepp
commit: b22e0a9909845323fad473b3f8745abe790f0ab5
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:49:17 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22e0a99

dev-libs/appstream-glib: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-libs/appstream-glib/Manifest   |  1 -
 .../appstream-glib/appstream-glib-0.7.15.ebuild| 64 --
 2 files changed, 65 deletions(-)

diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 94894135010..00d2d6531fd 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,3 +1,2 @@
-DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B 
e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea
 SHA512 
bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 
101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348
 SHA512 
a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
 DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 
88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0
 SHA512 
72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223

diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild 
b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
deleted file mode 100644
index 49ef2b9f887..000
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream 
metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/;
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz;
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-   >=dev-libs/glib-2.45.8:2
-   sys-apps/util-linux
-   app-arch/libarchive
-   >=net-libs/libsoup-2.51.92:2.4
-   >=dev-libs/json-glib-1.1.2
-   >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-   fonts? ( x11-libs/gtk+:3
-   >=media-libs/freetype-2.4:2 )
-   >=media-libs/fontconfig-2.11:1.0
-   dev-libs/libyaml
-   stemmer? ( dev-libs/snowball-stemmer )
-   x11-libs/pango
-   introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-   dev-util/gperf
-
-   dev-libs/libxml2:2
-   app-text/docbook-xml-dtd:4.2
-   dev-libs/libxslt
-   gtk-doc? (
-   >=dev-util/gtk-doc-1.9
-   app-text/docbook-xml-dtd:4.3
-   )
-   >=sys-devel/gettext-0.19.8
-"
-# ${PN} superseeds appdata-tools
-RDEPEND="${RDEPEND}
-   !

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

2020-04-17 Thread Mart Raudsepp
commit: d02a6c698c007e7088fa514ea237255b841fd621
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:38:14 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02a6c69

net-misc/networkmanager: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../networkmanager/networkmanager-1.18.4-r1.ebuild | 350 -
 1 file changed, 350 deletions(-)

diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild 
b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
deleted file mode 100644
index 38eebd608ee..000
--- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd 
readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager;
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname 
version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind 
gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono 
ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-   bluetooth? ( modemmanager )
-   iwd? ( wifi )
-   vala? ( introspection )
-   wext? ( wifi )
-   || ( nss gnutls )
-   ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-   >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-   >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-   >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-   policykit? ( >=sys-auth/polkit-0.106 )
-   net-libs/libndp[${MULTILIB_USEDEP}]
-   >=net-misc/curl-7.24
-   net-misc/iputils
-   sys-apps/util-linux[${MULTILIB_USEDEP}]
-   sys-libs/readline:0=
-   >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-   audit? ( sys-process/audit )
-   bluetooth? ( >=net-wireless/bluez-5 )
-   connection-sharing? (
-   net-dns/dnsmasq[dbus,dhcp]
-   net-firewall/iptables )
-   consolekit? ( >=sys-auth/consolekit-1.0.0 )
-   dhclient? ( >=net-misc/dhcp-4[client] )
-   dhcpcd? ( net-misc/dhcpcd )
-   elogind? ( >=sys-auth/elogind-219 )
-   introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-   json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-   modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-   ncurses? ( >=dev-libs/newt-0.52.15 )
-   nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-   !nss? ( gnutls? (
-   dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-   >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-   ofono? ( net-misc/ofono )
-   ovs? ( dev-libs/jansson )
-   ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-   resolvconf? ( net-dns/openresolv )
-   selinux? ( sys-libs/libselinux )
-   systemd? ( >=sys-apps/systemd-209:0= )
-   teamd? (
-   dev-libs/jansson
-   >=net-misc/libteam-1.9
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   acct-group/plugdev
-   || (
-   net-misc/iputils[arping(+)]
-   net-analyzer/arping
-   )
-   wifi? (
-   !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-   iwd? ( net-wireless/iwd )
-   )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-util/gdbus-codegen
-   dev-util/glib-utils
-   dev-util/gtk-doc-am
-   >=dev-util/intltool-0.40
-   >=sys-devel/gettext-0.17
-   >=sys-kernel/linux-headers-3.18
-   virtual/pkgconfig[${MULTILIB_USEDEP}]
-   introspection? (
-   $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-   dev-lang/perl
-   dev-libs/libxslt
-   )
-   vala? ( $(vala_depend) )
-   test? (
-   $(python_gen_any_dep '
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   dev-python/pygobject:3[${PYTHON_USEDEP}]')
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch
-)
-
-python_check_deps() {
-   if use introspection; then
-   has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-   fi
-   if use test; then
-   has_version 

[gentoo-commits] repo/gentoo:master commit in: app-editors/gnome-latex/

2020-04-17 Thread Mart Raudsepp
commit: 9b87430e0a2ce54c92de502eb1a9a11ce01971b6
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:47:01 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b87430e

app-editors/gnome-latex: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 app-editors/gnome-latex/Manifest  |  1 -
 app-editors/gnome-latex/gnome-latex-3.28.1.ebuild | 49 ---
 2 files changed, 50 deletions(-)

diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index ee292892a3a..f22983ef318 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,2 +1 @@
-DIST gnome-latex-3.28.1.tar.xz 1082708 BLAKE2B 
3b0a341278838b37fb1a54f4f746af4fc6ccf4dd37f6b919f53523acfdcbeb6a8974217260db4d8186b8acd3ba782cbc1ddf1dce20735d70d01c88ed3c1fb90f
 SHA512 
fe5c2456839757237d422d0f0629f11a43a8ca5b3cd86ce94b37ee26f68165f111940d5c3c47adba7be05532c413a97a867219c498abec3fd064122516e0c470
 DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 
3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f
 SHA512 
6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0

diff --git a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild 
b/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
deleted file mode 100644
index b62f1edfdf1..000
--- a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
-   app-text/enchant:0
-   >=app-text/gspell-1.0:0=
-   >=dev-libs/glib-2.56:2
-   >=dev-libs/libgee-0.10:0.8=
-   gnome-base/gsettings-desktop-schemas
-   >=x11-libs/gtk+-3.22:3
-   >=x11-libs/gtksourceview-4.0:4
-   >=gui-libs/tepl-4.0:4
-   x11-libs/gdk-pixbuf:2
-   x11-libs/pango
-   introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-   gnome-base/dconf
-"
-RDEPEND="${COMMON_DEPEND}
-   virtual/latex-base
-   x11-themes/hicolor-icon-theme
-   latexmk? ( dev-tex/latexmk )
-   rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-util/gdbus-codegen
-   dev-util/glib-utils
-   >=dev-util/gtk-doc-am-1.14
-   >=dev-util/intltool-0.50.1
-   dev-util/itstool
-   virtual/pkgconfig
-"
-
-src_configure() {
-   gnome2_src_configure \
-   $(use_enable introspection) \
-   --enable-dconf_migration
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/gnome-builder/

2020-04-17 Thread Mart Raudsepp
commit: 0019bc103a61ab96b2c6aa980211598a9b6cb051
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 19:47:59 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 19:49:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0019bc10

dev-util/gnome-builder: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-util/gnome-builder/Manifest|   1 -
 .../gnome-builder/gnome-builder-3.30.3-r1.ebuild   | 184 -
 dev-util/gnome-builder/metadata.xml|   1 -
 3 files changed, 186 deletions(-)

diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index ed8ab782cb7..9a0f5f0c798 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,4 +1,3 @@
-DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B 
b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7
 SHA512 
468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
 DIST gnome-builder-3.32.4-patchset.tar.xz 34740 BLAKE2B 
6e29ce42b2b1878b5fcec7cf057bcdc015da8817d7f9209f4d03e02bb5837525e329d0627d4465123fb20a0a46415053d7e08b445634659123ebff12d2fb9d09
 SHA512 
494cf1ff370c7d86d42ec352966169e73b99556dc5a1be0bf0ec53cd78e8550897bb44187ae8f471fe3e10a85dc7d44d44c5edef0569b1d0a7dff7b5d78b1fa1
 DIST gnome-builder-3.32.4.tar.xz 11886980 BLAKE2B 
a7901566238dd39fe180d1e47089d7f99018be115f407d174472a8371374361fe50f2f15cb6d496a1afa3e30117d83788944636fb6a9487d4a719442ba6ae744
 SHA512 
a050161465edd448b0359ff781bf97b0cda6c184ea4f89193711a1bac3c7b79f76bac0d3600e3823a86aa19538228619b5d64aea94e8a67f480b5c1f79bc3b93
 DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 
91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a
 SHA512 
a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57

diff --git a/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild 
b/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild
deleted file mode 100644
index 7dce5bd51df..000
--- a/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-VALA_MIN_API_VERSION="0.36"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 
vala virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder;
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and 
other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea 
for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with 
toplevel one first.
-# Most plugins have no extra requirements and default to enabled; we need to 
handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify 
the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a 
(spammy) idea, plus python imports in try/except.
-
-# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc 
>=2.52.0 and ${LIBGIT_DEPS}
-# Editorconfig needs old pcre, with vte migrating away, might want it optional 
or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based 
language plugin wants to use it (grep for gi.repository). Last full check at 
3.28.4
-
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't 
supported yet)
-LIBGIT_DEPS="
-   dev-libs/libgit2[ssh,threads]
-   >=dev-libs/libgit2-glib-0.25.0[ssh]
-"
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-   >=dev-libs/libdazzle-3.30.2[introspection,vala?]
-   >=dev-libs/glib-2.58.0:2
-   >=x11-libs/gtk+-3.24.0:3[introspection]
-   >=x11-libs/gtksourceview-4.0.0:4[introspection]
-   >=dev-libs/json-glib-1.2.0
-   >=dev-libs/jsonrpc-glib-3.30.1[vala?]
-   >=x11-libs/pango-1.38.0
-   >=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
-   >=dev-libs/template-glib-3.28.0[introspection,vala?]
-   >=x11-libs/vte-0.40.2:2.91[vala?]
-   

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

2020-04-17 Thread Robin H. Johnson
commit: 8533ec2bf691a3b11fafbd20a05aaa417c306f01
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Apr 17 19:39:33 2020 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Apr 17 19:47:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8533ec2b

sys-apps/iproute2: QAfix emptydir /var/lib/arpd (take 2)

Also cleanup parent directories as much as possible.

Closes: https://bugs.gentoo.org/647032
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/iproute2/iproute2-5.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/iproute2-5.6.0.ebuild 
b/sys-apps/iproute2/iproute2-5.6.0.ebuild
index 7670dd448c2..622ac0d6894 100644
--- a/sys-apps/iproute2/iproute2-5.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.6.0.ebuild
@@ -159,6 +159,6 @@ src_install() {
dodir /usr/bin
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
elif [[ -d "${ED}"/var/lib/arpd ]]; then
-   rmdir "${ED}"/var/lib/arpd || die
+   rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
fi
 }



[gentoo-commits] repo/proj/guru:dev commit in: media-video/kikoplay/files/, media-video/kikoplay/

2020-04-17 Thread Rui Huang
commit: 11f4549a67d2a005f0c5108d4759b152775d54f4
Author: Huang Rui  gmail  com>
AuthorDate: Fri Apr 17 19:34:59 2020 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Apr 17 19:46:27 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11f4549a

media-video/kikoplay: new package

A Full-Featured Danmu Player based on mpv.
NOTE: this package is blocked by lua 5.3,
However, Gentoo is using the old 5.1.
It depends on gentoo slotted dev-lang/lua
versions and dependencies.
See also https://bugs.gentoo.org/657722
See also https://bugs.gentoo.org/671248
It takes many years.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Huang Rui  gmail.com>

 media-video/kikoplay/Manifest  |1 +
 .../kikoplay/files/kikoplay-0.6.0-desktop.patch|   16 +
 .../kikoplay/files/kikoplay-0.6.0-home.patch   |   97 ++
 .../kikoplay/files/kikoplay-0.6.0-install.patch| 1003 
 media-video/kikoplay/kikoplay-0.6.0.ebuild |   78 ++
 media-video/kikoplay/metadata.xml  |   38 +
 6 files changed, 1233 insertions(+)

diff --git a/media-video/kikoplay/Manifest b/media-video/kikoplay/Manifest
new file mode 100644
index 000..b7a4138
--- /dev/null
+++ b/media-video/kikoplay/Manifest
@@ -0,0 +1 @@
+DIST kikoplay-0.6.0.tar.gz 7497254 BLAKE2B 
a23106151782477194d15712e9458171a0bc1dd53f8b6c8dbed12663be1c2c76204674c23eba61f2b8828be7acbd10449f51c766ab57be86cf21844591430b18
 SHA512 
9d8801f7c9b091f097d1edf9496a389718e81399a8d380d7763c1d12eafd1d4ce444e4df22a0e4a6c8eebbc7f1176e58a3cbac6bea60e87ccd44a5890927bf21

diff --git a/media-video/kikoplay/files/kikoplay-0.6.0-desktop.patch 
b/media-video/kikoplay/files/kikoplay-0.6.0-desktop.patch
new file mode 100644
index 000..86b4382
--- /dev/null
+++ b/media-video/kikoplay/files/kikoplay-0.6.0-desktop.patch
@@ -0,0 +1,16 @@
+diff --git a/kikoplay.desktop b/kikoplay.desktop
+new file mode 100644
+index 000..6171559
+--- /dev/null
 b/kikoplay.desktop
+@@ -0,0 +1,10 @@
++[Desktop Entry]
++Type=Application
++Name=KikoPlay
++Comment=KikoPlay is a full-featured danmu player!
++TryExec=KikoPlay
++Exec=KikoPlay
++Icon=/usr/share/pixmaps/kikoplay.png
++Terminal=false
++StartupNotify=true
++Categories=Qt;AudioVideo;Video;

diff --git a/media-video/kikoplay/files/kikoplay-0.6.0-home.patch 
b/media-video/kikoplay/files/kikoplay-0.6.0-home.patch
new file mode 100644
index 000..ec2eae5
--- /dev/null
+++ b/media-video/kikoplay/files/kikoplay-0.6.0-home.patch
@@ -0,0 +1,97 @@
+diff --git a/Download/Script/scriptmanager.cpp 
b/Download/Script/scriptmanager.cpp
+index f99c261..8ede8e3 100644
+--- a/Download/Script/scriptmanager.cpp
 b/Download/Script/scriptmanager.cpp
+@@ -163,7 +163,11 @@ QString ScriptManager::search(QString sid, const QString 
, int page, int
+ {
+ if(s.id==sid)
+ {
++#ifndef CONFIG_HOME_DATA
+ 
scriptPath=QCoreApplication::applicationDirPath()+"/script/"+s.fileName;
++#else
++
scriptPath=QDir::homePath()+"/.config/kikoplay/script/"+s.fileName;
++#endif
+ break;
+ }
+ }
+@@ -270,7 +274,11 @@ void ScriptManager::removeScript(const QModelIndex )
+ else
+ normalScriptId="";
+ }
++#ifndef CONFIG_HOME_DATA
+ QFileInfo 
fi(QCoreApplication::applicationDirPath()+"/script/"+script.fileName);
++#else
++QFileInfo 
fi(QDir::homePath()+"/.config/kikoplay/script/"+script.fileName);
++#endif
+ if(fi.exists()) fi.dir().remove(fi.fileName());
+ beginRemoveRows(QModelIndex(),index.row(),index.row());
+ scriptList.removeAt(index.row());
+@@ -319,7 +327,11 @@ QVariant ScriptManager::headerData(int section, 
Qt::Orientation orientation, int
+ 
+ void ScriptWorker::refreshScriptList()
+ {
++#ifndef CONFIG_HOME_DATA
+ QString scriptPath(QCoreApplication::applicationDirPath()+"/script/");
++#else
++QString scriptPath(QDir::homePath()+"/.config/kikoplay/script/");
++#endif
+ QDir folder(scriptPath);
+ QList sList;
+ for (QFileInfo fileInfo : folder.entryInfoList())
+diff --git a/Download/aria2jsonrpc.cpp b/Download/aria2jsonrpc.cpp
+index 7999128..43bc63d 100644
+--- a/Download/aria2jsonrpc.cpp
 b/Download/aria2jsonrpc.cpp
+@@ -1,4 +1,5 @@
+ #include "aria2jsonrpc.h"
++#include 
+ #include 
+ #include 
+ #include 
+@@ -19,7 +20,13 @@ Aria2JsonRPC::Aria2JsonRPC(QObject *parent) : 
QObject(parent)
+ #ifdef Q_OS_WIN
+ process->start(QCoreApplication::applicationDirPath()+"\\aria2c.exe", 
args);
+ #else
+-process->start(QCoreApplication::applicationDirPath()+"/aria2c", args);
++QFileInfo check_file(QCoreApplication::applicationDirPath()+"/aria2c");
++/* check if file exists and if yes: Is it really a file and no directory? 
*/
++if (check_file.exists() && check_file.isFile()) {
++process->start(QCoreApplication::applicationDirPath()+"/aria2c", 
args);
++} else {
++process->start("aria2c", args);
++}
+ 
+ 

[gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qhttpengine/

2020-04-17 Thread Rui Huang
commit: f8e335ae682d618ea28b0a5b8160bb075b17e693
Author: Huang Rui  gmail  com>
AuthorDate: Fri Apr 17 19:28:14 2020 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Apr 17 19:46:27 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f8e335ae

dev-libs/qhttpengine: new package

QHttpEngine provides a simple set of classes for developing
HTTP server applications in Qt.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Huang Rui  gmail.com>

 dev-libs/qhttpengine/Manifest |  1 +
 dev-libs/qhttpengine/metadata.xml | 23 
 dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild | 50 +++
 3 files changed, 74 insertions(+)

diff --git a/dev-libs/qhttpengine/Manifest b/dev-libs/qhttpengine/Manifest
new file mode 100644
index 000..0038b0d
--- /dev/null
+++ b/dev-libs/qhttpengine/Manifest
@@ -0,0 +1 @@
+DIST qhttpengine-1.0.1.tar.gz 107937 BLAKE2B 
c93711a16c53bea9622f5bfd4eeb480bf8bf4366f1d30d44d8c208b9600e632fd2c3b0129c2494858f6c51fd6d9df7973f02c28adf84c8b63186eec5ea9c3450
 SHA512 
d9b67db5f752cb494e71e37bed523490c53ce97d01b32925846a019e866776cef9e73f580acfb639fb04465439e8328e756dabd7b505380d3976ec872849fe22

diff --git a/dev-libs/qhttpengine/metadata.xml 
b/dev-libs/qhttpengine/metadata.xml
new file mode 100644
index 000..7a0f29d
--- /dev/null
+++ b/dev-libs/qhttpengine/metadata.xml
@@ -0,0 +1,23 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   vows...@gmail.com
+   Huang Rui
+   
+   
+   nitroshare/qhttpengine
+   
+   
+   QHttpEngine provides a simple set of classes for developing HTTP server
+   applications in Qt. The design goals of QHttpEngine include:
+   Reliability - extremely exhaustive test suite ensures that bugs are 
caught
+   as soon as they are introduced.
+   Flexibility - classes are designed for easy integration with existing Qt
+   code.
+   Simplicity - everything is intentionally kept as simple as possible.
+   Usability - documentation is provided for all classes.
+   All of QHttpEngine's functionality is included in a single monolithic
+   library.
+   
+

diff --git a/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild 
b/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild
new file mode 100644
index 000..a4e9bf0
--- /dev/null
+++ b/dev-libs/qhttpengine/qhttpengine-1.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="HTTP server for Qt applications"
+HOMEPAGE="https://github.com/nitroshare/qhttpengine;
+
+if [[ ${PV} == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/nitroshare/${PN}.git;
+else
+   SRC_URI="https://github.com/nitroshare/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+   S="${WORKDIR}/${PN}-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="5"
+
+IUSE="doc examples test"
+
+RDEPEND="
+   dev-qt/qtnetwork:5
+"
+
+DEPEND="
+   doc? ( app-doc/doxygen )
+   test? ( dev-qt/qttest:5 )
+   ${RDEPEND}
+"
+
+BDEPEND="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_DOC=$(usex doc)
+   -DBUILD_EXAMPLES=$(usex examples)
+   -DBUILD_TESTS=$(usex test)
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+   -DLIB_INSTALL_DIR=$(get_libdir)
+   ${CMAKE_CONF}
+   )
+
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/proj/guru:dev commit in: dev-libs/qhttpengine/

2020-04-17 Thread Rui Huang
commit: 34c4df12b885534a10ac7a3228c1eb78809a5c01
Author: Huang Rui  gmail  com>
AuthorDate: Fri Apr 17 19:29:54 2020 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Apr 17 19:46:27 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34c4df12

dev-libs/qhttpengine: add live build

User could get latest software

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Huang Rui  gmail.com>

 dev-libs/qhttpengine/qhttpengine-.ebuild | 50 
 1 file changed, 50 insertions(+)

diff --git a/dev-libs/qhttpengine/qhttpengine-.ebuild 
b/dev-libs/qhttpengine/qhttpengine-.ebuild
new file mode 100644
index 000..a4e9bf0
--- /dev/null
+++ b/dev-libs/qhttpengine/qhttpengine-.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="HTTP server for Qt applications"
+HOMEPAGE="https://github.com/nitroshare/qhttpengine;
+
+if [[ ${PV} == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/nitroshare/${PN}.git;
+else
+   SRC_URI="https://github.com/nitroshare/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+   S="${WORKDIR}/${PN}-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="5"
+
+IUSE="doc examples test"
+
+RDEPEND="
+   dev-qt/qtnetwork:5
+"
+
+DEPEND="
+   doc? ( app-doc/doxygen )
+   test? ( dev-qt/qttest:5 )
+   ${RDEPEND}
+"
+
+BDEPEND="
+   virtual/pkgconfig
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_DOC=$(usex doc)
+   -DBUILD_EXAMPLES=$(usex examples)
+   -DBUILD_TESTS=$(usex test)
+   -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+   -DLIB_INSTALL_DIR=$(get_libdir)
+   ${CMAKE_CONF}
+   )
+
+   cmake-utils_src_configure
+}



[gentoo-commits] repo/proj/guru:dev commit in: media-video/kikoplay/

2020-04-17 Thread Rui Huang
commit: 1a5488b13d96ebe5defbfcc0c518702c542d05dd
Author: Huang Rui  gmail  com>
AuthorDate: Fri Apr 17 19:42:56 2020 +
Commit: Rui Huang  gmail  com>
CommitDate: Fri Apr 17 19:46:28 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a5488b1

media-video/kikoplay: add live build

User could get latest software now
To install this package, lua 5.3 shoud unmasked
See also:
https://bugs.gentoo.org/671248
https://bugs.gentoo.org/657722

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Huang Rui  gmail.com>

 media-video/kikoplay/kikoplay-.ebuild | 77 +++
 1 file changed, 77 insertions(+)

diff --git a/media-video/kikoplay/kikoplay-.ebuild 
b/media-video/kikoplay/kikoplay-.ebuild
new file mode 100644
index 000..0823479
--- /dev/null
+++ b/media-video/kikoplay/kikoplay-.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GIT_PN="KikoPlay"
+
+inherit qmake-utils xdg
+
+DESCRIPTION="KikoPlay is a full-featured danmu player"
+HOMEPAGE="
+   https://kikoplay.fun
+   https://github.com/Protostars/KikoPlay
+"
+
+if [[ ${PV} == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git;
+else
+   SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+   S="${WORKDIR}/${GIT_PN}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+   dev-lang/lua:5.3
+   dev-libs/qhttpengine:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5
+   dev-qt/qtwidgets:5
+   media-video/mpv[libmpv,-luajit]
+   net-misc/aria2
+"
+
+DEPEND="
+   ${RDEPEND}
+"
+
+BDEPEND="
+   media-gfx/imagemagick
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.6.0-desktop.patch # Add a desktop file
+   "${FILESDIR}"/${PN}-0.6.0-home.patch # Add a desktop file
+)
+
+src_prepare() {
+   default
+   # Fix lua link problem, link to lua5.3 to fix bug
+   sed -i "s/-llua/-llua5.3/" KikoPlay.pro || die "Could not fix lua link"
+   echo "target.path += /usr/bin" >> KikoPlay.pro || die "Could not fix 
install path"
+   echo "INSTALLS += target icons desktop" >> KikoPlay.pro || die "Could 
not fix install target"
+   echo "unix:icons.path = /usr/share/pixmaps" >> KikoPlay.pro || die 
"Could not fix install icon PATH"
+   echo "unix:desktop.path = /usr/share/applications" >> KikoPlay.pro || 
die "Could not fix install desktop PATH"
+   echo "unix:icons.files = kikoplay.png kikoplay.xpm" >> KikoPlay.pro || 
die "Could not fix install desktop PATH"
+   echo "unix:desktop.files = kikoplay.desktop" >> KikoPlay.pro || die 
"Could not fix install desktop PATH"
+   echo "DEFINES += CONFIG_HOME_DATA" >> KikoPlay.pro || die "Could not 
set defines"
+   convert kikoplay.ico kikoplay.png || die "Could not create PNG icon"
+   convert kikoplay.ico kikoplay.xpm || die "Could not create XPM icon"
+}
+
+src_configure() {
+   eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+   # Can't use default, set INSTALL_ROOT
+   emake INSTALL_ROOT="${D}" install
+}



[gentoo-commits] repo/proj/guru:dev commit in: dev-python/mkdocs-material/

2020-04-17 Thread Andrew Ammerlaan
commit: 536a9d21d340d699eb601f67f84a2228823b1d28
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Fri Apr 17 19:44:38 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Fri Apr 17 19:44:38 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=536a9d21

dev-python/mkdocs-material: version bump 5.1.1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan  riseup.net>

 dev-python/mkdocs-material/Manifest | 2 +-
 .../{mkdocs-material-5.1.0.ebuild => mkdocs-material-5.1.1.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/mkdocs-material/Manifest 
b/dev-python/mkdocs-material/Manifest
index 4d4673d..0bc38d9 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-material-4.6.3.tar.gz 1701136 BLAKE2B 
b3e68c0c751c37e7910fad99daa222706b48cd63bfb28a18b9ae96840691eb28b0948fb02810af4ed9e54407ec9e67478371bf31ce7c044d52596d65aea3
 SHA512 
11f02b8c89ec25bc38825a7614ca7a276a28c270f23dcbd991c69fced03810e65d45a74f0c3cc0d8e686985499f23c4d0f0e57e063f5b97b3870809b748dd544
 DIST mkdocs-material-5.0.0_rc2.tar.gz 1852974 BLAKE2B 
0cd56bd11df50a6628b6fddc3758037218ca1b5d9484b8ffe9d67d40c4ebda51bdb96edc10f08c87fb936b3a852616004994bad2e000b00936e62e25ce3e7e81
 SHA512 
29e1d8dcc972302302fdd5b91f0c7bc191420ff1c2ea117fd7b45a346623f587771469d04cbf25600e360d6d9c41ca060147269cdfe6c30c0ef9fd5915a70692
-DIST mkdocs-material-5.1.0.tar.gz 2157737 BLAKE2B 
39afdafaea0d22b22f3ae4be3a024e6312b8c923ab05bb4ed95a85034a55669816237d1bbfa679fe326181238250bbe8ae867c03a0c3a607383363343949144e
 SHA512 
9c4f8ebb14f8e2b333e603aeb8bdcc29a5a57b1ef1f28db98987bd7b62bbdda2e70fde9fed067ceb0bc9e8788aa62200dfcfd86ef74f698367ac54e0a72e8a67
+DIST mkdocs-material-5.1.1.tar.gz 2112813 BLAKE2B 
8f6b9c0cacf47f1eeec6f30d11ee1489f3b6567044b04a4b2c001f13632380251bd10eaab8b44c11c4d85f4b3980bef0eaece49350b0be290aef163aa2299cd9
 SHA512 
800ecbbf9aa9a108a83e431bd12f4e35c4f43d701170e366748335fc1098481f37c08e62d2e7721ce93a28e268f896d8cfd56a2e331f9e2487cafbe7ee076a68

diff --git a/dev-python/mkdocs-material/mkdocs-material-5.1.0.ebuild 
b/dev-python/mkdocs-material/mkdocs-material-5.1.1.ebuild
similarity index 100%
rename from dev-python/mkdocs-material/mkdocs-material-5.1.0.ebuild
rename to dev-python/mkdocs-material/mkdocs-material-5.1.1.ebuild



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

2020-04-17 Thread Robin H. Johnson
commit: 073532b17c2d28bd996e0ba9def8690405f2c85b
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Apr 17 19:39:33 2020 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Apr 17 19:39:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073532b1

sys-apps/iproute2: QAfix emptydir /var/lib/arpd

Closes: https://bugs.gentoo.org/647032
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/iproute2/iproute2-5.6.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-apps/iproute2/iproute2-5.6.0.ebuild 
b/sys-apps/iproute2/iproute2-5.6.0.ebuild
index 9e2e1f7f4e5..7670dd448c2 100644
--- a/sys-apps/iproute2/iproute2-5.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.6.0.ebuild
@@ -158,5 +158,7 @@ src_install() {
# bug 47482, arpd doesn't need to be in /sbin
dodir /usr/bin
mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+   elif [[ -d "${ED}"/var/lib/arpd ]]; then
+   rmdir "${ED}"/var/lib/arpd || die
fi
 }



[gentoo-commits] proj/musl:master commit in: sys-devel/binutils/files/, sys-devel/lld/, sys-devel/binutils/

2020-04-17 Thread Jory Pratt
commit: 92d989491169db22a750b0a524ad9472d1307b75
Author: Jory Pratt  gentoo  org>
AuthorDate: Fri Apr 17 19:37:05 2020 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Fri Apr 17 19:37:05 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=92d98949

Add 2MB stacksize support to binutils/lld for musl users only

Signed-off-by: Jory Pratt  gentoo.org>

 sys-devel/binutils/Manifest|   2 +
 sys-devel/binutils/binutils-2.34.ebuild| 443 +
 .../binutils/files/binutils-2.33-gcc-10.patch  |  39 ++
 .../binutils/files/binutils-configure-LANG.patch   |  65 +++
 sys-devel/binutils/metadata.xml|  17 +
 sys-devel/lld/Manifest |   1 +
 sys-devel/lld/lld-10.0.0.ebuild|  63 +++
 sys-devel/lld/metadata.xml |   7 +
 8 files changed, 637 insertions(+)

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
new file mode 100644
index 000..7cea121
--- /dev/null
+++ b/sys-devel/binutils/Manifest
@@ -0,0 +1,2 @@
+DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 
8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042
 SHA512 
951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
+DIST binutils-2.34.tar.xz 21637796 BLAKE2B 
07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d
 SHA512 
2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd

diff --git a/sys-devel/binutils/binutils-2.34.ebuild 
b/sys-devel/binutils/binutils-2.34.ebuild
new file mode 100644
index 000..4e33aa0
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.34.ebuild
@@ -0,0 +1,443 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/;
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER  - the patchset version
+#  Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#- Default: PV
+# PATCH_DEV  - Use download URI 
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#  for the patchsets
+
+PATCH_VER=1
+PATCH_DEV=slyfox
+
+case ${PV} in
+   )
+   EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git;
+   inherit git-r3
+   S=${WORKDIR}/binutils
+   EGIT_CHECKOUT_DIR=${S}
+   SLOT=${PV}
+   ;;
+   *.)
+   EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git;
+   inherit git-r3
+   S=${WORKDIR}/binutils
+   EGIT_CHECKOUT_DIR=${S}
+   EGIT_BRANCH=$(ver_cut 1-2)
+   EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+   SLOT=$(ver_cut 1-2)
+   ;;
+   *)
+   SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+   SLOT=$(ver_cut 1-2)
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+   ;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz;
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+   if [[ ${CATEGORY} == cross-* ]] ; then
+   export CTARGET=${CATEGORY#cross-}
+   fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+   >=sys-devel/binutils-config-3
+   sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? ( sys-apps/texinfo )
+   test? ( dev-util/dejagnu )
+   nls? ( sys-devel/gettext )
+   sys-devel/flex
+   virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.33-gcc-10.patch
+)
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+   case ${PV} in
+   *)
+   git-r3_src_unpack
+   ;;
+   *)
+   ;;
+   esac
+   default
+   mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+   if [[ ! -z ${PATCH_VER} ]] ; then
+   # Use upstream patch to enable development mode
+

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

2020-04-17 Thread Mike Gilbert
commit: 635e5717f36c10289d2fe52793ae558b56ee4a1a
Author: Stephan Hartmann  googlemail  com>
AuthorDate: Fri Apr 17 16:16:18 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Apr 17 19:36:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635e5717

www-client/chromium: security cleanup

Bug: https://bugs.gentoo.org/717652
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann  googlemail.com>
Signed-off-by: Mike Gilbert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/15387

 www-client/chromium/Manifest |   1 -
 www-client/chromium/chromium-81.0.4044.92.ebuild | 748 ---
 2 files changed, 749 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fbba4a971b5..27ed304acf2 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,3 @@
 DIST chromium-81.0.4044.113.tar.xz 785970632 BLAKE2B 
4306b4f7986abd8b56d6b52bd76d84de755eeab7d2f5ded447d031a4e36376c5d5a580ed857181e8e893788407245eb65b908bd77df927d03e6e6e65f188527e
 SHA512 
dfdf71fb8c98baf722aded7815f773850368b0bc7cb74d8c994c0c3f7dcf0157a0969ba501774a107a00c1fe18d08f90fcf8ea957ffb19bed5007d188ffa2010
-DIST chromium-81.0.4044.92.tar.xz 785906276 BLAKE2B 
af8e40391362c5ea182b917b085cfc1c2fe605503621316196e4a60d7031fe3b3075af9040ad756bddbad77058b5210d265731990a828ca6a11829e41c7cb807
 SHA512 
2d5817c84ac17e7b4d2e4473df841f53a074528e0ac997345ee68db4a9f8b45d84ef50c1d475608428f49ae40fe5315cda9d501ee22b829156c9e533044fb5af
 DIST chromium-83.0.4103.14.tar.xz 802476760 BLAKE2B 
bf8df2572018a99e735bcf6fe017db8b3832205e69073091b868c8a147419dabd480420a652761a4386fd2f1671c803c8f903bf3f9381b9059d251cb9d9773a9
 SHA512 
7fa4848a332c2c5cee3b946d82f83e8d1fc561e8c94682400e12dd1cd2df9a53c140f331dfc570d4b968bd54f283c57c61f52cca9f91d627c92b56ff0e23191d
 DIST setuptools-44.1.0.zip 858569 BLAKE2B 
f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68
 SHA512 
4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf

diff --git a/www-client/chromium/chromium-81.0.4044.92.ebuild 
b/www-client/chromium/chromium-81.0.4044.92.ebuild
deleted file mode 100644
index 5260291a149..000
--- a/www-client/chromium/chromium-81.0.4044.92.ebuild
+++ /dev/null
@@ -1,748 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu 
he
-   hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl 
sr
-   sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils 
pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/;
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts 
kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg 
+system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-   >=app-accessibility/at-spi2-atk-2.26:2
-   app-arch/bzip2:=
-   cups? ( >=net-print/cups-1.3.11:= )
-   >=dev-libs/atk-2.26
-   dev-libs/expat:=
-   dev-libs/glib:2
-   system-icu? ( >=dev-libs/icu-65:= )
-   >=dev-libs/libxml2-2.9.4-r3:=[icu]
-   dev-libs/libxslt:=
-   dev-libs/nspr:=
-   >=dev-libs/nss-3.26:=
-   >=dev-libs/re2-0.2019.08.01:=
-   >=media-libs/alsa-lib-1.0.19:=
-   media-libs/fontconfig:=
-   media-libs/freetype:=
-   >=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-   media-libs/libjpeg-turbo:=
-   media-libs/libpng:=
-   system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-   >=media-libs/openh264-1.6.0:=
-   pulseaudio? ( media-sound/pulseaudio:= )
-   system-ffmpeg? (
-   >=media-video/ffmpeg-4:=
-   || (
-   media-video/ffmpeg[-samba]
-   >=net-fs/samba-4.5.10-r1[-debug(-)]
-   )
-   >=media-libs/opus-1.3.1:=
-   )
-   sys-apps/dbus:=
-   sys-apps/pciutils:=
-   virtual/udev
-   x11-libs/cairo:=
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3[X]
-   x11-libs/libX11:=
-   x11-libs/libXcomposite:=
-   x11-libs/libXcursor:=
-   x11-libs/libXdamage:=
-   x11-libs/libXext:=
-   x11-libs/libXfixes:=
-   >=x11-libs/libXi-1.6.0:=
-   x11-libs/libXrandr:=
-   

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

2020-04-17 Thread Craig Andrews
commit: 8f84197335e1efa1950b61600e332434606f84d5
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Apr 17 19:14:59 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Apr 17 19:14:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f841973

net-libs/nodejs: Python 3.8 compatibility

Closes: https://bugs.gentoo.org/715038
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews  gentoo.org>

 net-libs/nodejs/nodejs-13.13.0.ebuild  | 2 +-
 net-libs/nodejs/nodejs-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/nodejs/nodejs-13.13.0.ebuild 
b/net-libs/nodejs/nodejs-13.13.0.ebuild
index 3bd32e160d5..a0ae896ce42 100644
--- a/net-libs/nodejs/nodejs-13.13.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 
toolchain-funcs xdg-utils
 

diff --git a/net-libs/nodejs/nodejs-.ebuild 
b/net-libs/nodejs/nodejs-.ebuild
index f2c3b912dda..e7be7ae9d90 100644
--- a/net-libs/nodejs/nodejs-.ebuild
+++ b/net-libs/nodejs/nodejs-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 eutils flag-o-matic git-r3 pax-utils python-any-r1 
toolchain-funcs xdg-utils
 



  1   2   3   >