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

2019-11-12 Thread Zac Medico
commit: 07f5c5330d4508990ad52e66af4e18f1f860b2eb
Author: Ed Baker  intel  com>
AuthorDate: Fri Nov  8 22:12:27 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Nov 12 22:24:31 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=07f5c533

Keep https_proxy populated for curl downloads

When building Chromium OS behind a proxy, https_proxy needs to be set
for curl. Additional discussion can be found at [1]. Chromium configures
the chroot FETCHCOMMAND at [2].

Example fetch command:
curl --ipv4 -f -y 30 --retry 9 -L \
 --output /var/cache/chromeos-cache/distfiles/host/zlib-1.2.11.tar.gz \
 
https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/zlib-1.2.11.tar.gz

Example error message:
>>> 13:49:14 === Start output for job zlib-1.2.11 ===
zlib-1.2.11: >>> Downloading 
'https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/zlib-1.2.11.tar.gz'
zlib-1.2.11:   % Total% Received % Xferd  Average Speed   TimeTime 
Time  Current
zlib-1.2.11:  Dload  Upload   Total   Spent
Left  Speed
  0 00 00 0  0  0 --:--:--  0:02:10 --:--:-- 0
zlib-1.2.11: curl: (7) Failed to connect to commondatastorage.googleapis.com 
port 443: Connection timed out
zlib-1.2.11: >>> Downloading 
'https://commondatastorage.googleapis.com/chromeos-mirror/gentoo/distfiles/zlib-1.2.11.tar.gz'
zlib-1.2.11:   % Total% Received % Xferd  Average Speed   TimeTime 
Time  Current
zlib-1.2.11:  Dload  Upload   Total   Spent
Left  Speed
  0 00 00 0  0  0 --:--:--  0:02:11 --:--:-- 0
zlib-1.2.11: curl: (7) Failed to connect to commondatastorage.googleapis.com 
port 443: Connection timed out
zlib-1.2.11: !!! Couldn't download 'zlib-1.2.11.tar.gz'. Aborting.
zlib-1.2.11:  * Fetch failed for sys-libs/zlib-1.2.11, Log file:
zlib-1.2.11:  *   /var/log/portage/sys-libs:zlib-1.2.11:20191108-204452.log

[1] https://bugs.chromium.org/p/chromium/issues/detail?id=1021751
[2] 
https://chromium.googlesource.com/chromiumos/platform/crosutils/+/master/sdk_lib/make_conf_util.sh

Closes: https://github.com/gentoo/portage/pull/478
Signed-off-by: Edward Baker  intel.com>
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
index 7bb2b1aa0..71cbdad2e 100644
--- a/lib/portage/__init__.py
+++ b/lib/portage/__init__.py
@@ -563,7 +563,7 @@ def create_trees(config_root=None, target_root=None, 
trees=None, env=None,
clean_env = {}
for k in ('PATH', 'PORTAGE_GRPNAME', 'PORTAGE_REPOSITORIES', 
'PORTAGE_USERNAME',
'PYTHONPATH', 'SSH_AGENT_PID', 'SSH_AUTH_SOCK', 'TERM',
-   'ftp_proxy', 'http_proxy', 'no_proxy',
+   'ftp_proxy', 'http_proxy', 'https_proxy', 'no_proxy',
'__PORTAGE_TEST_HARDLINK_LOCKS'):
v = settings.get(k)
if v is not None:



[gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/

2019-11-11 Thread Zac Medico
commit: 598e450e5615e32a63c5fd6f3a9ce65ffc557b4f
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Nov 11 23:03:40 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Nov 11 23:04:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598e450e

install-qa-check.d/08gentoo-paths: add nix to allowed_paths_toplevel

Closes: https://bugs.gentoo.org/670902
Suggested-by: Michał Górny  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 metadata/install-qa-check.d/08gentoo-paths | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/install-qa-check.d/08gentoo-paths 
b/metadata/install-qa-check.d/08gentoo-paths
index 5161aef9922..9db1f9b3ce0 100644
--- a/metadata/install-qa-check.d/08gentoo-paths
+++ b/metadata/install-qa-check.d/08gentoo-paths
@@ -16,7 +16,7 @@ gentoo_path_check() {
# /home is not included as no ebuilds should install files there
local allowed_paths_toplevel=(
"${allowed_common_dirs[@]}"
-   boot dev etc opt srv usr var
+   boot dev etc nix opt srv usr var
)
 
# directories in /usr which can be installed to by ebuilds



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

2019-11-10 Thread Zac Medico
commit: cd900b031fef35ee240f5f7151060debec7c8459
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Nov 11 00:49:47 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Nov 11 01:00:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd900b03

app-text/calibre: 4.3.0-r1 revbump

Reported-by: majlo  o2.pl>
Closes: https://bugs.gentoo.org/699628
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zac Medico  gentoo.org>

 app-text/calibre/{calibre-4.3.0.ebuild => calibre-4.3.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/calibre/calibre-4.3.0.ebuild 
b/app-text/calibre/calibre-4.3.0-r1.ebuild
similarity index 99%
rename from app-text/calibre/calibre-4.3.0.ebuild
rename to app-text/calibre/calibre-4.3.0-r1.ebuild
index a435558ef33..bd7b7fd3364 100644
--- a/app-text/calibre/calibre-4.3.0.ebuild
+++ b/app-text/calibre/calibre-4.3.0-r1.ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=sys-apps/dbus-1.10.8
dev-python/dnspython[${PYTHON_USEDEP}]
>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+   >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]



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

2019-11-10 Thread Zac Medico
commit: 0f86e863cbbfb301d846d63d42ebee1de5193700
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Nov 11 00:52:10 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Nov 11 01:00:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f86e863

dev-python/html2text: keyword ~arm (new calibre dep)

Bug: https://bugs.gentoo.org/699628
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zac Medico  gentoo.org>

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

diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild 
b/dev-python/html2text/html2text-2019.8.11.ebuild
index ea4d4e71627..e44c8fcbf96 100644
--- a/dev-python/html2text/html2text-2019.8.11.ebuild
+++ b/dev-python/html2text/html2text-2019.8.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



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

2019-11-10 Thread Zac Medico
commit: c5ea8fdcf5a415b280427c0513613147ada81708
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Nov 11 00:12:29 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Nov 11 00:27:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ea8fdc

dev-python/html2text: Bump to version 2019.8.11

Reported-by: majlo  o2.pl>
Bug: https://bugs.gentoo.org/699628
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zac Medico  gentoo.org>

 dev-python/html2text/Manifest   |  1 +
 dev-python/html2text/html2text-2019.8.11.ebuild | 36 +
 2 files changed, 37 insertions(+)

diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index e832f9d7c99..840cdbc1d92 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,2 +1,3 @@
 DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B 
a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057
 SHA512 
773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
+DIST html2text-2019.8.11.tar.gz 48721 BLAKE2B 
6a63a9608c29374a510d7026717de4b94eb63d366513990623b9bfbf679680c85f5cf06ec7076143397d160a5c484bf5dfef3e24b1862be09e0cc0d7cd86051a
 SHA512 
f405bccea18b2898fc8816483e8fa8912b2d508f139d7a65c54218acc87006d8b89e00a12018dc7b911f729036fe4e8a5069242dc00edb40171d4bc149e39ba6
 DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B 
efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9
 SHA512 
4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d

diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild 
b/dev-python/html2text/html2text-2019.8.11.ebuild
new file mode 100644
index 000..ea4d4e71627
--- /dev/null
+++ b/dev-python/html2text/html2text-2019.8.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text 
https://pypi.org/project/html2text/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pkg_resources is used for entry points
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+python_prepare_all() {
+   # naming conflict with app-text/html2text, bug 421647
+   sed -i 's/html2text = html2text.cli:main/py\0/' setup.py || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   pytest -vv || die "tests failed with ${EPYTHON}"
+}



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

2019-11-10 Thread Zac Medico
commit: 9dd2601f275c9172deeddead235f416efc94bc86
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov 10 19:00:23 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Nov 10 19:02:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd2601f

dev-util/editorconfig-geany: Bump to version 0.2

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

 dev-util/editorconfig-geany/Manifest   |  1 +
 .../editorconfig-geany-0.2.ebuild  | 36 ++
 2 files changed, 37 insertions(+)

diff --git a/dev-util/editorconfig-geany/Manifest 
b/dev-util/editorconfig-geany/Manifest
index 8f409dc0cda..34ffd7e41b7 100644
--- a/dev-util/editorconfig-geany/Manifest
+++ b/dev-util/editorconfig-geany/Manifest
@@ -1 +1,2 @@
 DIST editorconfig-geany-0.1_p20160725.tar.gz 10336 BLAKE2B 
0794a7c90c46eb107822a2ceba92ae5dbcafcbe11aac519d8cd2102d92b93c578f3f49e31f7e281df2c3a90facaf29df5fdfa0b2970dd75894356066f4c40a0a
 SHA512 
ac8c4d46c17a5592c8f75a4100cfa1eaa55cb5333a1a6330ae84249d6df3b9ae4b454ee9c68b88ad777f5bea22ad1f3ce0a63bf89a1dd41d13abcfbd2a585734
+DIST editorconfig-geany-0.2.tar.gz 12322 BLAKE2B 
2d203d3df6c6a7bb18a0b80cd33c041606b9732a83c5210fe3a66db587dedd81e1a1c2102e827980f6d85404cceed3b097f85e6c33aea81f21e9725fa7dd49e8
 SHA512 
cda2fd6c8ff5b7a2088840e5f2ceebb2f00f48281ff2943c4ffada30a7e70ce18ae9a84e5ac946e3affb3e5238512f829e545d31b59383722820b89c0309702d

diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild 
b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
new file mode 100644
index 000..3e1268e041e
--- /dev/null
+++ b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="EditorConfig plugin for Geany"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-geany/;
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+CDEPEND="app-text/editorconfig-core-c:="
+DEPEND="${CDEPEND}
+   dev-util/geany"
+RDEPEND="${CDEPEND}"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+src_prepare() {
+   eapply_user
+   sed -e "s|^\\(EDITORCONFIG_PREFIX =\\).*|\\1 ${EPREFIX}/usr|" \
+   -e "s|^\\(CFLAGS =\\).*|\\1 -fPIC $("$(tc-getPKG_CONFIG)" 
--cflags geany geany) ${CFLAGS}|" \
+   -e "s|^\\(LDFLAGS =.*\\)|\\1 ${LDFLAGS}|" \
+   -e "s|\`pkg-config[^\`]*\`||" \
+   -i Makefile || die
+}
+
+src_install() {
+   exeinto "$("$(tc-getPKG_CONFIG)" --variable=libdir geany)/geany"
+   doexe ${PN}.so
+   dodoc README.md
+}



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

2019-11-10 Thread Zac Medico
commit: c6d2f47243bcedd4f491db5cbe316c2a261e4da3
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 19:56:54 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 20:42:26 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c6d2f472

FileCopier: native zero-copy and sparse file support

Use native copyfile for zero-copy and sparse file support, and copy
permission bits like shutil.copy.

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

 lib/portage/tests/util/test_file_copier.py |  4 
 lib/portage/util/_async/FileCopier.py  | 16 +---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/portage/tests/util/test_file_copier.py 
b/lib/portage/tests/util/test_file_copier.py
index 01dfba494..3f1ec6b78 100644
--- a/lib/portage/tests/util/test_file_copier.py
+++ b/lib/portage/tests/util/test_file_copier.py
@@ -4,6 +4,7 @@
 import errno
 import os
 import shutil
+import stat
 import tempfile
 
 from portage.tests import TestCase
@@ -22,8 +23,10 @@ class FileCopierTestCase(TestCase):
src_path = os.path.join(tempdir, 'src')
dest_path = os.path.join(tempdir, 'dest')
content = b'foo'
+   file_mode = 0o600
with open(src_path, 'wb') as f:
f.write(content)
+   os.chmod(src_path, file_mode)
copier = FileCopier(src_path=src_path, 
dest_path=dest_path, scheduler=loop)
copier.start()
loop.run_until_complete(copier.async_wait())
@@ -31,6 +34,7 @@ class FileCopierTestCase(TestCase):
copier.future.result()
with open(dest_path, 'rb') as f:
self.assertEqual(f.read(), content)
+   self.assertEqual(file_mode, 
stat.S_IMODE(os.stat(dest_path).st_mode))
 
# failure due to nonexistent src_path
src_path = os.path.join(tempdir, 'does-not-exist')

diff --git a/lib/portage/util/_async/FileCopier.py 
b/lib/portage/util/_async/FileCopier.py
index 3a0be4b63..d9077411d 100644
--- a/lib/portage/util/_async/FileCopier.py
+++ b/lib/portage/util/_async/FileCopier.py
@@ -1,7 +1,11 @@
 # Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-from portage import shutil
+import os as _os
+
+from portage import _encodings, _unicode_encode
+from portage.util import apply_stat_permissions
+from portage.util.file_copy import copyfile
 from portage.util.futures import asyncio
 from portage.util.futures.executor.fork import ForkExecutor
 from portage.util._async.AsyncTaskFuture import AsyncTaskFuture
@@ -14,6 +18,12 @@ class FileCopier(AsyncTaskFuture):
__slots__ = ('src_path', 'dest_path')
 
def _start(self):
-   self.future = 
asyncio.ensure_future(self.scheduler.run_in_executor(ForkExecutor(loop=self.scheduler),
-   shutil.copy, self.src_path, self.dest_path))
+   self.future = 
asyncio.ensure_future(self.scheduler.run_in_executor(
+   ForkExecutor(loop=self.scheduler), self._run))
super(FileCopier, self)._start()
+
+   def _run(self):
+   src_path = _unicode_encode(self.src_path, 
encoding=_encodings['fs'], errors='strict')
+   dest_path = _unicode_encode(self.dest_path, 
encoding=_encodings['fs'], errors='strict')
+   copyfile(src_path, dest_path)
+   apply_stat_permissions(dest_path, _os.stat(src_path))



[gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/

2019-11-10 Thread Zac Medico
commit: 3af85c99a2df7943f9476f5cd67d4c526b622fe2
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 22:46:44 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 22:51:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af85c99

app-emulation/libpod: fix get_release_info.sh VERSION

Bug: https://bugs.gentoo.org/697998
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/libpod/libpod-1.6.3.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-emulation/libpod/libpod-1.6.3.ebuild 
b/app-emulation/libpod/libpod-1.6.3.ebuild
index f2d8fa4c489..029c6c1413f 100644
--- a/app-emulation/libpod/libpod-1.6.3.ebuild
+++ b/app-emulation/libpod/libpod-1.6.3.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
-e 's/$(GO) build/$(GO) build -v -work -x/' \
-e 's/^\(install:.*\) install\.python$/\1/' \
-i Makefile || die
+
+   sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+   -i hack/get_release_info.sh || die
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/

2019-11-10 Thread Zac Medico
commit: 22f1b3e471e5795bcc025494197e584c89443927
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 22:36:40 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 22:37:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f1b3e4

app-emulation/libpod: Remove old version 1.6.2

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

 app-emulation/libpod/Manifest|   1 -
 app-emulation/libpod/libpod-1.6.2.ebuild | 142 ---
 2 files changed, 143 deletions(-)

diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index e09b88df125..d80038301d2 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,3 +1,2 @@
 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 
4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee
 SHA512 
d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
-DIST libpod-1.6.2.tar.gz 8270781 BLAKE2B 
5d86533ddc821f731292e126102a31d651956c275a22c5c4ab3c57b9351832a1d85d75be877343c60af47716f9d1776315b3bf41fb17037d02fee10cf88efba3
 SHA512 
68192dda019623e3f3af9f82f946be8efbaf3e2c54acf23f62af67ac1ca093dd4dba11d2a7c1c950b99060393ed7e945752c1eaa9eada0dfc30f3dcaac8e1c04
 DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B 
b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5
 SHA512 
a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd

diff --git a/app-emulation/libpod/libpod-1.6.2.ebuild 
b/app-emulation/libpod/libpod-1.6.2.ebuild
deleted file mode 100644
index 9c1a41555c1..000
--- a/app-emulation/libpod/libpod-1.6.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="f3ffda1e08f19e9a6a88484136b5eed76533f21a"
-EGO_PN="github.com/containers/${PN}"
-
-inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/;
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs ostree +rootless selinux"
-REQUIRED_USE="!selinux? ( !ostree )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   >=app-emulation/conmon-2.0.0
-   >=app-emulation/runc-1.0.0_rc6
-   dev-libs/libassuan:=
-   dev-libs/libgpg-error:=
-   sys-fs/lvm2
-   sys-libs/libseccomp:=
-
-   apparmor? ( sys-libs/libapparmor )
-   btrfs? ( sys-fs/btrfs-progs )
-   ostree? (
-   dev-libs/glib:=
-   dev-util/ostree:=
-   )
-   rootless? ( app-emulation/slirp4netns )
-   selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-   default
-
-   # Disable installation of python modules here, since those are
-   # installed by separate ebuilds.
-   sed -e '/^GIT_.*/d' \
-   -e 's/$(GO) build/$(GO) build -v -work -x/' \
-   -e 's/^\(install:.*\) install\.python$/\1/' \
-   -i Makefile || die
-}
-
-src_compile() {
-   # Filter unsupported linker flags
-   filter-flags '-Wl,*'
-
-   [[ -f hack/apparmor_tag.sh ]] || die
-   if use apparmor; then
-   echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-   else
-   echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-   fi
-
-   [[ -f hack/btrfs_installed_tag.sh ]] || die
-   if use btrfs; then
-   echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-   else
-   echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-   hack/btrfs_installed_tag.sh || die
-   fi
-
-   [[ -f hack/ostree_tag.sh ]] || die
-   if use ostree; then
-   echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
-   else
-   echo -e "#!/bin/sh\necho containers_image_ostree_stub" > 
hack/ostree_tag.sh || die
-   fi
-
-   [[ -f hack/selinux_tag.sh ]] || die
-   if use selinux; then
-   echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-   e

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

2019-11-08 Thread Zac Medico
commit: a78584964cdab8c3c7eb437c83688dacc04a5a8f
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 05:49:46 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 05:50:52 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7858496

repoman: Update for a repoman-2.3.18 release

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

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

diff --git a/repoman/RELEASE-NOTES b/repoman/RELEASE-NOTES
index e252d0124..dd6b1c6ac 100644
--- a/repoman/RELEASE-NOTES
+++ b/repoman/RELEASE-NOTES
@@ -1,6 +1,14 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+repoman-2.3.18
+==
+* Bug Fixes:
+- Bug 690786 Support metadata/layout.conf restrict-allowed
+- Bug 699514 Detect dosym absolute paths starting with ${D}, ${ED} etc.
+- Bug 699508 Fix unsafe string interpolation.
+
+
 repoman-2.3.17
 ==
 * Bug Fixes:

diff --git a/repoman/setup.py b/repoman/setup.py
index ebbf0a633..fef1e9450 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -450,7 +450,7 @@ def get_manpages():
 
 setup(
name = 'repoman',
-   version = '2.3.17',
+   version = '2.3.18',
url = 'https://wiki.gentoo.org/wiki/Project:Portage',
author = 'Gentoo Portage Development Team',
author_email = 'dev-port...@gentoo.org',



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

2019-11-08 Thread Zac Medico
commit: 2b90833cb908ee9a64c7293feadb16294ee5adff
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 05:58:22 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 05:59:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b90833c

app-portage/repoman: Bump to version 2.3.18

 #690786 Support metadata/layout.conf restrict-allowed
 #699514 Detect dosym absolute paths starting with ${D}, ${ED} etc.
 #699508 Fix unsafe string interpolation.

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

 app-portage/repoman/Manifest  |  1 +
 app-portage/repoman/repoman-2.3.18.ebuild | 63 +++
 2 files changed, 64 insertions(+)

diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 89a059eb575..20ceddf1c6e 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,3 +1,4 @@
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B 
f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d
 SHA512 
331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B 
dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38
 SHA512 
d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 DIST repoman-2.3.17.tar.bz2 86732 BLAKE2B 
95324a3513513349f3127b5c758766d3a05f9aa47ed9cbf1808a49b402b90004c469c2d621e5402358c307f53bfa04ac2873d0b3c5d6bc8548a092f9cde408b2
 SHA512 
a3c798482d5f91b61c979636876e8f127c5c84627b433c20343f359bc89b65b48f17fbe0d34fb0a8b9cbd3aabbacef71302ad87abc88763f51829e74a9d9f8fd
+DIST repoman-2.3.18.tar.bz2 86765 BLAKE2B 
99ba098b17d676a24c03cd37fb8aa81ce34e178af0973083e67196af88acb4473b0992e6c7706aefc20f4540c03544776fe74dcef7e6b1e1789ea95e43e457d4
 SHA512 
f041acc2f848f02a14cc8b50ad6e9b556db5a3409fb31b6d3e3e1755b44439252a90bee50e004f5921fd6326307c80a140a58e833bb6d902a603d96970cd6ef0

diff --git a/app-portage/repoman/repoman-2.3.18.ebuild 
b/app-portage/repoman/repoman-2.3.18.ebuild
new file mode 100644
index 000..7ce444e7657
--- /dev/null
+++ b/app-portage/repoman/repoman-2.3.18.ebuild
@@ -0,0 +1,63 @@
+# 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} )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git;
+   S="${WORKDIR}/${P}/repoman"
+else
+   SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   >=sys-apps/portage-2.3.72[${PYTHON_USEDEP}]
+   >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+   esetup.py test
+}
+
+python_install() {
+   # Install sbin scripts to bindir for python-exec linking
+   # they will be relocated in pkg_preinst()
+   distutils-r1_python_install \
+   --system-prefix="${EPREFIX}/usr" \
+   --bindir="$(python_get_scriptdir)" \
+   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+   --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+   --sbindir="$(python_get_scriptdir)" \
+   --sysconfdir="${EPREFIX}/etc" \
+   "${@}"
+}
+
+pkg_postinst() {
+   if [[ -z {REPLACING_VERSIONS} ]]; then
+   elog ""
+   elog "This release of repoman is from the new portage/repoman 
split"
+   elog "release code base."
+   elog "This new repoman code base is still being developed.  So 
its API's"
+   elog "are not to be considered stable and are subject to 
change."
+   elog "The code released has been tested and considered ready 
for use."
+   elog "This however does not guarantee it to be completely bug 
free."
+   elog "Please report any bugs you may encounter."
+   elog ""
+   fi
+}



[gentoo-commits] proj/portage: New tag: repoman-2.3.18

2019-11-08 Thread Zac Medico
commit: 
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 06:01:00 2019 +

New tag: repoman-2.3.18




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

2019-11-08 Thread Zac Medico
commit: 
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 05:23:39 2019 +

New tag: portage-2.3.79




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

2019-11-08 Thread Zac Medico
commit: a95264dd3d846c10045644d5385d96826fbbae78
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 05:16:02 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 05:22:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95264dd

sys-apps/portage: Bump to version 2.3.79

 #673400 emerge: fix error message for unknown options
 #699392 emirrordist: _recycle_copier_exit UnboundLocalError
 #699400 emirrordist: clean up FileCopier exception logging
 #699548 install.py: ignore -Z / --context

Bug: https://bugs.gentoo.org/697734
Bug: https://bugs.gentoo.org/673400
Bug: https://bugs.gentoo.org/699392
Bug: https://bugs.gentoo.org/699400
Bug: https://bugs.gentoo.org/699548
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.79.ebuild | 261 +
 2 files changed, 262 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fa84b5668f4..e47d4a94869 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,4 +2,5 @@ DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B 
dc378b714101b287fa33defeb778e586da83
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545a0f516a5724e331e
 SHA512 
20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 
1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903
 SHA512 
e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
 DIST portage-2.3.78.tar.bz2 1037439 BLAKE2B 
7f6d41feba299d2ae81a09ead816bb5695f93cf96f9a16fc4f7c865ceeed7cc5cc3ff5ad92b21a8b03a6ecbee462271a054adcb05c82ff079160d78531f21aee
 SHA512 
a33ec04b78c6e2e13dad80a43e6da6855aa91aa385a4d6f4b97bacc3af49e3e165e1b7183194e51cd7c4db0bba29200d60378197713c961601f84569f239b3e5
+DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 
7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e
 SHA512 
23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B 
f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c
 SHA512 
0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12

diff --git a/sys-apps/portage/portage-2.3.79.ebuild 
b/sys-apps/portage/portage-2.3.79.ebuild
new file mode 100644
index 000..8e7b92e07cc
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.79.ebuild
@@ -0,0 +1,261 @@
+# 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 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"
+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

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

2019-11-08 Thread Zac Medico
commit: c78451421e30504c821ac9ccc7b7d9a092208e25
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 05:12:11 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 05:12:23 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c7845142

Updates for portage-2.3.79 release

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

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index da49c9935..83a227836 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,17 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.3.79
+==
+* Bug Fixes:
+- Bug 673400 emerge: fix error message for unknown options
+- Bug 698046 fetch: remove symlink created by FETCHCOMMAND_RSYNC
+- Bug 698474 fetch: respect try_mirrors parameter for local mirrors
+- Bug 699392 emirrordist: _recycle_copier_exit UnboundLocalError
+- Bug 699400 emirrordist: clean up FileCopier exception logging
+- Bug 699548 install.py: ignore -Z / --context
+
+
 portage-2.3.78
 ==
 * Bug Fixes:

diff --git a/setup.py b/setup.py
index eee09e8bd..43bd88808 100755
--- a/setup.py
+++ b/setup.py
@@ -662,7 +662,7 @@ class build_ext(_build_ext):
 
 setup(
name = 'portage',
-   version = '2.3.78',
+   version = '2.3.79',
url = 'https://wiki.gentoo.org/wiki/Project:Portage',
author = 'Gentoo Portage Development Team',
author_email = 'dev-port...@gentoo.org',



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

2019-11-08 Thread Zac Medico
commit: 240060f32e3a21233a89f751e7f42b0bfa9a1712
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 04:43:26 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 04:43:48 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=240060f3

CommitMessageVerificationTest: fix DeprecationWarning for assertRegexpMatches

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

 repoman/lib/repoman/tests/commit/test_commitmsg.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/lib/repoman/tests/commit/test_commitmsg.py 
b/repoman/lib/repoman/tests/commit/test_commitmsg.py
index a734c1065..83fa0f37c 100644
--- a/repoman/lib/repoman/tests/commit/test_commitmsg.py
+++ b/repoman/lib/repoman/tests/commit/test_commitmsg.py
@@ -29,7 +29,7 @@ Expected: /%s/''' % (commitmsg, reason_re))
 Expected: /%s/
 Errors:
 %s''' % (commitmsg, reason_re, expl))
-   self.assertRegexpMatches(expl, reason_re,
+   (self.assertRegex if hasattr(self, 'assertRegex') else 
self.assertRegexpMatches)(expl, reason_re,
'''Commit message verification did not return 
expected error, for:
 %s
 



[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/linechecks/do/

2019-11-08 Thread Zac Medico
commit: 219e9bed020b67e78e96c5cded6ece7f7f68fb06
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Nov  9 04:57:14 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 04:59:15 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=219e9bed

repoman: ebuild.absdosym check: fix AttributeError for re.ASCII under python2.7

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

 repoman/lib/repoman/modules/linechecks/do/dosym.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/lib/repoman/modules/linechecks/do/dosym.py 
b/repoman/lib/repoman/modules/linechecks/do/dosym.py
index d1aed74d7..37c0ac535 100644
--- a/repoman/lib/repoman/modules/linechecks/do/dosym.py
+++ b/repoman/lib/repoman/modules/linechecks/do/dosym.py
@@ -10,7 +10,7 @@ class EbuildNonRelativeDosym(LineCheck):
variables = ('D', 'ED', 'ROOT', 'EROOT', 'BROOT')
regex = re.compile(

r'^\s*dosym\s+(["\']?((\$(%s)\W|\${(%s)(%%/)?})|/(bin|etc|lib|opt|sbin|srv|usr|var))\S*)'
 %
-   ('|'.join(variables), '|'.join(variables)), re.ASCII)
+   ('|'.join(variables), '|'.join(variables)), getattr(re, 
'ASCII', 0))
 
def check(self, num, line):
match = self.regex.match(line)



[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/linechecks/do/, ...

2019-11-08 Thread Zac Medico
commit: bb6a2ca9ccc8d3d6f7feb7c9ac6b6c2b40ce9d28
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Nov  9 03:39:53 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Nov  9 04:06:05 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bb6a2ca9

repoman: Fix unsafe string interpolation.

"on line: %d" etc. is no longer included in messages returned from individual 
checks.
"line %d: " is now consistently added by controller directly after ebuild path
and precedes specific message.

Example:
   app-misc/test/test-0.ebuild: line 5: please migrate from 'games' (no 
replacement)
   app-misc/test/test-0.ebuild: line 5: please migrate from 'versionator' to 
'eapi7-ver (built-in since EAPI 7)'
   app-misc/test/test-0.ebuild: line 10: Useless blank line
   app-misc/test/test-0.ebuild: line 20: 'econf' call should be moved to 
src_configure

Bug: https://bugs.gentoo.org/699508
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Zac Medico  gentoo.org>

 repoman/cnf/linechecks/linechecks.yaml | 46 +++---
 repoman/lib/repoman/modules/linechecks/base.py |  5 +--
 .../lib/repoman/modules/linechecks/controller.py   | 12 --
 .../modules/linechecks/deprecated/inherit.py   | 18 +++--
 repoman/lib/repoman/modules/linechecks/do/dosym.py |  2 +-
 .../lib/repoman/modules/linechecks/eapi/checks.py  | 10 ++---
 .../lib/repoman/modules/linechecks/emake/emake.py  |  2 +-
 .../lib/repoman/modules/linechecks/phases/phase.py |  4 +-
 .../repoman/modules/linechecks/portage/internal.py |  7 +---
 .../repoman/modules/linechecks/quotes/quoteda.py   |  2 +-
 .../repoman/modules/linechecks/useless/dodoc.py|  2 +-
 .../repoman/modules/linechecks/whitespace/blank.py |  2 +-
 12 files changed, 53 insertions(+), 59 deletions(-)

diff --git a/repoman/cnf/linechecks/linechecks.yaml 
b/repoman/cnf/linechecks/linechecks.yaml
index c452af07d..410bcd9c5 100644
--- a/repoman/cnf/linechecks/linechecks.yaml
+++ b/repoman/cnf/linechecks/linechecks.yaml
@@ -9,27 +9,27 @@ repoman_version: 2.3.3
 # configuration file for the LineCheck plugins run via the multicheck
 # scan module
 errors:
-COPYRIGHT_ERROR: 'Invalid Copyright on line: %d'
-LICENSE_ERROR: 'Invalid Gentoo/GPL License on line: %d'
-ID_HEADER_ERROR: 'Stale CVS header on line: %d'
-NO_BLANK_LINE_ERROR: 'Non-blank line after header on line: %d'
-LEADING_SPACES_ERROR: 'Ebuild contains leading spaces on line: %d'
-TRAILING_WHITESPACE_ERROR: 'Trailing whitespace error on line: %d'
-READONLY_ASSIGNMENT_ERROR: 'Ebuild contains assignment to read-only 
variable on line: %d'
-MISSING_QUOTES_ERROR: 'Unquoted Variable on line: %d'
-NESTED_DIE_ERROR: 'Ebuild calls die in a subshell on line: %d'
-PATCHES_ERROR: 'PATCHES is not a bash array on line: %d'
-REDUNDANT_CD_S_ERROR: 'Ebuild has redundant cd ${S} statement on line: %d'
-EMAKE_PARALLEL_DISABLED: 'Upstream parallel compilation bug (ebuild calls 
emake -j1 on line: %d)'
-EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS: 'Upstream parallel compilation bug 
(MAKEOPTS=-j1 on line: %d)'
-DEPRECATED_BINDNOW_FLAGS: 'Deprecated bindnow-flags call on line: %d'
-EAPI_DEFINED_AFTER_INHERIT: 'EAPI defined after inherit on line: %d'
-NO_AS_NEEDED: 'Upstream asneeded linking bug (no-as-needed on line: %d)'
-PRESERVE_OLD_LIB: 'Ebuild calls deprecated preserve_old_lib on line: %d'
-BUILT_WITH_USE: 'built_with_use on line: %d'
-NO_OFFSET_WITH_HELPERS: 'Helper function is used with D, ROOT, ED, EROOT 
or EPREFIX on line: %d'
-SANDBOX_ADDPREDICT: 'Ebuild calls addpredict on line: %d'
-USEQ_ERROR: 'Ebuild calls deprecated useq function on line: %d'
-HASQ_ERROR: 'Ebuild calls deprecated hasq function on line: %d'
-URI_HTTPS: 'Ebuild uses http:// but should use https:// on line: %d'
+COPYRIGHT_ERROR: 'Invalid Copyright'
+LICENSE_ERROR: 'Invalid Gentoo/GPL License'
+ID_HEADER_ERROR: 'Stale CVS header'
+NO_BLANK_LINE_ERROR: 'Non-blank line after header'
+LEADING_SPACES_ERROR: 'Ebuild contains leading spaces'
+TRAILING_WHITESPACE_ERROR: 'Trailing whitespace error'
+READONLY_ASSIGNMENT_ERROR: 'Ebuild contains assignment to read-only 
variable'
+MISSING_QUOTES_ERROR: 'Unquoted Variable'
+NESTED_DIE_ERROR: 'Ebuild calls die in a subshell'
+PATCHES_ERROR: 'PATCHES is not a bash array'
+REDUNDANT_CD_S_ERROR: 'Ebuild has redundant cd ${S} statement'
+EMAKE_PARALLEL_DISABLED: 'Upstream parallel compilation bug (ebuild calls 
emake -j1)'
+EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS: 'Upstream parallel compilation bug 
(MAKEOPTS=-j1)'
+DEPRECATED_BINDNOW_FLAGS: 'Deprecated bindnow-flags call'
+EAPI_DEFINED_AFTER_INHERIT: 'EAPI defined after inherit'
+NO_AS_NEEDED: 'Upstream asneeded linking bug (no-as-needed)'
+PRESERVE_OLD_LIB: 'Ebuild calls deprecated prese

[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/linechecks/

2019-11-07 Thread Zac Medico
commit: d8879e74458935919a4303f4fd1d2d24eb92e094
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Nov  8 05:42:16 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  8 05:43:26 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d8879e74

Revert "repoman: fix unsafe string interpolation (bug 699508)"

This reverts commit d156784fd7557e8f5ce8a6de5cd3a6a38a78e436.
The 'on line: %d' string fails to match some messages.

Reported-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Bug: https://bugs.gentoo.org/699508
Signed-off-by: Zac Medico  gentoo.org>

 repoman/lib/repoman/modules/linechecks/controller.py | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/repoman/lib/repoman/modules/linechecks/controller.py 
b/repoman/lib/repoman/modules/linechecks/controller.py
index b468e348d..7082a5d02 100644
--- a/repoman/lib/repoman/modules/linechecks/controller.py
+++ b/repoman/lib/repoman/modules/linechecks/controller.py
@@ -1,6 +1,4 @@
 
-from __future__ import unicode_literals
-
 import logging
 import operator
 import os
@@ -138,8 +136,7 @@ class LineCheckController(object):
if not ignore or not 
ignore.match(line):
e = lc.check(num, line)
if e:
-   # String 
interpolation on the variable e is unsafe because it can contain % characters.
-   yield 
lc.repoman_check_name, e.replace('on line: %d', 'on line: %d' % strnum + 1)
+   yield 
lc.repoman_check_name, e % (num + 1)
 
for lc in checks:
i = lc.end()



[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/linechecks/

2019-11-07 Thread Zac Medico
commit: d156784fd7557e8f5ce8a6de5cd3a6a38a78e436
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Nov  8 04:52:42 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  8 04:54:37 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d156784f

repoman: fix unsafe string interpolation (bug 699508)

Reported-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Bug: https://bugs.gentoo.org/699508
Signed-off-by: Zac Medico  gentoo.org>

 repoman/lib/repoman/modules/linechecks/controller.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/repoman/lib/repoman/modules/linechecks/controller.py 
b/repoman/lib/repoman/modules/linechecks/controller.py
index 7082a5d02..b468e348d 100644
--- a/repoman/lib/repoman/modules/linechecks/controller.py
+++ b/repoman/lib/repoman/modules/linechecks/controller.py
@@ -1,4 +1,6 @@
 
+from __future__ import unicode_literals
+
 import logging
 import operator
 import os
@@ -136,7 +138,8 @@ class LineCheckController(object):
if not ignore or not 
ignore.match(line):
e = lc.check(num, line)
if e:
-   yield 
lc.repoman_check_name, e % (num + 1)
+   # String 
interpolation on the variable e is unsafe because it can contain % characters.
+   yield 
lc.repoman_check_name, e.replace('on line: %d', 'on line: %d' % strnum + 1)
 
for lc in checks:
i = lc.end()



[gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/modules/linechecks/do/

2019-11-07 Thread Zac Medico
commit: 424f333b044a89f3a7a782ceef43480795696f3b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov  7 06:38:30 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  8 04:31:42 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=424f333b

repoman: ebuild.absdosym check: Detect absolute paths starting with ${D}, ${ED} 
etc.

Bug: https://bugs.gentoo.org/699514
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Zac Medico  gentoo.org>

 repoman/lib/repoman/modules/linechecks/do/dosym.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/repoman/lib/repoman/modules/linechecks/do/dosym.py 
b/repoman/lib/repoman/modules/linechecks/do/dosym.py
index bab4dad03..c342d3595 100644
--- a/repoman/lib/repoman/modules/linechecks/do/dosym.py
+++ b/repoman/lib/repoman/modules/linechecks/do/dosym.py
@@ -7,8 +7,10 @@ from repoman.modules.linechecks.base import LineCheck
 class EbuildNonRelativeDosym(LineCheck):
"""Check ebuild for dosym using absolute paths instead of relative."""
repoman_check_name = 'ebuild.absdosym'
+   variables = ('D', 'ED', 'ROOT', 'EROOT', 'BROOT')
regex = re.compile(
-   r'^\s*dosym\s+["\']?(/(bin|etc|lib|opt|sbin|srv|usr|var)\S*)')
+   
r'^\s*dosym\s+(["\']?((\$(%s)\W|\${(%s)(%%/)?})|/(bin|etc|lib|opt|sbin|srv|usr|var))\S*)'
 %
+   ('|'.join(variables), '|'.join(variables)), re.ASCII)
 
def check(self, num, line):
match = self.regex.match(line)



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

2019-11-07 Thread Zac Medico
commit: 4c5f556649fd16d681646967a2ab9c8d423ad124
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Nov  8 02:26:49 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  8 02:27:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5f5566

app-text/calibre: Bump to version 4.3.0

Closes: https://bugs.gentoo.org/699406
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-text/calibre/Manifest |   1 +
 app-text/calibre/calibre-4.3.0.ebuild | 271 ++
 2 files changed, 272 insertions(+)

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 718285fb3a1..d9bf0f726a7 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,3 +2,4 @@ DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 
60915345dd756d085386af61128e92569304
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 
9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41
 SHA512 
6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
 DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 
85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8
 SHA512 
9a4766ccec830e553b5165f9a3ba6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
 DIST calibre-4.2.0.tar.xz 36319240 BLAKE2B 
a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437
 SHA512 
653dec2ba7a7ca122425619dc148765aea5cd60ede7fab23c1b10b0a7ba70f055bc6167732d4e21f161f37b313a7f2f9dde81240e1226a11a24b1195c9e38866
+DIST calibre-4.3.0.tar.xz 36472072 BLAKE2B 
fd187d1b68ac60c26c11094b0d19123f24ac93cde1e9939b71ecd4756c7a40ab55e4e36128763ed7f312df18a5152da418828ce84f4514a8747df8ccc3de2365
 SHA512 
7b95459df5a65f3c6ea743ef8e45b2f859c5bd4991813c583380c173c8f0dbba07128e8dbe09f2c6133706367c76add9b3387c8fbc6e2587d0723b7ebfa41351

diff --git a/app-text/calibre/calibre-4.3.0.ebuild 
b/app-text/calibre/calibre-4.3.0.ebuild
new file mode 100644
index 000..a435558ef33
--- /dev/null
+++ b/app-text/calibre/calibre-4.3.0.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/;
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz;
+
+LICENSE="
+   GPL-3+
+   GPL-3
+   GPL-2+
+   GPL-2
+   GPL-1+
+   LGPL-3+
+   LGPL-2.1+
+   LGPL-2.1
+   BSD
+   MIT
+   Old-MIT
+   Apache-2.0
+   public-domain
+   || ( Artistic GPL-1+ )
+   CC-BY-3.0
+   OFL-1.1
+   PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+   >=app-text/hunspell-1.7:=
+   >=app-text/podofo-0.9.6_pre20171027:=
+   >=app-text/poppler-0.26.5[qt5]
+   >=dev-libs/chmlib-0.40:=
+   dev-libs/glib:2=
+   >=dev-libs/icu-57.1:=
+   dev-libs/libinput:=
+   >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+   >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+   >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+   >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+   >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+   >=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}]
+   >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+   >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+   >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+   >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+   >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+   
>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+   >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+   dev-python/regex[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5=
+   dev-qt/qtdbus:5=
+   dev-qt/qtgui:5=
+   >=dev-qt/qtwebengine-5.12
+   dev-qt/qtwidgets:5=

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

2019-11-06 Thread Zac Medico
commit: 7b8f57335c43054fe4008b7401d6ac2b3f710c1a
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Nov  6 08:03:36 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Wed Nov  6 20:05:27 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7b8f5733

FileCopier: capture exceptions

Use ForkExecutor to capture exceptions instead of showing
a full traceback. FileCopier callers will now be responsible
for displaying relevant exception messages.

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

 lib/portage/tests/util/test_file_copier.py | 44 ++
 lib/portage/util/_async/FileCopier.py  | 16 ++-
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/lib/portage/tests/util/test_file_copier.py 
b/lib/portage/tests/util/test_file_copier.py
new file mode 100644
index 0..01dfba494
--- /dev/null
+++ b/lib/portage/tests/util/test_file_copier.py
@@ -0,0 +1,44 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import errno
+import os
+import shutil
+import tempfile
+
+from portage.tests import TestCase
+from portage.util._async.FileCopier import FileCopier
+from portage.util._eventloop.global_event_loop import global_event_loop
+
+
+class FileCopierTestCase(TestCase):
+
+   def testFileCopier(self):
+   loop = global_event_loop()
+   tempdir = tempfile.mkdtemp()
+   try:
+
+   # regular successful copy
+   src_path = os.path.join(tempdir, 'src')
+   dest_path = os.path.join(tempdir, 'dest')
+   content = b'foo'
+   with open(src_path, 'wb') as f:
+   f.write(content)
+   copier = FileCopier(src_path=src_path, 
dest_path=dest_path, scheduler=loop)
+   copier.start()
+   loop.run_until_complete(copier.async_wait())
+   self.assertEqual(copier.returncode, 0)
+   copier.future.result()
+   with open(dest_path, 'rb') as f:
+   self.assertEqual(f.read(), content)
+
+   # failure due to nonexistent src_path
+   src_path = os.path.join(tempdir, 'does-not-exist')
+   copier = FileCopier(src_path=src_path, 
dest_path=dest_path, scheduler=loop)
+   copier.start()
+   loop.run_until_complete(copier.async_wait())
+   self.assertEqual(copier.returncode, 1)
+   self.assertEqual(copier.future.exception().errno, 
errno.ENOENT)
+   self.assertEqual(copier.future.exception().filename, 
src_path.encode('utf8'))
+   finally:
+   shutil.rmtree(tempdir)

diff --git a/lib/portage/util/_async/FileCopier.py 
b/lib/portage/util/_async/FileCopier.py
index 27e5ab4c0..3a0be4b63 100644
--- a/lib/portage/util/_async/FileCopier.py
+++ b/lib/portage/util/_async/FileCopier.py
@@ -1,17 +1,19 @@
-# Copyright 2013 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-from portage import os
 from portage import shutil
-from portage.util._async.ForkProcess import ForkProcess
+from portage.util.futures import asyncio
+from portage.util.futures.executor.fork import ForkExecutor
+from portage.util._async.AsyncTaskFuture import AsyncTaskFuture
 
-class FileCopier(ForkProcess):
+class FileCopier(AsyncTaskFuture):
"""
Asynchronously copy a file.
"""
 
__slots__ = ('src_path', 'dest_path')
 
-   def _run(self):
-   shutil.copy(self.src_path, self.dest_path)
-   return os.EX_OK
+   def _start(self):
+   self.future = 
asyncio.ensure_future(self.scheduler.run_in_executor(ForkExecutor(loop=self.scheduler),
+   shutil.copy, self.src_path, self.dest_path))
+   super(FileCopier, self)._start()



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

2019-11-06 Thread Zac Medico
commit: e5c7b9e292c81c74c6b016aa03ef76214515f0bd
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Nov  6 08:03:48 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Wed Nov  6 20:05:27 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e5c7b9e2

emaint: log FileCopier exceptions

Since FileCopier now captures exceptions instead of showing
a traceback, it's necessary to explicitly log them.

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

 lib/portage/_emirrordist/DeletionTask.py | 2 +-
 lib/portage/_emirrordist/FetchTask.py| 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/portage/_emirrordist/DeletionTask.py 
b/lib/portage/_emirrordist/DeletionTask.py
index 2fdafd59e..5eb01d840 100644
--- a/lib/portage/_emirrordist/DeletionTask.py
+++ b/lib/portage/_emirrordist/DeletionTask.py
@@ -85,7 +85,7 @@ class DeletionTask(CompositeTask):
 
else:
logging.error(("%s copy from distfiles "
-   "to recycle failed") % (self.distfile,))
+   "to recycle failed: %s") % (self.distfile, 
copier.future.exception()))
success = False
 
if success:

diff --git a/lib/portage/_emirrordist/FetchTask.py 
b/lib/portage/_emirrordist/FetchTask.py
index ca573fa49..0441fc677 100644
--- a/lib/portage/_emirrordist/FetchTask.py
+++ b/lib/portage/_emirrordist/FetchTask.py
@@ -372,8 +372,8 @@ class FetchTask(CompositeTask):
 
current_mirror = self._current_mirror
if copier.returncode != os.EX_OK:
-   msg = "%s %s copy failed unexpectedly" % \
-   (self.distfile, current_mirror.name)
+   msg = "%s %s copy failed unexpectedly: %s" % \
+   (self.distfile, current_mirror.name, 
copier.future.exception())
self.scheduler.output(msg + '\n', background=True,
log_path=self._log_path)
logging.error(msg)
@@ -549,8 +549,8 @@ class FetchTask(CompositeTask):
self._make_layout_links()
else:
# out of space?
-   msg = "%s %s copy failed unexpectedly" % \
-   (self.distfile, self._fetch_tmp_dir_info)
+   msg = "%s %s copy failed unexpectedly: %s" % \
+   (self.distfile, self._fetch_tmp_dir_info, 
copier.future.exception())
self.scheduler.output(msg + '\n', background=True,
log_path=self._log_path)
logging.error(msg)



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

2019-11-06 Thread Zac Medico
commit: 47e0d5b5390873edd0020245307b0febad84a5b5
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Nov  6 19:56:52 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Wed Nov  6 20:03:42 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=47e0d5b5

emirrordist: _make_layout_links msg UnboundLocalError

Fixes: 0d34d89d5028 ("emirrordist: Implement mirror layout.conf support")
Bug: https://bugs.gentoo.org/699392
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/_emirrordist/FetchTask.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/portage/_emirrordist/FetchTask.py 
b/lib/portage/_emirrordist/FetchTask.py
index 6f547d397..ca573fa49 100644
--- a/lib/portage/_emirrordist/FetchTask.py
+++ b/lib/portage/_emirrordist/FetchTask.py
@@ -585,6 +585,8 @@ class FetchTask(CompositeTask):
self._success()
self.returncode = os.EX_OK
else:
+   msg = "failed to create distfiles layout {}".format(
+   "symlink" if self.config.options.symlinks else 
"hardlink")
self.config.log_failure("%s\t%s\t%s" %
(self.cpv, self.distfile, msg))
self.config.file_failures[self.distfile] = self.cpv



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

2019-11-05 Thread Zac Medico
commit: 716cbb59275e7f0fed2c06c9855a910e1f2a162d
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Nov  5 19:20:12 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Nov  5 19:20:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=716cbb59

app-misc/yq: RESTRICT="!test? ( test )"

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

 app-misc/yq/yq-2.7.1-r1.ebuild | 1 +
 app-misc/yq/yq-2.7.2.ebuild| 1 +
 app-misc/yq/yq-2.8.0.ebuild| 1 +
 app-misc/yq/yq-2.9.2.ebuild| 1 +
 4 files changed, 4 insertions(+)

diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
index e433a14e78e..45578ed432d 100644
--- a/app-misc/yq/yq-2.7.1-r1.ebuild
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]

diff --git a/app-misc/yq/yq-2.7.2.ebuild b/app-misc/yq/yq-2.7.2.ebuild
index 7dc084a4b39..3c4174e21d4 100644
--- a/app-misc/yq/yq-2.7.2.ebuild
+++ b/app-misc/yq/yq-2.7.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]

diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild
index 7dc084a4b39..3c4174e21d4 100644
--- a/app-misc/yq/yq-2.8.0.ebuild
+++ b/app-misc/yq/yq-2.8.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]

diff --git a/app-misc/yq/yq-2.9.2.ebuild b/app-misc/yq/yq-2.9.2.ebuild
index 7dc084a4b39..3c4174e21d4 100644
--- a/app-misc/yq/yq-2.9.2.ebuild
+++ b/app-misc/yq/yq-2.9.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-misc/jq
>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]



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

2019-11-05 Thread Zac Medico
commit: e6190145c18a275f9e44618deadb9763631d6c19
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Nov  5 19:01:20 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Nov  5 19:03:21 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e6190145

emirrordist: _recycle_copier_exit UnboundLocalError (bug 699392)

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

 lib/portage/_emirrordist/DeletionTask.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/_emirrordist/DeletionTask.py 
b/lib/portage/_emirrordist/DeletionTask.py
index 4e9c26ca2..2fdafd59e 100644
--- a/lib/portage/_emirrordist/DeletionTask.py
+++ b/lib/portage/_emirrordist/DeletionTask.py
@@ -85,7 +85,7 @@ class DeletionTask(CompositeTask):
 
else:
logging.error(("%s copy from distfiles "
-   "to recycle failed: %s") % (self.distfile, e))
+   "to recycle failed") % (self.distfile,))
success = False
 
if success:



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

2019-11-05 Thread Zac Medico
commit: b4a1a52c00412be1c84d791e261478e5a0e52e75
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Nov  5 18:49:58 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Nov  5 18:50:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a1a52c

app-misc/yq: Bump to version 2.9.2

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

 app-misc/yq/Manifest|  1 +
 app-misc/yq/yq-2.9.2.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index cb04825cec5..b8889f89b56 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,3 +1,4 @@
 DIST yq-2.7.1.tar.gz 13794 BLAKE2B 
87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66
 SHA512 
ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
 DIST yq-2.7.2.tar.gz 14010 BLAKE2B 
ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f
 SHA512 
0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
 DIST yq-2.8.0.tar.gz 14434 BLAKE2B 
1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69
 SHA512 
aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09
+DIST yq-2.9.2.tar.gz 19177 BLAKE2B 
038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f
 SHA512 
a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c

diff --git a/app-misc/yq/yq-2.9.2.ebuild b/app-misc/yq/yq-2.9.2.ebuild
new file mode 100644
index 000..7dc084a4b39
--- /dev/null
+++ b/app-misc/yq/yq-2.9.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ 
https://pypi.org/project/yq/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-misc/jq
+   >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+   test? (
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/toml[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   )"
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+   sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+   -i test/test.py || die
+}
+
+python_test() {
+   ./test/test.py || die "tests failed under ${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/

2019-11-03 Thread Zac Medico
commit: bc2a6090600db70d91ddc6a52828a353c19ea333
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov  3 21:40:30 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Nov  3 21:41:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2a6090

app-emulation/libpod: Bump to version 1.6.3

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

 app-emulation/libpod/Manifest|   1 +
 app-emulation/libpod/libpod-1.6.3.ebuild | 130 +++
 2 files changed, 131 insertions(+)

diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 24023149209..e09b88df125 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,2 +1,3 @@
 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 
4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee
 SHA512 
d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
 DIST libpod-1.6.2.tar.gz 8270781 BLAKE2B 
5d86533ddc821f731292e126102a31d651956c275a22c5c4ab3c57b9351832a1d85d75be877343c60af47716f9d1776315b3bf41fb17037d02fee10cf88efba3
 SHA512 
68192dda019623e3f3af9f82f946be8efbaf3e2c54acf23f62af67ac1ca093dd4dba11d2a7c1c950b99060393ed7e945752c1eaa9eada0dfc30f3dcaac8e1c04
+DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B 
b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5
 SHA512 
a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd

diff --git a/app-emulation/libpod/libpod-1.6.3.ebuild 
b/app-emulation/libpod/libpod-1.6.3.ebuild
new file mode 100644
index 000..f2d8fa4c489
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.6.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="9d087f6a766259ba53b224944f1b7b778035c370"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/;
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!ostree"
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   >=app-emulation/conmon-2.0.0
+   >=app-emulation/runc-1.0.0_rc6
+   dev-libs/libassuan:=
+   dev-libs/libgpg-error:=
+   sys-fs/lvm2
+   sys-libs/libseccomp:=
+
+   apparmor? ( sys-libs/libapparmor )
+   btrfs? ( sys-fs/btrfs-progs )
+   rootless? ( app-emulation/slirp4netns )
+   selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+   default
+
+   # Disable installation of python modules here, since those are
+   # installed by separate ebuilds.
+   sed -e '/^GIT_.*/d' \
+   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/^\(install:.*\) install\.python$/\1/' \
+   -i Makefile || die
+}
+
+src_compile() {
+   # Filter unsupported linker flags
+   filter-flags '-Wl,*'
+
+   [[ -f hack/apparmor_tag.sh ]] || die
+   if use apparmor; then
+   echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+   else
+   echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+   fi
+
+   [[ -f hack/btrfs_installed_tag.sh ]] || die
+   if use btrfs; then
+   echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+   else
+   echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+   hack/btrfs_installed_tag.sh || die
+   fi
+
+   [[ -f hack/selinux_tag.sh ]] || die
+   if use selinux; then
+   echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+   else
+   echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+   fi
+
+   export -n GOCACHE XDG_CACHE_HOME
+   GOBIN="${S}/bin" \
+   emake all \
+   GIT_BRANCH=master \
+   GIT_BRANCH_CLEAN=master \
+   COMMIT_NO="${EGIT_COMMIT}" \
+   GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+   insint

[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2019-11-03 Thread Zac Medico
commit: 5952ad42e44d15da4d3a73d43f6bcc3714bf9a4f
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov  3 20:11:35 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Nov  3 20:11:50 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5952ad42

Revert "install-qa-check.d: handle libtool files and static libs from /"

This reverts commit a2506e4ebd47781eb81b7d13b0a1a376ed028c77.

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

 bin/install-qa-check.d/80libraries | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/install-qa-check.d/80libraries 
b/bin/install-qa-check.d/80libraries
index 806605293..e59369bf6 100644
--- a/bin/install-qa-check.d/80libraries
+++ b/bin/install-qa-check.d/80libraries
@@ -139,7 +139,7 @@ lib_check() {
# https://bugs.gentoo.org/4411
local abort="no"
local a s
-   for a in "${ED%/}"{/usr,}/lib*/*.a ; do
+   for a in "${ED%/}"/usr/lib*/*.a ; do
s=${a%.a}.so
if [[ ! -e ${s} ]] ; then
s=${s%usr/*}${s##*/usr/}
@@ -154,7 +154,7 @@ lib_check() {
 
# Verify that the libtool files don't contain bogus $D entries.
local abort=no gentoo_bug=no always_overflow=no
-   for a in "${ED%/}"{/usr,}/lib*/*.la ; do
+   for a in "${ED%/}"/usr/lib*/*.la ; do
s=${a##*/}
if grep -qs "${ED}" "${a}" ; then
__vecho -ne '\n'



[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2019-11-03 Thread Zac Medico
commit: ae2a76261fd7e519bfbb3b8c4b41aa511d039245
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov  3 20:12:02 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Nov  3 20:14:42 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ae2a7626

Revert "install-qa-check.d: remove check that bans libtool files and static 
libs from /"

This reverts commit 498900e5e51460502d8271f409a4c614a021613b.
This change is still being discussed.

See: 
https://archives.gentoo.org/gentoo-portage-dev/message/6e4cfbb0ef9c36dc6511d4f2003cc458
Bug: https://bugs.gentoo.org/699252
Signed-off-by: Zac Medico  gentoo.org>

 bin/install-qa-check.d/80libraries | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/bin/install-qa-check.d/80libraries 
b/bin/install-qa-check.d/80libraries
index e59369bf6..d1d2c4fdd 100644
--- a/bin/install-qa-check.d/80libraries
+++ b/bin/install-qa-check.d/80libraries
@@ -152,6 +152,16 @@ lib_check() {
done
[[ ${abort} == "yes" ]] && die "add those ldscripts"
 
+   # Make sure people don't store libtool files or static libs in /lib
+   f=$(ls "${ED%/}"/lib*/*.{a,la} 2>/dev/null)
+   if [[ -n ${f} ]] ; then
+   __vecho -ne '\n'
+   eqawarn "QA Notice: Excessive files found in the / partition"
+   eqawarn "${f}"
+   __vecho -ne '\n'
+   die "static archives (*.a) and libtool library files (*.la) 
belong in /usr/lib*, not /lib*"
+   fi
+
# Verify that the libtool files don't contain bogus $D entries.
local abort=no gentoo_bug=no always_overflow=no
for a in "${ED%/}"/usr/lib*/*.la ; do



[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2019-11-03 Thread Zac Medico
commit: a2506e4ebd47781eb81b7d13b0a1a376ed028c77
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Nov  3 19:59:06 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Nov  3 20:00:59 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2506e4e

install-qa-check.d: handle libtool files and static libs from /

Fixes: 498900e5e514 ("install-qa-check.d: remove check that bans libtool files 
and static libs from /")
Bug: https://bugs.gentoo.org/699252
Signed-off-by: Zac Medico  gentoo.org>

 bin/install-qa-check.d/80libraries | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/install-qa-check.d/80libraries 
b/bin/install-qa-check.d/80libraries
index e59369bf6..806605293 100644
--- a/bin/install-qa-check.d/80libraries
+++ b/bin/install-qa-check.d/80libraries
@@ -139,7 +139,7 @@ lib_check() {
# https://bugs.gentoo.org/4411
local abort="no"
local a s
-   for a in "${ED%/}"/usr/lib*/*.a ; do
+   for a in "${ED%/}"{/usr,}/lib*/*.a ; do
s=${a%.a}.so
if [[ ! -e ${s} ]] ; then
s=${s%usr/*}${s##*/usr/}
@@ -154,7 +154,7 @@ lib_check() {
 
# Verify that the libtool files don't contain bogus $D entries.
local abort=no gentoo_bug=no always_overflow=no
-   for a in "${ED%/}"/usr/lib*/*.la ; do
+   for a in "${ED%/}"{/usr,}/lib*/*.la ; do
s=${a##*/}
if grep -qs "${ED}" "${a}" ; then
__vecho -ne '\n'



[gentoo-commits] proj/portage:master commit in: bin/install-qa-check.d/

2019-11-03 Thread Zac Medico
commit: 498900e5e51460502d8271f409a4c614a021613b
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Oct 27 17:40:07 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Nov  3 19:44:44 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=498900e5

install-qa-check.d: remove check that bans libtool files and static libs from /

Most upstreams and build systems do not make this distinction, so this
causes unnecessary hacks in ebuilds.

Bug: https://bugs.gentoo.org/699252
Signed-off-by: William Hubbs  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 bin/install-qa-check.d/80libraries | 10 --
 1 file changed, 10 deletions(-)

diff --git a/bin/install-qa-check.d/80libraries 
b/bin/install-qa-check.d/80libraries
index d1d2c4fdd..e59369bf6 100644
--- a/bin/install-qa-check.d/80libraries
+++ b/bin/install-qa-check.d/80libraries
@@ -152,16 +152,6 @@ lib_check() {
done
[[ ${abort} == "yes" ]] && die "add those ldscripts"
 
-   # Make sure people don't store libtool files or static libs in /lib
-   f=$(ls "${ED%/}"/lib*/*.{a,la} 2>/dev/null)
-   if [[ -n ${f} ]] ; then
-   __vecho -ne '\n'
-   eqawarn "QA Notice: Excessive files found in the / partition"
-   eqawarn "${f}"
-   __vecho -ne '\n'
-   die "static archives (*.a) and libtool library files (*.la) 
belong in /usr/lib*, not /lib*"
-   fi
-
# Verify that the libtool files don't contain bogus $D entries.
local abort=no gentoo_bug=no always_overflow=no
for a in "${ED%/}"/usr/lib*/*.la ; do



[gentoo-commits] repo/gentoo:master commit in: app-emulation/conmon/

2019-11-01 Thread Zac Medico
commit: c6796eae37ac69fd211efb7d888b556f3a2f2a35
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Nov  1 23:08:26 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  1 23:08:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6796eae

app-emulation/conmon: Bump to version 2.0.2

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

 app-emulation/conmon/Manifest|  1 +
 app-emulation/conmon/conmon-2.0.2.ebuild | 42 
 2 files changed, 43 insertions(+)

diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 6d3b3d7119c..7f6f08d2af0 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1 +1,2 @@
 DIST conmon-2.0.1.tar.gz 52250 BLAKE2B 
59d0786975d0332ce2eb68024bbfe4c3275388d1e12561a279918fb4d2fdc2c8fd24d5872b724ccbc32722b50debf2de5c9e904aa26e25c3363f0418f5f74f8d
 SHA512 
ba7ccdb61b6092987a3fe0fbcf76c11edaf4e15e4af4d831a8e5fdd58202a81be4d9ddf5c1d71eba5824b284f3b4416a65864e19d65dec4dfd511210c75480b1
+DIST conmon-2.0.2.tar.gz 52364 BLAKE2B 
6acf8265c28da6fedf43ea585a773a213bf7405fcd0b53a1b91c6eca314dde19e59e5883994d1d90a68b5cdc267d97587b7461d3f71da65055e52896a444cfc0
 SHA512 
f325906b0a9d884e84cb899e4eb2843f1f6a08fa03d255c7ebd4c1c47f7192defc98698c09c5ef428c31d1ccf21dc813f86fd3213e73ceb4d4ee8b2cbc4e7e89

diff --git a/app-emulation/conmon/conmon-2.0.2.ebuild 
b/app-emulation/conmon/conmon-2.0.2.ebuild
new file mode 100644
index 000..9a58b4847e7
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="65fe0226d85b69fc9e527e376795c9791199153d"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon;
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+RDEPEND="dev-libs/glib:=
+   systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   if ! use systemd; then
+   sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' 
\
+   -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+   -i Makefile || die
+   fi
+}
+
+src_compile() {
+   emake GIT_COMMIT="${EGIT_COMMIT}" \
+   all
+}
+
+src_install() {
+   emake DESTDIR="${D}" \
+   PREFIX="/usr" \
+   install
+   dodir /usr/libexec/podman
+   ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+   dodoc README.md
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/conmon/

2019-11-01 Thread Zac Medico
commit: e7b222791c9c08ba1f0b797aa98a1ea06948746c
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Nov  1 23:01:34 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  1 23:02:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b22279

app-emulation/conmon: Remove old versions

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

 app-emulation/conmon/Manifest|  3 ---
 app-emulation/conmon/conmon-0.3.0.ebuild | 42 
 app-emulation/conmon/conmon-0.4.0.ebuild | 42 
 app-emulation/conmon/conmon-2.0.0.ebuild | 42 
 4 files changed, 129 deletions(-)

diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 957c323f730..6d3b3d7119c 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,4 +1 @@
-DIST conmon-0.3.0.tar.gz 49021 BLAKE2B 
ca753f8fe0801cef4e392e2f60e58c51100628f0576c46d139c9c9827a927970ec63bb0aaebce6ac6ffaedae75b141730833b8adcafc8d9777900d96319edff3
 SHA512 
9a60f3eace596a8d12dc950597a9e3619a6728bf4555bb1636da3ac8ed8a6bc2ae28471cba9c7c3ad04b61a24aa4bbd28242a22940240bf27babb834031deea4
-DIST conmon-0.4.0.tar.gz 48889 BLAKE2B 
50bfa534d04428b422902ab3cd4feec5cb1cf7a6411eb35fc2420680eccc95dd17d7cd1ed8af904f6d246f10511b23b69ff112fee70d3a734098fcd7f5d7d7e7
 SHA512 
6aa9e0f72231bd890df4f4fe96b8831ad0fcb3e1f0edef74af8471aa227aefc3d8ea20d8bf0d50a6c06913c6360970464ea1b44fb68c77dbcc2da55073704bdd
-DIST conmon-2.0.0.tar.gz 51805 BLAKE2B 
4c9e89c7d2339c82eda41b35f014ef392e185a28e93e81770bb1b9c629709c9b20ce0e7d78a0a1e2a68193e791ec45e70d427d8f4533adf5817bf806e919b524
 SHA512 
0d903f1b83248a130fa6a5c212f96a5bcc37113cfb93c73847a3744b9da8ca355f93f16ca57f4bfb50bcba13b272f23970fdec8ab7ac1862e93b3057512e572b
 DIST conmon-2.0.1.tar.gz 52250 BLAKE2B 
59d0786975d0332ce2eb68024bbfe4c3275388d1e12561a279918fb4d2fdc2c8fd24d5872b724ccbc32722b50debf2de5c9e904aa26e25c3363f0418f5f74f8d
 SHA512 
ba7ccdb61b6092987a3fe0fbcf76c11edaf4e15e4af4d831a8e5fdd58202a81be4d9ddf5c1d71eba5824b284f3b4416a65864e19d65dec4dfd511210c75480b1

diff --git a/app-emulation/conmon/conmon-0.3.0.ebuild 
b/app-emulation/conmon/conmon-0.3.0.ebuild
deleted file mode 100644
index 0946d32bf2f..000
--- a/app-emulation/conmon/conmon-0.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="8455ce1ef385120deb827d0f0588c04357bad4c4"
-DESCRIPTION="An OCI container runtime monitor"
-HOMEPAGE="https://github.com/containers/conmon;
-SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-RDEPEND="dev-libs/glib:=
-   systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   default
-
-   if ! use systemd; then
-   sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-   -e 's| pkg-config --exists libsystemd | false |' \
-   -i Makefile || die
-   fi
-}
-
-src_compile() {
-   emake GIT_COMMIT="${EGIT_COMMIT}" \
-   all
-}
-
-src_install() {
-   emake DESTDIR="${D}" \
-   PREFIX="/usr" \
-   install
-   dodir /usr/libexec/podman
-   ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
-   dodoc README.md
-}

diff --git a/app-emulation/conmon/conmon-0.4.0.ebuild 
b/app-emulation/conmon/conmon-0.4.0.ebuild
deleted file mode 100644
index 65866c0ffe7..000
--- a/app-emulation/conmon/conmon-0.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="ba305505e9621fc0b4429287bfc2c2a7057af51a"
-DESCRIPTION="An OCI container runtime monitor"
-HOMEPAGE="https://github.com/containers/conmon;
-SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-RDEPEND="dev-libs/glib:=
-   systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   default
-
-   if ! use systemd; then
-   sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' 
\
-   -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
-   -i Makefile || die
-   fi
-}
-
-src_compile() {
-   emake GIT_COMMIT="${EGIT_COMMIT}" \
-   all
-}
-
-src_install() {
-   emake DESTDIR="${D}" \
-   PREFIX="/usr"

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

2019-11-01 Thread Zac Medico
commit: 7ceb5329d410f058e0fbcb2b31ce76c24baf044d
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Nov  1 21:37:47 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Nov  1 21:44:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ceb5329

app-benchmarks/hey: Bump to version 0.1.2

Reported-by: Jesse Adelman  boldandbusted.com>
Closes: https://bugs.gentoo.org/699108
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-benchmarks/hey/Manifest |  1 +
 app-benchmarks/hey/hey-0.1.2.ebuild | 27 +++
 2 files changed, 28 insertions(+)

diff --git a/app-benchmarks/hey/Manifest b/app-benchmarks/hey/Manifest
index 172bb7655bc..837a02f5ca1 100644
--- a/app-benchmarks/hey/Manifest
+++ b/app-benchmarks/hey/Manifest
@@ -1 +1,2 @@
 DIST hey-0.1.1_p20181017.tar.gz 446212 BLAKE2B 
b8d55e4f7efb34634b81b5301617c84aea66cb1fdbe973d45317a309b845d4503331618688feeaef2bb9effa82f6d155b68b813a4b5b4f17149245cb7f15b2ec
 SHA512 
ccaf4ca2025ce4cbe10cbeb5d7a43903d7e15fdc20ed9623795bd3c11b0df510c3b51749c5e63502fb0fd3153f18a7d1b65297b11631b5889f719d0619602604
+DIST hey-0.1.2.tar.gz 446073 BLAKE2B 
5c5933f54f5895100ea0f5b08c84143d30fb02f1b2a5cf1209a41b271d18dbf41ce24bf35fdc9846d04173e620e584e1afd8f0b3e8e7a9cd8d6d8e2aa85fac67
 SHA512 
21b7b2ddee84c2dd144a7bca44ea2c24dcfe5a6e41f8ad388a1099ec42b83789748906c2d405b774aefbdffd5cb90e045219f6ee39a9837adef5b57c5f0b2e3a

diff --git a/app-benchmarks/hey/hey-0.1.2.ebuild 
b/app-benchmarks/hey/hey-0.1.2.ebuild
new file mode 100644
index 000..639ee500ec4
--- /dev/null
+++ b/app-benchmarks/hey/hey-0.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="HTTP load generator, ApacheBench (ab) replacement, formerly known 
as rakyll/boom"
+HOMEPAGE="https://github.com/rakyll/hey;
+SRC_URI="https://github.com/rakyll/hey/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+   export -n GOCACHE XDG_CACHE_HOME
+   go build -o ./bin/${PN} || die
+}
+
+src_install() {
+   dobin ./bin/${PN}
+   dodoc README.md
+}



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

2019-10-29 Thread Zac Medico
commit: 59d23246a7a88801ea4af77787697b452b8da23f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Oct 29 09:19:21 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 29 17:40:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d23246

dev-util/bcc: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/13483
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch | 182 --
 1 file changed, 182 deletions(-)

diff --git a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch 
b/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch
deleted file mode 100644
index fabb3f3f2e6..000
--- a/dev-util/bcc/files/bcc-0.10.0-system-libbpf.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 94aac856..bd454226 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,12 +9,6 @@ endif()
- 
- enable_testing()
- 
--# populate submodules (libbpf)
--if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
--  execute_process(COMMAND git submodule update --init --recursive
--  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--endif()
--
- include(cmake/GetGitRevisionDescription.cmake)
- include(cmake/version.cmake)
- include(CMakeDependentOption)
-@@ -61,6 +55,9 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS})
-   include_directories("${DIR}/../tools/clang/include")
- ENDFOREACH()
- 
-+find_package(PkgConfig)
-+pkg_check_modules(LIBBPF REQUIRED libbpf)
-+
- # Set to a string path if system places kernel lib directory in
- # non-default location.
- if(NOT DEFINED BCC_KERNEL_MODULES_DIR)
-diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
-index 906c9aaf..210f0f75 100644
 a/examples/cpp/CMakeLists.txt
-+++ b/examples/cpp/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- option(INSTALL_CPP_EXAMPLES "Install C++ examples. Those binaries are 
statically linked and can take plenty of disk space" OFF)
- 
-diff --git a/examples/cpp/pyperf/CMakeLists.txt 
b/examples/cpp/pyperf/CMakeLists.txt
-index 6f963c66..e8dd66f6 100644
 a/examples/cpp/pyperf/CMakeLists.txt
-+++ b/examples/cpp/pyperf/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- add_executable(PyPerf PyPerf.cc PyPerfUtil.cc PyPerfBPFProgram.cc 
PyPerfLoggingHelper.cc PyPerfDefaultPrinter.cc Py36Offsets.cc)
- target_link_libraries(PyPerf bcc-static)
-diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt
-index 88df6e84..de8a6464 100644
 a/introspection/CMakeLists.txt
-+++ b/introspection/CMakeLists.txt
-@@ -3,11 +3,11 @@
- 
- include_directories(${CMAKE_SOURCE_DIR}/src/cc)
- include_directories(${CMAKE_SOURCE_DIR}/src/cc/api)
--include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- 
- option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON)
- 
- add_executable(bps bps.c)
--target_link_libraries(bps bpf-static)
-+target_link_libraries(bps ${LIBBPF_LIBRARIES})
- 
- install (TARGETS bps DESTINATION share/bcc/introspection)
-diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
-index bd34fd48..dfbeb596 100644
 a/src/cc/CMakeLists.txt
-+++ b/src/cc/CMakeLists.txt
-@@ -10,8 +10,7 @@ 
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang)
- include_directories(${LLVM_INCLUDE_DIRS})
- include_directories(${LIBELF_INCLUDE_DIRS})
- # todo: if check for kernel version
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include)
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi)
-+include_directories(${LIBBPF_INCLUDE_DIRS})
- add_definitions(${LLVM_DEFINITIONS})
- configure_file(libbcc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc @ONLY)
- 
-@@ -28,13 +27,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
-DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}")
- 
- include(static_libstdc++)
- 
--file(GLOB libbpf_sources "libbpf/src/*.c")
--add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
--set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
--add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
--set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} 
SOVERSION 0)
--set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
--
- set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc 
exported_files.cc)
- if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_P

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

2019-10-28 Thread Zac Medico
commit: fb7c020a6779d020cc781eeb159ab9e60791c9a4
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct 29 01:57:24 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 29 02:01:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7c020a

sys-apps/portage: 2.3.78-r2 revbump for bug 698046

This avoids confusing "No such file or directory" errors as demonstrated
by the following test case:

$ ln -s /foo/bar /tmp/sudo-1.8.29rc1.tar.gz
$ wget http://distfiles.gentoo.org/distfiles/sudo-1.8.29rc1.tar.gz -O 
/tmp/sudo-1.8.29rc1.tar.gz
/tmp/sudo-1.8.29rc1.tar.gz: No such file or directory

Bug: https://bugs.gentoo.org/697734
Bug: https://bugs.gentoo.org/698046
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 .../portage/{portage-2.3.78-r1.ebuild => portage-2.3.78-r2.ebuild}   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/portage/portage-2.3.78-r1.ebuild 
b/sys-apps/portage/portage-2.3.78-r2.ebuild
similarity index 95%
rename from sys-apps/portage/portage-2.3.78-r1.ebuild
rename to sys-apps/portage/portage-2.3.78-r2.ebuild
index 81439a8a03c..4a73b9ccc46 100644
--- a/sys-apps/portage/portage-2.3.78-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.78-r2.ebuild
@@ -103,8 +103,11 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
-   # Apply 0299aedef74e47c0a68acf7905d8714c9578f125 for bug 698046.
+   # Apply 0299aedef74e47c0a68acf7905d8714c9578f125 and
+   # 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046.
sed -e 's|rsync -avP|rsync -LtvP|' -i 
lib/portage/tests/util/test_getconfig.py || die
+   sed -e 's|if os.stat(download_path).st_size == 0:|mystat = 
os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or 
(stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \
+   -i lib/portage/package/ebuild/fetch.py || die
 
# Apply 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 for bug 698474.
sed -e 's|if "local" in custommirrors:|if try_mirrors and "local" in 
custommirrors:|' -i lib/portage/package/ebuild/fetch.py || die



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

2019-10-28 Thread Zac Medico
commit: 443f1bb6676eea1e042d0231588ab9458020c10f
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct 29 01:53:03 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 29 01:53:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443f1bb6

sys-apps/portage: Remove old version 2.3.77-r1

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

 sys-apps/portage/Manifest |   1 -
 sys-apps/portage/portage-2.3.77-r1.ebuild | 264 --
 2 files changed, 265 deletions(-)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 22bafbbc06c..fa84b5668f4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,5 @@
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B 
dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6
 SHA512 
f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545a0f516a5724e331e
 SHA512 
20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 
1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903
 SHA512 
e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
-DIST portage-2.3.77.tar.bz2 1037202 BLAKE2B 
f47260f079759ac3820f884a72a595a2b331ae50e5d20a7719c1b0192333839739f180e55e46a047a4b02a0a0faf697799051b0f0acef15251548f28a24c2589
 SHA512 
95947081ca8c3b42a7f4aae8b934b9c24dd3f44e58cbcc9168aa5a9ff53964dfab5019cbeba6f5a1906be8ba6a29dd7f5b888bc0bf2fab63db7ac1882368255b
 DIST portage-2.3.78.tar.bz2 1037439 BLAKE2B 
7f6d41feba299d2ae81a09ead816bb5695f93cf96f9a16fc4f7c865ceeed7cc5cc3ff5ad92b21a8b03a6ecbee462271a054adcb05c82ff079160d78531f21aee
 SHA512 
a33ec04b78c6e2e13dad80a43e6da6855aa91aa385a4d6f4b97bacc3af49e3e165e1b7183194e51cd7c4db0bba29200d60378197713c961601f84569f239b3e5
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B 
f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c
 SHA512 
0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12

diff --git a/sys-apps/portage/portage-2.3.77-r1.ebuild 
b/sys-apps/portage/portage-2.3.77-r1.ebuild
deleted file mode 100644
index 055343f47ab..000
--- a/sys-apps/portage/portage-2.3.77-r1.ebuild
+++ /dev/null
@@ -1,264 +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 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"
-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}]
-   >

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

2019-10-28 Thread Zac Medico
commit: f7b7f15761aaa20ad0b4eeddbb7b3637b2d356f0
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct 29 01:31:41 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 29 01:42:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b7f157

sys-apps/portage: 2.3.76-r1 stable revbump for bug 698046

This avoids confusing "No such file or directory" errors as demonstrated
by the following test case:

$ ln -s /foo/bar /tmp/sudo-1.8.29rc1.tar.gz
$ wget http://distfiles.gentoo.org/distfiles/sudo-1.8.29rc1.tar.gz -O 
/tmp/sudo-1.8.29rc1.tar.gz
/tmp/sudo-1.8.29rc1.tar.gz: No such file or directory

Bug: https://bugs.gentoo.org/691278
Bug: https://bugs.gentoo.org/698046
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 .../portage/{portage-2.3.76.ebuild => portage-2.3.76-r1.ebuild}| 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.76.ebuild 
b/sys-apps/portage/portage-2.3.76-r1.ebuild
similarity index 94%
rename from sys-apps/portage/portage-2.3.76.ebuild
rename to sys-apps/portage/portage-2.3.76-r1.ebuild
index 11e24d32a9f..ff8abf53e72 100644
--- a/sys-apps/portage/portage-2.3.76.ebuild
+++ b/sys-apps/portage/portage-2.3.76-r1.ebuild
@@ -103,6 +103,13 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   # Apply 03c54e340073620f489ca85bca94267a198174fe,
+   # 0299aedef74e47c0a68acf7905d8714c9578f125, and
+   # 1ca5b822133171b131cef3dc15dc43583893ad6b for bug 698046.
+   sed -e 's|rsync -avP|rsync -LtvP|' -i cnf/make.globals 
lib/portage/tests/util/test_getconfig.py || die
+   sed -e 's|if os.stat(download_path).st_size == 0:|mystat = 
os.lstat(download_path)\n\t\t\t\t\t\tif mystat.st_size == 0 or 
(stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):|' \
+   -i lib/portage/package/ebuild/fetch.py || die
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \



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

2019-10-28 Thread Zac Medico
commit: 1ca5b822133171b131cef3dc15dc43583893ad6b
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct 29 00:56:47 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 29 01:07:45 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ca5b822

fetch: remove symlink created by FETCHCOMMAND_RSYNC (bug 698046)

This avoids confusing "No such file or directory" errors as demonstrated
by the following test case:

$ ln -s /foo/bar /tmp/sudo-1.8.29rc1.tar.gz
$ wget http://distfiles.gentoo.org/distfiles/sudo-1.8.29rc1.tar.gz -O 
/tmp/sudo-1.8.29rc1.tar.gz
/tmp/sudo-1.8.29rc1.tar.gz: No such file or directory

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

 lib/portage/package/ebuild/fetch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index 58718b568..4612532c5 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -1283,7 +1283,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
# trust the return value from the 
fetcher.  Remove the
# empty file and try to download again.
try:
-   if 
os.stat(download_path).st_size == 0:
+   mystat = os.lstat(download_path)
+   if mystat.st_size == 0 or 
(stat.S_ISLNK(mystat.st_mode) and not os.path.exists(download_path)):
os.unlink(download_path)
fetched = 0
continue



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

2019-10-27 Thread Zac Medico
commit: c1faef3a67ae5904fcd8e95495b005e268f1bc76
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Oct 27 22:14:09 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 27 23:51:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1faef3a

dev-util/diffball: revbump to 1.0.1-r1 for bug 543310

Fix stack buffer overflows reported in bug 543310.

Bug: https://bugs.gentoo.org/543310
See: https://github.com/zmedico/diffball/pull/1
Reported-by: Aidan Thornton  googlemail.com>
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 dev-util/diffball/Manifest |  2 ++
 dev-util/diffball/diffball-1.0.1-r1.ebuild | 38 ++
 2 files changed, 40 insertions(+)

diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index 538d9e71b8f..29623d42c41 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1 +1,3 @@
+DIST bug_543310_diffball_stack_buffer_overflows.patch 2945 BLAKE2B 
17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b
 SHA512 
be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced6a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B 
e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e
 SHA512 
1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
+DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 
1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9
 SHA512 
3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4

diff --git a/dev-util/diffball/diffball-1.0.1-r1.ebuild 
b/dev-util/diffball/diffball-1.0.1-r1.ebuild
new file mode 100644
index 000..7515e452dd6
--- /dev/null
+++ b/dev-util/diffball/diffball-1.0.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Delta compression suite for using/generating binary patches"
+HOMEPAGE="https://github.com/zmedico/diffball;
+SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   https://github.com/zmedico/diffball/pull/1.patch -> 
bug_543310_diffball_stack_buffer_overflows.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos"
+IUSE="debug"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+   >=app-arch/bzip2-1.0.2
+   app-arch/xz-utils"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+# Invalid RESTRICT for source package. Investigate.
+RESTRICT="strip"
+
+PATCHES=("${DISTDIR}/bug_543310_diffball_stack_buffer_overflows.patch")
+
+src_prepare() {
+   # fix bug 548316 by restoring pre-GCC5 inline semantics
+   append-cflags -std=gnu89
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf $(use_enable debug asserts)
+}



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

2019-10-27 Thread Zac Medico
commit: 15b80af0c8276001290696391a184deb98c4cc01
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Oct 27 23:29:49 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 27 23:51:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b80af0

dev-util/diffball: become maintainer

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

 dev-util/diffball/metadata.xml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
index eac20fbfab6..3f9423fb713 100644
--- a/dev-util/diffball/metadata.xml
+++ b/dev-util/diffball/metadata.xml
@@ -2,11 +2,10 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   rafaelmart...@gentoo.org
-   Rafael G. Martins
+   zmed...@gentoo.org
+           Zac Medico


-   rafaelmartins/diffball
-   diffball
+   zmedico/diffball

 



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

2019-10-27 Thread Zac Medico
commit: ad192f6fbd621c3548344cfe02b3bd62c0d23b36
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Oct 27 19:40:49 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 27 19:42:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad192f6f

sys-apps/nvme-cli: stabilize 1.9 for amd64

Bug: https://bugs.gentoo.org/698680
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/nvme-cli/nvme-cli-1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild 
b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
index dab045a072b..3be939cd58b 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
@@ -12,7 +12,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="+uuid"
 
 RDEPEND="uuid? ( sys-apps/util-linux:= )"



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

2019-10-27 Thread Zac Medico
commit: 6d519a589a9656a511b369c223e27e2f8d8437de
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Oct 27 18:58:37 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 27 19:11:40 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6d519a58

emerge: fix error message for unknown options (bug 673400)

Do not use parse_known_args to parse positional arguments, since that
causes unknown options to be handled like unknown positional arguments.

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

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

diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py
index 486664c84..0d2c45a4f 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -299,7 +299,6 @@ def _find_bad_atoms(atoms, less_strict=False):
 def parse_opts(tmpcmdline, silent=False):
myaction=None
myopts = {}
-   myfiles=[]
 
actions = frozenset([
"clean", "check-news", "config", "depclean", "help",
@@ -810,9 +809,11 @@ def parse_opts(tmpcmdline, silent=False):
parser.add_argument(dest=myopt.lstrip("--").replace("-", "_"),
*args, **kwargs)
 
+   parser.add_argument('positional_args', nargs='*')
+
tmpcmdline = insert_optional_args(tmpcmdline)
 
-   myoptions, myargs = parser.parse_known_args(args=tmpcmdline)
+   myoptions = parser.parse_args(args=tmpcmdline)
 
if myoptions.alert in true_y:
myoptions.alert = True
@@ -1165,9 +1166,7 @@ def parse_opts(tmpcmdline, silent=False):
if myaction is None and myoptions.deselect is True:
myaction = 'deselect'
 
-   myfiles += myargs
-
-   return myaction, myopts, myfiles
+   return myaction, myopts, myoptions.positional_args
 
 def profile_check(trees, myaction):
if myaction in ("help", "info", "search", "sync", "version"):



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

2019-10-26 Thread Zac Medico
commit: a0700b404610252e50537c7ca6b0c5f29aff6726
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 26 20:25:25 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 26 20:33:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0700b40

dev-python/pytest-mock: Bump to version 1.11.2

Reported-by: Alessandro Barbieri  gmail.com>
Closes: https://bugs.gentoo.org/698554
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 dev-python/pytest-mock/Manifest  |  1 +
 dev-python/pytest-mock/pytest-mock-1.11.2.ebuild | 39 
 2 files changed, 40 insertions(+)

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index a6cc65b2e1a..f9ac3ad3468 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B 
db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1
 SHA512 
b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
+DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B 
d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa
 SHA512 
6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 
4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca
 SHA512 
c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 
1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3
 SHA512 
6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a

diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild 
b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
new file mode 100644
index 000..9abdcee85b1
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+src_prepare() {
+   if has_version dev-python/mock; then
+   # test fails when standalone mock is installed
+   sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i 
tests/test_pytest_mock.py || die
+   fi
+   sed -e 's|^\(def \)\(test_failure_message_with_no_name(\)|\1_\2|' \
+   -e 's|^\(def \)\(test_failure_message_with_name(\)|\1_\2|' \
+   -e 's|^\(def \)\(test_detailed_introspection(\)|\1_\2|' \
+   -i tests/test_pytest_mock.py || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
+   py.test -vv tests/test_pytest_mock.py || die "Tests fail with 
${EPYTHON}"
+}



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

2019-10-25 Thread Zac Medico
commit: c6eaa4b1cda33d3a8beb267d798e97df2d3cc4f4
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 26 02:15:17 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 26 02:15:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6eaa4b1

app-misc/yq: Bump to version 2.8.0

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

 app-misc/yq/Manifest|  1 +
 app-misc/yq/yq-2.8.0.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 7f1abb5ef27..cb04825cec5 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,2 +1,3 @@
 DIST yq-2.7.1.tar.gz 13794 BLAKE2B 
87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66
 SHA512 
ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
 DIST yq-2.7.2.tar.gz 14010 BLAKE2B 
ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f
 SHA512 
0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
+DIST yq-2.8.0.tar.gz 14434 BLAKE2B 
1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69
 SHA512 
aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09

diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild
new file mode 100644
index 000..7dc084a4b39
--- /dev/null
+++ b/app-misc/yq/yq-2.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ 
https://pypi.org/project/yq/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-misc/jq
+   >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+   test? (
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/toml[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   )"
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+   sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+   -i test/test.py || die
+}
+
+python_test() {
+   ./test/test.py || die "tests failed under ${EPYTHON}"
+}



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

2019-10-25 Thread Zac Medico
commit: 9e78c43270aa47bf7cb7c465572c9ea380d5c084
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 25 23:35:25 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 26 00:06:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e78c432

dev-python/cheroot: old versions are incompatible with latest setuptools

Closes: https://bugs.gentoo.org/696990
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 dev-python/cheroot/cheroot-6.0.0-r1.ebuild | 2 +-
 dev-python/cheroot/cheroot-6.0.0.ebuild| 2 +-
 dev-python/cheroot/cheroot-6.5.4.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild 
b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
index c2af48268b9..1433e9d15da 100644
--- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
+   =dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
test? (
dev-python/portend[${PYTHON_USEDEP}]

diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild 
b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 21f4fc2d47a..ce7dc4100fc 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
+   =dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
test? (
dev-python/portend[${PYTHON_USEDEP}]

diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild 
b/dev-python/cheroot/cheroot-6.5.4.ebuild
index 91d2b9382e2..52823236539 100644
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ b/dev-python/cheroot/cheroot-6.5.4.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
+   =dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
 



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

2019-10-25 Thread Zac Medico
commit: 1608149401759e1f8bf3ca9efa876caae132a9c6
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Oct 25 22:37:05 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 25 23:13:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16081494

dev-python/cheroot: version bump

Closes: https://bugs.gentoo.org/679810
Closes: https://github.com/gentoo/gentoo/pull/13441
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Alessandro Barbieri  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 dev-python/cheroot/Manifest |  1 +
 dev-python/cheroot/cheroot-8.2.1.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 83b02d2e41f..71d038c979a 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,2 +1,3 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 
0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f
 SHA512 
0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
 DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 
5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c
 SHA512 
62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
+DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 
57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360
 SHA512 
3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862

diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild 
b/dev-python/cheroot/cheroot-8.2.1.ebuild
new file mode 100644
index 000..bec1012424e
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by 
CherryPy."
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ 
https://github.com/cherrypy/cheroot;
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+# Unit tests are temporarily disabled for this version, see below for
+# what needs to be done.
+#IUSE="test"
+RESTRICT="test"
+
+RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+   >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+   >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
+
+   # Add the following for unit tests, some packages listed will need
+   # to be added and keyworded appropriately.
+#  test? (
+#  >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+#  >=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+#  >=dev-python/pytest-sugar-0.9.1[${PYTHON_USEDEP}]
+#  >=dev-python/pytest-testmon-0.9.7[${PYTHON_USEDEP}]
+#  ~dev-python/pytest-watch-4.2.0[${PYTHON_USEDEP}]
+#  >=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
+#  ~dev-python/coverage-4.5.3[${PYTHON_USEDEP}]
+#  ~dev-python/codecov-2.0.15[${PYTHON_USEDEP}]
+#  ~dev-python/pytest-cov-2.7.1[${PYTHON_USEDEP}]
+#  >=dev-python/trustme-0.4.0[${PYTHON_USEDEP}]
+#  dev-python/pyopenssl[${PYTHON_USEDEP}]
+#  dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+#  )"
+
+#python_test() {
+#  py.test -v || die "tests failed under ${EPYTHON}"
+#}



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

2019-10-24 Thread Zac Medico
commit: d156f25b8901c208a6ac561dca0da448a7cb545c
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 24 19:59:10 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 24 20:06:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d156f25b

app-portage/mirrorselect: remove old version 2.2.5

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

 app-portage/mirrorselect/Manifest  |  1 -
 app-portage/mirrorselect/mirrorselect-2.2.5.ebuild | 39 --
 2 files changed, 40 deletions(-)

diff --git a/app-portage/mirrorselect/Manifest 
b/app-portage/mirrorselect/Manifest
index c9d7a5a0fa4..64d656c55b6 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,5 +1,4 @@
 DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 
7234ab8a681713c63b201e1ae362ea9a28d5e76b5640c6128d79c66d9967660474d0597822604defd3f562cd155524835c5ae20cbf21c5526595775b3be39dc4
 SHA512 
af1d3657b9ff5a6184ebfd89579a1bdbf11f7389ca12d4cd7a41cd136a553732cbbfb7675e25f7d79756b0b9e74b496d28ee5fdc8872173825262fae0052e8e2
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 
67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5
 SHA512 
8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
-DIST mirrorselect-2.2.5.tar.gz 16638 BLAKE2B 
b306f146936344309e79469281830bdbd088bae3686de777bf24bce5bd4e915c951b1f01612c9600cadcbc90139c74a9a5774ca5779bae339d1d5f33d17f70f1
 SHA512 
845df4073f5dc7544d7c1ae410f154e27ef9a9848c2fa182f4d0acd287f17792d11065b1b3394856bd760589d6b24e30e031d10e4ef6c987ac4321dc7e044e4e
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 
8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8
 SHA512 
ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 
8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f
 SHA512 
f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27

diff --git a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild 
b/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
deleted file mode 100644
index 745675eb6f7..000
--- a/app-portage/mirrorselect/mirrorselect-2.2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect;
-SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
-   https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-   "
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
-
-RDEPEND="
-   dev-util/dialog
-   >=net-analyzer/netselect-0.4[ipv6(+)]
-   >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
-   "
-
-python_prepare_all()  {
-   python_setup
-   eprefixify setup.py mirrorselect/main.py
-   echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py 
set_version
-   VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py 
set_version failed"
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   esetup.py test || die "tests failed under ${EPYTHON}"
-}



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

2019-10-24 Thread Zac Medico
commit: 2c75495f03df28b28600c4c27e6c34067bb4fbd6
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 24 20:05:06 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 24 20:06:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c75495f

app-portage/mirrorselect: 2.2.6-r1 revbump for bug 698470

Closes: https://bugs.gentoo.org/698470
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 .../{mirrorselect-2.2.6.ebuild => mirrorselect-2.2.6-r1.ebuild}   | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild 
b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
similarity index 88%
rename from app-portage/mirrorselect/mirrorselect-2.2.6.ebuild
rename to app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
index a8348fc40d2..22fdd516033 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r1.ebuild
@@ -37,6 +37,10 @@ python_prepare_all()  {
sed -e '/^NETSELECT_SUPPORTS_IPV4_IPV6 =/s|False|True|' \
-i mirrorselect/selectors.py || die
fi
+
+   # Apply e69ec2d046626fa2079d460aab469d04256182cd for bug 698470.
+   sed -e 's|key = lex.get_token()|\0\n\t\t\tif key is 
None:\n\t\t\t\tbreak|' -i mirrorselect/configs.py || die
+
distutils-r1_python_prepare_all
 }
 



[gentoo-commits] proj/mirrorselect:master commit in: tests/, mirrorselect/

2019-10-24 Thread Zac Medico
commit: e69ec2d046626fa2079d460aab469d04256182cd
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 24 19:52:10 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 24 19:53:57 2019 +
URL:https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=e69ec2d0

write_make_conf: fix infinite loop (bug 698470)

Fixes: 42238f4ff13a ("write_make_conf: support multi-line GENTOO_MIRRORS (bug 
543814)")
Bug: https://bugs.gentoo.org/698470
Signed-off-by: Zac Medico  gentoo.org>

 mirrorselect/configs.py   | 2 ++
 tests/test_write_make_conf.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mirrorselect/configs.py b/mirrorselect/configs.py
index df718f6..4cba14f 100644
--- a/mirrorselect/configs.py
+++ b/mirrorselect/configs.py
@@ -81,6 +81,8 @@ def write_make_conf(output, config_path, var, mirror_string):
lex.quotes = "\"'"
while True:
key = lex.get_token()
+   if key is None:
+   break
 
if key == var:
begin_line = lex.lineno

diff --git a/tests/test_write_make_conf.py b/tests/test_write_make_conf.py
index 3dedd93..fb84978 100644
--- a/tests/test_write_make_conf.py
+++ b/tests/test_write_make_conf.py
@@ -23,6 +23,7 @@ class WriteMakeConfTestCase(unittest.TestCase):
('\n{}="foo \\\nbar"\n'.format(var), 
'\n{}\n'.format(mirror_string)),
('\n\n{}="foo \\\nbar"\n'.format(var), 
'\n\n{}\n'.format(mirror_string)),
('\n\n{}="foo \\\nbar"\na="b"\n'.format(var), 
'\n\na="b"\n{}\n'.format(mirror_string)),
+   ('', '{}\n'.format(mirror_string)),
)
 
for make_conf, expected_result in cases:



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

2019-10-24 Thread Zac Medico
commit: f13f09de05113a98cecb840b4e6343002fcbc101
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 24 19:37:51 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 24 19:40:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13f09de

sys-apps/portage: 2.3.78-r1 revbump for bug 698474

Closes: https://bugs.gentoo.org/698474
Bug: https://bugs.gentoo.org/697734
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/{portage-2.3.78.ebuild => portage-2.3.78-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.78.ebuild 
b/sys-apps/portage/portage-2.3.78-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.78.ebuild
rename to sys-apps/portage/portage-2.3.78-r1.ebuild
index 051e9931397..81439a8a03c 100644
--- a/sys-apps/portage/portage-2.3.78.ebuild
+++ b/sys-apps/portage/portage-2.3.78-r1.ebuild
@@ -106,6 +106,9 @@ python_prepare_all() {
# Apply 0299aedef74e47c0a68acf7905d8714c9578f125 for bug 698046.
sed -e 's|rsync -avP|rsync -LtvP|' -i 
lib/portage/tests/util/test_getconfig.py || die
 
+   # Apply 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848 for bug 698474.
+   sed -e 's|if "local" in custommirrors:|if try_mirrors and "local" in 
custommirrors:|' -i lib/portage/package/ebuild/fetch.py || die
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \



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

2019-10-24 Thread Zac Medico
commit: 26fd7ffdd5b74af3aeedf0e6a87ac6b3d1243848
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 24 19:28:40 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 24 19:29:26 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=26fd7ffd

fetch: respect try_mirrors parameter for local mirrors

This is needed in order to prevent infinit recursion like this:

  File "portage/package/ebuild/fetch.py", line 1131, in fetch
loc = loc()
  File "portage/package/ebuild/fetch.py", line 424, in get_mirror_url
mysettings, force=1, try_mirrors=0):
  File "portage/package/ebuild/fetch.py", line 1131, in fetch
loc = loc()

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

 lib/portage/package/ebuild/fetch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index cf073436e..58718b568 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -588,7 +588,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 #  use_locks = 0
 
# local mirrors are always added
-   if "local" in custommirrors:
+   if try_mirrors and "local" in custommirrors:
mymirrors += custommirrors["local"]
 
if restrict_mirror:



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

2019-10-23 Thread Zac Medico
commit: 498961b2786d4bd3a042e96d7c6c5bd45d260c2c
Author: Justin Turner Arthur  gmail  com>
AuthorDate: Tue Oct 22 03:12:14 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Wed Oct 23 17:01:52 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=498961b2

Improve runtime performance of depgraph module functions.

Use set literals, compile-time str concats, reduce function calls,
especially those on built-in types that can be replaced by operators.

Signed-off-by: Justin Turner Arthur  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 lib/_emerge/depgraph.py | 325 +---
 1 file changed, 169 insertions(+), 156 deletions(-)

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index a641bfc21..68b5bdb2e 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -167,7 +167,7 @@ class _frozen_depgraph_config(object):
if params.get("ignore_world", False):
self._required_set_names = set()
else:
-   self._required_set_names = set(["world"])
+   self._required_set_names = {"world"}
 
atoms = ' '.join(myopts.get("--exclude", [])).split()
self.excluded_pkgs = _wildcard_set(atoms)
@@ -1095,11 +1095,11 @@ class depgraph(object):
 
self._show_merge_list()
 
-   if ignored_binaries.get("respect_use"):
+   if "respect_use" in ignored_binaries:
self._show_ignored_binaries_respect_use(
ignored_binaries["respect_use"])
 
-   if ignored_binaries.get("changed_deps"):
+   if "changed_deps" in ignored_binaries:
self._show_ignored_binaries_changed_deps(
ignored_binaries["changed_deps"])
 
@@ -1271,9 +1271,10 @@ class depgraph(object):
return
 
self._show_merge_list()
-   msg = []
-   msg.append("\nWARNING: One or more updates/rebuilds have been " 
+ \
-   "skipped due to a dependency conflict:\n\n")
+   msg = [
+   "\nWARNING: One or more updates/rebuilds have been "
+   "skipped due to a dependency conflict:\n\n"
+   ]
 
indent = "  "
for pkg, parent_atoms in missed_updates:
@@ -1337,33 +1338,37 @@ class depgraph(object):
if "--quiet" in self._frozen_config.myopts:
return
 
-   msg = []
-   msg.append("It may be possible to solve this problem ")
-   msg.append("by using package.mask to prevent one of ")
-   msg.append("those packages from being selected. ")
-   msg.append("However, it is also possible that conflicting ")
-   msg.append("dependencies exist such that they are impossible to 
")
-   msg.append("satisfy simultaneously.  If such a conflict exists 
in ")
-   msg.append("the dependencies of two different packages, then 
those ")
-   msg.append("packages can not be installed simultaneously.")
+   msg = [
+   "It may be possible to solve this problem "
+   "by using package.mask to prevent one of "
+   "those packages from being selected. "
+   "However, it is also possible that conflicting "
+   "dependencies exist such that they are impossible to "
+   "satisfy simultaneously.  If such a conflict exists in "
+   "the dependencies of two different packages, then those 
"
+   "packages can not be installed simultaneously."
+   ]
backtrack_opt = self._frozen_config.myopts.get('--backtrack')
if not self._dynamic_config._allow_backtracking and \
(backtrack_opt is None or \
(backtrack_opt > 0 and backtrack_opt < 30)):
-   msg.append(" You may want to try a larger value of the 
")
-   msg.append("--backtrack option, such as --backtrack=30, 
")
-   msg.append("in order to see if that will solve this 
conflict ")
-   msg.append("automatically.")
+   msg.append(
+   " You may want to try a larger value of the "
+  

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

2019-10-23 Thread Zac Medico
commit: 8663207ddef5124466ac8943f6b61789d8ab54a4
Author: Justin Turner Arthur  gmail  com>
AuthorDate: Tue Oct 22 02:59:34 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Wed Oct 23 17:01:39 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8663207d

Improve runtime performance of portage.dep module functions.

Use tuple vs list, reduce dot-refs, remove unused, use operators
instead of function calls where possible.

Signed-off-by: Justin Turner Arthur  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/dep/__init__.py | 108 ++--
 1 file changed, 55 insertions(+), 53 deletions(-)

diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 285e0c2ec..f08f6ba4c 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -17,7 +17,6 @@ __all__ = [
 
 import re, sys
 import warnings
-from itertools import chain
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
@@ -28,8 +27,8 @@ from portage import _encodings, _unicode_decode, 
_unicode_encode
 from portage.eapi import _get_eapi_attrs
 from portage.exception import InvalidAtom, InvalidData, InvalidDependString
 from portage.localization import _
-from portage.versions import catpkgsplit, catsplit, \
-   vercmp, ververify, _cp, _cpv, _pkg_str, _slot, _unknown_repo, _vr
+from portage.versions import _cp, _cpv, _pkg_str, _slot, _unknown_repo, _vr, \
+   catpkgsplit, vercmp, ververify
 import portage.cache.mappings
 
 if sys.hexversion >= 0x300:
@@ -405,7 +404,7 @@ def paren_enclose(mylist, unevaluated_atom=False, 
opconvert=False):
mystrparts.append(x)
return " ".join(mystrparts)
 
-def use_reduce(depstr, uselist=[], masklist=[], matchall=False, excludeall=[], 
is_src_uri=False, \
+def use_reduce(depstr, uselist=(), masklist=(), matchall=False, excludeall=(), 
is_src_uri=False, \
eapi=None, opconvert=False, flat=False, is_valid_flag=None, 
token_class=None, matchnone=False):
"""
Takes a dep string and reduces the use? conditionals out, leaving an 
array
@@ -413,14 +412,14 @@ def use_reduce(depstr, uselist=[], masklist=[], 
matchall=False, excludeall=[], i
 
@param depstr: depstring
@type depstr: String
-   @param uselist: List of use enabled flags
-   @type uselist: List
-   @param masklist: List of masked flags (always treated as disabled)
-   @type masklist: List
+   @param uselist: Sequence of use enabled flags
+   @type uselist: Sequence
+   @param masklist: Sequence of masked flags (always treated as disabled)
+   @type masklist: Sequence
@param matchall: Treat all conditionals as active. Used by repoman. 
@type matchall: Bool
-   @param excludeall: List of flags for which negated conditionals are 
always treated as inactive.
-   @type excludeall: List
+   @param excludeall: Sequence of flags for which negated conditionals are 
always treated as inactive.
+   @type excludeall: Sequence
@param is_src_uri: Indicates if depstr represents a SRC_URI
@type is_src_uri: Bool
@param eapi: Indicates the EAPI the dep string has to comply to
@@ -903,7 +902,7 @@ class _use_dep(object):
if conditional:
self.conditional = self._conditionals_class()
for k in "enabled", "disabled", "equal", "not_equal":
-   setattr(self.conditional, k, 
frozenset(conditional.get(k, [])))
+   setattr(self.conditional, k, 
frozenset(conditional.get(k, (
 
def __bool__(self):
return bool(self.tokens)
@@ -1012,7 +1011,7 @@ class _use_dep(object):
conditional = {}
tokens = []
 
-   all_defaults = frozenset(chain(self.missing_enabled, 
self.missing_disabled))
+   all_defaults = self.missing_enabled | self.missing_disabled

def validate_flag(flag):
return is_valid_flag(flag) or flag in all_defaults
@@ -1249,35 +1248,36 @@ class Atom(_unicode):
m = atom_re.match(s)
if m is None:
raise InvalidAtom(self)
-   gdict = m.groupdict()
-   if m.group('star') is not None:
+   m_group = m.group
+   if m_group('star') is not None:
op = '=*'
base = atom_re.groupindex['star']
-   cp = m.group(base + 1)
-   cpv = m.group('star')[1:]
-   extended_version =

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

2019-10-21 Thread Zac Medico
commit: a406490d06a09730fffa9de3255b8e3210ceaab8
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct 22 01:50:19 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 22 01:50:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a406490d

net-dns/bind-tools: Fix COMMON_DEPEND reference in RDEPEND

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

 net-dns/bind-tools/bind-tools-9.14.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/bind-tools/bind-tools-9.14.7.ebuild 
b/net-dns/bind-tools/bind-tools-9.14.7.ebuild
index 2481a42162f..089de718b32 100644
--- a/net-dns/bind-tools/bind-tools-9.14.7.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.7.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
)"
 DEPEND="${COMMON_DEPEND}"
 
-RDEPEND="${COMMON_EPEND}
+RDEPEND="${COMMON_DEPEND}
!

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

2019-10-21 Thread Zac Medico
commit: b74125f7b34055f38bb546439d35e8b5c84dc1b1
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 19:48:16 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 19:49:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74125f7

sys-apps/portage: fixup 2.3.78 GetConfigTestCase

Bug: https://bugs.gentoo.org/698046
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/portage-2.3.78.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.78.ebuild 
b/sys-apps/portage/portage-2.3.78.ebuild
index 8e7b92e07cc..051e9931397 100644
--- a/sys-apps/portage/portage-2.3.78.ebuild
+++ b/sys-apps/portage/portage-2.3.78.ebuild
@@ -103,6 +103,9 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   # Apply 0299aedef74e47c0a68acf7905d8714c9578f125 for bug 698046.
+   sed -e 's|rsync -avP|rsync -LtvP|' -i 
lib/portage/tests/util/test_getconfig.py || die
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \



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

2019-10-21 Thread Zac Medico
commit: 0299aedef74e47c0a68acf7905d8714c9578f125
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 19:40:46 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 19:42:19 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0299aede

GetConfigTestCase: update FETCHCOMMAND_RSYNC

Bug: https://bugs.gentoo.org/698046
Fixes: 03c54e340073 ("make.globals: Change FETCHCOMMAND_RSYNC to --copy-links")
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/tests/util/test_getconfig.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/util/test_getconfig.py 
b/lib/portage/tests/util/test_getconfig.py
index e79fca4b9..a0d00d0e1 100644
--- a/lib/portage/tests/util/test_getconfig.py
+++ b/lib/portage/tests/util/test_getconfig.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import tempfile
@@ -19,7 +19,7 @@ class GetConfigTestCase(TestCase):
 
_cases = {
'FETCHCOMMAND' : 'wget -t 3 -T 60 --passive-ftp -O 
"${DISTDIR}/${FILE}" "${URI}"',
-   'FETCHCOMMAND_RSYNC'   : 'rsync -avP "${URI}" 
"${DISTDIR}/${FILE}"',
+   'FETCHCOMMAND_RSYNC'   : 'rsync -LtvP "${URI}" 
"${DISTDIR}/${FILE}"',
'FETCHCOMMAND_SFTP': 'bash -c "x=\\${2#sftp://} ; 
host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = 
\\${port} ]] && port= ; eval \\"declare -a ssh_opts=(\\${3})\\" ; exec sftp 
\\${port:+-P \\${port}} \\"\\${ssh_opts[@]}\\" \\"\\${host}:/\\${x#*/}\\" 
\\"\\$1\\"" sftp "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"',
'FETCHCOMMAND_SSH' : 'bash -c "x=\\${2#ssh://} ; 
host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = 
\\${port} ]] && port= ; exec rsync --rsh=\\"ssh \\${port:+-p\\${port}} 
\\${3}\\" -avP \\"\\${host}:/\\${x#*/}\\" \\"\\$1\\"" rsync 
"${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"',
'PORTAGE_ELOG_MAILSUBJECT' : '[portage] ebuild log for 
${PACKAGE} on ${HOST}'



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

2019-10-21 Thread Zac Medico
commit: ecbfeae408f1bdcfa4241a3f4001d57cf30c3405
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 19:12:06 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 19:16:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbfeae4

sys-apps/portage: Bump to version 2.3.78

 #697566 fetch: Use FETCHCOMMAND to fetch mirror layout.conf
 #697890 emirrordist: Fix DeletionTask layout assumptions
 #697906 emirrordist: Delete potential symlinks for all layouts
 #698046 make.globals: Change FETCHCOMMAND_RSYNC to --copy-links

Bug: https://bugs.gentoo.org/697734
Bug: https://bugs.gentoo.org/697566
Bug: https://bugs.gentoo.org/697890
Bug: https://bugs.gentoo.org/697906
Bug: https://bugs.gentoo.org/698046
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.78.ebuild | 261 +
 2 files changed, 262 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index bab73df84fb..22bafbbc06c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,4 +2,5 @@ DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B 
dc378b714101b287fa33defeb778e586da83
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545a0f516a5724e331e
 SHA512 
20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 
1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903
 SHA512 
e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
 DIST portage-2.3.77.tar.bz2 1037202 BLAKE2B 
f47260f079759ac3820f884a72a595a2b331ae50e5d20a7719c1b0192333839739f180e55e46a047a4b02a0a0faf697799051b0f0acef15251548f28a24c2589
 SHA512 
95947081ca8c3b42a7f4aae8b934b9c24dd3f44e58cbcc9168aa5a9ff53964dfab5019cbeba6f5a1906be8ba6a29dd7f5b888bc0bf2fab63db7ac1882368255b
+DIST portage-2.3.78.tar.bz2 1037439 BLAKE2B 
7f6d41feba299d2ae81a09ead816bb5695f93cf96f9a16fc4f7c865ceeed7cc5cc3ff5ad92b21a8b03a6ecbee462271a054adcb05c82ff079160d78531f21aee
 SHA512 
a33ec04b78c6e2e13dad80a43e6da6855aa91aa385a4d6f4b97bacc3af49e3e165e1b7183194e51cd7c4db0bba29200d60378197713c961601f84569f239b3e5
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B 
f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c
 SHA512 
0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12

diff --git a/sys-apps/portage/portage-2.3.78.ebuild 
b/sys-apps/portage/portage-2.3.78.ebuild
new file mode 100644
index 000..8e7b92e07cc
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.78.ebuild
@@ -0,0 +1,261 @@
+# 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 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"
+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}]' \
+   pyth

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

2019-10-21 Thread Zac Medico
commit: 9886affcbc23747c96601e6bea9b5587ef01ad1e
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 08:37:06 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 19:06:35 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9886affc

Updates for portage-2.3.78 release

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

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 31a3adaf1..da49c9935 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,15 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.3.78
+==
+* Bug Fixes:
+- Bug 697566 fetch: Use FETCHCOMMAND to fetch mirror layout.conf
+- Bug 697890 emirrordist: Fix DeletionTask layout assumptions
+- Bug 697906 emirrordist: Delete potential symlinks for all layouts
+- Bug 698046 make.globals: Change FETCHCOMMAND_RSYNC to --copy-links
+
+
 portage-2.3.77
 ==
 * Bug Fixes:

diff --git a/setup.py b/setup.py
index 20cd04958..eee09e8bd 100755
--- a/setup.py
+++ b/setup.py
@@ -662,7 +662,7 @@ class build_ext(_build_ext):
 
 setup(
name = 'portage',
-   version = '2.3.77',
+   version = '2.3.78',
url = 'https://wiki.gentoo.org/wiki/Project:Portage',
author = 'Gentoo Portage Development Team',
author_email = 'dev-port...@gentoo.org',



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

2019-10-21 Thread Zac Medico
commit: 
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 19:16:32 2019 +

New tag: portage-2.3.78




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

2019-10-21 Thread Zac Medico
commit: db78fff2ffc15c5e245d87c2944c869dbe260a78
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 17:48:11 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 17:48:53 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=db78fff2

FilenameHashLayout.get_filenames: force UTF8 encoding for iglob argument

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

 lib/portage/package/ebuild/fetch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index ac25e4326..cf073436e 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -307,7 +307,7 @@ class FilenameHashLayout(object):
c = c // 4
pattern += c * '[0-9a-f]' + '/'
pattern += '*'
-   for x in glob.iglob(os.path.join(distdir, pattern)):
+   for x in 
glob.iglob(portage._unicode_encode(os.path.join(distdir, pattern), 
errors='strict')):
try:
yield portage._unicode_decode(x, 
errors='strict').rsplit('/', 1)[1]
except UnicodeDecodeError:



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

2019-10-21 Thread Zac Medico
commit: d9855418352398013ae787bb73f70e935ec109ca
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 09:51:33 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 09:55:36 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d9855418

fetch: yield unicode from layout get_filenames methods

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

 lib/portage/package/ebuild/fetch.py| 18 ++
 lib/portage/tests/ebuild/test_fetch.py | 26 ++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index cedf12b19..ac25e4326 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -7,6 +7,7 @@ __all__ = ['fetch']
 
 import errno
 import functools
+import glob
 import io
 import itertools
 import json
@@ -27,7 +28,6 @@ except ImportError:
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
-   'glob:glob',
'portage.package.ebuild.config:check_config_instance,config',
'portage.package.ebuild.doebuild:doebuild_environment,' + \
'_doebuild_spawn',
@@ -272,7 +272,13 @@ class FlatLayout(object):
def get_filenames(self, distdir):
for dirpath, dirnames, filenames in os.walk(distdir,
onerror=_raise_exc):
-   return iter(filenames)
+   for filename in filenames:
+   try:
+   yield portage._unicode_decode(filename, 
errors='strict')
+   except UnicodeDecodeError:
+   # Ignore it. Distfiles names must have 
valid UTF8 encoding.
+   pass
+   return
 
@staticmethod
def verify_args(args):
@@ -301,8 +307,12 @@ class FilenameHashLayout(object):
c = c // 4
pattern += c * '[0-9a-f]' + '/'
pattern += '*'
-   return (x.rsplit('/', 1)[1]
-   for x in glob(os.path.join(distdir, pattern)))
+   for x in glob.iglob(os.path.join(distdir, pattern)):
+   try:
+   yield portage._unicode_decode(x, 
errors='strict').rsplit('/', 1)[1]
+   except UnicodeDecodeError:
+   # Ignore it. Distfiles names must have valid 
UTF8 encoding.
+   pass
 
@staticmethod
def verify_args(args):

diff --git a/lib/portage/tests/ebuild/test_fetch.py 
b/lib/portage/tests/ebuild/test_fetch.py
index 538fb1754..9a8a4a544 100644
--- a/lib/portage/tests/ebuild/test_fetch.py
+++ b/lib/portage/tests/ebuild/test_fetch.py
@@ -448,3 +448,29 @@ class EbuildFetchTestCase(TestCase):
 '''
self.assertRaises(ConfigParserError, mlc.read_from_file,
io.StringIO(conf))
+
+   def test_filename_hash_layout_get_filenames(self):
+   layouts = (
+   FlatLayout(),
+   FilenameHashLayout('SHA1', '4'),
+   FilenameHashLayout('SHA1', '8'),
+   FilenameHashLayout('SHA1', '8:16'),
+   FilenameHashLayout('SHA1', '8:16:24'),
+   )
+   filename = 'foo-1.tar.gz'
+
+   for layout in layouts:
+   distdir = tempfile.mkdtemp()
+   try:
+   path = os.path.join(distdir, 
layout.get_path(filename))
+   try:
+   os.makedirs(os.path.dirname(path))
+   except OSError:
+   pass
+
+   with open(path, 'wb') as f:
+   pass
+
+   self.assertEqual([filename], 
list(layout.get_filenames(distdir)))
+   finally:
+   shutil.rmtree(distdir)



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

2019-10-21 Thread Zac Medico
commit: 72c3a6d7179d9b18b8681a958a86af95889e6d88
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 21 08:20:45 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 21 08:23:27 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=72c3a6d7

SlotOperatorRuntimePkgMaskTestCase: increase --backtrack to 14

Hopefully this solves an occasional travis-ci test failure,
since the increase to 13 in c510f715b748 did not solve it.
Curiously, both observed failures were with python3.5.

See: https://travis-ci.org/gentoo/portage/jobs/600277643
See: https://travis-ci.org/gentoo/portage/jobs/585109030
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py 
b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
index 4a028def3..affe33f89 100644
--- a/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
+++ b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
@@ -110,7 +110,7 @@ class SlotOperatorRuntimePkgMaskTestCase(TestCase):
ResolverPlaygroundTestCase(
["=app-misc/meta-pkg-2"],
options = {
-   "--backtrack": 13,
+   "--backtrack": 14,
},
success = True,
ambiguous_merge_order = True,



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

2019-10-20 Thread Zac Medico
commit: 52bc75a60b84d709712e91c68782f2f207bfce4e
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Oct 20 00:55:09 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 20 08:33:09 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=52bc75a6

fetch: add force parameter (bug 697566)

Add a force parameter which forces download even when a file already
exists in DISTDIR (and no digests are available to verify it). This
avoids the need to remove the existing file in advance, which makes
it possible to atomically replace the file and avoid interference
with concurrent processes. This is useful when using FETCHCOMMAND to
fetch a mirror's layout.conf file, for the purposes of bug 697566.

Bug: https://bugs.gentoo.org/697566
Reviewed-by: Michał Górny  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/package/ebuild/fetch.py| 22 +++
 lib/portage/tests/ebuild/test_fetch.py | 40 +++---
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index 76e4636c2..05de12740 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -432,7 +432,7 @@ def get_mirror_url(mirror_url, filename, cache_path=None):
 
 def fetch(myuris, mysettings, listonly=0, fetchonly=0,
locks_in_subdir=".locks", use_locks=1, try_mirrors=1, digests=None,
-   allow_missing_digests=True):
+   allow_missing_digests=True, force=False):
"""
Fetch files to DISTDIR and also verify digests if they are available.
 
@@ -455,10 +455,23 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
@param allow_missing_digests: Enable fetch even if there are no digests
available for verification.
@type allow_missing_digests: bool
+   @param force: Force download, even when a file already exists in
+   DISTDIR. This is most useful when there are no digests 
available,
+   since otherwise download will be automatically forced if the
+   existing file does not match the available digests. Also, this
+   avoids the need to remove the existing file in advance, which
+   makes it possible to atomically replace the file and avoid
+   interference with concurrent processes.
+   @type force: bool
@rtype: int
@return: 1 if successful, 0 otherwise.
"""
 
+   if force and digests:
+   # Since the force parameter can trigger unnecessary fetch when 
the
+   # digests match, do not allow force=True when digests are 
provided.
+   raise PortageException(_('fetch: force=True is not allowed when 
digests are provided'))
+
if not myuris:
return 1
 
@@ -878,7 +891,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
eout.quiet = mysettings.get("PORTAGE_QUIET") == 
"1"
match, mystat = _check_distfile(
myfile_path, pruned_digests, eout, 
hash_filter=hash_filter)
-   if match:
+   if match and not force:
# Skip permission adjustment for 
symlinks, since we don't
# want to modify anything outside of 
the primary DISTDIR,
# and symlinks typically point to 
PORTAGE_RO_DISTDIRS.
@@ -1042,10 +1055,11 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,

os.unlink(download_path)
except EnvironmentError:
pass
-   elif myfile not in mydigests:
+   elif not orig_digests:
# We don't have a digest, but 
the file exists.  We must
# assume that it is fully 
downloaded.
-   continue
+   if not force:
+   continue
else:
if 
(mydigests[myfile].get("size") is not None
and 
mystat.st_size < mydigests[myfile]["size"]

diff --git a/lib/portage/tests/ebuild/test_fetch.py 
b/lib/portage/tests/ebuild/test_fetch.py
index f50fea0dd..538fb1754 100644
--- a/lib/portage/tests/ebuild/test_fetch.py
+++ b/lib/portage/tests/ebuild/test_fetch.py
@@ -1

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

2019-10-19 Thread Zac Medico
commit: d4854fc4e4f3dc4578ae732a4aa9990933f47b7d
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 19 23:48:56 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 19 23:52:04 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d4854fc4

fetch: add docstring

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

 lib/portage/package/ebuild/fetch.py | 26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index debab38a2..76e4636c2 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -433,7 +433,31 @@ def get_mirror_url(mirror_url, filename, cache_path=None):
 def fetch(myuris, mysettings, listonly=0, fetchonly=0,
locks_in_subdir=".locks", use_locks=1, try_mirrors=1, digests=None,
allow_missing_digests=True):
-   "fetch files.  Will use digest file if available."
+   """
+   Fetch files to DISTDIR and also verify digests if they are available.
+
+   @param myuris: Maps each file name to a tuple of available fetch URIs.
+   @type myuris: dict
+   @param mysettings: Portage config instance.
+   @type mysettings: portage.config
+   @param listonly: Only print URIs and do not actually fetch them.
+   @type listonly: bool
+   @param fetchonly: Do not block for files that are locked by a
+   concurrent fetcher process. This means that the function can
+   return successfully *before* all files have been successfully
+   fetched!
+   @type fetchonly: bool
+   @param use_locks: Enable locks. This parameter is ineffective if
+   FEATURES=distlocks is disabled in the portage config!
+   @type use_locks: bool
+   @param digests: Maps each file name to a dict of digest types and 
values.
+   @type digests: dict
+   @param allow_missing_digests: Enable fetch even if there are no digests
+   available for verification.
+   @type allow_missing_digests: bool
+   @rtype: int
+   @return: 1 if successful, 0 otherwise.
+   """
 
if not myuris:
return 1



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

2019-10-19 Thread Zac Medico
commit: 491b3ff4d35194765c8ee93c6a438097551fd07e
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 19 23:12:46 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 19 23:13:30 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=491b3ff4

testEbuildFetch: demonstrate fetch behavior with stale file and no digests

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

 lib/portage/tests/ebuild/test_fetch.py | 31 ++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/lib/portage/tests/ebuild/test_fetch.py 
b/lib/portage/tests/ebuild/test_fetch.py
index da63d9dea..f50fea0dd 100644
--- a/lib/portage/tests/ebuild/test_fetch.py
+++ b/lib/portage/tests/ebuild/test_fetch.py
@@ -20,7 +20,7 @@ from portage.util._async.SchedulerInterface import 
SchedulerInterface
 from portage.util._eventloop.global_event_loop import global_event_loop
 from portage.package.ebuild.config import config
 from portage.package.ebuild.digestgen import digestgen
-from portage.package.ebuild.fetch import (_download_suffix, FlatLayout,
+from portage.package.ebuild.fetch import (_download_suffix, fetch, FlatLayout,
FilenameHashLayout, MirrorLayoutConfig)
 from _emerge.EbuildFetcher import EbuildFetcher
 from _emerge.Package import Package
@@ -51,6 +51,12 @@ class EbuildFetchTestCase(TestCase):
}
 
loop = SchedulerInterface(global_event_loop())
+
+   def run_async(func, *args, **kwargs):
+   with ForkExecutor(loop=loop) as executor:
+   return 
loop.run_until_complete(loop.run_in_executor(executor,
+   functools.partial(func, *args, 
**kwargs)))
+
scheme = 'http'
host = '127.0.0.1'
content = {}
@@ -99,6 +105,29 @@ class EbuildFetchTestCase(TestCase):
portdb = root_config.trees["porttree"].dbapi
settings = config(clone=playground.settings)
 
+   # Demonstrate that fetch preserves a stale file 
in DISTDIR when no digests are given.
+   foo_uri = {'foo': 
('{scheme}://{host}:{port}/distfiles/foo'.format(scheme=scheme, host=host, 
port=server.server_port),)}
+   foo_path = os.path.join(settings['DISTDIR'], 
'foo')
+   foo_stale_content = b'stale content\n'
+   with open(foo_path, 'wb') as f:
+   f.write(b'stale content\n')
+
+   self.assertTrue(bool(run_async(fetch, foo_uri, 
settings, try_mirrors=False)))
+
+   with open(foo_path, 'rb') as f:
+   self.assertEqual(f.read(), 
foo_stale_content)
+   with open(foo_path, 'rb') as f:
+   self.assertNotEqual(f.read(), 
distfiles['foo'])
+
+   # Remove the stale file in order to forcefully 
update it.
+   os.unlink(foo_path)
+
+   self.assertTrue(bool(run_async(fetch, foo_uri, 
settings, try_mirrors=False)))
+
+   with open(foo_path, 'rb') as f:
+   self.assertEqual(f.read(), 
distfiles['foo'])
+
+   # Test emirrordist invocation.
emirrordist_cmd = (portage._python_interpreter, 
'-b', '-Wd',
os.path.join(self.bindir, 
'emirrordist'),
'--distfiles', settings['DISTDIR'],



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

2019-10-19 Thread Zac Medico
commit: c366e1a755ed4d6b49883b8d8b20629fe32b6b43
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 19 05:46:53 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 19 05:59:07 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c366e1a7

urlopen: eliminate deprecated urllib.parse.splituser

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

 lib/portage/util/_urlopen.py | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/portage/util/_urlopen.py b/lib/portage/util/_urlopen.py
index fc9db74a0..1d8ba3fd3 100644
--- a/lib/portage/util/_urlopen.py
+++ b/lib/portage/util/_urlopen.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2014 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import io
@@ -11,12 +11,10 @@ try:
from urllib.request import urlopen as _urlopen
import urllib.parse as urllib_parse
import urllib.request as urllib_request
-   from urllib.parse import splituser as urllib_parse_splituser
 except ImportError:
from urllib import urlopen as _urlopen
import urlparse as urllib_parse
import urllib2 as urllib_request
-   from urllib import splituser as urllib_parse_splituser
 
 if sys.hexversion >= 0x300:
# pylint: disable=W0622
@@ -43,7 +41,7 @@ def urlopen(url, if_modified_since=None):
if parse_result.scheme not in ("http", "https"):
return _urlopen(url)
else:
-   netloc = urllib_parse_splituser(parse_result.netloc)[1]
+   netloc = parse_result.netloc.rpartition('@')[-1]
url = urllib_parse.urlunparse((parse_result.scheme, netloc, 
parse_result.path, parse_result.params, parse_result.query, 
parse_result.fragment))
password_manager = 
urllib_request.HTTPPasswordMgrWithDefaultRealm()
request = urllib_request.Request(url)



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

2019-10-18 Thread Zac Medico
commit: 4331274f2faca6052f771eb2c4840afd25efa58c
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 19 05:25:27 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 19 05:27:20 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4331274f

testEbuildFetch: test emirrordist invocation

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

 lib/portage/tests/ebuild/test_fetch.py | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/portage/tests/ebuild/test_fetch.py 
b/lib/portage/tests/ebuild/test_fetch.py
index c0a76b701..da63d9dea 100644
--- a/lib/portage/tests/ebuild/test_fetch.py
+++ b/lib/portage/tests/ebuild/test_fetch.py
@@ -9,11 +9,12 @@ import tempfile
 
 import portage
 from portage import shutil, os
-from portage.const import BASH_BINARY
+from portage.const import BASH_BINARY, PORTAGE_PYM_PATH
 from portage.tests import TestCase
 from portage.tests.resolver.ResolverPlayground import ResolverPlayground
 from portage.tests.util.test_socks5 import AsyncHTTPServer
 from portage.util.configparser import ConfigParserError
+from portage.util.futures import asyncio
 from portage.util.futures.executor.fork import ForkExecutor
 from portage.util._async.SchedulerInterface import SchedulerInterface
 from portage.util._eventloop.global_event_loop import global_event_loop
@@ -98,6 +99,27 @@ class EbuildFetchTestCase(TestCase):
portdb = root_config.trees["porttree"].dbapi
settings = config(clone=playground.settings)
 
+   emirrordist_cmd = (portage._python_interpreter, 
'-b', '-Wd',
+   os.path.join(self.bindir, 
'emirrordist'),
+   '--distfiles', settings['DISTDIR'],
+   '--config-root', settings['EPREFIX'],
+   '--repositories-configuration', 
settings.repositories.config_string(),
+   '--repo', 'test_repo', '--mirror')
+
+   env = os.environ.copy()
+   env['PYTHONPATH'] = ':'.join(
+   filter(None, [PORTAGE_PYM_PATH] + 
os.environ.get('PYTHONPATH', '').split(':')))
+
+   for k in distfiles:
+   
os.unlink(os.path.join(settings['DISTDIR'], k))
+
+   proc = 
loop.run_until_complete(asyncio.create_subprocess_exec(*emirrordist_cmd, 
env=env))
+   
self.assertEqual(loop.run_until_complete(proc.wait()), 0)
+
+   for k in distfiles:
+   with 
open(os.path.join(settings['DISTDIR'], k), 'rb') as f:
+   self.assertEqual(f.read(), 
distfiles[k])
+
# Tests only work with one ebuild at a time, so 
the config
# pool only needs a single config instance.
class config_pool:



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

2019-10-18 Thread Zac Medico
commit: ab481a27e3a672ec762140f9d7cc6be883665a7b
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Oct 19 01:32:45 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sat Oct 19 01:36:15 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ab481a27

testEbuildFetch: add mirror support

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

 lib/portage/tests/ebuild/test_fetch.py | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/ebuild/test_fetch.py 
b/lib/portage/tests/ebuild/test_fetch.py
index ac45f8720..c0a76b701 100644
--- a/lib/portage/tests/ebuild/test_fetch.py
+++ b/lib/portage/tests/ebuild/test_fetch.py
@@ -29,6 +29,13 @@ class EbuildFetchTestCase(TestCase):
 
def testEbuildFetch(self):
 
+   user_config = {
+   "make.conf":
+   (
+   
'GENTOO_MIRRORS="{scheme}://{host}:{port}"',
+   ),
+   }
+
distfiles = {
'bar': b'bar\n',
'foo': b'foo\n',
@@ -37,7 +44,6 @@ class EbuildFetchTestCase(TestCase):
ebuilds = {
'dev-libs/A-1': {
'EAPI': '7',
-   'RESTRICT': 'primaryuri',
'SRC_URI': 
'''{scheme}://{host}:{port}/distfiles/bar.txt -> bar

{scheme}://{host}:{port}/distfiles/foo.txt -> foo''',
},
@@ -47,7 +53,13 @@ class EbuildFetchTestCase(TestCase):
scheme = 'http'
host = '127.0.0.1'
content = {}
+
+   content['/distfiles/layout.conf'] = b'[structure]\n0=flat\n'
+
for k, v in distfiles.items():
+   # mirror path
+   content['/distfiles/{}'.format(k)] = v
+   # upstream path
content['/distfiles/{}.txt'.format(k)] = v
 
with AsyncHTTPServer(host, content, loop) as server:
@@ -58,7 +70,16 @@ class EbuildFetchTestCase(TestCase):
scheme=scheme, host=host, 
port=server.server_port)
ebuilds_subst[cpv] = metadata
 
-   playground = ResolverPlayground(ebuilds=ebuilds_subst, 
distfiles=distfiles)
+   user_config_subst = user_config.copy()
+   for configname, configdata in user_config.items():
+
+   configdata_sub = []
+   for line in configdata:
+   configdata_sub.append(line.format(
+   scheme=scheme, host=host, 
port=server.server_port))
+   user_config_subst[configname] = 
tuple(configdata_sub)
+
+   playground = ResolverPlayground(ebuilds=ebuilds_subst, 
distfiles=distfiles, user_config=user_config_subst)
ro_distdir = tempfile.mkdtemp()
eubin = os.path.join(playground.eprefix, "usr", "bin")
try:



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

2019-10-18 Thread Zac Medico
commit: 5ba2f99e7ba7298091d0cf557bed7d3115535ffd
Author: Gerion Entrup  flump  de>
AuthorDate: Thu Oct 17 12:09:24 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 06:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba2f99e

dev-python/aiodns: use correct typing distribution

With the Gentoo startfiles for Python the typing distribution for
Python 3.6  and Python 3.7 is searched as external library and not as
part of the standard library.

Backport fix from 
https://github.com/saghul/aiodns/commit/281112107c742a3e24e8bce2cb09c3c4d9d01b6d

Closes: https://github.com/gentoo/gentoo/pull/13324
Closes: https://bugs.gentoo.org/692720
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Gerion Entrup  flump.de>
Signed-off-by: Zac Medico  gentoo.org>

 dev-python/aiodns/{aiodns-2.0.0.ebuild => aiodns-2.0.0-r1.ebuild} | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dev-python/aiodns/aiodns-2.0.0.ebuild 
b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
similarity index 75%
rename from dev-python/aiodns/aiodns-2.0.0.ebuild
rename to dev-python/aiodns/aiodns-2.0.0-r1.ebuild
index 7763f5b57eb..0799c11f85d 100644
--- a/dev-python/aiodns/aiodns-2.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
@@ -21,6 +21,13 @@ RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
 
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+
+   #692720 apply https://github.com/saghul/aiodns/pull/73
+   sed -e 's|typing; python_version<"3.7"|typing; python_version<"3.5"|' 
-i setup.py || die
+}
+
 python_test() {
"${EPYTHON}" tests.py -v || die
 }



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

2019-10-18 Thread Zac Medico
commit: b39c41bed0201af65dbb892b2f9580664d825d62
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 06:15:59 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 06:15:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39c41be

dev-python/pycares: Bump to version 3.0.0

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

 dev-python/pycares/Manifest |  1 +
 dev-python/pycares/pycares-3.0.0.ebuild | 31 +++
 2 files changed, 32 insertions(+)

diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 7f4896def1f..3f015d51542 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -2,3 +2,4 @@ DIST pycares-0c831407bc32c6e78a80c5b3d7865ba4c7ac26df.tar.gz 
215641 BLAKE2B 36ae
 DIST pycares-2.1.1.tar.gz 226787 BLAKE2B 
26716906e78a3fa16bcbd143f63e633ffe4664706b2230f698ea933c15d057f92a0fedc45927743690e9ef8f84191e40f4215878ff2845fd1fb4bcf91f49b765
 SHA512 
c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403
 DIST pycares-2.3.0.tar.gz 224941 BLAKE2B 
9ab59f8f7294930b5ff97c7340c3f64cd039c4b291b7b33d00da85168638cdfc75552508a72afd91db28c4c1b823a018b45c346a3daf8da15d5160fd691b6c4a
 SHA512 
dc707ab0320e03fb20e728e2e2e52e92ed3388afcf19e4553bc2a15c33a129abee39a9bc423edb7be7113d42989286ab8e8ad48699cc7433a6d8823460fd4678
 DIST pycares-2.4.0.tar.gz 214021 BLAKE2B 
481d46e9a5726d953d0dcb391a549ba4177e5ac1758a0ecb25bf634b9eb6baa2fbb0544874a78ae46e30a1dd4be8a981f5ebdf1b36cb9aa2e42370074731319e
 SHA512 
7770a2b1fd69bb800019a292e5c9fc1f737b044fb4ca5166ead197da3515f2edac55f947a68f3505c9b404745529287114667d742162c98f2ff84b2c330ef295
+DIST pycares-pycares-3.0.0.tar.gz 215445 BLAKE2B 
5543d27ee38d9360b9ee74ebf1c09da15f68873d5cc83b486e61f3d337e733353dde44d64d6a0520525f4876e67d34c91a770f1c9717b7a1036f568c227f6c87
 SHA512 
bf60549044686accae68ed118e6c5e0da07b1d13473b70f91db85693ebd9ac9e4afb87cba763c667f2f7f487de28759e26a1677023081e94311b547a51bf7451

diff --git a/dev-python/pycares/pycares-3.0.0.ebuild 
b/dev-python/pycares/pycares-3.0.0.ebuild
new file mode 100644
index 000..5581faeccb3
--- /dev/null
+++ b/dev-python/pycares/pycares-3.0.0.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+EGIT_COMMIT=pycares-3.0.0
+MY_P=${PN}-${EGIT_COMMIT}
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/;
+SRC_URI="https://github.com/saghul/pycares/archive/${EGIT_COMMIT}.tar.gz -> 
${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+   "${EPYTHON}" tests/tests.py -v || die
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/containers-storage/

2019-10-18 Thread Zac Medico
commit: 5c8f131b5b0535b8c85739edb99ffad6371df4fd
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 05:36:00 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 05:36:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8f131b

app-emulation/containers-storage: Bump to version 1.13.5

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

 app-emulation/containers-storage/Manifest  |   1 +
 .../containers-storage-1.13.5.ebuild   | 102 +
 2 files changed, 103 insertions(+)

diff --git a/app-emulation/containers-storage/Manifest 
b/app-emulation/containers-storage/Manifest
index ccac46192e8..91bec43f25d 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,3 +1,4 @@
 DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 
1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d
 SHA512 
9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
 DIST containers-storage-1.13.3.tar.gz 5983607 BLAKE2B 
9e591873da4824a133e3818ba9a97074bca234c3154bef9c4febcfd559d0b2ab7462c7da24ce7d391bbdbe2d9a62cb9fd711624623ba28cd8e79d0ca7fcabb47
 SHA512 
83fd16cbe5821c68092845defc2c5b8407b03c3972b146f409be3444a114d357709fefc25206a1ca26e6ef4a5fc219f360bb0195ffdc1c6e9f79e90f07740820
+DIST containers-storage-1.13.5.tar.gz 5968281 BLAKE2B 
9690ebc87ce32a82b7560d594e192e0ad4dc9e8885797593d8c9699c13b9ddf0814773bce081edafe3050aba5d2bc470855c0717874c091b1468d52f7ad08658
 SHA512 
7f9f65e3141b7843a42389c78b3fbcc55a205eb661968f85942ccc2751fa6eb3fdf1199e8d244264d1b8f392e290a1770f93d5a8fd58de98f9d9a277aa39155f
 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 
103470 BLAKE2B 
81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4
 SHA512 
fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6

diff --git a/app-emulation/containers-storage/containers-storage-1.13.5.ebuild 
b/app-emulation/containers-storage/containers-storage-1.13.5.ebuild
new file mode 100644
index 000..abe57aef3e0
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.13.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+   "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
+)
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage;
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+IUSE="btrfs +device-mapper test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+   ${EGO_VENDOR_URI}"
+RDEPEND="
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )"
+DEPEND="${RDEPEND}
+   dev-go/go-md2man
+   test? (
+   sys-fs/btrfs-progs
+   sys-fs/lvm2
+   sys-apps/util-linux
+   )"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+src_unpack() {
+   golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+   default
+
+   [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
+   use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+   "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
+
+   [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
+   use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion 
exclude_graphdriver_devicemapper" > \
+   "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
+
+   sed -e 's:TestChrootUntarPath(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
+   sed -e 's:TestTarUntar(:_\0:' \
+   -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
+   -e 's:TestTarWithOptions(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+   sed -e 's:TestTarUntarWithXattr(:_\0:' \
+   -e 's:TestTarWithBlockCharFifo(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
+   sed -e 's:TestTarUntarWithXattr(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
+   sed -e 's:TestApplyLayer(:_\0:' \
+   -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/

2019-10-17 Thread Zac Medico
commit: dd5b2cef22827af1f16a3121401549fc5cccf60b
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 05:15:46 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 05:30:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5b2cef

app-emulation/libpod: Bump to version 1.6.2

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

 app-emulation/libpod/Manifest|   1 +
 app-emulation/libpod/libpod-1.6.2.ebuild | 142 +++
 2 files changed, 143 insertions(+)

diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index d81a0348f34..24023149209 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1 +1,2 @@
 DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 
4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee
 SHA512 
d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
+DIST libpod-1.6.2.tar.gz 8270781 BLAKE2B 
5d86533ddc821f731292e126102a31d651956c275a22c5c4ab3c57b9351832a1d85d75be877343c60af47716f9d1776315b3bf41fb17037d02fee10cf88efba3
 SHA512 
68192dda019623e3f3af9f82f946be8efbaf3e2c54acf23f62af67ac1ca093dd4dba11d2a7c1c950b99060393ed7e945752c1eaa9eada0dfc30f3dcaac8e1c04

diff --git a/app-emulation/libpod/libpod-1.6.2.ebuild 
b/app-emulation/libpod/libpod-1.6.2.ebuild
new file mode 100644
index 000..9c1a41555c1
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.6.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="f3ffda1e08f19e9a6a88484136b5eed76533f21a"
+EGO_PN="github.com/containers/${PN}"
+
+inherit bash-completion-r1 flag-o-matic golang-vcs-snapshot
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/;
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!selinux? ( !ostree )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   >=app-emulation/conmon-2.0.0
+   >=app-emulation/runc-1.0.0_rc6
+   dev-libs/libassuan:=
+   dev-libs/libgpg-error:=
+   sys-fs/lvm2
+   sys-libs/libseccomp:=
+
+   apparmor? ( sys-libs/libapparmor )
+   btrfs? ( sys-fs/btrfs-progs )
+   ostree? (
+   dev-libs/glib:=
+   dev-util/ostree:=
+   )
+   rootless? ( app-emulation/slirp4netns )
+   selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+
+   # Disable installation of python modules here, since those are
+   # installed by separate ebuilds.
+   sed -e '/^GIT_.*/d' \
+   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/^\(install:.*\) install\.python$/\1/' \
+   -i Makefile || die
+}
+
+src_compile() {
+   # Filter unsupported linker flags
+   filter-flags '-Wl,*'
+
+   [[ -f hack/apparmor_tag.sh ]] || die
+   if use apparmor; then
+   echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+   else
+   echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+   fi
+
+   [[ -f hack/btrfs_installed_tag.sh ]] || die
+   if use btrfs; then
+   echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+   else
+   echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+   hack/btrfs_installed_tag.sh || die
+   fi
+
+   [[ -f hack/ostree_tag.sh ]] || die
+   if use ostree; then
+   echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
+   else
+   echo -e "#!/bin/sh\necho containers_image_ostree_stub" > 
hack/ostree_tag.sh || die
+   fi
+
+   [[ -f hack/selinux_tag.sh ]] || die
+   if use selinux; then
+   echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+   else
+   echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+   fi
+
+   env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" 
GOBIN="${WORKDIR}/${P}/bin" \
+   emake all \
+   GIT_BRANCH=master \
+   GIT_BRANCH_CLEAN=master \
+ 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/buildah/

2019-10-17 Thread Zac Medico
commit: ec8011d459d4d4aeb09c92f623699ba358177a6f
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 04:58:49 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 04:58:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8011d4

app-emulation/buildah: Fix 1.11.3 GIT_COMMIT

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

 app-emulation/buildah/buildah-1.11.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/buildah/buildah-1.11.3.ebuild 
b/app-emulation/buildah/buildah-1.11.3.ebuild
index 6a58e5f4b30..42661d17b64 100644
--- a/app-emulation/buildah/buildah-1.11.3.ebuild
+++ b/app-emulation/buildah/buildah-1.11.3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 IUSE="ostree selinux"
 EGO_PN="${HOMEPAGE#*//}"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0bafbfe"
+GIT_COMMIT="bdd78ad"
 SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
app-emulation/skopeo



[gentoo-commits] repo/gentoo:master commit in: app-emulation/buildah/

2019-10-17 Thread Zac Medico
commit: 1671df03467cc6249de10f043ccddfacb3d93a9d
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 04:43:42 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 04:43:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1671df03

app-emulation/buildah: Bump to version 1.11.3

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

 app-emulation/buildah/Manifest  |  1 +
 app-emulation/buildah/buildah-1.11.3.ebuild | 57 +
 2 files changed, 58 insertions(+)

diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 1e2514b010a..cc53b820d9a 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1 +1,2 @@
 DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B 
ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250
 SHA512 
f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
+DIST buildah-1.11.3.tar.gz 10429884 BLAKE2B 
2d433a128d115c6b2f3a9d246d41406993905dee357237796cea3295036d026ca93f8c98ca992cfebfa574ab0d5e7b974fd356a146b7cde58986166bc18a5645
 SHA512 
07fff3f8c044ad01a663bf5470b19f75568ce741b3bb45f656200099ba559622597111ede3e20331dc06139f2e58d962d92bf0fdd00284ca6ed05b5b66500975

diff --git a/app-emulation/buildah/buildah-1.11.3.ebuild 
b/app-emulation/buildah/buildah-1.11.3.ebuild
new file mode 100644
index 000..6a58e5f4b30
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah;
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="0bafbfe"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+   app-emulation/skopeo
+   dev-libs/libgpg-error:=
+   dev-libs/libassuan:=
+   sys-fs/lvm2:=
+   sys-libs/libseccomp:=
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+REQUIRED_USE="!selinux? ( !ostree )"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+   sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+   [[ -f ostree_tag.sh ]] || die
+   use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" 
> \
+   ostree_tag.sh || die; }
+
+   [[ -f selinux_tag.sh ]] || die
+   use selinux || { echo -e "#!/bin/sh\ntrue" > \
+   selinux_tag.sh || die; }
+}
+
+src_compile() {
+   export -n GOCACHE XDG_CACHE_HOME
+   GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+   dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md 
troubleshooting.md
+   doman docs/*.1
+   dodoc -r docs/tutorials
+   dobin ${PN} imgtype
+   dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+   GOPATH="${WORKDIR}/${P}" emake test-unit
+}



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

2019-10-17 Thread Zac Medico
commit: 4b75dd06be8e6a26032999d9e06ee50301f378dd
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 04:39:07 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 04:39:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b75dd06

sys-apps/yarn: Bump to version 1.19.1

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

 sys-apps/yarn/Manifest   |  1 +
 sys-apps/yarn/yarn-1.19.1.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index dae8824ee59..032560775f1 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -5,4 +5,5 @@ DIST yarn-v1.15.2.tar.gz 1169927 BLAKE2B 
1ebf899b1f34dd3b6fea4fa001b1edda62dd4c8
 DIST yarn-v1.16.0.tar.gz 1172930 BLAKE2B 
1dbb754ae0af3b9666bb03057f587854407b3587fc4304e8282c759d5ea0cbee12eed58e526808893d3cf8e29c4ec69b13a28a6f6908bcdb8c9126d1a408
 SHA512 
71f7a6c8696758a035ce8a5452079b4cf7fc0b85a43c867e4c99a4970704009e2eea858fb49780cebb1a99a18687ff9bd5759ef16e75cb3008982e0059b591d6
 DIST yarn-v1.17.3.tar.gz 1240577 BLAKE2B 
a5b0fdd014928181da63a322bdc030e4aefd4033d27f49a37225aa2cb3199339dd06e9f74aaa442bfb4692b0470fda40102a41b52a1369c8b84282bae5bc46a6
 SHA512 
0a003ca3b9d165a42f99e17f581c76142edff56ff45f9f53d8868b62a80ca3aeb7ef07e9e66304b0cdd85e826d294b299e998324a97f8061619ea4beb0e37b84
 DIST yarn-v1.19.0.tar.gz 1242633 BLAKE2B 
55aacab6e44c0a44f39ef9e116444043784272ab3d328f44e818cc45a94203f6e73a6d66f51dbdec46a0694890817dde3148be0fc3c931de79c0e2164f5e755f
 SHA512 
40b88ca23f991e8da44f5ef1d6dedeaceea0cd1fbdc526b9cfb2e67a2d6a60cd528f7ef088816febb910707fa792c86c3b47f4dc89970a57e410a5209ec32b79
+DIST yarn-v1.19.1.tar.gz 1243585 BLAKE2B 
01d19b9e2dabf40988b8dac9b3b48a43e7f15d0e4a3f75aad40afb8c811d6387bc476dbb7c6c841af33fe6010b98eaa4969b32cd590f9092b7552e8e9a152960
 SHA512 
8019df6cbf6b618d391add1c8c986cfec8aa4171d89596a54e32b79d79f640edb4c5b90814fa1bf8b947e3830be3b19c478554f7fd9d61c93505614cd096afc7
 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 
188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f
 SHA512 
1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b

diff --git a/sys-apps/yarn/yarn-1.19.1.ebuild b/sys-apps/yarn/yarn-1.19.1.ebuild
new file mode 100644
index 000..6366d148523
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.19.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com;
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz;
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+   net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   sed -i 's/"installationMethod": "tar"/"installationMethod": 
"portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+   local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+   insinto "${install_dir}"
+   doins -r .
+   dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+   while read -r -d '' path; do
+   read -r shebang < "${ED}${path}" || die
+   [[ "${shebang}" == \#\!* ]] || continue
+   fperms +x "${path}"
+   done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}



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

2019-10-17 Thread Zac Medico
commit: 50ffdc20817f73a7fe5c4ec9998b298e07df06ec
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 04:31:51 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 04:32:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ffdc20

app-text/calibre: Bump to version 4.2.0

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

 app-text/calibre/Manifest |   1 +
 app-text/calibre/calibre-4.2.0.ebuild | 271 ++
 2 files changed, 272 insertions(+)

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index cdc02b5864f..718285fb3a1 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,4 @@
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 
60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1
 SHA512 
010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 
9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41
 SHA512 
6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
 DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 
85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8
 SHA512 
9a4766ccec830e553b5165f9a3ba6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
+DIST calibre-4.2.0.tar.xz 36319240 BLAKE2B 
a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437
 SHA512 
653dec2ba7a7ca122425619dc148765aea5cd60ede7fab23c1b10b0a7ba70f055bc6167732d4e21f161f37b313a7f2f9dde81240e1226a11a24b1195c9e38866

diff --git a/app-text/calibre/calibre-4.2.0.ebuild 
b/app-text/calibre/calibre-4.2.0.ebuild
new file mode 100644
index 000..a435558ef33
--- /dev/null
+++ b/app-text/calibre/calibre-4.2.0.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/;
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz;
+
+LICENSE="
+   GPL-3+
+   GPL-3
+   GPL-2+
+   GPL-2
+   GPL-1+
+   LGPL-3+
+   LGPL-2.1+
+   LGPL-2.1
+   BSD
+   MIT
+   Old-MIT
+   Apache-2.0
+   public-domain
+   || ( Artistic GPL-1+ )
+   CC-BY-3.0
+   OFL-1.1
+   PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+   >=app-text/hunspell-1.7:=
+   >=app-text/podofo-0.9.6_pre20171027:=
+   >=app-text/poppler-0.26.5[qt5]
+   >=dev-libs/chmlib-0.40:=
+   dev-libs/glib:2=
+   >=dev-libs/icu-57.1:=
+   dev-libs/libinput:=
+   >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+   >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+   >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+   >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+   >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+   >=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}]
+   >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+   >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+   >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+   >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+   >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+   
>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+   >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+   dev-python/regex[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5=
+   dev-qt/qtdbus:5=
+   dev-qt/qtgui:5=
+   >=dev-qt/qtwebengine-5.12
+   dev-qt/qtwidgets:5=
+   dev-util/desktop-file-utils
+   dev-util/gtk-update-icon-cache
+   media-fonts/liberation-fonts
+   media-

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

2019-10-17 Thread Zac Medico
commit: 6e441cb24d4c4c35fec539158904dd7093e4874d
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 04:13:57 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 04:16:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e441cb2

sys-apps/portage: Revbump to 2.3.77-r1 for bug 697906

Closes: https://bugs.gentoo.org/697906
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/{portage-2.3.77.ebuild => portage-2.3.77-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.77.ebuild 
b/sys-apps/portage/portage-2.3.77-r1.ebuild
similarity index 97%
rename from sys-apps/portage/portage-2.3.77.ebuild
rename to sys-apps/portage/portage-2.3.77-r1.ebuild
index 8e7b92e07cc..055343f47ab 100644
--- a/sys-apps/portage/portage-2.3.77.ebuild
+++ b/sys-apps/portage/portage-2.3.77-r1.ebuild
@@ -103,6 +103,9 @@ pkg_setup() {
 python_prepare_all() {
distutils-r1_python_prepare_all
 
+   # Apply 4e9f04a1e11e84a8c513ee334cf2bc1c013d8c11 for bug 697906.
+   sed -e 's|\(self\.config\.layouts\)\[1:\]|\1|' -i 
lib/portage/_emirrordist/DeletionTask.py || die
+
if use gentoo-dev; then
einfo "Disabling --dynamic-deps by default for gentoo-dev..."
sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \



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

2019-10-17 Thread Zac Medico
commit: be825fc0930945bfe18a52c89765957fe5ac1f08
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 03:46:26 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 03:46:58 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=be825fc0

asyncio.start_unix_server: suppress DeprecationWarning for loop argument

See: https://bugs.python.org/issue36373
Signed-off-by: Zac Medico  gentoo.org>

 bin/socks5-server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/socks5-server.py b/bin/socks5-server.py
index f5d995f0d..d1649ad4a 100644
--- a/bin/socks5-server.py
+++ b/bin/socks5-server.py
@@ -228,7 +228,7 @@ if __name__ == '__main__':
loop = asyncio.get_event_loop()
s = Socks5Server()
server = loop.run_until_complete(
-   asyncio.start_unix_server(s.handle_proxy_conn, sys.argv[1], 
loop=loop))
+   asyncio.start_unix_server(s.handle_proxy_conn, sys.argv[1]))
 
ret = 0
try:



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

2019-10-17 Thread Zac Medico
commit: 67e0bba35f1b7afd5ee5ca648154838741875d6a
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 18 03:35:46 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 18 03:37:40 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=67e0bba3

asyncio.create_subprocess_exec: suppress DeprecationWarning for loop argument

See: https://bugs.python.org/issue36373
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/util/futures/_asyncio/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/portage/util/futures/_asyncio/__init__.py 
b/lib/portage/util/futures/_asyncio/__init__.py
index bd9f2e47c..7635dbb5e 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -140,8 +140,9 @@ def create_subprocess_exec(*args, **kwargs):
loop = _wrap_loop(kwargs.pop('loop', None))
kwargs.setdefault('close_fds', _close_fds_default)
if _asyncio_enabled and isinstance(loop, _AsyncioEventLoop):
-   # Use the real asyncio loop and create_subprocess_exec.
-   return _real_asyncio.create_subprocess_exec(*args, 
loop=loop._loop, **kwargs)
+   # Use the real asyncio create_subprocess_exec (loop argument
+   # is deprecated since since Python 3.8).
+   return _real_asyncio.create_subprocess_exec(*args, **kwargs)
 
result = loop.create_future()
 



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

2019-10-14 Thread Zac Medico
commit: e57cc89e8870beff73a65ab4a59fea2fae3c262e
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct 15 00:40:55 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct 15 00:45:30 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e57cc89e

ChildWatcherTestCase: python3.8 compat

Since python3.8, the add_child_handler method must be called
while the event loop is running, in order to avoid this error:

  File "lib/portage/tests/util/futures/asyncio/test_child_watcher.py", line 41, 
in testChildWatcher
watcher.add_child_handler(pids[0], callback, *args_tuple)
  File "/opt/python/3.8-dev/lib/python3.8/asyncio/unix_events.py", line 1286, 
in add_child_handler
loop = events.get_running_loop()
RuntimeError: no running event loop

See: https://travis-ci.org/gentoo/portage/jobs/597907096
Signed-off-by: Zac Medico  gentoo.org>

 .../tests/util/futures/asyncio/test_child_watcher.py  | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/portage/tests/util/futures/asyncio/test_child_watcher.py 
b/lib/portage/tests/util/futures/asyncio/test_child_watcher.py
index 0fc73ab49..8a8fb3d4f 100644
--- a/lib/portage/tests/util/futures/asyncio/test_child_watcher.py
+++ b/lib/portage/tests/util/futures/asyncio/test_child_watcher.py
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Foundation
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import os
@@ -7,6 +7,7 @@ from portage.process import find_binary, spawn
 from portage.tests import TestCase
 from portage.util._eventloop.global_event_loop import global_event_loop
 from portage.util.futures import asyncio
+from portage.util.futures.compat_coroutine import coroutine
 from portage.util.futures.unix_events import DefaultEventLoopPolicy
 
 
@@ -36,13 +37,17 @@ class ChildWatcherTestCase(TestCase):
def callback(pid, returncode, *args):
future.set_result((pid, returncode, args))
 
-   with asyncio.get_child_watcher() as watcher:
-   pids = spawn([true_binary], returnpid=True)
-   watcher.add_child_handler(pids[0], callback, 
*args_tuple)
+   @coroutine
+   def watch_pid():
 
-   self.assertEqual(
-   loop.run_until_complete(future),
-   (pids[0], os.EX_OK, args_tuple))
+   with asyncio.get_child_watcher() as watcher:
+   pids = spawn([true_binary], 
returnpid=True)
+   watcher.add_child_handler(pids[0], 
callback, *args_tuple)
+   self.assertEqual(
+   (yield future),
+   (pids[0], os.EX_OK, args_tuple))
+
+   loop.run_until_complete(watch_pid())
finally:
asyncio.set_event_loop_policy(initial_policy)
if loop not in (None, global_event_loop()):



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

2019-10-14 Thread Zac Medico
commit: 
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 23:01:41 2019 +

New tag: portage-2.3.77




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

2019-10-14 Thread Zac Medico
commit: 196ff7d54f1a23646f2ad70801a7a04c80c0a8cd
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 14 22:42:20 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 22:42:20 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=196ff7d5

Updates for portage-2.3.77 release

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

 NEWS  |  9 +
 RELEASE-NOTES | 10 ++
 setup.py  |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e09468a87..751f91456 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 News (mainly features/major bug fixes)
 
+portage-2.3.77
+--
+* The emerge --autounmask option is now disabled by default, except for
+  portions of behavior which are controlled by the --autounmask-use and
+  --autounmask-license options. For backward compatibility, previous
+  behavior of --autounmask=y and --autounmask=n is entirely preserved.
+  Users can get the old behavior simply by adding --autounmask to the
+  make.conf EMERGE_DEFAULT_OPTS variable.
+
 portage-2.3.72
 --
 * The glsa-check program is now provided by portage, and it has been

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e58087694..31a3adaf1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,16 @@
 Release Notes; upgrade information mainly.
 Features/major bugfixes are listed in NEWS
 
+portage-2.3.77
+==
+* Bug Fixes:
+- Bug 220533 Fix FEATURES=skiprocheck read-only DISTDIR support
+- Bug 646898 Support GLEP 75 mirror structure
+- Bug 658648 Disable emerge --autounmask by default, except for
+ package.use and package.license changes
+- Bug 695870 Improvements to ebuild(5) man page
+
+
 portage-2.3.76
 ==
 * Bug Fixes:

diff --git a/setup.py b/setup.py
index 0d55d05ed..20cd04958 100755
--- a/setup.py
+++ b/setup.py
@@ -662,7 +662,7 @@ class build_ext(_build_ext):
 
 setup(
name = 'portage',
-   version = '2.3.76',
+   version = '2.3.77',
url = 'https://wiki.gentoo.org/wiki/Project:Portage',
author = 'Gentoo Portage Development Team',
author_email = 'dev-port...@gentoo.org',



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

2019-10-14 Thread Zac Medico
commit: e18292c54af86bee8299b6a925d25eb6c55fd77b
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 14 22:53:35 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 23:01:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18292c5

sys-apps/portage: Bump to version 2.3.77

 #220533 Fix FEATURES=skiprocheck read-only DISTDIR support
 #646898 Support GLEP 75 mirror structure
 #658648 Disable emerge --autounmask by default, except for package.use
 and package.license changes
 #695870 Improvements to ebuild(5) man page

Bug: https://bugs.gentoo.org/697734
Bug: https://bugs.gentoo.org/220533
Bug: https://bugs.gentoo.org/646898
Bug: https://bugs.gentoo.org/658648
Bug: https://bugs.gentoo.org/695870
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/portage/Manifest  |   1 +
 sys-apps/portage/portage-2.3.77.ebuild | 261 +
 2 files changed, 262 insertions(+)

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 54349eaddfb..bab73df84fb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,5 @@
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B 
dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6
 SHA512 
f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 
22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545a0f516a5724e331e
 SHA512 
20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 
1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903
 SHA512 
e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
+DIST portage-2.3.77.tar.bz2 1037202 BLAKE2B 
f47260f079759ac3820f884a72a595a2b331ae50e5d20a7719c1b0192333839739f180e55e46a047a4b02a0a0faf697799051b0f0acef15251548f28a24c2589
 SHA512 
95947081ca8c3b42a7f4aae8b934b9c24dd3f44e58cbcc9168aa5a9ff53964dfab5019cbeba6f5a1906be8ba6a29dd7f5b888bc0bf2fab63db7ac1882368255b
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B 
f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c
 SHA512 
0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12

diff --git a/sys-apps/portage/portage-2.3.77.ebuild 
b/sys-apps/portage/portage-2.3.77.ebuild
new file mode 100644
index 000..8e7b92e07cc
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.77.ebuild
@@ -0,0 +1,261 @@
+# 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 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"
+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

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

2019-10-14 Thread Zac Medico
commit: 979f9f47cce27092e528321ccafd7a649adbc7b3
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 11 03:58:15 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 22:26:58 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=979f9f47

Default disable autounmask package.accept_keywords/mask changes (bug 658648)

Add emerge --autounmask-license and --autounmask-use options which are
enabled by default, and disable package.accept_keywords/mask changes by
default. For backward compatibility, previous behavior of
--autounmask=y and --autounmask=n is entirely preserved. Users can
get the old behavior simply by adding --autounmask to the make.conf
EMERGE_DEFAULT_OPTS variable.

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

 lib/_emerge/create_depgraph_params.py | 35 +++
 lib/_emerge/depgraph.py   | 20 +--
 lib/_emerge/main.py   | 10 
 lib/portage/tests/resolver/test_autounmask.py | 35 ++-
 man/emerge.1  | 23 +++---
 5 files changed, 110 insertions(+), 13 deletions(-)

diff --git a/lib/_emerge/create_depgraph_params.py 
b/lib/_emerge/create_depgraph_params.py
index 08605baa1..7d8da9065 100644
--- a/lib/_emerge/create_depgraph_params.py
+++ b/lib/_emerge/create_depgraph_params.py
@@ -7,6 +7,11 @@ from portage.util import writemsg_level
 def create_depgraph_params(myopts, myaction):
#configure emerge engine parameters
#
+   # autounmask:   enable autounmask
+   # autounmask_keep_keywords: prevent autounmask changes to 
package.accept_keywords
+   # autounmask_keep_license:  prevent autounmask changes to 
package.license
+   # autounmask_keep_masks:prevent autounmask changes to package.mask
+   # autounmask_keep_use:  prevent autounmask changes to package.use
# self:  include _this_ package regardless of if it is merged.
# selective: exclude the package if it is merged
# recurse:   go into the dependencies
@@ -34,6 +39,36 @@ def create_depgraph_params(myopts, myaction):
# binpkg_changed_deps: reject binary packages with outdated deps
myparams = {"recurse" : True}
 
+   autounmask_keep_keywords = myopts.get("--autounmask-keep-keywords")
+   autounmask_keep_masks = myopts.get("--autounmask-keep-masks")
+
+   autounmask = myopts.get("--autounmask")
+   autounmask_license = myopts.get('--autounmask-license')
+   autounmask_use = myopts.get('--autounmask-use')
+   if autounmask == 'n':
+   autounmask = False
+   else:
+   if autounmask is None:
+   if autounmask_use in (None, 'y'):
+   autounmask = True
+   elif autounmask_license in (None, 'y'):
+   autounmask = True
+
+   # Do not enable package.accept_keywords or package.mask
+   # changes by default.
+   if autounmask_keep_keywords is None:
+   autounmask_keep_keywords = True
+   if autounmask_keep_masks is None:
+   autounmask_keep_masks = True
+   else:
+   autounmask = True
+
+   myparams['autounmask'] = autounmask
+   myparams['autounmask_keep_use'] = True if autounmask_use == 'n' else 
False
+   myparams['autounmask_keep_license'] = True if autounmask_license == 'n' 
else False
+   myparams['autounmask_keep_keywords'] = False if 
autounmask_keep_keywords in (None, 'n') else True
+   myparams['autounmask_keep_masks'] = False if autounmask_keep_masks in 
(None, 'n') else True
+
bdeps = myopts.get("--with-bdeps")
if bdeps is not None:
myparams["bdeps"] = bdeps

diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 51614fc14..a641bfc21 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -495,7 +495,7 @@ class _dynamic_depgraph_config(object):
self._backtrack_infos = {}
 
self._buildpkgonly_deps_unsatisfied = False
-   self._autounmask = 
depgraph._frozen_config.myopts.get('--autounmask') != 'n'
+   self._autounmask = self.myparams['autounmask']
self._displayed_autounmask = False
self._success_without_autounmask = False
self._autounmask_backtrack_disabled = False
@@ -5907,15 +5907,19 @@ class depgraph(object):
if self._dynamic_config._autounmask is not True:
return
 
-   autounmask_keep_keywords = 
self._frozen_config.myopts.get("--autounmask-keep-keywords", "n") != "n"
- 

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

2019-10-14 Thread Zac Medico
commit: 76fd5593d8ddf446f445ba3dd9da18a6e44dc5b3
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 14 20:37:25 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 20:38:29 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=76fd5593

get_mirror_url: do not cache after ConfigParserError

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

 lib/portage/package/ebuild/fetch.py | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index 107fba50e..debab38a2 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -415,11 +415,8 @@ def get_mirror_url(mirror_url, filename, cache_path=None):
finally:
f.close()
 
-   try:
-   mirror_conf.read_from_file(data)
-   except ConfigParserError:
-   pass
-   except (IOError, UnicodeDecodeError):
+   mirror_conf.read_from_file(data)
+   except (ConfigParserError, IOError, UnicodeDecodeError):
# Do not cache negative results.
cache_path = None
 



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

2019-10-14 Thread Zac Medico
commit: 41ae830027648e65f867476a4039e7f51db64673
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 14 20:34:37 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 20:35:10 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=41ae8300

get_mirror_url: do not cache negative results

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

 lib/portage/package/ebuild/fetch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index 4e67dff97..107fba50e 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -420,7 +420,8 @@ def get_mirror_url(mirror_url, filename, cache_path=None):
except ConfigParserError:
pass
except (IOError, UnicodeDecodeError):
-   pass
+   # Do not cache negative results.
+   cache_path = None
 
cache[mirror_url] = (time.time(), mirror_conf.serialize())
if cache_path is not None:



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

2019-10-14 Thread Zac Medico
commit: 7c0fd425fd33a75dc8978b5d9ef6d4bd7f8a31bc
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct 14 20:10:41 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 20:11:40 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7c0fd425

get_mirror_url: handle UnicodeDecodeError

Fixes: 6a539b7c5163 ("fetch: Support GLEP 75 mirror structure")
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/package/ebuild/fetch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index 1d5e07260..4e67dff97 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -419,7 +419,7 @@ def get_mirror_url(mirror_url, filename, cache_path=None):
mirror_conf.read_from_file(data)
except ConfigParserError:
pass
-   except IOError:
+   except (IOError, UnicodeDecodeError):
pass
 
cache[mirror_url] = (time.time(), mirror_conf.serialize())



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

2019-10-14 Thread Zac Medico
commit: 6b5889afb1e80bc673ce782e65fc0f49ee7d0908
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Oct 13 22:13:18 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct 14 19:46:16 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6b5889af

fetch: minimal skiprocheck fixes (bug 220533)

Fix cases here fetch assumes that DISTDIR is writable when it's actually
read-only. This preserves old behavior which allowed users to override
FETCHCOMMAND to fetch files on a remote system, even though DISTDIR is
locally mounted in read-only mode.

Bug: https://bugs.gentoo.org/220533
Fixes: ebbde237d33e ("fetch: atomic downloads (bug 175612)")
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/package/ebuild/fetch.py| 38 --
 lib/portage/tests/ebuild/test_fetch.py | 22 
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/lib/portage/package/ebuild/fetch.py 
b/lib/portage/package/ebuild/fetch.py
index cd204b755..1d5e07260 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -529,11 +529,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
if listonly or ("distlocks" not in features):
use_locks = 0
 
+   distdir_writable = os.access(mysettings["DISTDIR"], os.W_OK)
fetch_to_ro = 0
if "skiprocheck" in features:
fetch_to_ro = 1
 
-   if not os.access(mysettings["DISTDIR"],os.W_OK) and fetch_to_ro:
+   if not distdir_writable and fetch_to_ro:
if use_locks:
writemsg(colorize("BAD",
_("!!! For fetching to a read-only filesystem, "
@@ -613,8 +614,11 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
for myfile, myuri in file_uri_tuples:
if myfile not in filedict:
filedict[myfile]=[]
-   mirror_cache = os.path.join(mysettings["DISTDIR"],
-   ".mirror-cache.json")
+   if distdir_writable:
+   mirror_cache = 
os.path.join(mysettings["DISTDIR"],
+   ".mirror-cache.json")
+   else:
+   mirror_cache = None
for l in locations:
filedict[myfile].append(functools.partial(
get_mirror_url, l, myfile, 
mirror_cache))
@@ -790,7 +794,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
pruned_digests["size"] = size
 
myfile_path = os.path.join(mysettings["DISTDIR"], myfile)
-   download_path = myfile_path + _download_suffix
+   download_path = myfile_path if fetch_to_ro else myfile_path + 
_download_suffix
has_space = True
has_space_superuser = True
file_lock = None
@@ -1058,7 +1062,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,

"File renamed to '%s'\n\n") % \

temp_filename, noiselevel=-1)
else:
-   
_movefile(download_path, myfile_path, mysettings=mysettings)
+   if not 
fetch_to_ro:
+   
_movefile(download_path, myfile_path, mysettings=mysettings)
eout = EOutput()
eout.quiet = \

mysettings.get("PORTAGE_QUIET", None) == "1"
@@ -1177,7 +1182,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
del e
fetched = 0
else:
-   if mystat.st_size < 
fetch_resume_size:
+   if distdir_writable and 
mystat.st_size < fetch_resume_size:
writemsg(_(">>> 
Deleting distfile with size "
"%d 
(smaller than " &qu

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

2019-10-13 Thread Zac Medico
commit: 4fa8032c00df4e5d9a18a9572e63c44a36f0bb87
Author: Craig Andrews  gentoo  org>
AuthorDate: Sun Oct 13 20:05:46 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 13 20:29:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa8032c

app-portage/elogv: Python 3.7 compatibility

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

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

diff --git a/app-portage/elogv/elogv-0.7.8.ebuild 
b/app-portage/elogv/elogv-0.7.8.ebuild
index f97650aeaf6..9b427a3649c 100644
--- a/app-portage/elogv/elogv-0.7.8.ebuild
+++ b/app-portage/elogv/elogv-0.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 



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

2019-10-13 Thread Zac Medico
commit: 7b930ee18e9514fd1c67f22fb4564b37cbf76c9a
Author: Craig Andrews  gentoo  org>
AuthorDate: Sun Oct 13 20:07:09 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct 13 20:29:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b930ee1

app-portage/elogv: EAPI=7

Closes: https://github.com/gentoo/gentoo/pull/13283
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews  gentoo.org>
Signed-off-by: Zac Medico  gentoo.org>

 app-portage/elogv/elogv-0.7.8-r1.ebuild | 52 +
 1 file changed, 52 insertions(+)

diff --git a/app-portage/elogv/elogv-0.7.8-r1.ebuild 
b/app-portage/elogv/elogv-0.7.8-r1.ebuild
new file mode 100644
index 000..e5004bc33c8
--- /dev/null
+++ b/app-portage/elogv/elogv-0.7.8-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Curses based utility to parse the contents of elogs created by 
Portage"
+HOMEPAGE="https://github.com/gentoo/elogv;
+SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos"
+
+DOCS=( README )
+
+src_install() {
+   distutils-r1_src_install
+
+   # unset LINGUAS => install all languages
+   # empty LINGUAS => install none
+   local i
+   if [[ -n "${LINGUAS+x}" ]] ; then
+   for i in $(ls "${ED}"/usr/share/locale/) ; do
+   if ! has ${i} ${LINGUAS} ; then
+   rm -rf "${ED}"/usr/share/{locale,man}/${i}
+   fi
+   done
+   fi
+}
+
+pkg_postinst() {
+   elog "Optional dependencies:"
+   elog "  dev-python/pyliblzma (for xz compressed elog files)"
+   elog
+   elog "In order to use this software, you need to activate"
+   elog "Portage's elog features.  Required is"
+   elog "   PORTAGE_ELOG_SYSTEM=\"save\" "
+   elog "and at least one out of "
+   elog "   PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
+   elog "More information on the elog system can be found"
+   elog "in ${EPREFIX}/usr/share/portage/config/make.conf.example"
+   elog
+   elog "To operate properly this software needs the directory"
+   elog "${PORT_LOGDIR:-${EPREFIX}/var/log/portage}/elog created, 
belonging to group portage."
+   elog "To start the software as a user, add yourself to the portage"
+   elog "group."
+   elog
+}



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

2019-10-10 Thread Zac Medico
commit: bfc7b14852da5a2c6274e2116b81e9f2abfcb962
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Oct 11 03:57:10 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Fri Oct 11 04:00:17 2019 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bfc7b148

tests/resolver: specify --autounmask when appropriate

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

 lib/portage/tests/resolver/test_autounmask.py |  4 +++-
 lib/portage/tests/resolver/test_keywords.py   | 15 ++-
 .../tests/resolver/test_slot_operator_autounmask.py   |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/portage/tests/resolver/test_autounmask.py 
b/lib/portage/tests/resolver/test_autounmask.py
index 809d42104..64718dbf9 100644
--- a/lib/portage/tests/resolver/test_autounmask.py
+++ b/lib/portage/tests/resolver/test_autounmask.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2018 Gentoo Foundation
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
@@ -579,12 +579,14 @@ class AutounmaskTestCase(TestCase):
ResolverPlaygroundTestCase(
["dev-libs/B"],
success=False,
+   options={"--autounmask": True},
mergelist=["dev-libs/A-2", "dev-libs/B-1"],
needed_p_mask_changes=set(["dev-libs/A-2"])),
 
ResolverPlaygroundTestCase(
["dev-libs/C"],
success=False,
+   options={"--autounmask": True},
mergelist=["dev-libs/A-", "dev-libs/C-1"],
unstable_keywords=set(["dev-libs/A-"]),
needed_p_mask_changes=set(["dev-libs/A-"])),

diff --git a/lib/portage/tests/resolver/test_keywords.py 
b/lib/portage/tests/resolver/test_keywords.py
index d59ea5881..7989bbac5 100644
--- a/lib/portage/tests/resolver/test_keywords.py
+++ b/lib/portage/tests/resolver/test_keywords.py
@@ -1,4 +1,4 @@
-# Copyright 2011 Gentoo Foundation
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
@@ -37,6 +37,7 @@ class KeywordsTestCase(TestCase):
ResolverPlaygroundTestCase(
['app-misc/B'],
success = False,
+   options={'--autounmask': True},
unstable_keywords = ('app-misc/B-1',),
mergelist = ['app-misc/B-1']),
 
@@ -48,24 +49,28 @@ class KeywordsTestCase(TestCase):
ResolverPlaygroundTestCase(
['app-misc/D'],
success = False,
+   options={'--autounmask': True},
unstable_keywords = ('app-misc/D-1',),
mergelist = ['app-misc/D-1']),
 
ResolverPlaygroundTestCase(
['app-misc/E'],
success = False,
+   options={'--autounmask': True},
unstable_keywords = ('app-misc/E-1',),
mergelist = ['app-misc/E-1']),
 
ResolverPlaygroundTestCase(
['app-misc/F'],
success = False,
+   options={'--autounmask': True},
unstable_keywords = ('app-misc/F-1',),
mergelist = ['app-misc/F-1']),
 
ResolverPlaygroundTestCase(
['app-misc/G'],
success = False,
+   options={'--autounmask': True},
unstable_keywords = ('app-misc/G-1',),
mergelist = ['app-misc/G-1']),
)
@@ -109,6 +114,7 @@ class KeywordsTestCase(TestCase):
ResolverPlaygroundTestCase(
['app-misc/B'],
success = False,
+   options={'--autounmask': True},
unstable_keywords = ('app-misc/B-1',),
mergelist = ['app-misc/B-1']),
 
@@ -120,6 +126,7 @@ class KeywordsTestCase(TestCase):
ResolverPlaygroundTestCase(
['app-misc/D'],
success = F

[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/

2019-10-10 Thread Zac Medico
commit: 4d5e925b3a07e0843ce2e01b676d297234bf61b6
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 10 18:02:43 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 10 18:02:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5e925b

app-admin/vault: Remove old version 1.2.2

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

 app-admin/vault/Manifest   |  2 -
 app-admin/vault/vault-1.2.2.ebuild | 93 --
 2 files changed, 95 deletions(-)

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index e3840427e1a..6bb3543126f 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,4 +1,2 @@
-DIST vault-1.2.2-webui.tar.xz 1920136 BLAKE2B 
81b90a0d796727c7523712ae50f85a24fa98b8b78c304d3ee50654e7f0ea1b3d58005abcbe55a15c3b496f5fce5701306ac57f0c6decc7ab8ae24ab12f5dd81d
 SHA512 
b454e02e664190903b11bf0e3e465463182f3b7060efeb2c858127306869d731193102ba58398c28441d2be1a3956b88b2591aab1460047647742ba9dab5a00c
-DIST vault-1.2.2.tar.gz 27588019 BLAKE2B 
5d989d1750a134f0c68e25ced7406ec8e7ae1d2233a1ece634e1487e4879af2d4a3e938aea1016d6872754f31ef19c85d04cd65e63f6547d7a5cf3cfa93ec208
 SHA512 
ce9211b3deb1839759646f8488fe2b89fec379bafed472921a62cd507f842ed05647fe4da7cb9482d195b028a29eb576f947da24aecd8b19181c7282fd3a155d
 DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 
503425336fac45645b837380dcf94be4bdbb3876b1408a6bbd6ccaca96fd93e47dd2fcaf9913a70cb69fc0c7c1c36a90680acb629be3d616fe77d95662d93ed0
 SHA512 
1e414143ea163dc021ffefba023ff827f8241db5c125c3aa5de407dc4ae476413d32bf3b150167ffb14026f07663a26f3ab62b142019758f751a4f115d438d87
 DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 
862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c
 SHA512 
9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75

diff --git a/app-admin/vault/vault-1.2.2.ebuild 
b/app-admin/vault/vault-1.2.2.ebuild
deleted file mode 100644
index cda2c7eb503..000
--- a/app-admin/vault/vault-1.2.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/;
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-   webui? (
-   mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-   https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-   )"
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11:=
-   dev-go/gox"
-
-FILECAPS=(
-   -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-   golang-vcs-snapshot_src_unpack
-   if use webui; then
-   # The webui assets build has numerous nodejs dependencies,
-   # see 
https://github.com/hashicorp/vault/blob/master/ui/README.md
-   pushd "${S}/src/${EGO_PN}" >/dev/null || die
-   unpack "${VAULT_WEBUI_ARCHIVE}"
-   popd >/dev/null
-   fi
-}
-
-src_prepare() {
-   default
-   # Avoid the need to have a git checkout
-   sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-   -e 's:^\(GIT_DIRTY=\).*:\1:' \
-   -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-   -i src/${EGO_PN}/scripts/build.sh || die
-   sed -e "/hooks/d" \
-   -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-   -i src/${EGO_PN}/Makefile || die
-
-   # Avoid network-sandbox violations since go-1.13
-   rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-   mkdir bin || die
-   export -n GOCACHE XDG_CACHE_HOME #678970
-   export GOBIN=${S}/bin GOPATH=${S}
-   cd src/${EGO_PN} || die
-   # The fmt target may need to be executed if it was previously
-   # executed by an older version of go (bug 665438).
-   emake fmt
-   BUILD_TAGS="$(usex webui ui '')" \
-   XC_ARCH=$(go env GOARCH) \
-   XC_OS=$(go env GOOS) \
-   XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-   emake
-}
-
-src_install() {
-   dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-   newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/

[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/

2019-10-10 Thread Zac Medico
commit: e1bc78a0e449c998c3307b61c6e416a8304ab95e
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Oct 10 18:00:06 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Thu Oct 10 18:01:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1bc78a0

app-admin/vault: require at least go-1.12

Reported-by: Hans de Graaff  gentoo.org>
Closes: https://bugs.gentoo.org/697174
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-admin/vault/vault-1.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/vault/vault-1.2.3.ebuild 
b/app-admin/vault/vault-1.2.3.ebuild
index cda2c7eb503..ba761e12341 100644
--- a/app-admin/vault/vault-1.2.3.ebuild
+++ b/app-admin/vault/vault-1.2.3.ebuild
@@ -21,7 +21,7 @@ IUSE="+webui"
 
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.11:=
+DEPEND=">=dev-lang/go-1.12:=
dev-go/gox"
 
 FILECAPS=(



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

2019-10-09 Thread Zac Medico
commit: 50c8c7c4cf350eefdce502070db628841c944d9f
Author: Guillaume Castagnino  xwing  info>
AuthorDate: Wed Oct  9 17:27:18 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Wed Oct  9 17:29:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c8c7c4

app-text/calibre: fix 4.1.0 PyQtWebEngine dep

As calibre has migrated from webkit to webengine, the PyQt dependency
must be updated.  Calibre now needs the webengine python bindings,
not anymore webkit one. If not updated, the ebook reader part fail
to open with a python stack trace.

Closes: https://bugs.gentoo.org/697048
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-text/calibre/{calibre-4.1.0.ebuild => calibre-4.1.0-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-text/calibre/calibre-4.1.0.ebuild 
b/app-text/calibre/calibre-4.1.0-r1.ebuild
similarity index 98%
rename from app-text/calibre/calibre-4.1.0.ebuild
rename to app-text/calibre/calibre-4.1.0-r1.ebuild
index dc7b6fb4792..a435558ef33 100644
--- a/app-text/calibre/calibre-4.1.0.ebuild
+++ b/app-text/calibre/calibre-4.1.0-r1.ebuild
@@ -65,7 +65,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-   
>=dev-python/PyQt5-5.12[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+   
>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+   >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
dev-python/regex[${PYTHON_USEDEP}]
dev-qt/qtcore:5=
dev-qt/qtdbus:5=



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

2019-10-08 Thread Zac Medico
commit: 9e5783e47f8368f2c86564af3066b52b447137fb
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct  8 02:35:23 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Tue Oct  8 23:19:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5783e4

app-text/calibre: Bump to version 4.1.0

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

 app-text/calibre/Manifest |   1 +
 app-text/calibre/calibre-4.1.0.ebuild | 270 ++
 2 files changed, 271 insertions(+)

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 338d8585e15..cdc02b5864f 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,2 +1,3 @@
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 
60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1
 SHA512 
010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 
9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41
 SHA512 
6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
+DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 
85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8
 SHA512 
9a4766ccec830e553b5165f9a3ba6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e

diff --git a/app-text/calibre/calibre-4.1.0.ebuild 
b/app-text/calibre/calibre-4.1.0.ebuild
new file mode 100644
index 000..dc7b6fb4792
--- /dev/null
+++ b/app-text/calibre/calibre-4.1.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/;
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz;
+
+LICENSE="
+   GPL-3+
+   GPL-3
+   GPL-2+
+   GPL-2
+   GPL-1+
+   LGPL-3+
+   LGPL-2.1+
+   LGPL-2.1
+   BSD
+   MIT
+   Old-MIT
+   Apache-2.0
+   public-domain
+   || ( Artistic GPL-1+ )
+   CC-BY-3.0
+   OFL-1.1
+   PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+   >=app-text/hunspell-1.7:=
+   >=app-text/podofo-0.9.6_pre20171027:=
+   >=app-text/poppler-0.26.5[qt5]
+   >=dev-libs/chmlib-0.40:=
+   dev-libs/glib:2=
+   >=dev-libs/icu-57.1:=
+   dev-libs/libinput:=
+   >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+   >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+   >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+   >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+   >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+   >=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}]
+   >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+   >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+   >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+   >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+   >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+   >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+   
>=dev-python/PyQt5-5.12[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+   dev-python/regex[${PYTHON_USEDEP}]
+   dev-qt/qtcore:5=
+   dev-qt/qtdbus:5=
+   dev-qt/qtgui:5=
+   >=dev-qt/qtwebengine-5.12
+   dev-qt/qtwidgets:5=
+   dev-util/desktop-file-utils
+   dev-util/gtk-update-icon-cache
+   media-fonts/liberation-fonts
+   media-libs/fontconfig:=
+   >=media-libs/freetype-2:=
+   >=media-libs/libmtp-1.1.11:=
+   >=media-libs/libwmf-0.2.8
+   >=media-gfx/optipng-0.7.6
+   >=sys-libs/zlib-1.2.11:=
+   virtual/libusb:1=
+   x11-libs/libxkbcommon:=
+   x11-libs/libX11:=
+   x11-libs/libXext:=
+   x11-libs/libXrender:=
+   x11-misc/shared-

[gentoo-commits] repo/gentoo:master commit in: sys-auth/docker_auth/files/

2019-10-07 Thread Zac Medico
commit: aabc390f019a496de056014f5d51d20b9a05ba53
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Oct  7 22:05:01 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Mon Oct  7 22:06:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabc390f

sys-auth/docker_auth: sync confd command_args with init script

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

 sys-auth/docker_auth/files/docker_auth.confd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-auth/docker_auth/files/docker_auth.confd 
b/sys-auth/docker_auth/files/docker_auth.confd
index 9185f376b0d..096572cd845 100644
--- a/sys-auth/docker_auth/files/docker_auth.confd
+++ b/sys-auth/docker_auth/files/docker_auth.confd
@@ -1,2 +1,2 @@
 # arguments for docker auth
-command_args="/etc/docker_auth/config.yml"
+command_args="--log_dir /var/log/${RC_SVCNAME} /etc/docker_auth/config.yml"



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

2019-10-06 Thread Zac Medico
commit: fee1f9715908668dac34d6f53ee81c59d23ce5c1
Author: Rodrigo Saboya  users  noreply  github  
com>
AuthorDate: Sat Oct  5 14:33:44 2019 +
Commit:     Zac Medico  gentoo  org>
CommitDate: Sun Oct  6 17:55:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee1f971

sys-apps/yarn: Bumping to 1.19.0

Closes: https://github.com/gentoo/gentoo/pull/13163
Closes: https://bugs.gentoo.org/696762
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Rodrigo Saboya  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/yarn/Manifest   |  1 +
 sys-apps/yarn/yarn-1.19.0.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index be981e0d2fb..dae8824ee59 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -4,4 +4,5 @@ DIST yarn-v1.13.0.tar.gz 1169613 BLAKE2B 
5fc730c0b456d67702ef5305223cfd933c4c8f1
 DIST yarn-v1.15.2.tar.gz 1169927 BLAKE2B 
1ebf899b1f34dd3b6fea4fa001b1edda62dd4c8964099b8a1bc858a1b28b7ccbab3aa3e229bc7882892763db414ed4f7cfbe2deb636d2a8675da87df1754a835
 SHA512 
0e1a9a19ed8571829db8ee36776841c9793bcbc936938d87deecd875604c4ef70d72058ac7bc429095ac540422917bda1103761b224daf3f026e8a9499a051af
 DIST yarn-v1.16.0.tar.gz 1172930 BLAKE2B 
1dbb754ae0af3b9666bb03057f587854407b3587fc4304e8282c759d5ea0cbee12eed58e526808893d3cf8e29c4ec69b13a28a6f6908bcdb8c9126d1a408
 SHA512 
71f7a6c8696758a035ce8a5452079b4cf7fc0b85a43c867e4c99a4970704009e2eea858fb49780cebb1a99a18687ff9bd5759ef16e75cb3008982e0059b591d6
 DIST yarn-v1.17.3.tar.gz 1240577 BLAKE2B 
a5b0fdd014928181da63a322bdc030e4aefd4033d27f49a37225aa2cb3199339dd06e9f74aaa442bfb4692b0470fda40102a41b52a1369c8b84282bae5bc46a6
 SHA512 
0a003ca3b9d165a42f99e17f581c76142edff56ff45f9f53d8868b62a80ca3aeb7ef07e9e66304b0cdd85e826d294b299e998324a97f8061619ea4beb0e37b84
+DIST yarn-v1.19.0.tar.gz 1242633 BLAKE2B 
55aacab6e44c0a44f39ef9e116444043784272ab3d328f44e818cc45a94203f6e73a6d66f51dbdec46a0694890817dde3148be0fc3c931de79c0e2164f5e755f
 SHA512 
40b88ca23f991e8da44f5ef1d6dedeaceea0cd1fbdc526b9cfb2e67a2d6a60cd528f7ef088816febb910707fa792c86c3b47f4dc89970a57e410a5209ec32b79
 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 
188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f
 SHA512 
1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b

diff --git a/sys-apps/yarn/yarn-1.19.0.ebuild b/sys-apps/yarn/yarn-1.19.0.ebuild
new file mode 100644
index 000..6366d148523
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.19.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com;
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz;
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+   net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   sed -i 's/"installationMethod": "tar"/"installationMethod": 
"portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+   local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+   insinto "${install_dir}"
+   doins -r .
+   dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+
+   while read -r -d '' path; do
+   read -r shebang < "${ED}${path}" || die
+   [[ "${shebang}" == \#\!* ]] || continue
+   fperms +x "${path}"
+   done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}



  1   2   3   4   5   6   7   8   9   10   >