[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins/

2020-08-05 Thread Michael Orlitzky
commit: da85e1b542a1a2aae3401869a767456061de6dda
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug  5 15:33:26 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug  5 15:34:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da85e1b5

net-analyzer/nagios-plugins: remove old "unused" version 2.2.1-r3.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-analyzer/nagios-plugins/Manifest   |   1 -
 .../nagios-plugins/nagios-plugins-2.2.1-r3.ebuild  | 118 -
 2 files changed, 119 deletions(-)

diff --git a/net-analyzer/nagios-plugins/Manifest 
b/net-analyzer/nagios-plugins/Manifest
index a61327a7e25..b54c98b7a97 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,2 +1 @@
-DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B 
ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a
 SHA512 
6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B 
f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863
 SHA512 
89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a

diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild 
b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
deleted file mode 100644
index 77dac5af393..000
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Official plugins for Nagios"
-HOMEPAGE="http://nagios-plugins.org/;
-SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
-IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres 
radius samba selinux snmp ssh +ssl"
-
-# Most of the plugins use automagic dependencies, i.e. the plugin will
-# get built if the binary it uses is installed. For example, check_snmp
-# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
-# installed. End result: most of our runtime dependencies are required
-# at build time as well.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-   ldap? ( net-nds/openldap )
-   mysql? ( dev-db/mysql-connector-c )
-   postgres? ( dev-db/postgresql:* )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
-   )
-   radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-   nagios-dns? ( net-dns/bind-tools )
-   nagios-game? ( games-util/qstat )
-   nagios-ping? ( net-analyzer/fping )
-   samba? ( net-fs/samba )
-   ssh? ( net-misc/openssh )
-   snmp? ( dev-perl/Net-SNMP
-   net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-   !net-analyzer/monitoring-plugins
-   selinux? ( sec-policy/selinux-nagios )"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-DOCS=(
-   ACKNOWLEDGEMENTS
-   AUTHORS
-   CODING
-   ChangeLog
-   FAQ
-   NEWS
-   README
-   REQUIREMENTS
-   SUPPORT
-   THANKS
-)
-
-PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
-
-src_prepare() {
-   default
-
-   # Fix the path to our perl interpreter
-   sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
-   "${S}"/plugins-scripts/*.pl \
-   || die 'failed to fix perl interpreter path'
-}
-
-src_configure() {
-   # Use an array to prevent econf from mangling the ping args.
-   local myconf=()
-
-   if use ssl; then
-   myconf+=( $(use_with ssl openssl /usr) )
-   else
-   myconf+=( --without-openssl )
-   myconf+=( --without-gnutls )
-   fi
-
-   # The autodetection for these two commands can hang if localhost is
-   # down or ICMP traffic is filtered. Bug #468296.
-   myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
-
-   if use ipv6; then
-   myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d 
%s" )
-   fi
-
-   econf \
-   $(use_with mysql) \
-   $(use_with ipv6) \
-   $(use_with ldap) \
-   $(use_with postgres pgsql /usr) \
-   $(use_with radius) \
-   "${myconf[@]}" \
-   

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

2020-08-05 Thread Alexis Ballier
commit: 243a99a9d56b3eba4ce60910c886477a354479cc
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 14:19:23 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243a99a9

media-video/ffmpeg: add := dep on openh264

Closes: https://bugs.gentoo.org/735924
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/ffmpeg/ffmpeg-4.3.1.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild 
b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index fae73db7594..9582ffc912a 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -184,7 +184,7 @@ RDEPEND="
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] 
)
kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-   openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+   openh264? ( 
>=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
rav1e? ( media-video/rav1e:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index 135717fbdd3..be2f483ec3e 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -184,7 +184,7 @@ RDEPEND="
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] 
)
kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-   openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+   openh264? ( 
>=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
rav1e? ( media-video/rav1e:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (



[gentoo-commits] repo/gentoo:master commit in: dev-ros/geodesy/files/, dev-ros/geodesy/

2020-08-05 Thread Alexis Ballier
commit: 079e687284a647e9d00ee5c7bc5cb4972a4ed5ee
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 15:03:06 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079e6872

dev-ros/geodesy: py3 fixes

Closes: https://bugs.gentoo.org/734708
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/geodesy/files/py3.patch  | 41 
 dev-ros/geodesy/geodesy-0.5.5.ebuild |  1 +
 dev-ros/geodesy/geodesy-.ebuild  |  1 +
 3 files changed, 43 insertions(+)

diff --git a/dev-ros/geodesy/files/py3.patch b/dev-ros/geodesy/files/py3.patch
new file mode 100644
index 000..08259ee976c
--- /dev/null
+++ b/dev-ros/geodesy/files/py3.patch
@@ -0,0 +1,41 @@
+Index: geodesy/src/geodesy/wu_point.py
+===
+--- geodesy.orig/src/geodesy/wu_point.py
 geodesy/src/geodesy/wu_point.py
+@@ -159,12 +159,12 @@ class WuPointSet():
+ # Initialize way point information.
+ self.way_point_ids = {} # points symbol table
+ self.n_points = len(self.points)
+-for wid in xrange(self.n_points):
++for wid in range(self.n_points):
+ self.way_point_ids[self.points[wid].id.uuid] = wid
+ 
+ # Create empty list of UTM points, corresponding to map points.
+ # They will be evaluated lazily, when first needed.
+-self.utm_points = [None for wid in xrange(self.n_points)]
++self.utm_points = [None for wid in range(self.n_points)]
+ 
+ def __contains__(self, item):
+ """ Point set membership. """
+@@ -259,7 +259,7 @@ class WuPointSet():
+ """
+ return self.way_point_ids.get(key, default)
+ 
+-def next(self):
++def __next__(self):
+ """ Next iteration point.
+ 
+ :returns: Next :class:`WuPoint`.
+Index: geodesy/tests/test_wu_point.py
+===
+--- geodesy.orig/tests/test_wu_point.py
 geodesy/tests/test_wu_point.py
+@@ -127,7 +127,7 @@ class TestWuPoint(unittest.TestCase):
+ self.assertEqual(wupts.get(uu).uuid(), uu)
+ 
+ # test index() function
+-for i in xrange(len(uuids)):
++for i in range(len(uuids)):
+ self.assertEqual(wupts.index(uuids[i]), i)
+ self.assertEqual(wupts.points[i].id.uuid, uuids[i])
+ 

diff --git a/dev-ros/geodesy/geodesy-0.5.5.ebuild 
b/dev-ros/geodesy/geodesy-0.5.5.ebuild
index 597e80d1d00..88ea377b0cc 100644
--- a/dev-ros/geodesy/geodesy-0.5.5.ebuild
+++ b/dev-ros/geodesy/geodesy-0.5.5.ebuild
@@ -32,3 +32,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/py3.patch" )

diff --git a/dev-ros/geodesy/geodesy-.ebuild 
b/dev-ros/geodesy/geodesy-.ebuild
index 597e80d1d00..88ea377b0cc 100644
--- a/dev-ros/geodesy/geodesy-.ebuild
+++ b/dev-ros/geodesy/geodesy-.ebuild
@@ -32,3 +32,4 @@ DEPEND="${RDEPEND}
dev-cpp/gtest
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/py3.patch" )



[gentoo-commits] repo/gentoo:master commit in: dev-ros/test_tf2/

2020-08-05 Thread Alexis Ballier
commit: 9309c5265ea62d90354d81ae0dc5ad6b74de23a5
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 15:05:46 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9309c526

dev-ros/test_tf2: add missing dep

Closes: https://bugs.gentoo.org/734706
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/test_tf2/test_tf2-0.7.2.ebuild | 4 +++-
 dev-ros/test_tf2/test_tf2-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-ros/test_tf2/test_tf2-0.7.2.ebuild 
b/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
index 10d0f26755b..24179b34048 100644
--- a/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
+++ b/dev-ros/test_tf2/test_tf2-0.7.2.ebuild
@@ -25,9 +25,11 @@ DEPEND="
dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
dev-ros/tf2_msgs
+   dev-ros/rosbash
sci-libs/orocos_kdl
$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
dev-libs/boost:=[threads]
-   dev-cpp/gtest"
+   dev-cpp/gtest
+"
 
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )

diff --git a/dev-ros/test_tf2/test_tf2-.ebuild 
b/dev-ros/test_tf2/test_tf2-.ebuild
index 10d0f26755b..24179b34048 100644
--- a/dev-ros/test_tf2/test_tf2-.ebuild
+++ b/dev-ros/test_tf2/test_tf2-.ebuild
@@ -25,9 +25,11 @@ DEPEND="
dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
dev-ros/tf2_msgs
+   dev-ros/rosbash
sci-libs/orocos_kdl
$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
dev-libs/boost:=[threads]
-   dev-cpp/gtest"
+   dev-cpp/gtest
+"
 
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )



[gentoo-commits] repo/gentoo:master commit in: dev-ros/actionlib/

2020-08-05 Thread Alexis Ballier
commit: f9122d4b0c39cab0854937bd7ec2b4550cd96051
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 15:30:05 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9122d4b

dev-ros/actionlib: fix tests

Closes: https://bugs.gentoo.org/734700
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/actionlib/actionlib-1.13.1.ebuild | 5 +
 dev-ros/actionlib/actionlib-.ebuild   | 5 +
 2 files changed, 10 insertions(+)

diff --git a/dev-ros/actionlib/actionlib-1.13.1.ebuild 
b/dev-ros/actionlib/actionlib-1.13.1.ebuild
index 0233a91da05..38e08315412 100644
--- a/dev-ros/actionlib/actionlib-1.13.1.ebuild
+++ b/dev-ros/actionlib/actionlib-1.13.1.ebuild
@@ -26,3 +26,8 @@ RDEPEND="${RDEPEND}
dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 "
+
+src_test() {
+   export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+   ros-catkin_src_test
+}

diff --git a/dev-ros/actionlib/actionlib-.ebuild 
b/dev-ros/actionlib/actionlib-.ebuild
index 0233a91da05..38e08315412 100644
--- a/dev-ros/actionlib/actionlib-.ebuild
+++ b/dev-ros/actionlib/actionlib-.ebuild
@@ -26,3 +26,8 @@ RDEPEND="${RDEPEND}
dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 "
+
+src_test() {
+   export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+   ros-catkin_src_test
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ros/camera_calibration/

2020-08-05 Thread Alexis Ballier
commit: 4032a6cf05f82127e3b6a0991fcb90298ee3927d
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 14:28:17 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4032a6cf

dev-ros/camera_calibration: prefetch test data

Closes: https://bugs.gentoo.org/734714
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/camera_calibration/Manifest |  4 
 dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild | 12 
 dev-ros/camera_calibration/camera_calibration-.ebuild   | 12 
 3 files changed, 28 insertions(+)

diff --git a/dev-ros/camera_calibration/Manifest 
b/dev-ros/camera_calibration/Manifest
index f95181cdfa0..5d6c6e87d9c 100644
--- a/dev-ros/camera_calibration/Manifest
+++ b/dev-ros/camera_calibration/Manifest
@@ -1 +1,5 @@
+DIST camera_calibration-1.15.2-camera_calibration.tar.gz 16954576 BLAKE2B 
8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381
 SHA512 
e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
+DIST camera_calibration-1.15.2-multi_board_calibration.tar.gz 24644313 BLAKE2B 
9969bb35028a826306a021a7b519a18c4457691c8d207ea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4
 SHA512 
87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
+DIST camera_calibration--camera_calibration.tar.gz 16954576 BLAKE2B 
8071b9cbae6c1b7c4c7784a5413f3328f216c17e7ef29b04688b81d45321d5a69284481770fc18e35dd7061e560023a3753743e532d52848aec9af9d09560381
 SHA512 
e856d58ae1cea22fe36a332794f49ef345e3e6b9455785369b33c8844bd52e311ae944becc556726d24967798588893eae4ac5eb510cd6d5fa8fb15a2b907ee6
+DIST camera_calibration--multi_board_calibration.tar.gz 24644313 BLAKE2B 
9969bb35028a826306a021a7b519a18c4457691c8d207ea8d994a26cae792ec5c1878e04c69154c85589a7bef725f1b8cd52515ec6bbaed123705da033e4
 SHA512 
87ec6b24d0436a6d33d0f41130c96b663315ce2bc67e86b5c6e1bde027f4e026792ced7bdc3ab57e6b4586844e66f153353c038ac5eb36014789f29f3ad40547
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 
7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453
 SHA512 
8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc

diff --git a/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild 
b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
index 3018cc3ee7c..115ecc7444b 100644
--- a/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
+++ b/dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
@@ -12,6 +12,10 @@ DESCRIPTION="Calibration of monocular or stereo cameras"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
+SRC_URI="${SRC_URI}
+   
http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> 
${P}-camera_calibration.tar.gz
+   
http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz 
-> ${P}-multi_board_calibration.tar.gz
+"
 
 RDEPEND="
dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
@@ -26,3 +30,11 @@ DEPEND="${RDEPEND}
test? (
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+
+src_prepare() {
+   ros-catkin_src_prepare
+   # Avoid external downloads during tests
+   cp "${DISTDIR}/${P}-camera_calibration.tar.gz" 
"${S}/camera_calibration.tar.gz" || die
+   cp "${DISTDIR}/${P}-multi_board_calibration.tar.gz" 
"${S}/multi_board_calibration.tar.gz" || die
+   sed -e 
"s#http://download.ros.org/data/camera_calibration/#file://${S}/#; -i 
CMakeLists.txt || die
+}

diff --git a/dev-ros/camera_calibration/camera_calibration-.ebuild 
b/dev-ros/camera_calibration/camera_calibration-.ebuild
index 3018cc3ee7c..115ecc7444b 100644
--- a/dev-ros/camera_calibration/camera_calibration-.ebuild
+++ b/dev-ros/camera_calibration/camera_calibration-.ebuild
@@ -12,6 +12,10 @@ DESCRIPTION="Calibration of monocular or stereo cameras"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
+SRC_URI="${SRC_URI}
+   
http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> 
${P}-camera_calibration.tar.gz
+   
http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz 
-> ${P}-multi_board_calibration.tar.gz
+"
 
 RDEPEND="
dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
@@ -26,3 +30,11 @@ DEPEND="${RDEPEND}
test? (
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+
+src_prepare() {
+   ros-catkin_src_prepare
+   # Avoid external downloads during tests
+   cp 

[gentoo-commits] repo/gentoo:master commit in: dev-ros/calibration_estimation/files/, dev-ros/calibration_estimation/

2020-08-05 Thread Alexis Ballier
commit: ee2d2c671a98dfd61e61b1525975b1cfce94f160
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 14:54:11 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2d2c67

dev-ros/calibration_estimation: fix py3 compat

Closes: https://bugs.gentoo.org/734710
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 .../calibration_estimation-0.10.14.ebuild  |  7 ++
 .../calibration_estimation-.ebuild |  7 ++
 dev-ros/calibration_estimation/files/py3.patch | 78 ++
 3 files changed, 92 insertions(+)

diff --git 
a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild 
b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
index 804aef9eae2..c83819a9fef 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.14.ebuild
@@ -30,3 +30,10 @@ DEPEND="${RDEPEND}
dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/py3.patch" )
+
+src_prepare() {
+   ros-catkin_src_prepare
+   sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
+   2to3 -w src/*/*.py src/*/*/*.py test/*.py || die
+}

diff --git a/dev-ros/calibration_estimation/calibration_estimation-.ebuild 
b/dev-ros/calibration_estimation/calibration_estimation-.ebuild
index 804aef9eae2..c83819a9fef 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-.ebuild
@@ -30,3 +30,10 @@ DEPEND="${RDEPEND}
dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+PATCHES=( "${FILESDIR}/py3.patch" )
+
+src_prepare() {
+   ros-catkin_src_prepare
+   sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
+   2to3 -w src/*/*.py src/*/*/*.py test/*.py || die
+}

diff --git a/dev-ros/calibration_estimation/files/py3.patch 
b/dev-ros/calibration_estimation/files/py3.patch
new file mode 100644
index 000..ad680c7a7c6
--- /dev/null
+++ b/dev-ros/calibration_estimation/files/py3.patch
@@ -0,0 +1,78 @@
+Index: 
calibration_estimation/src/calibration_estimation/sensors/chain_sensor.py
+===
+--- 
calibration_estimation.orig/src/calibration_estimation/sensors/chain_sensor.py
 calibration_estimation/src/calibration_estimation/sensors/chain_sensor.py
+@@ -135,7 +135,7 @@ class ChainSensor:
+ cov_angles = [x*x for x in 
self._full_chain.calc_block._chain._cov_dict['joint_angles']]
+ cov = matrix(Jt).T * matrix(diag(cov_angles)) * matrix(Jt)
+ 
+-if ( 
self._full_chain.calc_block._chain._cov_dict.has_key('translation') ):
++if ( 'translation' in self._full_chain.calc_block._chain._cov_dict ):
+ translation_var = 
self._full_chain.calc_block._chain._cov_dict['translation'];
+ translation_cov = 
numpy.diag(translation_var*(self.get_residual_length()/3))
+ cov = cov + translation_cov
+Index: 
calibration_estimation/src/calibration_estimation/sensors/tilting_laser_sensor.py
+===
+--- 
calibration_estimation.orig/src/calibration_estimation/sensors/tilting_laser_sensor.py
 
calibration_estimation/src/calibration_estimation/sensors/tilting_laser_sensor.py
+@@ -99,7 +99,7 @@ class TiltingLaserSensor:
+ gamma = matrix(zeros(cov.shape))
+ num_pts = self.get_residual_length()/3
+ 
+-for k in range(num_pts):
++for k in range(int(num_pts)):
+ first = 3*k
+ last = 3*k+3
+ sub_cov = matrix(cov[first:last, first:last])
+Index: calibration_estimation/test/chain_sensor_unittest.py
+===
+--- calibration_estimation.orig/test/chain_sensor_unittest.py
 calibration_estimation/test/chain_sensor_unittest.py
+@@ -59,7 +59,7 @@ from numpy import *
+ 
+ def loadSystem():
+ urdf = '''
+-
++
+   
+   
+ 
+Index: calibration_estimation/test/full_chain_unittest.py
+===
+--- calibration_estimation.orig/test/full_chain_unittest.py
 calibration_estimation/test/full_chain_unittest.py
+@@ -50,7 +50,7 @@ import numpy
+ 
+ def loadSystem1():
+ urdf = '''
+-
++
+   
+   
+ 
+Index: calibration_estimation/test/tilting_laser_sensor_unittest.py
+===
+--- calibration_estimation.orig/test/tilting_laser_sensor_unittest.py
 

[gentoo-commits] repo/gentoo:master commit in: dev-ros/tf2_ros/

2020-08-05 Thread Alexis Ballier
commit: 5a6a0342b5582d9f41f3076d447fe331be95d557
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  5 15:09:05 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  5 15:30:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6a0342

dev-ros/tf2_ros: fix tests

Closes: https://bugs.gentoo.org/734704
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild | 6 ++
 dev-ros/tf2_ros/tf2_ros-.ebuild  | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild 
b/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
index 46f41781292..efd7f5b732c 100644
--- a/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-0.7.2.ebuild
@@ -31,3 +31,9 @@ DEPEND="${RDEPEND}
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
+
+src_test() {
+   # Needed for tests to find internal launch file
+   export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+   ros-catkin_src_test
+}

diff --git a/dev-ros/tf2_ros/tf2_ros-.ebuild 
b/dev-ros/tf2_ros/tf2_ros-.ebuild
index 46f41781292..efd7f5b732c 100644
--- a/dev-ros/tf2_ros/tf2_ros-.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-.ebuild
@@ -31,3 +31,9 @@ DEPEND="${RDEPEND}
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
+
+src_test() {
+   # Needed for tests to find internal launch file
+   export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+   ros-catkin_src_test
+}



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

2020-08-05 Thread Michał Górny
commit: eba5b6bcdb44548dbab2daa415a7d8ea6f2ffc36
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:14:20 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba5b6bc

dev-util/debugedit: Remove old

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

 dev-util/debugedit/Manifest|  1 -
 dev-util/debugedit/debugedit-4.15.0.ebuild | 91 --
 2 files changed, 92 deletions(-)

diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index c7fc2f6be32..6293e1f0115 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,2 +1 @@
-DIST rpm-4.15.0.tar.bz2 4205632 BLAKE2B 
3e9701582e82d4164a21374df78c7a9ab3ca4f9aeafc13706fd0aa27782a34d2a732d7ae9659589abc9f9b8a48ce5c2cdbbea72c46768f1baba28ded26817e5b
 SHA512 
bca9cc9ef0ad53fa5cd257c29a0a0b9447956afe4024835f5416b13926bc8bbaf8aacd481e721b4a28983bc57f98b75b91750d39dd72de4876efa9d6db53a26c
 DIST rpm-4.15.1.tar.bz2 4243893 BLAKE2B 
352695e1fdac231127c9a2a775ff1aa05c1f3acbb10b0678e06011f9e4a5124e48cc19dce83417866e0f3c92bfd94e9c52b8c1884151ee77559bea1020d3623e
 SHA512 
6c66835da5a54349bcfba5cc69831c8c57568aabd53c5c2820ec78c361be5116fecd41777b097e9c49458f984a7beb054fa8ed453ff7263cad4a29a11f780767

diff --git a/dev-util/debugedit/debugedit-4.15.0.ebuild 
b/dev-util/debugedit/debugedit-4.15.0.ebuild
deleted file mode 100644
index c31eee2f2b6..000
--- a/dev-util/debugedit/debugedit-4.15.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="https://rpm.org
-   https://github.com/rpm-software-management/rpm;
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-   sys-libs/zlib:=
-   >=dev-libs/popt-1.7
-   >=dev-libs/elfutils-0.176-r1
-   dev-libs/nss
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   eapply_user
-
-   # cheat it into believing we're bundling db
-   mkdir -p db/dist || die
-   touch db/dist/configure || die
-   chmod +x db/dist/configure || die
-   echo 'install:' > db3/Makefile || die
-
-   # TODO: why do we need to do this?
-   mkdir rpm || die
-   find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-   append-cppflags -I"${EPREFIX}/usr/include/nss" 
-I"${EPREFIX}/usr/include/nspr"
-   local myconf=(
-   # force linking to static librpmio
-   --disable-shared
-
-   # disable linking compression libraries
-   ac_cv_header_bzlib_h=no
-   ac_cv_header_lzma_h=no
-   --disable-zstd
-
-   # fake some libraries we don't use
-   ac_cv_header_magic_h=yes
-   ac_cv_lib_magic_magic_open=yes
-
-   # use nss as crypto provider
-   --with-crypto=nss
-
-   # disable other stuff irrelevant to debugedit
-   --disable-bdb
-   --disable-nls
-   --disable-plugins
-   --disable-python
-   --without-acl
-   --without-archive
-   --without-cap
-   --without-external-db
-   --without-hackingdocs
-   --without-lua
-   --without-selinux
-   )
-   econf "${myconf[@]}"
-}
-
-src_compile() {
-   emake -C misc
-   emake -C rpmio
-   emake debugedit
-}
-
-src_test() {
-   :
-}
-
-src_install() {
-   dobin debugedit
-}



[gentoo-commits] repo/gentoo:master commit in: app-portage/gpyutils/

2020-08-05 Thread Michał Górny
commit: 61c637540adf42a43efcb4efc6ea09ac119b6402
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:13:33 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c63754

app-portage/gpyutils: Remove old

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

 app-portage/gpyutils/Manifest  |  1 -
 app-portage/gpyutils/gpyutils-0.4.1.ebuild | 24 
 2 files changed, 25 deletions(-)

diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index a4d3b7b912f..966730a61c4 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,2 +1 @@
-DIST gpyutils-0.4.1.tar.gz 19444 BLAKE2B 
20b9a3072337665a83e86994b4b0e5cc33673364320838ab3e56b87b06146d91d519f1b60023fa3e9be0bc6fc10a207a3fe87937158edb2c8607d8145022ee50
 SHA512 
c3420ec2c5fff39b32beb43b48eb06179534c359f755e5877d29ba4e3f393ce62c8ded48cd909bc69c20730d028e01c76375892ebb2a364017aa196c81865ecf
 DIST gpyutils-0.4.2.tar.gz 19771 BLAKE2B 
a5b58efcaad803a3eeb4a04b51811c2832f5a61154ac60b67c31e1962efd5f1a801e06fd3245c2336e6440b03fae2c30642e99c7588af89b7a3d0173b93f0c87
 SHA512 
699132833ddbaffe26bec8b3cb8914a609cc98ee2d8b852b59162265ee3daf6a0a0bd8ccc4d693e319d4e413c441ca94bd6837f07f1a132bda383350593792c4

diff --git a/app-portage/gpyutils/gpyutils-0.4.1.ebuild 
b/app-portage/gpyutils/gpyutils-0.4.1.ebuild
deleted file mode 100644
index ac5c7dac4d6..000
--- a/app-portage/gpyutils/gpyutils-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/;
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
-
-python_test() {
-   esetup.py test
-}



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

2020-08-05 Thread Michał Górny
commit: 2226b98a0ddaf2fbd3133f78257d8b5503e2b78e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:12:59 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2226b98a

dev-python/xlsxwriter: Remove old

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

 dev-python/xlsxwriter/Manifest|  2 --
 dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild | 22 --
 dev-python/xlsxwriter/xlsxwriter-1.3.0.ebuild | 22 --
 3 files changed, 46 deletions(-)

diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 18f55006a0c..56a0841857c 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,4 +1,2 @@
-DIST xlsxwriter-1.2.8-tests.tar.gz 29222574 BLAKE2B 
11a13c5fc4089c8c15dcaa069a6f044555426e71dd040a6abf1038fb2a33788744c80487abaf1da6b3c0fae2db55a389c0cedbac251c793dc828920ea55ee5b3
 SHA512 
2269235ad3bb243dd8be5cf33efb6503e08e3d7ac42bce042c97737ebb8a9db880db93c05bbb2708b0bb6c621cb11c91f3e7d5b4fa09fce88092b365910b1afb
 DIST xlsxwriter-1.2.9-tests.tar.gz 29395878 BLAKE2B 
010e3baf191dafe04b4c73986c7997048aeb1002515d24e104a241e7bc80c5e3e4e46b2454e01de72e23418a24ad981b758355dc77dfa1980265d5b119e7c247
 SHA512 
4680f2eaa96ec8063432f3f0642d27895cd462d3d9b664a452f8e2956bcd16268f41a5780d172cf61cd3951f1f5fbc2dc904ebef1e08e7f45269821a3157c7eb
-DIST xlsxwriter-1.3.0-tests.tar.gz 30533927 BLAKE2B 
4339cf064147e4f7e05af4b91576cd13eb3b0074ef98a843107e01d13548dd4781f520b589035439e6dfff5e915673462dfaac2d8143ffc5295a69ebbc193656
 SHA512 
41cb2743dbcf7f9537922060d84683145b82e4e8eac7134356c23b15ba30094c0461767d15cc8d2aec712ce8e1516b3a7811c60305cc365a5d0cb3c18da046fd
 DIST xlsxwriter-1.3.1-tests.tar.gz 31366131 BLAKE2B 
10c39c2a4d7c509ae98cf39feb97ae19bf53fc6be2ed0688d59bc6bd26bd3a8ce53edb43eedc83eba41258074fdc8bcdd54f2514297d045d5b283a7f1aacf922
 SHA512 
822a00911b783eeb907da3563a0fc939693296418b785087d2b7a43db08118b038ea6261f5b8832a1270813c51d54f2937020ccc150bfb4556bee056ae8af34b

diff --git a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild 
b/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
deleted file mode 100644
index 12bfbaf692b..000
--- a/dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter;
-SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz 
-> ${P}-tests.tar.gz"
-S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest

diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.0.ebuild 
b/dev-python/xlsxwriter/xlsxwriter-1.3.0.ebuild
deleted file mode 100644
index 11100a0ce79..000
--- a/dev-python/xlsxwriter/xlsxwriter-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="XlsxWriter"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter;
-SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz 
-> ${P}-tests.tar.gz"
-S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest



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

2020-08-05 Thread Michał Górny
commit: 3cbcb115ec9140498aa491f226c00bdee2a2382b
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:12:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cbcb115

dev-python/sybil: Remove old

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

 dev-python/sybil/Manifest   |  1 -
 dev-python/sybil/sybil-1.2.2.ebuild | 22 --
 2 files changed, 23 deletions(-)

diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 2a6acc4ef5e..814f2ae9b58 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,2 @@
-DIST sybil-1.2.2.tar.gz 29182 BLAKE2B 
d0d9a0a2e5117efd36e7561f74d31283fa25ea0210e0796fe1a1cc4247712bff0e3ac329781987b5ba805ccd2cddf01eec2672d5e2677422d1ed378068482da5
 SHA512 
c1785c00ce1dfdaf85d13db976f28062c09c47974107bc2af54c3bd9bf4ad5124c9b52321f3350fb1cc50aefdf72f2a9b6b22fc766b139516ff7979864604735
 DIST sybil-1.3.0.tar.gz 29296 BLAKE2B 
a7f08f6374e12213b644685276832eca849c85e85c8aaf0a37bdfdbf648e0e0e4c2b3d1a4dc7038c91fe8d64aa476d96bf87fa3a5f2f11a955b758182411763d
 SHA512 
fc478896bb1958303ffcac6d35993b2785a50c6c221848d83c92c158a27fff059491aa3baaddd0b56e040fe6c07b764aa33c69204750de9ad351084b2815fd47
 DIST sybil-1.3.1.tar.gz 29392 BLAKE2B 
a7736bed59e444bcd42f5fdf720e08680d827eef9043b318abda08d427e25eeec9ba3acf9bfa251c584e0960c3d3b10fecaf8367742f29230421bec594cf3e59
 SHA512 
7bd39707babb15ed7ec99ecd640d983d4e71519efe7490230fe0be4e0111bc0b0957797b19292519b6c09965669251788f1d2c0baf9f179856f28e6aeb5ecc52

diff --git a/dev-python/sybil/sybil-1.2.2.ebuild 
b/dev-python/sybil/sybil-1.2.2.ebuild
deleted file mode 100644
index 3e88978fa0f..000
--- a/dev-python/sybil/sybil-1.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/cjw296/sybil;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# nose is used to test nosetests integration
-BDEPEND="
-   test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest



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

2020-08-05 Thread Michał Górny
commit: 42ee933f4d5e2366a9ac4c038e7e2f1a31f36e3e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:12:46 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ee933f

dev-python/watchdog: Remove old

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

 dev-python/watchdog/Manifest   |  1 -
 dev-python/watchdog/watchdog-0.10.2.ebuild | 35 --
 2 files changed, 36 deletions(-)

diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index e246b620a9a..5e0bb5bb29a 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,3 +1,2 @@
-DIST watchdog-0.10.2.tar.gz 88902 BLAKE2B 
f6fc6b9dd867a69139289fe6189f90fbc35897a63db1685da85960358141e5eed8391c1aba0cbb899b197056ae80141795090de7f73d821a1819b5c63361cc65
 SHA512 
3563a9686ce304350f33bbf4b16933cd0db5d6ab17676dfcc779b86cf9ddd06c42462ec40ad5c046cf4aa4b603aa477865de45daef05f9c6af3a441bcab16dbb
 DIST watchdog-0.10.3.tar.gz 89215 BLAKE2B 
bbe8a2ab3f84b7eff60d4ebd38ac928db85998910fc5b107dcd645c9b91388a9e45d31f08288ce3bc2befcf9310bb7c8aef4f8e3309481919dc87e84b2a1
 SHA512 
6061b1393cd07038ee22271101bd6d5c847ee9732b14f63bbb5d94fba9f8273ca728cdc58b6f53a95d8213d0ed35bc71e8bb9c54960bf3aea2f64da066a864f5
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B 
d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932
 SHA512 
61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f

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



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

2020-08-05 Thread Michał Górny
commit: 03fd0405e38dfa1d27fecf2a348d336bcee80bd2
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:11:54 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fd0405

dev-python/s3transfer: Remove old

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

 dev-python/s3transfer/Manifest|  1 -
 dev-python/s3transfer/s3transfer-0.3.1.ebuild | 43 ---
 2 files changed, 44 deletions(-)

diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index f6a72064e53..5f15032716f 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,2 +1 @@
-DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 
26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408
 SHA512 
75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
 DIST s3transfer-0.3.3.tar.gz 118872 BLAKE2B 
a8e10a135052a29cbc5949bd8dc82d0b7f76840e6dbc6ba5ccdfe23757d363476f1dc330cee36ceb88e5c5287f644a27ed50b518a346f1b6b8ae38a9ca5576c9
 SHA512 
e258958b47812d8620ea6ef604dadb2a13beef9bbed005e8d38153039a291099786a3cec68511f2ff4372ff57f60440ca700b6783967484d8284b4ad0c1ae754

diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild 
b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
deleted file mode 100644
index d81234e7f38..000
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   dev-python/botocore[${PYTHON_USEDEP}]
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-   test? (
-   ${CDEPEND}
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-   nosetests -v tests/unit/ tests/functional/ || die "tests failed under 
${EPYTHON}"
-}
-
-src_prepare() {
-   default
-
-   # Incompatible with recent Future version
-   rm tests/unit/test_s3transfer.py || die
-}



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

2020-08-05 Thread Michał Górny
commit: 09f16241828ad6c0d2c9e25347f67d7035581149
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:11:39 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f16241

dev-python/responses: Remove old

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

 dev-python/responses/Manifest |  1 -
 dev-python/responses/responses-0.10.14.ebuild | 42 ---
 2 files changed, 43 deletions(-)

diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index eaaf34586f1..5d3907eff3b 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,2 +1 @@
-DIST responses-0.10.14.tar.gz 24782 BLAKE2B 
2c233ad41bfc1d9eeaaf84d2e8a98f5f808e39ffbb50c796aed6a3065827a0c33301c8d6ed1e7c4d88e6d0f7378796bdaba3816fd558f5797a725ea99835c54c
 SHA512 
f7edf64d4e6d62fa7295b6ac95d60bc30adbf0b141d9624ed7ca03efe02790973aa8ebd3f93187d0fdb41e323c1d87184717b77bba2ea70a7ae25f4d9237314f
 DIST responses-0.10.15.tar.gz 25350 BLAKE2B 
6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b
 SHA512 
513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0

diff --git a/dev-python/responses/responses-0.10.14.ebuild 
b/dev-python/responses/responses-0.10.14.ebuild
deleted file mode 100644
index aa7f8d6ba7e..000
--- a/dev-python/responses/responses-0.10.14.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
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-   >=dev-python/requests-2.0[${PYTHON_USEDEP}]
-   dev-python/cookies[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-   test? (
-   ${RDEPEND}
-   dev-python/pytest-localserver[${PYTHON_USEDEP}]
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}/responses-0.10.7-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-   # py3.9, doesn't look important
-   sed -e 's:test_arbitrary_status_code:_&:' \
-   -i test_responses.py || die
-   distutils-r1_src_prepare
-}



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

2020-08-05 Thread Michał Górny
commit: 8a24c39a429179130afbe2cdb50f21d8bf424d65
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:14:59 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a24c39a

x11-misc/qt5ct: Remove old

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

 x11-misc/qt5ct/Manifest  |  1 -
 x11-misc/qt5ct/qt5ct-0.41.ebuild | 52 
 2 files changed, 53 deletions(-)

diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 8dad1e362a1..cb96046bd4c 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,3 +1,2 @@
-DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B 
de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2
 SHA512 
a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
 DIST qt5ct-1.0.tar.bz2 73360 BLAKE2B 
a2a37534434102f08d0f225017c5b835bc22ac2d86592505d4dcc8823a8ed34fd54085a581e86e83ecaec04141e90f4c6e87b9aaed027b68e29ed9a773108263
 SHA512 
f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2
 DIST qt5ct-1.1.tar.bz2 79890 BLAKE2B 
e816d76ea35b2133891ccf63be47a227d95dc9783b6f2ac18ee7a7c67bae545fbdc7109103e63c18f093458942ae0b9bab3d1847c40abea9761ab0c314de6357
 SHA512 
0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7

diff --git a/x11-misc/qt5ct/qt5ct-0.41.ebuild b/x11-misc/qt5ct/qt5ct-0.41.ebuild
deleted file mode 100644
index 575ed6982d0..000
--- a/x11-misc/qt5ct/qt5ct-0.41.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
-HOMEPAGE="https://sourceforge.net/projects/qt5ct/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dbus"
-
-RDEPEND="
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5=
-   dev-qt/qtwidgets:5
-   dbus? (
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5[dbus]
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-"
-
-src_configure() {
-   eqmake5 DISABLE_DBUS=$(usex dbus 0 1)
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-   einstalldocs
-
-   newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
-}
-
-pkg_postinst() {
-   if [[ -z ${REPLACING_VERSIONS} ]]; then
-   ewarn "qt5ct configuration won't be applied to the currently 
running sessions."
-   ewarn "Please relogin."
-   fi
-   if ! has_version 'dev-qt/qtsvg:5'; then
-   elog
-   elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
-   elog
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: app-portage/pram/

2020-08-05 Thread Michał Górny
commit: d41f9d101dcb66a3e769eca21bb84c8318a9ce7d
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:13:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41f9d10

app-portage/pram: Remove old

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

 app-portage/pram/Manifest  |  1 -
 app-portage/pram/pram-8.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/app-portage/pram/Manifest b/app-portage/pram/Manifest
index b6f775a7714..e514e0db312 100644
--- a/app-portage/pram/Manifest
+++ b/app-portage/pram/Manifest
@@ -1,2 +1 @@
-DIST pram-8.tar.gz 7918 BLAKE2B 
cc5bea629e49b229622a77c585a62710234e00ae245b68cbcfbae5be538b82752e8b2e8da5ae82f571dd4d7368ecaacd1233affe975fd9e20177122808dc39cc
 SHA512 
bbd9e7ce3207550f1651d63a045474d90c4aaf20ab0c541b2a78e6af6351f9c7bd278b649ee57ed1b3b85cbc4f38f1b98a008e791bf9d19e4ea718892544bd46
 DIST pram-9.tar.gz 8206 BLAKE2B 
cf490edd53d307e5d9c715d0ca68e38d04ebd5a1dc75f89232605ac5cc9cbc9567b3895b1e2445a14c5acf119f054dc2b982ea7b9949177519a70062e648272b
 SHA512 
a9e718ca0cdc93a67f442f2db5dd6a854357aa493ad7836e5d75ede68c3fad06d2343f1ee34f00bb66203d41575c7773999772f9251a9a2d6fc74702ce875c4d

diff --git a/app-portage/pram/pram-8.ebuild b/app-portage/pram/pram-8.ebuild
deleted file mode 100644
index debf356c6ab..000
--- a/app-portage/pram/pram-8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Tool to ease merging Pull Requests and git patches"
-HOMEPAGE="https://github.com/mgorny/pram;
-SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-vcs/git
-   net-misc/wget[ssl]
-   virtual/editor
-   !dev-perl/Gentoo-App-Pram"
-DEPEND="
-   test? (
-   ${RDEPEND}
-   app-crypt/gnupg
-   sys-apps/diffutils
-   )"



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/

2020-08-05 Thread Michał Górny
commit: cb82f9b316afc56e73f42a98db6b8208c3d19612
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:15:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb82f9b3

sci-mathematics/z3: Remove old

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

 sci-mathematics/z3/Manifest|  1 -
 sci-mathematics/z3/z3-4.8.6.ebuild | 93 --
 2 files changed, 94 deletions(-)

diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 4957c984b18..402a84ffbbe 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,2 +1 @@
-DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 
4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46
 SHA512 
d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
 DIST z3-4.8.8.tar.gz 4520119 BLAKE2B 
8d3d9fac61ac7d5a9d8c44323db9f67a7b24ee510b12e67867b249062cbcfe9a3bd0fa3b24c03c9eccd2aaf90451083ff5e9a9253a87c3e8e943fc5cf08a1893
 SHA512 
a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f

diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild 
b/sci-mathematics/z3/z3-4.8.6.ebuild
deleted file mode 100644
index fca0f4ef0b6..000
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/;
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz;
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-   doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-   -DUSE_LIB_GMP=$(usex gmp)
-   -DENABLE_EXAMPLE_TARGETS=OFF
-   -DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-   -DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-   -DBUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-   )
-
-   cmake-utils_src_configure
-}
-
-multilib_src_test() {
-   cmake-utils_src_make test-z3
-   set -- "${BUILD_DIR}"/test-z3 /a
-   echo "${@}" >&2
-   "${@}" || die
-}
-
-multilib_src_install_all() {
-   dodoc README.md RELEASE_NOTES
-   use examples && dodoc -r examples
-   use python && python_optimize
-
-   if use isabelle; then
-   insinto /usr/share/Isabelle/contrib/${P}/etc
-   newins - settings <<-EOF
-   Z3_COMPONENT="\$COMPONENT"
-   Z3_HOME="${EPREFIX}/usr/bin"
-   Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-   Z3_REMOTE_SOLVER="z3"
-   Z3_VERSION="${PV}"
-   Z3_INSTALLED="yes"
-   Z3_NON_COMMERCIAL="yes"
-   EOF
-   fi
-}
-
-pkg_postinst() {
-   if use isabelle; then
-   if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-   sed -e "/contrib\/${PN}-[0-9.]*/d" \
-   -i "${ROOT}/etc/isabelle/components" || die
-   cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-   contrib/${P}
-   EOF
-   fi
-   fi
-}
-
-pkg_postrm() {
-   if use isabelle; then
-   if [[ ! ${REPLACING_VERSIONS} ]]; then
-   if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-   # Note: this sed should only match the version 
of this ebuild
-   # Which is what we want as we do not want to 
remove the line
-   # of a new Isabelle component being installed 
during an upgrade.
-   sed -e "/contrib\/${P}/d" \
-   -i "${ROOT}/etc/isabelle/components" || 
die
-   fi
-   fi
-   fi
-}



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

2020-08-05 Thread Michał Górny
commit: 541c619cf33eddeed6b6c54c223296d6555d5006
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:10:33 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541c619c

dev-python/PyICU: Remove old

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

 dev-python/PyICU/Manifest   |  1 -
 dev-python/PyICU/PyICU-2.4.3.ebuild | 23 ---
 2 files changed, 24 deletions(-)

diff --git a/dev-python/PyICU/Manifest b/dev-python/PyICU/Manifest
index 1e7659d7cec..17ec9e653fd 100644
--- a/dev-python/PyICU/Manifest
+++ b/dev-python/PyICU/Manifest
@@ -1,2 +1 @@
-DIST PyICU-2.4.3.tar.gz 219819 BLAKE2B 
5e4b9ecab9e726aa05ae4a30d3b277dec3a94a2e0393a7cd9a9f247c73f02051649f03079b3b5f6d5a1745f00d2dc367066de8e93cafe3291cce7aa09884d7af
 SHA512 
77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
 DIST PyICU-2.5.tar.gz 225591 BLAKE2B 
0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151
 SHA512 
b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548

diff --git a/dev-python/PyICU/PyICU-2.4.3.ebuild 
b/dev-python/PyICU/PyICU-2.4.3.ebuild
deleted file mode 100644
index 9721c47..000
--- a/dev-python/PyICU/PyICU-2.4.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: dev-python/python-distutils-extra/files/, dev-python/python-distutils-extra/

2020-08-05 Thread Michał Górny
commit: 65b67009f8f6d65483fdb81362126fcf223639ca
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:10:47 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b67009

dev-python/python-distutils-extra: Remove old

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

 dev-python/python-distutils-extra/Manifest |  1 -
 .../python-distutils-extra-2.44-skip-build.patch   | 63 --
 .../files/python-distutils-extra-2.44-test.patch   | 27 --
 .../python-distutils-extra-2.44-r1.ebuild  | 42 ---
 4 files changed, 133 deletions(-)

diff --git a/dev-python/python-distutils-extra/Manifest 
b/dev-python/python-distutils-extra/Manifest
index 3c6dcf4b79a..beb806cef34 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,2 +1 @@
-DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 
3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e
 SHA512 
517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822
 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B 
b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41
 SHA512 
04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1

diff --git 
a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
 
b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
deleted file mode 100644
index f2a19990ed3..000
--- 
a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-skip-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4f5e0ce9cc3f511c798acfc009ce5db4e9ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
-Date: Tue, 28 Apr 2020 10:48:18 +0200
-Subject: [PATCH] Fix install_auto command with --skip-build
-
-python-distutils-extra seems to rely on a very bad practice of modifying
-internal state (file lists) in middle of `build` commands.  As a result,
-if the package is installed via `build` command followed by `install
---skip-build` (since everything was built already!), most of the files
-are not installed.
-
-Ideally, this would be resolved by making internal state updates
-independent of `build` command execution.  However, given that
-the package is not really alive and worth the effort, let's settle
-on a cheap hack of calling all `build_*` subcommands from `install`
-if `--skip-build` is used.  This partially reverses what standard
-distutils `install` command does but it will rebuild only the data files
-rather than all C extensions.
-
-Modify tests to use `--skip-build` unconditionally to test this better.
-Testing both scenarios probably makes little sense.

- DistUtilsExtra/auto.py | 7 +++
- test/auto.py   | 5 +++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/DistUtilsExtra/auto.py b/DistUtilsExtra/auto.py
-index ea15183..db45f7a 100644
 a/DistUtilsExtra/auto.py
-+++ b/DistUtilsExtra/auto.py
-@@ -711,6 +711,13 @@ class sdist_auto(distutils.command.sdist.sdist):
- 
- class install_auto(distutils.command.install.install):
- def run(self):
-+# run build_* subcommands to get file lists if install command
-+# won't run 'build' for us
-+if self.skip_build:
-+self.run_command('build_help')
-+self.run_command('build_i18n')
-+self.run_command('build_icons')
-+
- # install files from etc/
- if os.path.isdir('etc'):
- # work around a bug in copy_tree() which fails with "File exists" 
on
-diff --git a/test/auto.py b/test/auto.py
-index b9644ba..15780c6 100755
 a/test/auto.py
-+++ b/test/auto.py
-@@ -873,8 +873,9 @@ print ('import iamnota.module')
- '''
- self.install_tree = tempfile.mkdtemp()
- 
--return self.setup_py(['install', '--no-compile', '--prefix=/usr',
--'--root=' + self.install_tree])
-+self.setup_py(['build'])
-+return self.setup_py(['install', '--no-compile', '--skip-build',
-+'--prefix=/usr', '--root=' + self.install_tree])
- 
- def installed_files(self):
- '''Return list of file paths in install tree.'''
--- 
-2.26.2
-

diff --git 
a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
 
b/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
deleted file mode 100644
index b00fc32d017..000
--- 
a/dev-python/python-distutils-extra/files/python-distutils-extra-2.44-test.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 33026583f3b2f59bcc415fae4c1ae84bfd058817 Mon Sep 17 00:00:00 2001
-From: 

[gentoo-commits] repo/gentoo:master commit in: app-shells/posh/

2020-08-05 Thread Michał Górny
commit: aba5762dbc820214b02767b082807c9d36eaecd8
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:14:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba5762d

app-shells/posh: Remove old

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

 app-shells/posh/Manifest   |  2 --
 app-shells/posh/posh-0.13.2.ebuild | 22 --
 app-shells/posh/posh-0.14.ebuild   | 32 
 3 files changed, 56 deletions(-)

diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index 2bb336a2a51..698839d2e85 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -1,3 +1 @@
 DIST posh-debian-0.14.1.tar.bz2 208385 BLAKE2B 
0670d529f0d2f3b27e212d0efd66b42de4d37a6ce99f18d6fdd0b681a61ed313df5a9cecfee840eacb95df73b611fa3fa24163529d59423a3c0ac3f33bf5
 SHA512 
2beb8af9edbc318da243a82e1fbaec4ac81ec166b3e602f6b37867e4bbe548247a299dd748df4da88b2ff2930785945d91c5b84b563c339bc239299ecf67beec
-DIST posh-debian-0.14.tar.bz2 208192 BLAKE2B 
b2a974fdb55d39260bf21831c2df1518e6ef2e7c982e7a15c70ba470dff9e1eac41ac5b7e6709b630d7dcb2cd2871268328c70f876778fb9196f70dd1702fedf
 SHA512 
8e30245146197f379ae7bccc6f56a1d0d38796d7b5499bf334d0c4375e8caacabaf8293e838bc827e511a57c6ae70701bfb1887c0756bce3bb9a4b69b9fd07ae
-DIST posh_0.13.2.tar.xz 267492 BLAKE2B 
44a06528825485ac1c5d899e9b625785ec733fee945241dc0708e51e1f2145a31aae04023477f6b3abb8053ab42714d2ceac6b5a1d776780ea2ab78ca1fd44d5
 SHA512 
1d0de10e47e66cb654a47c18bb7f8b5361eff2d99e6c0b215ed9a1052134b534276ed58feafd53fe0ee2fbc3e048dc9cf747752568fb361ea47700e02a3478f0

diff --git a/app-shells/posh/posh-0.13.2.ebuild 
b/app-shells/posh/posh-0.13.2.ebuild
deleted file mode 100644
index b5f53776db4..000
--- a/app-shells/posh/posh-0.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="https://salsa.debian.org/clint/posh;
-SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2+ BSD public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-src_configure() {
-   local myconf=(
-   --exec-prefix="${EPREFIX:-/}"
-   )
-   econf "${myconf[@]}"
-}

diff --git a/app-shells/posh/posh-0.14.ebuild b/app-shells/posh/posh-0.14.ebuild
deleted file mode 100644
index 9ebc1b24bba..000
--- a/app-shells/posh/posh-0.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P=posh-debian-${PV}
-DESCRIPTION="Reimplementation of Bourne shell based on pdksh"
-HOMEPAGE="https://salsa.debian.org/clint/posh;
-SRC_URI="
-   
https://salsa.debian.org/clint/posh/-/archive/debian/${PV}/${MY_P}.tar.bz2;
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2+ BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   local myconf=(
-   --exec-prefix="${EPREFIX:-/}"
-   )
-   econf "${myconf[@]}"
-}



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

2020-08-05 Thread Michał Górny
commit: 233c5309547e3d8d01818d65f690ef230708420a
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:13:23 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233c5309

app-arch/libarchive: Remove old

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

 app-arch/libarchive/Manifest|   1 -
 app-arch/libarchive/libarchive-3.4.2.ebuild | 134 
 2 files changed, 135 deletions(-)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 30ac772f2d0..0878de80977 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1 @@
-DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B 
eea90e4751ae487cd1a9b0eecd16598d1b81665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d
 SHA512 
a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 
12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256
 SHA512 
d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d

diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild 
b/app-arch/libarchive/libarchive-3.4.2.ebuild
deleted file mode 100644
index d9f9a71caad..000
--- a/app-arch/libarchive/libarchive-3.4.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/;
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz;
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 
+lzma lzo nettle static-libs +threads xattr +zlib zstd"
-
-RDEPEND="
-   acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-   blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-   bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-   expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-   !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-   iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-   kernel_linux? (
-   xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-   )
-   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-   lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
-   lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-   nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-   zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-   zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   kernel_linux? (
-   virtual/os-headers
-   e2fsprogs? ( sys-fs/e2fsprogs )
-   )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.3.3-libressl.patch
-)
-
-# Various test problems, starting with the fact that sandbox
-# explodes on long paths. https://bugs.gentoo.org/598806
-RESTRICT="test"
-
-src_prepare() {
-   default
-   elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-   export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-   local myconf=(
-   $(use_enable acl)
-   $(use_enable static-libs static)
-   $(use_enable xattr)
-   $(use_with blake2 libb2)
-   $(use_with bzip2 bz2lib)
-   $(use_with expat)
-   $(use_with !expat xml2)
-   $(use_with iconv)
-   $(use_with lz4)
-   $(use_with lzma)
-   $(use_with lzo lzo2)
-   $(use_with nettle)
-   $(use_with zlib)
-   $(use_with zstd)
-
-   # Windows-specific
-   --without-cng
-   )
-   if multilib_is_native_abi ; then
-   myconf+=(
-   --enable-bsdcat=$(tc-is-static-only && echo static || 
echo shared)
-   --enable-bsdcpio=$(tc-is-static-only && echo static || 
echo shared)
-   --enable-bsdtar=$(tc-is-static-only && echo static || 
echo shared)
-   )
-   else
-   myconf+=(
-   --disable-bsdcat
-   --disable-bsdcpio
-   --disable-bsdtar
-   )
-   fi
-
-   ECONF_SOURCE="${S}" 

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

2020-08-05 Thread Michał Górny
commit: 91da51304ae3effb96ec830ca46a4b1aeda36b96
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:14:46 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91da5130

dev-libs/jsoncpp: Remove old

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

 dev-libs/jsoncpp/Manifest |  1 -
 dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild | 47 ---
 2 files changed, 48 deletions(-)

diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 7199d75d978..2f2722de426 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,2 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 
654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6
 SHA512 
4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 
6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8
 SHA512 
f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
-DIST jsoncpp-1.9.3_pre20200412.tar.gz 212522 BLAKE2B 
17b0cc2ef40ae932c6ff26c0fa77e8326099a1b6f088e53697c2a3c286d23ef63dd372f2ba721025b84670957689251c2d15083bdd24565715a78beac556ead2
 SHA512 
6e58870c5c478fe2bba125c50c4f77654f304051f4091cc5a98f9a3c9aefbb94d1156eb07ce004a7683675fd971ec825a0828803042d9b03783b1debf3a39e2b

diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild 
b/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
deleted file mode 100644
index cb7119c2897..000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson python-any-r1
-
-EGIT_COMMIT="90ca694e4697497a8c2bc8c60a9c9f89e7290a10"
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp;
-SRC_URI="
-   
https://github.com/open-source-parsers/${PN}/archive/${EGIT_COMMIT}.tar.gz
-   -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_configure() {
-   local emesonargs=(
-   # Follow Debian, Ubuntu, Arch convention for headers location
-   # bug #452234
-   --includedir include/jsoncpp
-   -Dtests=$(usex test true false)
-   )
-   meson_src_configure
-}
-
-src_compile() {
-   meson_src_compile
-
-   if use doc; then
-   echo "${PV}" > version || die
-   "${EPYTHON}" doxybuild.py 
--doxygen="${EPREFIX}"/usr/bin/doxygen || die
-   HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-   fi
-}



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

2020-08-05 Thread Michał Górny
commit: 4ec35c8dbe793a6e01db6e62fb9157ce24d23ddb
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:12:05 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec35c8d

dev-python/sphinxcontrib-programoutput: Remove old

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

 dev-python/sphinxcontrib-programoutput/Manifest|  1 -
 .../sphinxcontrib-programoutput-0.15.ebuild| 40 --
 2 files changed, 41 deletions(-)

diff --git a/dev-python/sphinxcontrib-programoutput/Manifest 
b/dev-python/sphinxcontrib-programoutput/Manifest
index f900e70328d..85d3e5578b3 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-programoutput-0.15.tar.gz 21772 BLAKE2B 
e3bf609315e0298e73bf37db0d7e4d5175121fd0b0c612083427d60ab10cbfc1bf65c572b9ce561b05c9adffe288df7f0b28d6f2daa44af197d22b99ec8d00f4
 SHA512 
08444118daf09e05c1318ee87a22fcccb7822b99d58d18cf46748aa32338f35519017839c233cd5176a5426cb5f55047039ee28a26f6f4ebd99a35b199c0ff19
 DIST sphinxcontrib-programoutput-0.16.tar.gz 23714 BLAKE2B 
1e5136faa89a2f303008fb0e24f99f544464d30f5c0c072db4e2e25cb30bfc3cd4af6157f6c8dc7ddfaffd8f6587435c5947b6981c34daf2d6029736fdc22870
 SHA512 
6003b8ce43ed468b01f6bda02c6f58c0518b38c43a75f1ed0869dd8df2ee215310246b7feeba90f213547644c1bdb0164cf1f44f44879ac054dcbd6d6f48a69e

diff --git 
a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild
 
b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild
deleted file mode 100644
index 950fa2dea78..000
--- 
a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to sphinx to include program output"
-HOMEPAGE="
-   https://sphinxcontrib-programoutput.readthedocs.io/en/latest/
-   https://pypi.org/project/sphinxcontrib-programoutput/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-DEPEND="
-   ${RDEPEND}
-   test? (
-   dev-python/mock[${PYTHON_USEDEP}]
-   )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
-   distutils-r1_python_install_all
-   find "${ED}" -name '*.pth' -delete || die
-}



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

2020-08-05 Thread Michał Górny
commit: c23e305cff4d85f128c78f56e2799a8b87fbb59d
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:12:35 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23e305c

dev-python/toolz: Remove old

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

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

diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 163b8c129bb..998a839b166 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,2 +1 @@
 DIST toolz-0.10.0.tar.gz 49579 BLAKE2B 
c323bf1ba1da5c01a1a1d879ef545767b8253c906baba63a0f600d2879c5b7120c4978574447954648c23c1ba05de2a2c7437eed1eeff31dface1c823f6e
 SHA512 
4ed40c165462440c6004974d2515067f211c625bebcb69ea854fd8837e1fe05febc546215355a6bb9de5916c8ba98a4d297f8aa20e40ffbc8a730b2bb3831a71
-DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 
8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c
 SHA512 
f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d

diff --git a/dev-python/toolz/toolz-0.9.0.ebuild 
b/dev-python/toolz/toolz-0.9.0.ebuild
deleted file mode 100644
index 0c486b0291b..000
--- a/dev-python/toolz/toolz-0.9.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-portage/eix/

2020-08-05 Thread Michał Górny
commit: b710697b947610e20842dd60ba48d5026420bc62
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:13:51 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:18:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b710697b

app-portage/eix: Remove old

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

 app-portage/eix/Manifest |   4 --
 app-portage/eix/eix-0.33.11.ebuild   | 107 -
 app-portage/eix/eix-0.33.9-r1.ebuild | 107 -
 app-portage/eix/eix-0.34.1.ebuild| 112 ---
 app-portage/eix/eix-0.34.2.ebuild| 108 -
 5 files changed, 438 deletions(-)

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 7db40e4ac8c..5b0f48d5d81 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1 @@
-DIST eix-0.33.11.tar.xz 623256 BLAKE2B 
756feed85cb4f40ef9228a03d2a8b8470eb6017b00d93b364d67e3d11ecaacce2bb9c6afed388d9f70dfcb7a0b9ece13ca6ee523f5839b7d9bf80cf3b2721524
 SHA512 
2829d1482abfe479ae71e8b00da07abe74ba3090ba2a3f9d9a93437cb2d4d64213968bcd6c082a6703ec1d9c36dfcfaa0850172f3ffd4d256f553b98eeaf29e6
-DIST eix-0.33.9.tar.xz 627944 BLAKE2B 
cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8
 SHA512 
7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
-DIST eix-0.34.1.tar.xz 626484 BLAKE2B 
3f33df9d3f45abc073d7b80a7a6b3574ef6c1372042cb1ec4f0b0213842bc48d8d5a76c005ece2c060a39b1c8778764eb1f6808e75bc10af6e366e33e10aa6c7
 SHA512 
86289d8dcb0cf87ad48c739aae637626f9e63200a48d019fc96e74f2851b2791a61741d5db72ceaf3e5a375fb0dbf9302b04f766c3def69bcaabb393545dc767
-DIST eix-0.34.2.tar.xz 626492 BLAKE2B 
984411e459b18f0ade77569b1e972a8c59588a31ce6af4b998a5fa27f9d5a2cc75fe647641f0651f17b5e9b4dc5706444dc49bd09e9e070e666beb989403e303
 SHA512 
422123108c841dd7e02296fa38276e72c61c8cab5e9ebba1fd2cd23d2a4b2c68e1dc530e47428f0bc41e89983196c7b8319ee548789199e4673c04687bbc5aec
 DIST eix-0.34.4.tar.xz 628516 BLAKE2B 
0c7cb4d7cd13d7715ba35cc0edd38e549fd1d1618bfdcacb272ee8325a844276a6df59a701ab2b4ecc693e5dad2d95c96c000e96eb8bce72709baf22f3fa490f
 SHA512 
a96714fba8324529bf63de63f9eb11cc76da05e3d43c5eedad49079b6e3a1960376bd5d3bc116dba49bc7f694c7588741e518438936abd4b37edfe0a097ecd3d

diff --git a/app-portage/eix/eix-0.33.11.ebuild 
b/app-portage/eix/eix-0.33.11.ebuild
deleted file mode 100644
index d3a156ca40f..000
--- a/app-portage/eix/eix-0.33.11.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/;
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-   sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-   >=app-shells/push-2.0-r1
-   >=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-   app-arch/xz-utils
-   nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-   # remove stale cache file to prevent collisions
-   local old_cache=${EROOT}/var/cache/${PN}
-   if [[ -f ${old_cache} ]]; then
-   rm "${old_cache}" || die
-   fi
-}
-
-src_prepare() {
-   default
-   sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-   sed -e "/eixf_source=/s:push.sh:cat 
\"${EPREFIX}/usr/share/push/push.sh\":" \
-   -e "/eixf_source=/s:quoter_pipe.sh:cat 
\"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-   -i src/eix-functions.sh.in || die
-   sed -e "s:'\$(bindir)/eix-functions.sh':cat 
\"${EPREFIX}/usr/share/eix/eix-functions\":" \
-   -i src/Makefile.am || die
-   eautoreconf
-}
-
-src_configure() {
-   local myconf=(
-   $(use_enable debug paranoic-asserts)
-   $(use_enable nls)
-   $(use_with doc extra-doc)
-   $(use_with sqlite)
-
-   # default configuration
-   $(use_with prefix always-accept-keywords)
-   --with-dep-default
-   --with-required-use-default
-
-   # paths
-   --with-portage-rootpath="${ROOTPATH}"
-   --with-eprefix-default="${EPREFIX}"
-
-   # build a single executable with symlinks
-   --disable-separate-binaries
-   --disable-separate-tools
-
-   # 

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, profiles/arch/amd64/

2020-08-05 Thread Thomas Deutschmann
commit: ced27205fe6e8d3b79d1448626010e36880ca29e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 15:13:10 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 15:14:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced27205

profiles: amd64/x86: Add app-metrics/collectd[collectd_plugins_slurm] 
p.use.stable.mask

sys-cluster/slurm has no stable keywords.

Bug: https://bugs.gentoo.org/735772
Signed-off-by: Thomas Deutschmann  gentoo.org>

 profiles/arch/amd64/package.use.stable.mask | 4 
 profiles/arch/x86/package.use.stable.mask   | 4 
 2 files changed, 8 insertions(+)

diff --git a/profiles/arch/amd64/package.use.stable.mask 
b/profiles/arch/amd64/package.use.stable.mask
index da37900362b..8e6132fb9db 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann  (2020-08-05)
+# sys-cluster/slurm has no stable keywords
+app-metrics/collectd collectd_plugins_slurm
+
 # Joonas Niilola  (2020-06-21)
 # sys-apps/apparmor doesn't have stable keywords.
 app-emulation/lxc apparmor

diff --git a/profiles/arch/x86/package.use.stable.mask 
b/profiles/arch/x86/package.use.stable.mask
index 6fd1a4f65f1..23c5bfa1a89 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann  (2020-08-05)
+# sys-cluster/slurm has no stable keywords
+app-metrics/collectd collectd_plugins_slurm
+
 # Andreas Sturmlechner  (2020-01-04)
 # net-libs/libktorrent:5 is not stable anymore, bug #696858
 kde-apps/kget bittorrent



[gentoo-commits] repo/gentoo:master commit in: www-misc/shellinabox/

2020-08-05 Thread Patrice Clement
commit: eae61794b46636c1e3aac5d7bb1542f8c6c895b8
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Aug  5 15:14:40 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Aug  5 15:14:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae61794

www-misc/shellinabox: clean up old.

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Patrice Clement  gentoo.org>

 www-misc/shellinabox/Manifest   |   1 -
 www-misc/shellinabox/shellinabox-2.20-r1.ebuild | 107 ---
 www-misc/shellinabox/shellinabox-2.20-r2.ebuild | 109 
 www-misc/shellinabox/shellinabox-2.20-r3.ebuild | 109 
 4 files changed, 326 deletions(-)

diff --git a/www-misc/shellinabox/Manifest b/www-misc/shellinabox/Manifest
index 6d54fe277e4..5f04dbaa704 100644
--- a/www-misc/shellinabox/Manifest
+++ b/www-misc/shellinabox/Manifest
@@ -1,2 +1 @@
 DIST shellinabox-2.20.tar.gz 745920 BLAKE2B 
34d360d2e4f0474f64490894f4ba9b9457ca7915156fc3364e874c89d9792ec52c8e756d5f356da6f680425fcc4cf9c9025a47d56cb0b0671a2749f0ba90d5b9
 SHA512 
369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237
-DIST shellinabox-2.20.zip 792359 BLAKE2B 
fd6ebde4d9f81314dd439126ad9ed6759556268c4af6dbe2094fb7aaef3956e8c484deb8c3b43a485bc28cf3a2c0105bee0f8b5c2efba1d3d7f0c0b6b3f6867a
 SHA512 
0537b6400cb7f4880c76cce270e5eefd6f536eae7e27b5f7b12de0465a1e354f7980bb2f67230237eda1f7945afb1d3bb18013106bf7c3a02e7974532f0d9190

diff --git a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild 
b/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
deleted file mode 100644
index 0fd76e1f2e6..000
--- a/www-misc/shellinabox/shellinabox-2.20-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="yes"
-AUTOTOOLS_IN_SOURCE_BUILD="yes"
-
-inherit user autotools-utils systemd
-
-DESCRIPTION="Export command line tools to a web based terminal emulator"
-HOMEPAGE="https://github.com/shellinabox/shellinabox;
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+pam"
-
-DEPEND="
-   dev-libs/openssl:0=
-   pam? ( sys-libs/pam )"
-
-SIAB_CERT_DIR="/etc/shellinabox/cert"
-SIAB_SSL_BASH="${SIAB_CERT_DIR}/gen_ssl_cert.bash"
-SIAB_DAEMON="${PN}d"
-
-shellinbox_gen_ssl_setup() {
-   read -r -d '' SIAB_SSL_SETUP << EOF
-cd ${SIAB_CERT_DIR}
-openssl genrsa -des3 -out server.key 1024
-openssl req -new -key server.key -out server.csr
-cp server.key server.key.org
-openssl rsa -in server.key.org -out server.key
-openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
-cat server.crt server.key > certificate.pem
-EOF
-}
-
-pkg_setup() {
-   enewgroup "${SIAB_DAEMON}"
-   enewuser "${SIAB_DAEMON}" -1 -1 -1 "${SIAB_DAEMON}"
-}
-
-src_configure() {
-   local myeconf=(
-   --disable-runtime-loading
-   --enable-ssl
-   )
-
-   econf \
-   $(use_enable pam) \
-   "${myeconf[@]}"
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   # make installs the binary in bin...
-   rm -rf "${D}/usr/bin" || die
-
-   # ... whereas it should put it in sbin.
-   dosbin "${SIAB_DAEMON}"
-
-   # Install init+conf files.
-   newinitd "${FILESDIR}/${SIAB_DAEMON}.init" "${SIAB_DAEMON}"
-   newconfd "${FILESDIR}/${SIAB_DAEMON}.conf" "${SIAB_DAEMON}"
-
-   # Install systemd unit file.
-   systemd_dounit "${FILESDIR}"/shellinaboxd.service
-
-   # Install CSS files.
-   insinto "/usr/share/${PN}-resources"
-   doins -r "${PN}"/*.css
-
-   # Create directory where SSL certificates will be generated.
-   dodir "${SIAB_CERT_DIR}"
-   fowners "${SIAB_DAEMON}:${SIAB_DAEMON}" "${SIAB_CERT_DIR}"
-
-   # Generate set up variable.
-   shellinbox_gen_ssl_setup
-
-   # Dump it in a bash script.
-   echo "#!/usr/bin/env bash" > "${D}/${SIAB_SSL_BASH}" || die
-   echo "${SIAB_SSL_SETUP}" >> "${D}/${SIAB_SSL_BASH}" || die
-   chmod +x "${D}/${SIAB_SSL_BASH}" || die
-}
-
-pkg_postinst() {
-   ewarn
-   ewarn "The default configuration exposes a login shell"
-   ewarn "with SSL disabled on the localhost interface only."
-   ewarn
-
-   shellinbox_gen_ssl_setup
-
-   einfo
-   einfo "To generate self-signed SSL certificates"
-   einfo "please read the procedure explained here:"
-   einfo "https://code.google.com/p/shellinabox/issues/detail?id=59#c15;
-   einfo
-   einfo "${SIAB_SSL_SETUP}"
-   einfo
-   einfo "This walkthrough has been written in ${SIAB_SSL_BASH} for your 
convenience."
-   einfo "Make sure to execute this script."
-   einfo
-}

diff --git 

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

2020-08-05 Thread Michał Górny
commit: 9d574398d6ca6b9dd46c6808e006b57d36e6e2d1
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:07:04 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:07:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d574398

dev-python/configshell-fb: Remove old

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

 dev-python/configshell-fb/Manifest|  1 -
 .../configshell-fb/configshell-fb-1.1.27.ebuild   | 19 ---
 2 files changed, 20 deletions(-)

diff --git a/dev-python/configshell-fb/Manifest 
b/dev-python/configshell-fb/Manifest
index 518fca3eaa6..2e0c19b3316 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,2 +1 @@
-DIST configshell-fb-1.1.27.tar.gz 57174 BLAKE2B 
4f1f4dd6b641fc5843956b3d88f43456f326af16799b770b1224ba029903fb6bfb291101ae780f48fa126c9e5482b95e5e545121a11afc9d8535dd23be3445c1
 SHA512 
53d81b939f393f88141f2c158295a5297850e2a908b6124d085b2ae185a2093b877bffb0536a195b2743057bbd3131c75daeb90a4b83b6305baa89463e30c685
 DIST configshell-fb-1.1.28.tar.gz 55076 BLAKE2B 
8f7ab1b6172412dffd77d1ba89082f815b90167b5bc7e15c26c26a101e2e8a0ab5bc716c040f41124a9d5a5038b751e4cd882124d70fe2fda2b796ef43dc97c8
 SHA512 
7d05fdfca5646ec05d5f4b2ea499235237f5f3157c1330ed46dcc76ce8dea5cca0e3ec4d4376db2ec8358438737fb54286cb0c712c0f16637128670d2858dd4d

diff --git a/dev-python/configshell-fb/configshell-fb-1.1.27.ebuild 
b/dev-python/configshell-fb/configshell-fb-1.1.27.ebuild
deleted file mode 100644
index 54877c40994..000
--- a/dev-python/configshell-fb/configshell-fb-1.1.27.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/urwid[${PYTHON_USEDEP}]"



[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfwm4/

2020-08-05 Thread Michał Górny
commit: a849c6a7ffa9a36e0f6f67caed223803e8fb3622
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:06:26 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:06:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a849c6a7

xfce-base/xfwm4: Remove old

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

 xfce-base/xfwm4/Manifest   |  1 -
 xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild | 69 --
 2 files changed, 70 deletions(-)

diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index e92693d811a..9c36abe533c 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,4 +1,3 @@
-DIST xfwm4-4.14.0.tar.bz2 1122735 BLAKE2B 
1865c0714ddd4107e806de5607ef0e260c3fd1b6c9abcbec112a126bf780f456873786595a4cb924ce2154a40868670699519e4bb4576d971f853f7d3f63e98c
 SHA512 
27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939
 DIST xfwm4-4.14.2.tar.bz2 1158799 BLAKE2B 
87270997688a44e1476935f2158842999befebf18628f6cd92131d81beac2f0a91db0a6522f86340688285fd67cf48e94259bdb2e4ce8df567eba83319bb31e3
 SHA512 
9e28f7782ce6c1734f9a50efec75d4c03a193bf078fd29f42c11770cef134c4516c256cb9c4b92a71fca81f37ba0ce19477831bb1da858c839135005b8f2
 DIST xfwm4-4.14.3.tar.bz2 1164653 BLAKE2B 
24db309df708164bd0554fb96499205b4f1437023c014d571ba86f7419e09e23ffdacbf31d3afd05b7bd4f4e8e88394cfe34ec233518078b88eb8c0c640b8af7
 SHA512 
eb27c9d540a4b1d773f31c16dd8e7e4cd8fb833514ecc62251c68b53e88440beccb4923c49c66a29b387c77e2e69cb36e83d0a3d457ef8e7fdd5d2b925fdfda6
 DIST xfwm4-4.14.4.tar.bz2 1164972 BLAKE2B 
5bdf4837bd19708c975d6400750059c5182b9d1b1a0b7b30e8721e1c443d9f78c1ea1c868ad7ceb384e442b94139b89d50327dc6413e938348816a311cada2b2
 SHA512 
ca3c94d1835076b904aca9f531dccebd9d78a1c85e0f7af7ac7aaba1a067e0f11f5224bdc20dc233038dc752ae1ac85602608c168a4d91643ac7538b448c04bf

diff --git a/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild 
b/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
deleted file mode 100644
index d7d6669f20a..000
--- a/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/;
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND=">=dev-libs/glib-2.20
-   >=x11-libs/gtk+-3.20:3
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXrender
-   x11-libs/pango
-   >=x11-libs/libwnck-3.14:3
-   >=xfce-base/libxfce4util-4.10:=
-   >=xfce-base/libxfce4ui-4.12:=
-   >=xfce-base/xfconf-4.13:=
-   opengl? ( media-libs/libepoxy:=[X(+)] )
-   startup-notification? ( x11-libs/startup-notification )
-   xpresent? ( x11-libs/libXpresent )
-   xcomposite? (
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   )"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   sys-devel/gettext
-   x11-libs/libICE
-   x11-libs/libSM
-   xfce-base/exo
-   virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-   local myconf=(
-   $(use_enable opengl epoxy)
-   $(use_enable startup-notification)
-   --enable-xsync
-   --enable-render
-   --enable-randr
-   $(use_enable xpresent)
-   $(use_enable xcomposite compositor)
-   )
-
-   econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}



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

2020-08-05 Thread Michał Górny
commit: dabad89499b7ba357f023ad11b974e3831e82ca6
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:08:22 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:08:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabad894

dev-python/psycopg: Remove old

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

 dev-python/psycopg/Manifest |  1 -
 dev-python/psycopg/psycopg-2.8.4.ebuild | 82 -
 2 files changed, 83 deletions(-)

diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 93ad4779f79..4c2172a1c62 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,3 +1,2 @@
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B 
bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f
 SHA512 
032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
-DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 
6d25a96d6fb45cc450b20fb570741538c2870e0ab205b9aab1018d4ef716bfba129235a422f2a0dfd182162bff948db8a2e4d23cd57dc01971f2e6f734ebf90e
 SHA512 
d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 
843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e
 SHA512 
d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e

diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild 
b/dev-python/psycopg/psycopg-2.8.4.ebuild
deleted file mode 100644
index 15c005f09ae..000
--- a/dev-python/psycopg/psycopg-2.8.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/;
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}
-   doc? (
-   >=dev-python/pygments-2.2[${PYTHON_USEDEP}]
-   >=dev-python/sphinx-1.6
-   )"
-
-# Avoid using mxdatetime: https://bugs.gentoo.org/452028
-PATCHES=(
-   "${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
-)
-
-python_compile() {
-   local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-
-   ! python_is_python3 && append-flags -fno-strict-aliasing
-
-   distutils-r1_python_compile
-}
-
-python_prepare_all() {
-   if use debug; then
-   sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-   fi
-
-   distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-   use doc && emake -C doc/src -j1 html text
-}
-
-src_test() {
-   initdb -D "${T}"/pgsql || die
-   # TODO: random port
-   pg_ctl -w -D "${T}"/pgsql start \
-   -o "-h '' -k '${T}'" || die
-   createdb -h "${T}" psycopg2_test || die
-
-   local -x PSYCOPG2_TESTDB_HOST="${T}"
-   distutils-r1_src_test
-
-   pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-   "${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-   if use doc; then
-   dodoc -r doc/src/_build/html
-   dodoc doc/src/_build/text/*
-   fi
-
-   distutils-r1_python_install_all
-}



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

2020-08-05 Thread Michał Górny
commit: 21a7167f8babba5b5e7a7396a4a3acd8b7111328
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:09:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:09:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a7167f

dev-python/pynacl: Remove old

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

 dev-python/pynacl/Manifest|  2 --
 dev-python/pynacl/pynacl-1.2.1.ebuild | 39 ---
 dev-python/pynacl/pynacl-1.3.0.ebuild | 36 
 3 files changed, 77 deletions(-)

diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 3676176d5df..443a16ab549 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,3 +1 @@
-DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 
96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925
 SHA512 
15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
-DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B 
e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1
 SHA512 
815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 
9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343
 SHA512 
2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88

diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild 
b/dev-python/pynacl/pynacl-1.2.1.ebuild
deleted file mode 100644
index 9c06b3ad7e2..000
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/;
-SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-python/six[${PYTHON_USEDEP}]
-   >=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-   dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
-   >=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-   # For not using the bundled libsodium
-   export SODIUM_INSTALL=system
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   py.test -v || die "Tests failed under ${EPYTHON}"
-}

diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild 
b/dev-python/pynacl/pynacl-1.3.0.ebuild
deleted file mode 100644
index dfc8f7da7cd..000
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/;
-SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux"
-
-RDEPEND="
-   dev-python/six[${PYTHON_USEDEP}]
-   >=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-   dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${P}-hypothesis-4.patch" )
-
-src_prepare() {
-   # For not using the bundled libsodium
-   export SODIUM_INSTALL=system
-   distutils-r1_python_prepare_all
-}



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

2020-08-05 Thread Michał Górny
commit: 71b4302a15da0290f8de4728a77b7d240dc7c127
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:09:30 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:09:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b4302a

dev-python/pykerberos: Remove old

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

 dev-python/pykerberos/Manifest|  1 -
 dev-python/pykerberos/pykerberos-1.2.1.ebuild | 21 -
 2 files changed, 22 deletions(-)

diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 5e9369c1a85..9e987e39807 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,2 +1 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 
5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5
 SHA512 
ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
-DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 
5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0
 SHA512 
048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f

diff --git a/dev-python/pykerberos/pykerberos-1.2.1.ebuild 
b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
deleted file mode 100644
index ce8ce457faa..000
--- a/dev-python/pykerberos/pykerberos-1.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-   app-crypt/mit-krb5
-   dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"



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

2020-08-05 Thread Michał Górny
commit: 0e2c91e7f75bc0e27bd80ae6c557c430763f9882
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:07:44 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:07:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2c91e7

dev-python/locket: Remove old

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

 dev-python/locket/Manifest|  1 -
 dev-python/locket/locket-0.2.0.ebuild | 18 --
 2 files changed, 19 deletions(-)

diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index ac79a63de3a..e2eebd981c7 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,2 +1 @@
-DIST locket-0.2.0.tar.gz 3506 BLAKE2B 
10f5c325036b5c0880c2b0261de180ee9d046ac346a64612d680170fad8664bcbd681954384bb6b9c4f812059b4418c618ee44f638ac6fc1c35b62786afe555c
 SHA512 
ed9bb25f3fcaa70386217716db5612bf31a923c669cbdb8e871de6df4c0c42bf3309604a1aac804c0f334aed8c88b0ba113d8d265054c0e87793c7b53f729ff9
 DIST locket.py-0.2.0.gh.tar.gz 5598 BLAKE2B 
9b8a1b3d4c3fed3e9ab8f37a1e7bd9d0aa65e618985368691802b1b66d0dbdeb7a1635ff72efec8a7351ce31ffc00413d5ee388e520057bf181a18a39ef46f0a
 SHA512 
e5e5d34daf5c36b0ac4871ce0dec50c67b504be16755e38d7721e40c4f2c385c022c305ac1a9bd641ba9eaf45a2693a4a77b6fa6e95d6ae5ab34947e4ac30393

diff --git a/dev-python/locket/locket-0.2.0.ebuild 
b/dev-python/locket/locket-0.2.0.ebuild
deleted file mode 100644
index 32d1cdefc99..000
--- a/dev-python/locket/locket-0.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="File-based locks for Python"
-HOMEPAGE="https://github.com/mwilliamson/locket.py;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"



[gentoo-commits] repo/gentoo:master commit in: dev-python/docker-py/, dev-python/docker-py/files/

2020-08-05 Thread Michał Górny
commit: 3017df87274e91b0919ad8ebaaf757c556db960e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:07:17 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:07:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3017df87

dev-python/docker-py: Remove old

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

 dev-python/docker-py/Manifest  |  1 -
 dev-python/docker-py/docker-py-4.2.0-r1.ebuild | 52 ---
 .../files/docker-py-4.2.0-fix_splitnport.patch | 59 --
 3 files changed, 112 deletions(-)

diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 10b9b4e65f5..bad92bb3a39 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,3 +1,2 @@
-DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 
385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80
 SHA512 
df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
 DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 
4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94
 SHA512 
46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f
 DIST docker-py-4.2.2.tar.gz 234729 BLAKE2B 
06ebe27582ab6a8a61fdf655d01b01495724e03178c2b8291d38425f2678a3d1f826a836a5926ccf65b07c232fba38251cf8f0b1c644334d1b7611adb9d49e84
 SHA512 
d81f5a6d1cc15dd6d65e65c9e4f24fcae172ce41c8244e13c99adaad8627c9f0eece923d66108951b5e9aaa134e668f317481684b3c2bd51802321d1c4adbab1

diff --git a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild 
b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
deleted file mode 100644
index b730b40c98f..000
--- a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py;
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   !~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-   >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-   >=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-   test? (
-   ${RDEPEND}
-   >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-   >=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
-   >=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fix_splitnport.patch
-)
-
-distutils_enable_sphinx docs \
-   'dev-python/recommonmark' \
-   '>=dev-python/sphinx-1.4.6'
-
-src_prepare() {
-   # localhost has a better chance of being in /etc/hosts
-   sed -e 's:socket[.]gethostname():"localhost":' \
-   -i tests/unit/api_test.py || die
-
-   distutils-r1_src_prepare
-}
-
-python_test() {
-   pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
-}

diff --git a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch 
b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
deleted file mode 100644
index 6eda63459dd..000
--- a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/docker/utils/utils.py b/docker/utils/utils.py
-index 447760b..3996d08 100644
 a/docker/utils/utils.py
-+++ b/docker/utils/utils.py
-@@ -17,10 +17,9 @@ from ..constants import DEFAULT_NPIPE
- from ..constants import BYTE_UNITS
- 
- if six.PY2:
--from urllib import splitnport
- from urlparse import urlparse
- else:
--from urllib.parse import splitnport, urlparse
-+from urllib.parse import urlparse
- 
- 
- def create_ipam_pool(*args, **kwargs):
-@@ -278,7 +277,7 @@ def parse_host(addr, is_win32=False, tls=False):
- if proto != 'ssh':
- raise errors.DockerException(
- 'Invalid bind address format: port is required:'
--' {}'.format(addr)
-+' {}://{}'.format(proto, addr)
- )
- port = 22
- 
-@@ -295,6 +294,33 @@ def parse_host(addr, is_win32=False, tls=False):
- return "{}://{}".format(proto, path).rstrip('/')
- return '{0}://{1}:{2}{3}'.format(proto, host, port, path).rstrip('/')
- 
-+def splitnport(netloc):
-+import re
-+
-+host_port_re1 = re.compile(r"^(.*):([0-9]*)$", re.DOTALL)
-+host_port_re2 = re.compile(r"^(.*)$", re.DOTALL)
-+
-+host = None
-+port = None
-+
-+

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

2020-08-05 Thread Michał Górny
commit: 7f46abd92c6e471a761aa6bfea4075a4eea545f7
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:06:08 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:06:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f46abd9

app-arch/xarchiver: Remove old

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

 app-arch/xarchiver/Manifest  |  1 -
 app-arch/xarchiver/xarchiver-0.5.4.14.ebuild | 62 
 2 files changed, 63 deletions(-)

diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 3dff7cce876..5712d2568a3 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,2 +1 @@
-DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 
591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4
 SHA512 
b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 
6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb
 SHA512 
e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f

diff --git a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild 
b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
deleted file mode 100644
index cd24f94b4a0..000
--- a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
-HOMEPAGE="https://github.com/ib/xarchiver;
-SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE="doc"
-
-# older pigz versions have incompatible command-line processing
-# https://bugs.gentoo.org/661464
-RDEPEND=">=dev-libs/glib-2:=
-   x11-libs/gtk+:3=
-   !!

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

2020-08-05 Thread Michał Górny
commit: 6e3e47b2ed8dfca43182be7187ae637e37ee63b4
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:09:22 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:09:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3e47b2

dev-python/pycryptodome: Remove old

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

 dev-python/pycryptodome/Manifest  |  1 -
 dev-python/pycryptodome/pycryptodome-3.9.7.ebuild | 41 ---
 2 files changed, 42 deletions(-)

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index bc49c635b42..ddeadc268fc 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B 
dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1
 SHA512 
2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
 DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 
8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12
 SHA512 
894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c

diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild 
b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
deleted file mode 100644
index fc32975c8f9..000
--- a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org 
https://github.com/Legrandin/pycryptodome 
https://pypi.org/project/pycryptodome/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-   virtual/python-cffi[${PYTHON_USEDEP}]
-   !dev-python/pycrypto"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-   # parallel make fixes
-   #  Multiple targets were compiling the same file, setuptools doesn't
-   #  understand this and you get race conditions where a file gets
-   #  overwritten while it's linking. This makes the files look like 
separate
-   #  files so this race won't happen
-   ln src/blowfish.c src/blowfish_eks.c || die
-   ln src/mont.c src/mont_math.c || die
-
-   distutils-r1_python_prepare_all
-}



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

2020-08-05 Thread Michał Górny
commit: 192d356d4aa8282e144e7daa492d403b2fab224e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:05:56 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:05:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192d356d

dev-python/wtforms: Remove old

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

 dev-python/wtforms/Manifest |  1 -
 dev-python/wtforms/wtforms-2.2.1.ebuild | 48 -
 2 files changed, 49 deletions(-)

diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index 84ad9c946c5..1f09bb51f24 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,2 @@
-DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B 
bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2
 SHA512 
06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
 DIST WTForms-2.3.1.tar.gz 162773 BLAKE2B 
b51b5cb26c550a2502c8c70c1de91c7e6e320f60e2df3ab2b9a5cd755dbbb753d8d2fa05837657aa639929b380e8c65fd25182192538ccef837cae0869b19c80
 SHA512 
40b810d2d0ce6d2e7880615fb5c3b3e55cfade8e352be5d626d0de16f00a9ef4626ffa106b67d0cbef15e42513073db52ba1ceb04cb18146bba0ba9c26236fdd
 DIST WTForms-2.3.3.tar.gz 162945 BLAKE2B 
5f9f2c920ffc784c34d69f42cd259c1cb6007edbc99028bede98b7c3e24b8ba616b89eceac241cc9b20b241e758ee0c88a9c6736597ddc83c90542135a004fec
 SHA512 
934cf1483beec37d698d13a81e44a733d082baad1f418d3087306fd908df809d37fffe000ed1ecabf65d2c31b57034bf6f25c3b77cfc5598ae1f65bf4a115fe5

diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild 
b/dev-python/wtforms/wtforms-2.2.1.ebuild
deleted file mode 100644
index 456dd7d33ee..000
--- a/dev-python/wtforms/wtforms-2.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-inherit distutils-r1
-
-MY_PN="WTForms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flexible forms validation and rendering library for python web 
development"
-HOMEPAGE="https://wtforms.readthedocs.io/;
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-BDEPEND="
-   test? (
-   dev-python/Babel[${PYTHON_USEDEP}]
-   dev-python/python-dateutil[${PYTHON_USEDEP}]
-   dev-python/sqlalchemy[${PYTHON_USEDEP}]
-   dev-python/webob[${PYTHON_USEDEP}]
-   )
-"
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-   # Extension-tests are written for an older version of Django
-   # Disable pep8 even when it is installed
-   sed \
-   -e "s|'ext_django.tests', ||" \
-   -e "/import pep8/d" \
-   -e "s|has_pep8 = True|has_pep8 = False|" \
-   -i tests/runtests.py || die
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   "${EPYTHON}" tests/runtests.py -v || die
-}



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

2020-08-05 Thread Michał Górny
commit: a220dc897c6b1e10a960878bb6424fe082296cf0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:09:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:09:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a220dc89

dev-python/pyopengl_accelerate: Remove old

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

 dev-python/pyopengl_accelerate/Manifest|  1 -
 .../pyopengl_accelerate-3.1.0-r1.ebuild| 29 --
 2 files changed, 30 deletions(-)

diff --git a/dev-python/pyopengl_accelerate/Manifest 
b/dev-python/pyopengl_accelerate/Manifest
index 2b1cc96ad2c..c4a07056dba 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,2 +1 @@
-DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 
01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e
 SHA512 
2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
 DIST pyopengl-3.1.5.gh.tar.gz 3287132 BLAKE2B 
a1d683715f4a57c0374cac827e7bd9c93ca303ac578f50a71edff983c6bf3c32858be454bf6ac00f757c52a0adc3b7df7f03181abf69304ed3621d168f2166d8
 SHA512 
66a6e07b4cee4d80d5b01cd6a506b54995e499611979f8a02fef76d95d6178fe9644fa4ad794812599be0aad293424be980f4a9d47480983503e09887250560d

diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild 
b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
deleted file mode 100644
index 65fad24ae3f..000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="http://pyopengl.sourceforge.net/ 
https://pypi.org/project/PyOpenGL-accelerate/;
-MY_PN="PyOpenGL-accelerate"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   sed -e 's:>exc_:>curexc_:g' -i src/*.c || die "sed failed" # bug 691520
-   default
-}



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

2020-08-05 Thread Michał Górny
commit: 1592383e77f18b5259efc714c8cfb4c3a9b94a09
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:08:14 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:08:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1592383e

dev-python/nbsphinx: Remove old

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

 dev-python/nbsphinx/Manifest  |  1 -
 dev-python/nbsphinx/nbsphinx-0.4.1.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index dc9da811c40..98cb343c6d8 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,2 +1 @@
-DIST nbsphinx-0.4.1.tar.gz 108928 BLAKE2B 
449ba009003c1de52057d558039255f80efc2d6979926bbe8757faf21139bdf6f0e7e96280f63ffcc0436f45d83efeb525bca0139018f345025b8dd25202bc12
 SHA512 
5c37d8cb48c82aa9ae865a27650aaa037cde2c06140672ae1245fd3ceafa3d40b0ccbc37ac67bd1688b228107b97d84fb8eced783d71f79f8da7505883cf2617
 DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 
635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5
 SHA512 
af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c

diff --git a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild 
b/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
deleted file mode 100644
index f469dc231b4..000
--- a/dev-python/nbsphinx/nbsphinx-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-   dev-python/docutils[${PYTHON_USEDEP}]
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/nbconvert[${PYTHON_USEDEP}]
-   dev-python/nbformat[${PYTHON_USEDEP}]
-   >=dev-python/sphinx-1.3.2[${PYTHON_USEDEP}]
-   dev-python/traitlets[${PYTHON_USEDEP}]
-   "
-DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-eyes-plugin/

2020-08-05 Thread Michał Górny
commit: fa88c1aa45d07fb962a7d62aef5c8080b787d723
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:06:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:06:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa88c1aa

xfce-extra/xfce4-eyes-plugin: Remove old

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

 xfce-extra/xfce4-eyes-plugin/Manifest  |  1 -
 .../xfce4-eyes-plugin-4.5.0.ebuild | 36 --
 2 files changed, 37 deletions(-)

diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest 
b/xfce-extra/xfce4-eyes-plugin/Manifest
index f0772a612a7..2c797f9a043 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-eyes-plugin-4.5.0.tar.bz2 366460 BLAKE2B 
4f773eb44d622a0a232c9881cf601c0b7ce01f33c9d76091b9f896fee4df76381c558b0f0bc62d720aba35fb2064cb49ed61b8c6992be71b4afb2edf3a21e9e0
 SHA512 
884f409bda74688ccf3426cc139235daf709d1eabe884db80ecaa5300814308f8ddcf205af7fa2a48cef7d08c03b1f5778e3aedc2f08e15ce22d13066775c771
 DIST xfce4-eyes-plugin-4.5.1.tar.bz2 367404 BLAKE2B 
5db449ac12e130d837df293c634c9ac17dc8681e940441640af3b9ef26baa8812c8bb4529ff6b56fe32589111e3c578e78d9c1cd46aadb007a0075e22375f952
 SHA512 
1de072b03720772adb41e6a6d0a72e8c6524c7c5e299c951d89739b7de3876582e8acf31f4896191d796c34f5abd98da37c363b84a1e24addc4fa42e553ba37a

diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.5.0.ebuild 
b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.5.0.ebuild
deleted file mode 100644
index 7aa894a3341..000
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin;
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.20
-   >=x11-libs/gtk+-3.16:3
-   >=xfce-base/libxfce4ui-4.12:=
-   >=xfce-base/xfce4-panel-4.12:="
-DEPEND="${RDEPEND}
-   dev-util/intltool
-   virtual/pkgconfig"
-
-src_install() {
-   default
-   find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-}



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

2020-08-05 Thread Michał Górny
commit: c8517d3b9ccb2d0706dac2bef2227a82f2d8c583
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:09:09 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:09:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8517d3b

dev-python/pyaudio: Remove old

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

 dev-python/pyaudio/pyaudio-0.2.11.ebuild | 36 
 1 file changed, 36 deletions(-)

diff --git a/dev-python/pyaudio/pyaudio-0.2.11.ebuild 
b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
deleted file mode 100644
index 248a4891ebc..000
--- a/dev-python/pyaudio/pyaudio-0.2.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_PN="PyAudio"
-
-DESCRIPTION="Python bindings for PortAudio"
-HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/;
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="media-libs/portaudio"
-DEPEND="${RDEPEND}
-   doc? ( dev-python/sphinx )"
-
-S=${WORKDIR}/PyAudio-${PV}
-
-src_compile() {
-   distutils-r1_src_compile
-   use doc && emake docs
-}
-
-python_install_all() {
-   use doc && local HTML_DOCS=( docs/. )
-   distutils-r1_python_install_all
-}



[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-alsa-plugin/

2020-08-05 Thread Michał Górny
commit: b714c3c74b801902b8b8de14e7935eab24ca6f09
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:06:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:06:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b714c3c7

xfce-extra/xfce4-alsa-plugin: Remove old

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

 xfce-extra/xfce4-alsa-plugin/Manifest  |  1 -
 .../xfce4-alsa-plugin-0.2.1.ebuild | 37 --
 2 files changed, 38 deletions(-)

diff --git a/xfce-extra/xfce4-alsa-plugin/Manifest 
b/xfce-extra/xfce4-alsa-plugin/Manifest
index badc6091e13..f4e3988ce88 100644
--- a/xfce-extra/xfce4-alsa-plugin/Manifest
+++ b/xfce-extra/xfce4-alsa-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-alsa-plugin-0.2.1.tar.gz 29375 BLAKE2B 
1bb13203af1c21c472531ecddd4d65b84c5610893a434440585c1e51e2e717cd8642874e7ea784b2c5ae7e0c9203dfa9104e95485045f5749e77ea2d4d56c8a2
 SHA512 
d04ca015d33bd068cbd45d200181239f1b1ecc2fc7723ed8d4566fe28a8b6b28e916e2c484ef535cbabcfb81813ffc46f5fa2b1f8535fde2f4cd719cc0f65e27
 DIST xfce4-alsa-plugin-0.3.0.tar.gz 28277 BLAKE2B 
e821276a80a4fbb245a21b53e16fd85bf0de9010ba848329639b2f8ea00fb85288b2799a1ea97eb6004963c6915fc4cf8ec8ea9c5b87c3cc8dc1a482a7e52d9d
 SHA512 
ed6a99ddf5fb1d3bef5b0741c94127ac48d6b2bd0bfc5ace9416302f6780692ed21e5f0ccff4758b915aefc2288fbf2b7e6671ee6cb26e4e57c44a6409dda08f

diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild 
b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild
deleted file mode 100644
index 17f8e414f13..000
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vala meson
-
-DESCRIPTION="Simple ALSA volume control for xfce4-panel"
-HOMEPAGE="https://github.com/equeim/xfce4-alsa-plugin;
-SRC_URI="https://github.com/equeim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-   media-libs/alsa-lib
-   >=xfce-base/xfce4-panel-4.13
-   x11-libs/gtk+:3[introspection]
-"
-DEPEND="${RDEPEND}
-   $(vala_depend)
-   sys-devel/gettext
-"
-
-src_prepare() {
-   vala_src_prepare
-   eapply_user
-}
-
-src_configure() {
-   local emesonargs=(
-   -Dgtk3=true
-   )
-   meson_src_configure
-}



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

2020-08-05 Thread Michał Górny
commit: de0856cf4a4b38ec86cd7fe4a4b52ae2b5b2a20e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Aug  5 15:02:56 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Aug  5 15:03:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0856cf

dev-python/hypothesis: Remove old

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

 dev-python/hypothesis/Manifest  | 11 -
 dev-python/hypothesis/hypothesis-5.16.0.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.19.0.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.19.1.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.19.2.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.20.2.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.20.3.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.23.1.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.23.11.ebuild | 56 -
 dev-python/hypothesis/hypothesis-5.23.3.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.23.7.ebuild  | 56 -
 dev-python/hypothesis/hypothesis-5.23.8.ebuild  | 56 -
 12 files changed, 627 deletions(-)

diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7eb4d6eea18..f06525b0f2e 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,16 +1,5 @@
 DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B 
f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0
 SHA512 
8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 
3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991
 SHA512 
28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.16.0.tar.gz 9011031 BLAKE2B 
65659f72094ac7fcc82c7e5a8b88c0156345530742412f13398dc72ce50d2466fa9b04b5cf4a79e87916aae770f2a89aa880d1d238890c7f8c8483c4c5068bcb
 SHA512 
66366c172aaed84f1fb5fe0cef4e0fccfa4f65c31a94d52cf3a49b44b535f8366e71974f2aaa7b39d1d1b4171fd92cbfe4bbbac8ec4b9c4ccd2b0e5d15976d26
 DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B 
d74a68c4ee1e5aacf4be1da5a4656011b0a15f990106c21298101d36e9a097c5dfd165987ad90a45f3a0b74375c4da609cd750f618242b94f34e03b6de0ee866
 SHA512 
912d984995d4ad8f06e98eb2cc327629328990fc1c072527ce261b637e16622acaf4d0d93928f9dd2d6601ab78f69aa6cf129d5cd7c1c00e50754ebc06957df0
-DIST hypothesis-python-5.19.0.tar.gz 9022213 BLAKE2B 
d8996cfd18d24722cd4faaf8335ce2b1c67757e3ffe973a33bd8ad087fcde513442d9fdf01f486ee07b33504e4088aa9e4c104782c3b03aa4f0d77a99ba6f672
 SHA512 
c26b0c9c5c7e1941c7f491e8e8165fda86a6e985204b9098c214080e508167f77f7dffe65192a4418f4958c3c6df44a20d75131895517c40c1113995ace3b604
-DIST hypothesis-python-5.19.1.tar.gz 9023768 BLAKE2B 
d1aa7c7a537e9f4ac0f33c12fa0c8269917aa83c01b8e333492d22ac8642ea29f678ca94d6f3d6c45efce7a2fd178d7cab6bcdfefef57c19e84c559a9affd8bd
 SHA512 
81397f64f79debcea05f343f7c8c7cb528231be0bea15f0c6b81e3f68278eff6d73fa09a2f85a798c58468087b6135fea21530402a8fb9bd8014c040ad54a8c4
-DIST hypothesis-python-5.19.2.tar.gz 9023874 BLAKE2B 
e4c713a574547eccfd9d9fc36c2ef192795922c7fc97eb8a59a61506d2d89101a02e0f81fda3d703aac03ed4dc902f47f07ea50375efbc5b1ae7c24f7ea3f058
 SHA512 
f0a55e8039666dc664760483e6a6cae3371b627912f89215c76430d71bfc80426beef3001dd7415686d75387ceb1a0810068fded11ec728d20f81936bd0b9717
-DIST hypothesis-python-5.20.2.tar.gz 9024252 BLAKE2B 
91fc3c24e00301c2df16ca408f1efce512753bd8ea37ae912d4a10be455b42b830a72659394a88749d261cda08f5519c2cc455339094c025d5cb9e9ffede654e
 SHA512 
8819cf3cce70a16d5e551d38ac54cd27a9649a775416d01452694a86dc40c840ace5d8edda6aed5680a98908e6266fbe6dcc4e6d6d9d3bceb8417d341e3e7a07
-DIST hypothesis-python-5.20.3.tar.gz 9024258 BLAKE2B 
75bc1e868061be9c8d0377143f5f45221e182eef54c93aa0445dac1b087c35472af6a32d7b6ee8d69bfb9ed16a14927e8572f98b7b3d02fbd880d979b54b862b
 SHA512 
2b8819c425f607e300ad569115cc72b3ab45026a4d82b7f52a66fc60fe92d392a4ca0dac3260969409006958a81e69fbaac1b4612bfa6236e27f4d8f996acb89
 DIST hypothesis-python-5.21.0.tar.gz 9025422 BLAKE2B 
acd6f3b0f945ae65656af2a718add06fe440e221fda7793e3557ab194ccee4c6327e7946a58ce51e9efe3c08274888a648d9021c49fdcf663a04c28b99a0f636
 SHA512 
1921e5ea8d0f2a6e55d80611004d35671f7a7a02cb8a8f101b45e64e4ef23f9c2c8a9c467fb6c9f33ae440622020e1ad504f51a7d725a6449ca715ad1f373e40
-DIST hypothesis-python-5.23.1.tar.gz 9031807 BLAKE2B 
00c54296f83bdcd41ac63b36a29dc9e542a236406609b9b800912a209d56c4169f2d4b1c139697ffe38eff6cd886cd4a2491f3b4b5294cc710aedb70f5905436
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2020-08-05 Thread Thomas Deutschmann
commit: 54fe5e50b32cef353120e069787707859e1b7d02
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 15:01:22 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 15:01:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fe5e50

sys-kernel/gentoo-sources: Linux patch 4.14.192

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

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-4.14.192.ebuild  | 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index a45b8fee6c9..d7d96dd143d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,9 @@ DIST genpatches-4.14-200.extras.tar.xz 17528 BLAKE2B 
2ba5b662b0c1e48f5df63f7bada
 DIST genpatches-4.14-201.base.tar.xz 4414260 BLAKE2B 
5a1f01d572c2d202bc1ae8fb1cb3510abc58cb72b6e84fb41193a2416e2b3e6132d8aedf8e1369aee074ddd7eb4b4c3b625ac694ea163c87c1b2648a443b75b3
 SHA512 
40e6a6bcf79261b1dd2aa68e7afef88f46d0813c53d8cf3af74059202ced19024e943f1c3e1fe0b78cb8babcb0401543ac815e04c0c502ae8c226dd199dcc1f6
 DIST genpatches-4.14-201.experimental.tar.xz 6092 BLAKE2B 
d5c600c41ab13c9bb96d11175ed2198ab34a1660c6077cad43c620657ca52b176d5ba11a728f592a2cc446428a6a16f139dd7e77aceb6d16a903a2a1a400d79b
 SHA512 
f84d101933957e9e4ebdca6f123772b0048350fbf7bfc4c5ae6842246b552dd5bbdff3b032056adb2866c06596c863e3292b16c26b37b2bf20366eeaaf89af59
 DIST genpatches-4.14-201.extras.tar.xz 17532 BLAKE2B 
a0aad64c11f2473f5f33626fe685eb173d436ade212ed7c24c31026cbcd4672a92979aa51526cf9f1fed1d0e1980a79be644adf9b3a45475634063fb28c76a67
 SHA512 
b632a7f85a9b5458166ce4aacf07cc3295ec494099fddb8eefa15725e5882fc57184cdeea8553c1b94ef63e958807cd7e6a34a207e5f3baa320f1b8d9b3a2eae
+DIST genpatches-4.14-202.base.tar.xz 4422868 BLAKE2B 
e69e4a9de4303e45d605be5171ef4b5798b31d5c712484110f6c6f19b19bc9bdde38e08e83464284e70bfc57100a37038d1c506f87376fae49abd70a2f982fcf
 SHA512 
6070a3168bc7688bd84ce663d569009a3dab3447355d39c04e4f689f28181cc165868feaae77c29dc947171484d6c74a4bbb0f75a40882f95f866fadfc205145
+DIST genpatches-4.14-202.experimental.tar.xz 6092 BLAKE2B 
97747fac5a3cacf39806ec0dd679ccddc6f9ffd7f7065ba3c1c18eb91cea524e4516a6da272a560fa805ef62f00570c0ff921ecf200407018be16624212f
 SHA512 
7220f2601ce32363ec9182639062253ad26df4a43dfb08529abec6f88743c8671ad55bb1215b0bdd5106e74431064028dee4d40c5ec07295c3479b2e4a308500
+DIST genpatches-4.14-202.extras.tar.xz 17528 BLAKE2B 
5b5768145766f88933538d40e536de74c7a7587a2a008885701864dfa9d98496180a5b0a0d0186339c983d64a67f32895821f4ad7c3714ad795ca570747e228f
 SHA512 
af0f88529f43aecefeb031abf1159e169387298a2d921eef614900eaa128419077cdb3d1e8a0dde241c0c8502a7d6ae25494e710a3a3e9127d74a441486de4e5
 DIST genpatches-4.19-119.base.tar.xz 3427592 BLAKE2B 
162b414b2480bf6f2c380680b2a27fb14aa9a715e07d0af2a45433e8b20dc48c3c317c308d082d328c7312cd707adb528dcc88a0515942e4c794adf63ae916e9
 SHA512 
ca403e6cc5037ca4c8b25c53b0f5a60f6a006f0d7486ff32cb7e7e634a3ef34883ee96ec5049825a0c07111fcc7561e172f95c4cdbf5fb7d21c1e986081a9593
 DIST genpatches-4.19-119.experimental.tar.xz 6424 BLAKE2B 
52329f89b354a12cffa0eb0fa35f237b9ae1b2bf81e0ecce3a90331bbbee7e1c4b41161286952c84ba64ca54235aa134dffd09ecf164eda3fdb7f0e000a35f32
 SHA512 
3db0a42d06fbee6e0a6f1afa50c48e42cd4c43365f91a800a4f99a9444db2b5030a5c367ea09409efa8d7f14494c6b8eefec47d2e8a8e14f52da040d26bce845
 DIST genpatches-4.19-119.extras.tar.xz 17508 BLAKE2B 
fd7ac78c365d496e3a3ef6584c2690205fe6ade564ef1c6104d9995943f32e3669d8f1bc7403792f2570db01c7afbe205e343a863a391489725cd7a82c1d1295
 SHA512 
153134a2f1a684a185efa3effc5e254857b79e5a07a06cbc5ae43f7d852d51fb4e920c6fd020d8eeb88a7b863d09679a90df28ce5d0c39bd77f055109824a3f4

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.192.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-4.14.192.ebuild
new file mode 100644
index 000..68750240fb2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.192.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="202"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches;
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] proj/linux-patches: New tag: 4.14-202

2020-08-05 Thread Thomas Deutschmann
commit: 
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:58:21 2020 +

New tag: 4.14-202




[gentoo-commits] proj/linux-patches:4.14 commit in: /

2020-08-05 Thread Thomas Deutschmann
commit: bd6577cda5271fe9e525c3408f74d51aa6be8454
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:57:43 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:57:43 2020 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=bd6577cd

Linux patch 4.14.192

Signed-off-by: Thomas Deutschmann  gentoo.org>

 _README   |4 +
 1191_linux-4.14.192.patch | 1244 +
 2 files changed, 1248 insertions(+)

diff --git a/_README b/_README
index a0f0dc8..c4718ce 100644
--- a/_README
+++ b/_README
@@ -807,6 +807,10 @@ Patch:  1190_linux-4.14.191.patch
 From:   https://www.kernel.org
 Desc:   Linux 4.14.191
 
+Patch:  1191_linux-4.14.192.patch
+From:   https://www.kernel.org
+Desc:   Linux 4.14.192
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1191_linux-4.14.192.patch b/1191_linux-4.14.192.patch
new file mode 100644
index 000..87bec01
--- /dev/null
+++ b/1191_linux-4.14.192.patch
@@ -0,0 +1,1244 @@
+diff --git a/Makefile b/Makefile
+index e31c1ce12895..60570fad811e 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 4
+ PATCHLEVEL = 14
+-SUBLEVEL = 191
++SUBLEVEL = 192
+ EXTRAVERSION =
+ NAME = Petit Gorille
+ 
+diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
+index af2a7f1e3103..a30f656f791f 100644
+--- a/arch/arm/kernel/hw_breakpoint.c
 b/arch/arm/kernel/hw_breakpoint.c
+@@ -688,6 +688,12 @@ static void disable_single_step(struct perf_event *bp)
+   arch_install_hw_breakpoint(bp);
+ }
+ 
++static int watchpoint_fault_on_uaccess(struct pt_regs *regs,
++ struct arch_hw_breakpoint *info)
++{
++  return !user_mode(regs) && info->ctrl.privilege == ARM_BREAKPOINT_USER;
++}
++
+ static void watchpoint_handler(unsigned long addr, unsigned int fsr,
+  struct pt_regs *regs)
+ {
+@@ -747,16 +753,27 @@ static void watchpoint_handler(unsigned long addr, 
unsigned int fsr,
+   }
+ 
+   pr_debug("watchpoint fired: address = 0x%x\n", info->trigger);
++
++  /*
++   * If we triggered a user watchpoint from a uaccess routine,
++   * then handle the stepping ourselves since userspace really
++   * can't help us with this.
++   */
++  if (watchpoint_fault_on_uaccess(regs, info))
++  goto step;
++
+   perf_bp_event(wp, regs);
+ 
+   /*
+-   * If no overflow handler is present, insert a temporary
+-   * mismatch breakpoint so we can single-step over the
+-   * watchpoint trigger.
++   * Defer stepping to the overflow handler if one is installed.
++   * Otherwise, insert a temporary mismatch breakpoint so that
++   * we can single-step over the watchpoint trigger.
+*/
+-  if (is_default_overflow_handler(wp))
+-  enable_single_step(wp, instruction_pointer(regs));
++  if (!is_default_overflow_handler(wp))
++  goto unlock;
+ 
++step:
++  enable_single_step(wp, instruction_pointer(regs));
+ unlock:
+   rcu_read_unlock();
+   }
+diff --git a/arch/arm64/include/asm/alternative.h 
b/arch/arm64/include/asm/alternative.h
+index 1824768fb1ee..3abb2dacb43f 100644
+--- a/arch/arm64/include/asm/alternative.h
 b/arch/arm64/include/asm/alternative.h
+@@ -72,9 +72,9 @@ void apply_alternatives(void *start, size_t length);
+   "663:\n\t"  \
+   newinstr "\n"   \
+   "664:\n\t"  \
+-  ".previous\n\t" \
+   ".org   . - (664b-663b) + (662b-661b)\n\t"  \
+-  ".org   . - (662b-661b) + (664b-663b)\n"\
++  ".org   . - (662b-661b) + (664b-663b)\n\t"  \
++  ".previous\n"   \
+   ".endif\n"
+ 
+ #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb)  \
+diff --git a/arch/arm64/include/asm/checksum.h 
b/arch/arm64/include/asm/checksum.h
+index 0b6f5a7d4027..fd11e0d70e44 100644
+--- a/arch/arm64/include/asm/checksum.h
 b/arch/arm64/include/asm/checksum.h
+@@ -30,16 +30,17 @@ static inline __sum16 ip_fast_csum(const void *iph, 
unsigned int ihl)
+ {
+   __uint128_t tmp;
+   u64 sum;
++  int n = ihl; /* we want it signed */
+ 
+   tmp = *(const __uint128_t *)iph;
+   iph += 16;
+-  ihl -= 4;
++  n -= 4;
+   tmp += ((tmp >> 64) | (tmp << 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2020-08-05 Thread Thomas Deutschmann
commit: 11148a5e6681e9fd9fe8da4fd97b24d67a5345aa
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:54:46 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:54:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11148a5e

sys-kernel/gentoo-sources: Linux patch 4.19.137

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

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-4.19.137.ebuild  | 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index 1514faf0777..a45b8fee6c9 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -34,6 +34,9 @@ DIST genpatches-4.19-134.extras.tar.xz 17520 BLAKE2B 
edbd2911c50ef7efcccb63a3a02
 DIST genpatches-4.19-135.base.tar.xz 3724284 BLAKE2B 
402d5d01331ea923f488877134bb2585224d56c43f9ae5ddaa75e7ed94c321925513b5c462325ed27dadd5852db05bb64ed237d1efc4ac648e1d6dfdd2d135c1
 SHA512 
5e480a7d85be4f1e6a6ee04c51b5f67378ef0a76db0c78da585f90d97cb36ffcaf88635307903800915702f1e8cf048afae7f0a47c7efc552e9d2cf011c967d4
 DIST genpatches-4.19-135.experimental.tar.xz 6980 BLAKE2B 
b54067068de27d290b754ab9a0e8d1854f82d0395ee140007188252b47c9b5f1da0a4587522a710473fdb3eb18c23af378d9ff8964a0a2b7d2ea5cf210702cc4
 SHA512 
79fb39cc4da38de5c70337ac51eecddaf105b706c549f8fb351f63ba1777b6b38f6977965cf649d39ae8ff99edc4e3208597944e56d86f0b71b102b29d03
 DIST genpatches-4.19-135.extras.tar.xz 17516 BLAKE2B 
985d88f41cfb813a800193227903b6a5f7498296184f35a2dcfa1bff3a21e1aa3ad1f601fd37c15365336ddb9fa37f223ccfcad79d694c9141bca488b79b2adc
 SHA512 
6df3a51fc7ceb0e09a7e27f9f47ad98a683b978f1fee6dd78e8e2ca83f7c5959141602c5ac8b4c89ed608716d099388d936219841a4edc79b29c89c16a135e28
+DIST genpatches-4.19-136.base.tar.xz 3734152 BLAKE2B 
e9b67329dca301264d225f80407c82782fa961a104d18ab07e27da0e372be1938e3d6c3ccca28d4a202e92939da34bde01180d48d74639adc78d2ef71731b4eb
 SHA512 
368f80c0490867d990352e2e4466b81ce9e9e61d11a0df762762bc3eb5b7de341bda6e0c5c734c7b8018619229f05a6dc9836300a67af94643b8bdebe64cc23a
+DIST genpatches-4.19-136.experimental.tar.xz 6984 BLAKE2B 
04361cca18abbdc5d9c0107ee605b3cab5f0814023b59574ed913e1041bcc5a7c6c968feb51e3f4fa49a8c23a79b85e258d02388aedad262f92142f1f9b2daa8
 SHA512 
8be4784e54eba690f2ad6c546187b25325c7d230e29e0d6dcb7a29e49b1e884111f0bed49686c938ddd929ace7b3951f142067963a46336b596f9bbfd3130c46
+DIST genpatches-4.19-136.extras.tar.xz 17516 BLAKE2B 
b1e407a129062ddb46d48b6e10d43abcfdfd42e3fe6fbacb9b452d688eaa2df188adc29f0e04ffc7578b08410b5351e08ee0e5859bce11bff548e0ea045a7fbe
 SHA512 
ce20aa22f414dedda490268d484b6197759abd9d2380abbe2a8d683625f6c450eef9a95861902d839da38b337a457fe00c1a602940bb8f720dd14de0ea8e7e2c
 DIST genpatches-4.4-222.base.tar.xz 3571800 BLAKE2B 
4402f71d528f74ba4da4fab9e0209ca9f169f78ff3619f04b6c448bbd7a21613118d1f79a470f63785180e7080289fb9ab2a59673b9ef3b67838e5fe769e297b
 SHA512 
d03f6b31adbf185918cb71a9a276cc09c500f2d6234c6d86e9d4341e487204b4b50ee3a0af48002bb529a0445ee50f7ce187ffabb9b76a69e789a7a930caf23a
 DIST genpatches-4.4-222.experimental.tar.xz 83348 BLAKE2B 
fbb8c234d060b3c54b0ecb3763ca0b36700556817d4bec51ceace60a68b82c7d93c673ab3372e9e0aecfc9e0cf688340c6122070b509096971f98e1bee86d71b
 SHA512 
d8c39c415bcb5f40e1d3877f85e9ac649936af66108d9106f5c6732b2f75b37b6a18893889fc4ed6f8409ad47b0d5a2ba1e45a16bf31a0fa3b0e771789841d83
 DIST genpatches-4.4-222.extras.tar.xz 16496 BLAKE2B 
cc06659a35fed7d1bac1d7c8076f1199b5985b99202c64b6f09a8557361151b51be540189b1ffeb8acfe222cfb4908e401f74b5757e6ba65a2c16dd035fb831b
 SHA512 
294bf913915ca2669475be17dcc91f2b65c5c48bf59964650a869f1d2773e2940a09b8caf51fa92db7933d3eafa3569df64699ff10bcf1b16bed1c722fef7581

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.137.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-4.19.137.ebuild
new file mode 100644
index 000..08bd18283db
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.137.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="136"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches;
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] proj/linux-patches: New tag: 4.19-136

2020-08-05 Thread Thomas Deutschmann
commit: 
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:52:24 2020 +

New tag: 4.19-136




[gentoo-commits] proj/linux-patches:4.19 commit in: /

2020-08-05 Thread Thomas Deutschmann
commit: 0d53102c63ad653cc05e1f84cfa532b49dc52ac3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:51:33 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:51:33 2020 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=0d53102c

Linux patch 4.19.137

Signed-off-by: Thomas Deutschmann  gentoo.org>

 _README   |4 +
 1136_linux-4.19.137.patch | 1486 +
 2 files changed, 1490 insertions(+)

diff --git a/_README b/_README
index b50ea6d..d6fa27c 100644
--- a/_README
+++ b/_README
@@ -583,6 +583,10 @@ Patch:  1135_linux-4.19.136.patch
 From:   https://www.kernel.org
 Desc:   Linux 4.19.136
 
+Patch:  1136_linux-4.19.137.patch
+From:   https://www.kernel.org
+Desc:   Linux 4.19.137
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1136_linux-4.19.137.patch b/1136_linux-4.19.137.patch
new file mode 100644
index 000..6f2e949
--- /dev/null
+++ b/1136_linux-4.19.137.patch
@@ -0,0 +1,1486 @@
+diff --git a/Makefile b/Makefile
+index a76c159bb605..edf1799c08d2 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 4
+ PATCHLEVEL = 19
+-SUBLEVEL = 136
++SUBLEVEL = 137
+ EXTRAVERSION =
+ NAME = "People's Front"
+ 
+diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
+index 1d5fbf1d1c67..8a8470d36c65 100644
+--- a/arch/arm/kernel/hw_breakpoint.c
 b/arch/arm/kernel/hw_breakpoint.c
+@@ -688,6 +688,12 @@ static void disable_single_step(struct perf_event *bp)
+   arch_install_hw_breakpoint(bp);
+ }
+ 
++static int watchpoint_fault_on_uaccess(struct pt_regs *regs,
++ struct arch_hw_breakpoint *info)
++{
++  return !user_mode(regs) && info->ctrl.privilege == ARM_BREAKPOINT_USER;
++}
++
+ static void watchpoint_handler(unsigned long addr, unsigned int fsr,
+  struct pt_regs *regs)
+ {
+@@ -747,16 +753,27 @@ static void watchpoint_handler(unsigned long addr, 
unsigned int fsr,
+   }
+ 
+   pr_debug("watchpoint fired: address = 0x%x\n", info->trigger);
++
++  /*
++   * If we triggered a user watchpoint from a uaccess routine,
++   * then handle the stepping ourselves since userspace really
++   * can't help us with this.
++   */
++  if (watchpoint_fault_on_uaccess(regs, info))
++  goto step;
++
+   perf_bp_event(wp, regs);
+ 
+   /*
+-   * If no overflow handler is present, insert a temporary
+-   * mismatch breakpoint so we can single-step over the
+-   * watchpoint trigger.
++   * Defer stepping to the overflow handler if one is installed.
++   * Otherwise, insert a temporary mismatch breakpoint so that
++   * we can single-step over the watchpoint trigger.
+*/
+-  if (is_default_overflow_handler(wp))
+-  enable_single_step(wp, instruction_pointer(regs));
++  if (!is_default_overflow_handler(wp))
++  goto unlock;
+ 
++step:
++  enable_single_step(wp, instruction_pointer(regs));
+ unlock:
+   rcu_read_unlock();
+   }
+diff --git a/arch/arm64/include/asm/alternative.h 
b/arch/arm64/include/asm/alternative.h
+index 849d891c60a8..844f05b23115 100644
+--- a/arch/arm64/include/asm/alternative.h
 b/arch/arm64/include/asm/alternative.h
+@@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, 
size_t length) { }
+   "663:\n\t"  \
+   newinstr "\n"   \
+   "664:\n\t"  \
+-  ".previous\n\t" \
+   ".org   . - (664b-663b) + (662b-661b)\n\t"  \
+-  ".org   . - (662b-661b) + (664b-663b)\n"\
++  ".org   . - (662b-661b) + (664b-663b)\n\t"  \
++  ".previous\n"   \
+   ".endif\n"
+ 
+ #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb)  \
+diff --git a/arch/arm64/include/asm/checksum.h 
b/arch/arm64/include/asm/checksum.h
+index 0b6f5a7d4027..fd11e0d70e44 100644
+--- a/arch/arm64/include/asm/checksum.h
 b/arch/arm64/include/asm/checksum.h
+@@ -30,16 +30,17 @@ static inline __sum16 ip_fast_csum(const void *iph, 
unsigned int ihl)
+ {
+   __uint128_t tmp;
+   u64 sum;
++  int n = ihl; /* we want it signed */
+ 
+   tmp = *(const __uint128_t *)iph;
+   iph += 16;
+-  ihl -= 4;
++  n -= 4;
+   tmp += 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2020-08-05 Thread Thomas Deutschmann
commit: ffec485810ea07664e502ef7a3523570375a7766
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:48:26 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:48:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffec4858

sys-kernel/gentoo-sources: Linux patch 5.4.56

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

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-5.4.56.ebuild| 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index bd2927623e8..1514faf0777 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -88,6 +88,9 @@ DIST genpatches-5.4-54.extras.tar.xz 1768 BLAKE2B 
667887f4041d39ba1c308e9569c131
 DIST genpatches-5.4-56.base.tar.xz 1858344 BLAKE2B 
240267c30bb8be8662f4a6fbb642606801b95b7b63263073747eca00b82b882563bfc8a92e87c3cafb90aab6875396992bb01dd4bc947b85a20c571c32399e4c
 SHA512 
b60ee720a80743a97cd2db487a67c761a98223391bf596595eb764bd9e0a3e40578e0f68a38a0a46d606712fbac63269194c80325908a40cfce8a7f57d5d730c
 DIST genpatches-5.4-56.experimental.tar.xz 6700 BLAKE2B 
0cd6b6129c4e4661bcaed1dd0dc8a5a8c8f6a65f0176f5672027e5a3bab44cf77a9ccfb79540e776d1b22c80d4aac02186d07eaebb2cb411d75fb5ed7d0a3a1c
 SHA512 
c1838e4c000ec5ba336d5a2ab4a0141c43f5747d750cfa8fa41e774ac77c006c199ab355b268d98b7295901950735222e59488c3eb71afdbf67edbe1df0e79ae
 DIST genpatches-5.4-56.extras.tar.xz 1768 BLAKE2B 
49b3874e27513376da3b44605ee399750482bcb4ac45b4cee39929ce3bed71cf292d8a42677f196912a313103e08af6c9189fd67a493aea284a0de69ff43ac93
 SHA512 
a2132e83db6e8c96ec59c7ec26280b383ddd76c7e9448cb1347004900f2471774e1e5e99ea6e27f61fb00c3cec4ea01e043ca44e58dc900ebb60ed6d69638559
+DIST genpatches-5.4-57.base.tar.xz 2072976 BLAKE2B 
6b1c954075b2cb45c90c091514d60a6cf31141cfdae1f6df210cfb5fe9b9218ecd1e8fd5fd83bc90c0ad18ff18db83d34f18a36f3cac31b71c9188026ea44429
 SHA512 
badd17281ba1906f3a9257590b4ddf21370d7a996e41d8be37e2bb14e25dd9490ffa915c2a4f84e25de9d9727d418bdce10ecf6ae4dc62947fa7078da61b4784
+DIST genpatches-5.4-57.experimental.tar.xz 6696 BLAKE2B 
22321eab03278d52b4a0a0ade1ddf612aa077ea50410d94a7822f867c466999cd5eb85c6ba3540284a957d33cac38d2d3288db5960a93b2cd714f9d6a189b32b
 SHA512 
ceab5665c49ebb8196be8181bd1853e61191ecf6a7bea4f62026d2692d5832ea0ad6c65c03622e8b67490cbb212fc13424810eed2c6f54388e50c101d0a4438d
+DIST genpatches-5.4-57.extras.tar.xz 1768 BLAKE2B 
e3850182da8254aa5a13c9ea0208bdadc873ea7014892fd20abeb960e0f1a228d44d1cc8687c4be192c0064136a007507611439b66bdeb142133687da46f8b39
 SHA512 
87d6b85c69c52426ca93d117b0b68029a5ec11c7ad58f9a352b446c22c75147f33f92dcd0db4ba297053d1e701d62f3730a61f374b60fbfed172e376fec242ef
 DIST genpatches-5.7-10.base.tar.xz 471556 BLAKE2B 
895b76bb27d9bb8ac06514e1dbb6cb16994b6e5f7357b01efce5ff27d4337975507b132f747bf4a4508de33afb65554aa87c704766f28866efe6d4edf21b9618
 SHA512 
6fa423283cce5ebf82a45a95965b449aabebf9a49dfceb6173552e7cc6dfe5bdbd54817c7a3a239602fe363993b0b08005e769a350b2e4263eeac9c1eac4b13d
 DIST genpatches-5.7-10.experimental.tar.xz 14148 BLAKE2B 
1a73711680c8fba7c27b567e6757faa08622fb4beef093791ea274c32be7a73ad102cbb4f278864b0badcc32edc216c4fd331fe2dbfbe4cba3606e4220bf6086
 SHA512 
96980f0e26f2f13d89c9e2721b8512deca50602d2fe4a60f43ffab4744d8f0c6ce5ea5baceb01da92f4ba10f676371ef2ed4ef79c8b0eb0cbc11f2614173e0ff
 DIST genpatches-5.7-10.extras.tar.xz 1768 BLAKE2B 
f51851b7e4fa9eaeab537eb33f09ee19247f078d302167acce077f2804a1e4ea28012f9d9b1cbd9cd0997a6e6ae5785ecb40738c5bec2dc75574c301e047ab4a
 SHA512 
05f9e6c87f736735fc004e9127f79ad820983e59147a79e11357e49b0ff45f924b82d6b5683ea7fe7807cf8b981a8c3e8fb4b731c0fd8d8dcee1e1856dab3ace

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.56.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-5.4.56.ebuild
new file mode 100644
index 000..600b7b7e989
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.56.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="57"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches;
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] proj/linux-patches: New tag: 5.4-57

2020-08-05 Thread Thomas Deutschmann
commit: 
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:46:10 2020 +

New tag: 5.4-57




[gentoo-commits] proj/linux-patches:5.4 commit in: /

2020-08-05 Thread Thomas Deutschmann
commit: 84f693cf79638d3350eda3ac45f50eebb618b0af
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:45:25 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:45:25 2020 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=84f693cf

Linux patch 5.4.56

Signed-off-by: Thomas Deutschmann  gentoo.org>

 _README |4 +
 1055_linux-5.4.56.patch | 2697 +++
 2 files changed, 2701 insertions(+)

diff --git a/_README b/_README
index 9289fff..0a219d2 100644
--- a/_README
+++ b/_README
@@ -263,6 +263,10 @@ Patch:  1054_linux-5.4.55.patch
 From:   http://www.kernel.org
 Desc:   Linux 5.4.55
 
+Patch:  1055_linux-5.4.56.patch
+From:   http://www.kernel.org
+Desc:   Linux 5.4.56
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1055_linux-5.4.56.patch b/1055_linux-5.4.56.patch
new file mode 100644
index 000..fd7909a
--- /dev/null
+++ b/1055_linux-5.4.56.patch
@@ -0,0 +1,2697 @@
+diff --git a/Makefile b/Makefile
+index 072fe0eaa740..c33fb4eebd4d 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 5
+ PATCHLEVEL = 4
+-SUBLEVEL = 55
++SUBLEVEL = 56
+ EXTRAVERSION =
+ NAME = Kleptomaniac Octopus
+ 
+diff --git a/arch/arm/boot/dts/armada-38x.dtsi 
b/arch/arm/boot/dts/armada-38x.dtsi
+index 3f4bb44d85f0..669da3a33d82 100644
+--- a/arch/arm/boot/dts/armada-38x.dtsi
 b/arch/arm/boot/dts/armada-38x.dtsi
+@@ -339,7 +339,8 @@
+ 
+   comphy: phy@18300 {
+   compatible = "marvell,armada-380-comphy";
+-  reg = <0x18300 0x100>;
++  reg-names = "comphy", "conf";
++  reg = <0x18300 0x100>, <0x18460 4>;
+   #address-cells = <1>;
+   #size-cells = <0>;
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi 
b/arch/arm/boot/dts/imx6qdl-icore.dtsi
+index 7814f1ef0804..fde56f98398d 100644
+--- a/arch/arm/boot/dts/imx6qdl-icore.dtsi
 b/arch/arm/boot/dts/imx6qdl-icore.dtsi
+@@ -384,7 +384,7 @@
+ 
+   pinctrl_usbotg: usbotggrp {
+   fsl,pins = <
+-  MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++  MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+   >;
+   };
+ 
+@@ -396,6 +396,7 @@
+   MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
+   MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
+   MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
++  MX6QDL_PAD_GPIO_1__GPIO1_IO01  0x1b0b0
+   >;
+   };
+ 
+diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts 
b/arch/arm/boot/dts/imx6sx-sabreauto.dts
+index 315044ccd65f..e4719566133c 100644
+--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
 b/arch/arm/boot/dts/imx6sx-sabreauto.dts
+@@ -99,7 +99,7 @@
+  {
+   pinctrl-names = "default";
+   pinctrl-0 = <_enet2>;
+-  phy-mode = "rgmii";
++  phy-mode = "rgmii-id";
+   phy-handle = <>;
+   fsl,magic-packet;
+   status = "okay";
+diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi 
b/arch/arm/boot/dts/imx6sx-sdb.dtsi
+index f6972deb5e39..865528b134d8 100644
+--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
 b/arch/arm/boot/dts/imx6sx-sdb.dtsi
+@@ -213,7 +213,7 @@
+  {
+   pinctrl-names = "default";
+   pinctrl-0 = <_enet2>;
+-  phy-mode = "rgmii";
++  phy-mode = "rgmii-id";
+   phy-handle = <>;
+   status = "okay";
+ };
+diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi 
b/arch/arm/boot/dts/sun4i-a10.dtsi
+index 4c268b70b735..e0a9b371c248 100644
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
 b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -198,7 +198,7 @@
+   default-pool {
+   compatible = "shared-dma-pool";
+   size = <0x600>;
+-  alloc-ranges = <0x4a00 0x600>;
++  alloc-ranges = <0x4000 0x1000>;
+   reusable;
+   linux,cma-default;
+   };
+diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
+index 6befa236ba99..fd31da8fd311 100644
+--- a/arch/arm/boot/dts/sun5i.dtsi
 b/arch/arm/boot/dts/sun5i.dtsi
+@@ -117,7 +117,7 @@
+   default-pool {
+   compatible = "shared-dma-pool";
+   size = <0x600>;
+-  alloc-ranges = <0x4a00 0x600>;
++  alloc-ranges = <0x4000 0x1000>;
+   reusable;
+   linux,cma-default;
+   };
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi 
b/arch/arm/boot/dts/sun7i-a20.dtsi
+index 8aebefd6accf..1f8b45f07e58 100644
+--- 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2020-08-05 Thread Thomas Deutschmann
commit: 5b60582550c261424d8eefa3c677807a6a0a243a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:42:13 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:42:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b605825

sys-kernel/gentoo-sources: Linux patch 5.7.13

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

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-5.7.13.ebuild| 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index 93d2b9d3455..bd2927623e8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -100,6 +100,9 @@ DIST genpatches-5.7-12.extras.tar.xz 1768 BLAKE2B 
a1e243afbad561989fe8b3665a8511
 DIST genpatches-5.7-13.base.tar.xz 581360 BLAKE2B 
16841cdedf5ac9fd897e6c3ea6f428a4bbde48dca1c5f6d432d1c63248d6cec9157d4f0680cf340cc08703715afb32db342aa837a978c29b1874917d13454dd6
 SHA512 
aa15be557a74258476d777575cbe98148bb99104f221206e5d1589dfee89ab7ed2637a4e6dd044f477e3c5b0388faf399dc7241951c37a1df405981927f9973c
 DIST genpatches-5.7-13.experimental.tar.xz 14144 BLAKE2B 
9bf6cb08196fff299c5dd69095b63b39e0bbb5df959ba7d69a468dfcc9d71089ab63a4fdcadc4adde593e2b528d7e0d388493398dc1b7c75a802b719227f7679
 SHA512 
0bf12170ef9b7455b95330cbdb422d33f12e151def80865c5b04f471b8d7d13f419a949acebcb1c221907a23ffc1a72b100fbe6c7d59db4fab87c2b5c02f7668
 DIST genpatches-5.7-13.extras.tar.xz 1768 BLAKE2B 
49f3af716da6e9029ca774056259e2f4521dbbcde9d453c71987d105b628934738eb96cd622ec92d338ed7fd9c17b0f99d82154b240258c299f1e55ecee938e3
 SHA512 
0cb1d9affd59a93596ea0c41f888a451440b6efd0788b47cfecbf6ee41b24685cf0b7c9ac43a0cb1375086809fc1423c3c2ef1bffa93eb60c4f653d473441d66
+DIST genpatches-5.7-14.base.tar.xz 608144 BLAKE2B 
735617575780177615b76e35674d86e7e67b063e3582e4d71d0935ce0db603f2186c24c6b520d2c88f8279ae64b36b85c1d5ae177219dc1d2940d6af7ff6791e
 SHA512 
001465ca190d3b222faa3084c600706d6f7a5646cfd6d4283354df298e6f715b68dfd64ba2b7315e7c852448b5071dcca9621c559adc58a93935963dd4c2e74e
+DIST genpatches-5.7-14.experimental.tar.xz 14144 BLAKE2B 
6084e0e505c0d317b0c47345ca0c9ee344a608b5175fdc5217d0337bed6c9bedb99eacd7a0fa300314ca4627d8a3a7a2dc5b3631d311220ae32426ea004aadf2
 SHA512 
56042f564196034b38a158932a2cbf72269cb4d6bf62248363a6bb40f7a57a1cdc166586e9b3c393b70eb61522809ca77ca593f42565e3d20c2ebe46834c605f
+DIST genpatches-5.7-14.extras.tar.xz 1768 BLAKE2B 
864a38c040d786d53eda128ca9fdb1ea51b28f2391b5eded178836469779baf282577e8ef6855616eae740f355230b9c3fa19f6da4885f210efb552cdf720cd7
 SHA512 
c1fe586202bfb1ccf6ae06bbf8a175bbe19ab21f6582b4ccae551d904e6c09e13faf9d938ebe78e910db9a6903135e413e3521e633d4cfa61ab93e34a5896175
 DIST genpatches-5.7-9.base.tar.xz 422996 BLAKE2B 
b642f97c554acfed1c360ed0a39e8dc926717bcae6d8544e6a8cffbcca892dd489709ef8490b409128a33612b74df7d57c35a10a8f4f6ed4a711bc26cac31293
 SHA512 
470d95d5964426fdc976f45ab66d03395f9597a5090b2f452607acce6baff5827dbfc385e033125429db4d8d4e32a7e356c3ccfac149c538c604cf331286c2f0
 DIST genpatches-5.7-9.experimental.tar.xz 14140 BLAKE2B 
e1ac516ae635fc5ad797bf785dcbb188be8c6b13ab3228ca10a328e73fe0f45dfbd3ee596d8aea4298788e480133bab453e72a1bb78e40043a254edf6bdf99d3
 SHA512 
eec7e825f368e956aac97e9031cb5c8eb3f607a44dabc1ff2ed4d5c65e65e8a59920fed78e1c019af9368a45200dd1d16f71c8e8f223ed9171ff1e084f07b0e0
 DIST genpatches-5.7-9.extras.tar.xz 1764 BLAKE2B 
eb8d437e2761aa350548643ef39beaf73cd7935a0c2028b44edaf9d93c833b7050d11b66e540731708911df971f4bf4b947a89eeddcd9b49278fe1afceb16753
 SHA512 
4dc6cf6c181756aac4ea0bdffd571e64d787a592d5878d4c90f1f76e34beb3726e94d070b2138b68124ebd01de43b09595072c5f737eb6181d283edbc85d30e9

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.7.13.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-5.7.13.ebuild
new file mode 100644
index 000..dbe33f83a4b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.7.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches;
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] proj/linux-patches: New tag: 5.7-14

2020-08-05 Thread Thomas Deutschmann
commit: 
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:37:18 2020 +

New tag: 5.7-14




[gentoo-commits] proj/linux-patches:5.7 commit in: /

2020-08-05 Thread Thomas Deutschmann
commit: 89d0e8ab4377428b936f4a21b215d245e94131a3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  5 14:33:53 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  5 14:35:38 2020 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=89d0e8ab

Linux patch 5.7.13

Signed-off-by: Thomas Deutschmann  gentoo.org>

 _README |4 +
 1012_linux-5.7.13.patch | 3752 +++
 2 files changed, 3756 insertions(+)

diff --git a/_README b/_README
index 21eff3a..a388fef 100644
--- a/_README
+++ b/_README
@@ -91,6 +91,10 @@ Patch:  1011_linux-5.7.12.patch
 From:   http://www.kernel.org
 Desc:   Linux 5.7.12
 
+Patch:  1012_linux-5.7.13.patch
+From:   http://www.kernel.org
+Desc:   Linux 5.7.13
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1012_linux-5.7.13.patch b/1012_linux-5.7.13.patch
new file mode 100644
index 000..f28c06a
--- /dev/null
+++ b/1012_linux-5.7.13.patch
@@ -0,0 +1,3752 @@
+diff --git a/Makefile b/Makefile
+index 401d58b35e61..b77b4332a41a 100644
+--- a/Makefile
 b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 5
+ PATCHLEVEL = 7
+-SUBLEVEL = 12
++SUBLEVEL = 13
+ EXTRAVERSION =
+ NAME = Kleptomaniac Octopus
+ 
+diff --git a/arch/arm/boot/dts/armada-38x.dtsi 
b/arch/arm/boot/dts/armada-38x.dtsi
+index e038abc0c6b4..420ae26e846b 100644
+--- a/arch/arm/boot/dts/armada-38x.dtsi
 b/arch/arm/boot/dts/armada-38x.dtsi
+@@ -344,7 +344,8 @@
+ 
+   comphy: phy@18300 {
+   compatible = "marvell,armada-380-comphy";
+-  reg = <0x18300 0x100>;
++  reg-names = "comphy", "conf";
++  reg = <0x18300 0x100>, <0x18460 4>;
+   #address-cells = <1>;
+   #size-cells = <0>;
+ 
+diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi 
b/arch/arm/boot/dts/imx6qdl-icore.dtsi
+index 756f3a9f1b4f..12997dae35d9 100644
+--- a/arch/arm/boot/dts/imx6qdl-icore.dtsi
 b/arch/arm/boot/dts/imx6qdl-icore.dtsi
+@@ -397,7 +397,7 @@
+ 
+   pinctrl_usbotg: usbotggrp {
+   fsl,pins = <
+-  MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++  MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+   >;
+   };
+ 
+@@ -409,6 +409,7 @@
+   MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
+   MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
+   MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
++  MX6QDL_PAD_GPIO_1__GPIO1_IO01  0x1b0b0
+   >;
+   };
+ 
+diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts 
b/arch/arm/boot/dts/imx6sx-sabreauto.dts
+index 825924448ab4..14fd1de52a68 100644
+--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
 b/arch/arm/boot/dts/imx6sx-sabreauto.dts
+@@ -99,7 +99,7 @@
+  {
+   pinctrl-names = "default";
+   pinctrl-0 = <_enet2>;
+-  phy-mode = "rgmii";
++  phy-mode = "rgmii-id";
+   phy-handle = <>;
+   fsl,magic-packet;
+   status = "okay";
+diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi 
b/arch/arm/boot/dts/imx6sx-sdb.dtsi
+index 3e5fb72f21fc..c99aa273c296 100644
+--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
 b/arch/arm/boot/dts/imx6sx-sdb.dtsi
+@@ -213,7 +213,7 @@
+  {
+   pinctrl-names = "default";
+   pinctrl-0 = <_enet2>;
+-  phy-mode = "rgmii";
++  phy-mode = "rgmii-id";
+   phy-handle = <>;
+   status = "okay";
+ };
+diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi 
b/arch/arm/boot/dts/sun4i-a10.dtsi
+index bf531efc0610..0f95a6ef8543 100644
+--- a/arch/arm/boot/dts/sun4i-a10.dtsi
 b/arch/arm/boot/dts/sun4i-a10.dtsi
+@@ -198,7 +198,7 @@
+   default-pool {
+   compatible = "shared-dma-pool";
+   size = <0x600>;
+-  alloc-ranges = <0x4a00 0x600>;
++  alloc-ranges = <0x4000 0x1000>;
+   reusable;
+   linux,cma-default;
+   };
+diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
+index e6b036734a64..c2b4fbf552a3 100644
+--- a/arch/arm/boot/dts/sun5i.dtsi
 b/arch/arm/boot/dts/sun5i.dtsi
+@@ -117,7 +117,7 @@
+   default-pool {
+   compatible = "shared-dma-pool";
+   size = <0x600>;
+-  alloc-ranges = <0x4a00 0x600>;
++  alloc-ranges = <0x4000 0x1000>;
+   reusable;
+   linux,cma-default;
+   };
+diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi 
b/arch/arm/boot/dts/sun7i-a20.dtsi
+index ffe1d10a1a84..6d6a37940db2 100644
+--- 

[gentoo-commits] repo/gentoo:master commit in: www-apps/drupal/

2020-08-05 Thread Jorge Manuel B. S. Vicetto
commit: 0f4ede5dd7bbdb6a25b5ed95a21ed99968883bc4
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo 
 org>
AuthorDate: Wed Aug  5 14:35:08 2020 +
Commit: Jorge Manuel B. S. Vicetto  gentoo  org>
CommitDate: Wed Aug  5 14:35:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4ede5d

www-apps/drupal: 8.9.2 and 9.0.2 version bump.

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)  
gentoo.org>

 www-apps/drupal/Manifest|  2 ++
 www-apps/drupal/drupal-8.9.2.ebuild | 68 +
 www-apps/drupal/drupal-9.0.2.ebuild | 68 +
 3 files changed, 138 insertions(+)

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 7a723bcab41..3b77ed54dd5 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,4 +1,6 @@
 DIST drupal-7.72.tar.gz 3323531 BLAKE2B 
07d22cde80763e9d9e959907ae246b95dc611b6ae32f8bf69e5c2fa03ad023bcb3810703dbe2285b89f43709616d9302b0598012237fe97487820e71df1b9b70
 SHA512 
5ad91d9aa31a0d31ba07dba0de5fd4d0fb4b875ed3fed7d48e3b65d4e2e8d7e7f3e66dcbe9d2a7a78fa22923597a396f43d70ee7b5ac63469ca3e256ba4746b6
 DIST drupal-8.8.8.tar.gz 19504669 BLAKE2B 
f98e772753ffc6df5e9404bcf1c30acaca284447040b73ba43e62aa413c712f3174f636efa24a3e24c5d2dfd3906ad920b40eab5c7ad51f485ef6b25647bcf84
 SHA512 
1170d4a6372f21d8817264f17998f3b29c5c158267d4d60d057475a773fe24eb85b4988c89daef80c08a89bf4d4ba1a85d1d35ac698ebd588109be0731b796ca
 DIST drupal-8.9.1.tar.gz 19776948 BLAKE2B 
34dafaddafb0a8e742ff8591aa016e1d8cdf40c5779236308427339087b2c2f552b8829de0ae3dc2eedf5e99d70922e89a281852b3e3f2f3c27a00efafdea849
 SHA512 
db518cc180508023025c2f7b898f85c4728712bafaa048fe1783aa471d0c38f24f27e62175a8cea314c330b0a147509d8285ee6f0838d990ae3c76aab83d081f
+DIST drupal-8.9.2.tar.gz 19780242 BLAKE2B 
72a84df5f2ed029dd4c6d6e6f6473d5934bdf4d02069fb0d522c3144e99b0409fd751d3e2201be562ea76b61f167bcc0fe1f0276311a7c58b291caf890f8bf72
 SHA512 
71643fb4c0ca8f299f9791c25172c4f4a8a7a5f9dcb7eba76bb25446c4f91c7d8fba6c93acec80302c33e7945e9d3b9f46e3b40a51a935724ddde4c702a3c9b0
 DIST drupal-9.0.1.tar.gz 16832166 BLAKE2B 
b783bb0282f0ee81fa1a3d606e3a97d65a537f20e2820270a2e5d554b737af45f31fac82f45e1322df8ee04ba1a4a5ee757a67fe2a09c272a32400c4d5b51424
 SHA512 
499459ebf72b1008266e6075667a4781b27d2e82635687744321513af1ac2289a0a33273666f251b90c4a2020e4fb52b83146b9a65007de788c5f3559bb4cb0a
+DIST drupal-9.0.2.tar.gz 16841367 BLAKE2B 
c9813a0c4fd5a0b3a78b44c540c9938fe851a4c743a0ff21e9f5d7dc19190b03ec5ea6f10370e92589567b11dae19ea392a611022bad60be21eb58a3bc39808c
 SHA512 
0ad937a2f0d300f70e33018b89074a0c97592dcad1eb0c3ba9fb8df3f4df53e659c6a47f4a94926ecdae34204f16173f75c14bf9756355254f4e1b666ba5ac39

diff --git a/www-apps/drupal/drupal-8.9.2.ebuild 
b/www-apps/drupal/drupal-8.9.2.ebuild
new file mode 100644
index 000..50acdd30770
--- /dev/null
+++ b/www-apps/drupal/drupal-8.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/;
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+   dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+   virtual/httpd-php
+   uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+   webapp_src_preinst
+
+   local docs="LICENSE.txt README.txt core/MAINTAINERS.txt 
core/INSTALL.txt core/CHANGELOG.txt \
+   core/INSTALL.mysql.txt core/INSTALL.pgsql.txt 
core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+   dodoc ${docs}
+   rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+   cp sites/default/{default.settings.php,settings.php} || die
+   insinto "${MY_HTDOCSDIR}"
+   doins -r .
+
+   dodir "${MY_HTDOCSDIR}"/files
+   webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+   webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+   webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+   webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+   webapp_src_install
+}
+
+pkg_postinst() {
+   echo
+   ewarn "SECURITY NOTICE"
+   ewarn "If you plan on using SSL on your Drupal site, please consult the 
postinstall information:"
+   ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+   echo
+   ewarn "If this is a new install, unless you want anyone with network 
access to your server to be"
+   ewarn "able to run the setup, you'll have to configure your web server 
to limit access to it."
+   echo
+   ewarn "If you're 

[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 84b4ee711e35b9b53a443cd92d31a108e2aaa569
Author: zongyu  gmail  com>
AuthorDate: Sat Aug  1 15:21:31 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Aug  1 15:26:41 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=84b4ee71

update the recorded skeleton cmd

Signed-off-by: zongyu  gmail.com>

 src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java | 9 +
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 8fceec6..810358c 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -364,11 +364,20 @@ public class MavenEbuilder {
 });
 }
 
+if (config.isFromMavenCentral()) {
+writer.print(" --from-maven-central");
+}
+
 if (config.getDownloadUri() != null) {
 writer.print(" --download-uri ");
 writer.print(config.getDownloadUri());
 }
 
+if (config.hasBinjarUri()) {
+writer.print(" --binjar-uri ");
+writer.print(config.getBinjarUri());
+}
+
 if (config.getLicense() != null) {
 writer.print(" --license ");
 writer.print(config.getLicense());



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, src/main/resources/

2020-08-05 Thread Miroslav Šulc
commit: cc8aa4b89b5f9e268d4d40d04b25418e70955ea3
Author: zongyu  gmail  com>
AuthorDate: Fri Jul 31 09:07:48 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jul 31 16:25:14 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=cc8aa4b8

initial effort to make java-ebuilder parse licenses from pom.xml

Signed-off-by: zongyu  gmail.com>

 .../gentoo/java/ebuilder/maven/MavenEbuilder.java  |  2 +
 .../gentoo/java/ebuilder/maven/MavenLicenses.java  | 62 
 .../gentoo/java/ebuilder/maven/MavenParser.java| 66 ++
 .../gentoo/java/ebuilder/maven/MavenProject.java   | 22 
 src/main/resources/licenseMap.properties   |  2 +
 5 files changed, 154 insertions(+)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 37d45a4..3b5c3d6 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -702,6 +702,8 @@ public class MavenEbuilder {
 
 if (config.getLicense() != null) {
 writer.print(config.getLicense());
+} else {
+writer.print(mavenProject.getLicenses());
 }
 
 writer.println('"');

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java
new file mode 100644
index 000..e2db62c
--- /dev/null
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java
@@ -0,0 +1,62 @@
+package org.gentoo.java.ebuilder.maven;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * translate licenses from pom.xml to portage
+ *
+ * @author Zhang Zongyu
+ */
+public class MavenLicenses {
+
+/**
+ * Location of the resource file mapping licenses.
+ */
+private static final String licenseMapFile
+= "/licenseMap.properties";
+
+/**
+ * the Map that will convert license from maven
+ * to portage.
+ */
+private Map licenseMap;
+
+/**
+ * Load cache from resource
+ */
+@SuppressWarnings({"unchecked", "rawtypes"})
+MavenLicenses() {
+Properties mapProperty = new Properties();
+try {
+mapProperty.load(
+this.getClass().getResourceAsStream(
+licenseMapFile));
+} catch (final IOException ex) {
+throw new RuntimeException(
+"Failed to read license map from resource", ex);
+}
+
+licenseMap = (Map)mapProperty;
+}
+
+/**
+ * query the LicenseMap
+ *
+ * @param licenseName the licenses/license/name in pom.xml
+ *
+ * @return license identifier that works with Portage
+ */
+public String getEquivalentLicense(String licenseName) {
+final String portageLicense = licenseMap.get(licenseName);
+
+if (portageLicense == null) {
+return "!!!equivalentPortageLicenseName-not-found!!!";
+} else {
+return portageLicense;
+}
+}
+}

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
index 8abc0aa..8c64e37 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
@@ -16,6 +16,7 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import org.gentoo.java.ebuilder.Config;
+import org.gentoo.java.ebuilder.maven.MavenLicenses;
 
 /**
  * Parser for parsing pom.xml into project collector class.
@@ -419,6 +420,9 @@ public class MavenParser {
 case "groupId":
 mavenProject.setGroupId(reader.getElementText());
 break;
+case "licenses":
+parseProjectLicenses(mavenProject, reader);
+break;
 case "properties":
 parseProjectProperties(mavenProject, reader);
 break;
@@ -572,6 +576,68 @@ public class MavenParser {
 }
 }
 
+/**
+ * Parses project licenses.
+ *
+ * @param mavenProject maven project instance
+ * @param reader   XML stream reader
+ *
+ * @throws XMLStreamException Thrown if problem occurred while reading the
+ *XML stream.
+ */
+private void parseProjectLicenses(final MavenProject mavenProject,
+final XMLStreamReader reader)
+   

[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 1a3f3a54a35473811acf16057529703199a3df76
Author: zongyu  gmail  com>
AuthorDate: Wed Aug  5 04:20:07 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  5 07:49:29 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1a3f3a54

make java-ebuilder able to recogize junit-5 and cucumber testing frameworks

Signed-off-by: zongyu  gmail.com>

 .../org/gentoo/java/ebuilder/maven/MavenEbuilder.java  | 18 --
 .../org/gentoo/java/ebuilder/maven/MavenProject.java   |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index b9778ef..e73a1fd 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -211,11 +211,9 @@ public class MavenEbuilder {
  */
 private String determineTestingFrameworkByDependency(
 final MavenDependency dependency) {
-/** TODO: missing support for
- *"org.junit.vintage:junit-vintage-engine" tests
+/** TODO: missing determination for
  *"POJO" tests
  *"spock" tests
- *"cucumber" tests
  */
 if ("junit".equals(dependency.getGroupId())
 && "junit".equals(dependency.getArtifactId())) {
@@ -224,9 +222,17 @@ public class MavenEbuilder {
 && "testng".equals(dependency.getArtifactId())) {
 return "testng";
 } else if ("org.junit.jupiter".equals(dependency.getGroupId())
-&& "junit-jupiter-engine".
-equals(dependency.getArtifactId())) {
-return "junit-5";
+&& "junit-jupiter-engine".equals(dependency.getArtifactId())) {
+// java-pkg-simple do not support now
+return "junit-juniper";
+} else if ("org.junit.vintage".equals(dependency.getGroupId())
+&& "junit-vintage-engine".equals(dependency.getArtifactId())) {
+// java-pkg-simple do not support now
+return "junit-vintage";
+} else if ("io.cucumber".equals(dependency.getGroupId())
+&& "cucumber-junit".equals(dependency.getArtifactId())) {
+// java-pkg-simple do not support now
+return "cucumber";
 } else {
 return null;
 }

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index 51ec844..794f992 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -276,7 +276,7 @@ public class MavenProject {
  * @param description {@link #description}
  */
 public void setDescription(final String description) {
-this.description = description;
+this.description = description.replaceAll("[\n ]+", " ");
 }
 
 /**



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/resources/, src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 1a0861fce9d1eed817114871b073edf1f527e21d
Author: zongyu  gmail  com>
AuthorDate: Sat Aug  1 09:16:04 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Aug  1 15:25:32 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1a0861fc

update usage.txt, fix Copyright statement of Gentoo

Signed-off-by: zongyu  gmail.com>

 src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java | 2 +-
 src/main/resources/usage.txt| 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 3b5c3d6..8fceec6 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -598,7 +598,7 @@ public class MavenEbuilder {
  * @param writer ebuild writer
  */
 private void writeHeader(final PrintWriter writer) {
-writer.printf("# Copyright 1999-%d Gentoo Foundation\n",
+writer.printf("# Copyright 1999-%d Gentoo Authors\n",
 LocalDate.now().getYear());
 writer.println("# Distributed under the terms of the GNU General "
 + "Public License v2");

diff --git a/src/main/resources/usage.txt b/src/main/resources/usage.txt
index 725643c..78ab745 100644
--- a/src/main/resources/usage.txt
+++ b/src/main/resources/usage.txt
@@ -2,13 +2,16 @@ Usage: java-ebuilder 
 
 Generating ebuild:
 --download-uri|-u uri that goes to SRC_URI
+--binjar-uri  uri that goes to binary jar
 --dump-projects|-d outputs information about parsed projects
(useful for debugging)
 --ebuild|-e  path to ebuild that should be created
 --force-min-java-version  force minimum JDK/JRE version in 
dependencies
+--from-maven-central   make java-ebuilder inherit 
java-pkg-maven.eclass
 --generate-ebuild|-g   generates ebuild from pom.xml
 --keywords|-karch keywords
---license|-l  license name
+--license|-l  license name, if it is not specified,
+   java-ebuilder will determine LICENSE from 
pom.xml
 --pom|-p path to pom.xml that should be parsed,
the path must be relative to workdir (can be
specified multiple times)



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 6f952b0dfa64958ddd6f391703995c6c97f75bce
Author: zongyu  gmail  com>
AuthorDate: Sun Aug  2 02:48:45 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  2 03:21:21 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=6f952b0d

create proper GENTOO_CLASSPATH for java-virtuals/*.

Signed-off-by: zongyu  gmail.com>

 .../org/gentoo/java/ebuilder/maven/MavenEbuilder.java| 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 810358c..646fc13 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -33,6 +33,12 @@ public class MavenEbuilder {
 private static final Pattern PATTERN_TARBALL_NAME
 = 
Pattern.compile("^.*/\\$\\{P\\}-sources.((?:\\.tar)\\.\\S+|(?:\\.jar))$");
 
+/**
+ * Pattern for checking whether the dependency is specifying versions.
+ */
+private static final Pattern PATTERN_EBUILD_VERSIONING
+= Pattern.compile("^[~=<>].*$");
+
 /**
  * Generates ebuild from the collected information at the specified path.
  *
@@ -88,14 +94,20 @@ public class MavenEbuilder {
 sbCP.append(',');
 }
 
-final String[] parts = dependency.getSystemDependency().
+final String ebuildDependency =
+dependency.getSystemDependency();
+
+final String[] parts = ebuildDependency.
 replaceAll(".*/", "").
 replaceAll("\\[.*\\]", "").
 split(":");
 String pn = parts[0].replaceAll("-r\\d+$", "");
 
 if (parts.length == 2) {
-pn = pn.substring(0, pn.lastIndexOf('-'));
+if (PATTERN_EBUILD_VERSIONING.
+matcher(ebuildDependency).matches()) {
+pn = pn.substring(0, pn.lastIndexOf('-'));
+}
 
 if (!parts[1].equals("0")) {
 pn += "-" + parts[1];



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/resources/, src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 1c7018663e04e676f4ff74a9604913a81ddbfbf4
Author: zongyu  gmail  com>
AuthorDate: Sat Aug  1 09:04:07 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Aug  1 15:17:55 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1c701866

Use Set instead of List for storing Licenses, update license map

Signed-off-by: zongyu  gmail.com>

 .../gentoo/java/ebuilder/maven/MavenLicenses.java  |   3 +-
 .../gentoo/java/ebuilder/maven/MavenProject.java   |  12 +-
 src/main/resources/licenseMap.properties   | 152 -
 3 files changed, 161 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java
index e2db62c..f2f4f9a 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenLicenses.java
@@ -51,7 +51,8 @@ public class MavenLicenses {
  * @return license identifier that works with Portage
  */
 public String getEquivalentLicense(String licenseName) {
-final String portageLicense = licenseMap.get(licenseName);
+final String portageLicense =
+licenseMap.get(licenseName.toLowerCase());
 
 if (portageLicense == null) {
 return "!!!equivalentPortageLicenseName-not-found!!!";

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index fa4958d..2fd88de 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -4,7 +4,9 @@ import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Contains information about maven project collected from pom.xml.
@@ -44,7 +46,7 @@ public class MavenProject {
 /**
  * Lisences.
  */
-private List licenses = new ArrayList<>(10);
+private Set licenses = new HashSet<>(10);
 /**
  * Homepage URL.
  */
@@ -113,8 +115,12 @@ public class MavenProject {
  *
  * @param license {@link #licenses}
  */
-public void addLicense(final String license) {
-licenses.add(license);
+public void addLicense(final String portageLicenses) {
+final String[] parts = portageLicenses.split(":");
+
+for (String eachLicense: parts) {
+licenses.add(eachLicense);
+}
 }
 
 /**

diff --git a/src/main/resources/licenseMap.properties 
b/src/main/resources/licenseMap.properties
index fe9262a..5cd2e5d 100644
--- a/src/main/resources/licenseMap.properties
+++ b/src/main/resources/licenseMap.properties
@@ -1,2 +1,150 @@
-#Fri Jul 31 23:28:29 CST 2020
-Apache\ License,\ Version\ 2.0=Apache-2.0
+#Sat Aug 01 15:44:04 CST 2020
+# A properties file that maps license name of pom.xml to
+#   portage compatible names.
+#
+# If the name indicates multiple licenses, please record
+#   the license like:
+#@CODE
+#   name\ from\ pom.xml=GPL-2:MIT:BSD
+#@CODE
+#
+# If it indicates multiple choices of licenses, please
+#   record the license like:
+#@CODE
+#   name\ from\ pom.xml=||\ (\ GPL-2\ MIT\ )
+#@CODE
+#
+# according to dev-java/bcpkix::gentoo
+bouncy\ castle\ licence=BSD
+# according to dev-lang/scala::gentoo
+bsd-like=BSD
+#
+3-clause\ bsd\ license=BSD
+apache\ 2=Apache-2.0
+apache\ 2.0=Apache-2.0
+apache-2.0=Apache-2.0
+apache\ 2.0\ license=Apache-2.0
+apache\ license=Apache
+apache\ license\ 2=Apache-2.0
+apache\ license\ 2.0=Apache-2.0
+apache\ license,\ 2.0=Apache-2.0
+apache\ license\ v2.0=Apache-2.0
+apache\ license\ version\ 2=Apache-2.0
+apache\ license,\ version\ 2.0=Apache-2.0
+apache\ license\ version\ 2.0=Apache-2.0
+apache\ license,\ version\ 2.0=Apache-2.0
+apache\ public\ license\ 2.0=Apache-2.0
+apache\ software\ license,\ version\ 1.1=Apache-1.1
+apache\ software\ license\ -\ version\ 2.0=Apache-2.0
+apache\ v2=Apache-2.0
+asf\ 2.0=Apache-2.0
+asl=Apache-2.0
+asl\ 2.0=Apache-2.0
+asl,\ version\ 2=Apache-2.0
+bsd=BSD-1
+bsd\ 2-clause=BSD-2
+bsd-2-clause=BSD-2
+bsd\ 2-clause\ license=BSD-2
+bsd\ 3-clause=BSD
+bsd-3-clause=BSD
+bsd\ licence=BSD-1
+bsd\ license=BSD-1
+bsd\ style=BSD
+cc0=CC0-1.0
+cddl\ 1.0=CDDL
+cddl\ 1.1=CDDL-1.1
+cddl+gpl\ license=CDDL:GPL-1
+cddl/gplv2+ce=||\ (\ CDDL\ GPL-2-with-classpath-exception\ )
+cddl\ +\ gplv2\ with\ classpath\ exception=CDDL:GPL-2-with-classpath-exception
+cddl\ license=CDDL
+cddl\ v1.1\ /\ gpl\ v2\ dual\ license=CDDL-1.1:GPL-2
+common\ development\ and\ distribution\ license=CDDL
+common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL
+common\ development\ and\ distribution\ license\ (cddl)\ v1.0=CDDL
+common\ development\ and\ distribution\ license\ (cddl)\ version\ 

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

2020-08-05 Thread Benda XU
commit: 32d90cac0e9d0ad174083f69df92b94cdf592b62
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Aug  5 14:30:21 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Wed Aug  5 14:32:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d90cac

cuda.eclass: adopt it on behalf of Science Project.

Signed-off-by: Benda Xu  gentoo.org>

Reference: 
https://archives.gentoo.org/gentoo-dev/message/d693da42b93e7bf016a44b3ae3752b9f

 eclass/cuda.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass
index 3d16570e862..b1da77c69dd 100644
--- a/eclass/cuda.eclass
+++ b/eclass/cuda.eclass
@@ -14,7 +14,7 @@ esac
 
 # @ECLASS: cuda.eclass
 # @MAINTAINER:
-# No maintainer 
+# Gentoo Science Project 
 # @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Common functions for cuda packages
 # @DESCRIPTION:



[gentoo-commits] proj/java-ebuilder:master commit in: maven/eclass/

2020-08-05 Thread Miroslav Šulc
commit: 6630c8b0d4c1beb5dee68d4481487e8acd0340e4
Author: zongyu  gmail  com>
AuthorDate: Wed Aug  5 04:04:34 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  5 04:05:29 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=6630c8b0

update java-pkg-maven: recogize files by suffixes

Signed-off-by: zongyu  gmail.com>

 maven/eclass/java-pkg-maven.eclass | 45 --
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/maven/eclass/java-pkg-maven.eclass 
b/maven/eclass/java-pkg-maven.eclass
index d926cc3..fb41bb2 100644
--- a/maven/eclass/java-pkg-maven.eclass
+++ b/maven/eclass/java-pkg-maven.eclass
@@ -13,23 +13,30 @@
 
 EXPORT_FUNCTIONS src_unpack
 
-# @ECLASS-VARIABLE: JAVA_SOURCE_FILENAME
+# @ECLASS-VARIABLE: JAVA_SRC_DIR
 # @DESCRIPTION:
-# The filename of the source code.
-: ${JAVA_SOURCE_FILENAME:=${P}-sources.jar}
-
-# @ECLASS-VARIABLE: JAVA_TEST_SOURCE_FILENAME
-# @DESCRIPTION:
-# The filename of the source code for launch testing.
-: ${JAVA_TEST_SOURCE_FILENAME:=${P}-test-sources.jar}
+# A directory relative to ${S} which contains the source code.
+# source code distributed by Maven Central are exactly the root of
+# the source code, we need to assign them a separate directory to
+# avoid the situation that the source code, the resources and the
+# source code for testing are mixed in ${S}.
+#
+: ${JAVA_SRC_DIR:=src/main/java}
 
 # @ECLASS-VARIABLE: JAVA_RESOURCE_DIRS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# A directory relative to ${S} which contain the resources of the
+# A directory relative to ${S} which contains the resources of the
 # application. Give it a default value to handle src_unpack.
 : ${JAVA_RESOURCE_DIRS:=src/main/resources}
 
+# @ECLASS-VARIABLE: JAVA_RESOURCE_DIRS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# A directory relative to ${S} which contains the source code for testing
+# the application. Give it a default value to handle src_unpack.
+: ${JAVA_TEST_SRC_DIR:=src/test/java}
+
 # @FUNCTION: java-pkg-binjar_src_unpack
 # @DESCRIPTION:
 # Copy the binary jar into the expected place of java-pkg-simple.  Do
@@ -37,23 +44,27 @@ EXPORT_FUNCTIONS src_unpack
 java-pkg-maven_src_unpack() {
for file in ${A}; do
case ${file} in
-   ${JAVA_BINJAR_FILENAME}) ;;
-   ${JAVA_SOURCE_FILENAME})
-   mkdir -p "${S}"/${JAVA_SRC_DIR}\
-   || die "Could not create 
${JAVA_SRC_DIR}"
-   unzip -q -o "${DISTDIR}"/${file} -d 
"${S}"/${JAVA_SRC_DIR}\
-   || die "Could not unzip source code" ;;
-   ${JAVA_TEST_SOURCE_FILENAME})
+   *-test-sources.jar)
mkdir -p "${S}"/${JAVA_TEST_SRC_DIR}\
|| die "Could not create 
${JAVA_TEST_SRC_DIR}"
unzip -q -o "${DISTDIR}"/${file} -d 
"${S}"/${JAVA_TEST_SRC_DIR}\
|| die "Could not unzip source code for 
testing" ;;
+   *-sources.jar)
+   mkdir -p "${S}"/${JAVA_SRC_DIR}\
+   || die "Could not create 
${JAVA_SRC_DIR}"
+   unzip -q -o "${DISTDIR}"/${file} -d 
"${S}"/${JAVA_SRC_DIR}\
+   || die "Could not unzip source code"
+   if [[ -d "${S}"/${JAVA_SRC_DIR}/META-INF ]] ; 
then
+   rm "${S}"/${JAVA_SRC_DIR}/META-INF -r 
|| die
+   fi ;;
+   *)
+   unpack ${file};;
esac
done
 
# the resources (maven resources are bundled inside source file)
+   mkdir -p $(dirname "${S}"/${JAVA_RESOURCE_DIRS}) || die
cp "${S}"/${JAVA_SRC_DIR} "${S}"/${JAVA_RESOURCE_DIRS} -r || die
-   rm "${S}"/${JAVA_RESOURCE_DIRS}/META-INF -r || die
find "${S}"/${JAVA_RESOURCE_DIRS} -type f ! -name \*.properties \
-exec rm {} \; || die
 }



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...

2020-08-05 Thread Miroslav Šulc
commit: 11678b72a491963a8bad6d65c84d6228a0e3ac5a
Author: zongyu  gmail  com>
AuthorDate: Tue Aug  4 07:10:01 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  5 04:05:24 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=11678b72

sort KEYWORDS

Signed-off-by: zongyu  gmail.com>

 src/main/java/org/gentoo/java/ebuilder/Config.java | 32 
 src/main/java/org/gentoo/java/ebuilder/Main.java   |  2 +-
 .../gentoo/java/ebuilder/maven/MavenProject.java   |  2 +-
 .../java/ebuilder/portage/KeywordComparator.java   | 35 ++
 src/main/resources/usage.txt   |  2 +-
 5 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/Config.java 
b/src/main/java/org/gentoo/java/ebuilder/Config.java
index dbfa30b..4502ab3 100644
--- a/src/main/java/org/gentoo/java/ebuilder/Config.java
+++ b/src/main/java/org/gentoo/java/ebuilder/Config.java
@@ -7,7 +7,10 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 import org.gentoo.java.ebuilder.maven.JavaVersion;
+import org.gentoo.java.ebuilder.portage.KeywordComparator;
 
 /**
  * Container for command line configuration.
@@ -73,7 +76,7 @@ public class Config {
 /**
  * Arch keywords.
  */
-private String keywords;
+private SortedSet keywords = new TreeSet<>(new 
KeywordComparator());
 /**
  * License name.
  */
@@ -301,16 +304,33 @@ public class Config {
  * @return {@link #keywords}
  */
 public String getKeywords() {
-return keywords;
+return String.join(" ", keywords);
 }
 
 /**
- * Setter for {@link #keywords}.
+ * add keyword to {@link #keywords}.
  *
- * @param keywords {@link #keywords}
+ * @param keyword String that contains one or more keywords
  */
-public void setKeywords(final String keywords) {
-this.keywords = keywords;
+public void addKeywords(final String keywords) {
+String[] parts = keywords.split(" ");
+
+/**
+ * Make "-amd64" replace "amd64 ~amd64"
+ * Make "amd64" replace "~amd64"
+ */
+for (String part : parts) {
+if (part.startsWith("-")) {
+this.keywords.remove(part.substring(1));
+this.keywords.remove("~" + part.substring(1));
+this.keywords.add(part);
+} else if (part.startsWith("~")) {
+this.keywords.add(part);
+} else {
+this.keywords.remove("~" + part);
+this.keywords.add(part);
+}
+}
 }
 
 /**

diff --git a/src/main/java/org/gentoo/java/ebuilder/Main.java 
b/src/main/java/org/gentoo/java/ebuilder/Main.java
index 49f6a49..999f741 100644
--- a/src/main/java/org/gentoo/java/ebuilder/Main.java
+++ b/src/main/java/org/gentoo/java/ebuilder/Main.java
@@ -262,7 +262,7 @@ public class Main {
 case "--keywords":
 case "-k":
 i++;
-config.setKeywords(args[i]);
+config.addKeywords(args[i]);
 break;
 case "--license":
 case "-l":

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index e1016a8..51ec844 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -46,7 +46,7 @@ public class MavenProject {
 /**
  * Lisences.
  */
-private SortedSet licenses = new TreeSet<>(10);
+private SortedSet licenses = new TreeSet<>();
 /**
  * Homepage URL.
  */

diff --git 
a/src/main/java/org/gentoo/java/ebuilder/portage/KeywordComparator.java 
b/src/main/java/org/gentoo/java/ebuilder/portage/KeywordComparator.java
new file mode 100644
index 000..4382cf4
--- /dev/null
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/KeywordComparator.java
@@ -0,0 +1,35 @@
+package org.gentoo.java.ebuilder.portage;
+
+import java.util.Comparator;
+
+/**
+ * a comparator to sort keywords
+ *
+ * @author Zhang Zongyu
+ */
+public class KeywordComparator implements Comparator {
+
+/**
+ * it is designed to compare KEYWORDS as what repoman will do:
+ * 1) "-amd64", "amd64" and "~amd64" are the same -- they will
+ *not appear at the same time in a TreeSet;
+ * 2) After splitting the strings into two parts by "-", it will
+ *compare the suffixes before it compares the prefixes.
+ */
+@Override
+public int compare(String o1, String o2) {
+// prepend "-0-" to make sure the length of the array is 2
+final String[] trimmedO1 = (o1 + "-0-").
+replaceAll("^[-~]", "").
+

[gentoo-commits] proj/java-ebuilder:master commit in: src/main/resources/, src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 1198ae64e71b5d8dab832c78ab16a103512eaf58
Author: zongyu  gmail  com>
AuthorDate: Sun Aug  2 09:13:54 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Aug  3 02:28:40 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1198ae64

reformat the license/name string

Signed-off-by: zongyu  gmail.com>

 src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 4 +++-
 src/main/resources/licenseMap.properties  | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
index 8c64e37..d487024 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
@@ -627,7 +627,9 @@ public class MavenParser {
 case "name":
 mavenProject.addLicense(
 mavenLicenses.getEquivalentLicense(
-reader.getElementText()));
+reader.getElementText().
+trim().
+replaceAll("[\n ]+", " ")));
 break;
 default:
 consumeElement(reader);

diff --git a/src/main/resources/licenseMap.properties 
b/src/main/resources/licenseMap.properties
index 5cd2e5d..a2fdbc6 100644
--- a/src/main/resources/licenseMap.properties
+++ b/src/main/resources/licenseMap.properties
@@ -59,7 +59,7 @@ cddl\ +\ gplv2\ with\ classpath\ 
exception=CDDL:GPL-2-with-classpath-exception
 cddl\ license=CDDL
 cddl\ v1.1\ /\ gpl\ v2\ dual\ license=CDDL-1.1:GPL-2
 common\ development\ and\ distribution\ license=CDDL
-common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL
+common\ development\ and\ distribution\ license\ (cddl)\ plus\ gpl=CDDL:GPL-1
 common\ development\ and\ distribution\ license\ (cddl)\ v1.0=CDDL
 common\ development\ and\ distribution\ license\ (cddl)\ version\ 1.0=CDDL
 common\ public\ license\ -\ v\ 1.0=CPL-1.0
@@ -113,7 +113,8 @@ hsqldb\ license=BSD
 indiana\ university\ extreme!\ lab\ software\ 
license=Indiana-University-Extreme-Lab
 indiana\ university\ extreme!\ lab\ software\ license\ 
1.1.1=Indiana-University-Extreme-Lab
 indiana\ university\ extreme!\ lab\ software\ license,\ vesion\ 
1.1.1=Indiana-University-Extreme-Lab
-jquery\ license=MIT:CC0
+jquery\ license=MIT:CC0-1.0
+jsr-000107\ jcache\ 2.9\ public\ review\ -\ updated\ specification\ 
license=Apache-2.0
 lgpl=LGPL-3
 lgpl\ 2.1=LGPL-2.1
 lgpl-2.1=LGPL-2.1



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, ...

2020-08-05 Thread Miroslav Šulc
commit: 6052789c154452e2198ddf57983d626ba870c321
Author: zongyu  gmail  com>
AuthorDate: Mon Aug  3 13:16:36 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Aug  3 14:42:52 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=6052789c

initial effort to support multiple testing frameworks

Signed-off-by: zongyu  gmail.com>

 src/main/java/org/gentoo/java/ebuilder/Config.java |  40 +++
 src/main/java/org/gentoo/java/ebuilder/Main.java   |  17 ++-
 .../gentoo/java/ebuilder/maven/MavenEbuilder.java  | 128 +++--
 .../gentoo/java/ebuilder/maven/MavenParser.java|   5 +
 .../gentoo/java/ebuilder/maven/MavenProject.java   |   9 ++
 src/main/resources/usage.txt   |   1 +
 6 files changed, 161 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/Config.java 
b/src/main/java/org/gentoo/java/ebuilder/Config.java
index 27dbc7c..dbfa30b 100644
--- a/src/main/java/org/gentoo/java/ebuilder/Config.java
+++ b/src/main/java/org/gentoo/java/ebuilder/Config.java
@@ -98,6 +98,14 @@ public class Config {
  * Writer for standard output.
  */
 private final PrintWriter stdoutWriter;
+/**
+ * URI that goes to *-test-sources.jar distributed by maven central
+ */
+private URI testSrcUri;
+/**
+ * whether testSrcUri is set and whether the pkg is from maven central.
+ */
+private boolean testSrcUriExists;
 /**
  * Path to workdir.
  */
@@ -377,6 +385,35 @@ public class Config {
 return stdoutWriter;
 }
 
+/**
+ * Getter for {@link #testSrcUri}.
+ *
+ * @return {@link #testSrcUri}
+ */
+public URI getTestSrcUri() {
+return testSrcUri;
+}
+
+/**
+ * Getter for {@link #testSrcUriExists}.
+ *
+ * @return {@link #testSrcUriExists}
+ */
+public boolean hasTestSrcUri() {
+return testSrcUriExists;
+}
+
+/**
+ * Setter for {@link #testSrcUri}.
+ *
+ * @param testSrcUri {@link #testSrcUri}
+ */
+public void setTestSrcUri(final URI testSrcUri) {
+this.testSrcUri = testSrcUri;
+if (isFromMavenCentral()) {
+this.testSrcUriExists = true;
+}
+}
 /**
  * Getter for {@link #workdir}.
  *
@@ -429,6 +466,9 @@ public class Config {
  */
 public void setFromMavenCentral(final boolean fromMavenCentral) {
 this.fromMavenCentral = fromMavenCentral;
+if (getTestSrcUri() != null) {
+this.testSrcUriExists = true;
+}
 }
 
 /**

diff --git a/src/main/java/org/gentoo/java/ebuilder/Main.java 
b/src/main/java/org/gentoo/java/ebuilder/Main.java
index 72e0a04..49f6a49 100644
--- a/src/main/java/org/gentoo/java/ebuilder/Main.java
+++ b/src/main/java/org/gentoo/java/ebuilder/Main.java
@@ -219,7 +219,9 @@ public class Main {
 try {
 config.setBinjarUri(new URI(args[i]));
 } catch (final URISyntaxException ex) {
-config.getErrorWriter().println("ERROR: BINJAR_URI " + 
args[i]
+config.getErrorWriter().println(
+"ERROR: URI goes to binary jar "
++ args[i]
 + " is not valid.");
 }
 
@@ -291,6 +293,19 @@ public class Main {
 case "-s":
 i++;
 config.setSlot(args[i]);
+break;
+case "--test-src-uri":
+i++;
+
+try {
+config.setTestSrcUri(new URI(args[i]));
+} catch (final URISyntaxException ex) {
+config.getErrorWriter().println(
+"ERROR: URI that goes to src code for testing"
++ args[i]
++ " is not valid.");
+}
+
 break;
 case "--workdir":
 case "-w":

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 857d6c1..b9778ef 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -6,9 +6,11 @@ import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.Set;
 import org.gentoo.java.ebuilder.Config;
 
 /**
@@ -29,6 +31,14 @@ public class MavenEbuilder {
 private static final String defaultHomepage
 = "https://wiki.gentoo.org/wiki/No_homepage;;
 
+/**
+ * The extra dependency for framework "pkgdiff"
+ */
+   

[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 22348c9c8ef160aab32ed4231cd45279ec56cdd2
Author: zongyu  gmail  com>
AuthorDate: Mon Aug  3 02:37:54 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Aug  3 02:40:52 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=22348c9c

add default{Desciption,Homepage}

Signed-off-by: zongyu  gmail.com>

 .../gentoo/java/ebuilder/maven/MavenEbuilder.java  | 33 --
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 646fc13..1fde760 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -18,6 +18,17 @@ import org.gentoo.java.ebuilder.Config;
  */
 public class MavenEbuilder {
 
+/**
+ * The fallback description if no description is found in pom.xml.
+ */
+private static final String defaultDescription = "${MAVEN_ID}";
+
+/**
+ * The fallback homepage if no homepage is found in pom.xml.
+ */
+private static final String defaultHomepage
+= "https://wiki.gentoo.org/wiki/No_homepage;;
+
 /**
  * EAPI version.
  */
@@ -694,10 +705,22 @@ public class MavenEbuilder {
 final MavenProject mavenProject, final PrintWriter writer) {
 writer.println();
 
+// write MAVEN_ID ahead of DESCRIPTION,
+//   becase defaultDescription need ${MAVEN_ID}
+writer.print("MAVEN_ID=\"");
+writer.print(mavenProject.getGroupId());
+writer.print(':');
+writer.print(mavenProject.getArtifactId());
+writer.print(':');
+writer.print(mavenProject.getVersion());
+writer.println('"');
+
 writer.print("DESCRIPTION=\"");
 
 if (mavenProject.getDescription() != null) {
 writer.print(mavenProject.getDescription().replace("\"", "\\\""));
+} else {
+writer.print(defaultDescription);
 }
 
 writer.println('"');
@@ -706,6 +729,8 @@ public class MavenEbuilder {
 
 if (mavenProject.getHomepage() != null) {
 writer.print(mavenProject.getHomepage());
+} else {
+writer.print(defaultHomepage);
 }
 
 writer.println('"');
@@ -736,14 +761,6 @@ public class MavenEbuilder {
 writer.print("KEYWORDS=\"");
 writer.print(config.getKeywords());
 writer.println('"');
-
-writer.print("MAVEN_ID=\"");
-writer.print(mavenProject.getGroupId());
-writer.print(':');
-writer.print(mavenProject.getArtifactId());
-writer.print(':');
-writer.print(mavenProject.getVersion());
-writer.println('"');
 }
 
 /**



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: 774340875eb0e929b0db193cd4e84887e52339d8
Author: zongyu  gmail  com>
AuthorDate: Mon Aug  3 08:38:58 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Aug  3 10:56:22 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=77434087

make MavenEbuilder not print unnecessary lines

Signed-off-by: zongyu  gmail.com>

 .../gentoo/java/ebuilder/maven/MavenEbuilder.java  | 24 --
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 1fde760..857d6c1 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -450,10 +450,8 @@ public class MavenEbuilder {
 mavenProjects, "runtime");
 final boolean hasCDepend = !commonDependencies.isEmpty();
 
-writer.println();
-
 if (hasCDepend) {
-writer.println("# Common dependencies");
+writer.println("\n# Common dependencies");
 
 mavenProjects.stream().
 filter((mavenProject)
@@ -474,11 +472,9 @@ public class MavenEbuilder {
 writer.println('"');
 }
 
-writer.println();
-
 if (!compileDependencies.isEmpty()
 || !testDependencies.isEmpty()) {
-writer.println("# Compile dependencies");
+writer.println("\n# Compile dependencies");
 
 mavenProjects.stream().
 filter((mavenProject)
@@ -543,10 +539,8 @@ public class MavenEbuilder {
 
 writer.println('"');
 
-writer.println();
-
 if (!runtimeDependencies.isEmpty()) {
-writer.println("# Runtime dependencies");
+writer.println("\n# Runtime dependencies");
 
 mavenProjects.stream().
 filter((mavenProject)
@@ -558,7 +552,7 @@ public class MavenEbuilder {
 });
 }
 
-writer.print("RDEPEND=\"\n\t>=virtual/jre-");
+writer.print("\nRDEPEND=\"\n\t>=virtual/jre-");
 writer.print(getMinTargetVersion(
 mavenProjects, config.getForceMinJavaVersion()));
 writer.println(":*");
@@ -575,8 +569,6 @@ public class MavenEbuilder {
 });
 }
 
-
-
 writer.println('"');
 }
 
@@ -680,14 +672,14 @@ public class MavenEbuilder {
 // Global:
 // JAVA_GENTOO_CLASSPATH
 // JAVA_CLASSPATH_EXTRA
-// JAVA_GENTOO_TEST_CLASSPATH
+// JAVA_TEST_GENTOO_CLASSPATH
 // JAVA_ENCODING (unless it differs in projects)
 // Compile (jars, doc):
 // JAVA_SRC_DIR
 // JAVA_RESOURCE_DIRS
 // JAVA_ENCODING (in case project encodings are different)
 // Test:
-// JAVA_TESTING_FRAMEWORK
+// JAVA_TESTING_FRAMEWORKS
 // JAVA_TEST_SRC_DIR
 // JAVA_TEST_RESOURCE_DIRS
 // Install (jars, doc, sources):
@@ -855,7 +847,7 @@ public class MavenEbuilder {
 firstTestVar = false;
 }
 
-writer.print("JAVA_TESTING_FRAMEWORK=\"");
+writer.print("JAVA_TESTING_FRAMEWORKS=\"");
 writer.print(testingFramework);
 writer.println('"');
 }
@@ -866,7 +858,7 @@ public class MavenEbuilder {
 firstTestVar = false;
 }
 
-writer.print("JAVA_GENTOO_TEST_CLASSPATH=\"");
+writer.print("JAVA_TEST_GENTOO_CLASSPATH=\"");
 writer.print(createClassPath(mavenProject.getTestDependencies()));
 writer.println('"');
 }



[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

2020-08-05 Thread Miroslav Šulc
commit: d87268c1674caf498a8cb65033a6a1b763112e35
Author: zongyu  gmail  com>
AuthorDate: Tue Aug  4 07:08:00 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  4 07:08:00 2020 +
URL:https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=d87268c1

sort licenses

Signed-off-by: zongyu  gmail.com>

 src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index 4ce11b8..e1016a8 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -4,9 +4,9 @@ import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 /**
  * Contains information about maven project collected from pom.xml.
@@ -46,7 +46,7 @@ public class MavenProject {
 /**
  * Lisences.
  */
-private Set licenses = new HashSet<>(10);
+private SortedSet licenses = new TreeSet<>(10);
 /**
  * Homepage URL.
  */



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/

2020-08-05 Thread Miroslav Šulc
commit: b5a6e082349adea21e3a5d416eac8f7e491d5c2a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Aug  5 14:26:41 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug  5 14:26:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a6e082

net-analyzer/zabbix: removed vulnerable 3.0.31

Bug: https://bugs.gentoo.org/733118
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 net-analyzer/zabbix/zabbix-3.0.31.ebuild | 350 ---
 1 file changed, 350 deletions(-)

diff --git a/net-analyzer/zabbix/zabbix-3.0.31.ebuild 
b/net-analyzer/zabbix/zabbix-3.0.31.ebuild
deleted file mode 100644
index ca1bbd3d949..000
--- a/net-analyzer/zabbix/zabbix-3.0.31.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
-HOMEPAGE="https://www.zabbix.com/;
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/stable/${PV}/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-   proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-   server? ( ^^ ( mysql oracle postgres odbc ) )
-   static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-   curl? ( net-misc/curl )
-   java? ( >=virtual/jdk-1.8:* )
-   ldap? (
-   =dev-libs/cyrus-sasl-2*
-   net-libs/gnutls
-   net-nds/openldap
-   )
-   libxml2? ( dev-libs/libxml2 )
-   mysql? ( dev-db/mysql-connector-c )
-   odbc? ( dev-db/unixODBC )
-   openipmi? ( sys-libs/openipmi )
-   oracle? ( dev-db/oracle-instantclient-basic )
-   postgres? ( dev-db/postgresql:* )
-   proxy?  ( sys-libs/zlib )
-   server? (
-   dev-libs/libevent
-   sys-libs/zlib
-   )
-   snmp? ( net-analyzer/net-snmp )
-   sqlite? ( dev-db/sqlite )
-   ssh? ( net-libs/libssh2 )
-   ssl? ( dev-libs/openssl:=[-bindist] )
-   xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-   java? ( >=virtual/jre-1.8:* )
-   mysql? ( virtual/mysql )
-   proxy? ( net-analyzer/fping[suid] )
-   server? (
-   app-admin/webapp-config
-   dev-libs/libevent
-   dev-libs/libpcre
-   net-analyzer/fping[suid]
-   )
-   frontend? (
-   app-admin/webapp-config
-   
dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-   media-libs/gd[png]
-   virtual/httpd-php:*
-   mysql? ( dev-lang/php[mysqli] )
-   odbc? ( dev-lang/php[odbc] )
-   oracle? ( dev-lang/php[oci8-instant-client] )
-   postgres? ( dev-lang/php[postgres] )
-   sqlite? ( dev-lang/php[sqlite] )
-   )
-"
-DEPEND="${COMMON_DEPEND}
-   static? (
-   curl? ( net-misc/curl[static-libs] )
-   ldap? (
-   =dev-libs/cyrus-sasl-2*[static-libs]
-   net-libs/gnutls[static-libs]
-   net-nds/openldap[static-libs]
-   )
-   libxml2? ( dev-libs/libxml2[static-libs] )
-   mysql? ( dev-db/mysql-connector-c[static-libs] )
-   odbc? ( dev-db/unixODBC[static-libs] )
-   postgres? ( dev-db/postgresql:*[static-libs] )
-   sqlite? ( dev-db/sqlite[static-libs] )
-   ssh? ( net-libs/libssh2 )
-   )
-"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-   "${FILESDIR}/${PN}-3.0.30-mysql8.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-   if use oracle; then
-   if [ -z "${ORACLE_HOME}" ]; then
-   eerror
-   eerror "The environment variable ORACLE_HOME must be 
set"
-   eerror "and point to the correct location."
-   eerror "It looks like you don't have Oracle installed."
-   eerror
-   die "Environment variable ORACLE_HOME is not set"
-   fi
-   if has_version 'dev-db/oracle-instantclient-basic'; then
-   ewarn
-   ewarn "Please ensure you have a full install of the 
Oracle client."
-   ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-

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

2020-08-05 Thread Agostino Sarubbo
commit: f62b6214758d27a19063a088705bbb20ce604d29
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:26 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62b6214

dev-python/dkimpy: x86 stable wrt bug #734798

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-python/dkimpy/dkimpy-1.0.4.ebuild 
b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
index 9b82416d574..0cdf6add25e 100644
--- a/dev-python/dkimpy/dkimpy-1.0.4.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="



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

2020-08-05 Thread Agostino Sarubbo
commit: 9d84c3106c81c8c95b3756bee6f3cf7cbc218d15
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d84c310

sys-libs/libxcrypt: x86 stable wrt bug #734634

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild 
b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
index ff6b9f2ed59..c2e66761e43 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/besser82/libxcrypt;
 
 LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
 SLOT="0/1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+compat split-usr +static-libs system test"
 
 DEPEND="system? (



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

2020-08-05 Thread Agostino Sarubbo
commit: e1ad8e4e4ab39960a11256079fc232dab64bb211
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ad8e4e

x11-misc/qt5ct: x86 stable wrt bug #734540

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/qt5ct/qt5ct-1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/qt5ct/qt5ct-1.0.ebuild b/x11-misc/qt5ct/qt5ct-1.0.ebuild
index fdc06c00927..5ec0690f1e1 100644
--- a/x11-misc/qt5ct/qt5ct-1.0.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2;
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+dbus"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-shells/posh/

2020-08-05 Thread Agostino Sarubbo
commit: 1ac222faa5c995b307c522e5726e0aa9b3c277bf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:46 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac222fa

app-shells/posh: x86 stable wrt bug #734534

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-shells/posh/posh-0.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/posh/posh-0.14.1.ebuild 
b/app-shells/posh/posh-0.14.1.ebuild
index f8a249ea0b0..e2a2f510457 100644
--- a/app-shells/posh/posh-0.14.1.ebuild
+++ b/app-shells/posh/posh-0.14.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+ BSD public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"



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

2020-08-05 Thread Agostino Sarubbo
commit: 928def1b7d8263702ddeac415824b90a6aafa208
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:17:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:17:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=928def1b

app-misc/lcd4linux: x86 stable wrt bug #735220

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild 
b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
index 2bbdac173ba..20e1c6d2177 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dmalloc outb"
 REQUIRED_USE="
?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )



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

2020-08-05 Thread Agostino Sarubbo
commit: 83c84bda42aaba62ef5fed7159fcf17842b12037
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:17:00 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:17:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c84bda

dev-python/nautilus-python: x86 stable wrt bug #735204

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild 
b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
index d1caa228ce1..8258df11b31 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/nautilus-python/;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Require pygobject:3 and USE=introspection on nautilus for sanity,



[gentoo-commits] repo/gentoo:master commit in: media-sound/teamspeak-client/

2020-08-05 Thread Agostino Sarubbo
commit: 42e0c29315a703cfb2ebe15b6091c2ac087a80d4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e0c293

media-sound/teamspeak-client: x86 stable wrt bug #734802

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild 
b/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
index 5453d19c153..af57b75982c 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
x86? ( 
https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run
 )
 "
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="0"
 IUSE="+alsa pulseaudio"



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

2020-08-05 Thread Agostino Sarubbo
commit: 3b888971c247aec36eac0017e5570cdb0e86a16c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b888971

media-gfx/gthumb: x86 stable wrt bug #712932

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild 
b/media-gfx/gthumb/gthumb-3.10.0.ebuild
index bb4265b619d..a7ddac9f803 100644
--- a/media-gfx/gthumb/gthumb-3.10.0.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff 
webp"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-portage/pram/

2020-08-05 Thread Agostino Sarubbo
commit: 83a5fcdebc799c475592e4513843de4a36597404
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:42 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a5fcde

app-portage/pram: x86 stable wrt bug #734530

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-portage/pram/pram-9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/pram/pram-9.ebuild b/app-portage/pram/pram-9.ebuild
index ff45b7e7ee5..c60e887a732 100644
--- a/app-portage/pram/pram-9.ebuild
+++ b/app-portage/pram/pram-9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



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

2020-08-05 Thread Agostino Sarubbo
commit: 3d6912e86b560cade2c617194961fac9bfa8c561
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6912e8

net-dns/ddclient: x86 stable wrt bug #734656

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dns/ddclient/ddclient-3.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/ddclient/ddclient-3.9.1.ebuild 
b/net-dns/ddclient/ddclient-3.9.1.ebuild
index 7c5ed788b5b..cd30dfa85f2 100644
--- a/net-dns/ddclient/ddclient-3.9.1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://ddclient.net/;
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"



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

2020-08-05 Thread Agostino Sarubbo
commit: acdc053a8f4f98d1e990c074598172a8f8b8a823
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:53 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdc053a

dev-libs/jsoncpp: x86 stable wrt bug #734538

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild 
b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
index 8a239a927e2..d90de76e3fc 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-opensteamworks/

2020-08-05 Thread Agostino Sarubbo
commit: 8354fc4edafee5bb97eb80ccba1b3f104b689c63
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:43 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8354fc4e

x11-plugins/pidgin-opensteamworks: x86 stable wrt bug #735112

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild 
b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
index c688cb9ee8e..bc8f30a4b43 100644
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.7.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-antivirus/clamtk/

2020-08-05 Thread Agostino Sarubbo
commit: 80361a9f67b021cd420dbcd5ec8aad77a9c342f4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80361a9f

app-antivirus/clamtk: x86 stable wrt bug #735204

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-antivirus/clamtk/clamtk-6.03-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-antivirus/clamtk/clamtk-6.03-r1.ebuild 
b/app-antivirus/clamtk/clamtk-6.03-r1.ebuild
index d708ef4c5cc..5b7116dac17 100644
--- a/app-antivirus/clamtk/clamtk-6.03-r1.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.03-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde nautilus nemo +nls thunar"
 REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/

2020-08-05 Thread Agostino Sarubbo
commit: 263982c34e641aa6c77ab597e888f2615029ccfc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:01 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=263982c3

sci-mathematics/z3: x86 stable wrt bug #734542

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/z3/z3-4.8.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/z3/z3-4.8.8.ebuild 
b/sci-mathematics/z3/z3-4.8.8.ebuild
index b6edbe2c611..7ca54108075 100644
--- a/sci-mathematics/z3/z3-4.8.8.ebuild
+++ b/sci-mathematics/z3/z3-4.8.8.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/dir2ogg/

2020-08-05 Thread Agostino Sarubbo
commit: 11f9156b1367a3d32c08884892be031549679952
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:47 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f9156b

media-sound/dir2ogg: x86 stable wrt bug #735176

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild 
b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
index 7101b18bab2..d20c747e08d 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="aac flac mac mp3 musepack wavpack wma"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



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

2020-08-05 Thread Agostino Sarubbo
commit: 427992a51db3c86d39212fb9b68c166c481d971e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427992a5

app-arch/libarchive: x86 stable wrt bug #734520

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/libarchive/libarchive-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild 
b/app-arch/libarchive/libarchive-3.4.3.ebuild
index 57d1994f5f8..87a77a41f2c 100644
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz;
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 
+lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="



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

2020-08-05 Thread Agostino Sarubbo
commit: 8afd3832eeaac2365ec698dd992a2a8d2c71a84c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:39 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afd3832

media-libs/lvtk: x86 stable wrt bug #735070

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/lvtk/lvtk-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/lvtk/lvtk-1.2.0.ebuild 
b/media-libs/lvtk/lvtk-1.2.0.ebuild
index 80dc0ab33a1..74f3be66ae3 100644
--- a/media-libs/lvtk/lvtk-1.2.0.ebuild
+++ b/media-libs/lvtk/lvtk-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lvtk/lvtk/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc examples +gtk2 +tools"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



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

2020-08-05 Thread Agostino Sarubbo
commit: 0e2596f168cad848d458ad15981357d227e33732
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:51 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2596f1

app-misc/golly: x86 stable wrt bug #735192

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-misc/golly/golly-3.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/golly/golly-3.3-r3.ebuild 
b/app-misc/golly/golly-3.3-r3.ebuild
index c7042f51869..8e1fd8ca096 100644
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



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

2020-08-05 Thread Agostino Sarubbo
commit: 694b2a6285dd933bca1750345e81438ec7ca71e6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694b2a62

app-arch/patool: x86 stable wrt bug #714048

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/patool/patool-1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/patool/patool-1.12.ebuild 
b/app-arch/patool/patool-1.12.ebuild
index c8161661369..bba8d66cfe2 100644
--- a/app-arch/patool/patool-1.12.ebuild
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""



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

2020-08-05 Thread Agostino Sarubbo
commit: 3178b64e9bdd0c56968a8a1e3e5a0d22b8de42bc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:49 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3178b64e

dev-util/debugedit: x86 stable wrt bug #734536

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-util/debugedit/debugedit-4.15.1.ebuild 
b/dev-util/debugedit/debugedit-4.15.1.ebuild
index 1b246bcf974..6fe9c37f5aa 100644
--- a/dev-util/debugedit/debugedit-4.15.1.ebuild
+++ b/dev-util/debugedit/debugedit-4.15.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 
1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-portage/eix/

2020-08-05 Thread Agostino Sarubbo
commit: 4d7e8ddea77601ed77e8f0ef045668b9ad519c7c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:38 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7e8dde

app-portage/eix: x86 stable wrt bug #734528

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-portage/eix/eix-0.34.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/eix/eix-0.34.4.ebuild 
b/app-portage/eix/eix-0.34.4.ebuild
index 11761983768..27581250b04 100644
--- a/app-portage/eix/eix-0.34.4.ebuild
+++ b/app-portage/eix/eix-0.34.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )



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

2020-08-05 Thread Agostino Sarubbo
commit: 03d82bff17d3820449a9c4f936929a54bb5b9ce0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d82bff

app-editors/nano: x86 stable wrt bug #734556

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/nano/nano-4.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/nano/nano-4.9.3.ebuild 
b/app-editors/nano/nano-4.9.3.ebuild
index c20ac389f34..5e77b11f1a7 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then
 else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"



[gentoo-commits] repo/gentoo:master commit in: app-portage/gpyutils/

2020-08-05 Thread Agostino Sarubbo
commit: b657e354e2784e9a48b790014028815472ee24cd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:15:29 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:15:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b657e354

app-portage/gpyutils: x86 stable wrt bug #734526

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-portage/gpyutils/gpyutils-0.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/gpyutils/gpyutils-0.4.2.ebuild 
b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
index 4bf90b50f68..ac5c7dac4d6 100644
--- a/app-portage/gpyutils/gpyutils-0.4.2.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"



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

2020-08-05 Thread Agostino Sarubbo
commit: e818c45e56bde6c64ab107eb465e895efac8f5bc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e818c45e

dev-libs/libbytesize: x86 stable wrt bug #734936

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-libs/libbytesize/libbytesize-2.3.ebuild 
b/dev-libs/libbytesize/libbytesize-2.3.ebuild
index bed3e450153..bdb2d302c57 100644
--- a/dev-libs/libbytesize/libbytesize-2.3.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize;
 
SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz;
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc python test tools"
 
 REQUIRED_USE="



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

2020-08-05 Thread Agostino Sarubbo
commit: b88d7201fa7589ab86dee253a50c8c01716866d5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:16:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:16:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88d7201

kde-apps/ark: x86 stable wrt bug #734622

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/kde-apps/ark/ark-20.04.3-r1.ebuild 
b/kde-apps/ark/ark-20.04.3-r1.ebuild
index 65dffc5fc6d..a06c99dee9c 100644
--- a/kde-apps/ark/ark-20.04.3-r1.ebuild
+++ b/kde-apps/ark/ark-20.04.3-r1.ebuild
@@ -16,7 +16,7 @@ https://utils.kde.org/projects/ark/;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="bzip2 lzma zip"
 
 BDEPEND="



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

2020-08-05 Thread Agostino Sarubbo
commit: 741e21b0e6c5c6eac6605e9562865ff4904dba6b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:08:12 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:08:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741e21b0

dev-python/pip: sparc stable wrt bug #734362

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index 9ec9561ec8e..4366b935080 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not 
very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 



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

2020-08-05 Thread Agostino Sarubbo
commit: 7c8714a9e632bd6a916f7655c97ec67c78cfbe99
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:08:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:08:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8714a9

dev-python/csv23: sparc stable wrt bug #734362

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

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

diff --git a/dev-python/csv23/csv23-0.3.2.ebuild 
b/dev-python/csv23/csv23-0.3.2.ebuild
index ea2e4c1090e..4cd89a07f42 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 # note: upstream really uses mock at runtime
 RDEPEND="



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

2020-08-05 Thread Agostino Sarubbo
commit: d30ed33197082d916cbb36f480f4b6b930748708
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 14:06:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 14:06:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30ed331

app-arch/zopfli: s390 stable wrt bug #733528

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/zopfli/zopfli-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild 
b/app-arch/zopfli/zopfli-1.0.3.ebuild
index f0026d95344..5ee720b8196 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )



<    1   2   3   4   >