[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/

2019-07-29 Thread Eray Aslan
commit: 7e481b20b55c896ba8c7b6a31b59a7c54b257c00
Author: Eray Aslan  gentoo  org>
AuthorDate: Tue Jul 30 06:31:32 2019 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Tue Jul 30 06:31:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e481b20

net-mail/cyrus-imapd: bump to 3.0.11

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Eray Aslan  gentoo.org>

 net-mail/cyrus-imapd/Manifest  |   1 +
 net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild | 224 +
 2 files changed, 225 insertions(+)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a6fd79b4cf5..a8109439a59 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,2 +1,3 @@
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 
366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a
 SHA512 
1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
+DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B 
ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06
 SHA512 
058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B 
a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873
 SHA512 
262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
new file mode 100644
index 000..2a381e5de2d
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.11.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/";
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz";
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+   mysql nntp pam perl postgres replication +server sieve snmp \
+   sqlite ssl static-libs tcpd test xapian"
+
+CDEPEND="
+   sys-libs/zlib:0=
+   dev-libs/libpcre:3
+   >=dev-libs/cyrus-sasl-2.1.13:2
+   dev-libs/jansson
+   dev-libs/icu:0=
+   sys-libs/e2fsprogs-libs
+   afs? ( net-fs/openafs )
+   calalarm? ( dev-libs/libical:0= )
+   caps? ( sys-libs/libcap )
+   clamav? ( app-antivirus/clamav )
+   http? ( dev-libs/libxml2:2 dev-libs/libical:0= )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   lmdb? ( dev-db/lmdb:0= )
+   mysql? ( dev-db/mysql-connector-c:0= )
+   nntp? ( !net-nntp/leafnode )
+   pam? (
+   virtual/pam
+   >=net-mail/mailbase-1
+   )
+   perl? ( dev-lang/perl:= )
+   postgres? ( dev-db/postgresql:* )
+   snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:0= )
+   ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist] )
+   sqlite? ( dev-db/sqlite:3 )
+   tcpd? ( >=sys-apps/tcp-wrappers-7.6
+   snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
+   )
+   xapian? ( >=dev-libs/xapian-1.4.0:0= )
+"
+DEPEND="${CDEPEND}
+   test? ( dev-util/cunit )
+"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+   !mail-mta/courier
+   !net-mail/bincimap
+   !net-mail/courier-imap
+   !net-mail/uw-imap
+   !app-arch/dump
+"
+
+REQUIRED_USE="
+   afs? ( kerberos )
+   backup? ( sqlite )
+   calalarm? ( http )
+   http? ( sqlite )
+"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" )
+
+pkg_setup() {
+   enewuser cyrus -1 -1 /usr/cyrus mail
+   # https://bugs.gentoo.org/604466
+   append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+   default
+   # Fix master(8)->cyrusmaster(8) manpage.
+   for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+   sed -i -e 's:master\.8:cyrusmaster.8:g' \
+   -e 's:master(8):cyrusmaster(8):g' \
+   "${i}" || die "sed failed" || die "sed failed"
+   done
+   mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+   sed -i -e "s:MASTER:CYRUSMASTER:g" \
+   -e "s:Master:Cyrusmaster:g" \
+   -e "s:master:cyrusmaster:g" \
+   man/cyrusmaster.8 || die "

[gentoo-commits] repo/gentoo:master commit in: net-mail/cyrus-imapd/, net-mail/cyrus-imapd/files/

2019-07-29 Thread Eray Aslan
commit: b5e9758e9142364cf5ebb277206c6b2463149814
Author: Eray Aslan  gentoo  org>
AuthorDate: Tue Jul 30 06:34:55 2019 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Tue Jul 30 06:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e9758e

net-mail/cyrus-imapd: remove old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Eray Aslan  gentoo.org>

 net-mail/cyrus-imapd/Manifest  |   1 -
 net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild  | 221 -
 .../cyrus-imapd/files/cyrus-imapd-fix-tests.patch  |  21 --
 .../files/cyrus-imapd-libcap-libs.patch|  35 
 .../files/cyrus-imapd-sieve-libs-v4.patch  | 127 
 net-mail/cyrus-imapd/metadata.xml  |   2 -
 6 files changed, 407 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index a8109439a59..cfb8cb572cd 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,2 @@
 DIST cyrus-imapd-3.0.10.tar.gz 10766263 BLAKE2B 
366a8f524849d2173b8ea836e9f239ae20295dd435594af17d4c4682e7e672bc92c9f1bb0a60d7f7dce638beb94954f20906f9454b33830d2dcabb956ebd558a
 SHA512 
1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0
 DIST cyrus-imapd-3.0.11.tar.gz 10797507 BLAKE2B 
ac62c11e50b6d92c17056a050f3adcfdeb055930a8568873f65c14a131a04223929c00679265ab7b96a056d7642f93f484ac75b136a9d09c0fa5e0dba0e89a06
 SHA512 
058efc2e462729b79e431e1b5dab1addfe737aeec8b686698cd2270748275028ca5722ed3960fcd680a0393027ee1b1d7dff65872dd1d8349a3f933e81227e48
-DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B 
a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873
 SHA512 
262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410

diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild 
b/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
deleted file mode 100644
index ba030ccce89..000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.5.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic pam ssl-cert user
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="https://www.cyrusimap.org/";
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz";
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="afs backup calalarm caps clamav http jmap kerberos ldap lmdb \
-   mysql nntp pam perl postgres replication +server sieve snmp \
-   sphinx sqlite ssl static-libs tcpd test xapian"
-
-# virtual/mysql-5.5 added for the --variable= option below
-CDEPEND="sys-libs/zlib
-   dev-libs/libpcre
-   >=dev-libs/cyrus-sasl-2.1.13
-   dev-libs/jansson
-   dev-libs/icu:=
-   afs? ( net-fs/openafs )
-   caps? ( sys-libs/libcap )
-   clamav? ( app-antivirus/clamav )
-   http? ( dev-libs/libxml2 dev-libs/libical )
-   kerberos? ( virtual/krb5 )
-   ldap? ( net-nds/openldap )
-   lmdb? ( dev-db/lmdb )
-   mysql? ( >=virtual/mysql-5.5 )
-   nntp? ( !net-nntp/leafnode )
-   pam? (
-   virtual/pam
-   >=net-mail/mailbase-1
-   )
-   perl? ( dev-lang/perl:= )
-   postgres? ( dev-db/postgresql:* )
-   snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-   ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-   sqlite? ( dev-db/sqlite:3 )
-   tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( 
net-analyzer/net-snmp[tcpd=] ) )
-   xapian? ( >=dev-libs/xapian-1.4.0 )"
-
-DEPEND="${CDEPEND}
-   test? ( dev-util/cunit )"
-
-# all blockers really needed?
-RDEPEND="${CDEPEND}
-   !mail-mta/courier
-   !net-mail/bincimap
-   !net-mail/courier-imap
-   !net-mail/uw-imap
-   !net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-   backup? ( sqlite )
-   calalarm? ( http )
-   http? ( sqlite )
-   jmap? ( http xapian )
-   sphinx? ( mysql )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-   enewuser cyrus -1 -1 /usr/cyrus mail
-   append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-   # bug 604470
-   eapply -p1 "${FILESDIR}/${PN}-sieve-libs-v4.patch"
-   eapply -p1 "${FILESDIR}/${PN}-libcap-libs.patch"
-   eapply -p1 "${FILESDIR}/${PN}-fix-tests.patch"
-   # Fix master(8)->cyrusmaster(8) manpage.
-   for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-   sed -i -e 's:master\.8:cyrusmaster.8:g' \
-   -e 's:master(8):cyrusmaster(8):g' \
-   "${i}" || die "sed failed" || die "sed failed"
-   done
-   mv man/master.8 man/cyrusmaster.8 || die "mv fai

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

2019-07-29 Thread Johannes Huber
commit: ae9416e96281ec5754f356ff5bdcefaf604cf29c
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jul 30 06:25:37 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jul 30 06:26:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9416e9

media-sound/lollypop: Remove 1.1.4.5

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Johannes Huber  gentoo.org>

 media-sound/lollypop/Manifest|  1 -
 media-sound/lollypop/lollypop-1.1.4.5.ebuild | 60 
 2 files changed, 61 deletions(-)

diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index a2b1dd9cb17..fd808ef7140 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,2 @@
 DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 
65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b
 SHA512 
d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
-DIST lollypop-1.1.4.5.tar.xz 455344 BLAKE2B 
c40aec6c8a9225bbcaf70516530615854e0cc64567423dd1e38da4dd8ce0eb6f37f5b50f4960a6583c37785a350e1ca595a3615e98a2d8c6c46fff5c5978e10c
 SHA512 
add1e84a1b5564433462641795bf7aa18e3663db4a27139da3bc621d2658249a4cfcc7cda092c7f02ae2a95b823ef00823e12b811e5747dad5ac9103f6420111
 DIST lollypop-1.1.4.7.tar.xz 455536 BLAKE2B 
1c8c07fcf4f428f1ff04ff9bbea927b337ac35359e05c7675aeed6f48c0ebe68dc14f1e9bae22a3dafb3122df75f0cbae0bdf6fae0f097add6a1b8669697e624
 SHA512 
2b0868080ae78a5718f7169bc4c11fe603d030f505644a5aaa342ee50c5a19a567e79094b9abdf8f87e117bb551bcff522e0b0e2bf3cdb9a0cb9319c498b7b16

diff --git a/media-sound/lollypop/lollypop-1.1.4.5.ebuild 
b/media-sound/lollypop/lollypop-1.1.4.5.ebuild
deleted file mode 100644
index 750233c6d5a..000
--- a/media-sound/lollypop/lollypop-1.1.4.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="47f36faea72b3f99662772209de6038d"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop";
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz";
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="${PYTHON_DEPS}
-   dev-libs/appstream-glib[introspection]
-   dev-libs/glib:2
-   dev-libs/gobject-introspection[cairo]
-   dev-python/pycairo[${PYTHON_USEDEP}]
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   gnome-base/gnome-common
-   x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
-   dev-python/pkgconfig[${PYTHON_USEDEP}]
-   dev-util/desktop-file-utils
-   dev-util/itstool
-   dev-util/intltool
-"
-RDEPEND="${DEPEND}
-   app-crypt/libsecret[introspection]
-   dev-libs/totem-pl-parser
-   dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-   dev-python/dbus-python
-   dev-python/pillow[${PYTHON_USEDEP}]
-   >=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
-   media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
-   gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-   gnome2_gconf_install
-   gnome2_schemas_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   gnome2_gconf_uninstall
-   gnome2_schemas_update
-   xdg_desktop_database_update
-}



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

2019-07-29 Thread Johannes Huber
commit: d9d1fcd8edf98401266e66a251c23d536dd474ee
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jul 30 06:24:52 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jul 30 06:25:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d1fcd8

media-sound/lollypop: Version bump 1.1.4.7

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Johannes Huber  gentoo.org>

 media-sound/lollypop/Manifest|  1 +
 media-sound/lollypop/lollypop-1.1.4.7.ebuild | 60 
 2 files changed, 61 insertions(+)

diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index c2210cacdac..a2b1dd9cb17 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,2 +1,3 @@
 DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 
65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b
 SHA512 
d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
 DIST lollypop-1.1.4.5.tar.xz 455344 BLAKE2B 
c40aec6c8a9225bbcaf70516530615854e0cc64567423dd1e38da4dd8ce0eb6f37f5b50f4960a6583c37785a350e1ca595a3615e98a2d8c6c46fff5c5978e10c
 SHA512 
add1e84a1b5564433462641795bf7aa18e3663db4a27139da3bc621d2658249a4cfcc7cda092c7f02ae2a95b823ef00823e12b811e5747dad5ac9103f6420111
+DIST lollypop-1.1.4.7.tar.xz 455536 BLAKE2B 
1c8c07fcf4f428f1ff04ff9bbea927b337ac35359e05c7675aeed6f48c0ebe68dc14f1e9bae22a3dafb3122df75f0cbae0bdf6fae0f097add6a1b8669697e624
 SHA512 
2b0868080ae78a5718f7169bc4c11fe603d030f505644a5aaa342ee50c5a19a567e79094b9abdf8f87e117bb551bcff522e0b0e2bf3cdb9a0cb9319c498b7b16

diff --git a/media-sound/lollypop/lollypop-1.1.4.7.ebuild 
b/media-sound/lollypop/lollypop-1.1.4.7.ebuild
new file mode 100644
index 000..498a26092c4
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.1.4.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="d11925640e7c0337893933b50d144aae"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop";
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz";
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="${PYTHON_DEPS}
+   dev-libs/appstream-glib[introspection]
+   dev-libs/glib:2
+   dev-libs/gobject-introspection[cairo]
+   dev-python/pycairo[${PYTHON_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   gnome-base/gnome-common
+   x11-libs/gtk+:3
+"
+BDEPEND="${DEPEND}
+   dev-python/pkgconfig[${PYTHON_USEDEP}]
+   dev-util/desktop-file-utils
+   dev-util/itstool
+   dev-util/intltool
+"
+RDEPEND="${DEPEND}
+   app-crypt/libsecret[introspection]
+   dev-libs/totem-pl-parser
+   dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+   dev-python/dbus-python
+   dev-python/pillow[${PYTHON_USEDEP}]
+   >=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+   media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+   gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+   gnome2_gconf_install
+   gnome2_schemas_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   gnome2_gconf_uninstall
+   gnome2_schemas_update
+   xdg_desktop_database_update
+}



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

2019-07-29 Thread Michał Górny
commit: 6bb41f183c94b17836ba47db98bcc2116f8cd4ca
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:16:29 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:17:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb41f18

package.mask: Last rite virtual/python-dnspython

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index e00089fbaea..c557e176654 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny  (30 Jul 2019)
+# Obsolete virtual that was created back when dev-python/dnspython
+# needed separate slots for py2 & py3.  The versions needing it are long
+# gone.  Replace all its uses with dev-python/dnspython.
+# Removal in 30 days.
+virtual/python-dnspython
+
 # Thomas Deutschmann  (2019-07-29)
 # Broken config parser
 >=app-metrics/collectd-5.9.0



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

2019-07-29 Thread Hans de Graaff
commit: a941cb3497315f72a9f6ae9cf9e4b4727ad38683
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul 30 06:06:57 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul 30 06:07:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a941cb34

www-apps/nanoc-core: add 4.11.7

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

 www-apps/nanoc-core/Manifest |  1 +
 www-apps/nanoc-core/nanoc-core-4.11.7.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index cb760a6e09e..2f5fe5fa396 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,3 +1,4 @@
 DIST nanoc-core-4.11.2.tar.gz 302927 BLAKE2B 
206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e
 SHA512 
842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
 DIST nanoc-core-4.11.5.tar.gz 305078 BLAKE2B 
d86fc1991f7aa1d0459c0a8b30053a97065f23a7c088fe739db6362ad2692622fe08c715b05b156d44e5bcdc1283e2bce2deeb562e61dc0933e3444f421d9113
 SHA512 
65285a0ddd822d15b788e824fc114c4c5f89d94221b6c7379eb8037519afd85d5131c571e0fbae4a447723448f61cdd4cdb8543de98f3bfdb1ac669a59ad64b8
 DIST nanoc-core-4.11.6.tar.gz 306875 BLAKE2B 
dbb949572d22c6acb3ba7acf94712966a4105024f51f3e3df74f4ef010577d75be7859ad3eb2e877837c0fa38fbb384f00bd756466a23804d4b0e3167c22a12b
 SHA512 
3735c374c302258ebc22f52e0044727de1fb283ed4c4f0075aad351b4645935d58aa04638f90c3e29e0c5270db148f83768aef41881c6fb5b53fe9efcf2b29a2
+DIST nanoc-core-4.11.7.tar.gz 307042 BLAKE2B 
b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3
 SHA512 
d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c

diff --git a/www-apps/nanoc-core/nanoc-core-4.11.7.ebuild 
b/www-apps/nanoc-core/nanoc-core-4.11.7.ebuild
new file mode 100644
index 000..ccc331cdd62
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.11.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written 
in Ruby"
+HOMEPAGE="https://nanoc.ws/";
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+   dev-ruby/ddmemoize:1
+   dev-ruby/ddmetrics:1
+   dev-ruby/ddplugin:1
+   =dev-ruby/hamster-3*
+   >=dev-ruby/json_schema-0.19:0
+   dev-ruby/slow_enumerator_tools:1
+   >=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+   dev-ruby/bundler
+   dev-ruby/rspec:3
+   dev-ruby/rspec-its
+   dev-ruby/fuubar
+   dev-ruby/minitest
+   dev-ruby/timecop
+   dev-ruby/yard
+)
+"
+
+all_ruby_prepare() {
+   # Avoid unneeded development dependencies
+   sed -i -e '/simplecov/I s:^:#:' \
+   -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb 
|| die
+   sed -i -e '/coverall/I s:^:#:' \
+   -e '/rubocop/ s:^:#:' Rakefile || die
+   sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb 
|| die
+
+   echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+   sed -i -e "s:require_relative 'lib:require './lib:" 
${RUBY_FAKEGEM_GEMSPEC} || die
+
+   # Use useable tmp dir
+   sed -i -e 's:/tmp/whatever:'${T}'/whatever:' 
spec/nanoc/core/checksummer_spec.rb || die
+}
+
+each_ruby_test() {
+   RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}



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

2019-07-29 Thread Hans de Graaff
commit: f7afecbd75e3e89f539128e2ad5431ba3da1a949
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Jul 30 06:07:27 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Jul 30 06:07:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7afecbd

www-apps/nanoc: add 4.11.7

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

 www-apps/nanoc/Manifest|  1 +
 www-apps/nanoc/nanoc-4.11.7.ebuild | 98 ++
 2 files changed, 99 insertions(+)

diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 9c78b06d5c1..f9dd37236e5 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -3,3 +3,4 @@ DIST nanoc-4.11.0.tar.gz 291654 BLAKE2B 
ab88bf36b472106f356ae67782dac61f691e0d64
 DIST nanoc-4.11.2.tar.gz 302927 BLAKE2B 
206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e
 SHA512 
842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
 DIST nanoc-4.11.5.tar.gz 305078 BLAKE2B 
d86fc1991f7aa1d0459c0a8b30053a97065f23a7c088fe739db6362ad2692622fe08c715b05b156d44e5bcdc1283e2bce2deeb562e61dc0933e3444f421d9113
 SHA512 
65285a0ddd822d15b788e824fc114c4c5f89d94221b6c7379eb8037519afd85d5131c571e0fbae4a447723448f61cdd4cdb8543de98f3bfdb1ac669a59ad64b8
 DIST nanoc-4.11.6.tar.gz 306875 BLAKE2B 
dbb949572d22c6acb3ba7acf94712966a4105024f51f3e3df74f4ef010577d75be7859ad3eb2e877837c0fa38fbb384f00bd756466a23804d4b0e3167c22a12b
 SHA512 
3735c374c302258ebc22f52e0044727de1fb283ed4c4f0075aad351b4645935d58aa04638f90c3e29e0c5270db148f83768aef41881c6fb5b53fe9efcf2b29a2
+DIST nanoc-4.11.7.tar.gz 307042 BLAKE2B 
b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3
 SHA512 
d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c

diff --git a/www-apps/nanoc/nanoc-4.11.7.ebuild 
b/www-apps/nanoc/nanoc-4.11.7.ebuild
new file mode 100644
index 000..de28a28b120
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.11.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written 
in Ruby"
+HOMEPAGE="https://nanoc.ws/";
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+   dev-ruby/mime-types:*
+   dev-ruby/rack:*
+   www-servers/adsf
+)
+   >=dev-ruby/addressable-2.5
+   >=dev-ruby/colored-1.2:0
+   >=dev-ruby/cri-2.15:0
+   ~www-apps/nanoc-core-${PV}
+   >=dev-ruby/parallel-1.12:1
+   >=dev-ruby/tomlrb-1.2:1
+   >=dev-ruby/tty-command-0.8:0
+   >=dev-ruby/tty-file-0.7:0
+   >=dev-ruby/tty-platform-0.2:0
+   >=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+   dev-ruby/rspec:3
+   dev-ruby/asciidoctor
+   dev-ruby/fuubar
+   dev-ruby/haml
+   dev-ruby/maruku
+   >=dev-ruby/mocha-0.13
+   dev-ruby/minitest
+   dev-ruby/mustache
+   dev-ruby/pry
+   dev-ruby/rdoc
+   >=dev-ruby/rouge-3.5.1:2
+   dev-ruby/rubypants
+   dev-ruby/systemu
+   dev-ruby/timecop
+   dev-ruby/vcr
+   dev-ruby/webmock
+   dev-ruby/yard
+)
+doc? (
+   dev-ruby/kramdown
+   dev-ruby/rdiscount
+   dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+   # Avoid unneeded development dependencies
+   sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || 
die
+   sed -i -e '/simplecov/I s:^:#:' \
+   -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb 
|| die
+   sed -i -e '/coverall/I s:^:#:' \
+   -e '/rubocop/ s:^:#:' Rakefile || die
+
+   echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+   # Avoid basepath issues when generating gemspec
+   sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} 
|| die
+
+   # Avoid tests requiring a network connection or make assumptions
+   # about the local network environment.
+   rm -f test/checking/checks/test_{css,html}.rb 
spec/nanoc/cli/commands/view_spec.rb || die
+
+   # Avoid tests for unpackaged dependencies
+   rm spec/nanoc/deploying/fog_spec.rb \
+  spec/nanoc/filters/less_spec.rb \
+  test/filters/test_{markaby,rainpress}.rb || die
+
+   # Avoid non-fatal failing tests due to specifics in the environment
+   sed -

[gentoo-commits] repo/gentoo:master commit in: net-mail/mailman/

2019-07-29 Thread Michał Górny
commit: 08dd40e5395ac125ca2cd3e9cbbeb24ce6e7f14b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:03:52 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:03:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08dd40e5

net-mail/mailman: Revbump post dep changes

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

 net-mail/mailman/{mailman-2.1.29.ebuild => mailman-2.1.29-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-mail/mailman/mailman-2.1.29.ebuild 
b/net-mail/mailman/mailman-2.1.29-r1.ebuild
similarity index 100%
rename from net-mail/mailman/mailman-2.1.29.ebuild
rename to net-mail/mailman/mailman-2.1.29-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: 9fbb8c8de921a026e3544955a77dc81d1229ea2a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:04:11 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:04:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbb8c8d

net-misc/electron-cash: Revbump post dep changes

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

 .../{electron-cash-3.3.6.ebuild => electron-cash-3.3.6-r1.ebuild} | 0
 .../{electron-cash-4.0.2.ebuild => electron-cash-4.0.2-r1.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-misc/electron-cash/electron-cash-3.3.6.ebuild 
b/net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild
similarity index 100%
rename from net-misc/electron-cash/electron-cash-3.3.6.ebuild
rename to net-misc/electron-cash/electron-cash-3.3.6-r1.ebuild

diff --git a/net-misc/electron-cash/electron-cash-4.0.2.ebuild 
b/net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild
similarity index 100%
rename from net-misc/electron-cash/electron-cash-4.0.2.ebuild
rename to net-misc/electron-cash/electron-cash-4.0.2-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: b6579d1465f3741081a152ba080e7b1e4787b79c
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:02:51 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:02:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6579d14

net-analyzer/linkchecker: Revbump post dep changes

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

 .../linkchecker/{linkchecker-9.4.0.ebuild => linkchecker-9.4.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild 
b/net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild
similarity index 100%
rename from net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
rename to net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: aecd8bf1d8428449387291bd53fc8e4791a36eaa
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:04:44 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:04:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aecd8bf1

net-misc/electrum: Revbump post dep changes

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

 net-misc/electrum/{electrum-3.1.3.ebuild => electrum-3.1.3-r1.ebuild} | 0
 net-misc/electrum/{electrum-3.3.6.ebuild => electrum-3.3.6-r1.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-misc/electrum/electrum-3.1.3.ebuild 
b/net-misc/electrum/electrum-3.1.3-r1.ebuild
similarity index 100%
rename from net-misc/electrum/electrum-3.1.3.ebuild
rename to net-misc/electrum/electrum-3.1.3-r1.ebuild

diff --git a/net-misc/electrum/electrum-3.3.6.ebuild 
b/net-misc/electrum/electrum-3.3.6-r1.ebuild
similarity index 100%
rename from net-misc/electrum/electrum-3.3.6.ebuild
rename to net-misc/electrum/electrum-3.3.6-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: a91f23a9d44ae6a20764a7b9aacec370e4cca086
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:01:56 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:01:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91f23a9

app-text/calibre: Revbump post dep changes

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

 app-text/calibre/{calibre-3.26.1.ebuild => calibre-3.26.1-r1.ebuild} | 0
 app-text/calibre/{calibre-3.46.0.ebuild => calibre-3.46.0-r1.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-text/calibre/calibre-3.26.1.ebuild 
b/app-text/calibre/calibre-3.26.1-r1.ebuild
similarity index 100%
rename from app-text/calibre/calibre-3.26.1.ebuild
rename to app-text/calibre/calibre-3.26.1-r1.ebuild

diff --git a/app-text/calibre/calibre-3.46.0.ebuild 
b/app-text/calibre/calibre-3.46.0-r1.ebuild
similarity index 100%
rename from app-text/calibre/calibre-3.46.0.ebuild
rename to app-text/calibre/calibre-3.46.0-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: 6cdf44c586ee10f5213cf939b69e70928fa51b0f
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:04:25 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:04:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdf44c5

net-misc/electrum-ltc: Revbump post dep changes

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

 .../{electrum-ltc-3.3.4.1.ebuild => electrum-ltc-3.3.4.1-r1.ebuild}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild 
b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild
similarity index 100%
rename from net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
rename to net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: 28c277788b15e74f38f4ca85416c3ad9575b4fe0
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:03:26 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:03:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c27778

net-dns/hash-slinger: Revbump post dep changes

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

 .../hash-slinger/{hash-slinger-2.7.ebuild => hash-slinger-2.7-r1.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-dns/hash-slinger/hash-slinger-2.7.ebuild 
b/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
similarity index 100%
rename from net-dns/hash-slinger/hash-slinger-2.7.ebuild
rename to net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: 9076bc0f69805225adc71fc39e00e89016ac9008
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:02:09 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:02:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9076bc0f

dev-python/formencode: Revbump post dep changes

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

 .../formencode/{formencode-1.3.0-r2.ebuild => formencode-1.3.0-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild 
b/dev-python/formencode/formencode-1.3.0-r3.ebuild
similarity index 100%
rename from dev-python/formencode/formencode-1.3.0-r2.ebuild
rename to dev-python/formencode/formencode-1.3.0-r3.ebuild



[gentoo-commits] repo/gentoo:master commit in: net-im/err/

2019-07-29 Thread Michał Górny
commit: 0c838ee92923f4ee1a359c425e228a7a7cb958ca
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:03:37 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:03:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c838ee9

net-im/err: Revbump post dep changes

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

 net-im/err/{err-5.2.0.ebuild => err-5.2.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-im/err/err-5.2.0.ebuild b/net-im/err/err-5.2.0-r1.ebuild
similarity index 100%
rename from net-im/err/err-5.2.0.ebuild
rename to net-im/err/err-5.2.0-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: 4d624a032d95dd5eb1549ffec9292d00737a3e4b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:02:27 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:02:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d624a03

dev-python/python-etcd: Revbump post dep changes

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

 .../python-etcd/{python-etcd-0.4.5.ebuild => python-etcd-0.4.5-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-python/python-etcd/python-etcd-0.4.5.ebuild 
b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
similarity index 100%
rename from dev-python/python-etcd/python-etcd-0.4.5.ebuild
rename to dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild



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

2019-07-29 Thread Michał Górny
commit: b5dbb527cf60ab0fac945c3556f0be181de2d0e5
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:02:36 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:02:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5dbb527

dev-python/xmpppy: Revbump post dep changes

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

 .../xmpppy/{xmpppy-0.5.0_rc1-r2.ebuild => xmpppy-0.5.0_rc1-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild 
b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild
similarity index 100%
rename from dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
rename to dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild



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

2019-07-29 Thread Michał Górny
commit: 5f0f7edea9840f607173d9cb6f6eb3c6c7f89acc
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 06:03:00 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 06:03:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0f7ede

net-analyzer/namebench: Revbump post dep changes

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

 .../namebench/{namebench-1.3.1-r2.ebuild => namebench-1.3.1-r3.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild 
b/net-analyzer/namebench/namebench-1.3.1-r3.ebuild
similarity index 100%
rename from net-analyzer/namebench/namebench-1.3.1-r2.ebuild
rename to net-analyzer/namebench/namebench-1.3.1-r3.ebuild



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

2019-07-29 Thread Michał Górny
commit: 0be4ff7c79e8cc9e9b51090536e76dc5af1d7caf
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:40:00 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:40:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be4ff7c

net-misc/electrum-ltc: Retire virtual/python-dnspython

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

 net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild 
b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
index 1e6465700a4..8ca11888da6 100644
--- a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
@@ -34,6 +34,7 @@ REQUIRED_USE="
 RDEPEND="${PYTHON_DEPS}
dev-python/aiohttp-socks[${PYTHON_USEDEP}]
dev-python/aiorpcX[${PYTHON_USEDEP}]
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/jsonrpclib[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -45,7 +46,6 @@ RDEPEND="${PYTHON_DEPS}
dev-python/six[${PYTHON_USEDEP}]
dev-python/tlslite[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
qrcode? ( media-gfx/zbar[v4l] )
qt5? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]



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

2019-07-29 Thread Michał Górny
commit: 548ce9c9f1ef20b759d42db33dfb2a4ca4ae1cf6
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:42 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548ce9c9

dev-python/formencode: Retire virtual/python-dnspython

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

 dev-python/formencode/formencode-1.3.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild 
b/dev-python/formencode/formencode-1.3.0-r2.ebuild
index a64c1af7d6f..6a09d0e8b3a 100644
--- a/dev-python/formencode/formencode-1.3.0-r2.ebuild
+++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild
@@ -20,9 +20,9 @@ IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/pycountry[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}] )"
+   dev-python/pycountry[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 RESTRICT="test"



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

2019-07-29 Thread Michał Górny
commit: 3d47068153c06d58d72e3048707956e6d122b88c
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:40:02 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:40:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d470681

net-misc/electrum: Retire virtual/python-dnspython

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

 net-misc/electrum/electrum-3.1.3.ebuild | 2 +-
 net-misc/electrum/electrum-3.3.4.ebuild | 2 +-
 net-misc/electrum/electrum-3.3.6.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/electrum/electrum-3.1.3.ebuild 
b/net-misc/electrum/electrum-3.1.3.ebuild
index 93c690ce8a8..25eee433cc4 100644
--- a/net-misc/electrum/electrum-3.1.3.ebuild
+++ b/net-misc/electrum/electrum-3.1.3.ebuild
@@ -47,6 +47,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="${PYTHON_DEPS}
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/jsonrpclib[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -58,7 +59,6 @@ RDEPEND="${PYTHON_DEPS}
dev-python/six[${PYTHON_USEDEP}]
dev-python/tlslite[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
qrcode? ( media-gfx/zbar[v4l] )
qt5? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]

diff --git a/net-misc/electrum/electrum-3.3.4.ebuild 
b/net-misc/electrum/electrum-3.3.4.ebuild
index 55e1c6c8c06..72ad9942454 100644
--- a/net-misc/electrum/electrum-3.3.4.ebuild
+++ b/net-misc/electrum/electrum-3.3.4.ebuild
@@ -49,6 +49,7 @@ REQUIRED_USE="
 RDEPEND="${PYTHON_DEPS}
dev-python/aiohttp-socks[${PYTHON_USEDEP}]
dev-python/aiorpcX[${PYTHON_USEDEP}]
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/jsonrpclib[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -60,7 +61,6 @@ RDEPEND="${PYTHON_DEPS}
dev-python/six[${PYTHON_USEDEP}]
dev-python/tlslite[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
qrcode? ( media-gfx/zbar[v4l] )
qt5? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]

diff --git a/net-misc/electrum/electrum-3.3.6.ebuild 
b/net-misc/electrum/electrum-3.3.6.ebuild
index b664a9d69b2..330ad0367b4 100644
--- a/net-misc/electrum/electrum-3.3.6.ebuild
+++ b/net-misc/electrum/electrum-3.3.6.ebuild
@@ -49,6 +49,7 @@ REQUIRED_USE="
 RDEPEND="${PYTHON_DEPS}
dev-python/aiohttp-socks[${PYTHON_USEDEP}]
=dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/jsonrpclib[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -60,7 +61,6 @@ RDEPEND="${PYTHON_DEPS}
dev-python/six[${PYTHON_USEDEP}]
dev-python/tlslite[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
qrcode? ( media-gfx/zbar[v4l] )
qt5? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]



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

2019-07-29 Thread Michał Górny
commit: fa3f15f39bc74b520d0a784bf6c67a13b90212a3
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:48 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3f15f3

net-analyzer/linkchecker: Retire virtual/python-dnspython

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

 net-analyzer/linkchecker/linkchecker-9.4.0.ebuild | 2 +-
 net-analyzer/linkchecker/linkchecker-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild 
b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
index ce086daf5a2..a18fd0556c9 100644
--- a/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.4.0.ebuild
@@ -18,9 +18,9 @@ KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="sqlite"
 
 RDEPEND="
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
>=dev-python/requests-2.2[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 DEPEND=""
 

diff --git a/net-analyzer/linkchecker/linkchecker-.ebuild 
b/net-analyzer/linkchecker/linkchecker-.ebuild
index 528d4f9fc6c..32272ea2e2c 100644
--- a/net-analyzer/linkchecker/linkchecker-.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-.ebuild
@@ -19,9 +19,9 @@ KEYWORDS=""
 IUSE="sqlite"
 
 RDEPEND="
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 DEPEND=""
 



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

2019-07-29 Thread Michał Górny
commit: 5681257377efc3db93e161a9a9fe48a4b21ee59b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:51 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56812573

net-dns/hash-slinger: Retire virtual/python-dnspython

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

 net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild | 2 +-
 net-dns/hash-slinger/hash-slinger-2.7.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild 
b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
index a73f7bc1f8d..a2ff821691b 100644
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
@@ -21,10 +21,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="
${PYTHON_DEPS}
+   dev-python/dnspython[$PYTHON_USEDEP]
dev-python/ipaddr[$PYTHON_USEDEP]
dev-python/m2crypto[$PYTHON_USEDEP]
net-dns/unbound[python,$PYTHON_USEDEP]
-   virtual/python-dnspython[$PYTHON_USEDEP]
ipsec? ( net-vpn/libreswan[dnssec] )
openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
ssh? ( net-misc/openssh )

diff --git a/net-dns/hash-slinger/hash-slinger-2.7.ebuild 
b/net-dns/hash-slinger/hash-slinger-2.7.ebuild
index a73f7bc1f8d..a2ff821691b 100644
--- a/net-dns/hash-slinger/hash-slinger-2.7.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.7.ebuild
@@ -21,10 +21,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="
${PYTHON_DEPS}
+   dev-python/dnspython[$PYTHON_USEDEP]
dev-python/ipaddr[$PYTHON_USEDEP]
dev-python/m2crypto[$PYTHON_USEDEP]
net-dns/unbound[python,$PYTHON_USEDEP]
-   virtual/python-dnspython[$PYTHON_USEDEP]
ipsec? ( net-vpn/libreswan[dnssec] )
openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
ssh? ( net-misc/openssh )



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

2019-07-29 Thread Michał Górny
commit: 66b39c87bb2656ca957a84a72111fd911c88845d
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:46 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b39c87

dev-python/xmpppy: Retire virtual/python-dnspython

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

 dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild 
b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
index bdf5748f70d..3fc1671aa60 100644
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="doc"
 
 RDEPEND="
|| (
-   virtual/python-dnspython[${PYTHON_USEDEP}]
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/pydns:2[${PYTHON_USEDEP}]
)"
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: net-mail/mailman/

2019-07-29 Thread Michał Górny
commit: e94d1ca10aa801f7021a750303c673192d1a445d
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:55 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94d1ca1

net-mail/mailman: Retire virtual/python-dnspython

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

 net-mail/mailman/mailman-2.1.29.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/mailman/mailman-2.1.29.ebuild 
b/net-mail/mailman/mailman-2.1.29.ebuild
index e6eaf2e1a7e..c3eb71cf99d 100644
--- a/net-mail/mailman/mailman-2.1.29.ebuild
+++ b/net-mail/mailman/mailman-2.1.29.ebuild
@@ -19,10 +19,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
${PYTHON_DEPS}
+   dev-python/dnspython[${PYTHON_USEDEP}]
virtual/mta
virtual/cron
-   virtual/httpd-cgi
-   virtual/python-dnspython[${PYTHON_USEDEP}]"
+   virtual/httpd-cgi"
 RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-mailman )
 "



[gentoo-commits] repo/gentoo:master commit in: net-im/err/

2019-07-29 Thread Michał Górny
commit: ec4812a28a7dce690009c092cf1fa735ec2716d2
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:53 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4812a2

net-im/err: Retire virtual/python-dnspython

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

 net-im/err/err-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-im/err/err-5.2.0.ebuild b/net-im/err/err-5.2.0.ebuild
index 56e859063a4..4a854df6d56 100644
--- a/net-im/err/err-5.2.0.ebuild
+++ b/net-im/err/err-5.2.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
dev-python/colorlog[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/daemonize[${PYTHON_USEDEP}]
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
@@ -33,7 +34,6 @@ RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/webtest[${PYTHON_USEDEP}]
dev-python/yapsy[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
irc? (
dev-python/irc[${PYTHON_USEDEP}]
)



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

2019-07-29 Thread Michał Górny
commit: f0f84cd31436b25dc05aae6bcb127555379e2098
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:44 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f84cd3

dev-python/python-etcd: Retire virtual/python-dnspython

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

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

diff --git a/dev-python/python-etcd/python-etcd-0.4.5.ebuild 
b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
index 89942971811..31aa61ab47f 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-RDEPEND=">=virtual/python-dnspython-2[${PYTHON_USEDEP}]
+RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
>=dev-python/urllib3-1.7.1[${PYTHON_USEDEP}]"
 



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

2019-07-29 Thread Michał Górny
commit: 5beaa80591b12c1477098fc817cda11f88b914f1
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:49 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5beaa805

net-analyzer/namebench: Retire virtual/python-dnspython

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

 net-analyzer/namebench/namebench-1.3.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild 
b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
index 147f06b1243..880c4fc0f9a 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
@@ -19,11 +19,11 @@ IUSE="X"
 # PYTHON_REQ_USE does not support X? ( tk ) syntax yet
 DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
 RDEPEND="${DEPEND}
+   dev-python/dnspython[${PYTHON_USEDEP}]
>=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {



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

2019-07-29 Thread Michał Górny
commit: 260b2210a447d5648141cc75eeeb12f4999dbbcb
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:58 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260b2210

net-misc/electron-cash: Retire virtual/python-dnspython

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

 net-misc/electron-cash/electron-cash-3.3.6.ebuild | 2 +-
 net-misc/electron-cash/electron-cash-4.0.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/electron-cash/electron-cash-3.3.6.ebuild 
b/net-misc/electron-cash/electron-cash-3.3.6.ebuild
index 7c1417f1166..ce2b8f67d14 100644
--- a/net-misc/electron-cash/electron-cash-3.3.6.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.3.6.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/jsonrpclib[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -42,7 +43,6 @@ RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
dev-python/tlslite[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
qrcode? ( media-gfx/zbar[v4l] )
qt5? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]

diff --git a/net-misc/electron-cash/electron-cash-4.0.2.ebuild 
b/net-misc/electron-cash/electron-cash-4.0.2.ebuild
index 3b33abcf417..39e50d7d405 100644
--- a/net-misc/electron-cash/electron-cash-4.0.2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.0.2.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/ecdsa[${PYTHON_USEDEP}]
dev-python/jsonrpclib[${PYTHON_USEDEP}]
dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -42,7 +43,6 @@ RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
dev-python/tlslite[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
-   virtual/python-dnspython[${PYTHON_USEDEP}]
qrcode? ( media-gfx/zbar[v4l] )
qt5? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]



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

2019-07-29 Thread Michał Górny
commit: 52e86dd41a3c32bd78d3e68414c130798c3b0125
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:39:39 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:39:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e86dd4

app-text/calibre: Retire virtual/python-dnspython

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

 app-text/calibre/calibre-3.26.1.ebuild | 2 +-
 app-text/calibre/calibre-3.44.0.ebuild | 2 +-
 app-text/calibre/calibre-3.46.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/calibre/calibre-3.26.1.ebuild 
b/app-text/calibre/calibre-3.26.1.ebuild
index c9008b5e802..5fb25df4b35 100644
--- a/app-text/calibre/calibre-3.26.1.ebuild
+++ b/app-text/calibre/calibre-3.26.1.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
>=dev-libs/dbus-glib-0.106
>=sys-apps/dbus-1.10.8
+   dev-python/dnspython[${PYTHON_USEDEP}]
dev-python/html5-parser[${PYTHON_USEDEP}]
>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
@@ -77,7 +78,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-gfx/optipng-0.7.6
sys-libs/zlib:=
virtual/libusb:1=
-   virtual/python-dnspython[${PYTHON_USEDEP}]
x11-libs/libxkbcommon:=
x11-libs/libX11:=
x11-libs/libXext:=

diff --git a/app-text/calibre/calibre-3.44.0.ebuild 
b/app-text/calibre/calibre-3.44.0.ebuild
index cc0a05f19e8..2459339e259 100644
--- a/app-text/calibre/calibre-3.44.0.ebuild
+++ b/app-text/calibre/calibre-3.44.0.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
>=dev-libs/dbus-glib-0.106
>=sys-apps/dbus-1.10.8
+   dev-python/dnspython[${PYTHON_USEDEP}]
>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
@@ -79,7 +80,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-gfx/optipng-0.7.6
>=sys-libs/zlib-1.2.11:=
virtual/libusb:1=
-   virtual/python-dnspython[${PYTHON_USEDEP}]
x11-libs/libxkbcommon:=
x11-libs/libX11:=
x11-libs/libXext:=

diff --git a/app-text/calibre/calibre-3.46.0.ebuild 
b/app-text/calibre/calibre-3.46.0.ebuild
index cc0a05f19e8..2459339e259 100644
--- a/app-text/calibre/calibre-3.46.0.ebuild
+++ b/app-text/calibre/calibre-3.46.0.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
>=dev-libs/dbus-glib-0.106
>=sys-apps/dbus-1.10.8
+   dev-python/dnspython[${PYTHON_USEDEP}]
>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
@@ -79,7 +80,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-gfx/optipng-0.7.6
>=sys-libs/zlib-1.2.11:=
virtual/libusb:1=
-   virtual/python-dnspython[${PYTHON_USEDEP}]
x11-libs/libxkbcommon:=
x11-libs/libX11:=
x11-libs/libXext:=



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

2019-07-29 Thread Michał Górny
commit: c6e595bda53b127db52c02f35d7c9784cb99ff2a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:29:09 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:29:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e595bd

dev-python/dnspython: EAPI 7 and cleanup

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

 dev-python/dnspython/dnspython-1.16.0.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild 
b/dev-python/dnspython/dnspython-1.16.0.ebuild
index 5f23e5d067a..1f8c7e41ec8 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
@@ -15,6 +15,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
@@ -23,12 +24,9 @@ RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
!dev-python/dnspython:py3"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
 python_test() {
cd tests || die
-   "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+   "${EPYTHON}" utest.py || die "tests failed under ${EPYTHON}"
einfo "Testsuite passed under ${EPYTHON}"
 }
 



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

2019-07-29 Thread Michał Górny
commit: 0769885c7bb39b31c228d8687bdf47ea718ee277
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:22:53 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:22:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0769885c

dev-python/dnspython: Remove unused vcs-snapshot

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

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

diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild 
b/dev-python/dnspython/dnspython-1.16.0.ebuild
index 99bce355fb9..5f23e5d067a 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 DESCRIPTION="DNS toolkit for Python"
 HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/";



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

2019-07-29 Thread Michał Górny
commit: 8a0aaa1efef1e561baff6240c10ace78cd6b77e6
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jul 30 05:08:09 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 30 05:08:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0aaa1e

dev-python/dnspython: Drop old

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

 dev-python/dnspython/Manifest  |  1 -
 .../dnspython/dnspython-1.16.0_pre20180731.ebuild  | 43 --
 2 files changed, 44 deletions(-)

diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 71fbab97708..cb735da94cb 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,2 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 
6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9
 SHA512 
942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B 
a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb
 SHA512 
825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-DIST dnspython-1.16.0_pre20180731.tar.gz 182538 BLAKE2B 
3a472091fccc4f37d65681727643677472837fd6be0c4fd6aaa13afd1fd4362eb27a5ba4ff6babca46fe15c2f5318ddbba22ce058b522f763baa797e1e2d1ab9
 SHA512 
67d17ab7cb48c370c3c2dd5cb935eec5ab7e3ac0c912e179931f395899ad186ba869edd8b870c043ba9fb3545bace18549d2a377f2ae2c278660fc488e68a20d

diff --git a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild 
b/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
deleted file mode 100644
index 2384af49beb..000
--- a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-GIT_COMMIT="be7e71e54a6edc87ead1b15af8981b8921e0e83d"
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/";
-SRC_URI="https://github.com/rthalley/dnspython/archive/${GIT_COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-   >=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-   >=dev-python/idna-2.1[${PYTHON_USEDEP}]
-   !dev-python/dnspython:py2
-   !dev-python/dnspython:py3"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-   cd tests || die
-   "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-   einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-   if use examples; then
-   dodoc -r examples
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/alpha/, profiles/arch/ia64/, profiles/arch/riscv/, ...

2019-07-29 Thread Georgy Yakovlev
commit: 969460a23eeef40572773018e5ce0a3e8fd0b11a
Author: Tomas Mozes  gmail  com>
AuthorDate: Tue Jul 23 22:37:44 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 30 03:39:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=969460a2

app-admin/syslog-ng: bump to 3.22.1

Closes: https://bugs.gentoo.org/690490
Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12526
Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-admin/syslog-ng/Manifest|   1 +
 app-admin/syslog-ng/metadata.xml|   1 +
 app-admin/syslog-ng/syslog-ng-3.22.1.ebuild | 171 
 profiles/arch/alpha/package.use.mask|   2 +-
 profiles/arch/ia64/package.use.mask |   4 +
 profiles/arch/powerpc/package.use.mask  |   2 +-
 profiles/arch/riscv/package.use.mask|   2 +-
 7 files changed, 180 insertions(+), 3 deletions(-)

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 100217bea8a..1204093c860 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -3,4 +3,5 @@ DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 
3268a51c587e66579b30ee8d27397eeeb3a
 DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 
3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4
 SHA512 
2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
 DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B 
e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a
 SHA512 
f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
 DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B 
df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0
 SHA512 
19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
+DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B 
e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223
 SHA512 
4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 
25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf
 SHA512 
e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b

diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index fbeea5ea70d..4f02d274612 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -14,6 +14,7 @@
Add support for geo lookup based on IPs via 
dev-libs/libmaxminddb
Enable support for HTTP destinations
Enable support for JSON template formatting 
via dev-libs/json-c
+   Enable support for Kafka destinations
Enable support for mongodb 
destinations
Enable support for reading Process 
Accounting files (EXPERIMENTAL, Linux only)
Enable support for Redis destinations

diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild 
b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
new file mode 100644
index 000..7d9070a2279
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management";
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz";
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sh ~sparc ~x86"
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct 
python redis smtp snmp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+   >=dev-libs/glib-2.10.1:2
+   >=dev-libs/ivykis-0.42.4
+   >=dev-libs/libpcre-6.1:=
+   !dev-libs/eventlog
+   amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+   caps? ( sys-libs/libcap )
+   dbi? ( >=dev-db/libdbi-0.9.0 )
+   geoip? ( >=dev-libs/geoip-1.5.0 )
+   geoip2? ( dev-libs/libmaxminddb:= )
+   http? ( net-misc/curl )
+   json? ( >

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

2019-07-29 Thread Georgy Yakovlev
commit: 6ec1f79a134a88a982400165c0e0803884c19d64
Author: Christian Strahl  eppendorf  de>
AuthorDate: Mon Jul 29 13:48:41 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 30 03:33:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec1f79a

dev-util/clion: version bump to 2019.2

Package-Manager: Portage-2.3.66-r1, Repoman-2.3.16
Signed-off-by: Christian Strahl  gmail.com>
Closes: https://bugs.gentoo.org/690680
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/clion/Manifest|  1 +
 dev-util/clion/clion-2019.2.ebuild | 78 ++
 2 files changed, 79 insertions(+)

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 1e2f5444d6c..27081bc09fe 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1 +1,2 @@
 DIST clion-2019.1.3.tar.gz 431393782 BLAKE2B 
5612f8109d7ad7dc98990a8f549383086263a980b482fba0c2357e86fc09b474e597b0ce8f911f287b7ba6837247f2be47372a79ce416bb16e10c0ffdbec2588
 SHA512 
9c0971db22f87447edfcc6c6089470bbda507bff5755ccf4efff3dfb4704ebcb4b1b0fa71580824af2ee0a1bf0036475220deb5948bdf2f12e4f151cd55a230e
+DIST clion-2019.2.tar.gz 485913295 BLAKE2B 
db723c1785cdf09f35299f89bb89f21c4f4ea96cc89de73484e31d042088cf613f634fc16e4c9d927f6903be3c401002836c0628cb80be7b029c4b28a67515ee
 SHA512 
eb0a1acb9f267fa36f3cb2924cd9caa2f84367401c271d99458fc90b40cd62f97f566270ef1cd03bd0ce4160ab4bc92182fd468b860c67f2358e3c6adb021ddb

diff --git a/dev-util/clion/clion-2019.2.ebuild 
b/dev-util/clion/clion-2019.2.ebuild
new file mode 100644
index 000..b3360455dab
--- /dev/null
+++ b/dev-util/clion/clion-2019.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion";
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="IDEA
+   || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror splitdebug"
+IUSE="custom-jdk"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+   dev-util/cmake
+   sys-devel/gdb
+   !custom-jdk? ( virtual/jdk )"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+   default
+
+   local remove_me=(
+   bin/gdb/linux
+   bin/lldb/linux
+   bin/cmake
+   license/CMake*
+   lib/pty4j-native/linux/ppc64le
+   )
+
+   use amd64 || remove_me+=( bin/fsnotifier64 
lib/pty4j-native/linux/x86_64)
+   use arm || remove_me+=( bin/fsnotifier-arm )
+   use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
+
+   use custom-jdk || remove_me+=( jbr )
+
+   rm -rv "${remove_me[@]}" || die
+}
+
+src_install() {
+   local dir="/opt/${P}"
+
+   insinto "${dir}"
+   doins -r *
+   fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
+
+   if use amd64; then
+   fperms 755 "${dir}"/bin/fsnotifier64
+   fi
+   if use arm; then
+   fperms 755 "${dir}"/bin/fsnotifier-arm
+   fi
+   if use x86; then
+   fperms 755 "${dir}"/bin/fsnotifier
+   fi
+
+   if use custom-jdk; then
+   if [[ -d jbr ]]; then
+   fperms 755 
"${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+   fi
+   fi
+
+   make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+   newicon "bin/${PN}.svg" "${PN}.svg"
+   make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
+
+   # recommended by: 
https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+   dodir /usr/lib/sysctl.d/
+   echo "fs.inotify.max_user_watches = 524288" > 
"${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}



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

2019-07-29 Thread Georgy Yakovlev
commit: 0d2e97afd269e51478402aec71aff85ac17cb444
Author: Christian Strahl  eppendorf  de>
AuthorDate: Mon Jul 29 13:50:03 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 30 03:33:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2e97af

dev-util/clion: remove old versions

Package-Manager: Portage-2.3.66-r1, Repoman-2.3.16
Signed-off-by: Christian Strahl  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12569
Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/clion/Manifest  |  1 -
 dev-util/clion/clion-2019.1.3.ebuild | 78 
 2 files changed, 79 deletions(-)

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 27081bc09fe..97281d77969 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,2 +1 @@
-DIST clion-2019.1.3.tar.gz 431393782 BLAKE2B 
5612f8109d7ad7dc98990a8f549383086263a980b482fba0c2357e86fc09b474e597b0ce8f911f287b7ba6837247f2be47372a79ce416bb16e10c0ffdbec2588
 SHA512 
9c0971db22f87447edfcc6c6089470bbda507bff5755ccf4efff3dfb4704ebcb4b1b0fa71580824af2ee0a1bf0036475220deb5948bdf2f12e4f151cd55a230e
 DIST clion-2019.2.tar.gz 485913295 BLAKE2B 
db723c1785cdf09f35299f89bb89f21c4f4ea96cc89de73484e31d042088cf613f634fc16e4c9d927f6903be3c401002836c0628cb80be7b029c4b28a67515ee
 SHA512 
eb0a1acb9f267fa36f3cb2924cd9caa2f84367401c271d99458fc90b40cd62f97f566270ef1cd03bd0ce4160ab4bc92182fd468b860c67f2358e3c6adb021ddb

diff --git a/dev-util/clion/clion-2019.1.3.ebuild 
b/dev-util/clion/clion-2019.1.3.ebuild
deleted file mode 100644
index ac0d030149b..000
--- a/dev-util/clion/clion-2019.1.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="https://www.jetbrains.com/clion";
-SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="IDEA
-   || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror splitdebug"
-IUSE="custom-jdk"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-   dev-util/cmake
-   sys-devel/gdb
-   !custom-jdk? ( virtual/jdk )"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-   default
-
-   local remove_me=(
-   bin/gdb/linux
-   bin/lldb/linux
-   bin/cmake
-   license/CMake*
-   lib/pty4j-native/linux/ppc64le
-   )
-
-   use amd64 || remove_me+=( bin/fsnotifier64 
lib/pty4j-native/linux/x86_64)
-   use arm || remove_me+=( bin/fsnotifier-arm )
-   use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
-
-   use custom-jdk || remove_me+=( jre64 )
-
-   rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-   local dir="/opt/${P}"
-
-   insinto "${dir}"
-   doins -r *
-   fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
-
-   if use amd64; then
-   fperms 755 "${dir}"/bin/fsnotifier64
-   fi
-   if use arm; then
-   fperms 755 "${dir}"/bin/fsnotifier-arm
-   fi
-   if use x86; then
-   fperms 755 "${dir}"/bin/fsnotifier
-   fi
-
-   if use custom-jdk; then
-   if [[ -d jre64 ]]; then
-   fperms 755 
"${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-   fi
-   fi
-
-   make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-   newicon "bin/${PN}.svg" "${PN}.svg"
-   make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-   # recommended by: 
https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-   dodir /usr/lib/sysctl.d/
-   echo "fs.inotify.max_user_watches = 524288" > 
"${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}



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

2019-07-29 Thread Matt Turner
commit: 6f680e4fe73925ae130343e02adb416cb799ce7d
Author: Chris Mayo  gmail  com>
AuthorDate: Fri Jul 26 18:48:13 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jul 30 01:49:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f680e4f

virtualx.eclass: Fix no display for an emerge following a failure

If using GNOME GDM, X is started on DISPLAY :0 but a lock file
/tmp/.X1024-lock is created instead of /tmp/.X0-lock.
virtx() will initially set XDISPLAY to 0 and attempt to start Xvfb on
DISPLAY :0 which fails but DISPLAY :1 (and greater) is not attempted if
a previous emerge left /tmp/.X1-lock behind.

Closes: https://bugs.gentoo.org/690778
Signed-off-by: Chris Mayo  gmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 eclass/virtualx.eclass | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index fb6a867a35c..40eeea5463b 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: virtualx.eclass
@@ -178,7 +178,10 @@ virtx() {
# Xvfb is started, else bump the display number
#
# Azarah - 5 May 2002
-   XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo 
${i})
+   # GNOME GDM may have started X on DISPLAY :0 with a
+   # lock file /tmp/.X1024-lock, therefore start the search at 1.
+   # Else a leftover /tmp/.X1-lock will prevent finding an available 
display.
+   XDISPLAY=$(i=1; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo 
${i})
debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}"
 
# We really do not want SANDBOX enabled here



[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/

2019-07-29 Thread Matt Turner
commit: 39a053a99e04391563810fe953112d2249317681
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jul 30 01:38:30 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jul 30 01:49:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a053a9

x11-base/xorg-server: Suppress meaningless errors during shutdown

Thanks to crocket for the patch.

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

 x11-base/xorg-server/files/xdm.initd-11 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/files/xdm.initd-11 
b/x11-base/xorg-server/files/xdm.initd-11
index c9ec36746d0..7b2f992325f 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -207,7 +207,7 @@ stop() {
 
ebegin "Stopping ${myservice}"
 
-   if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+   if start-stop-daemon --quiet --test --stop --exec "${myexe}" 
2>/dev/null; then
start-stop-daemon --stop --exec "${myexe}" --retry 
TERM/5/TERM/5 \
${mypidfile:+--pidfile} ${mypidfile} \
${myname:+--name} ${myname}



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

2019-07-29 Thread Zac Medico
commit: 3d0d365f6de736c45bb8d67f421cb6b8ea09697c
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Jul 30 01:35:23 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Jul 30 01:36:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0d365f

sys-apps/portage: Remove old versions

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/Manifest |   2 -
 sys-apps/portage/portage-2.3.62-r2.ebuild | 261 -
 sys-apps/portage/portage-2.3.68-r1.ebuild | 263 --
 3 files changed, 526 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b35a0a139fd..f54e105fb3a 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,3 @@
-DIST portage-2.3.62.tar.bz2 1021442 BLAKE2B 
37d5dab0e678ced78e0ff4dc9907af3d20370a4b0f52cea9118be3d06bb14e24fe6597d86c9bbd9d3ed2fc51f9e031d4e9ba84f354b945f7a399da3cbb95d74a
 SHA512 
d4eca7e70573aae07a0522b4bf361191fded00fa02c5e6d8f70cf72c19c4dcfa9be7169a267afdc58cdd0a8ee333774a7779ac08dee3490aa8e8a1ebd39deb49
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B 
dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6
 SHA512 
f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
-DIST portage-2.3.68.tar.bz2 1025806 BLAKE2B 
70d5011548a11f3f8859fba407603c34162274698d5a4351e7ed10addf6cf5df88261ab3a1aed73dd7600d9038aa0cf3bb67705e78a51103a5e355c7fa615d8b
 SHA512 
4dc9ac1e03c267b280c932fbcde14f74cac1fb111fe75f21521d156696ab9a7aab2ca175a35615375b097196ad998ae774e8535a6c6205398b10596fb9d1a859
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545a0f516a5724e331e
 SHA512 
20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B 
f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c
 SHA512 
0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12

diff --git a/sys-apps/portage/portage-2.3.62-r2.ebuild 
b/sys-apps/portage/portage-2.3.62-r2.ebuild
deleted file mode 100644
index 6774b1d5563..000
--- a/sys-apps/portage/portage-2.3.62-r2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-   pypy
-   python3_5 python3_6 python3_7
-   python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for 
Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify 
selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   >=sys-apps/sed-4.0.5 sys-devel/patch
-   doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-   epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-   >=app-arch/tar-1.27
-   dev-lang/python-exec:2
-   !build? (
-   >=sys-apps/sed-4.0.5
-   app-shells/bash:0[readline]
-   >=app-admin/eselect-1.2
-   $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-   python{2_7,3_5} pypy)
-   rsync-verify? (
-   >=app-portage/gemato-14[${PYTHON_USEDEP}]
-   >=app-crypt/openpgp-keys-gentoo-release-20180706
-   >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-   )
-   )
-   elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-   elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-   elibc_musl? ( >=sys-apps/sandbox-2.2 )
-   elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-   kernel_linux? ( sys-apps/util-linux )
-

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/kpatch/, sys-kernel/kpatch/files/

2019-07-29 Thread Stefan Strogin
commit: 6bc01acb15af728e31eb158c23e1e03a0ba31c85
Author: Stefan Strogin  gentoo  org>
AuthorDate: Tue Jul 30 01:26:50 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Jul 30 01:31:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc01acb

sys-kernel/kpatch: add patch to disable DWARF compression

Fixes https://github.com/dynup/kpatch/issues/877

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stefan Strogin  gentoo.org>

 .../kpatch-0.7.1-disable-dwarf-compression.patch   | 32 ++
 sys-kernel/kpatch/kpatch-0.7.1.ebuild  |  2 ++
 2 files changed, 34 insertions(+)

diff --git 
a/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch 
b/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch
new file mode 100644
index 000..85f2862df54
--- /dev/null
+++ b/sys-kernel/kpatch/files/kpatch-0.7.1-disable-dwarf-compression.patch
@@ -0,0 +1,32 @@
+From fe6e3f51bfe17945205445904c1fc602008ac7dd Mon Sep 17 00:00:00 2001
+From: Stefan Strogin 
+Date: Mon, 29 Jul 2019 13:20:20 +0300
+Subject: [PATCH] create-diff-object: disable DWARF compression explicitly
+
+On some systems the linker produces compressed debug sections by
+default. It is not supported by create-diff-object for now.
+
+Fixes: #877
+
+Upstream-Status: Submitted [https://github.com/dynup/kpatch/pull/1011]
+Signed-off-by: Stefan Strogin 
+---
+ kpatch-build/kpatch-build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
+index 9ef3809..365655c 100755
+--- a/kpatch-build/kpatch-build
 b/kpatch-build/kpatch-build
+@@ -748,7 +748,7 @@ if [[ "$ARCH" = "ppc64le" ]]; then
+   ARCH_KCFLAGS="-mcmodel=large -fplugin=$PLUGINDIR/ppc64le-plugin.so"
+ fi
+ 
+-export KCFLAGS="-I$DATADIR/patch -ffunction-sections -fdata-sections 
$ARCH_KCFLAGS"
++export KCFLAGS="-I$DATADIR/patch -ffunction-sections -fdata-sections -gz=none 
$ARCH_KCFLAGS"
+ 
+ echo "Reading special section data"
+ find_special_section_data
+-- 
+2.22.0
+

diff --git a/sys-kernel/kpatch/kpatch-0.7.1.ebuild 
b/sys-kernel/kpatch/kpatch-0.7.1.ebuild
index dd2b30d0b35..9aa8f4e44e1 100644
--- a/sys-kernel/kpatch/kpatch-0.7.1.ebuild
+++ b/sys-kernel/kpatch/kpatch-0.7.1.ebuild
@@ -33,6 +33,8 @@ DEPEND="
test? ( dev-util/shellcheck-bin )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-disable-dwarf-compression.patch )
+
 pkg_setup() {
if use kmod; then
if kernel_is gt 3 9 0; then



[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/

2019-07-29 Thread Georgy Yakovlev
commit: 10f674c0ce76478e454a68cbc63cb043ad360169
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jul 30 01:21:45 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jul 30 01:22:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f674c0

net-dns/dnscrypt-proxy: fix logrotate file

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev  gentoo.org>

 ...rypt-proxy-2.0.25-r1.ebuild => dnscrypt-proxy-2.0.25-r2.ebuild} | 0
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate  | 7 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r1.ebuild 
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild
similarity index 100%
rename from net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r1.ebuild
rename to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.25-r2.ebuild

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate 
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
index dcc603284a8..ff58fbeab1e 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.logrotate
@@ -1,5 +1,6 @@
 /var/log/dnscrypt-proxy/*.log {
-copytruncate
-missingok
-notifempty
+   su dnscrypt-proxy dnscrypt-proxy
+   copytruncate
+   missingok
+   notifempty
 }



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

2019-07-29 Thread Stefan Strogin
commit: 6ec6e05b6664d8b236da50c2eaec13c4944df993
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon Jul 29 00:54:39 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Jul 30 01:11:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec6e05b

sys-kernel/kpatch: bump version to 0.7.1

- Install files necessary for kpatch-build into /usr/share/${PN}/patch/
- Remove USE=doc as there is only one not very big document in doc/ and
nothing to compile.
- Install man pages.
- Remove redundant dependency on openssl.

Closes: https://bugs.gentoo.org/690912
Closes: https://bugs.gentoo.org/690914
Closes: https://github.com/gentoo/gentoo/pull/12566
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stefan Strogin  gentoo.org>

 sys-kernel/kpatch/Manifest|  1 +
 sys-kernel/kpatch/kpatch-0.7.1.ebuild | 95 +++
 2 files changed, 96 insertions(+)

diff --git a/sys-kernel/kpatch/Manifest b/sys-kernel/kpatch/Manifest
index 64fabeba921..575e72f0cd1 100644
--- a/sys-kernel/kpatch/Manifest
+++ b/sys-kernel/kpatch/Manifest
@@ -1 +1,2 @@
 DIST kpatch-0.6.3.tar.gz 153100 BLAKE2B 
e95d1880ffc9ff6038bba98902d0f1e97c9f7f8d0f90eedc281c4bf0570217668cf7b701d038d6f06e9885ebdbb4407cc554d5175cf17eb8fd5051381f75deb3
 SHA512 
0d266dd837ad651d7f46047cf2c8de527d08274a885a154c53354f4b3c5679d91c766d7d42294ffe71cc548e5ee865c7555f24001882b806f2fb48825f9b0c06
+DIST kpatch-0.7.1.tar.gz 181732 BLAKE2B 
da3ff8a6bbd31c3bdc353a3d2b75c6947b915fb309a6f19c57b31a6cbad1d82b9e1611bc2c412c5d049511e217a01719eb9a017d1fbbe7c7bbf2e5b02a381f40
 SHA512 
c1b149e9532dc16ee4f7578aadf3eda73b53c889a055229490a7afd1fca8e6df755c98c938353f937b81679fe8d08e065c473a6c31e588b1eb67f2de56bfddea

diff --git a/sys-kernel/kpatch/kpatch-0.7.1.ebuild 
b/sys-kernel/kpatch/kpatch-0.7.1.ebuild
new file mode 100644
index 000..dd2b30d0b35
--- /dev/null
+++ b/sys-kernel/kpatch/kpatch-0.7.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/dynup/${PN}.git";
+else
+   SRC_URI="https://github.com/dynup/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Dynamic kernel patching for Linux"
+HOMEPAGE="https://github.com/dynup/kpatch";
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="contrib +kpatch +kpatch-build kmod test"
+
+RDEPEND="
+   app-crypt/pesign
+   sys-libs/zlib
+   sys-apps/pciutils
+"
+
+DEPEND="
+   ${RDEPEND}
+   dev-libs/elfutils
+   sys-devel/bison
+   test? ( dev-util/shellcheck-bin )
+"
+
+pkg_setup() {
+   if use kmod; then
+   if kernel_is gt 3 9 0; then
+   if ! linux_config_exists; then
+   eerror "Unable to check the currently running 
kernel for kpatch support"
+   eerror "Please be sure a .config file is 
available in the kernel src dir"
+   eerror "and ensure the kernel has been built."
+   else
+   # Fail to build if these kernel options are not 
enabled (see kpatch/kmod/core/Makefile)
+   CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY 
MODULES SYSFS KALLSYMS_ALL"
+   ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER 
must be enabled in the kernel's config file"
+   ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be 
enabled in the kernel's config file"
+   ERROR_MODULES="CONFIG_MODULES must be enabled 
in the kernel's config file"
+   ERROR_SYSFS="CONFIG_SYSFS must be enabled in 
the kernel's config file"
+   ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be 
enabled in the kernel's config file"
+   fi
+   else
+   eerror
+   eerror "kpatch is not available for Linux kernels below 
4.0.0"
+   eerror
+   die "Upgrade the kernel sources before installing 
kpatch."
+   fi
+   check_extra_config
+   fi
+
+}
+
+src_prepare() {
+   replace-flags '-O?' '-O1'
+   default
+}
+
+src_compile() {
+   use kpatch-build && emake -C kpatch-build
+   use kpatch && emake -C kpatch
+   use kmod && set_arch_to_kernel && emake -C kmod
+   use contrib && emake -C contrib
+   use test && emake check
+}
+
+src_install() {
+   if use kpatch-build; then
+   emake DESTDIR="${D}" PREFIX="/usr" install -C kpatch-build
+   insinto /usr/share/${PN}/patch
+   doins kmod/patch/kpatch{.lds.S,-macros.h,-patch.h,-patch-hook.c}
+   doins kmod/patch/{livepatch-patch-hook.c,Makefile,pa

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

2019-07-29 Thread Stefan Strogin
commit: d1ad77934e0f1cea04a344365affb0b644a1251b
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon Jul 29 02:28:03 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Jul 30 01:11:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ad7793

sys-kernel/kpatch: sync live ebuild

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stefan Strogin  gentoo.org>

 sys-kernel/kpatch/kpatch-.ebuild | 78 ++--
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/sys-kernel/kpatch/kpatch-.ebuild 
b/sys-kernel/kpatch/kpatch-.ebuild
index 0d6aa6e706a..dd2b30d0b35 100644
--- a/sys-kernel/kpatch/kpatch-.ebuild
+++ b/sys-kernel/kpatch/kpatch-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit linux-info linux-mod flag-o-matic
+inherit flag-o-matic linux-mod
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -18,45 +18,46 @@ HOMEPAGE="https://github.com/dynup/kpatch";
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="examples +modules test"
+IUSE="contrib +kpatch +kpatch-build kmod test"
 
 RDEPEND="
app-crypt/pesign
-   dev-libs/openssl:0=
sys-libs/zlib
sys-apps/pciutils
 "
 
 DEPEND="
${RDEPEND}
-   test? ( dev-util/shellcheck )
dev-libs/elfutils
sys-devel/bison
+   test? ( dev-util/shellcheck-bin )
 "
 
-pkg_pretend() {
-   if kernel_is gt 3 9 0; then
-   if ! linux_config_exists; then
-   eerror "Unable to check the currently running kernel 
for kpatch support"
-   eerror "Please be sure a .config file is available in 
the kernel src dir"
-   eerror "and ensure the kernel has been built."
+pkg_setup() {
+   if use kmod; then
+   if kernel_is gt 3 9 0; then
+   if ! linux_config_exists; then
+   eerror "Unable to check the currently running 
kernel for kpatch support"
+   eerror "Please be sure a .config file is 
available in the kernel src dir"
+   eerror "and ensure the kernel has been built."
+   else
+   # Fail to build if these kernel options are not 
enabled (see kpatch/kmod/core/Makefile)
+   CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY 
MODULES SYSFS KALLSYMS_ALL"
+   ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER 
must be enabled in the kernel's config file"
+   ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be 
enabled in the kernel's config file"
+   ERROR_MODULES="CONFIG_MODULES must be enabled 
in the kernel's config file"
+   ERROR_SYSFS="CONFIG_SYSFS must be enabled in 
the kernel's config file"
+   ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be 
enabled in the kernel's config file"
+   fi
else
-   # Fail to build if these kernel options are not enabled 
(see kpatch/kmod/core/Makefile)
-   CONFIG_CHECK="FUNCTION_TRACER HAVE_FENTRY MODULES SYSFS 
KALLSYMS_ALL"
-   ERROR_FUNCTION_TRACER="CONFIG_FUNCTION_TRACER must be 
enabled in the kernel's config file"
-   ERROR_HAVE_FENTRY="CONFIG_HAVE_FENTRY must be enabled 
in the kernel's config file"
-   ERROR_MODULES="CONFIG_MODULES must be enabled in the 
kernel's config file"
-   ERROR_SYSFS="CONFIG_SYSFS must be enabled in the 
kernel's config file"
-   ERROR_KALLSYMS_ALL="CONFIG_KALLSYMS_ALL must be enabled 
in the kernel's config file"
+   eerror
+   eerror "kpatch is not available for Linux kernels below 
4.0.0"
+   eerror
+   die "Upgrade the kernel sources before installing 
kpatch."
fi
-   else
-   eerror
-   eerror "kpatch is not available for Linux kernels below 4.0.0"
-   eerror
-   die "Upgrade the kernel sources before installing kpatch."
+   check_extra_config
fi
 
-   check_extra_config
 }
 
 src_prepare() {
@@ -65,13 +66,30 @@ src_prepare() {
 }
 
 src_compile() {
-   set_arch_to_kernel
-   emake all
+   use kpatch-build && emake -C kpatch-build
+   use kpatch && emake -C kpatch
+   use kmod && set_arch_to_kernel && emake -C kmod
+   use contrib && emake -C contrib
+   use test && emake check
 }
 
 src_install() {
-   set_arch_to_kernel
-   emake DESTDIR="${D}" PREFIX="/usr" install
+   if use kpatch-build; then
+   emake DESTDI

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

2019-07-29 Thread Lars Wendler
commit: dde8825898c4f596ac02647461a1cf18afc64b4b
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 30 00:29:13 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 30 00:29:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde88258

app-text/aspell: Bump to version 0.60.7

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

 app-text/aspell/Manifest |   1 +
 app-text/aspell/aspell-0.60.7.ebuild | 103 +++
 2 files changed, 104 insertions(+)

diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index d91b0e49b78..3e96b1b2c72 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -1,2 +1,3 @@
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 
7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c
 SHA512 
e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
 DIST aspell-0.60.7-rc2.tar.gz 2064871 BLAKE2B 
74760cc10804d964bd7d7ee0097198ab26026e0bca2987223b7b58e67491e2d0914c7e24d63cb5540764017dc15358c023e1a3cf6240d5feec8d1dd25ddf6450
 SHA512 
f9f81efaaeaac4d2bc5b3018fe2cef9ed2406f2c648298465d983a012cf8ba3e25a46593c9833ac5d8b4c8cfca2ac3b76b476a4893ba880e4753770d134bead3
+DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B 
d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b55776171ccb5bc6995a57de69a9adb07db66
 SHA512 
6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535

diff --git a/app-text/aspell/aspell-0.60.7.ebuild 
b/app-text/aspell/aspell-0.60.7.ebuild
new file mode 100644
index 000..67647535050
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/";
+if [[ "${PV}" = *_rc* ]] ; then
+   SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
+else
+   SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls unicode"
+
+PDEPEND="app-dicts/aspell-en"
+LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
+hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+   IUSE+=" l10n_${lang}"
+   case ${lang} in
+   de-1901) dict="de-alt"  ;;
+   pt-BR)   dict="pt-br"   ;;
+   *)   dict="${lang}" ;;
+   esac
+   PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
+done
+unset dict lang LANGS
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="
+   sys-libs/ncurses:0=[unicode?]
+   nls? ( virtual/libintl )
+   !=app-dicts/aspell-en-0.5*
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+PATCHES=(
+   "${FILESDIR}/${PN}-0.60.5-nls.patch"
+   "${FILESDIR}/${PN}-0.60.5-solaris.patch"
+   "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+   "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+   # includes fix for bug #467602
+   "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+)
+
+src_prepare() {
+   default
+
+   rm m4/lt* m4/libtool.m4 || die
+   eautoreconf
+   elibtoolize --reverse-deps
+
+   # Parallel install of libtool libraries doesn't always work.
+   # https://lists.gnu.org/archive/html/libtool/2011-03/msg3.html
+   # This has to be after automake has run so that we don't clobber
+   # the default target that automake creates for us.
+   echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in 
|| die
+
+   # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
+   # any more.  Fix this.
+   [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode 
&& \
+   append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable nls)
+   $(use_enable unicode)
+   --disable-static
+   --sysconfdir="${EPREFIX}"/etc/aspell
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+
+   docinto examples
+   dodoc "${S}"/examples/*.c
+
+   # install ispell/aspell compatibility scripts
+   newbin scripts/ispell ispell-aspell
+   newbin scripts/spell spell-aspell
+
+  

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

2019-07-29 Thread Patrick McLean
commit: b615a8e3f1c12a6c333ab0ba33c364b1c7e241b9
Author: Patrick McLean  sony  com>
AuthorDate: Tue Jul 30 00:21:16 2019 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue Jul 30 00:21:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b615a8e3

net-misc/gsutil: RESTRICT=test (bug #690796)

The tests reqire talking to Google, there is no feasible way to make
them work.

It seems like repoman should be checking for this...
Closes: https://bugs.gentoo.org/690796
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Patrick McLean  gentoo.org>

 net-misc/gsutil/gsutil-4.41.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/gsutil/gsutil-4.41.ebuild 
b/net-misc/gsutil/gsutil-4.41.ebuild
index 1bb18ea172b..c645f1344db 100644
--- a/net-misc/gsutil/gsutil-4.41.ebuild
+++ b/net-misc/gsutil/gsutil-4.41.ebuild
@@ -44,7 +44,7 @@ S="${WORKDIR}/${PN}"
 DOCS=( README.md CHANGES.md )
 
 # needs to talk to Google to run tests
-RESTRICT="test? ( network-sandbox )"
+RESTRICT="test"
 
 python_prepare_all() {
distutils-r1_python_prepare_all



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

2019-07-29 Thread Aaron Bauman
commit: 84cfcce849d7502c0dfd57580daa3ecc2c1dd98d
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:34:23 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:34:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cfcce8

arm64/p.u.m: dev-vcs/mercurial is stable

Signed-off-by: Aaron Bauman  gentoo.org>

 profiles/arch/arm64/package.use.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index 2c7d35ac8e1..9becc7f2cde 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -191,10 +191,6 @@ dev-python/pymongo test
 # USE=test-full requires USE=pkcs11 that is use.masked.
 net-libs/gnutls test-full
 
-# Matthew Thode  (2018-02-13)
-# USE=mercurial requires dev-vcs/mercurial, which is not keyworded yet
-dev-python/setuptools_scm mercurial
-
 # Matthew Thode  (2018-02-13)
 # USE=scipy requires scipy, which is not keyworded yet
 dev-python/networkx scipy



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

2019-07-29 Thread Aaron Bauman
commit: 29b925e541e1a02bbe96820c39a84d0af48a31de
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:38:40 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:38:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b925e5

arm64/p.u.s.m: net-wireless/bluez is stable now

Signed-off-by: Aaron Bauman  gentoo.org>

 profiles/arch/arm64/package.use.stable.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/arm64/package.use.stable.mask 
b/profiles/arch/arm64/package.use.stable.mask
index 83d26eb42fe..d6e9c8b4abe 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -34,10 +34,6 @@ sys-auth/polkit kde
 # Respective x11-drivers/ not tested and stable yet
 x11-base/xorg-drivers input_devices_elographics input_devices_joystick 
input_devices_void video_cards_dummy video_cards_fbdev video_cards_nouveau
 
-# Mart Raudsepp  (2018-09-11)
-# net-wireless/bluez not stable yet
-dev-lang/python bluetooth
-
 # Mart Raudsepp  (2018-07-24)
 # Temporary mask due to test failures in sys-libs/libcxxabi
 # and sys-libs/compiler-rt-sanitizers



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

2019-07-29 Thread Aaron Bauman
commit: d460cae6268cd429467ae73f13ee30535b7ae41f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:41:22 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:41:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d460cae6

arm64/use.stable.mask: media-libs/portaudio is stable meow

Signed-off-by: Aaron Bauman  gentoo.org>

 profiles/arch/arm64/use.stable.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/arm64/use.stable.mask 
b/profiles/arch/arm64/use.stable.mask
index 2c6f7965937..3bc5d02e20b 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -20,10 +20,6 @@ consolekit
 # media-sound/musepack-tools not stable yet
 musepack
 
-# Mart Raudsepp  (2019-02-07)
-# media-libs/portaudio not stable yet
-portaudio
-
 # Mart Raudsepp  (2018-11-27)
 # x11-libs/fltk not stable yet
 fltk



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

2019-07-29 Thread Aaron Bauman
commit: 2d66a9fdd32f72e19b3edb9a20807380d0d14f33
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:37:51 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:37:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d66a9fd

arm64/p.u.s.m: virtual/notification-daemon drop kde

Signed-off-by: Aaron Bauman  gentoo.org>

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

diff --git a/profiles/arch/arm64/package.use.stable.mask 
b/profiles/arch/arm64/package.use.stable.mask
index 9c64054e1bf..83d26eb42fe 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -16,7 +16,7 @@ net-im/pidgin eds
 
 # Aaron Bauman  (2019-05-20)
 # deps are not stable yet
-virtual/notification-daemon gnome kde
+virtual/notification-daemon gnome
 
 # Aaron Bauman  (2019-05-15)
 # packages for these USE flags fail tests



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

2019-07-29 Thread Aaron Bauman
commit: 2bd8294f14d13bed854e3fe636b9c98ea5ebe806
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:40:32 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:40:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd8294f

arm64/use.stable.mask: dev-vcs/subversion is stable meow

Signed-off-by: Aaron Bauman  gentoo.org>

 profiles/arch/arm64/use.stable.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/arm64/use.stable.mask 
b/profiles/arch/arm64/use.stable.mask
index 0cb107d8064..2c6f7965937 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -37,10 +37,6 @@ python_single_target_python3_7
 # dev-lang/tk is not stable here.
 tk
 
-# Mart Raudsepp  (2017-02-04)
-# dev-vcs/subversion not marked stable yet
-subversion
-
 # Mart Raudsepp  (2017-01-28)
 # sys-auth/skey not marked stable yet
 skey



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

2019-07-29 Thread Aaron Bauman
commit: 6fc33eda71ab4eb2cf7b8de948bb5d3e44ef4c51
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:29:36 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:29:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc33eda

dev-libs/libintl: arm64 stable (bug #685944)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

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

diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild 
b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 2cd8f0555e5..65a105fb134 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"



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

2019-07-29 Thread Aaron Bauman
commit: cfec2cb31318ec8e797b4276945384ba560323d3
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:27:10 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:27:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfec2cb3

dev-libs/jsoncpp: arm64 stable (bug #690878)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

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

diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild 
b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
index 14eea97be97..ce0ec4a6e30 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-video/photofilmstrip/files/, media-video/photofilmstrip/

2019-07-29 Thread Joonas Niilola
commit: 81754ad34e9ffce5d722cb31d33690bb6d76d0c2
Author: Joonas Niilola  gmail  com>
AuthorDate: Mon Jul 29 19:20:14 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 29 23:22:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81754ad3

media-video/photofilmstrip: bump to 3.7.1

Closes: https://bugs.gentoo.org/643324
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Joonas Niilola  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12574
Signed-off-by: Joonas Niilola  gentoo.org>

 media-video/photofilmstrip/Manifest|  1 +
 ...tofilmstrip-3.7.1-disable-docs-by-default.patch | 15 +
 .../photofilmstrip/photofilmstrip-3.7.1.ebuild | 67 ++
 3 files changed, 83 insertions(+)

diff --git a/media-video/photofilmstrip/Manifest 
b/media-video/photofilmstrip/Manifest
index 81e3b4862c3..4773f126200 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1 +1,2 @@
 DIST photofilmstrip-2.1.0.tar.gz 243163 BLAKE2B 
30bc0de885a00b715377b262039b3c22425315e77c7e5ac7db377535f0dc3a7614bd83b894bcfbaf53601be140fef0e9754a3911958b9f71aec1e5d0214fe972
 SHA512 
e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142
+DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B 
df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7
 SHA512 
fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb

diff --git 
a/media-video/photofilmstrip/files/photofilmstrip-3.7.1-disable-docs-by-default.patch
 
b/media-video/photofilmstrip/files/photofilmstrip-3.7.1-disable-docs-by-default.patch
new file mode 100644
index 000..78dd6697ca7
--- /dev/null
+++ 
b/media-video/photofilmstrip/files/photofilmstrip-3.7.1-disable-docs-by-default.patch
@@ -0,0 +1,15 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py 2019-07-29 20:46:23.212292642 +0300
 b/setup.py 2019-07-29 20:47:47.426300796 +0300
+@@ -20,10 +20,7 @@
+ from distutils.dir_util import remove_tree
+ from distutils.sysconfig import get_python_lib
+ 
+-try:
+-from sphinx.application import Sphinx
+-except ImportError:
+-Sphinx = None
++Sphinx = None
+ 
+ try:
+ import py2exe

diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild 
b/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
new file mode 100644
index 000..a8f65086077
--- /dev/null
+++ b/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils xdg-utils
+
+DESCRIPTION="Movie slideshow creator using Ken Burns effect"
+HOMEPAGE="https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip";
+SRC_URI="https://github.com/PhotoFilmStrip/PFS/releases/download/v${PV}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/gst-python[${PYTHON_USEDEP}]
+   dev-python/pillow[${PYTHON_USEDEP}]
+   dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+   media-plugins/gst-plugins-jpeg:1.0
+   x11-libs/wxGTK:*[X]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-disable-docs-by-default.patch" )
+
+src_prepare() {
+   default
+
+   # fix 'unexpected path' QA warning on einstalldocs
+   sed -i 's|"share", "doc", "photofilmstrip"|"share", "doc", "'${PF}'"|g' 
setup.py ||
+   die "Fixing unexpected path failed."
+
+   # build html docs
+   if use doc; then
+   sed -i 's/Sphinx = None/from sphinx.application import 
Sphinx/g' -i setup.py ||
+   die "Failed to enable building docs with sphinx."
+   fi
+
+   # fix a QA issue with .desktop file
+   sed -i '/Version=/d' data/photofilmstrip.desktop || die "Failed to 
update .desktop file."
+}
+
+python_install_all() {
+   use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+   doman docs/manpage/*.1
+   distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+
+   optfeature "additional rendering formats" media-plugins/gst-plugins-bad
+   optfeature "additional rendering formats" media-plugins/gst-plugins-good
+   optfeature "additional rendering formats" media-plugins/gst-plugins-ugly
+   optfeature "ogg/theora support" media-libs/gst-plugins-base[theora]
+   optfeature "h264 (MKV/MP4) support" media-plugins/gst-plugins-x264
+   optfeature "h265 (MKV) support" media-plugins/gst-plugins-x265
+   optfeature "MPEG 1/2 (DVD) support" media-plugins/gst-plugins-mpeg2enc
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminology/

2019-07-29 Thread Joonas Niilola
commit: 6cb7134fc7a9263bacb52bad03954ded39138a39
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 29 23:07:39 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 29 23:08:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb7134f

x11-terms/terminology: update maintainer info

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Joonas Niilola  gentoo.org>

 x11-terms/terminology/metadata.xml | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/x11-terms/terminology/metadata.xml 
b/x11-terms/terminology/metadata.xml
index acb2058998a..9515a632de5 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/metadata.xml
@@ -2,11 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   
-juip...@gmail.com
-  
-  
-proxy-ma...@gentoo.org
-Proxy Maintainers
+juip...@gentoo.org
   
   
 Install additional testing tools



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

2019-07-29 Thread Aaron Bauman
commit: 39f47cbfb7501302576dc077223968e93ee417de
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 23:06:30 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 23:06:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f47cbf

net-libs/miniupnpc: arm64 stable (bug #690886)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild 
b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
index e14023edea9..32a35629b4d 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 sparc ~x86 
~x86-fbsd"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""



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

2019-07-29 Thread Aaron Bauman
commit: 86c0a127b4529be2f14979f6d6a4bf089eefd9cc
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:51:34 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:51:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c0a127

arm64/use.mask: dev-vcs/bzr is now stable

Signed-off-by: Aaron Bauman  gentoo.org>

 profiles/arch/arm64/use.mask | 1 -
 1 file changed, 1 deletion(-)

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index c987808ecd6..d525c922745 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -95,7 +95,6 @@ mssql
 
 # havent tested yet
 libproxy
-bazaar
 darcs
 afs
 lirc



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

2019-07-29 Thread Aaron Bauman
commit: 95195a57e77a1d939bdc25c5ea14464261206d2f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:49:54 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:50:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95195a57

dev-python/importlib_resources: arm64 keyworded (bug #690956)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16

 dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild 
b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
index d46d8177a6a..5ae2777366d 100644
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="



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

2019-07-29 Thread Aaron Bauman
commit: e62bcb028fa417993248f1443c254aaf9697ff29
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:49:19 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:50:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62bcb02

dev-python/zipp: arm64 keyworded (bug #690956)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16

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

diff --git a/dev-python/zipp/zipp-0.5.2.ebuild 
b/dev-python/zipp/zipp-0.5.2.ebuild
index 11e5c5eced8..0cfa201aaf2 100644
--- a/dev-python/zipp/zipp-0.5.2.ebuild
+++ b/dev-python/zipp/zipp-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc test"
 
 BDEPEND="



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

2019-07-29 Thread Aaron Bauman
commit: 0386acebb04aedc5a2eb62dc9934c6221ba4ea7e
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:48:41 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:50:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0386aceb

net-libs/libssh2: arm64 stable (bug #690884)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 net-libs/libssh2/libssh2-1.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild 
b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 55f39cb41e7..47eb8eef493 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"



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

2019-07-29 Thread Aaron Bauman
commit: 14dbe11ce33f2ac112e3e37cb080e3e274387544
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:49:39 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:50:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14dbe11c

dev-python/importlib_metadata: arm64 keyworded (bug #690956)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16

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

diff --git a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild 
b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
index 15de405a5ab..2573d7da8ac 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/

2019-07-29 Thread James Le Cuirot
commit: bbf38c3cdbeab8173a1b66ff9b75910892a0bebe
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jul 29 22:18:06 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jul 29 22:24:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf38c3c

games-board/pysolfc: Bump to 2.6.4, EAPI 7, fix card sets

Thanks to Scott Furry. This now installs for a single Python version
as multiple versions do not make sense here. I've dropped Python 2 for
simplicity and because it's old.

Closes: https://bugs.gentoo.org/679362
Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot  gentoo.org>

 games-board/pysolfc/Manifest |  2 +
 games-board/pysolfc/metadata.xml |  1 +
 games-board/pysolfc/pysolfc-2.6.4.ebuild | 83 
 3 files changed, 86 insertions(+)

diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 953309506ad..fddaf75fe51 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,5 +1,7 @@
 DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 
0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd
 SHA512 
ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc
+DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 
629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b
 SHA512 
56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B 
f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501
 SHA512 
24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
 DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B 
ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3
 SHA512 
c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
 DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B 
c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981
 SHA512 
177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
 DIST pysolfc-2.6.2.tar.gz 6791741 BLAKE2B 
473105f04bfb2fb174d3b50de5a7a55d586756a75e37eb36a9ff688a5a4b148ee940467b18fa4710f828d461d9156163c8fc9cd323b1562da18f0eb02e096916
 SHA512 
37b4f5f5f53c8041e7b908719456ad3c26401744389ffd44f445402d653b515c44e02ba55950e24d6a3aa2fc2bf914f8575f630335fe1b52c698154b47fb5717
+DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B 
d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127
 SHA512 
da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906

diff --git a/games-board/pysolfc/metadata.xml b/games-board/pysolfc/metadata.xml
index 7cc738da552..40a685cd115 100644
--- a/games-board/pysolfc/metadata.xml
+++ b/games-board/pysolfc/metadata.xml
@@ -10,6 +10,7 @@
 Enable sound support using 
dev-python/pygame
   
   
+shlomif/PySolFC
 pysolfc
   
 

diff --git a/games-board/pysolfc/pysolfc-2.6.4.ebuild 
b/games-board/pysolfc/pysolfc-2.6.4.ebuild
new file mode 100644
index 000..bc63361710f
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.6.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 desktop
+
+MY_PN=PySolFC
+CARD_BASE="${MY_PN}-Cardsets"
+CARD_BASEV="${CARD_BASE}-2.0"
+CARD_BASE_MINV="${CARD_BASE}--Minimal-2.0.1"
+SF_CARD_BASE="mirror://sourceforge/${PN}/${CARD_BASE}"
+
+DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="https://pysolfc.sourceforge.net/";
+SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
+   extra-cardsets? ( ${SF_CARD_BASE}/${CARD_BASEV}/${CARD_BASEV}.tar.bz2 )
+   !extra-cardsets? ( ${SF_CARD_BASE}/minimal/${CARD_BASE_MINV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+S="${WORKDIR}/${MY_PN}-${P}"
+
+RDEPEND="
+   dev-python/random2[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   !minimal? (
+   dev-python/pillow[tk,${PYTHON_USEDEP}]
+   dev-tcltk/tktable
+   )
+   sound? (
+   dev-python/pygame[${PYTHON_USEDEP}]
+ 

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

2019-07-29 Thread James Le Cuirot
commit: b885ae63e48830092502901ab4e854079bbfb3f1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jul 29 22:07:39 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jul 29 22:23:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b885ae63

dev-python/random2: Add Python 3.7, EAPI 7, drop eutils

Closes: https://bugs.gentoo.org/688986
Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot  gentoo.org>

 dev-python/random2/random2-1.0.1-r1.ebuild | 16 
 1 file changed, 16 insertions(+)

diff --git a/dev-python/random2/random2-1.0.1-r1.ebuild 
b/dev-python/random2/random2-1.0.1-r1.ebuild
new file mode 100644
index 000..59faaf8a32c
--- /dev/null
+++ b/dev-python/random2/random2-1.0.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python-2.7 random module ported to python-3"
+HOMEPAGE="https://pypi.org/project/random2/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-arch/unzip
+   dev-python/setuptools[${PYTHON_USEDEP}]"



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

2019-07-29 Thread James Le Cuirot
commit: 380ba0dd75c2c1273d2d17bbab212bc97744533e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jul 29 22:09:10 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jul 29 22:24:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=380ba0dd

dev-python/pygame: Bump to 1.9.6, EAPI 7, add Python 3.7

Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot  gentoo.org>

 dev-python/pygame/Manifest|  1 +
 dev-python/pygame/pygame-1.9.6.ebuild | 79 +++
 2 files changed, 80 insertions(+)

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index d8c451b7eb1..ff4413caf99 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,2 +1,3 @@
 DIST pygame-1.9.2_pre20120101.tar.xz 2263028 BLAKE2B 
401b7cdc32cfc6b960e8a686236d0a310d840b4a41211b602f6fe137f80f3bb358daa5e25758c4e152ab41e50c3864c183a0b6f36176e3dec12db80449e126e1
 SHA512 
1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576
 DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 
38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19
 SHA512 
8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
+DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B 
a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17
 SHA512 
d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0

diff --git a/dev-python/pygame/pygame-1.9.6.ebuild 
b/dev-python/pygame/pygame-1.9.6.ebuild
new file mode 100644
index 000..5dc353c7051
--- /dev/null
+++ b/dev-python/pygame/pygame-1.9.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit flag-o-matic distutils-r1 virtualx
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="http://www.pygame.org/";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples midi X"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+   >=media-libs/sdl-image-1.2.2[png,jpeg]
+   >=media-libs/sdl-mixer-1.2.4
+   >=media-libs/sdl-ttf-2.0.6
+   >=media-libs/smpeg-0.4.4-r1
+   midi? ( media-libs/portmidi )
+   X? ( >=media-libs/libsdl-1.2.5[X,video] )
+   !X? ( >=media-libs/libsdl-1.2.5 )"
+RDEPEND="${DEPEND}"
+
+# various module import and data path issues
+RESTRICT=test
+
+python_configure() {
+   PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+   "${EPYTHON}" "${S}"/buildconfig/config.py -auto
+
+   if ! use X; then
+   sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
+   fi
+
+   # Disable automagic dependency on PortMidi.
+   if ! use midi; then
+   sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+   fi
+}
+
+python_compile() {
+   if [[ ${EPYTHON} == python2* ]]; then
+   local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+   append-flags -fno-strict-aliasing
+   fi
+
+   distutils-r1_python_compile
+}
+
+python_test() {
+   PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
+}
+
+python_install() {
+   distutils-r1_python_install
+
+   # Bug #497720
+   rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   if use doc; then
+   docinto html
+   dodoc -r docs/*
+   fi
+
+   if use examples; then
+   insinto /usr/share/doc/${PF}/examples
+   doins -r examples/*
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/files/, games-board/pysolfc/

2019-07-29 Thread James Le Cuirot
commit: 2a0eaa29b442c711d3a666375188713f8ac2c969
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jul 29 22:23:18 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jul 29 22:24:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0eaa29

games-board/pysolfc: Drop all old versions

Closes: https://bugs.gentoo.org/585124
Closes: https://bugs.gentoo.org/656194
Closes: https://bugs.gentoo.org/70
Closes: https://bugs.gentoo.org/670046
Closes: https://bugs.gentoo.org/671836
Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot  gentoo.org>

 games-board/pysolfc/Manifest   |  4 --
 .../pysolfc/files/pysolfc-PIL-imports.patch| 49 ---
 games-board/pysolfc/files/pysolfc-pillow-6.patch   | 20 ---
 games-board/pysolfc/pysolfc-2.0-r5.ebuild  | 64 
 games-board/pysolfc/pysolfc-2.2.0.ebuild   | 69 -
 games-board/pysolfc/pysolfc-2.4.0-r1.ebuild| 69 -
 games-board/pysolfc/pysolfc-2.6.2.ebuild   | 70 --
 7 files changed, 345 deletions(-)

diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index fddaf75fe51..f3084ac40b3 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,7 +1,3 @@
-DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 
0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd
 SHA512 
ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc
 DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 
629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b
 SHA512 
56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B 
f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501
 SHA512 
24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
-DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B 
ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3
 SHA512 
c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
-DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B 
c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981
 SHA512 
177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
-DIST pysolfc-2.6.2.tar.gz 6791741 BLAKE2B 
473105f04bfb2fb174d3b50de5a7a55d586756a75e37eb36a9ff688a5a4b148ee940467b18fa4710f828d461d9156163c8fc9cd323b1562da18f0eb02e096916
 SHA512 
37b4f5f5f53c8041e7b908719456ad3c26401744389ffd44f445402d653b515c44e02ba55950e24d6a3aa2fc2bf914f8575f630335fe1b52c698154b47fb5717
 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B 
d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127
 SHA512 
da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906

diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch 
b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
deleted file mode 100644
index 64d9980a881..000
--- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://sourceforge.net/p/pysolfc/patches/10/
-https://bugs.gentoo.org/show_bug.cgi?id=471514
-
-Index: pysollib/mfxutil.py
-===
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
 a/pysollib/mfxutil.py  (revision 279)
-+++ b/pysollib/mfxutil.py  (working copy)
-@@ -41,18 +41,18 @@
- Image = ImageTk = ImageOps = None
- if TOOLKIT == 'tk':
- try: # PIL
--import Image
--import ImageTk
--import ImageOps
-+from PIL import Image
-+from PIL import ImageTk
-+from PIL import ImageOps
- except ImportError:
- Image = None
- else:
- # for py2exe
--import GifImagePlugin
--import PngImagePlugin
--import JpegImagePlugin
--import BmpImagePlugin
--import PpmImagePlugin
-+from PIL import GifImagePlugin
-+from PIL import PngImagePlugin
-+from PIL import JpegImagePlugin
-+from PIL import BmpImagePlugin
-+from PIL import PpmImagePlugin
- Image._initialized = 2
- USE_PIL = False
- if TOOLKIT == 'tk' and Image and I

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

2019-07-29 Thread Aaron Bauman
commit: 0709f38fe1628d1d3d57a7035d2eac5b75b81b46
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 22:07:11 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 22:07:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0709f38f

media-gfx/exiv2: arm64 stable (bug #689642)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

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

diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild 
b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 13352226a95..b62a10789a1 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
 else
SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz";
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris 
~x86-solaris"
 fi
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )



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

2019-07-29 Thread Aaron Bauman
commit: 67e83b423fbabe3e113139e2631bbd1bb90910ba
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 21:36:35 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 21:36:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e83b42

app-shells/zsh-completions: arm64 keyworded (bug #669478)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16

 app-shells/zsh-completions/zsh-completions-0.30.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild 
b/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
index e15fd226328..062d59b0401 100644
--- a/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.30.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git";
 else
SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~sparc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"



[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/

2019-07-29 Thread Mike Gilbert
commit: a545cdcf943903a304b14ea872b66a7d8a1434c9
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul 29 21:30:49 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 29 21:30:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a545cdcf

www-plugins/chrome-binary-plugins: automated update (76.0.3809.87)

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert  gentoo.org>

 www-plugins/chrome-binary-plugins/Manifest  | 2 +-
 ...09.80_beta.ebuild => chrome-binary-plugins-76.0.3809.87_beta.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-plugins/chrome-binary-plugins/Manifest 
b/www-plugins/chrome-binary-plugins/Manifest
index 57a66e84081..0c86bfc1cef 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_76.0.3809.80-1_amd64.deb 60835832 BLAKE2B 
3413ec51d2e3486f4ab129a02f431bbbc3cd4ec25a65c35a95ba14791052f151820d44cbf6cea3edc25f07087ad84f84a3d932e45af461d8946f9081194a23d4
 SHA512 
dfc2cdffa3c8dfda2b0decb8aced0234416d5fc8aa6f37f7159bc44103e11e9dfc75ed836c3748e5985fd6baa9f4f4b2252e4d442119620acf1efd4df30903cb
+DIST google-chrome-beta_76.0.3809.87-1_amd64.deb 61007480 BLAKE2B 
9efe3eb5760dbfabdfed447481fb0e9e7983ff154b3e3c77425eb6ee80a9fa451fd626ecc4a05c5f501de3b9d29897a72090199b4f1714f86f85a54741e09090
 SHA512 
fa544f035abce25d4e3184022472de56f1a5a6445ac09e9672bf7537d849d8469887277c1b50a9b956b0ba53c9e5771834a5641b8abd7cedce04d34bc58f628f
 DIST google-chrome-stable_75.0.3770.142-1_amd64.deb 59242374 BLAKE2B 
6610d46190c2321157c9b7609a944b047de77c2adc7c4fc28c39da25a499495a6d2edbd079457c2af063e16842cdc13b0b8e66c2a76ba431d7b6d44d5252e47b
 SHA512 
a700ea6f02865b581225092f7f8c934ac862eb6510d8fbf2261522efa3f0cb629f8b30243b06d3e31054ab79c336c8a350c6cf4abdd5e14d30faa3e9dd01f3c0
 DIST google-chrome-unstable_77.0.3860.5-1_amd64.deb 63913182 BLAKE2B 
f6fa90bf64f588eb9d2e50ffb45165c64f39c9bee10d906aa837f972f87661b814a81ad67ad22933b50694e34c59a80b8513f6d6985ebda2311b3a6244836fd8
 SHA512 
f782686943fced242a6f295fd286ce7a45fe45f18f160fa6a518dc7434fa0d2e95fd3621476f3ab42c3cac081d41ed5c2246389283a5edb6196ba25697ab9649

diff --git 
a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.80_beta.ebuild
 
b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.87_beta.ebuild
similarity index 100%
rename from 
www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.80_beta.ebuild
rename to 
www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.87_beta.ebuild



[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/

2019-07-29 Thread Mike Gilbert
commit: 91560cb05b954b4f419e0a57d08a012dec3d6092
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Jul 29 21:30:39 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Jul 29 21:30:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91560cb0

www-client/google-chrome-beta: automated update (76.0.3809.87)

Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert  gentoo.org>

 www-client/google-chrome-beta/Manifest  | 2 +-
 ...-beta-76.0.3809.80.ebuild => google-chrome-beta-76.0.3809.87.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/google-chrome-beta/Manifest 
b/www-client/google-chrome-beta/Manifest
index 71c271b7c61..9c5a4e5bac6 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_76.0.3809.80-1_amd64.deb 60835832 BLAKE2B 
3413ec51d2e3486f4ab129a02f431bbbc3cd4ec25a65c35a95ba14791052f151820d44cbf6cea3edc25f07087ad84f84a3d932e45af461d8946f9081194a23d4
 SHA512 
dfc2cdffa3c8dfda2b0decb8aced0234416d5fc8aa6f37f7159bc44103e11e9dfc75ed836c3748e5985fd6baa9f4f4b2252e4d442119620acf1efd4df30903cb
+DIST google-chrome-beta_76.0.3809.87-1_amd64.deb 61007480 BLAKE2B 
9efe3eb5760dbfabdfed447481fb0e9e7983ff154b3e3c77425eb6ee80a9fa451fd626ecc4a05c5f501de3b9d29897a72090199b4f1714f86f85a54741e09090
 SHA512 
fa544f035abce25d4e3184022472de56f1a5a6445ac09e9672bf7537d849d8469887277c1b50a9b956b0ba53c9e5771834a5641b8abd7cedce04d34bc58f628f

diff --git 
a/www-client/google-chrome-beta/google-chrome-beta-76.0.3809.80.ebuild 
b/www-client/google-chrome-beta/google-chrome-beta-76.0.3809.87.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-76.0.3809.80.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-76.0.3809.87.ebuild



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

2019-07-29 Thread Aaron Bauman
commit: 9681caca068866fc71268c0f64e6a1c9c46162ab
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 29 21:12:41 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 29 21:13:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9681caca

app-text/gtkspell: slot 3 this time...

Signed-off-by: Aaron Bauman  gentoo.org>

 app-text/gtkspell/gtkspell-3.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild 
b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index e35705c34ec..0c11422fc62 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 



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

2019-07-29 Thread Thomas Deutschmann
commit: c04b5dc118a47fb11278768173500ddf278d49da
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 21:09:17 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 21:11:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04b5dc1

sys-kernel/genkernel: bump to v4.0.0_beta10

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

 sys-kernel/genkernel/Manifest   |  6 +++---
 ...4.0.0_beta9.ebuild => genkernel-4.0.0_beta10.ebuild} | 17 ++---
 sys-kernel/genkernel/genkernel-.ebuild  | 17 ++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 1c5a6df634e..7140714b1f9 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,7 +1,7 @@
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B 
a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3
 SHA512 
c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.185.tgz 2386328 BLAKE2B 
d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506
 SHA512 
f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.88.tgz 1029151 BLAKE2B 
e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501
 SHA512 
5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
-DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B 
ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808
 SHA512 
0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
+DIST btrfs-progs-v5.2.1.tar.xz 2049856 BLAKE2B 
841a506f07f1d965c3443fbea39c81a833c41ce1215db3feb41650c964a3a6ba8f5f964c61838921f2df90f6de7fdb057f0d41856549f26b9c4d580b4707d18f
 SHA512 
7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59
 DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 
3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501
 SHA512 
089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
 DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 
3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6
 SHA512 
9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 
77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991
 SHA512 
d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
@@ -24,7 +24,7 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 
101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 
9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41
 SHA512 
096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 
14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec
 SHA512 
1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 
0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231
 SHA512 
9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.0_beta9.tar.xz 389088 BLAKE2B 
63efcc42caa9d7a3fd674ef45579c9d7ff6a19343da2792d974635f5e25fcd9dd0f4f3be7a7d4bcc6aaefa5ee76f0ca604e1b445913ca96106ace93bfe003990
 SHA512 
5958b605ce00b5d39bd77c14c03a876379f43382b44140f819f274836fa8d9947e706a5b06e50cb31c44a1d85fadf7e651475bd10aabd78eac28acac8eace08d
+DIST genkernel-4.0.0_beta10.tar.xz 395268 BLAKE2B 
02fdcf9a8f1a7b5c383eca8f3a6d0d1df1d29becfa1d6a27ed8b29b41ac122ef06457ea9925d3d39c1e669b6e16f876198f0a40343fb052cb1d957010aa7ecc7
 SHA512 
510e15230f940848de4cf3ea3c5e

[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: 8eaf8dbe03de28867915417da50b5089a52835ad
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 19:45:32 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eaf8dbe

media-libs/raspberrypi-userland-bin: don't look for sbin/

Back in 2017, there used to be such directory, but now there's none.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 .../raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild  | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
index de28e90041a..8bd52f28799 100644
--- 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
+++ 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -33,7 +33,6 @@ src_install() {
doins -r include
into /opt
dobin bin/*
-   dobin sbin/*
insopts -m 0755
insinto "/opt/vc/$(get_libdir)"
doins -r lib/*



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: 224f614a79ca7db6790ff32b98a25626e8108880
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 17:36:52 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224f614a

media-libs/raspberrypi-userland-bin: drop inherit vcs-snapshot

Github-hosted files don't need it.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 .../raspberrypi-userland-bin-1.20190709.ebuild| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
index 194681ade14..88cc1e30552 100644
--- 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
+++ 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit multilib vcs-snapshot
+inherit multilib
 
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/firmware";
@@ -18,7 +18,7 @@ IUSE="+hardfp examples"
 RDEPEND="!media-libs/raspberrypi-userland"
 DEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/firmware-${PV}"
 
 RESTRICT="binchecks"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: d877fcbf3ad6a455d0b77500e017173b2e3eb7eb
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 17:18:58 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d877fcbf

media-libs/raspberrypi-userland-bin: set myself as maintainer

The package was unmaintained, I intend to use it and take care of it.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 media-libs/raspberrypi-userland-bin/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/raspberrypi-userland-bin/metadata.xml 
b/media-libs/raspberrypi-userland-bin/metadata.xml
index 43773231f6e..7e9cc8e5385 100644
--- a/media-libs/raspberrypi-userland-bin/metadata.xml
+++ b/media-libs/raspberrypi-userland-bin/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   andrey_ut...@gentoo.org
+   Andrey Utkin
+   

Use armv6 hardfp ABI




[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: 288e434138c3cd33b61dd5abf57eac7ff3120983
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 19:29:09 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288e4341

media-libs/raspberrypi-userland-bin: drop inherit multilib

Apparenly multilib.eclass was used only for get_libdir function, and the
usage was wrong, because it was appended to the package-specific
"/opt/vc/" path which does not need to match system library directory
name.

More than that, the path "/opt/vc/lib" is actually hardcoded in env.d
file installed by this package, so even if get_libdir ever returned
something different than "lib", that would break dynamic linkage of the
installed executables.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 .../raspberrypi-userland-bin-1.20190709.ebuild| 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
index 88cc1e30552..67de53f9fa0 100644
--- 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
+++ 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=5
 
-inherit multilib
-
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/firmware";
 MY_P="raspberrypi-firmware-${PV}"
@@ -30,7 +28,7 @@ src_install() {
into /opt
dobin bin/*
insopts -m 0755
-   insinto "/opt/vc/$(get_libdir)"
+   insinto "/opt/vc/lib"
doins -r lib/*
 
doenvd "${FILESDIR}"/04${PN}



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: f9b9bdf71de05ade71e0608b678559b2a02db6b9
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 17:28:03 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b9bdf7

media-libs/raspberrypi-userland-bin: EAPI=7

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 .../raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
index 67de53f9fa0..336f6354c10 100644
--- 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
+++ 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/firmware";



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: 234fe7d8314b894336813b2e5edff006beab57c8
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 17:27:18 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234fe7d8

media-libs/raspberrypi-userland-bin: add new version 1.20190709

Cloned from existing ebuild unchanged.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 media-libs/raspberrypi-userland-bin/Manifest   |  1 +
 .../raspberrypi-userland-bin-1.20190709.ebuild | 48 ++
 2 files changed, 49 insertions(+)

diff --git a/media-libs/raspberrypi-userland-bin/Manifest 
b/media-libs/raspberrypi-userland-bin/Manifest
index e85f49a4665..487bb6cedd4 100644
--- a/media-libs/raspberrypi-userland-bin/Manifest
+++ b/media-libs/raspberrypi-userland-bin/Manifest
@@ -1 +1,2 @@
 DIST raspberrypi-firmware-1.20170303.tar.gz 11867 BLAKE2B 
d90fc012d4371a797ed52172f0d0f94ea33901bbf10fc59f1ce0f54fbeb74a849b46dbbd4f71a73a7de655a4ed27586ee354e1535079e304bd66513452a33193
 SHA512 
cb0015fcaa607039db2ff40cadcfcafd0cf2ec7dd1df47f38414540fb1f86d626648bf6403989007895b0617c13ff4ec233a7b1987986224c09a8209e7732501
+DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 
4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174
 SHA512 
6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522

diff --git 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
new file mode 100644
index 000..de28e90041a
--- /dev/null
+++ 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib vcs-snapshot
+
+DESCRIPTION="Raspberry Pi userspace tools and libraries"
+HOMEPAGE="https://github.com/raspberrypi/firmware";
+MY_P="raspberrypi-firmware-${PV}"
+SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> 
${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+KEYWORDS="-* ~arm"
+IUSE="+hardfp examples"
+
+RDEPEND="!media-libs/raspberrypi-userland"
+DEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="binchecks"
+
+src_prepare() {
+   rm {,hardfp/}opt/vc/LICENCE || die
+}
+
+src_install() {
+   cd $(usex hardfp hardfp/ "")opt/vc || die
+
+   insinto /opt/vc
+   doins -r include
+   into /opt
+   dobin bin/*
+   dobin sbin/*
+   insopts -m 0755
+   insinto "/opt/vc/$(get_libdir)"
+   doins -r lib/*
+
+   doenvd "${FILESDIR}"/04${PN}
+
+   if use examples ; then
+   insopts -m 0644
+   insinto /usr/share/doc/${PF}/examples
+   doins -r src/hello_pi
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland-bin/

2019-07-29 Thread Andrey Utkin
commit: 0596cce988a0b43efd64ae4c7e82f56c5c1de37b
Author: Andrey Utkin  gentoo  org>
AuthorDate: Mon Jul 29 19:31:51 2019 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Mon Jul 29 21:00:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0596cce9

media-libs/raspberrypi-userland-bin: drop src_prepare definition

All it does is removing LICENSE file, which is not installed anyway.

EAPI=7 mandates a call to eapply_user in src_prepare, which was missing.
So rather than maintaining an explicit phase function, it is dropped so
that the default implementation takes care of this.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin  gentoo.org>

 .../raspberrypi-userland-bin-1.20190709.ebuild| 4 
 1 file changed, 4 deletions(-)

diff --git 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
index 8bd52f28799..194681ade14 100644
--- 
a/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
+++ 
b/media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20190709.ebuild
@@ -22,10 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 RESTRICT="binchecks"
 
-src_prepare() {
-   rm {,hardfp/}opt/vc/LICENCE || die
-}
-
 src_install() {
cd $(usex hardfp hardfp/ "")opt/vc || die
 



[gentoo-commits] proj/genkernel: New tag: v4.0.0_beta10

2019-07-29 Thread Thomas Deutschmann
commit: 
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:16:26 2019 +

New tag: v4.0.0_beta10




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

2019-07-29 Thread Thomas Deutschmann
commit: c7200d139371d5c0cf8b60143a0abb60d8013c00
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 00:12:45 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:27 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c7200d13

gen_funcs.sh: gkbuild(): Export any set CCACHE_* and DISTCC_* variable

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

 gen_funcs.sh | 13 +
 1 file changed, 13 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index cb0763a..e700ae1 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1233,6 +1233,19 @@ gkbuild() {
"STRIP='$(tc-getSTRIP)'"
)
 
+   local envvar_prefix envvars_to_export envvar_to_export
+   for envvar_prefix in CCACHE_ DISTCC_
+   do
+   envvars_to_export=$(compgen -A variable | grep 
"^${envvar_prefix}")
+   for envvar_to_export in ${envvars_to_export}
+   do
+   [ -z "${envvar_to_export}" ] && break
+
+   envvars+=( "${envvar_to_export}='${!envvar_to_export}'" 
)
+   done
+   done
+   unset envvar_prefix envvars_to_export envvar_to_export
+
if [ ${NICE} -ne 0 ]
then
NICEOPTS="nice -n${NICE} "



[gentoo-commits] proj/genkernel:master commit in: doc/

2019-07-29 Thread Thomas Deutschmann
commit: 6de79b848f4aaf0024e37530e48b3eba9ef7dcfd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 19:47:03 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:21 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6de79b84

manpage: Clarify that dosshd will start network

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

 doc/genkernel.8.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 1b36729..f5f877d 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -688,8 +688,9 @@ recognized by the kernel itself.
 By default we will wait up to 10 seconds for interface to show up.
 
 *dosshd*::
-Will start an SSH daemon within initramfs allowing to remotely unlock
-encrypted devices or just for debugging purpose.
+Will bring up an interface and start a SSH daemon within initramfs
+allowing to remotely unlock encrypted devices or just for debugging
+purpose. See *ip* option for how to configure network.
 
 *gk.sshd.port*=<...>::
 By default, sshd will listen on port 22.



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

2019-07-29 Thread Thomas Deutschmann
commit: b4a90d77ea10bf9ca993c7b464d4d789535e1577
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 13:47:45 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:21 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b4a90d77

gen_determineargs.sh: determine_real_args(): Don't allow TMPDIR with spaces

This just won't work -- many packages like util-linux don't support spaces
in builddir path and will fail when applying libtool magic.

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

 gen_determineargs.sh |  7 +++
 gen_funcs.sh | 16 
 2 files changed, 23 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b64cdba..9170080 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -380,6 +380,13 @@ determine_real_args() {
 
dump_debugcache
 
+   if isTrue "$(has_space_characters "${TMPDIR}")"
+   then
+   # Packages like util-linux will fail to compile when path to
+   # build dir contains spaces
+   gen_die "--tmpdir '${TMPDIR}' contains space character(s) which 
are not supported!"
+   fi
+
if [ ! -d "${TMPDIR}" ]
then
mkdir -p "${TMPDIR}" || gen_die "Failed to create '${TMPDIR}'!"

diff --git a/gen_funcs.sh b/gen_funcs.sh
index e700ae1..c042513 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -209,6 +209,22 @@ can_run_programs_compiled_by_genkernel() {
echo "${can_run_programs}"
 }
 
+has_space_characters() {
+   [[ ${#} -ne 1 ]] \
+   && gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid 
usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"
+
+   local testvalue=${1}
+   local has_space_characters=no
+
+   local space_pattern='[[:space:]]'
+   if [[ "${testvalue}" =~ ${space_pattern} ]]
+   then
+   has_space_characters=yes
+   fi
+
+   echo "${has_space_characters}"
+}
+
 is_gzipped() {
[[ ${#} -ne 1 ]] \
&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid 
usage of ${FUNCNAME}(): Function takes exactly one argument (${#} given)!"



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

2019-07-29 Thread Thomas Deutschmann
commit: da27142c8819c05ed3bd75de1c4623d867e48f71
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 13:54:38 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:21 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=da27142c

gen_determineargs.sh: determine_real_args(): Don't allow KERNEL_OUTPUTDIR with 
spaces

Kernel Makefile just don't support that.

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

 gen_determineargs.sh | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 9170080..8044a97 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -680,6 +680,12 @@ determine_real_args() {
 
if isTrue "${BUILD_KERNEL}"
then
+   if isTrue "$(has_space_characters "${KERNEL_OUTPUTDIR}")"
+   then
+   # Kernel Makefile doesn't support spaces in outputdir 
path...
+   gen_die "--kernel-outputdir '${KERNEL_OUTPUTDIR}' 
contains space character(s) which are not supported!"
+   fi
+
if [ "${KERNEL_DIR}" != "${KERNEL_OUTPUTDIR}" -a ! -d 
"${KERNEL_OUTPUTDIR}" ]
then
print_warning 3 "Set --kernel-outputdir 
'${KERNEL_OUTPUTDIR}' does not exist; Will try to create ..."



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

2019-07-29 Thread Thomas Deutschmann
commit: 15b34c0a3b9c63cbedc25db05081fc5e2ed00b67
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 21:10:49 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:26 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=15b34c0a

genkernel: Don't install modules to /lib/modules when --kerncache is used but 
--no-install is set

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

 genkernel | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/genkernel b/genkernel
index f33379c..c3aa8d1 100755
--- a/genkernel
+++ b/genkernel
@@ -280,6 +280,21 @@ if isTrue "${KERNCACHE_IS_VALID}"
 then
if ! isTrue "${BUILD_STATIC}"
then
+   if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ]
+   then
+   # We have to set $INSTALL_MOD_PATH to avoid installing 
files
+   # to /lib/modules because --no-install was set
+   INSTALL_MOD_PATH="$(mktemp -d -p "${TEMP}" 
kerncache-modules.XXX 2>/dev/null)"
+   if [ -z "${INSTALL_MOD_PATH}" ]
+   then
+   gen_die "Internal error: Variable 
'INSTALL_MOD_PATH' is empty; mktemp() for kerncache modules failed!"
+   else
+   print_info 5 '' 1 0
+   print_info 5 "INSTALL_MOD_PATH set to 
'${INSTALL_MOD_PATH}' because --kerncache is used but --no-install was set ..."
+   mkdir "${INSTALL_MOD_PATH}/lib" || gen_die 
"Failed to create '${INSTALL_MOD_PATH}/lib'!"
+   fi
+   fi
+
print_info 1 '' 1 0
gen_kerncache_extract_modules
fi



[gentoo-commits] proj/genkernel:master commit in: worker_modules/, /

2019-07-29 Thread Thomas Deutschmann
commit: cd8fcd4fa6ec236a71d5dec7469db3e1072ef0a3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 13:43:14 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:20 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cd8fcd4f

gen_compile.sh: Refactor populate_binpkg() function

- Use nameref instead of manually created references

- Fix quoting of BINPKGs

- Pass delimiter-separated BINPKG deps value to gkbuild()

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

 gen_compile.sh| 20 ++--
 worker_modules/gkbuild.sh |  3 +--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index dd2e7d7..0cf6114 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -437,8 +437,7 @@ populate_binpkg() {
 
local 
REQUIRED_BINPKGS_PARENT_VARNAME="CHECK_L${CHECK_LEVEL_PARENT}_REQUIRED_BINPKGS"
local 
REQUIRED_BINPKGS_CURRENT_VARNAME="CHECK_L${CHECK_LEVEL_CURRENT}_REQUIRED_BINPKGS"
-   local 
REQUIRED_BINPKGS_CURRENT_VARNAME_SEPARATE_WORD="${REQUIRED_BINPKGS_CURRENT_VARNAME}[@]"
-   local 
REQUIRED_BINPKGS_CURRENT_VARNAME_SINGLE_WORD="${REQUIRED_BINPKGS_CURRENT_VARNAME}[*]"
+   local -n 
REQUIRED_BINPKGS_CURRENT_VARNAME_ref="${REQUIRED_BINPKGS_CURRENT_VARNAME}"
 
# Make sure we start with an empty array just in case ...
eval declare -ga ${REQUIRED_BINPKGS_CURRENT_VARNAME}=\(\)
@@ -523,7 +522,7 @@ populate_binpkg() {
if [[ -f "${BINPKG}" ]]
then
local required_binpkg=
-   for required_binpkg in 
"${!REQUIRED_BINPKGS_CURRENT_VARNAME_SEPARATE_WORD}"
+   for required_binpkg in 
"${REQUIRED_BINPKGS_CURRENT_VARNAME_ref[@]}"
do
# Create shorter variable value so we do not clutter 
output
local required_binpkg_filename=$(basename 
"${required_binpkg}")
@@ -537,7 +536,7 @@ populate_binpkg() {
 
print_info 3 "${CHECK_LEVEL_PREFIX}Existing ${P} binpkg 
is newer than '${required_binpkg_filename}'; Skipping ..."
done
-   unset required_binpkg 
REQUIRED_BINPKGS_CURRENT_VARNAME_SEPARATE_WORD required_binpkg_filename
+   unset required_binpkg required_binpkg_filename
fi
 
if [[ -f "${BINPKG}" ]]
@@ -562,13 +561,22 @@ populate_binpkg() {
if [[ ! -f "${BINPKG}" ]]
then
print_info 3 "${CHECK_LEVEL_PREFIX}Binpkg '${BINPKG}' does NOT 
exist; Need to build ${P} ..."
+
+   local required_binpkgs=
+   local required_binpkg=
+   for required_binpkg in 
"${REQUIRED_BINPKGS_CURRENT_VARNAME_ref[@]}"
+   do
+   required_binpkgs+="${required_binpkg};"
+   done
+   unset required_binpkg required_binpkg_filename
+
gkbuild \
${PN} \
${PV} \
$(get_gkpkg_srcdir "${PN}") \
$(get_gkpkg_srctar "${PN}") \
"${BINPKG}" \
-   "${!REQUIRED_BINPKGS_CURRENT_VARNAME_SINGLE_WORD}"
+   "${required_binpkgs}"
else
print_info 3 "${CHECK_LEVEL_PREFIX}Can keep using existing ${P} 
binpkg from '${BINPKG}'!"
[[ ${CHECK_LEVEL_CURRENT} -eq 0 ]] && print_info 2 
"$(get_indent 2)${PN}: >> Using ${P} binpkg ..."
@@ -581,7 +589,7 @@ populate_binpkg() {
unset CHECK_L${CHECK_LEVEL_PARENT}_REQUIRED_BINPKGS
else
print_info 3 "${CHECK_LEVEL_PREFIX}Binpkg of ${P} is ready; 
Adding to list '${REQUIRED_BINPKGS_PARENT_VARNAME}' ..."
-   eval ${REQUIRED_BINPKGS_PARENT_VARNAME}+=\( "${BINPKG}" \)
+   eval ${REQUIRED_BINPKGS_PARENT_VARNAME}+=\( \"${BINPKG}\" \)
fi
 
# REQUIRED_BINPKGS_CURRENT_VARNAME

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index 41d2791..e6b90b2 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -284,8 +284,7 @@ _initialize() {
 
if [[ -n "${GKPKG_DEPS}" ]]
then
-   # GKPKG_DEPS is ${ARRAY[*]} value (single word), not 
${ARRAY[@]} (separate word)!
-   GKPKG_DEPS=( ${GKPKG_DEPS} )
+   IFS=';' read -r -a GKPKG_DEPS <<< "${GKPKG_DEPS}"
local GKPKG_DEP=
for GKPKG_DEP in "${GKPKG_DEPS[@]}"
do



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

2019-07-29 Thread Thomas Deutschmann
commit: 77abf7456bf0af2b145e44a0148fcecae882b9b9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 23:25:31 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:27 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=77abf745

gen_funcs.sh: Refactor get_chost_libdir() error handling

We need to check each returned value because last call to
dirname() would return "." when called for an empty path
caused by a previous failure.

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

 gen_funcs.sh | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index a1fe98a..59c7507 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -736,9 +736,21 @@ debug_breakpoint() {
 
 get_chost_libdir() {
local cc=$(tc-getCC)
-   local libdir=$(dirname "$(realpath "$(${cc} 
-print-file-name=libnss_files.so)")")
 
-   if [[ -z "${libdir}" ]]
+   local test_file=$("${cc}" -print-file-name=libnss_files.so 2>/dev/null)
+   if [ -z "${test_file}" ]
+   then
+   gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to 
determine CHOST's libdir: '${cc} -print-file-name=libnss_files.so' returned 
nothing!"
+   fi
+
+   local test_file_realpath=$(realpath "${test_file}" 2>/dev/null)
+   if [ -z "${test_file_realpath}" ]
+   then
+   gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to 
determine CHOST's libdir: 'realpath \"${test_file}\"' returned nothing!"
+   fi
+
+   local libdir=$(dirname "${test_file_realpath}" 2>/dev/null)
+   if [ -z "${libdir}" ]
then
gen_die "$(get_useful_function_stack "${FUNCNAME}")Unable to 
determine CHOST's libdir!"
fi



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

2019-07-29 Thread Thomas Deutschmann
commit: 94d32a155ef3e5cd59f852a032e5887b74306d81
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 22:06:33 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:27 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=94d32a15

Add --kernel-append-localversion option

Now that we moved $ARCH value to kernel's LOCALVERSION setting,
you cannot easily change LOCALVERSION anymore without losing
$ARCH information.

This can be annoying when you just want to build a new revision
which should have its own kernel binary, initramfs and modules
directory because you would have to remember to include default
value.

The new option will allow you to just append to genkernel's
KERNEL_LOCALVERSION value. This way you can just call genkernel
with --kernel-append-localversion=-rN option to build and test
a new revision.

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

 doc/genkernel.8.txt  |  6 +
 gen_cmdline.sh   |  6 +
 gen_determineargs.sh | 63 ++--
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 35762a2..1b36729 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -124,6 +124,12 @@ KERNEL CONFIGURATION
 *--*[*no-*]*virtio*::
 Adds, or skip adding VirtIO support to kernel configuration.
 
+*--kernel-append-localversion*=<...>::
+Appends value to genkernel's *KERNEL_LOCALVERSION* option (see below).
+The idea is to use this option to allow to easily build a new revision
+with own kernel binary, initramfs and modules directory without losing
+default *KERNEL_LOCALVERSION* value.
+
 *--kernel-localversion*=<...>::
 Set kernel option *LOCALVERSION*. Use special value *UNSET* to
 unset any already set *LOCALVERSION*. The following placeholders are

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 6fbf309..dcf479b 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -71,6 +71,8 @@ longusage() {
   echo "   --no-static Do not build a static (monolithic 
kernel)"
   echo "  Kernel settings"
   echo "   --kerneldir=   Location of the kernel sources"
+  echo "   --kernel-append-localversion=<...>"
+  echo "   Appends value to genkernel's 
KERNEL_LOCALVERSION option"
   echo "   --kernel-config="
   echo "   Kernel configuration file to use for 
compilation; Use"
   echo "   'default' to explicitly start from 
scratch using"
@@ -648,6 +650,10 @@ parse_cmdline() {
CMD_KERNEL_DIR="${*#*=}"
print_info 3 "CMD_KERNEL_DIR: ${CMD_KERNEL_DIR}"
;;
+   --kernel-append-localversion=*)
+   CMD_KERNEL_APPEND_LOCALVERSION="${*#*=}"
+   print_info 3 "CMD_KERNEL_APPEND_LOCALVERSION: 
${CMD_KERNEL_APPEND_LOCALVERSION}"
+   ;;
--kernel-config=*)
CMD_KERNEL_CONFIG="${*#*=}"
print_info 3 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index df0934d..f4b3cf7 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -290,6 +290,7 @@ determine_real_args() {
set_config_with_override STRING CROSS_COMPILE 
CMD_CROSS_COMPILE
set_config_with_override STRING BOOTDIR   
CMD_BOOTDIR   "/boot"
set_config_with_override STRING KERNEL_OUTPUTDIR  
CMD_KERNEL_OUTPUTDIR  "${KERNEL_DIR}"
+   set_config_with_override STRING KERNEL_APPEND_LOCALVERSION
CMD_KERNEL_APPEND_LOCALVERSION
set_config_with_override STRING KERNEL_LOCALVERSION   
CMD_KERNEL_LOCALVERSION   "-%%ARCH%%"
set_config_with_override STRING MODPROBEDIR   
CMD_MODPROBEDIR   "/etc/modprobe.d"
 
@@ -630,6 +631,46 @@ determine_real_args() {
need_tar=yes
fi
 
+   # We always need to populate KERNEL_LOCALVERSION to be able to warn
+   # if user changed value but didn't rebuild kernel
+   local valid_localversion_pattern='^[A-Za-z0-9_.-]{1,}$'
+
+   if [ -n "${KERNEL_LOCALVERSION}" ]
+   then
+   case "${KERNEL_LOCALVERSION}" in
+   UNSET)
+   ;;
+   *)
+   KERNEL_LOCALVERSION=$(arch_replace 
"${KERNEL_LOCALVERSION}")
+   if [ -z "${KERNEL_LOCALVERSION}" ]
+   then
+   # We somehow lost value...
+   gen_die "Internal error: Variable 
'KERNEL_LOCALVERSION' is empty!"
+   

[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-07-29 Thread Thomas Deutschmann
commit: 97c0c1761b977b0ddc1100111b608a2dba32e32a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 16:26:25 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:21 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=97c0c176

initrd.scripts: start_network(): Handle already running interface

When kernel was built with CONFIG_IP_PNP_DHCP=y option for example and
ip=dhcp was specified on kernel command-line, interface maybe already
up and running (configured). In this case it doesn't make any sense to
fire up udhcpc which would only get the same network configuration.

However, when interface is already up but manual IP configuration was
specified, we must restart interface to get back into a known state and
apply our own configuration like told by the user because we support
more complex configurations.

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

 defaults/initrd.scripts | 33 -
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index ce38bd8..e01f461 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1727,10 +1727,23 @@ start_network() {
 
warn_msg "Will not try to start network ..."
return 1
+   elif [ "${interface_identifier}" = 'mac' ]
+   then
+   good_msg "Interface detected as ${GK_NET_IFACE}"
fi
 
if [ -z "${IP}" -o "${IP}" = 'dhcp' ]
then
+   if is_interface_up
+   then
+   # CONFIG_IP_PNP_DHCP and ip=dhcp probably caused kernel 
to bring up
+   # network for us. Really no need re-run dhcp...
+   warn_msg "Interface ${GK_NET_IFACE} is already up."
+   warn_msg "Skipping network setup; Will use existing 
network configuration ..."
+   touch "${GK_NET_LOCKFILE}"
+   return 0
+   fi
+
good_msg "Bringing up interface ${GK_NET_IFACE} using dhcp ..." 
${QUIET}
busybox udhcpc -i "${GK_NET_IFACE}" -n -t 
${GK_NET_DHCP_RETRIES} -T ${GK_NET_TIMEOUT_DHCP} -R -p "${GK_NET_DHCP_PIDFILE}"
if [ $? -ne 0 ]
@@ -1739,6 +1752,15 @@ start_network() {
return 1
fi
else
+   if is_interface_up
+   then
+   # At this point we don't know if kernel has brought up 
network the
+   # way we wanted. It's safer to restart interface and do 
it on our own...
+   warn_msg "Interface ${GK_NET_IFACE} is already up and 
therefore in an unknown state!"
+   warn_msg "Will now restart interface ${GK_NET_IFACE} to 
get into a known state ..."
+   kill_network
+   fi
+
good_msg "Bringing up interface ${GK_NET_IFACE} ..." ${QUIET}
ip link set "${GK_NET_IFACE}" up
 
@@ -1835,7 +1857,16 @@ kill_network() {
return
fi
 
-   rm "${GK_NET_LOCKFILE}"
+   [ -f "${GK_NET_LOCKFILE}" ] && rm "${GK_NET_LOCKFILE}"
+}
+
+is_interface_up() {
+   if ip link show dev "${GK_NET_IFACE}" 2>/dev/null | grep -q ',UP,'
+   then
+   return 0
+   else
+   return 1
+   fi
 }
 
 ipv6_tentative() {



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

2019-07-29 Thread Hans de Graaff
commit: 1c4a5786faf7fcb2782708cd1a45c59af7db98ff
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jul 29 20:10:08 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jul 29 20:10:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4a5786

dev-ruby/redcarpet: add 3.5.0

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

 dev-ruby/redcarpet/Manifest   |  1 +
 dev-ruby/redcarpet/redcarpet-3.5.0.ebuild | 44 +++
 2 files changed, 45 insertions(+)

diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index bbbc2afc2bd..038ffbd1422 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1 +1,2 @@
 DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 
38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a
 SHA512 
25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
+DIST redcarpet-3.5.0.tar.gz 106773 BLAKE2B 
34c72d21c8ea4d841c9728e3c7e66be02c69943e5e0ee091688992c400748cf0a0900fa15de7bbaf18db8a89bc0309160fd5c2b2ca83ee86f6d46dd5d13d9770
 SHA512 
8d48f1b437297aa556d7f3c5e69c8dde04c63388e78ffe15ea3c36e4764790b5cb75a8baaf75ad64317bccc63384fa0a42251d05718902096229f9f6a24f06c9

diff --git a/dev-ruby/redcarpet/redcarpet-3.5.0.ebuild 
b/dev-ruby/redcarpet/redcarpet-3.5.0.ebuild
new file mode 100644
index 000..182d1bb7d60
--- /dev/null
+++ b/dev-ruby/redcarpet/redcarpet-3.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_GEMSPEC="redcarpet.gemspec"
+
+inherit multilib ruby-fakegem
+
+SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A Ruby wrapper for Upskirt"
+HOMEPAGE="https://github.com/vmg/redcarpet";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
+
+all_ruby_prepare() {
+   sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
+
+   # Avoid unneeded dependency on rake-compiler
+   sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+}
+
+each_ruby_prepare() {
+   sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
+}
+
+each_ruby_configure() {
+   ${RUBY} -Cext/redcarpet extconf.rb || die
+}
+
+each_ruby_compile() {
+   emake V=1 -Cext/${PN}
+   cp ext/${PN}/*$(get_modname) lib || die
+}



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

2019-07-29 Thread Thomas Deutschmann
commit: 730032d9d81c298497365feb84f8768ea5ad1231
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 21:36:10 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:27 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=730032d9

genkernel: Fix output when $KV has changed

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

 genkernel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index e405a95..31f994e 100755
--- a/genkernel
+++ b/genkernel
@@ -233,9 +233,9 @@ then
 
old_KV=$(cat "${TEMP}/.old_kv")
print_info 1 "$(get_indent 1)>> Kernel version has changed 
(probably due to config change) since genkernel start:"
-   print_info 1 "$(get_indent 1)>> We are now building Linux 
kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL} ..."
+   print_info 1 "$(get_indent 1)   We are now building Linux 
kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL} ..."
else
-   print_info 2 "$(get_indent 1)>> Kernel version has not changed 
since genkernel start."
+   print_info 2 "$(get_indent 1)>> Kernel version has not changed 
since genkernel start"
fi
 
compile_kernel



[gentoo-commits] proj/genkernel:master commit in: worker_modules/

2019-07-29 Thread Thomas Deutschmann
commit: 2a56383bb88211e5d18aa2f9e2c5332252ff6d17
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 13:46:26 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:20 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2a56383b

gkbuild.sh: gkconf(): Quote sysroot

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

 worker_modules/gkbuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh
index e6b90b2..136fe17 100644
--- a/worker_modules/gkbuild.sh
+++ b/worker_modules/gkbuild.sh
@@ -622,7 +622,7 @@ gkconf() {
fi
 
if [[ ${conf_help} == *--with-sysroot* ]]; then
-   conf_args+=( --with-sysroot="${BROOT}/usr:${SYSROOT}" )
+   conf_args+=( "--with-sysroot='${BROOT}/usr:${SYSROOT}'" 
)
fi
 
# Handle arguments containing quoted whitespace (see bug 
#457136).



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

2019-07-29 Thread Thomas Deutschmann
commit: 2f855273fc88de81cf3ae1208549c58c9bc91ba5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 13:41:41 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:17 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2f855273

gen_determineargs.sh: determine_KV(): Quote $KERNEL_OUTPUTDIR

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

 gen_determineargs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f4b3cf7..b64cdba 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -44,10 +44,10 @@ determine_KV() {
[ -f "${KERNEL_OUTPUTDIR}/include/linux/utsrelease.h" ] && \

VERSION_SOURCE="${KERNEL_OUTPUTDIR}/include/linux/utsrelease.h"
# Handle new-style releases where version.h doesn't have 
UTS_RELEASE
-   if [ -f ${KERNEL_OUTPUTDIR}/include/config/kernel.release ]
+   if [ -f "${KERNEL_OUTPUTDIR}/include/config/kernel.release" ]
then
print_info 3 "Using 
'${KERNEL_OUTPUTDIR}/include/config/kernel.release' to extract LOCALVERSION ..."
-   UTS_RELEASE=$(cat 
${KERNEL_OUTPUTDIR}/include/config/kernel.release)
+   UTS_RELEASE=$(cat 
"${KERNEL_OUTPUTDIR}/include/config/kernel.release")
LOV=$(echo ${UTS_RELEASE}|sed -e 
"s/${VER}.${PAT}.${SUB}${EXV}//")
KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
elif [ -n "${VERSION_SOURCE}" ]



[gentoo-commits] proj/genkernel:master commit in: defaults/keymaps/, defaults/

2019-07-29 Thread Thomas Deutschmann
commit: a5ea6132ef5afc2bdde38a84adc44849fa9b947f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 14:21:34 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 28 21:19:39 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a5ea6132

keymaps: Add bepo and colemak keymap

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

 defaults/initrd.scripts |  92 +---
 defaults/keymaps/10.map |   2 +-
 defaults/keymaps/11.map |   2 +-
 defaults/keymaps/12.map |   2 +-
 defaults/keymaps/13.map |   2 +-
 defaults/keymaps/14.map |   2 +-
 defaults/keymaps/15.map |   2 +-
 defaults/keymaps/16.map |   2 +-
 defaults/keymaps/17.map |   2 +-
 defaults/keymaps/18.map |   2 +-
 defaults/keymaps/19.map |   2 +-
 defaults/keymaps/20.map |   2 +-
 defaults/keymaps/21.map |   2 +-
 defaults/keymaps/22.map |   2 +-
 defaults/keymaps/23.map |   2 +-
 defaults/keymaps/24.map |   2 +-
 defaults/keymaps/25.map |   2 +-
 defaults/keymaps/26.map |   2 +-
 defaults/keymaps/27.map |   2 +-
 defaults/keymaps/28.map |   2 +-
 defaults/keymaps/29.map |   2 +-
 defaults/keymaps/3.map  |   2 +-
 defaults/keymaps/30.map |   2 +-
 defaults/keymaps/31.map |   2 +-
 defaults/keymaps/32.map |   2 +-
 defaults/keymaps/33.map |   2 +-
 defaults/keymaps/34.map |   2 +-
 defaults/keymaps/35.map |   2 +-
 defaults/keymaps/36.map |   2 +-
 defaults/keymaps/37.map |   2 +-
 defaults/keymaps/{35.map => 38.map} |   0
 defaults/keymaps/39.map |   2 +-
 defaults/keymaps/4.map  |   2 +-
 defaults/keymaps/40.map |   2 +-
 defaults/keymaps/41.map |   2 +-
 defaults/keymaps/42.map |   2 +-
 defaults/keymaps/43.map |   2 +-
 defaults/keymaps/{42.map => 44.map} |   0
 defaults/keymaps/5.map  |   2 +-
 defaults/keymaps/6.map  |   2 +-
 defaults/keymaps/7.map  |   2 +-
 defaults/keymaps/8.map  |   2 +-
 defaults/keymaps/9.map  |   2 +-
 defaults/keymaps/bepo.map   | Bin 0 -> 2823 bytes
 defaults/keymaps/colemak.map| Bin 0 -> 2823 bytes
 defaults/keymaps/keymapList |  16 +++
 46 files changed, 92 insertions(+), 96 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 827f843..ce38bd8 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1060,61 +1060,57 @@ chooseKeymap() {
case ${keymap} in
1|azerty) keymap=azerty ;;
2|be) keymap=be ;;
-   3|bg) keymap=bg ;;
-   4|br-a) keymap=br-a ;;
-   5|br-l) keymap=br-l ;;
-   6|by) keymap=by ;;
-   7|cf) keymap=cf ;;
-   8|croat) keymap=croat ;;
-   9|cz) keymap=cz ;;
-   10|de) keymap=de ;;
-   11|dk) keymap=dk ;;
-   12|dvorak) keymap=dvorak ;;
-   13|es) keymap=es ;;
-   14|et) keymap=et ;;
-   15|fi) keymap=fi ;;
-   16|fr) keymap=fr ;;
-   17|gr) keymap=gr ;;
-   18|hu) keymap=hu ;;
-   19|il) keymap=il ;;
-   20|is) keymap=is ;;
-   21|it) keymap=it ;;
-   22|jp) keymap=jp ;;
-   23|la) keymap=la ;;
-   24|lt) keymap=lt ;;
-   25|mk) keymap=mk ;;
-   26|nl) keymap=nl ;;
-   27|no) keymap=no ;;
-   28|pl) keymap=pl ;;
-   29|pt) keymap=pt ;;
-   30|ro) keymap=ro ;;
-   31|ru) keymap=ru ;;
-   32|se) keymap=se ;;
-   33|sg) keymap=sg ;;
-   34|sk-y) keymap=sk-y ;;
-   35|sk-z) keymap=sk-z ;;
-   36|slovene) keymap=slovene ;;
-   37|trf) keymap=trf ;;
-   38|trq) keymap=trq ;;
-   39|ua) keymap=ua ;;
-   40|uk) keymap=uk ;;
-   41|us) keymap=us ;;
-   42|wangbe) keymap=wangbe ;;
-   43|sf|ch*) keymap=sf ;;
+   3|bepo) keymap=bepo ;;
+   4|bg) keymap=bg ;;
+   5|br-a) keymap=br-a ;;
+   6|br-

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

2019-07-29 Thread Thomas Deutschmann
commit: 86ce6816b789e707fa8348624b0643beeeb3c7eb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 21:07:17 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:26 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=86ce6816

genkernel: Don't allow building kernel only when --kerncache is used but 
--no-install is set

This just don't make sense. We wouldn't do anything.

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

 genkernel | 8 
 1 file changed, 8 insertions(+)

diff --git a/genkernel b/genkernel
index 31a880d..f33379c 100755
--- a/genkernel
+++ b/genkernel
@@ -188,6 +188,14 @@ then
gen_kerncache_is_valid
 fi
 
+if isTrue "${KERNCACHE_IS_VALID}" && ! isTrue "${CMD_INSTALL}" && ! isTrue 
"${BUILD_RAMDISK}"
+then
+   error_msg="Nothing to do: Selected action does not include building 
initramfs."
+   error_msg+=" Because kerncache is valid, no kernel will be build."
+   error_msg+=" However, due to set --no-install option, we will not even 
install kernel binary from kerncache."
+   gen_die "${error_msg}"
+fi
+
 print_info 1 '' 1 0
 print_info 1 "Working with Linux kernel ${BOLD}${KV}${NORMAL} for 
${BOLD}${ARCH}${NORMAL}"
 print_info 1 "Using kernel config file '${KERNEL_CONFIG}' ..."



[gentoo-commits] proj/genkernel:master commit in: defaults/

2019-07-29 Thread Thomas Deutschmann
commit: 8a24f11205f7be79b22d81936c0c7e628b74986c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 18:20:42 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:02:21 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a24f112

initrd.scripts: cleanup(): Don't bring down network interface when 
real_root=/dev/nfs

At this stage we already have mounted root over network so we
should not bring down the network interface.

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

 defaults/initrd.scripts | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index e01f461..4c8955d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -2011,7 +2011,12 @@ cleanup() {
 
if [ -f "${GK_NET_LOCKFILE}" ]
then
-   kill_network
+   if [ "${REAL_ROOT}" = "/dev/nfs" ]
+   then
+   warn_msg "real_root=/dev/nfs; Will not bring down 
interface ${GK_NET_IFACE} ..."
+   else
+   kill_network
+   fi
fi
 }
 



[gentoo-commits] proj/genkernel:master commit in: patches/btrfs-progs/5.1.1/, patches/btrfs-progs/5.2.1/

2019-07-29 Thread Thomas Deutschmann
commit: d1df513aaf46642b24dc8fb2977901411cc8ac5f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 10:58:38 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 28 21:19:39 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d1df513a

Bump btrfs-progs to v5.2.1

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

 patches/btrfs-progs/{5.1.1 => 5.2.1}/btrfs-lzo2.patch | 0
 patches/btrfs-progs/{5.1.1 => 5.2.1}/btrfs-m4.patch   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/patches/btrfs-progs/5.1.1/btrfs-lzo2.patch 
b/patches/btrfs-progs/5.2.1/btrfs-lzo2.patch
similarity index 100%
rename from patches/btrfs-progs/5.1.1/btrfs-lzo2.patch
rename to patches/btrfs-progs/5.2.1/btrfs-lzo2.patch

diff --git a/patches/btrfs-progs/5.1.1/btrfs-m4.patch 
b/patches/btrfs-progs/5.2.1/btrfs-m4.patch
similarity index 100%
rename from patches/btrfs-progs/5.1.1/btrfs-m4.patch
rename to patches/btrfs-progs/5.2.1/btrfs-m4.patch



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

2019-07-29 Thread Thomas Deutschmann
commit: e900e7c9c02cc00cfa13ab50f440dfba236e9417
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 21:14:31 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:26 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e900e7c9

genkernel: Combine kerncache conditionals

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

 genkernel | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/genkernel b/genkernel
index c3aa8d1..d8700ea 100755
--- a/genkernel
+++ b/genkernel
@@ -267,17 +267,14 @@ then
fi
 fi
 
-if isTrue "${CMD_INSTALL}"
+if isTrue "${KERNCACHE_IS_VALID}"
 then
-   if isTrue "${KERNCACHE_IS_VALID}"
+   if isTrue "${CMD_INSTALL}"
then
print_info 1 '' 1 0
gen_kerncache_extract_kernel
fi
-fi
 
-if isTrue "${KERNCACHE_IS_VALID}"
-then
if ! isTrue "${BUILD_STATIC}"
then
if ! isTrue "${CMD_INSTALL}" && [ -z "${INSTALL_MOD_PATH}" ]



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

2019-07-29 Thread Thomas Deutschmann
commit: efe9365be7d8b0aab2d0768f05848f89657b45ee
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jul 27 20:29:25 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 28 21:19:30 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=efe9365b

gen_determineargs.sh: determine_real_args(): Fix LOCALVERSION validation pattern

Fixes c859019 ("Add --kernel-localversion option")
Signed-off-by: Thomas Deutschmann  gentoo.org>

 gen_determineargs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f1c887e..3674cf0 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -477,7 +477,7 @@ determine_real_args() {
UNSET)
;;
*)
-   local 
valid_localversion_pattern='^-[A-Za-z0-9\-_]{1,}$'
+   local 
valid_localversion_pattern='^[A-Za-z0-9_.-]{1,}$'
if [[ ! "${KERNEL_LOCALVERSION}" =~ 
${valid_localversion_pattern} ]]
then
gen_die "--kernel-localversion 
value '${KERNEL_LOCALVERSION}' does not match '${valid_localversion_pattern}' 
regex!"



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

2019-07-29 Thread Thomas Deutschmann
commit: 8acef68eac8dc4f7a6e937d11c4dd8713431e9b6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jul 29 00:09:39 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:27 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8acef68e

Export $PATH to genkernel worker

For example required for ccache.

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

 gen_funcs.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 59c7507..cb0763a 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -595,6 +595,7 @@ dropbear_create_key() {
"LOGLEVEL='${LOGLEVEL}'"
"LOGFILE='${LOGFILE}'"
"NOCOLOR='${NOCOLOR}'"
+   "PATH='${PATH}'"
"TEMP='${TEMP}'"
)
 
@@ -670,6 +671,7 @@ dropbear_generate_key_info_file() {
"LOGLEVEL='${LOGLEVEL}'"
"LOGFILE='${LOGFILE}'"
"NOCOLOR='${NOCOLOR}'"
+   "PATH='${PATH}'"
"TEMP='${TEMP}'"
)
 
@@ -1197,6 +1199,7 @@ gkbuild() {
"LOGLEVEL='${LOGLEVEL}'"
"LOGFILE='${LOGFILE}'"
"NOCOLOR='${NOCOLOR}'"
+   "PATH='${PATH}'"
"TEMP='${TEMP}'"
"TMPDIR='${TEMP}'"
)
@@ -1285,6 +1288,7 @@ unpack() {
"LOGLEVEL='${LOGLEVEL}'"
"LOGFILE='${LOGFILE}'"
"NOCOLOR='${NOCOLOR}'"
+   "PATH='${PATH}'"
"TEMP='${TEMP}'"
)
 



[gentoo-commits] proj/genkernel:master commit in: doc/, defaults/, /

2019-07-29 Thread Thomas Deutschmann
commit: 769a07fd3e947ffb216ea94887d752a27ea212d9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 28 14:33:25 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jul 29 20:00:24 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=769a07fd

Make initramfs and kernel filename customizable

New options like --initramfs-filename or --kernel-filename will
allow user to customize filenames used when installing initramfs
or kernel into $BOOTDIR. Therefore --kernelname (KNAME) option
was removed.

Filename can contain placeholders like '%%ARCH%%' which will get
replaced at runtime. Man page contains more information.

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

 defaults/config.sh   |   7 +++
 doc/genkernel.8.txt  |  90 +++
 gen_bootloader.sh|  12 ++--
 gen_cmdline.sh   |  40 ++--
 gen_compile.sh   |  26 
 gen_configkernel.sh  |   2 +-
 gen_determineargs.sh | 169 ++-
 gen_funcs.sh |   7 +++
 gen_initramfs.sh |  10 +--
 gen_package.sh   |  98 +++--
 genkernel|  33 +-
 genkernel.conf   |  22 +--
 12 files changed, 407 insertions(+), 109 deletions(-)

diff --git a/defaults/config.sh b/defaults/config.sh
index 3546299..7232671 100644
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -21,6 +21,13 @@ KERNEL_SUPPORT_MICROCODE=no
 # Arch-specific defaults that can be overridden in the config file or on the
 # command line.
 #
+DEFAULT_INITRAMFS_FILENAME="initramfs-genkernel-%%ARCH%%-%%KV%%"
+DEFAULT_INITRAMFS_SYMLINK_NAME="initramfs"
+DEFAULT_KERNEL_FILENAME="kernel-genkernel-%%ARCH%%-%%KV%%"
+DEFAULT_KERNEL_SYMLINK_NAME="kernel"
+DEFAULT_SYSTEMMAP_FILENAME="System.map-%%ARCH%%-%%KV%%"
+DEFAULT_SYSTEMMAP_SYMLINK_NAME="System.map"
+
 DEFAULT_COMPRESS_INITRD=yes
 DEFAULT_COMPRESS_INITRD_TYPE=best
 

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index f1ccbe6..e94fa12 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -150,16 +150,20 @@ KERNEL COMPILATION
 are copied over.
 
 *--*[*no-*]*symlink*::
-Manages,  or does not manage, symlinks in '/boot' like the manual
-kernel "make install" process does. A kernel (or,  depending on
-options,  kernelz)  symlink will link to the most recently built
-kernel image and a kernel.old (or kernelz.old) symlink will link
-to the second most recently built image, if one exists.  Similar
-symlinks (both * and *.old) are managed for initramfs and System.map.
-The corresponding work products (i.e., the actual kernel
-and initramfs images, and System.map) are also managed accordingly.
-NOTE: Specifying   *--symlink*  does nothing unless
-*--install* is also specified.
+Manages,  or does not manage, symlinks in '/boot' like the manual
+kernel "make install" process does. A 'kernel' (or, depending on
+options, 'kernelz') symlink will link to the most recently built
+kernel image and a 'kernel.old' (or 'kernelz.old') symlink will link
+to the second most recently built image, if one exists. Similar
+symlinks (with and without '.old' suffix) are managed for initramfs and
+System.map. The corresponding work products (i.e., the actual kernel
+and initramfs images, and System.map) are also managed accordingly.
++
+The symlink name can be controlled via *--kernel-symlink-name* and/or
+*--initramfs-symlink-name* option.
+
+NOTE: Specifying *--symlink* does nothing unless *--install* is also
+specified.
 
 *--*[*no-*]*oldconfig*::
 Runs, or does not run, "make oldconfig" before compilation.  Specifying
@@ -428,9 +432,22 @@ INTERNALS
 
 OUTPUT SETTINGS
 ~~~
-*--kernname*=<...>::
-Tag the kernel and initrd with a name, if not defined this
-option defaults to genkernel.
+*--initramfs-filename*=<...>::
+Set initramfs filename which will be used when initramfs will be installed
+into *BOOTDIR* (implies *--install* option). Please see
+*--kernel-filename* option for available placeholders and restrictions.
++
+By default, initramfs filename will be set to 
'initramfs-genkernel-%%ARCH%%-%%KV%%'.
+
+*--initramfs-symlink-name*=<...>::
+Set initramfs symlink name which will be used when initramfs will be
+installed into *BOOTDIR* (implies *--install* option) and *--symlink*
+option is given. Please see *--kernel-filename* option for available
+placeholders and restrictions.
++
+By default, initramfs symlink name will be set to 'initramfs'.
+
+NOTE: Initramfs filename and initramfs symlink name must be different.
 
 *--minkernpackage*=::
 Archive file created using tar containing kernel and initramfs.
@@ -445,11 +462,58 @@ NOTE: No modules outside of the initramfs will be 
included!
 Archive file created using tar containing kernel binary, content of
 '/lib/modules' and the kernel config after the callbacks have run.
 
+*--kernel-filename*=<...>::

  1   2   3   4   >