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

[Zac Medico]

commit: 41af82685d688cb03da743cdd03295271a3ef09c
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 05:45:13 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:20:01 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=41af8268

_MergeProcess: add_reader asyncio compat (bug 654382)

Use add_reader for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 pym/portage/dbapi/_MergeProcess.py | 27 +++
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/pym/portage/dbapi/_MergeProcess.py 
b/pym/portage/dbapi/_MergeProcess.py
index bfbe387e4..42f2d84e5 100644
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/pym/portage/dbapi/_MergeProcess.py
@@ -7,7 +7,6 @@ import signal
 import sys
 import traceback
 
-import errno
 import fcntl
 import portage
 from portage import os, _unicode_decode
@@ -24,7 +23,7 @@ class MergeProcess(ForkProcess):
__slots__ = ('mycat', 'mypkg', 'settings', 'treetype',
'vartree', 'blockers', 'pkgloc', 'infloc', 'myebuild',
'mydbapi', 'postinst_failure', 'prev_mtimes', 'unmerge',
-   '_elog_reader_fd', '_elog_reg_id',
+   '_elog_reader_fd',
'_buf', '_elog_keys', '_locked_vdb')
 
def _start(self):
@@ -79,14 +78,8 @@ class MergeProcess(ForkProcess):
self.vartree.dbapi.unlock()
self._locked_vdb = False
 
-   def _elog_output_handler(self, fd, event):
-   output = None
-   if event & self.scheduler.IO_IN:
-   try:
-   output = os.read(fd, self._bufsize)
-   except OSError as e:
-   if e.errno not in (errno.EAGAIN, errno.EINTR):
-   raise
+   def _elog_output_handler(self):
+   output = self._read_buf(self._elog_reader_fd, None)
if output:
lines = _unicode_decode(output).split('\n')
if len(lines) == 1:
@@ -101,15 +94,12 @@ class MergeProcess(ForkProcess):
reporter = 
getattr(portage.elog.messages, funcname)
reporter(msg, phase=phase, key=key, 
out=out)
 
-   if event & self.scheduler.IO_HUP:
-   self.scheduler.source_remove(self._elog_reg_id)
-   self._elog_reg_id = None
+   elif output is not None: # EIO/POLLHUP
+   self.scheduler.remove_reader(self._elog_reader_fd)
os.close(self._elog_reader_fd)
self._elog_reader_fd = None
return False
 
-   return True
-
def _spawn(self, args, fd_pipes, **kwargs):
"""
Fork a subprocess, apply local settings, and call
@@ -142,8 +132,7 @@ class MergeProcess(ForkProcess):
treetype=self.treetype, vartree=self.vartree,
blockers=blockers, pipe=elog_writer_fd)
fd_pipes[elog_writer_fd] = elog_writer_fd
-   self._elog_reg_id = self.scheduler.io_add_watch(elog_reader_fd,
-   self._registered_events, self._elog_output_handler)
+   self.scheduler.add_reader(elog_reader_fd, 
self._elog_output_handler)
 
# If a concurrent emerge process tries to install a package
# in the same SLOT as this one at the same time, there is an
@@ -275,10 +264,8 @@ class MergeProcess(ForkProcess):
pass
 
self._unlock_vdb()
-   if self._elog_reg_id is not None:
-   self.scheduler.source_remove(self._elog_reg_id)
-   self._elog_reg_id = None
if self._elog_reader_fd is not None:
+   self.scheduler.remove_reader(self._elog_reader_fd)
os.close(self._elog_reader_fd)
self._elog_reader_fd = None
if self._elog_keys is not None:

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

[Zac Medico]

commit: 2495fe6ff060e2ed8ee54e08a4dec132de1f4984
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 05:52:07 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:20:01 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2495fe6f

PipeLogger: add_reader asyncio compat (bug 654382)

Use add_reader for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 pym/portage/util/_async/PipeLogger.py | 20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pym/portage/util/_async/PipeLogger.py 
b/pym/portage/util/_async/PipeLogger.py
index 02de74b16..61000271d 100644
--- a/pym/portage/util/_async/PipeLogger.py
+++ b/pym/portage/util/_async/PipeLogger.py
@@ -21,7 +21,7 @@ class PipeLogger(AbstractPollTask):
"""
 
__slots__ = ("input_fd", "log_file_path", "stdout_fd") + \
-   ("_log_file", "_log_file_real", "_reg_id")
+   ("_log_file", "_log_file_real")
 
def _start(self):
 
@@ -57,8 +57,7 @@ class PipeLogger(AbstractPollTask):
fcntl.fcntl(fd, fcntl.F_SETFD,
fcntl.fcntl(fd, fcntl.F_GETFD) | 
fcntl.FD_CLOEXEC)
 
-   self._reg_id = self.scheduler.io_add_watch(fd,
-   self._registered_events, self._output_handler)
+   self.scheduler.add_reader(fd, self._output_handler, fd)
self._registered = True
 
def _cancel(self):
@@ -66,14 +65,14 @@ class PipeLogger(AbstractPollTask):
if self.returncode is None:
self.returncode = self._cancelled_returncode
 
-   def _output_handler(self, fd, event):
+   def _output_handler(self, fd):
 
background = self.background
stdout_fd = self.stdout_fd
log_file = self._log_file 
 
while True:
-   buf = self._read_buf(fd, event)
+   buf = self._read_buf(fd, None)
 
if buf is None:
# not a POLLIN event, EAGAIN, etc...
@@ -124,20 +123,13 @@ class PipeLogger(AbstractPollTask):
log_file.write(buf)
log_file.flush()
 
-   self._unregister_if_appropriate(event)
-
-   return True
-
def _unregister(self):
-
-   if self._reg_id is not None:
-   self.scheduler.source_remove(self._reg_id)
-   self._reg_id = None
-
if self.input_fd is not None:
if isinstance(self.input_fd, int):
+   self.scheduler.remove_reader(self.input_fd)
os.close(self.input_fd)
else:
+   
self.scheduler.remove_reader(self.input_fd.fileno())
self.input_fd.close()
self.input_fd = None
 

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

[Zac Medico]

commit: 31094342b2c55ecdf249e0b4a1df22d391f7fc1e
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 05:34:07 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:20:01 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=31094342

PipeReader: add_reader asyncio compat (bug 654382)

Use add_reader for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 pym/_emerge/PipeReader.py | 27 ---
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 267d0cea1..6b567d8b1 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -17,10 +17,9 @@ class PipeReader(AbstractPollTask):
"""
 
__slots__ = ("input_files",) + \
-   ("_read_data", "_reg_ids", "_use_array")
+   ("_read_data", "_use_array")
 
def _start(self):
-   self._reg_ids = set()
self._read_data = []
 
if self._use_array:
@@ -43,8 +42,7 @@ class PipeReader(AbstractPollTask):
fcntl.fcntl(fd, fcntl.F_SETFD,
fcntl.fcntl(fd, fcntl.F_GETFD) 
| fcntl.FD_CLOEXEC)
 
-   self._reg_ids.add(self.scheduler.io_add_watch(fd,
-   self._registered_events, output_handler))
+   self.scheduler.add_reader(fd, output_handler, fd)
self._registered = True
 
def _cancel(self):
@@ -60,10 +58,10 @@ class PipeReader(AbstractPollTask):
"""Free the memory buffer."""
self._read_data = None
 
-   def _output_handler(self, fd, event):
+   def _output_handler(self, fd):
 
while True:
-   data = self._read_buf(fd, event)
+   data = self._read_buf(fd, None)
if data is None:
break
if data:
@@ -74,18 +72,14 @@ class PipeReader(AbstractPollTask):
self._async_wait()
break
 
-   self._unregister_if_appropriate(event)
-
-   return True
-
-   def _array_output_handler(self, fd, event):
+   def _array_output_handler(self, fd):
 
for f in self.input_files.values():
if f.fileno() == fd:
break
 
while True:
-   data = self._read_array(f, event)
+   data = self._read_array(f, self.scheduler.IO_IN)
if data is None:
break
if data:
@@ -96,8 +90,6 @@ class PipeReader(AbstractPollTask):
self._async_wait()
break
 
-   self._unregister_if_appropriate(event)
-
return True
 
def _unregister(self):
@@ -107,16 +99,13 @@ class PipeReader(AbstractPollTask):
 
self._registered = False
 
-   if self._reg_ids is not None:
-   for reg_id in self._reg_ids:
-   self.scheduler.source_remove(reg_id)
-   self._reg_ids = None
-
if self.input_files is not None:
for f in self.input_files.values():
if isinstance(f, int):
+   self.scheduler.remove_reader(f)
os.close(f)
else:
+   self.scheduler.remove_reader(f.fileno())
f.close()
self.input_files = None
 

[gentoo-commits] proj/portage:master commit in: pym/_emerge/, pym/portage/util/_async/

[Zac Medico]

commit: c11a6ec05f02601a7c2cb5455d1289b9dfed5f10
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 06:06:56 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:24:15 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c11a6ec0

AbstractPollTask: add_reader asyncio compat (bug 654382)

Migration to add_reader is now complete, so remove unused code related
to io_add_watch (and source_remove).

Bug: https://bugs.gentoo.org/654382

 pym/_emerge/AbstractEbuildProcess.py  |  5 -
 pym/_emerge/AbstractPollTask.py   | 29 +--
 pym/_emerge/PipeReader.py |  2 +-
 pym/_emerge/SubProcess.py | 22 +---
 pym/portage/util/_async/SchedulerInterface.py |  6 +-
 5 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/pym/_emerge/AbstractEbuildProcess.py 
b/pym/_emerge/AbstractEbuildProcess.py
index ccc3b8e32..370cac529 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -347,11 +347,6 @@ class AbstractEbuildProcess(SpawnProcess):
log_path = self.settings.get("PORTAGE_LOG_FILE")
self.scheduler.output(msg, log_path=log_path)
 
-   def _log_poll_exception(self, event):
-   self._elog("eerror",
-   ["%s received strange poll event: %s\n" % \
-   (self.__class__.__name__, event,)])
-
def _async_waitpid_cb(self, *args, **kwargs):
"""
Override _async_waitpid_cb to perform cleanup that is

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index 2c5403751..3a869cb46 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -44,18 +44,16 @@ class AbstractPollTask(AsynchronousTask):
| ---
| 0  | None
"""
-   buf = None
-   if event & self.scheduler.IO_IN:
-   buf = array.array('B')
-   try:
+   buf = array.array('B')
+   try:
buf.fromfile(f, self._bufsize)
-   except EOFError:
+   except EOFError:
pass
-   except TypeError:
+   except TypeError:
# Python 3.2:
# TypeError: read() didn't return bytes
pass
-   except IOError as e:
+   except IOError as e:
# EIO happens with pty on Linux after the
# slave end of the pty has been closed.
if e.errno == errno.EIO:
@@ -121,23 +119,6 @@ class AbstractPollTask(AsynchronousTask):
def _unregister(self):
self._registered = False
 
-   def _log_poll_exception(self, event):
-   writemsg_level(
-   "!!! %s received strange poll event: %s\n" % \
-   (self.__class__.__name__, event,),
-   level=logging.ERROR, noiselevel=-1)
-
-   def _unregister_if_appropriate(self, event):
-   if self._registered:
-   if event & self._exceptional_events:
-   self._log_poll_exception(event)
-   self.cancel()
-   self.returncode = self.returncode or os.EX_OK
-   self._async_wait()
-   elif event & self.scheduler.IO_HUP:
-   self.returncode = self.returncode or os.EX_OK
-   self._async_wait()
-
def _wait_loop(self, timeout=None):
loop = getattr(self.scheduler, '_asyncio_wrapper', 
self.scheduler)
tasks = [self.async_wait()]

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 6b567d8b1..6a3fc9ea6 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -79,7 +79,7 @@ class PipeReader(AbstractPollTask):
break
 
while True:
-   data = self._read_array(f, self.scheduler.IO_IN)
+   data = self._read_array(f, None)
if data is None:
break
if data:

diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py
index a37482ca4..7d6b03272 100644
--- a/pym/_emerge/SubProcess.py
+++ b/pym/_emerge/SubProcess.py
@@ -12,7 +12,7 @@ import errno
 class SubProcess(AbstractPollTask):
 
__slots__ = ("pid",) + \
-   ("_dummy_pipe_fd", "_files", "_reg_id", "_waitpid_id")
+   ("_dummy_pipe_fd", "_fi

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

[Zac Medico]

commit: e1145930e94db753e29330a54e24b0814bd6c80c
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 03:22:46 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:20:01 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e1145930

EbuildMetadataPhase: add_reader asyncio compat (bug 654382)

Use add_reader for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 pym/_emerge/EbuildMetadataPhase.py | 31 ---
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/pym/_emerge/EbuildMetadataPhase.py 
b/pym/_emerge/EbuildMetadataPhase.py
index 7a5310b83..42bcd6739 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -15,7 +15,6 @@ from portage import _unicode_encode
 from portage.dep import extract_unpack_dependencies
 from portage.eapi import eapi_has_automatic_unpack_dependencies
 
-import errno
 import fcntl
 import io
 
@@ -109,8 +108,7 @@ class EbuildMetadataPhase(SubProcess):
 
self._raw_metadata = []
files.ebuild = master_fd
-   self._reg_id = self.scheduler.io_add_watch(files.ebuild,
-   self._registered_events, self._output_handler)
+   self.scheduler.add_reader(files.ebuild, self._output_handler)
self._registered = True
 
retval = portage.doebuild(ebuild_path, "depend",
@@ -130,19 +128,14 @@ class EbuildMetadataPhase(SubProcess):
 
self.pid = retval[0]
 
-   def _output_handler(self, fd, event):
-
-   if event & self.scheduler.IO_IN:
-   while True:
-   try:
-   self._raw_metadata.append(
-   os.read(self._files.ebuild, 
self._bufsize))
-   except OSError as e:
-   if e.errno not in (errno.EAGAIN,):
-   raise
-   break
-   else:
-   if not self._raw_metadata[-1]:
+   def _output_handler(self):
+   while True:
+   buf = self._read_buf(self._files.ebuild, None)
+   if buf is None:
+   break # EAGAIN
+   elif buf:
+   self._raw_metadata.append(buf)
+   else: # EIO/POLLHUP
if self.pid is None:
self._unregister()
self._async_wait()
@@ -150,9 +143,9 @@ class EbuildMetadataPhase(SubProcess):
self._async_waitpid()
break
 
-   self._unregister_if_appropriate(event)
-
-   return True
+   def _unregister(self):
+   self.scheduler.remove_reader(self._files.ebuild)
+   SubProcess._unregister(self)
 
def _async_waitpid_cb(self, *args, **kwargs):
"""

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

[Zac Medico]

commit: 452018c1fbf76cf097dbee1a9bb22a8b97958014
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 02:30:29 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:11:32 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=452018c1

FifoWriter: add_writer asyncio compat (bug 654382)

Use add_writer for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 bin/ebuild-ipc.py | 44 +++-
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index b47ee2333..c2773cb6a 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python -b
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # This is a helper which ebuild processes can use
@@ -53,7 +53,7 @@ RETURNCODE_WRITE_FAILED = 2
 
 class FifoWriter(AbstractPollTask):
 
-   __slots__ = ('buf', 'fifo', '_fd', '_reg_id',)
+   __slots__ = ('buf', 'fifo', '_fd')
 
def _start(self):
try:
@@ -67,31 +67,27 @@ class FifoWriter(AbstractPollTask):
return
else:
raise
-   self._reg_id = self.scheduler.io_add_watch(
+   self.scheduler.add_writer(
self._fd,
-   self.scheduler.IO_OUT | self.scheduler.IO_HUP | \
-   self._exceptional_events, self._output_handler)
+   self._output_handler)
self._registered = True
 
-   def _output_handler(self, fd, event):
-   if event & self.scheduler.IO_OUT:
-   # The whole buf should be able to fit in the fifo with
-   # a single write call, so there's no valid reason for
-   # os.write to raise EAGAIN here.
-   buf = self.buf
-   while buf:
+   def _output_handler(self):
+   # The whole buf should be able to fit in the fifo with
+   # a single write call, so there's no valid reason for
+   # os.write to raise EAGAIN here.
+   fd = self._fd
+   buf = self.buf
+   while buf:
+   try:
buf = buf[os.write(fd, buf):]
-   self.returncode = os.EX_OK
-   self._unregister()
-   self.wait()
-   return False
-   else:
-   self._unregister_if_appropriate(event)
-   if not self._registered:
+   except EnvironmentError:
self.returncode = RETURNCODE_WRITE_FAILED
-   self.wait()
-   return False
-   return True
+   self._async_wait()
+   return
+
+   self.returncode = os.EX_OK
+   self._async_wait()
 
def _cancel(self):
self.returncode = self._cancelled_returncode
@@ -99,10 +95,8 @@ class FifoWriter(AbstractPollTask):
 
def _unregister(self):
self._registered = False
-   if self._reg_id is not None:
-   self.scheduler.source_remove(self._reg_id)
-   self._reg_id = None
if self._fd is not None:
+   self.scheduler.remove_writer(self._fd)
os.close(self._fd)
self._fd = None
 

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

[Zac Medico]

commit: c06c7e50244292e263e5512f7baefc16bbe85456
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 04:05:22 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:20:01 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c06c7e50

EbuildIpcDaemon: add_reader asyncio compat (bug 654382)

Use add_reader for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 pym/_emerge/EbuildIpcDaemon.py | 28 +++-
 pym/_emerge/FifoIpcDaemon.py   | 20 
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/pym/_emerge/EbuildIpcDaemon.py b/pym/_emerge/EbuildIpcDaemon.py
index 8414d2020..c16049ee4 100644
--- a/pym/_emerge/EbuildIpcDaemon.py
+++ b/pym/_emerge/EbuildIpcDaemon.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import errno
@@ -32,24 +32,12 @@ class EbuildIpcDaemon(FifoIpcDaemon):
 
__slots__ = ('commands',)
 
-   def _input_handler(self, fd, event):
+   def _input_handler(self):
# Read the whole pickle in a single atomic read() call.
-   data = None
-   if event & self.scheduler.IO_IN:
-   # For maximum portability, use os.read() here since
-   # array.fromfile() and file.read() are both known to
-   # erroneously return an empty string from this
-   # non-blocking fifo stream on FreeBSD (bug #337465).
-   try:
-   data = os.read(fd, self._bufsize)
-   except OSError as e:
-   if e.errno != errno.EAGAIN:
-   raise
-   # Assume that another event will be generated
-   # if there's any relevant data.
-
-   if data:
-
+   data = self._read_buf(self._files.pipe_in, None)
+   if data is None:
+   pass # EAGAIN
+   elif data:
try:
obj = pickle.loads(data)
except SystemExit:
@@ -85,7 +73,7 @@ class EbuildIpcDaemon(FifoIpcDaemon):
if reply_hook is not None:
reply_hook()
 
-   elif event & self.scheduler.IO_HUP:
+   else: # EIO/POLLHUP
# This can be triggered due to a race condition which 
happens when
# the previous _reopen_input() call occurs before the 
writer has
# closed the pipe (see bug #401919). It's not safe to 
re-open
@@ -107,8 +95,6 @@ class EbuildIpcDaemon(FifoIpcDaemon):
finally:
unlockfile(lock_obj)
 
-   return True
-
def _send_reply(self, reply):
# File streams are in unbuffered mode since we do atomic
# read and write of whole pickles. Use non-blocking mode so

diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py
index 3676e98da..0cbaa13c7 100644
--- a/pym/_emerge/FifoIpcDaemon.py
+++ b/pym/_emerge/FifoIpcDaemon.py
@@ -15,8 +15,7 @@ from portage.cache.mappings import slot_dict_class
 
 class FifoIpcDaemon(AbstractPollTask):
 
-   __slots__ = ("input_fifo", "output_fifo",) + \
-   ("_files", "_reg_id",)
+   __slots__ = ("input_fifo", "output_fifo", "_files")
 
_file_names = ("pipe_in",)
_files_dict = slot_dict_class(_file_names, prefix="")
@@ -40,9 +39,9 @@ class FifoIpcDaemon(AbstractPollTask):
fcntl.fcntl(self._files.pipe_in,
fcntl.F_GETFD) | 
fcntl.FD_CLOEXEC)
 
-   self._reg_id = self.scheduler.io_add_watch(
+   self.scheduler.add_reader(
self._files.pipe_in,
-   self._registered_events, self._input_handler)
+   self._input_handler)
 
self._registered = True
 
@@ -51,7 +50,7 @@ class FifoIpcDaemon(AbstractPollTask):
Re-open the input stream, in order to suppress
POLLHUP events (bug #339976).
"""
-   self.scheduler.source_remove(self._reg_id)
+   self.scheduler.remove_reader(self._files.pipe_in)
os.close(self._files.pipe_in)
self._files.pipe_in = \
os.open(self.input_fifo, os.O_RDONLY|os.O_NONBLOCK)
@@ -67,9 +66,9 @@ class FifoIpcDaemon(AbstractPollTask):
fcntl.fcntl(self._files.pipe_in,
fcntl.F_GETFD) | 
fcntl.FD_CLOEXEC)
 
-   self._reg_id = sel

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

[Zac Medico]

commit: dfbb97f20ad7cc537f73c204eb740f8e376e27bb
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 02:55:14 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 06:13:25 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfbb97f2

_LockProcess: add_reader asyncio compat (bug 654382)

Use add_reader for asyncio compatibility.

Bug: https://bugs.gentoo.org/654382

 pym/_emerge/AsynchronousLock.py | 22 +-
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py
index c5991bcff..6cf37369f 100644
--- a/pym/_emerge/AsynchronousLock.py
+++ b/pym/_emerge/AsynchronousLock.py
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import fcntl
-import errno
 import logging
 import sys
 
@@ -181,8 +180,7 @@ class _LockProcess(AbstractPollTask):
"""
 
__slots__ = ('path',) + \
-   ('_acquired', '_kill_test', '_proc', '_files',
-'_reg_id','_unlock_future')
+   ('_acquired', '_kill_test', '_proc', '_files', '_unlock_future')
 
def _start(self):
in_pr, in_pw = os.pipe()
@@ -204,8 +202,7 @@ class _LockProcess(AbstractPollTask):
fcntl.fcntl(in_pr, fcntl.F_SETFD,
fcntl.fcntl(in_pr, fcntl.F_GETFD) | 
fcntl.FD_CLOEXEC)
 
-   self._reg_id = self.scheduler.io_add_watch(in_pr,
-   self.scheduler.IO_IN, self._output_handler)
+   self.scheduler.add_reader(in_pr, self._output_handler)
self._registered = True
self._proc = SpawnProcess(
args=[portage._python_interpreter,
@@ -268,14 +265,8 @@ class _LockProcess(AbstractPollTask):
self._proc.poll()
return self.returncode
 
-   def _output_handler(self, f, event):
-   buf = None
-   if event & self.scheduler.IO_IN:
-   try:
-   buf = os.read(self._files['pipe_in'], 
self._bufsize)
-   except OSError as e:
-   if e.errno not in (errno.EAGAIN,):
-   raise
+   def _output_handler(self):
+   buf = self._read_buf(self._files['pipe_in'], None)
if buf:
self._acquired = True
self._unregister()
@@ -287,16 +278,13 @@ class _LockProcess(AbstractPollTask):
def _unregister(self):
self._registered = False
 
-   if self._reg_id is not None:
-   self.scheduler.source_remove(self._reg_id)
-   self._reg_id = None
-
if self._files is not None:
try:
pipe_in = self._files.pop('pipe_in')
except KeyError:
pass
else:
+   self.scheduler.remove_reader(pipe_in)
os.close(pipe_in)
 
def _unlock(self):

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

[Patrick Lauer]

commit: 57edb28805fe770dc11c2050c71f30b2134f63c5
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Apr 30 06:06:12 2018 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Mon Apr 30 06:06:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57edb288

dev-python/awscli: Bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-python/awscli/Manifest  |  1 +
 dev-python/awscli/awscli-1.15.10.ebuild | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index d1d444c3d8c..33f446e81ce 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -7,3 +7,4 @@ DIST awscli-1.11.158.tar.gz 553030 BLAKE2B 
9a36fa3fd4fca2df9b561965fff92f2679f87
 DIST awscli-1.11.81.tar.gz 544970 BLAKE2B 
583a821298c416e8cc9dd9af9d55457fb1eb61cd415159aa880df1a78fd777f1b15e11dce3b712401bd9e1ed2e3ddc5ecb44652870a23f0e0c35aa25e7a07c70
 SHA512 
61b355247d75939d2814ca0594fb1b4498d7a1dc008e27302328c09bbe4ce72a6eddff64712410bd2023663436fd41d405a6a19a1c53c872a0ae6e68a0718175
 DIST awscli-1.14.16.tar.gz 576598 BLAKE2B 
708271155f54dbba643385513691a9fc1cf406eae2d87108a0081b46f84914acf79bb398948daa5df02433904d644e6f0e3ac623859b57a270ad8f1e240b0e8c
 SHA512 
6ad7b908cb1b858a7837042322f59a5aaf71c909d87e783e2f07ab0624b2ca9110cf879c292f9a39012f9e5dac95189a7401d319b3f088662d15c827e9396a06
 DIST awscli-1.14.50.tar.gz 587829 BLAKE2B 
d98f0ea4fe135f6ab5b458d251e763bd2d3c75eaa3edcadf0deaf33350a01e384b7f3a797069d631bcb3338b5a6b77c29d704e4a83946bb65e4c47fa523d8f8f
 SHA512 
c42cfb3ffd75ca4b472b62ecf7917fb204190363b62cbc55c19afe43293258dc762ab3133fea38fd20efc4625db5d97ef274517168e2a2b3cc53d0081b2945aa
+DIST awscli-1.15.10.tar.gz 593929 BLAKE2B 
75685f00b8f0fce1f75d5181019da4ea82d13b711fbcdc85cdfcbff2ef61e5e937fd60bd1ac1e25319284738e6567796255b21e3d8b817dd79fe8698011bd9bd
 SHA512 
704210a5af6b1445c9a4ae0332e2928757ecc823f378c84708bc5f8da40fc43457e8f14174d7f7e8834213a2e4f3d95db39dd9697e0539fa508c274d050718c8

diff --git a/dev-python/awscli/awscli-1.15.10.ebuild 
b/dev-python/awscli/awscli-1.15.10.ebuild
new file mode 100644
index 000..401b5eaad5a
--- /dev/null
+++ b/dev-python/awscli/awscli-1.15.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/";
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+   >=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
+   <=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+   dev-python/docutils[${PYTHON_USEDEP}]
+   <=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+   >=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+   <=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+
+"
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "

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

[Hans de Graaff]

commit: 98ac311add05e5b70d5f67cb3f86708c73081cd3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Apr 30 05:08:41 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Apr 30 05:08:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ac311a

dev-ruby/webmock: add 3.4.0

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-ruby/webmock/Manifest |  1 +
 dev-ruby/webmock/webmock-3.4.0.ebuild | 60 +++
 2 files changed, 61 insertions(+)

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e2cf161c544..cfaac2f10f6 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -2,3 +2,4 @@ DIST webmock-1.24.6.gem 04 BLAKE2B 
6574d398579dcafe6100d948b0c70fc8a1ca81333
 DIST webmock-2.3.2.gem 112128 BLAKE2B 
ef0a722374057d7c5392924f68de8520f08cb0aa038fc0b8511e00bbd9dc13f6535955f77611e414a33dbf0ed7a519e9c18caf8517d10be7438e7360c3037a1e
 SHA512 
bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6
 DIST webmock-3.0.1.gem 112640 BLAKE2B 
61d74bbc099bdec25e919c07a12824a3bc0761c2b4eaf1180c90bef64856882a69503f10ffc25f153b7d96d6fb2c1699eb0bde8fb94ce41ee0c25f5b47e68dda
 SHA512 
a5924105744a0b09e38501f242f3c19a6c483acdea5792bbe4805d046a4748b9ce8390745837bbf8c8101b1713e62940bda1f9e6b3d63d37b007521c46c521d5
 DIST webmock-3.3.0.gem 114688 BLAKE2B 
8306e96cfccbee598f275534effd119e75e3e1729b85936f29b4d4dc118f58c5ed39aa61553cb4c4a7389d704f57e55347d1f54f3cd392610a84683df993cd3b
 SHA512 
589d96c21c1afd05e11f4adc6325d277bbc9a2d25f1ed6176a7b7db88cf94413f470b75fd245faa73ef0a9cb037f52751826b5047f77b41bd03ac72860277902
+DIST webmock-3.4.0.gem 115712 BLAKE2B 
85098da0f41f364ca4b329995d6ff6dc2a3a57eca898f030d6a8b316781a13bb1bdd4bfef8649391c80ea2c24a27ae6a05f13b9c725c30a0891c15e06f4b5041
 SHA512 
fb2472bf018f602436a49ed649302c39d888178a8023e3af0c7b35ae95aaff1c1d0b0d82671ac07bf7d71ee9ec0ab944567ac1640b06fb9505c262b0c3b90558

diff --git a/dev-ruby/webmock/webmock-3.4.0.ebuild 
b/dev-ruby/webmock/webmock-3.4.0.ebuild
new file mode 100644
index 000..fd96b878436
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP 
requests"
+HOMEPAGE="https://github.com/bblimke/webmock";
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 
dev-ruby/hashdiff"
+
+ruby_add_bdepend "test? (
+   dev-ruby/minitest:5
+   dev-ruby/rspec:3
+   >=dev-ruby/test-unit-3.0.0
+   dev-ruby/rack
+   >=dev-ruby/httpclient-2.8.0
+   >=dev-ruby/patron-0.4.18
+   >=dev-ruby/http-0.8.0:0.8 )"
+
+all_ruby_prepare() {
+   # Remove bundler support
+   rm Gemfile || die
+   sed -i -e '/[Bb]undler/d' Rakefile || die
+   sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+   sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+   # There is now optional support for curb and typhoeus which we don't
+   # have in Gentoo yet. em_http_request is available in Gentoo but its
+   # version is too old.
+   sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
+   rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
+
+   # Avoid httpclient specs that require network access, most likely
+   # because mocking does not fully work.
+   sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
+   -e '/are detected when manually specifying Authorization 
header/,/^end/ s:^:#:' \
+   spec/acceptance/httpclient/httpclient_spec.rb
+}
+
+each_ruby_test() {
+   ${RUBY} -S rake test NO_CONNECTION=true || die
+   ${RUBY} -S rspec-3 spec || die
+
+   einfo "Delay to allow the test server to stop"
+   sleep 10
+}

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

[Hans de Graaff]

commit: aded905d23652f250561889db541bf96949ba4c3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Apr 30 04:57:16 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Apr 30 04:57:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aded905d

dev-ruby/yajl-ruby: add 1.4.0

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-ruby/yajl-ruby/Manifest   |  1 +
 dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild | 45 +++
 2 files changed, 46 insertions(+)

diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 173f184e5e4..2ea732ab4ee 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,2 +1,3 @@
 DIST yajl-ruby-1.3.0.gem 550912 BLAKE2B 
1fe5fd43809fec2bf06d8db14cb6cc6ac5fe59dea8afc12d4c8ca6d0ba7c1095f307575c86cdd6954ce0b5756de3fc2232fbd60398bdf1902da005c6d8242031
 SHA512 
351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 
809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c
 SHA512 
f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
+DIST yajl-ruby-1.4.0.gem 556544 BLAKE2B 
8eea447ef98cdd9b48fe6c91f2a385740339e78e6395b2f63add8757fe437dfd4ae721b604ca5b381c59e36412e1807c930730bcc1a7c7f921c50ccd7f03857b
 SHA512 
63407542a58231305d1cf326de09e8fdb0f4f5bbf28d3b83a3d8f4099db2a425b7a310fc23c62a37681cb24b50d2ce9d10a6641e07be16b52783ea7401ec7ca5

diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild 
b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
new file mode 100644
index 000..8c309083d19
--- /dev/null
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
+HOMEPAGE="https://github.com/brianmario/yajl-ruby";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND} dev-libs/yajl"
+DEPEND="${DEPEND} dev-libs/yajl"
+
+each_ruby_prepare() {
+   # Make sure the right ruby interpreter is used
+   sed -e '/capture/ s:ruby:'${RUBY}':' -i 
spec/parsing/large_number_spec.rb || die
+}
+
+each_ruby_configure() {
+   ${RUBY} -Cext/yajl extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+   emake -Cext/yajl CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
+   cp ext/yajl/yajl$(get_modname) lib/yajl/ || die
+}
+
+each_ruby_test() {
+   # Set RUBYLIB to pass search path on to additional interpreters that
+   # are started.
+   RUBYLIB=lib ruby-ng_rspec || die
+}

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

[Joshua Kinard]

commit: b596f24ddd523ec65e6ee65583926930bd36af5f
Author: Joshua Kinard  gentoo  org>
AuthorDate: Mon Apr 30 03:39:01 2018 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Mon Apr 30 03:39:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b596f24d

net-fs/ncpfs: Remove PHP support

Removed the PHP USE flag and force-disabled PHP support.
Also removed epatch lines for ncpfs-2.2.5-php.patch and
ncpfs-2.2.6-zend_function_entry.patch.  See Bug #582516.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild | 91 ++
 1 file changed, 91 insertions(+)

diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild 
b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
new file mode 100644
index 000..14c992bac3a
--- /dev/null
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam
+
+DESCRIPTION="Provides access to Netware services using the NCP protocol"
+HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/";
+SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="nls pam"
+
+DEPEND="
+   nls? ( sys-devel/gettext )
+   pam? ( virtual/pam )"
+
+RDEPEND="${DEPEND}"
+
+MY_PATCHES=(
+   # Build fixes.
+   "${FILESDIR}"/${P}-gcc4.patch
+   "${FILESDIR}"/${P}-missing-includes.patch
+
+   # Add a patch to fix multiple vulnerabilities.
+   # CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791.
+   # http://seclists.org/fulldisclosure/2010/Mar/122
+   "${FILESDIR}"/${P}-multiple-vulns.patch
+
+   # Add a patch that removes the __attribute__((packed)); directive
+   # from several struct members in include/ncp/ncplib.h.  This will
+   # cut down on a large number of compile warnings generated by modern
+   # gcc releases.
+   "${FILESDIR}"/${P}-remove-packed-attrib.patch
+
+   # Misc patches borrowed from Mageia.
+   "${FILESDIR}"/${P}-align-fix.patch
+   "${FILESDIR}"/${P}-getuid-fix.patch
+   "${FILESDIR}"/${P}-pam_ncp_auth-fix.patch
+   "${FILESDIR}"/${P}-servername-array-fix.patch
+
+   # Misc patches borrowed from Debian.
+   # Fixes Bug #497278
+   "${FILESDIR}"/${P}-drop-kernel-check.patch
+   "${FILESDIR}"/${P}-drop-mtab-support.patch
+   "${FILESDIR}"/${P}-no-suid-root.patch
+   "${FILESDIR}"/${P}-remove-libncp_atomic-header.patch
+
+   # Support LDFLAGS.
+   "${FILESDIR}"/${P}-ldflags-support.patch
+
+   # Bug 446696.  This might need re-diffing if additional Makefile
+   # fixes are added.
+   "${FILESDIR}"/${P}-makefile-fix-soname-link.patch
+)
+
+DOCS=( FAQ README )
+
+src_prepare() {
+   default
+
+   # Bug #273484.
+   sed -i '/ldconfig/d' lib/Makefile.in || die
+
+   epatch "${MY_PATCHES[@]}"
+}
+
+src_configure() {
+   # PHP integration no longer supported in Gentoo, per Bug #582516.
+   econf \
+   $(use_enable nls) \
+   $(use_enable pam pam "$(getpam_mod_dir)") \
+   --disable-php
+}
+
+src_install() {
+   dodir $(getpam_mod_dir) /usr/sbin /sbin
+
+   # Install main software and headers.
+   emake DESTDIR="${D}" install
+   emake DESTDIR="${D}" install-dev
+
+   # Install a startup script in /etc/init.d and a conf file in /etc/conf.d
+   newconfd "${FILESDIR}"/ipx.confd ipx
+   newinitd "${FILESDIR}"/ipx.init ipx
+
+   einstalldocs
+}

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

[Nick Sarnie]

commit: 9502f5dbce218cb63711efa3dd74be9b09d27747
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:42:03 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 03:12:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9502f5db

profiles/arch/base: Add USE mask for app-emulation/wine-staging[vulkan]

 profiles/arch/base/package.use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/base/package.use.mask 
b/profiles/arch/base/package.use.mask
index 2193850a95a..d93676d360b 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -3,6 +3,7 @@
 
 # Nick Sarnie  (29 Apr 2018)
 # media-libs/vulkan-loader is not available everywhere
+app-emulation/wine-staging vulkan
 app-emulation/wine-vanilla vulkan
 
 # Richard Yao  (16 Apr 2018)

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

[Nick Sarnie]

commit: 9b4cadbe1292ae4c5b330f80fa1bebe9eaef3ae2
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:43:59 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 03:12:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4cadbe

profiles/arch/amd64: Unmask app-emulation/wine-staging[vulkan] on amd64

 profiles/arch/amd64/package.use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index 27a1998dba7..9bb8626fe8f 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -19,6 +19,7 @@
 
 # Nick Sarnie  (29 Apr 2018)
 # media-libs/vulkan-loader is keyworded on amd64
+app-emulation/wine-staging -vulkan
 app-emulation/wine-vanilla -vulkan
 
 # Richard Yao  (16 Apr 2018)

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

[Nick Sarnie]

commit: ad9d7959aa9ccba99aa11e628e8e910a0ee811d9
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 03:10:02 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 03:12:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9d7959

app-emulation/wine-staging: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest|   6 -
 .../wine-staging/wine-staging-2.19.ebuild  | 603 
 .../wine-staging/wine-staging-2.20.ebuild  | 605 -
 .../wine-staging/wine-staging-2.21.ebuild  | 605 -
 4 files changed, 1819 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 5a948b439a6..bc09295a9d5 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,9 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 
84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6
 SHA512 
5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 
1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5
 SHA512 
b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
-DIST wine-2.19.tar.xz 19549464 BLAKE2B 
86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb
 SHA512 
83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
-DIST wine-2.20.tar.xz 19597556 BLAKE2B 
80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5
 SHA512 
d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
-DIST wine-2.21.tar.xz 19620888 BLAKE2B 
26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e
 SHA512 
4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 
04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d
 SHA512 
a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
-DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B 
e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f
 SHA512 
90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
-DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 
2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57
 SHA512 
16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
-DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B 
a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204
 SHA512 
701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
 DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B 
b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5
 SHA512 
39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
 DIST

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

[Nick Sarnie]

commit: 11af8c1d0ab69222db6c18035ea841653ed4f7e4
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 03:08:45 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 03:12:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11af8c1d

app-emulation/wine-staging: Sync with ::wine

- Added sdl USE flag
- Fixed staging SRC_URI to point to the active fork
- Removed unneeded patch exclusion as the patch was dropped upstream
- Bumped to 3.5, 3.6 and 3.7

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest  | 6 ++
 app-emulation/wine-staging/metadata.xml  | 1 +
 .../{wine-staging-.ebuild => wine-staging-3.5.ebuild}| 9 +
 .../{wine-staging-.ebuild => wine-staging-3.6.ebuild}| 9 +
 .../{wine-staging-.ebuild => wine-staging-3.7.ebuild}| 9 +
 app-emulation/wine-staging/wine-staging-.ebuild  | 9 +
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 66bfe168421..5a948b439a6 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -3,7 +3,13 @@ DIST wine-2.0.tar.bz2 23662707 BLAKE2B 
1d485c1359ce8a0395a9f6378c1f8be33ea2836b8
 DIST wine-2.19.tar.xz 19549464 BLAKE2B 
86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb
 SHA512 
83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
 DIST wine-2.20.tar.xz 19597556 BLAKE2B 
80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5
 SHA512 
d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
 DIST wine-2.21.tar.xz 19620888 BLAKE2B 
26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e
 SHA512 
4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43
+DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
+DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
+DIST wine-3.7.tar.xz 20454036 BLAKE2B 
04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d
 SHA512 
a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B 
e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f
 SHA512 
90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
 DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 
2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57
 SHA512 
16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
 DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B 
a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204
 SHA512 
701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
+DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B 
b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5
 SHA512 
39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
+DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 
9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895
 SHA512 
8397

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

[Davide Pesavento]

commit: a06cdf4161b4dae04afb2cb5e2487df8c9c83147
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Apr 30 03:05:07 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Apr 30 03:09:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06cdf41

dev-util/qbs: fix and reenable TestApi tests

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-util/qbs/qbs-1.11.0.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild
index bfadc6296da..4971aeed820 100644
--- a/dev-util/qbs/qbs-1.11.0.ebuild
+++ b/dev-util/qbs/qbs-1.11.0.ebuild
@@ -53,9 +53,6 @@ src_prepare() {
 
echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
 
-   # since 1.10, TestApi is either broken or requires more configuration
-   sed -i -e '/\/ d' tests/auto/auto.pro || die
-
# skip several tests that fail and/or have additional deps
sed -i \
-e 's/findArchiver("7z")/""/'   `# requires p7zip, 
fails` \
@@ -86,9 +83,10 @@ src_test() {
 
export HOME=${T}
export LD_LIBRARY_PATH=${S}/$(get_libdir)
+   export QBS_AUTOTEST_PROFILE=autotests
 
-   "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
-   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+   "${S}"/bin/qbs-setup-toolchains --detect || die
+   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
 
einfo "Running autotests"
 

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

[Davide Pesavento]

commit: f7476b34e47b693e304aa3e404f5fe85fe2a9f8f
Author: Asgeir Bjarni Ingvarsson  fundinn  org>
AuthorDate: Mon Apr 30 02:15:37 2018 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Apr 30 03:09:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7476b34

dev-util/qbs: 1.11 version bump

Closes: https://github.com/gentoo/gentoo/pull/8209
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-util/qbs/Manifest  |   1 +
 dev-util/qbs/qbs-1.11.0.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 44d5445ca18..f646edf215f 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B 
cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8
 SHA512 
e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac
+DIST qbs-src-1.11.0.tar.gz 4299668 BLAKE2B 
b17e5d0e65fd0c29bf7837d53eb5c5470e6f3a243b4cbd215a528c6657e5c4831e49b369034133f784122e358cce723bd78b26df8bd580ed570a71590a73af7d
 SHA512 
123319aca79c4816fcfd839a7c7f3029c55eac4dc2c2a2bae7df891c15ef81de22bb7f6ad04bbdb39401473a3df15e41b88adcd0d5d2462c2ef3e62bf5e0f80a

diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild
new file mode 100644
index 000..bfadc6296da
--- /dev/null
+++ b/dev-util/qbs/qbs-1.11.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs";
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz";
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+   dev-qt/qtcore:5=
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtscript:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+   doc? (
+   dev-qt/qdoc:5
+   dev-qt/qthelp:5
+   )
+   test? ( dev-qt/qtdeclarative:5 )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   default
+
+   # don't add /usr/include to INCLUDEPATH
+   # avoids a build failure in qt-creator with gcc-6 (bug 618424)
+   sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' 
src/lib/corelib/use_installed_corelib.pri || die
+
+   if ! use examples; then
+   sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+   fi
+
+   # the qbsres target uses the newly built qbs binary, so we have to tell 
it where to find its libraries
+   sed -i -e '/qbsres\.commands =/ 
a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \
+   static-res.pro || die
+
+   echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+
+   # since 1.10, TestApi is either broken or requires more configuration
+   sed -i -e '/\/ d' tests/auto/auto.pro || die
+
+   # skip several tests that fail and/or have additional deps
+   sed -i \
+   -e 's/findArchiver("7z")/""/'   `# requires p7zip, 
fails` \
+   -e 's/findArchiver(binaryName,.*/"";/'  `# requires zip and 
jar` \
+   -e 's/p\.value("nodejs\./true||&/'  `# requires nodejs, bug 
527652` \
+   -e 
's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires 
nodejs and typescript` \
+   tests/auto/blackbox/tst_blackbox.cpp || die
+
+   # requires jdk, fails, bug 585398
+   sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+   local myqmakeargs=(
+   qbs.pro # bug 523218
+   -recursive
+   CONFIG+=qbs_disable_rpath
+   CONFIG+=qbs_enable_project_file_updates
+   $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+   QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+   QBS_LIBRARY_DIRNAME="$(get_libdir)"
+   )
+   eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+   einfo "Setting up test environment in ${T}"
+
+   export HOME=${T}
+   export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+   "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
+   "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+   einfo "Running autotests"
+
+   # simply exporting LD_LIBRARY_PATH doesn't work
+   # we have to use a custom testrunner script
+   local testrunner=${WORKDIR}/gentoo-testrunner
+   cat <<-EOF > "${testrunner}"
+   #!/bin/sh
+   export 
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 616353a10a8262f8ee125b306d4429680aaae20a
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:19:27 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:56:13 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=616353a1

app-emulation/wine-staging: Updates for 

- Added sdl USE
- Updated upstream SRC_URI to point to the active fork
- Removed unneeded patch exclusion as the patch was dropped upstream

Bug: https://bugs.gentoo.org/647970

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/metadata.xml | 1 +
 app-emulation/wine-staging/wine-staging-.ebuild | 9 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 1295661..de9b63d 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -38,6 +38,7 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing
+   Add support for gamepad detection using 
SDL
Apply Wine-Staging patches for advanced 
feature support that haven't made it into upstream Wine yet
Support GTK+:3 window theming through 
Wine-Staging
Use virtual/libudev to provide 
plug and play support

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index fd41d6c..7ba4e02 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -36,15 +36,15 @@ SRC_URI="${SRC_URI}
 "
 
 if [[ ${PV} == "" ]] ; then
-   
STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git";
+   STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
 else
SRC_URI="${SRC_URI}
-   staging? ( 
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
+   staging? ( 
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> 
${STAGING_P}.tar.gz )"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba 
scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l 
vaapi vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba 
scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks 
v4l vaapi vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -99,6 +99,7 @@ COMMON_DEPEND="
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+   sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
themes? (
@@ -349,7 +350,6 @@ src_prepare() {
ewarn "Wine bugzilla should explicitly state that staging was 
used."
 
local STAGING_EXCLUDE=""
-   STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
winhlp32-Flex_Workaround" # Avoid double patching 
https://bugs.winehq.org/show_bug.cgi?id=42132
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W 
Pipelight"
 
# Launch wine-staging patcher in a subshell, using eapply as a 
backend, and gitapply.sh as a backend for binary patches
@@ -462,6 +462,7 @@ multilib_src_configure() {
$(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
+   $(use_with sdl)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 4c82fcafb70bb2a40d6ea683793312fc6d8b87d2
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:37:32 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:59:42 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=4c82fcaf

app-emulation/wine-staging: Bump to 3.4

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-3.4.ebuild | 608 +
 2 files changed, 610 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index 189dded..ff03a8c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -22,6 +22,7 @@ DIST wine-2.7.tar.xz 19101108 BLAKE2B 
cf5ff292ada8b65498098269b5961dc8f5c412cab4
 DIST wine-2.8.tar.xz 19120740 BLAKE2B 
6d6a7eb0a30a654337ede94d358bb9d477ce5162d9b50efc8ca75e6b143b638eca916f77e120cd35e632fbdfc7cf036f67132d19db86d8d5c6340b9ac18afee5
 SHA512 
4d0b167b1e5add31ed0ed05b328d16fc13cd268285c03a9100e7ddc53864aa07f6b216a555ef0c2e51dee550e3f4abf0c7c20db2cbca177bb38e8c3e11f05b97
 DIST wine-2.9.tar.xz 19154668 BLAKE2B 
45961ad031404a4cba8733bbbfe34ac1db361a508deca45e81938b25be0ed1b59e7fa9c9619bcfecce540b0c96e57cee75c6a98a144fbff6e91fa72af55ece94
 SHA512 
6d06e511d8f338297ed0ddb7bf2ffb501f528209eaecbbee3d4e5d53db649dd5ea0aeb78bba661a9bcfda5f97e170ca10eb8fab355e229bfe7db6a5feb7ec4e8
 DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
+DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-2.1.tar.gz 10101781 BLAKE2B 
6cbbc4bf2eec6416e7a9a128994dc53fbde6dd62fabdd94df6f675a395c9c7c5d22b2971d254bfb900b3f4cf727c9057c0cd912f1c256bc3b74a295386d420d5
 SHA512 
c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db
 DIST wine-staging-2.10.tar.gz 10091114 BLAKE2B 
e30bfdee83eead61ced3d6fc4cb1b6089b647a398737bfacf2da4c78e0c3c4ce9c5e5fc0f5a808ff8a6e7553f27e6a65ce4f236e6957753bd0fa706f7b71a30b
 SHA512 
c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7
@@ -45,3 +46,4 @@ DIST wine-staging-2.7.tar.gz 10018082 BLAKE2B 
47e572c1cc9e7b458afbc64bac3fc847b5
 DIST wine-staging-2.8.tar.gz 10043842 BLAKE2B 
bb11179d711b07289bf589287700bd8ba5c27f6d99c144f0704e7212211e9fb2e03a2eb6d0d5c664114485e337de291e5fc6885778cdcc45b40c8266d344b703
 SHA512 
af1707fe3119664a0d97d94fc4c955612d80cb76eae8c4248a268c0f6be9e659fccf7c26899c9e9ae5822f74474c0db5283b598dd4d9d69a3b108f947653217a
 DIST wine-staging-2.9.tar.gz 10062408 BLAKE2B 
1e5edd60cf944cac97948020f5730ce466f4770a2ea17bdbbc47c97d14c17007555c2113bc352c91aa31da4a8b7c7097881c9d5f0d5e4a05d6a3245ecbae6db6
 SHA512 
7862a403817791c54c5c1b8f233b06a850500305c46283bccb9026fb6db041a8fba619d145ab21fe2fdc5f25ed3bbb75fde05245fbbbd67139a5f64b547b1196
 DIST wine-staging-3.3.tar.gz 10136486 BLAKE2B 
ea64e19fe987125bcdb0c5281e389574fe300225adc62eaff9be4f751642fba863acd4580e80e041fb4d4881f7861a4c093944abeca3a1a786b713278f5bf6d5
 SHA512 
02d48a9c403b93d01ca37b74af5dc81f86e49c72d67f194c71ccebd4556fa72c473728a1b1f9d5325c6f85f4e41bb7072a1183a2d81cafae00dc53d12166
+DIST wine-staging-3.4.tar.gz 10117160 BLAKE2B 
f5a15718732afe25c92d3b245d270db4e161fc755fe50d83f9646d0dcdf076ea91af3955c35e8f8a08648e860c74cc59ba0adc8c626290e48e4f21bf41374a45
 SHA512 
f0cc2b3d91589a4d9536c1011001edf7db428387592407a64949381c0ac2f0bb79b0fbf04d3c85db50adbecba716188a8249e1ff166b5ec3004d9eb5f9e92f3f

diff --git a/app-emulation/wine-staging/wine-staging-3.4.ebuild 
b/app-emulation/wine-staging/wine-staging-3.4.ebuild
new file mode 100644
index 000..7ba4e02
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.4.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools e

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 094ce1b63004db5a8ad68e2a594d5ba0de4cf958
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:39:57 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:59:42 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=094ce1b6

app-emulation/wine-staging: Bump to 3.6

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-3.6.ebuild | 608 +
 2 files changed, 610 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index e675204..dda7564 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -24,6 +24,7 @@ DIST wine-2.9.tar.xz 19154668 BLAKE2B 
45961ad031404a4cba8733bbbfe34ac1db361a508d
 DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
 DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
+DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-2.1.tar.gz 10101781 BLAKE2B 
6cbbc4bf2eec6416e7a9a128994dc53fbde6dd62fabdd94df6f675a395c9c7c5d22b2971d254bfb900b3f4cf727c9057c0cd912f1c256bc3b74a295386d420d5
 SHA512 
c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db
 DIST wine-staging-2.10.tar.gz 10091114 BLAKE2B 
e30bfdee83eead61ced3d6fc4cb1b6089b647a398737bfacf2da4c78e0c3c4ce9c5e5fc0f5a808ff8a6e7553f27e6a65ce4f236e6957753bd0fa706f7b71a30b
 SHA512 
c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7
@@ -49,3 +50,4 @@ DIST wine-staging-2.9.tar.gz 10062408 BLAKE2B 
1e5edd60cf944cac97948020f5730ce466
 DIST wine-staging-3.3.tar.gz 10136486 BLAKE2B 
ea64e19fe987125bcdb0c5281e389574fe300225adc62eaff9be4f751642fba863acd4580e80e041fb4d4881f7861a4c093944abeca3a1a786b713278f5bf6d5
 SHA512 
02d48a9c403b93d01ca37b74af5dc81f86e49c72d67f194c71ccebd4556fa72c473728a1b1f9d5325c6f85f4e41bb7072a1183a2d81cafae00dc53d12166
 DIST wine-staging-3.4.tar.gz 10117160 BLAKE2B 
f5a15718732afe25c92d3b245d270db4e161fc755fe50d83f9646d0dcdf076ea91af3955c35e8f8a08648e860c74cc59ba0adc8c626290e48e4f21bf41374a45
 SHA512 
f0cc2b3d91589a4d9536c1011001edf7db428387592407a64949381c0ac2f0bb79b0fbf04d3c85db50adbecba716188a8249e1ff166b5ec3004d9eb5f9e92f3f
 DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B 
b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5
 SHA512 
39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
+DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 
9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895
 SHA512 
839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a

diff --git a/app-emulation/wine-staging/wine-staging-3.6.ebuild 
b/app-emulation/wine-staging/wine-staging-3.6.ebuild
new file mode 100644
index 000..7ba4e02
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.6.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools es

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 9e401d55ad21d461c115e8b092d402b79678573d
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:36:03 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:59:23 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=9e401d55

app-emulation/wine-staging: Bump to 3.3

There were no staging releases between 2.21 and 3.3 exclusive

Closes: https://bugs.gentoo.org/647970
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-3.3.ebuild | 608 +
 2 files changed, 610 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index beeca5c..189dded 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -21,6 +21,7 @@ DIST wine-2.6.tar.xz 19023352 BLAKE2B 
f74e2b9588eba76cd90ea62842725ddbb8d3233160
 DIST wine-2.7.tar.xz 19101108 BLAKE2B 
cf5ff292ada8b65498098269b5961dc8f5c412cab4fa781ce356df869eea9f5af641bd98957977a16b14dc00af4fadf57bba9320cdf5824aab3d3bbb0c87e8ab
 SHA512 
1e61b9a4aa1f5f42fb27d11d5254a9ba90f348ad9c4d1ddd4b5da47cd7de638290a20accf7447db9c0e4ced4c2144497cdf5fc906a5eac60e923dabb61f65d3a
 DIST wine-2.8.tar.xz 19120740 BLAKE2B 
6d6a7eb0a30a654337ede94d358bb9d477ce5162d9b50efc8ca75e6b143b638eca916f77e120cd35e632fbdfc7cf036f67132d19db86d8d5c6340b9ac18afee5
 SHA512 
4d0b167b1e5add31ed0ed05b328d16fc13cd268285c03a9100e7ddc53864aa07f6b216a555ef0c2e51dee550e3f4abf0c7c20db2cbca177bb38e8c3e11f05b97
 DIST wine-2.9.tar.xz 19154668 BLAKE2B 
45961ad031404a4cba8733bbbfe34ac1db361a508deca45e81938b25be0ed1b59e7fa9c9619bcfecce540b0c96e57cee75c6a98a144fbff6e91fa72af55ece94
 SHA512 
6d06e511d8f338297ed0ddb7bf2ffb501f528209eaecbbee3d4e5d53db649dd5ea0aeb78bba661a9bcfda5f97e170ca10eb8fab355e229bfe7db6a5feb7ec4e8
+DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-2.1.tar.gz 10101781 BLAKE2B 
6cbbc4bf2eec6416e7a9a128994dc53fbde6dd62fabdd94df6f675a395c9c7c5d22b2971d254bfb900b3f4cf727c9057c0cd912f1c256bc3b74a295386d420d5
 SHA512 
c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db
 DIST wine-staging-2.10.tar.gz 10091114 BLAKE2B 
e30bfdee83eead61ced3d6fc4cb1b6089b647a398737bfacf2da4c78e0c3c4ce9c5e5fc0f5a808ff8a6e7553f27e6a65ce4f236e6957753bd0fa706f7b71a30b
 SHA512 
c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7
@@ -43,3 +44,4 @@ DIST wine-staging-2.6.tar.gz 10034709 BLAKE2B 
54c0e3462648edf8418fbb43f0986b5585
 DIST wine-staging-2.7.tar.gz 10018082 BLAKE2B 
47e572c1cc9e7b458afbc64bac3fc847b5d85aec0ddc6260374ec5aa10e8bac1aa1d609963a8ef8818d45fe3ddc1e84c6f6d374f995e748739bebfc9305b9215
 SHA512 
0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee
 DIST wine-staging-2.8.tar.gz 10043842 BLAKE2B 
bb11179d711b07289bf589287700bd8ba5c27f6d99c144f0704e7212211e9fb2e03a2eb6d0d5c664114485e337de291e5fc6885778cdcc45b40c8266d344b703
 SHA512 
af1707fe3119664a0d97d94fc4c955612d80cb76eae8c4248a268c0f6be9e659fccf7c26899c9e9ae5822f74474c0db5283b598dd4d9d69a3b108f947653217a
 DIST wine-staging-2.9.tar.gz 10062408 BLAKE2B 
1e5edd60cf944cac97948020f5730ce466f4770a2ea17bdbbc47c97d14c17007555c2113bc352c91aa31da4a8b7c7097881c9d5f0d5e4a05d6a3245ecbae6db6
 SHA512 
7862a403817791c54c5c1b8f233b06a850500305c46283bccb9026fb6db041a8fba619d145ab21fe2fdc5f25ed3bbb75fde05245fbbbd67139a5f64b547b1196
+DIST wine-staging-3.3.tar.gz 10136486 BLAKE2B 
ea64e19fe987125bcdb0c5281e389574fe300225adc62eaff9be4f751642fba863acd4580e80e041fb4d4881f7861a4c093944abeca3a1a786b713278f5bf6d5
 SHA512 
02d48a9c403b93d01ca37b74af5dc81f86e49c72d67f194c71ccebd4556fa72c473728a1b1f9d5325c6f85f4e41bb7072a1183a2d81cafae00dc53d12166

diff --git a/app-emulation/wine-staging/wine-staging-3.3.ebuild 
b/app-emulation/wine-staging/wine-staging-3.3.ebuild
new file mode 100644
index 000..7ba4e02
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.3.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl 

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 410f7ce83383578d225e5e8d7969f99d71198ce0
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:39:04 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:59:42 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=410f7ce8

app-emulation/wine-staging: Bump to 3.5

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-3.5.ebuild | 608 +
 2 files changed, 610 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index ff03a8c..e675204 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -23,6 +23,7 @@ DIST wine-2.8.tar.xz 19120740 BLAKE2B 
6d6a7eb0a30a654337ede94d358bb9d477ce5162d9
 DIST wine-2.9.tar.xz 19154668 BLAKE2B 
45961ad031404a4cba8733bbbfe34ac1db361a508deca45e81938b25be0ed1b59e7fa9c9619bcfecce540b0c96e57cee75c6a98a144fbff6e91fa72af55ece94
 SHA512 
6d06e511d8f338297ed0ddb7bf2ffb501f528209eaecbbee3d4e5d53db649dd5ea0aeb78bba661a9bcfda5f97e170ca10eb8fab355e229bfe7db6a5feb7ec4e8
 DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
 DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
+DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-2.1.tar.gz 10101781 BLAKE2B 
6cbbc4bf2eec6416e7a9a128994dc53fbde6dd62fabdd94df6f675a395c9c7c5d22b2971d254bfb900b3f4cf727c9057c0cd912f1c256bc3b74a295386d420d5
 SHA512 
c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db
 DIST wine-staging-2.10.tar.gz 10091114 BLAKE2B 
e30bfdee83eead61ced3d6fc4cb1b6089b647a398737bfacf2da4c78e0c3c4ce9c5e5fc0f5a808ff8a6e7553f27e6a65ce4f236e6957753bd0fa706f7b71a30b
 SHA512 
c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7
@@ -47,3 +48,4 @@ DIST wine-staging-2.8.tar.gz 10043842 BLAKE2B 
bb11179d711b07289bf589287700bd8ba5
 DIST wine-staging-2.9.tar.gz 10062408 BLAKE2B 
1e5edd60cf944cac97948020f5730ce466f4770a2ea17bdbbc47c97d14c17007555c2113bc352c91aa31da4a8b7c7097881c9d5f0d5e4a05d6a3245ecbae6db6
 SHA512 
7862a403817791c54c5c1b8f233b06a850500305c46283bccb9026fb6db041a8fba619d145ab21fe2fdc5f25ed3bbb75fde05245fbbbd67139a5f64b547b1196
 DIST wine-staging-3.3.tar.gz 10136486 BLAKE2B 
ea64e19fe987125bcdb0c5281e389574fe300225adc62eaff9be4f751642fba863acd4580e80e041fb4d4881f7861a4c093944abeca3a1a786b713278f5bf6d5
 SHA512 
02d48a9c403b93d01ca37b74af5dc81f86e49c72d67f194c71ccebd4556fa72c473728a1b1f9d5325c6f85f4e41bb7072a1183a2d81cafae00dc53d12166
 DIST wine-staging-3.4.tar.gz 10117160 BLAKE2B 
f5a15718732afe25c92d3b245d270db4e161fc755fe50d83f9646d0dcdf076ea91af3955c35e8f8a08648e860c74cc59ba0adc8c626290e48e4f21bf41374a45
 SHA512 
f0cc2b3d91589a4d9536c1011001edf7db428387592407a64949381c0ac2f0bb79b0fbf04d3c85db50adbecba716188a8249e1ff166b5ec3004d9eb5f9e92f3f
+DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B 
b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5
 SHA512 
39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c

diff --git a/app-emulation/wine-staging/wine-staging-3.5.ebuild 
b/app-emulation/wine-staging/wine-staging-3.5.ebuild
new file mode 100644
index 000..7ba4e02
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.5.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools e

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 20eab1b8686215c5e91def5e30271e5df9aff1e3
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:41:02 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:59:42 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=20eab1b8

app-emulation/wine-staging: Bump to 3.7

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-staging/Manifest|   2 +
 app-emulation/wine-staging/wine-staging-3.7.ebuild | 608 +
 2 files changed, 610 insertions(+)

diff --git a/app-emulation/wine-staging/Manifest 
b/app-emulation/wine-staging/Manifest
index dda7564..bfff574 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -25,6 +25,7 @@ DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d
 DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
+DIST wine-3.7.tar.xz 20454036 BLAKE2B 
04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d
 SHA512 
a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 
1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960
 SHA512 
51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
 DIST wine-staging-2.1.tar.gz 10101781 BLAKE2B 
6cbbc4bf2eec6416e7a9a128994dc53fbde6dd62fabdd94df6f675a395c9c7c5d22b2971d254bfb900b3f4cf727c9057c0cd912f1c256bc3b74a295386d420d5
 SHA512 
c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db
 DIST wine-staging-2.10.tar.gz 10091114 BLAKE2B 
e30bfdee83eead61ced3d6fc4cb1b6089b647a398737bfacf2da4c78e0c3c4ce9c5e5fc0f5a808ff8a6e7553f27e6a65ce4f236e6957753bd0fa706f7b71a30b
 SHA512 
c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7
@@ -51,3 +52,4 @@ DIST wine-staging-3.3.tar.gz 10136486 BLAKE2B 
ea64e19fe987125bcdb0c5281e389574fe
 DIST wine-staging-3.4.tar.gz 10117160 BLAKE2B 
f5a15718732afe25c92d3b245d270db4e161fc755fe50d83f9646d0dcdf076ea91af3955c35e8f8a08648e860c74cc59ba0adc8c626290e48e4f21bf41374a45
 SHA512 
f0cc2b3d91589a4d9536c1011001edf7db428387592407a64949381c0ac2f0bb79b0fbf04d3c85db50adbecba716188a8249e1ff166b5ec3004d9eb5f9e92f3f
 DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B 
b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5
 SHA512 
39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
 DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 
9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895
 SHA512 
839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
+DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 
3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5
 SHA512 
4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14

diff --git a/app-emulation/wine-staging/wine-staging-3.7.ebuild 
b/app-emulation/wine-staging/wine-staging-3.7.ebuild
new file mode 100644
index 000..7ba4e02
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-3.7.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools est

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

[Nick Sarnie]

commit: 479766b5a174ed233a787e200949bfc3408f5389
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 02:14:17 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 02:16:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=479766b5

app-emulation/wine-staging: Sync with ::gentoo

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../wine-staging/wine-staging-2.0-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.1-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.10-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.11-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.12-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.13-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.14-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.15-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.16-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.17-r1.ebuild   | 24 ++
 .../wine-staging/wine-staging-2.18.ebuild  | 24 ++
 .../wine-staging/wine-staging-2.19.ebuild  | 24 ++
 .../wine-staging/wine-staging-2.2-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.20.ebuild  | 24 ++
 .../wine-staging/wine-staging-2.21.ebuild  | 24 ++
 .../wine-staging/wine-staging-2.3-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.4-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.5-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.6-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.7-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.8-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-2.9-r1.ebuild| 24 ++
 .../wine-staging/wine-staging-.ebuild  | 24 ++
 23 files changed, 46 insertions(+), 506 deletions(-)

diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index 22f656f..2eb9fbd 100644
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -113,22 +113,6 @@ COMMON_DEPEND="
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
-   )
-   abi_x86_32? (
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   !=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
-   X? (
-   x11-proto/inputproto
-   x11-proto/xextproto
-   x11-proto/xf86vidmodeproto
-   )
+   X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
-   xinerama? ( x11-proto/xineramaproto )"
+   xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu

diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
index 57930a0..f046389 100644
--- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
@@ -113,22 +113,6 @@ COMMON_DEPEND="
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
-   )
-   abi_x86_32? (
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   !=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
-   X? (
-   x11-proto/inputproto
-   x11-proto/xextproto
-   x11-proto/xf86vidmodeproto
-   )
+   X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
-   xinerama? ( x11-proto/xineramaproto )"
+   xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu

diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
index 95e9e2e..8aaef30 100644
--- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
@@ -114,22 +114,6 @@ COMMON_DEPEND="
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
-  

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

[Lars Wendler]

commit: 386007da3c3f8b904dfeab74ab2b3bb825b1bad6
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 30 02:54:32 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 30 02:54:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386007da

app-arch/xz-utils: Bumped live ebuild to EAPI-6.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-arch/xz-utils/xz-utils-.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index e770562d7a4..a58675ea9d0 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -4,9 +4,9 @@
 # Remember: we cannot leverage autotools in this ebuild in order
 #   to avoid circular deps with autotools
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://git.tukaani.org/xz.git";
@@ -16,8 +16,9 @@ if [[ ${PV} == "" ]] ; then
 else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz";
+   [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-   S=${WORKDIR}/${MY_P}
+   S="${WORKDIR}/${MY_P}"
EXTRA_DEPEND=
 fi
 
@@ -39,6 +40,7 @@ DEPEND="${RDEPEND}
 RESTRICT="!extra-filters? ( test )"
 
 src_prepare() {
+   default
if [[ ${PV} == "" ]] ; then
eautopoint
eautoreconf
@@ -77,9 +79,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-   prune_libtool_files --all
-   rm "${ED}"/usr/share/doc/xz/COPYING* || die
-   mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+   find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+   rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
 }
 
 pkg_preinst() {

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

[Lars Wendler]

commit: a967158100c3c3ecb3f6b281904c841bb6948cee
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 30 02:58:28 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 30 02:58:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9671581

app-arch/xz-utils: Bump to version 5.2.4

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-arch/xz-utils/Manifest  |  1 +
 app-arch/xz-utils/xz-utils-5.2.4.ebuild | 92 +
 2 files changed, 93 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 6af887311e1..06b5a4038fe 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,2 +1,3 @@
 DIST xz-5.2.2.tar.gz 1464228 BLAKE2B 
aea079d094ad23e305eb273c4b126816d36ec3b92e6d626bdf6cb6903bb49183c764b97a85eda52dfe5fb5ebc9bb87913a8caa0523a00acc2d2f4edf70b1418f
 SHA512 
8d6249f93c5c43e1c8eeb21f93b22330fd54575e20bbb4af3d06721192d9f0ca3351878964c9640238ac410b7dd9f16329793c7be7355c7ca0db92c6db6ab813
 DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 
470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078
 SHA512 
a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
+DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 
877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b
 SHA512 
e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578

diff --git a/app-arch/xz-utils/xz-utils-5.2.4.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.4.ebuild
new file mode 100644
index 000..a58675ea9d0
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=6
+
+inherit multilib toolchain-funcs libtool multilib-minimal
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://git.tukaani.org/xz.git";
+   inherit git-r3 autotools
+   SRC_URI=""
+   EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" 
#272880 286068
+else
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz";
+   [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+   S="${WORKDIR}/${MY_P}"
+   EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/";
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
+
+RDEPEND="!

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

[Zac Medico]

commit: c77afbc31fa687cc612a6f946b324bf4d74d8175
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 30 01:49:18 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 30 02:14:41 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c77afbc3

EventLoop: call add_reader/writer callbacks after pipe is closed (bug 654382)

Callbacks registered via add_reader/writer methods need to be called
when the other end of a pipe is closed, which does not result in a
normal read or write event. Therefore, respond to other event types
as well, for compatibility with the asyncio event loop implementation.

The included unit tests demonstrate asyncio compatible behavior for
both reader and writer callbacks.

Bug: https://bugs.gentoo.org/654382

 .../tests/util/futures/asyncio/test_pipe_closed.py | 133 +
 pym/portage/util/_eventloop/EventLoop.py   |   7 +-
 2 files changed, 138 insertions(+), 2 deletions(-)

diff --git a/pym/portage/tests/util/futures/asyncio/test_pipe_closed.py 
b/pym/portage/tests/util/futures/asyncio/test_pipe_closed.py
new file mode 100644
index 0..1ecddab78
--- /dev/null
+++ b/pym/portage/tests/util/futures/asyncio/test_pipe_closed.py
@@ -0,0 +1,133 @@
+# Copyright 2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+import errno
+import os
+import pty
+import shutil
+import socket
+import sys
+import tempfile
+
+from portage.tests import TestCase
+from portage.util.futures import asyncio
+from portage.util.futures.unix_events import (
+   DefaultEventLoopPolicy,
+   _set_nonblocking,
+)
+
+
+class _PipeClosedTestCase(object):
+
+   def test_pipe(self):
+   read_end, write_end = os.pipe()
+   self._do_test(read_end, write_end)
+
+   def test_pty_device(self):
+   try:
+   read_end, write_end = pty.openpty()
+   except EnvironmentError:
+   self.skipTest('pty not available')
+   self._do_test(read_end, write_end)
+
+   def test_domain_socket(self):
+   if sys.version_info >= (3, 2):
+   read_end, write_end = socket.socketpair()
+   else:
+   self.skipTest('socket detach not supported')
+   self._do_test(read_end.detach(), write_end.detach())
+
+   def test_named_pipe(self):
+   tempdir = tempfile.mkdtemp()
+   try:
+   fifo_path = os.path.join(tempdir, 'fifo')
+   os.mkfifo(fifo_path)
+   self._do_test(os.open(fifo_path, 
os.O_NONBLOCK|os.O_RDONLY),
+   os.open(fifo_path, os.O_NONBLOCK|os.O_WRONLY))
+   finally:
+   shutil.rmtree(tempdir)
+
+
+class ReaderPipeClosedTestCase(_PipeClosedTestCase, TestCase):
+   """
+   Test that a reader callback is called after the other end of
+   the pipe has been closed.
+   """
+   def _do_test(self, read_end, write_end):
+   initial_policy = asyncio.get_event_loop_policy()
+   if not isinstance(initial_policy, DefaultEventLoopPolicy):
+   asyncio.set_event_loop_policy(DefaultEventLoopPolicy())
+
+   loop = asyncio.get_event_loop()
+   read_end = os.fdopen(read_end, 'rb', 0)
+   write_end = os.fdopen(write_end, 'wb', 0)
+   try:
+   def reader_callback():
+   if not reader_callback.called.done():
+   reader_callback.called.set_result(None)
+
+   reader_callback.called = loop.create_future()
+   loop.add_reader(read_end.fileno(), reader_callback)
+
+   # Allow the loop to check for IO events, and assert
+   # that our future is still not done.
+   loop.run_until_complete(asyncio.sleep(0, loop=loop))
+   self.assertFalse(reader_callback.called.done())
+
+   # Demonstrate that the callback is called afer the
+   # other end of the pipe has been closed.
+   write_end.close()
+   loop.run_until_complete(reader_callback.called)
+   finally:
+   loop.remove_reader(read_end.fileno())
+   write_end.close()
+   read_end.close()
+   asyncio.set_event_loop_policy(initial_policy)
+
+
+class WriterPipeClosedTestCase(_PipeClosedTestCase, TestCase):
+   """
+   Test that a writer callback is called after the other end of
+   the pipe has been closed.
+   """
+   def _do_test(self, read_end, write_end):
+   initial_policy = asyncio.get_event_loop_policy()
+   if not isinstance(initial_policy, DefaultEven

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

[Nick Sarnie]

commit: 3bc035bf6325e4780f69e69985dc1d4f0b37cdec
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 01:38:55 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:56:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc035bf

profiles/arch/base: Add USE mask for app-emulation/wine-vanilla[vulkan]

 profiles/arch/base/package.use.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/arch/base/package.use.mask 
b/profiles/arch/base/package.use.mask
index 6786118cca0..2193850a95a 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Nick Sarnie  (29 Apr 2018)
+# media-libs/vulkan-loader is not available everywhere
+app-emulation/wine-vanilla vulkan
+
 # Richard Yao  (16 Apr 2018)
 # sys-fs/zfs is not available everywhere.
 sys-cluster/ceph zfs

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

[Nick Sarnie]

commit: 0a4a2ce6f0d3d7650bd866980b177f5f8ac18f36
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 01:41:37 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:56:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4a2ce6

profiles/arch/amd64: Unmask app-emulation/wine-vanilla[vulkan] on amd64

 profiles/arch/amd64/package.use.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index d41611604ae..27a1998dba7 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Nick Sarnie  (29 Apr 2018)
+# media-libs/vulkan-loader is keyworded on amd64
+app-emulation/wine-vanilla -vulkan
+
 # Richard Yao  (16 Apr 2018)
 # sys-fs/zfs is keyworded on amd64
 sys-cluster/ceph -zfs

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

[Nick Sarnie]

commit: 43c1e51f4c9570c8d401606e77ec8292ae0bb4ba
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 01:54:19 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:56:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c1e51f

app-emulation/wine-vanilla: Sync with ::wine

Bump to 3.5, 3.6, 3.7 and add sdl USE

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest   | 3 +++
 app-emulation/wine-vanilla/metadata.xml   | 1 +
 .../{wine-vanilla-.ebuild => wine-vanilla-3.5.ebuild} | 4 +++-
 .../{wine-vanilla-.ebuild => wine-vanilla-3.6.ebuild} | 4 +++-
 .../{wine-vanilla-.ebuild => wine-vanilla-3.7.ebuild} | 4 +++-
 app-emulation/wine-vanilla/wine-vanilla-.ebuild   | 4 +++-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 340f61e758a..5e0453c1e0f 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -10,3 +10,6 @@ DIST wine-2.22.tar.xz 19635032 BLAKE2B 
30534fb37ee0fe7b9f20309797240e461f14bc09e
 DIST wine-3.0.tar.xz 19712932 BLAKE2B 
4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6
 SHA512 
a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a
 DIST wine-3.1.tar.xz 19730700 BLAKE2B 
287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650
 SHA512 
49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545
 DIST wine-3.2.tar.xz 19793180 BLAKE2B 
014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da
 SHA512 
94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df22f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092
+DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
+DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
+DIST wine-3.7.tar.xz 20454036 BLAKE2B 
04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d
 SHA512 
a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index f0d3a46c5a7..78e364679eb 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -36,6 +36,7 @@ This variant of the Wine packaging does not include external 
patchsets
Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing
+   Add support for gamepad detection using 
SDL
Use virtual/libudev to provide 
plug and play support
Enable Vulkan drivers


diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
similarity index 98%
copy from app-emulation/wine-vanilla/wine-vanilla-.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
index 62ef97c197e..9bebca2da60 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux 
+ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama 
+xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truety

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

[Nick Sarnie]

commit: 6f4ea4556bbefe552b5945486ceb800e23790048
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Apr 30 01:55:58 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:56:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4ea455

app-emulation/wine-vanilla: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest|   5 -
 .../wine-vanilla/wine-vanilla-2.20.ebuild  | 525 
 .../wine-vanilla/wine-vanilla-2.21.ebuild  | 525 
 .../wine-vanilla/wine-vanilla-2.22.ebuild  | 525 
 app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild | 527 -
 app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild | 527 -
 6 files changed, 2634 deletions(-)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 5e0453c1e0f..fdc29151759 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,12 +4,7 @@ DIST wine-2.0.2.tar.xz 18854952 BLAKE2B 
ae55b6a31e4d36b367a84e0e5fa7bea8c39a61ec
 DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 
0503a11e7545d5af805bfc3c2f614b6e35e39b7b532ee45dd9947e1a9a53eb788a304e744c683e42bf84f0e67e2c046ea5f839b6bbad1cf73b9996eaae5c30c1
 SHA512 
e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb
 DIST wine-2.0.4.tar.xz 18898148 BLAKE2B 
a21c920e1cf15e064bc6b37067a11a5568f8d1906783c200236456b73947bbd24212208ab1bcc2ca526ed40d8b2e80a2dc5d95db1a8d356a484213afb6897f59
 SHA512 
8fccb93e5ebe482ed81e948e3b7f87d4fe5b1f838a10f9cdcafa9561de4ef54b7d5acdc292bf28ad3aaf44be34c5ad8452ebbfc39f49f95fcbe9f9d0fcfc862c
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 
1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5
 SHA512 
b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
-DIST wine-2.20.tar.xz 19597556 BLAKE2B 
80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5
 SHA512 
d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
-DIST wine-2.21.tar.xz 19620888 BLAKE2B 
26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e
 SHA512 
4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43
-DIST wine-2.22.tar.xz 19635032 BLAKE2B 
30534fb37ee0fe7b9f20309797240e461f14bc09ef1927e2c03e16cb136b83031ff186d29cc1092600ac53ede9533d0ddad6d4312e501e97201b0c632fedaae5
 SHA512 
14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb
 DIST wine-3.0.tar.xz 19712932 BLAKE2B 
4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6
 SHA512 
a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a
-DIST wine-3.1.tar.xz 19730700 BLAKE2B 
287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650
 SHA512 
49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545
-DIST wine-3.2.tar.xz 19793180 BLAKE2B 
014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da
 SHA512 
94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df22f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 
04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d
 SHA512 
a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
deleted

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: 59d899fc13c70ec1194dea0e9573abde359af121
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:49:13 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=59d899fc

app-emulation/wine-vanilla: Bump to 3.3

Closes: https://bugs.gentoo.org/654164

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild | 529 +
 2 files changed, 530 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index a4c540a..d8cab25 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -29,3 +29,4 @@ DIST wine-2.9.tar.xz 19154668 BLAKE2B 
45961ad031404a4cba8733bbbfe34ac1db361a508d
 DIST wine-3.0.tar.xz 19712932 BLAKE2B 
4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6
 SHA512 
a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a
 DIST wine-3.1.tar.xz 19730700 BLAKE2B 
287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650
 SHA512 
49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545
 DIST wine-3.2.tar.xz 19793180 BLAKE2B 
014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da
 SHA512 
94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df22f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092
+DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild
new file mode 100644
index 000..9bebca2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.3.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+   SRC_URI=""
+   #KEYWORDS=""
+else
+   MAJOR_V=$(get_version_component_range 1)
+   SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+   KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="https://www.winehq.org/";
+SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite 
xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+   X? ( truetype )
+   elibc_glibc? ( threads )
+   osmesa? ( opengl )
+   test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+   X? (
+   x11-libs/libXcursor[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXfixes[${MULTILIB_USEDEP}]
+   x11-libs/libXrandr[${MULTILIB_USEDEP}]
+   x11-libs/libXi[${MULTILIB_USEDEP}]
+   x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+   )
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+   cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: c95d8a238fc88e2e2ee647e6a0cd17179ea46b15
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:50:38 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c95d8a23

app-emulation/wine-vanilla: Bump to 3.4

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild | 529 +
 2 files changed, 530 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index d8cab25..ad9a2c7 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -30,3 +30,4 @@ DIST wine-3.0.tar.xz 19712932 BLAKE2B 
4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6
 DIST wine-3.1.tar.xz 19730700 BLAKE2B 
287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650
 SHA512 
49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545
 DIST wine-3.2.tar.xz 19793180 BLAKE2B 
014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da
 SHA512 
94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df22f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092
 DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
+DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild
new file mode 100644
index 000..9bebca2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.4.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+   SRC_URI=""
+   #KEYWORDS=""
+else
+   MAJOR_V=$(get_version_component_range 1)
+   SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+   KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="https://www.winehq.org/";
+SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite 
xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+   X? ( truetype )
+   elibc_glibc? ( threads )
+   osmesa? ( opengl )
+   test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+   X? (
+   x11-libs/libXcursor[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXfixes[${MULTILIB_USEDEP}]
+   x11-libs/libXrandr[${MULTILIB_USEDEP}]
+   x11-libs/libXi[${MULTILIB_USEDEP}]
+   x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+   )
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+   cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+   gphoto2? ( media-libs/libgphoto2:

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: 76e0e536ec881b35bc8fcd496c123331771d0536
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:18:04 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:18 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=76e0e536

app-emulation/wine-vanilla: Sync with ::gentoo

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../wine-vanilla/wine-vanilla-2.0-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.0.1-r1.ebuild  | 24 ++
 .../wine-vanilla/wine-vanilla-2.0.2-r1.ebuild  | 24 ++
 .../wine-vanilla/wine-vanilla-2.0.3.ebuild | 24 ++
 .../wine-vanilla/wine-vanilla-2.0.4.ebuild | 24 ++
 .../wine-vanilla/wine-vanilla-2.1-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.10-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.11-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.12-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.13-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.14-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.15-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.16-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.17-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.18-r2.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.19-r1.ebuild   | 24 ++
 .../wine-vanilla/wine-vanilla-2.2-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.20.ebuild  | 24 ++
 .../wine-vanilla/wine-vanilla-2.21.ebuild  | 24 ++
 .../wine-vanilla/wine-vanilla-2.22.ebuild  | 24 ++
 .../wine-vanilla/wine-vanilla-2.3-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.4-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.5-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.6-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.7-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.8-r1.ebuild| 24 ++
 .../wine-vanilla/wine-vanilla-2.9-r1.ebuild| 24 ++
 app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild | 24 ++
 app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild | 24 ++
 app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild | 24 ++
 .../wine-vanilla/wine-vanilla-.ebuild  | 24 ++
 31 files changed, 62 insertions(+), 682 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
index b6970b1..44f1a68 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
-   )
-   abi_x86_32? (
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   !=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
-   X? (
-   x11-proto/inputproto
-   x11-proto/xextproto
-   x11-proto/xf86vidmodeproto
-   )
+   X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
-   xinerama? ( x11-proto/xineramaproto )"
+   xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-merged/wine.menu

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
index f19e2fe..203ac31 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
xml? (
dev-libs/libxml2[${MULTILIB_USEDEP}]
dev-libs/libxslt[${MULTILIB_USEDEP}]
-   )
-   abi_x86_32? (
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   !=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
-   X? (
-   x11-proto/inputproto
-   x11-proto/xextproto
-   x11-proto/xf86vidmodeproto
-   )
+   X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
-   xinerama? ( x11-proto/xineramaproto )"
+   xinerama? ( x11-base/xorg-proto )"
 
 # These use a non-standard "Wine" category, which is provided by
 # /etc/xdg/applications-mer

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: 778ce9667656d2d7dbb4746624e92192b7ef2c12
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:53:25 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=778ce966

app-emulation/wine-vanilla: Bump to 3.6

Closes: https://bugs.gentoo.org/653784
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild | 529 +
 2 files changed, 530 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index 067d894..f0dc9f6 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -32,3 +32,4 @@ DIST wine-3.2.tar.xz 19793180 BLAKE2B 
014256734f4c1d70c81115ba6c470f8264746b57be
 DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
 DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
+DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild
new file mode 100644
index 000..9bebca2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+   SRC_URI=""
+   #KEYWORDS=""
+else
+   MAJOR_V=$(get_version_component_range 1)
+   SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+   KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="https://www.winehq.org/";
+SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite 
xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+   X? ( truetype )
+   elibc_glibc? ( threads )
+   osmesa? ( opengl )
+   test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+   X? (
+   x11-libs/libXcursor[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXfixes[${MULTILIB_USEDEP}]
+   x11-libs/libXrandr[${MULTILIB_USEDEP}]
+   x11-libs/libXi[${MULTILIB_USEDEP}]
+   x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+   )
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+   cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ 

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: 7df3b0ee3fe66f4916938d3051565dee1ee34120
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:54:44 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=7df3b0ee

app-emulation/wine-vanilla: Bump to 3.7

Closes: https://bugs.gentoo.org/652696
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild | 529 +
 2 files changed, 530 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index f0dc9f6..3e60b61 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -33,3 +33,4 @@ DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d
 DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
 DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 
6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71
 SHA512 
31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
+DIST wine-3.7.tar.xz 20454036 BLAKE2B 
04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d
 SHA512 
a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild
new file mode 100644
index 000..9bebca2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+   SRC_URI=""
+   #KEYWORDS=""
+else
+   MAJOR_V=$(get_version_component_range 1)
+   SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+   KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="https://www.winehq.org/";
+SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite 
xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+   X? ( truetype )
+   elibc_glibc? ( threads )
+   osmesa? ( opengl )
+   test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+   X? (
+   x11-libs/libXcursor[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXfixes[${MULTILIB_USEDEP}]
+   x11-libs/libXrandr[${MULTILIB_USEDEP}]
+   x11-libs/libXi[${MULTILIB_USEDEP}]
+   x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+   )
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+   cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ 

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: 9522a4e1efc4cfaa154bf7c644380ce0817dfa8a
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:52:02 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=9522a4e1

app-emulation/wine-vanilla: Bump to 3.5

Bug: https://bugs.gentoo.org/652696
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/Manifest|   1 +
 app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild | 529 +
 2 files changed, 530 insertions(+)

diff --git a/app-emulation/wine-vanilla/Manifest 
b/app-emulation/wine-vanilla/Manifest
index ad9a2c7..067d894 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -31,3 +31,4 @@ DIST wine-3.1.tar.xz 19730700 BLAKE2B 
287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dff
 DIST wine-3.2.tar.xz 19793180 BLAKE2B 
014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da
 SHA512 
94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df22f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092
 DIST wine-3.3.tar.xz 19891048 BLAKE2B 
be77224e7add585f6bba77f436faa8bc9da4f4416d07e2fc67e29d5f9553b03ae8cef12fcb8dee917d84bb5a1c66af16d3140b17b195f2db58464ffe86ff7d9e
 SHA512 
c9e4c75e94d745837208bf877b19c4e4e46df1e78082d21e716f52c9f9d93eaabbec8bf34783cda68e4275f53e37929b81ac128e5b8a13c1e5035223b2621d6a
 DIST wine-3.4.tar.xz 19932472 BLAKE2B 
8cac5d2c8b3cfb7377f8c3b0aaac6326afd1bda5a9203c9705ea473c43483475d80b23a53e40f2c17af256f523ad759525701b20ac8d600b662b34845ea9414b
 SHA512 
5787bf3fa13d363302ee26f86b96ed728b2b06184572021efdbb00b2c8ebd088056c6d9e22c6c78f0edc0a0b12e26fa51f08970c8c5eaab4309e86b4286c
+DIST wine-3.5.tar.xz 19963436 BLAKE2B 
83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f
 SHA512 
c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
new file mode 100644
index 000..9bebca2
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib 
multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://source.winehq.org/git/wine.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+   SRC_URI=""
+   #KEYWORDS=""
+else
+   MAJOR_V=$(get_version_component_range 1)
+   SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+   KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external 
patchsets"
+HOMEPAGE="https://www.winehq.org/";
+SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite 
xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+   X? ( truetype )
+   elibc_glibc? ( threads )
+   osmesa? ( opengl )
+   test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+   X? (
+   x11-libs/libXcursor[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libXfixes[${MULTILIB_USEDEP}]
+   x11-libs/libXrandr[${MULTILIB_USEDEP}]
+   x11-libs/libXi[${MULTILIB_USEDEP}]
+   x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+   )
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+   cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+   fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/

[Nick Sarnie]

commit: d1a1ccb8ea5f5ef3c1e64b9223b3a95f94733ae5
Author: Nick Sarnie  gentoo  org>
AuthorDate: Sat Apr 28 18:24:49 2018 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Apr 30 01:31:19 2018 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d1a1ccb8

app-emulation/wine-vanilla: Add sdl USE flag to 

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-emulation/wine-vanilla/metadata.xml | 1 +
 app-emulation/wine-vanilla/wine-vanilla-.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index f0d3a46..78e3646 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -36,6 +36,7 @@ This variant of the Wine packaging does not include external 
patchsets
Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing
+   Add support for gamepad detection using 
SDL
Use virtual/libudev to provide 
plug and play support
Enable Vulkan drivers


diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 62ef97c..9bebca2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux 
+ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama 
+xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD 
+lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss 
+perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl 
selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite 
xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -86,6 +86,7 @@ COMMON_DEPEND="
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+   sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
@@ -396,6 +397,7 @@ multilib_src_configure() {
$(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
+   $(use_with sdl)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)

[gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/, app-misc/mosquitto/files/

[Thomas Deutschmann]

commit: a10e73daa7b72d562e006beb77817712dbb606e5
Author: Lucas Ramage  openmailbox  org>
AuthorDate: Thu Apr 26 17:19:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr 30 01:26:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10e73da

app-misc/mosquitto: fix conditional tests for v1.4.15

Closes: https://bugs.gentoo.org/650632
Closes: https://bugs.gentoo.org/653238
Closes: https://github.com/gentoo/gentoo/pull/8027
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/mosquitto-1.4.15-conditional-tests.patch |  12 +++
 app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild  | 102 +
 2 files changed, 114 insertions(+)

diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch 
b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
new file mode 100644
index 000..1642597c562
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
@@ -0,0 +1,12 @@
+--- a/test/broker/c/Makefile   2016-02-14 14:36:55.0 +
 b/test/broker/c/Makefile   2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+   $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+ 
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
++ifeq ($(WITH_BRIDGE),yes)
+   $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
++endif
+ 
+ 
+ reallyclean : clean

diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild 
b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
new file mode 100644
index 000..48165a4db6f
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/";
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz";
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+   ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   srv? ( net-dns/c-ares )
+   websockets? ( net-libs/libwebsockets )"
+
+PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
+
+_emake() {
+   LIBDIR=$(get_libdir)
+   emake \
+   CC="$(tc-getCC)" \
+   LIB_SUFFIX="${LIBDIR:3}" \
+   WITH_BRIDGE="$(usex bridge)" \
+   WITH_PERSISTENCE="$(usex persistence)" \
+   WITH_SRV="$(usex srv)" \
+   WITH_TLS="$(usex ssl)" \
+   WITH_WEBSOCKETS="$(usex websockets)" \
+   WITH_WRAP="$(usex tcpd)" \
+   "$@"
+}
+
+pkg_setup() {
+   enewgroup mosquitto
+   enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+   default
+   if use persistence; then
+   sed -i -e "/^#autosave_interval/s|^#||" \
+   -e "s|^#persistence false$|persistence true|" \
+   -e "/^#persistence_file/s|^#||" \
+   -e "s|#persistence_location|persistence_location 
/var/lib/mosquitto/|" \
+   mosquitto.conf || die
+   fi
+
+   # Remove prestripping
+   sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+   client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || 
die
+
+   python_setup
+   python_fix_shebang test
+}
+
+src_compile() {
+   _emake
+}
+
+src_test() {
+   _emake test
+}
+
+src_install() {
+   _emake DESTDIR="${D}" prefix=/usr install
+   keepdir /var/lib/mosquitto
+   fowners mosquitto:mosquitto /var/lib/mosquitto
+   dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+   doinitd "${FILESDIR}"/mosquitto
+   insinto /etc/mosquitto
+   doins mosquitto.conf
+   systemd_dounit "${FILESDIR}/mosquitto.service"
+
+   if use examples; then
+   docompress -x "/usr/share/doc/${PF}/examples"
+   docinto "/usr/share/doc/${PF}"
+   doins -r examples
+   fi
+}
+
+pkg_postinst() {
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   elog "The Python module has been moved out of mosquitto."
+   elog "See https://mosquitto.org/documentation/python/";
+   else
+   elog "To start the mosquitto daemon at boot, add it to the 
default runlevel with:"
+   elog ""
+   elog "rc-update add mosquitto default"
+   elog "or"
+   elog "systemctl enable mosquitto"
+   fi
+}

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

[Jeroen Roovers]

commit: e429c192cf08fe9703460bdc2c320d169d00d585
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Apr 30 00:54:58 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Apr 30 01:09:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e429c192

media-gfx/sane-backends: Stable for HPPA too.

Package-Manager: Portage-2.3.31, Repoman-2.3.9
RepoMan-Options: --ignore-arches

 media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild 
b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
index e1c3a204ab0..fe9c0b297e9 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
@@ -122,7 +122,7 @@ 
SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz";
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/subversion/

[Jeroen Roovers]

commit: d823124010f669fa21cbfa1faffb6f987efa2dc3
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Apr 30 01:06:24 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Apr 30 01:10:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8231240

dev-vcs/subversion: Mark ~hppa too.

Package-Manager: Portage-2.3.31, Repoman-2.3.9
RepoMan-Options: --ignore-arches

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

diff --git a/dev-vcs/subversion/subversion-1.10.0.ebuild 
b/dev-vcs/subversion/subversion-1.10.0.ebuild
index 03d3f4e32e7..ecc74c603f7 100644
--- a/dev-vcs/subversion/subversion-1.10.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http 
java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="

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

[Jeroen Roovers]

commit: eaf3a8710ec736d4c361cdb8ab6a347035d6ffb0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Apr 30 01:04:56 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Apr 30 01:09:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf3a871

dev-libs/libutf8proc: Mark ~hppa too.

Package-Manager: Portage-2.3.31, Repoman-2.3.9
RepoMan-Options: --ignore-arches

 dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild | 4 ++--
 dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild 
b/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild
index ec51a4851e2..944f03316ea 100644
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-1.3.1_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc"
 IUSE=""
 
 RDEPEND=""

diff --git a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild 
b/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
index 3f4c7dd5d1d..6815f6a7980 100644
--- a/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-1.3.1_p3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 RDEPEND=""

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

[Mike Gilbert]

commit: 4c2ceb5a8bb0b0c0ab86c2e431ad4c3822bb8c86
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr 30 00:49:27 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 30 00:49:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2ceb5a

profiles/package.mask: update chromium mask for M68

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

diff --git a/profiles/package.mask b/profiles/package.mask
index b9052fb3850..c0527bbead3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert  (30 Apr 2018)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-68
+
 # Aaron Bauman  (30 Apr 2018)
 # Masked for testing
 =dev-libs/libressl-2.7*
@@ -291,11 +296,6 @@ media-plugins/gst-plugins-mad:1.0
 # Bug 629682.
 =net-misc/asterisk-11.25.1
 
-# Mike Gilbert  (24 Mar 2018)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-67
-
 # Aaron W. Swenson  (22 Mar 2018)
 # EOL. No longer receives bug or security fixes. Recommended to update
 # to latest available.

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

[Mike Gilbert]

commit: 652ed59680cf172d04e88004f69c964bfc4c552a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr 30 00:39:25 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 30 00:39:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652ed596

www-plugins/chrome-binary-plugins: drop libwidevinecdmadapter.so ...

from the beta slot.

Closes: https://bugs.gentoo.org/654358
Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116

 .../chrome-binary-plugins-67.0.3396.18_beta.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.18_beta.ebuild
 
b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.18_beta.ebuild
index e94c35d4702..f2cb5723b3d 100644
--- 
a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.18_beta.ebuild
+++ 
b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.18_beta.ebuild
@@ -54,8 +54,7 @@ pkg_nofetch() {
 src_install() {
insinto /usr/$(get_libdir)/chromium
if use widevine; then
-   doins libwidevinecdm.so libwidevinecdmadapter.so
+   doins libwidevinecdm.so
dosym ../chromium/libwidevinecdm.so 
/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-   dosym ../chromium/libwidevinecdmadapter.so 
/usr/$(get_libdir)/chromium-browser/libwidevinecdmadapter.so
fi
 }

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

[Aaron Bauman]

commit: d6963c4fbbc2d63b8cf38e59f8d8beee282e84cd
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr 30 00:29:35 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 30 00:29:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6963c4f

package.mask: mask dev-libs/libressl-2.7* for testing

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

diff --git a/profiles/package.mask b/profiles/package.mask
index dd73b9b0dc1..b9052fb3850 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron Bauman  (30 Apr 2018)
+# Masked for testing
+=dev-libs/libressl-2.7*
+
 # Mikle Kolyada  (27 Apr 2018)
 # Upstream is dead, the site with the sources is down.
 # There's no chance to get the sources (fetch restricted)

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

[Aaron Bauman]

commit: 335cbae983cbd5e2eff17b0853871332a5aca6a0
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr 30 00:22:31 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 30 00:22:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335cbae9

dev-libs/libressl: add keywords for supported arches

The package will be added to package.mask for testing

Package-Manager: Portage-2.3.31, Repoman-2.3.9

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

diff --git a/dev-libs/libressl/libressl-2.7.2.ebuild 
b/dev-libs/libressl/libressl-2.7.2.ebuild
index d988e0c8f01..c082e664866 100644
--- a/dev-libs/libressl/libressl-2.7.2.ebuild
+++ b/dev-libs/libressl/libressl-2.7.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="ISC openssl"
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/45"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/

[Aaron Bauman]

   mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+   "${FILESDIR}/mbstring-oniguruma-6.8.patch"
+   # hopefully upstream will include the same version check fixes in 
upcoming releases
+   # patch added 20180429
+   "${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 

diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
index ec866bd84ba..8de4204d1c0 100644
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -163,7 +163,12 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+   "${FILESDIR}/mbstring-oniguruma-6.8.patch"
+   # hopefully upstream will include the same version check fixes in 
upcoming releases
+   # patch added 20180429
+   "${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 

diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index 55fab7c4c96..0075b8f5bd7 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -145,7 +145,12 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+   "${FILESDIR}/mbstring-oniguruma-6.8.patch"
+   # hopefully upstream will include the same version check fixes in 
upcoming releases
+   # patch added 20180429
+   "${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 

diff --git a/dev-lang/php/php-7.1.17.ebuild b/dev-lang/php/php-7.1.17.ebuild
index 34ff2d2648d..fcd553f3148 100644
--- a/dev-lang/php/php-7.1.17.ebuild
+++ b/dev-lang/php/php-7.1.17.ebuild
@@ -144,6 +144,11 @@ REQUIRED_USE="
session-mm? ( session !threads )
mysql? ( || ( mysqli pdo ) )
 "
+PATCHES=(
+   # hopefully upstream will include the same version check fixes in 
upcoming releases
+   # patch added 20180429
+   "${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 

diff --git a/dev-lang/php/php-7.2.5.ebuild b/dev-lang/php/php-7.2.5.ebuild
index 5407f131e1a..558d91754f3 100644
--- a/dev-lang/php/php-7.2.5.ebuild
+++ b/dev-lang/php/php-7.2.5.ebuild
@@ -149,6 +149,11 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
zip-encryption? ( zip )
 "
+PATCHES=(
+   # hopefully upstream will include the same version check fixes in 
upcoming releases
+   # patch added 20180429
+   "${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 

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

[Brian Evans]

commit: 65c78e85a667742086b0f6dc6f02fed64349ed6a
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Apr 30 00:04:56 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Apr 30 00:04:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c78e85

Revert "eclass: Add MULTILIB_USEDEP to libnsl in mysql-multilib-r1"

This reverts commit 235ae287011539cfc256a22aac5081d4f348609c.

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 2f05c7943ed..48f300f9bbc 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -187,7 +187,7 @@ DEPEND="
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
sys-libs/ncurses:0=
-   net-libs/libnsl:0=[${MULTILIB_USEDEP}]
+   net-libs/libnsl:0=
 "
 
 # prefix: first need to implement something for #196294

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

[Brian Evans]

commit: 799be1104533d4c6b07300a0c74f650754066957
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Apr 30 00:05:32 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Apr 30 00:05:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799be110

Revert "dev-db/mariadb: Add net-libs/libnsl dependencies"

This reverts commit b081514850b14f9d2e434865385f1994e456dfc9.

 dev-db/mariadb/Manifest|   2 +
 ...riadb-10.2.14.ebuild => mariadb-10.2.12.ebuild} | 129 -
 ...riadb-10.2.14.ebuild => mariadb-10.2.13.ebuild} |   8 +-
 dev-db/mariadb/mariadb-10.2.14.ebuild  |   6 +-
 dev-db/mariadb/mariadb-10.3.5_rc.ebuild|  24 +---
 5 files changed, 60 insertions(+), 109 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6c694917ebe..b87e6c83080 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,6 +5,8 @@ DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 
38df67a1b26aab559e41f44b129f2e57388
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 
40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5
 SHA512 
c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 
1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f
 SHA512 
db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 
8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07
 SHA512 
fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a
+DIST mariadb-10.2.12.tar.gz 72818636 BLAKE2B 
50a72b8096ae8bd5dc635352fc35d22322a0d7cf415e45883898307050ec547a79c66d51ab0ce311f1895eb178afeb49664fb434af77f9ff2b9aedef0aea85bc
 SHA512 
8d3d3c84d4a01d6047e4f2b6802eb802e1f6a7b0e10e981c7ef9fdd27a5a25baab0af47a21b8637f4cbb9d21ef3bcc85097c5fdb8745c2a79040ab87fecb5a7b
+DIST mariadb-10.2.13.tar.gz 72591913 BLAKE2B 
5abc3fefc5b02f099254b8a3a832a20793989a316efdc22b146cf78b5b83fcb3e4e617fce1b9161194e3f54b7bb469de3bb656319048fb137915af24e21f6aa2
 SHA512 
4c6038f134a32f50daa3172b367588240ef20a6f6cfe36d830e427cf52d315284481f5300d3db32d9e81ddd352dbea01fd4230f4e4d79e175d97c0c49331a4ca
 DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B 
ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c
 SHA512 
12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026
 DIST mariadb-10.3.5.tar.gz 70945381 BLAKE2B 
10f5f08a64b3d046f8255a5ea9bb1661b7a88d130b0a89b41c8f98abbe3c04cc13154e1ad6c012ef97a396f055ca5d748998f1e7d6dc89ca73a3b61f70749457
 SHA512 
e7f2ffd38da4e4dbd214bc97e30216682b6f8ca368bcbd5717fb408a6110f26da4472cd7ac0d288c817eb9c6426a063cff8d582e03fe8a1219c0d70508e5a004
 DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 
150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807
 SHA512 
eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild 
b/dev-db/mariadb/mariadb-10.2.12.ebuild
similarity index 91%
copy from dev-db/mariadb/mariadb-10.2.14.ebuild
copy to dev-db/mariadb/mariadb-10.2.12.ebuild
index 90f70d1e201..73d4cd9e20e 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180308-1938Z"
+MY_EXTRAS_VER="20170926-1321Z"
 SUBSLOT="18"
 
 JAVA_PKG_OPT_USE="jdbc"
@@ -28,7 +28,7 @@ HOMEPAGE="http://mariadb.org/";
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd 
systemtap tcmalloc
@@ -39,11 +39,12 @@ RESTRICT="!bindist? ( bindist ) libressl? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
server? ( tokudb? ( jemalloc !tcmalloc ) )
-   !server? ( !extraengine )
+   !server? ( !extraengine !embedded )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
 
-KEYWORDS="~a

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

[Brian Evans]

commit: 91a503d1dacafb9e25663ee514dca3dae9e7bf5a
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Apr 30 00:05:51 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Apr 30 00:05:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a503d1

Revert "eclass: mysql - Add net-libs/libnsl for bug 643038"

This reverts commit 18779934c83275fa077d7f4d7a8f6ec72a4316d5.

 eclass/mysql-multilib-r1.eclass | 3 +--
 eclass/mysql-v2.eclass  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 48f300f9bbc..ebc054f0fef 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-20178Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mysql-multilib-r1.eclass
@@ -187,7 +187,6 @@ DEPEND="
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
sys-libs/ncurses:0=
-   net-libs/libnsl:0=
 "
 
 # prefix: first need to implement something for #196294

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1b1aa333274..766d5641014 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mysql-v2.eclass
@@ -273,7 +273,6 @@ DEPEND="
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
>=sys-libs/zlib-1.2.3
-   net-libs/libnsl
 "
 # TODO: add this as a dep if it is moved from the overlay
 #  !dev-db/mariadb-native-client[mysqlcompat]

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

[Anthony G. Basile]

commit: 8dbe380145805ef708d0fdaf29679f8643386a3b
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sun Apr 29 21:46:00 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Apr 29 23:57:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbe3801

app-admin/ulogd: verbump to 2.0.7

- Drop unneeded `eautoreconf' call
- Drop unneeded eclasses
- Drop obsolete kernel version check
- Add selinux USE to pull SELinux policy

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-admin/ulogd/Manifest   |   1 +
 app-admin/ulogd/ulogd-2.0.7.ebuild | 137 +
 2 files changed, 138 insertions(+)

diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 829bb7432d6..dc06cd5bcf0 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1 +1,2 @@
 DIST ulogd-2.0.5_p20161017.tar.gz 137936 BLAKE2B 
4cd252820920b0f872ddf97894c5917ed03fcab78b7fc215fa0ad00fbce2d2bd8cadc80120d452868e5292c97e595ea0ea861d685919fd18a8f040b683f2fe5d
 SHA512 
b9a3f5323766856fc20d58a6c55f9bc955f50e9d7052df0828ca08bf9d573326e69920f6c90c9d3e877c4dc1a29a5a994cde070bd0834fbf4dee8eebbb251e98
+DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B 
bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0
 SHA512 
1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09

diff --git a/app-admin/ulogd/ulogd-2.0.7.ebuild 
b/app-admin/ulogd/ulogd-2.0.7.ebuild
new file mode 100644
index 000..7ece6897526
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic linux-info ltprune readme.gentoo-r1 systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html";
+SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
+
+COMMON_DEPEND="
+   || ( net-firewall/iptables net-firewall/nftables )
+   >=net-libs/libnfnetlink-1.0.1
+   dbi? ( dev-db/libdbi )
+   json? ( dev-libs/jansson )
+   nfacct? (
+   >=net-libs/libmnl-1.0.3
+   >=net-libs/libnetfilter_acct-1.0.1
+   )
+   nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+   nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+   mysql? ( virtual/mysql )
+   pcap? ( net-libs/libpcap )
+   postgres? ( dev-db/postgresql:= )
+   sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+   doc? (
+   app-text/linuxdoc-tools
+   app-text/texlive-core
+   dev-texlive/texlive-fontsrecommended
+   virtual/latex-base
+   )
+"
+RDEPEND="${COMMON_DEPEND}
+   selinux? ( sec-policy/selinux-ulogd )
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+You must have at least one logging stack enabled to make ulogd work.
+Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+   linux-info_pkg_setup
+
+   if use nfacct && kernel_is lt 3 3 0; then
+   ewarn "NFACCT input plugin requires a kernel >= 3.3."
+   fi
+
+   if use ulog && kernel_is ge 3 17 0; then
+   ewarn "ULOG target has been removed in the 3.17 kernel release."
+   ewarn "Consider enabling NFACCT, NFCT, or NFLOG support 
instead."
+   fi
+
+   enewgroup ulogd
+   enewuser ulogd -1 -1 /var/log/ulogd ulogd
+}
+
+src_prepare() {
+   default_src_prepare
+
+   # Change default settings to:
+   # - keep log files in /var/log/ulogd instead of /var/log;
+   # - create sockets in /run instead of /tmp.
+   sed -i \
+   -e "s|var/log|var/log/${PN}|g" \
+   -e 's|tmp|run|g' \
+   ulogd.conf.in || die
+}
+
+src_configure() {
+   append-lfs-flags
+   local myeconfargs=(
+   $(use_with dbi)
+   $(use_with json jansson)
+   $(use_enable nfacct)
+   $(use_enable nfct)
+   $(use_enable nflog)
+   $(use_with mysql)
+   $(use_with pcap)
+   $(use_with postgres pgsql)
+   $(use_with sqlite)
+   $(use_enable ulog)
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   default_src_compile
+
+   if use doc; then
+   # Prevent access violations from bitmap font files generation.
+   export VARTEXFONTS="${T}/fonts"
+   emake -C doc
+   fi
+}
+
+src_install() {
+   use doc && HTML_DOCS=( doc/${PN}.html )
+
+   default_src_install
+   prune_libtool_files --modules
+   

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

[Bernard Cafarelli]

commit: 5376962cc49cded93a320d14ed585221217a1250
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr 29 22:09:51 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr 29 22:12:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5376962c

www-apps/owncloud: 9.18, 10.0.8 version bumps

Closes: https://bugs.gentoo.org/652780
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 www-apps/owncloud/Manifest   |  2 ++
 www-apps/owncloud/owncloud-10.0.8.ebuild | 47 
 www-apps/owncloud/owncloud-9.1.8.ebuild  | 47 
 3 files changed, 96 insertions(+)

diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index c3adf058609..334137b2b4d 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,3 +1,5 @@
 DIST owncloud-10.0.6-r1.tar.bz2 39393658 BLAKE2B 
34498d5c63a3417f9f42e55353884600c59a9b9e11167ef5b0dad3b496cfdcf091c95853dfcc851f767493483158a1a4b9e6bd291cddb95549b7fc07cce92618
 SHA512 
aaeb646255507cbe85de9f8e5f353479ee152f285e2c90ae48669a3fe78b718123105333d4b5c73478135fe2c940171dc8ffd732a9357c9709f391bcf01779d2
 DIST owncloud-10.0.7.tar.bz2 39395237 BLAKE2B 
c855913e60c214fddaa83e07278388501efd7510547cafb3ba7b87ca24086c2e603bec587dad52265ed824b6b67e4f6bef00ceddb9aaff3f9d9b468c306ea6af
 SHA512 
5e644a92469ef0ea6e9996282a1013923301ed4252c7f337571134ab0d8bceb0c69765144d4ecbabf91e2edfad2e2842935a66cbcbbc64e9ea82ad4f83c6fa21
+DIST owncloud-10.0.8.tar.bz2 40671279 BLAKE2B 
01f0f20640c8b98138835d7f164cefcdb457ee2e2e7188166e5ff8473ee984066cb6a869d3038541c26f622a0e3775710e7e75f5b49af94fd043e90d59bfaeae
 SHA512 
aebefb0051a1478f6da307c92d983c131b2e15c496fcc628569282875e2b21554a94e5f4ad335a11c1eb18be1987b15eaa033fdfa62cfdc1467a905b7e96211a
 DIST owncloud-9.1.7.tar.bz2 29243610 BLAKE2B 
8a8a54c299df25c0f3fcca1accae3de7f27fe229d8175522fd2b72f3f865539219b733318b077455f80907b74fbd63d570dd73f40a61a5005415923b562ea819
 SHA512 
b31888c2c3e991869018a1cd46e75348b2b02d93effee8950d6e54568cd22eb634d750c790421e8bc0c1c991d146fb50c1826f4aa786e4a348f1d8fa5aa4870d
+DIST owncloud-9.1.8.tar.bz2 29210020 BLAKE2B 
53dfa05e5a8ed3a040b26a0b6c6a5d6b50dfd7ea4727f9e0bc297a26be23b5aea8af16d766bda469b14bebdfbad9b46ea14e8e0ed973941c7d543551579f7ef5
 SHA512 
37475eb3dadda1911d7020b44e347629d59919b9298fd2dbe230388a061c03e8e9c0179381632afe0491a9b47f540ce62a748c9a4f59e7bffb0ce94aeb93d088

diff --git a/www-apps/owncloud/owncloud-10.0.8.ebuild 
b/www-apps/owncloud/owncloud-10.0.8.ebuild
new file mode 100644
index 000..5f42e828582
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.0.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your 
own control"
+HOMEPAGE="http://owncloud.org";
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+   virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+   webapp_pkg_setup
+}
+
+src_install() {
+   webapp_src_preinst
+
+   insinto "${MY_HTDOCSDIR}"
+   doins -r .
+   dodir "${MY_HTDOCSDIR}"/data
+
+   webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+   webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+   webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+   webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+   webapp_src_install
+}
+
+pkg_postinst() {
+   elog "Additional applications (calendar, ...) are no longer provided by 
default."
+   elog "You can install them after login via the applications management 
page"
+   elog "(check the recommended tab). No application data is lost."
+   webapp_pkg_postinst
+}

diff --git a/www-apps/owncloud/owncloud-9.1.8.ebuild 
b/www-apps/owncloud/owncloud-9.1.8.ebuild
new file mode 100644
index 000..5274245756a
--- /dev/null
+++ b/www-apps/owncloud/owncloud-9.1.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your 
own control"
+HOMEPAGE="http://owncloud.org";
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="

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

[Bernard Cafarelli]

commit: 666708d85bf3a950c726c8f5e83a3da247efc796
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr 29 22:14:20 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr 29 22:14:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666708d8

media-gfx/displaycal: 3.5.3.0 bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-gfx/displaycal/Manifest  |  1 +
 media-gfx/displaycal/displaycal-3.5.3.0.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 716d82695e1..b0c2b5c6bee 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,2 +1,3 @@
 DIST DisplayCAL-3.5.1.0.tar.gz 10378539 BLAKE2B 
b10e3f70401b9167728c4fc9b59bf66da7e3a09040fdf0800e9697aa9bc328d7d70e4018d14856fbde1a20028ef3aec2922727282050c291ed5a8c83209178e3
 SHA512 
7dd0c67c8766478223f1e36a36d386b0e8d284001642e34fd1aa27e196fc36be1fd98340f4af202c4b171aa44da9f9d20a53f8dda11ba5e270a1071351fc7a6a
 DIST DisplayCAL-3.5.2.0.tar.gz 10341417 BLAKE2B 
218d73756c57107b17a475101a8969af4213ce0417669b5d18f009320cab970da125ddae68a3288f61f05be99f3e2a621a727c2cf6b4aeae43252c8d257ed3af
 SHA512 
607a63c94fbebf916009327bf473c45e6e785e5dfa57bd0b5868616a57b7af1aa3173a43cd7e371b43a8078ad350ff27178c6c13b46a3e67e28a4397c5586665
+DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B 
a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3
 SHA512 
ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c

diff --git a/media-gfx/displaycal/displaycal-3.5.3.0.ebuild 
b/media-gfx/displaycal/displaycal-3.5.3.0.ebuild
new file mode 100644
index 000..72a722b6435
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.5.3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/";
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   >=media-gfx/argyllcms-1.1.0
+   dev-python/wxpython:3.0
+   >=x11-libs/libX11-1.3.3
+   >=x11-apps/xrandr-1.3.2
+   >=x11-libs/libXxf86vm-1.1.0
+   >=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+   >=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   # Do not generate udev/hotplug files
+   sed -e '/if 
os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+   -i DisplayCAL/setup.py || die
+   # Prohibit setup from running xdg-* programs, resulting to sandbox 
violation
+   sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+   -e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+   -i DisplayCAL/postinstall.py || die
+
+   # Remove deprecated Encoding key from .desktop file
+   sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+   # Remove x-world Media Type
+   sed -e 's/x\-world\/x\-vrml\;//g' \
+   -i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+   distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_icon_cache_update
+}

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

[Bernard Cafarelli]

commit: 33049fda60c78c8c52f1e8086211a6c4cf978c9b
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr 29 22:11:17 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr 29 22:12:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33049fda

dev-python/libpillowfight: 0.2.4 bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-python/libpillowfight/Manifest |  1 +
 .../libpillowfight/libpillowfight-0.2.4.ebuild | 29 ++
 2 files changed, 30 insertions(+)

diff --git a/dev-python/libpillowfight/Manifest 
b/dev-python/libpillowfight/Manifest
index cfdb5bd70d7..e4715359902 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,2 +1,3 @@
 DIST libpillowfight-0.2.2.tar.gz 23125494 BLAKE2B 
b9620b0e574869d1efcc9449e09f281a5d2611ec15f144ee24b385b5f6f693f037c844904f0abc715d49125df7d1a27d6c433aed83b33371b3f07310be8288db
 SHA512 
76dcaf9105b4dbbe427851d794e92ba023453e2d750ecdd4e3feb864534f9d99adb562b719b7c9af299ae16c0778b510ab96b4997cf9bcc6ea4c6f8f7471ae8a
 DIST pypillowfight-0.2.3.tar.gz 39416 BLAKE2B 
e216ddb1717189c142fc3d81d41c91855c52468e1af350d8f5db470f8901bd883223cad56dc8ced9cf61e90e511e0a5ef508ec6966a7f01a837e2bb0d393589f
 SHA512 
6d3e35ed567d66060f5bf4307b0bd7d9ee5c3e7ec430e6e04ee6a1e83e18ff829a7681a85186e6b2151f043f66453c12a60e7cce56c0558da3d72f1fce155097
+DIST pypillowfight-0.2.4.tar.gz 39411 BLAKE2B 
a890305e3c1650274426faf92178ca0b3742c413deac236a5ac23cb5ce9be372085cebfd7189a5e16e6f2176b5850c865cbfc899a036aedfad58c5f5fe08502a
 SHA512 
440b0faccb9f393126306afb2a060e5dab5e68a02822ad4846498a2a6b07013837642cfb818b669820b268342be3c5b0ebed81f1e3265e1f383d74c1cfb16187

diff --git a/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild 
b/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
new file mode 100644
index 000..b18a134d648
--- /dev/null
+++ b/dev-python/libpillowfight/libpillowfight-0.2.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="pypillowfight"
+
+DESCRIPTION="Small library containing various image processing algorithms"
+HOMEPAGE="https://github.com/openpaperwork/libpillowfight";
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+   test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+python_prepare_all() {
+   sed -e "/'nose>=1.0'/d" -i setup.py || die
+   distutils-r1_python_prepare_all
+}

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

[Bernard Cafarelli]

commit: 95368dd74d0933e31cf96b0041303b75404e879f
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr 29 22:12:28 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr 29 22:12:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95368dd7

media-video/devedeng: 4.10.0 bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-video/devedeng/Manifest   |  1 +
 media-video/devedeng/devedeng-4.10.0.ebuild | 38 +
 2 files changed, 39 insertions(+)

diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 8017c159a93..780def2406b 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,2 +1,3 @@
+DIST devedeng-4.10.0.tar.gz 1884153 BLAKE2B 
71b86ae206dfd8798d54304eb68b488fd7d5e6ca76d76691682bd106e28de7a75833fdf57499841d1aa970e35e336cf50d568fb5e3fc34a40eb685c8b503a561
 SHA512 
4230e0395b4add0b53921137c9d32ebcf7efb1d2e8e8298c57bc11e82e06783b9a4f4fdcec41b1bcfdb358a35d1ce03c14fa3448551ad7289684ad35ce76cbd2
 DIST devedeng-4.8.12.tar.gz 1884025 BLAKE2B 
7c6ed3c94bfd18a19147a8627fa846d78fe1f4c686a4875a917062419c2e4f136052aa79f2697e0a3642ebb92246b42ced3a4a398a4773599242726ff01c157c
 SHA512 
67eaf426d3f69a6efb8fde5f5df425d2b8ddf1052f22cd2d36056c687bc0978a456f6158a0af302292ef5e1abb837c9ac7ca6b4e0332e81c31ca7333ea86e184
 DIST devedeng-4.9.0.tar.gz 1884128 BLAKE2B 
8072fc31d02526dc4420b62e3721e46ffb246872c55cd3c2a72e28cc8aa2f3c08cbaebbaaf5b91021ce330ae4c819cc2f1eab7c7f6d12d705e8970aecf6627e0
 SHA512 
4200f3ce51fcdc38d17918f3fbca9acea2a63aa47e45714e8f834c9da7e643c29e22b2f1dac44b2db43ad034c7c84aba68d335f69245246a73c56e598e2aa445

diff --git a/media-video/devedeng/devedeng-4.10.0.ebuild 
b/media-video/devedeng/devedeng-4.10.0.ebuild
new file mode 100644
index 000..d1ed266804d
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or 
CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html";
+SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   x11-libs/gtk+:3
+   || ( media-video/vlc media-video/mpv media-video/mplayer )
+   !libav? ( media-video/ffmpeg )
+   libav? ( media-video/libav )
+   media-video/dvdauthor
+   media-video/vcdimager
+   virtual/cdrtools
+   || ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

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

[Zac Medico]

commit: 28fd93d4de0c1adcecb7ce10c7514d5718ccf43f
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 21:58:38 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 22:18:28 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=28fd93d4

Scheduler: call_later asyncio compat (bug 591760)

Use call_later for asyncio compatibility.

Bug: https://bugs.gentoo.org/591760

 pym/_emerge/Scheduler.py | 39 +++
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 4c1ea5078..422308184 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -74,8 +74,8 @@ class Scheduler(PollScheduler):
# max time between loadavg checks (seconds)
_loadavg_latency = 30
 
-   # max time between display status updates (milliseconds)
-   _max_display_latency = 3000
+   # max time between display status updates (seconds)
+   _max_display_latency = 3
 
_opts_ignore_blockers = \
frozenset(["--buildpkgonly",
@@ -1398,10 +1398,15 @@ class Scheduler(PollScheduler):
failed_pkgs = self._failed_pkgs
portage.locks._quiet = self._background
portage.elog.add_listener(self._elog_listener)
-   display_timeout_id = None
+
+   def display_callback():
+   self._status_display.display()
+   display_callback.handle = self._event_loop.call_later(
+   self._max_display_latency, display_callback)
+   display_callback.handle = None
+
if self._status_display._isatty and not 
self._status_display.quiet:
-   display_timeout_id = self._event_loop.timeout_add(
-   self._max_display_latency, 
self._status_display.display)
+   display_callback()
rval = os.EX_OK
 
try:
@@ -1410,8 +1415,8 @@ class Scheduler(PollScheduler):
self._main_loop_cleanup()
portage.locks._quiet = False
portage.elog.remove_listener(self._elog_listener)
-   if display_timeout_id is not None:
-   
self._event_loop.source_remove(display_timeout_id)
+   if display_callback.handle is not None:
+   display_callback.handle.cancel()
if failed_pkgs:
rval = failed_pkgs[-1].returncode
 
@@ -1625,12 +1630,11 @@ class Scheduler(PollScheduler):
elapsed_seconds < self._sigcont_delay:
 
if self._job_delay_timeout_id is not 
None:
-   self._event_loop.source_remove(
-   
self._job_delay_timeout_id)
+   
self._job_delay_timeout_id.cancel()
 
-   self._job_delay_timeout_id = 
self._event_loop.timeout_add(
-   1000 * (self._sigcont_delay - 
elapsed_seconds),
-   self._schedule_once)
+   self._job_delay_timeout_id = 
self._event_loop.call_later(
+   self._sigcont_delay - 
elapsed_seconds,
+   self._schedule)
return True
 
# Only set this to None after the delay has 
expired,
@@ -1651,19 +1655,14 @@ class Scheduler(PollScheduler):
if elapsed_seconds > 0 and elapsed_seconds < delay:
 
if self._job_delay_timeout_id is not None:
-   self._event_loop.source_remove(
-   self._job_delay_timeout_id)
+   self._job_delay_timeout_id.cancel()
 
-   self._job_delay_timeout_id = 
self._event_loop.timeout_add(
-   1000 * (delay - elapsed_seconds), 
self._schedule_once)
+   self._job_delay_timeout_id = 
self._event_loop.call_later(
+   delay - elapsed_seconds, self._schedule)
return True
 
return False
 
-   def _schedule_once(self):
-   self._schedule()
-   return False
-
def _schedule_tasks_imp(self):
"""
@rtype: bool

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

[Zac Medico]

commit: abf4b7abcdc53bbbd86eb6f79d45417b54ed64d2
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 22:12:13 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 22:18:28 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=abf4b7ab

AsyncScheduler: call_later asyncio compat (bug 591760)

Use call_later for asyncio compatibility. Also remove the
timeout_add method from SchedulerInterface, since there are
no more consumers.

Bug: https://bugs.gentoo.org/591760

 pym/portage/util/_async/AsyncScheduler.py | 9 +++--
 pym/portage/util/_async/SchedulerInterface.py | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pym/portage/util/_async/AsyncScheduler.py 
b/pym/portage/util/_async/AsyncScheduler.py
index 90e803eba..c6b523eaa 100644
--- a/pym/portage/util/_async/AsyncScheduler.py
+++ b/pym/portage/util/_async/AsyncScheduler.py
@@ -65,6 +65,11 @@ class AsyncScheduler(AsynchronousTask, PollScheduler):
task.addExitListener(self._task_exit)
task.start()
 
+   if self._loadavg_check_id is not None:
+   self._loadavg_check_id.cancel()
+   self._loadavg_check_id = self._event_loop.call_later(
+   self._loadavg_latency, self._schedule)
+
# Triggers cleanup and exit listeners if there's nothing left 
to do.
self.poll()
 
@@ -80,14 +85,14 @@ class AsyncScheduler(AsynchronousTask, PollScheduler):
(self._max_jobs is True or self._max_jobs > 1):
# We have to schedule periodically, in case the load
# average has changed since the last call.
-   self._loadavg_check_id = self._event_loop.timeout_add(
+   self._loadavg_check_id = self._event_loop.call_later(
self._loadavg_latency, self._schedule)
self._schedule()
 
def _cleanup(self):
super(AsyncScheduler, self)._cleanup()
if self._loadavg_check_id is not None:
-   self._event_loop.source_remove(self._loadavg_check_id)
+   self._loadavg_check_id.cancel()
self._loadavg_check_id = None
 
def _async_wait(self):

diff --git a/pym/portage/util/_async/SchedulerInterface.py 
b/pym/portage/util/_async/SchedulerInterface.py
index ff39bc587..56b844616 100644
--- a/pym/portage/util/_async/SchedulerInterface.py
+++ b/pym/portage/util/_async/SchedulerInterface.py
@@ -15,7 +15,6 @@ class SchedulerInterface(SlotObject):
"IO_NVAL", "IO_OUT", "IO_PRI",
"io_add_watch",
"source_remove",
-   "timeout_add",
 
"add_reader",
"add_writer",

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

[Zac Medico]

commit: 4da425966a82bfbbb68908010995941a44b45598
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 21:39:28 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 21:41:07 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4da42596

AbstractEbuildProcess: call_later asyncio compat (bug 591760)

Use call_later for asyncio compatibility.

Bug: https://bugs.gentoo.org/591760

 pym/_emerge/AbstractEbuildProcess.py | 11 ---
 pym/_emerge/SubProcess.py|  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pym/_emerge/AbstractEbuildProcess.py 
b/pym/_emerge/AbstractEbuildProcess.py
index 2ed175750..ccc3b8e32 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -37,7 +37,7 @@ class AbstractEbuildProcess(SpawnProcess):
# doesn't hurt to be generous here since the scheduler
# continues to process events during this period, and it can
# return long before the timeout expires.
-   _exit_timeout = 1 # 10 seconds
+   _exit_timeout = 10 # seconds
 
# The EbuildIpcDaemon support is well tested, but this variable
# is left so we can temporarily disable it if any issues arise.
@@ -247,7 +247,7 @@ class AbstractEbuildProcess(SpawnProcess):
if self._registered:
# Let the process exit naturally, if possible.
self._exit_timeout_id = \
-   self.scheduler.timeout_add(self._exit_timeout,
+   self.scheduler.call_later(self._exit_timeout,
self._exit_command_timeout_cb)
 
def _exit_command_timeout_cb(self):
@@ -258,17 +258,14 @@ class AbstractEbuildProcess(SpawnProcess):
# being killed by a signal.
self.cancel()
self._exit_timeout_id = \
-   self.scheduler.timeout_add(self._cancel_timeout,
+   self.scheduler.call_later(self._cancel_timeout,
self._cancel_timeout_cb)
else:
self._exit_timeout_id = None
 
-   return False # only run once
-
def _cancel_timeout_cb(self):
self._exit_timeout_id = None
self._async_waitpid()
-   return False # only run once
 
def _orphan_process_warn(self):
phase = self.phase
@@ -363,7 +360,7 @@ class AbstractEbuildProcess(SpawnProcess):
SpawnProcess._async_waitpid_cb(self, *args, **kwargs)
 
if self._exit_timeout_id is not None:
-   self.scheduler.source_remove(self._exit_timeout_id)
+   self._exit_timeout_id.cancel()
self._exit_timeout_id = None
 
if self._ipc_daemon is not None:

diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py
index aa4778737..a37482ca4 100644
--- a/pym/_emerge/SubProcess.py
+++ b/pym/_emerge/SubProcess.py
@@ -16,7 +16,7 @@ class SubProcess(AbstractPollTask):
 
# This is how much time we allow for waitpid to succeed after
# we've sent a kill signal to our subprocess.
-   _cancel_timeout = 1000 # 1 second
+   _cancel_timeout = 1 # seconds
 
def _poll(self):
# Simply rely on _async_waitpid_cb to set the returncode.

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

[Mikle Kolyada]

commit: 0e63e08f90d26f9a301567eb8d6ecb32f85993c4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 29 22:05:36 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 29 22:08:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e63e08f

dev-python/lit: arm stable wrt bug #644814

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/dev-python/lit/lit-5.0.1.ebuild b/dev-python/lit/lit-5.0.1.ebuild
index c7ea31c0235..eb53b1cdc0a 100644
--- a/dev-python/lit/lit-5.0.1.ebuild
+++ b/dev-python/lit/lit-5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd"
 IUSE="test"
 
 S=${WORKDIR}/${MY_P}/utils/lit

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/

[Mikle Kolyada]

commit: 8c092d0777bb556aab0da014ebbd3bd06a9ce02d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 29 22:07:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 29 22:08:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c092d07

sys-devel/llvm: arm stable wrt bug #644814

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/llvm/llvm-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/llvm/llvm-5.0.1.ebuild b/sys-devel/llvm/llvm-5.0.1.ebuild
index 295cd485338..b57ab048c4e 100644
--- a/sys-devel/llvm/llvm-5.0.1.ebuild
+++ b/sys-devel/llvm/llvm-5.0.1.ebuild
@@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test
kernel_Darwin kernel_linux ${ALL_LLVM_TARGETS[*]}"
 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvmgold/

[Mikle Kolyada]

commit: 913efb284b6a40f91a5d815412d29140d613276e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 29 22:06:51 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 29 22:08:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913efb28

sys-devel/llvmgold: arm stable wrt bug #644814

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/llvmgold/llvmgold-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/llvmgold/llvmgold-5.ebuild 
b/sys-devel/llvmgold/llvmgold-5.ebuild
index 30eabc2e878..a3af49b27d7 100644
--- a/sys-devel/llvmgold/llvmgold-5.ebuild
+++ b/sys-devel/llvmgold/llvmgold-5.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]

[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm-common/

[Mikle Kolyada]

commit: 28e336f0d4adba2f0b56e4fd1cc1927b8bfe071a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 29 22:04:44 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 29 22:08:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e336f0

sys-devel/llvm-common: arm stable wrt bug #644814

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/llvm-common/llvm-common-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/llvm-common/llvm-common-5.0.1.ebuild 
b/sys-devel/llvm-common/llvm-common-5.0.1.ebuild
index e5a7e9212ba..e87dcd0831d 100644
--- a/sys-devel/llvm-common/llvm-common-5.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-5.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"

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

[Andreas Hüttel]

commit: 0a594acda7bfbae3c55c54c9d0c521f362c2843d
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 29 22:06:51 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 29 22:07:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a594acd

dev-libs/weston: Add build fix for glibc-2.26, bug 610652

Oh well, this one was really easy.

Closes: https://bugs.gentoo.org/610652
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-libs/weston/files/weston-1.11.0-sysmacros.patch | 11 +++
 dev-libs/weston/weston-1.11.0.ebuild|  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch 
b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
new file mode 100644
index 000..6f54bfc11cd
--- /dev/null
+++ b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -ruN weston-1.11.0.orig/src/weston-launch.c 
weston-1.11.0/src/weston-launch.c
+--- weston-1.11.0.orig/src/weston-launch.c 2015-10-24 02:02:43.0 
+0200
 weston-1.11.0/src/weston-launch.c  2018-04-30 00:02:42.528120347 +0200
+@@ -37,6 +37,7 @@
+ #include 
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/dev-libs/weston/weston-1.11.0.ebuild 
b/dev-libs/weston/weston-1.11.0.ebuild
index 9574ec16fc7..81098bc0289 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ fi
 VIRTUALX_REQUIRED="test"
 RESTRICT="test"
 
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
+inherit autotools readme.gentoo-r1 toolchain-funcs virtualx epatch $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/";
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+   epatch "${FILESDIR}/${P}-sysmacros.patch"
if [[ ${PV} = * ]]; then
eautoreconf
fi

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/mayavi/

[Mikle Kolyada]

commit: 78b27173ca3ddcff5b8c6ed42a0fd160afbb1c6f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 29 21:57:23 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 29 21:57:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b27173

sci-visualization/mayavi: amd64 stable wrt bug #644746

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-visualization/mayavi/mayavi-4.5.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/mayavi/mayavi-4.5.0.ebuild 
b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
index 9368b708a30..30e24063df3 100644
--- a/sci-visualization/mayavi/mayavi-4.5.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="

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

[Mikle Kolyada]

commit: 90802a5aadd36c8076ec7a761907c59f0687e298
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 29 21:53:44 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 29 21:53:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90802a5a

sys-fs/encfs: amd64 stable wrt bug #654334

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-fs/encfs/encfs-1.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/encfs/encfs-1.9.4.ebuild b/sys-fs/encfs/encfs-1.9.4.ebuild
index 258bb0115cb..91dded583cb 100644
--- a/sys-fs/encfs/encfs-1.9.4.ebuild
+++ b/sys-fs/encfs/encfs-1.9.4.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/libdlm/files/, sys-cluster/libdlm/

[Andreas Hüttel]

commit: 836da927394465e8f086d7ea270ac1f9a8a78041
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 29 21:49:13 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 29 21:49:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836da927

sys-cluster/libdlm: Add build fix for glibc-2.26, bug 580296

Closes: https://bugs.gentoo.org/580296
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch | 11 +++
 sys-cluster/libdlm/libdlm-3.2.0.ebuild|  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch 
b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
new file mode 100644
index 000..3a8a8b11fa1
--- /dev/null
+++ b/sys-cluster/libdlm/files/libdlm-3.2.0-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -ruN cluster-3.2.0.orig/dlm/libdlm/libdlm.c 
cluster-3.2.0/dlm/libdlm/libdlm.c
+--- cluster-3.2.0.orig/dlm/libdlm/libdlm.c 2012-11-26 05:13:22.0 
+0100
 cluster-3.2.0/dlm/libdlm/libdlm.c  2018-04-29 23:46:57.591160008 +0200
+@@ -5,6 +5,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild 
b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
index 84928252827..aebc2e1b0ea 100644
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit multilib toolchain-funcs versionator
+inherit multilib toolchain-funcs versionator epatch
 
 CLUSTER_RELEASE="${PV}"
 MY_P="cluster-${CLUSTER_RELEASE}"
@@ -33,6 +33,7 @@ src_prepare() {
sed -i \
-e "s|/lib|/$(get_libdir)|g" \
"${WORKDIR}/${MY_P}/make/install.mk" || die "sed failed"
+   epatch "${FILESDIR}/${P}-sysmacros.patch"
 }
 
 src_configure() {

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

[Andreas Hüttel]

commit: 1c87f200a2569b61fce857dad622dc99de8e9f26
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 29 21:35:07 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 29 21:35:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c87f200

sys-libs/binutils-libs: Revision bump, 2.30 pachset 2

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-libs/binutils-libs/Manifest|   1 +
 .../binutils-libs/binutils-libs-2.30-r2.ebuild | 107 +
 2 files changed, 108 insertions(+)

diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 9ebac18fe17..edadd3e3c5b 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -7,4 +7,5 @@ DIST binutils-2.28.1.tar.bz2 28120394 BLAKE2B 
3a0ed2bcf0c859638546b7460d9e6f0a55
 DIST binutils-2.29.1-patches-2.tar.xz 18528 BLAKE2B 
514496d6c9609362782d66b6cecbe3fe617f96dfb86e174a80d0b9113cbd4fce9d760fa61660ba2cfafbe1e482e955391cb8d3ef78d2c166c82796416a7ee106
 SHA512 
b60a3af9cd6a681f32a59fc4a30602ee1290f75cc93c8ad38ab0de17a7f30538a751b801dbaf079e3d514b9671e34e91742c4c9c953a8c9794505b571b7e80f0
 DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 
83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878
 SHA512 
4063d3426922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592
 DIST binutils-2.30-patches-1.tar.xz 13884 BLAKE2B 
86d160144e4ae3213838ccd07d008a96f210dbe8d894f2043420bd0003f8e0611564f77dadf60780da61278bbac41130922703fef69ba8ac451bcae5d9c65cf4
 SHA512 
cf38328bac920c1159e73727a9bb46bd462fa60650c90ee8a3d6221d447c678fdd79c6886efc52e35897d535dd717c1dc363bcb3f201aacd15ace078694456da
+DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B 
a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f
 SHA512 
1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 
2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868
 SHA512 
e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839

diff --git a/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild 
b/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
new file mode 100644
index 000..2434d85063c
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCH_VER=2
+
+inherit eutils toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for 
external packages"
+HOMEPAGE="https://sourceware.org/binutils/";
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+   
mirror://gentoo/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+# The shared lib SONAMEs use the ${PV} in them.
+SLOT="0/${PV}"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=""
+IUSE="64-bit-bfd multitarget nls static-libs"
+
+COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+   >=sys-apps/texinfo-4.7
+   nls? ( sys-devel/gettext )"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${COMMON_DEPEND}
+   >=sys-devel/binutils-config-5
+   nls? ( !=2.24) make this an explicit option. #497268
+   --enable-install-libiberty
+   --disable-werror
+   --with-bugurl="https://bugs.gentoo.org/";
+   --with-pkgversion="$(pkgversion)"
+   $(use_enable static-libs static)
+   # The binutils eclass enables this flag for all bi-arch builds,
+   # but other tools often don't care about that support.  Put it
+   # beyond a flag if people really want it, but otherwise leave
+   # it disabled as it can slow things down on 32bit arches. 
#438522
+   $(use_enable 64-bit-bfd)
+   # This only disables building in the zlib subdir.
+   # For binutils itself, it'll use the system version. #591516
+   --without-zlib
+   --with-system-zlib
+   # We only care about the libs, so disable programs. #528088
+   --disable-{binutils,etc,ld,gas,gold,gprof}
+ 

[gentoo-commits] repo/gentoo:master commit in: sci-biology/wgs-assembler/files/, sci-biology/wgs-assembler/

[Andreas Hüttel]

commit: e5fab3349b68203b78b69745bbb71734fa43c515
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 29 21:30:45 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 29 21:31:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5fab334

sci-biology/wgs-assembler: Revision bump using libtirpc, bug 374815

Bug: https://bugs.gentoo.org/374815
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../files/wgs-assembler-7.0-libtirpc.patch | 16 +
 .../wgs-assembler/wgs-assembler-7.0-r2.ebuild  | 72 ++
 2 files changed, 88 insertions(+)

diff --git a/sci-biology/wgs-assembler/files/wgs-assembler-7.0-libtirpc.patch 
b/sci-biology/wgs-assembler/files/wgs-assembler-7.0-libtirpc.patch
new file mode 100644
index 000..7269b0b73c4
--- /dev/null
+++ b/sci-biology/wgs-assembler/files/wgs-assembler-7.0-libtirpc.patch
@@ -0,0 +1,16 @@
+diff -ruN wgs-7.0.orig/src/c_make.as wgs-7.0/src/c_make.as
+--- wgs-7.0.orig/src/c_make.as 2018-04-29 23:00:02.200181987 +0200
 wgs-7.0/src/c_make.as  2018-04-29 23:17:33.612700507 +0200
+@@ -196,6 +196,12 @@
+ CXXFLAGS+= $(ARCH_CXXFLAGS)
+ LDFLAGS += $(ARCH_LDFLAGS)
+ 
++# libtirpc
++
++CFLAGS += -I/usr/include/tirpc
++CXXFLAGS += -I/usr/include/tirpc
++LINK_LIBS += -ltirpc
++
+ INC_IMPORT_DIRS += $(LOCAL_WORK)/src $(patsubst %, $(LOCAL_WORK)/src/%, 
$(strip $(SUBDIRS)))
+ INC_IMPORT_DIRS += $(ARCH_INC)
+ 

diff --git a/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild 
b/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild
new file mode 100644
index 000..192dc48173e
--- /dev/null
+++ b/sci-biology/wgs-assembler/wgs-assembler-7.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Celera de novo whole-genome shotgun DNA sequence assembler, 
aka CABOG"
+HOMEPAGE="https://sourceforge.net/projects/wgs-assembler/";
+SRC_URI="mirror://sourceforge/${PN}/wgs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+   net-libs/libtirpc
+   x11-libs/libXt
+   !x11-terms/terminator"
+RDEPEND="${DEPEND}
+   app-shells/tcsh
+   dev-perl/Log-Log4perl"
+
+S="${WORKDIR}/wgs-${PV}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-build.patch
+   "${FILESDIR}"/${P}-libtirpc.patch
+)
+
+src_prepare() {
+   default
+   tc-export CC CXX
+}
+
+src_configure() {
+   cd "${S}/kmer"
+   ./configure.sh || die
+}
+
+src_compile() {
+   # not really an install target
+   emake -C kmer -j1 install
+   emake -C src -j1 SITE_NAME=LOCAL
+}
+
+src_install() {
+   OSTYPE=$(uname)
+   MACHTYPE=$(uname -m)
+   MACHTYPE=${MACHTYPE/x86_64/amd64}
+   MY_S="${OSTYPE}-${MACHTYPE}"
+   sed -i 's|#!/usr/local/bin/|#!/usr/bin/env |' $(find $MY_S -type f) || 
die
+
+   sed -i '/sub getBinDirectory ()/ a return "/usr/bin";' 
${MY_S}/bin/runCA* || die
+   sed -i '/sub getBinDirectoryShellCode ()/ a return "bin=/usr/bin\n";' 
${MY_S}/bin/runCA* || die
+   sed -i '1 a use lib "/usr/share/'${PN}'/lib";' $(find $MY_S -name 
'*.p*') || die
+
+   dobin kmer/${MY_S}/bin/*
+   insinto /usr/$(get_libdir)/${PN}
+   use static-libs && doins kmer/${MY_S}/lib/*
+
+   insinto /usr/include/${PN}
+   doins kmer/${MY_S}/include/*
+
+   insinto /usr/share/${PN}/lib
+   doins -r ${MY_S}/bin/TIGR
+   rm -rf ${MY_S}/bin/TIGR || die
+   dobin ${MY_S}/bin/*
+   use static-libs && dolib.a ${MY_S}/lib/*
+   dodoc README
+}

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

[Zac Medico]

commit: 542c6e6c20a1d93a3a2af47c8de50eac3c891d5d
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 20:48:23 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 21:26:37 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=542c6e6c

MergeProcess: fix deprecated _set_returncode (bug 654276)

Move cleanup code from _set_returncode to _async_waitpid_cb,
since _set_returncode expects an os.waitpid return value which
is inconveniently different from the returncode that is passed to
asyncio.AbstractChildWatcher.add_child_handler callbacks.

Bug: https://bugs.gentoo.org/654276

 pym/portage/dbapi/_MergeProcess.py | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pym/portage/dbapi/_MergeProcess.py 
b/pym/portage/dbapi/_MergeProcess.py
index 35591af16..bfbe387e4 100644
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/pym/portage/dbapi/_MergeProcess.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2013 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import io
@@ -251,8 +251,12 @@ class MergeProcess(ForkProcess):
# in order to avoid a race condition.
os._exit(1)
 
-   def _set_returncode(self, wait_retval):
-   ForkProcess._set_returncode(self, wait_retval)
+   def _async_waitpid_cb(self, *args, **kwargs):
+   """
+   Override _async_waitpid_cb to perform cleanup that is
+   not necessarily idempotent.
+   """
+   ForkProcess._async_waitpid_cb(self, *args, **kwargs)
if self.returncode == portage.const.RETURNCODE_POSTINST_FAILURE:
self.postinst_failure = True
self.returncode = os.EX_OK

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

[Zac Medico]

commit: b2ba35d4704172e8ddbfa0c98900f4b6ed20416b
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 20:03:05 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 20:03:43 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b2ba35d4

AbstractPollTask: call _unregister in _async_wait (bug 654276)

Subclasses of AbstractPollTask perform idempotent cleanup in
the _unregister method, so it's useful for _async_wait to call it
automatically. This allows for migration of various cleanup code from
_set_returncode to _unregister, for the purposes of bug 654276.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/AbstractPollTask.py | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index 0ce3594b4..2c5403751 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -114,8 +114,12 @@ class AbstractPollTask(AsynchronousTask):
 
return buf
 
+   def _async_wait(self):
+   self._unregister()
+   super(AbstractPollTask, self)._async_wait()
+
def _unregister(self):
-   raise NotImplementedError(self)
+   self._registered = False
 
def _log_poll_exception(self, event):
writemsg_level(
@@ -127,12 +131,10 @@ class AbstractPollTask(AsynchronousTask):
if self._registered:
if event & self._exceptional_events:
self._log_poll_exception(event)
-   self._unregister()
self.cancel()
self.returncode = self.returncode or os.EX_OK
self._async_wait()
elif event & self.scheduler.IO_HUP:
-   self._unregister()
self.returncode = self.returncode or os.EX_OK
self._async_wait()
 

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

[Zac Medico]

commit: 22fbdd3bf7de43c3bb216cd2da0623cd24280499
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 19:16:06 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 20:27:32 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=22fbdd3b

SpawnProcess: fix deprecated _set_returncode (bug 654276)

Move cleanup code from _set_returncode to _unregister, since
_set_returncode expects an os.waitpid return value which is
inconveniently different from the returncode that is passed to
asyncio.AbstractChildWatcher.add_child_handler callbacks.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/SpawnProcess.py | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index 78eb5e9c0..f592c543d 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -117,8 +117,7 @@ class SpawnProcess(SubProcess):
 
if isinstance(retval, int):
# spawn failed
-   self._unregister()
-   self._set_returncode((self.pid, retval))
+   self.returncode = retval
self._async_wait()
return
 
@@ -172,9 +171,11 @@ class SpawnProcess(SubProcess):
self._pipe_logger = None
self._async_waitpid()
 
-   def _set_returncode(self, wait_retval):
-   SubProcess._set_returncode(self, wait_retval)
-   self._cgroup_cleanup()
+   def _unregister(self):
+   SubProcess._unregister(self)
+   if self.cgroup is not None:
+   self._cgroup_cleanup()
+   self.cgroup = None
 
def _cancel(self):
SubProcess._cancel(self)

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

[Zac Medico]

commit: 9b013dc77de62604d151f82831ca3cd494788d5f
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 20:42:31 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 20:44:27 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b013dc7

EbuildMetadataPhase: fix deprecated _set_returncode (bug 654276)

Move cleanup code from _set_returncode to _async_waitpid_cb,
since _set_returncode expects an os.waitpid return value which
is inconveniently different from the returncode that is passed to
asyncio.AbstractChildWatcher.add_child_handler callbacks.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/EbuildMetadataPhase.py | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pym/_emerge/EbuildMetadataPhase.py 
b/pym/_emerge/EbuildMetadataPhase.py
index d146424c3..7a5310b83 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.SubProcess import SubProcess
@@ -49,14 +49,14 @@ class EbuildMetadataPhase(SubProcess):
if not parsed_eapi:
# An empty EAPI setting is invalid.
self._eapi_invalid(None)
-   self._set_returncode((self.pid, 1 << 8))
+   self.returncode = 1
self._async_wait()
return
 
self.eapi_supported = portage.eapi_is_supported(parsed_eapi)
if not self.eapi_supported:
self.metadata = {"EAPI": parsed_eapi}
-   self._set_returncode((self.pid, os.EX_OK << 8))
+   self.returncode = os.EX_OK
self._async_wait()
return
 
@@ -124,8 +124,7 @@ class EbuildMetadataPhase(SubProcess):
 
if isinstance(retval, int):
# doebuild failed before spawning
-   self._unregister()
-   self._set_returncode((self.pid, retval << 8))
+   self.returncode = retval
self._async_wait()
return
 
@@ -155,8 +154,12 @@ class EbuildMetadataPhase(SubProcess):
 
return True
 
-   def _set_returncode(self, wait_retval):
-   SubProcess._set_returncode(self, wait_retval)
+   def _async_waitpid_cb(self, *args, **kwargs):
+   """
+   Override _async_waitpid_cb to perform cleanup that is
+   not necessarily idempotent.
+   """
+   SubProcess._async_waitpid_cb(self, *args, **kwargs)
# self._raw_metadata is None when _start returns
# early due to an unsupported EAPI
if self.returncode == os.EX_OK and \

[gentoo-commits] proj/portage:master commit in: pym/_emerge/, pym/portage/util/_async/

[Zac Medico]

commit: b530e4e67b843837093e545cf81fd4ab8336d2c2
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 21:09:59 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 21:26:37 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b530e4e6

SubProcess: add_child_handler asyncio compat (bug 654276)

Migrate to asyncio's AbstractChildWatcher.add_child_handler
interface. Re-use PopenProcess code introduced in commit
be800bf0153a28ce034277d103a2021f93ac8b2e. Also remove the
child_watch_add method from SchedulerInterface, since there
are no more consumers.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/SubProcess.py | 58 ---
 pym/portage/util/_async/PopenProcess.py   | 20 ++---
 pym/portage/util/_async/SchedulerInterface.py |  1 -
 3 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py
index 3939de3ed..aa4778737 100644
--- a/pym/_emerge/SubProcess.py
+++ b/pym/_emerge/SubProcess.py
@@ -19,28 +19,7 @@ class SubProcess(AbstractPollTask):
_cancel_timeout = 1000 # 1 second
 
def _poll(self):
-   if self.returncode is not None:
-   return self.returncode
-   if self.pid is None:
-   return self.returncode
-   if self._registered:
-   return self.returncode
-
-   try:
-   # With waitpid and WNOHANG, only check the
-   # first element of the tuple since the second
-   # element may vary (bug #337465).
-   retval = os.waitpid(self.pid, os.WNOHANG)
-   except OSError as e:
-   if e.errno != errno.ECHILD:
-   raise
-   del e
-   retval = (self.pid, 1)
-
-   if retval[0] == 0:
-   return None
-   self._set_returncode(retval)
-   self._async_wait()
+   # Simply rely on _async_waitpid_cb to set the returncode.
return self.returncode
 
def _cancel(self):
@@ -71,20 +50,16 @@ class SubProcess(AbstractPollTask):
if self.returncode is not None:
self._async_wait()
elif self._waitpid_id is None:
-   self._waitpid_id = self.scheduler.child_watch_add(
-   self.pid, self._async_waitpid_cb)
+   self._waitpid_id = self.pid
+   self.scheduler._asyncio_child_watcher.\
+   add_child_handler(self.pid, 
self._async_waitpid_cb)
 
-   def _async_waitpid_cb(self, pid, condition, user_data=None):
+   def _async_waitpid_cb(self, pid, returncode):
if pid != self.pid:
raise AssertionError("expected pid %s, got %s" % 
(self.pid, pid))
-   self._set_returncode((pid, condition))
+   self.returncode = returncode
self._async_wait()
 
-   def _waitpid_cb(self, pid, condition, user_data=None):
-   if pid != self.pid:
-   raise AssertionError("expected pid %s, got %s" % 
(self.pid, pid))
-   self._set_returncode((pid, condition))
-
def _orphan_process_warn(self):
pass
 
@@ -100,7 +75,8 @@ class SubProcess(AbstractPollTask):
self._reg_id = None
 
if self._waitpid_id is not None:
-   self.scheduler.source_remove(self._waitpid_id)
+   self.scheduler._asyncio_child_watcher.\
+   remove_child_handler(self._waitpid_id)
self._waitpid_id = None
 
if self._files is not None:
@@ -126,21 +102,3 @@ class SubProcess(AbstractPollTask):
elif event & self.scheduler.IO_HUP:
self._unregister()
self._async_waitpid()
-
-   def _set_returncode(self, wait_retval):
-   """
-   Set the returncode in a manner compatible with
-   subprocess.Popen.returncode: A negative value -N indicates
-   that the child was terminated by signal N (Unix only).
-   """
-   self._unregister()
-
-   pid, status = wait_retval
-
-   if os.WIFSIGNALED(status):
-   retval = - os.WTERMSIG(status)
-   else:
-   retval = os.WEXITSTATUS(status)
-
-   self.returncode = retval
-

diff --git a/pym/portage/util/_async/PopenProcess.py 
b/pym/portage/util/_async/PopenProcess.py
index 3fb60d527..c1931327a 100644
--- a/pym/portage/util/_async/PopenProcess.py
+++ b/pym/portage/util/_async/PopenProcess.py
@@ -25,23 +25,9 @@ class PopenProcess(Su

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

[Zac Medico]

commit: 943bd29a388a7d113066bad660c9bfdb6fab0821
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 20:35:37 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 20:35:37 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=943bd29a

EbuildFetcher: fix deprecated _set_returncode (bug 654276)

Move cleanup code from _set_returncode to _async_waitpid_cb,
since _set_returncode expects an os.waitpid return value which
is inconveniently different from the returncode that is passed to
asyncio.AbstractChildWatcher.add_child_handler callbacks.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/EbuildFetcher.py | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index 466beac06..7c2cb3a58 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import copy
@@ -166,7 +166,7 @@ class _EbuildFetcherProcess(ForkProcess):
 
if not uri_map:
# Nothing to fetch.
-   self._set_returncode((self.pid, os.EX_OK << 8))
+   self.returncode = os.EX_OK
self._async_wait()
return
 
@@ -178,7 +178,7 @@ class _EbuildFetcherProcess(ForkProcess):
if self.prefetch and \
self._prefetch_size_ok(uri_map, settings, ebuild_path):
self.config_pool.deallocate(settings)
-   self._set_returncode((self.pid, os.EX_OK << 8))
+   self.returncode = os.EX_OK
self._async_wait()
return
 
@@ -327,8 +327,12 @@ class _EbuildFetcherProcess(ForkProcess):
if msg:
self.scheduler.output(msg, log_path=self.logfile)
 
-   def _set_returncode(self, wait_retval):
-   ForkProcess._set_returncode(self, wait_retval)
+   def _async_waitpid_cb(self, *args, **kwargs):
+   """
+   Override _async_waitpid_cb to perform cleanup that is
+   not necessarily idempotent.
+   """
+   ForkProcess._async_waitpid_cb(self, *args, **kwargs)
# Collect elog messages that might have been
# created by the pkg_nofetch phase.
# Skip elog messages for prefetch, in order to avoid duplicates.

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

[Zac Medico]

commit: 6d6e7debbd768b399bba5a32156bd59bb18f737d
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 20:19:24 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 20:27:32 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6d6e7deb

BinpkgFetcher: fix deprecated _set_returncode (bug 654276)

The _set_returncode method is deprecated because it expects
an os.waitpid return value which is inconveniently
different from the returncode that is passed to
asyncio.AbstractChildWatcher.add_child_handler callbacks.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/BinpkgFetcher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py
index 2bbc0a26f..8e651a1c7 100644
--- a/pym/_emerge/BinpkgFetcher.py
+++ b/pym/_emerge/BinpkgFetcher.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import functools
@@ -108,7 +108,7 @@ class _BinpkgFetcherProcess(SpawnProcess):
 
if pretend:
portage.writemsg_stdout("\n%s\n" % uri, noiselevel=-1)
-   self._set_returncode((self.pid, os.EX_OK << 8))
+   self.returncode = os.EX_OK
self._async_wait()
return
 

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

[Zac Medico]

commit: 08f03935b92e8fcacf95c583e389f349f5db67b8
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Apr 29 19:09:00 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Apr 29 20:27:32 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=08f03935

AbstractEbuildProcess: fix deprecated _set_returncode (bug 654276)

Move cleanup code from _set_returncode to _async_waitpid_cb,
since _set_returncode expects an os.waitpid return value which
is inconveniently different from the returncode that is passed to
asyncio.AbstractChildWatcher.add_child_handler callbacks.

Bug: https://bugs.gentoo.org/654276

 pym/_emerge/AbstractEbuildProcess.py | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pym/_emerge/AbstractEbuildProcess.py 
b/pym/_emerge/AbstractEbuildProcess.py
index 03c834912..2ed175750 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -64,7 +64,7 @@ class AbstractEbuildProcess(SpawnProcess):
"since PORTAGE_BUILDDIR does not exist: '%s'") % \
(self.phase, self.settings['PORTAGE_BUILDDIR'])
self._eerror(textwrap.wrap(msg, 72))
-   self._set_returncode((self.pid, 1 << 8))
+   self.returncode = 1
self._async_wait()
return
 
@@ -355,8 +355,12 @@ class AbstractEbuildProcess(SpawnProcess):
["%s received strange poll event: %s\n" % \
(self.__class__.__name__, event,)])
 
-   def _set_returncode(self, wait_retval):
-   SpawnProcess._set_returncode(self, wait_retval)
+   def _async_waitpid_cb(self, *args, **kwargs):
+   """
+   Override _async_waitpid_cb to perform cleanup that is
+   not necessarily idempotent.
+   """
+   SpawnProcess._async_waitpid_cb(self, *args, **kwargs)
 
if self._exit_timeout_id is not None:
self.scheduler.source_remove(self._exit_timeout_id)

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

[Andreas Sturmlechner]

commit: 0a162eb05ca531986a84643db40b94a6f7071399
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 21:16:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 21:17:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a162eb0

app-editors/kile: Drop old snapshot

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-editors/kile/Manifest |  1 -
 app-editors/kile/kile-2.9.91_p20180208.ebuild | 73 ---
 2 files changed, 74 deletions(-)

diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index b9a696dfb46..434643de4f5 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,3 +1,2 @@
 DIST kile-2.9.91_p20171209.tar.gz 3624273 BLAKE2B 
d6e4798869b8f5be7a2a6b00b1b067957245373f560a7485334ce1f3f932670a0cb8ef0b551fde2eea1d54a6114e8405025dbd3daea587a2d30b74fe614d332e
 SHA512 
b7e4a6e434057cf04e8712f543cdd74a40659843b1e2777d0a031b5a665e1de34e36ec9b3f5d9bd3bf9202f9dca8595fcee9a81ab4875bc4b6da3a2fb449b2c6
-DIST kile-2.9.91_p20180208.tar.gz 3635083 BLAKE2B 
0579dac072a97f152009a4462759f40bfcdff4d4b6d463affcba7d71cda023f8c43d2173511bd268be22f2cc4412f091ec7ab70793e16781f5cf2023b1303db0
 SHA512 
24bc9221524f2213b0651d96273f35871a5fdf5c65edc4a5d72cb6e2635b1d23e55549ba60172a94691b7793d0a57e116cd94010be28e61231b8ee59b3f369dd
 DIST kile-2.9.91_p20180419.tar.gz 3635059 BLAKE2B 
1f7c20e8881bcdd20f3230e8a8608dd816a5f00435734941280c4da75ca6460514a1c3dc0f3962d684f3e0a458ae427772cdf1cafbbe8f44be7a9e804ffcec05
 SHA512 
bb50f169d6e9630cc463f4615af06826608b640a7e43d5d671477fad6a199fcdc02c38138c8a211ce563f4e1f82ddd7cceea29a3e60b43e35c52076958818721

diff --git a/app-editors/kile/kile-2.9.91_p20180208.ebuild 
b/app-editors/kile/kile-2.9.91_p20180208.ebuild
deleted file mode 100644
index 61b5aa39876..000
--- a/app-editors/kile/kile-2.9.91_p20180208.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=be912e1b8644053d80e5e37d3ccd07448670fb10
-KDE_HANDBOOK="forceoptional"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://kile.sourceforge.io/";
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +png"
-
-DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdoctools)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep khtml)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep ktexteditor)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_kdeapps_dep okular)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtscript)
-   $(add_qt_dep qttest)
-   $(add_qt_dep qtwidgets)
-   pdf? ( app-text/poppler[qt5] )
-"
-RDEPEND="${DEPEND}
-   !app-editors/kile:4
-   $(add_kdeapps_dep konsole)
-   $(add_kdeapps_dep okular 'pdf?')
-   virtual/latex-base
-   virtual/tex-base
-   pdf? (
-   >=app-text/texlive-core-2014
-   app-text/ghostscript-gpl
-   )
-   png? (
-   app-text/dvipng
-   virtual/imagemagick-tools[png?]
-   )
-"
-
-DOCS=( kile-remote-control.txt )
-
-src_prepare() {
-   kde5_src_prepare
-
-   # I know upstream wants to help us but it doesn't work..
-   sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
-   -i CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package pdf Poppler)
-   )
-
-   kde5_src_configure
-}

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

[Andreas Sturmlechner]

commit: cf6994e764e95732f43ab5608b8012074cd1de7a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 21:12:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 21:17:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6994e7

app-editors/kile: Add 2.9.91_p20180419 snapshot

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-editors/kile/Manifest |  1 +
 app-editors/kile/kile-2.9.91_p20180419.ebuild | 75 +++
 2 files changed, 76 insertions(+)

diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 95ec48b0920..b9a696dfb46 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,2 +1,3 @@
 DIST kile-2.9.91_p20171209.tar.gz 3624273 BLAKE2B 
d6e4798869b8f5be7a2a6b00b1b067957245373f560a7485334ce1f3f932670a0cb8ef0b551fde2eea1d54a6114e8405025dbd3daea587a2d30b74fe614d332e
 SHA512 
b7e4a6e434057cf04e8712f543cdd74a40659843b1e2777d0a031b5a665e1de34e36ec9b3f5d9bd3bf9202f9dca8595fcee9a81ab4875bc4b6da3a2fb449b2c6
 DIST kile-2.9.91_p20180208.tar.gz 3635083 BLAKE2B 
0579dac072a97f152009a4462759f40bfcdff4d4b6d463affcba7d71cda023f8c43d2173511bd268be22f2cc4412f091ec7ab70793e16781f5cf2023b1303db0
 SHA512 
24bc9221524f2213b0651d96273f35871a5fdf5c65edc4a5d72cb6e2635b1d23e55549ba60172a94691b7793d0a57e116cd94010be28e61231b8ee59b3f369dd
+DIST kile-2.9.91_p20180419.tar.gz 3635059 BLAKE2B 
1f7c20e8881bcdd20f3230e8a8608dd816a5f00435734941280c4da75ca6460514a1c3dc0f3962d684f3e0a458ae427772cdf1cafbbe8f44be7a9e804ffcec05
 SHA512 
bb50f169d6e9630cc463f4615af06826608b640a7e43d5d671477fad6a199fcdc02c38138c8a211ce563f4e1f82ddd7cceea29a3e60b43e35c52076958818721

diff --git a/app-editors/kile/kile-2.9.91_p20180419.ebuild 
b/app-editors/kile/kile-2.9.91_p20180419.ebuild
new file mode 100644
index 000..db8abd6b9d1
--- /dev/null
+++ b/app-editors/kile/kile-2.9.91_p20180419.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=f87c242a61292ea254fed10f3e215a8d3e4b862a
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://kile.sourceforge.io/";
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="FDL-1.2 GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +png"
+
+DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdoctools)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep ktexteditor)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_kdeapps_dep okular)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtscript)
+   $(add_qt_dep qttest)
+   $(add_qt_dep qtwidgets)
+   pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+   !app-editors/kile:4
+   $(add_kdeapps_dep konsole)
+   $(add_kdeapps_dep okular 'pdf?')
+   virtual/latex-base
+   virtual/tex-base
+   pdf? (
+   >=app-text/texlive-core-2014
+   app-text/ghostscript-gpl
+   )
+   png? (
+   app-text/dvipng
+   virtual/imagemagick-tools[png?]
+   )
+"
+
+DOCS=( kile-remote-control.txt )
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+   kde5_src_prepare
+
+   # I know upstream wants to help us but it doesn't work..
+   sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
+   -i CMakeLists.txt || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package pdf Poppler)
+   )
+
+   kde5_src_configure
+}

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

[Sergei Trofimovich]

commit: f825d22a2e3ccb85bc5a1fa0c8a06b2f8d1f0b61
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr 29 20:25:17 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 29 20:25:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f825d22a

sys-fs/encfs: keyworded newer versions for sparc

Reported-by: [Arfrever]
Bug: https://bugs.gentoo.org/630486
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-fs/encfs/encfs-1.9.4.ebuild | 2 +-
 sys-fs/encfs/encfs-1.9.5.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fs/encfs/encfs-1.9.4.ebuild b/sys-fs/encfs/encfs-1.9.4.ebuild
index fd7b34ca752..258bb0115cb 100644
--- a/sys-fs/encfs/encfs-1.9.4.ebuild
+++ b/sys-fs/encfs/encfs-1.9.4.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="

diff --git a/sys-fs/encfs/encfs-1.9.5.ebuild b/sys-fs/encfs/encfs-1.9.5.ebuild
index fd7b34ca752..258bb0115cb 100644
--- a/sys-fs/encfs/encfs-1.9.5.ebuild
+++ b/sys-fs/encfs/encfs-1.9.5.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="

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

[Brian Evans]

commit: b081514850b14f9d2e434865385f1994e456dfc9
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Apr 29 20:22:29 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Apr 29 20:24:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0815148

dev-db/mariadb: Add net-libs/libnsl dependencies

Closes: https://bugs.gentoo.org/643038
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-db/mariadb/Manifest |2 -
 dev-db/mariadb/mariadb-10.2.12.ebuild   |  976 --
 dev-db/mariadb/mariadb-10.2.13.ebuild   | 1007 ---
 dev-db/mariadb/mariadb-10.2.14.ebuild   |6 +-
 dev-db/mariadb/mariadb-10.3.5_rc.ebuild |   24 +-
 5 files changed, 23 insertions(+), 1992 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b87e6c83080..6c694917ebe 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,8 +5,6 @@ DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 
38df67a1b26aab559e41f44b129f2e57388
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 
40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5
 SHA512 
c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 
1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f
 SHA512 
db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 
8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07
 SHA512 
fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a
-DIST mariadb-10.2.12.tar.gz 72818636 BLAKE2B 
50a72b8096ae8bd5dc635352fc35d22322a0d7cf415e45883898307050ec547a79c66d51ab0ce311f1895eb178afeb49664fb434af77f9ff2b9aedef0aea85bc
 SHA512 
8d3d3c84d4a01d6047e4f2b6802eb802e1f6a7b0e10e981c7ef9fdd27a5a25baab0af47a21b8637f4cbb9d21ef3bcc85097c5fdb8745c2a79040ab87fecb5a7b
-DIST mariadb-10.2.13.tar.gz 72591913 BLAKE2B 
5abc3fefc5b02f099254b8a3a832a20793989a316efdc22b146cf78b5b83fcb3e4e617fce1b9161194e3f54b7bb469de3bb656319048fb137915af24e21f6aa2
 SHA512 
4c6038f134a32f50daa3172b367588240ef20a6f6cfe36d830e427cf52d315284481f5300d3db32d9e81ddd352dbea01fd4230f4e4d79e175d97c0c49331a4ca
 DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B 
ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c
 SHA512 
12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026
 DIST mariadb-10.3.5.tar.gz 70945381 BLAKE2B 
10f5f08a64b3d046f8255a5ea9bb1661b7a88d130b0a89b41c8f98abbe3c04cc13154e1ad6c012ef97a396f055ca5d748998f1e7d6dc89ca73a3b61f70749457
 SHA512 
e7f2ffd38da4e4dbd214bc97e30216682b6f8ca368bcbd5717fb408a6110f26da4472cd7ac0d288c817eb9c6426a063cff8d582e03fe8a1219c0d70508e5a004
 DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 
150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807
 SHA512 
eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c

diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild 
b/dev-db/mariadb/mariadb-10.2.12.ebuild
deleted file mode 100644
index 73d4cd9e20e..000
--- a/dev-db/mariadb/mariadb-10.2.12.ebuild
+++ /dev/null
@@ -1,976 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170926-1321Z"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
-   java-pkg-opt-2 user cmake-utils multilib-minimal
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-   SRC_URI="${SRC_URI}
-   mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-   
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2";
-fi
-
-HOMEPAGE="http://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}

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

[Brian Evans]

commit: 18779934c83275fa077d7f4d7a8f6ec72a4316d5
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Apr 29 19:57:18 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Apr 29 20:24:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18779934

eclass: mysql - Add net-libs/libnsl for bug 643038

Bug: https://bugs.gentoo.org/643038

 eclass/mysql-multilib-r1.eclass | 3 ++-
 eclass/mysql-v2.eclass  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index ebc054f0fef..48f300f9bbc 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-20178Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mysql-multilib-r1.eclass
@@ -187,6 +187,7 @@ DEPEND="
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
sys-libs/ncurses:0=
+   net-libs/libnsl:0=
 "
 
 # prefix: first need to implement something for #196294

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 766d5641014..1b1aa333274 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mysql-v2.eclass
@@ -273,6 +273,7 @@ DEPEND="
>=sys-apps/sed-4
>=sys-apps/texinfo-4.7-r1
>=sys-libs/zlib-1.2.3
+   net-libs/libnsl
 "
 # TODO: add this as a dep if it is moved from the overlay
 #  !dev-db/mariadb-native-client[mysqlcompat]

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

[Brian Evans]

commit: 235ae287011539cfc256a22aac5081d4f348609c
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Apr 29 20:23:33 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Apr 29 20:24:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235ae287

eclass: Add MULTILIB_USEDEP to libnsl in mysql-multilib-r1

 eclass/mysql-multilib-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 48f300f9bbc..2f05c7943ed 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -187,7 +187,7 @@ DEPEND="
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
sys-libs/ncurses:0=
-   net-libs/libnsl:0=
+   net-libs/libnsl:0=[${MULTILIB_USEDEP}]
 "
 
 # prefix: first need to implement something for #196294

[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/

[Andreas Hüttel]

commit: 8c7fe7564dc60dd6caa3afd787728acb43fc7abe
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 29 20:07:56 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 29 20:08:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7fe756

sys-devel/binutils: Revision bump (no keywords), 2.30 patchset 2

Bug: https://bugs.gentoo.org/502492
Bug: https://bugs.gentoo.org/647798
Bug: https://bugs.gentoo.org/647296
Bug: https://bugs.gentoo.org/649690
Bug: https://bugs.gentoo.org/651576
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-devel/binutils/Manifest|   1 +
 sys-devel/binutils/binutils-2.30-r2.ebuild | 417 +
 2 files changed, 418 insertions(+)

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 325f29e412a..67acde949fd 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -9,4 +9,5 @@ DIST binutils-2.28.1.tar.bz2 28120394 BLAKE2B 
3a0ed2bcf0c859638546b7460d9e6f0a55
 DIST binutils-2.29.1-patches-3.tar.xz 20904 BLAKE2B 
5549cb2412123e4ad3a13935762cc0dca46215950dbf38a149caf4c6416da382a0fd7ecffe97b10bce4dfdcef5edc2673d49bb21e9d37be37e33b454a8c2bc1a
 SHA512 
ba54efaf9e9f668d2922972acd2cdf5c3e6f174cfcc73d29953ab4ba6e157ce0cb500c583568a4e3b92c9d30c394a327f29b51292acc66f8d3f20f5eae2a
 DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 
83de518a27bae0f13c57b1979493dd7f7cabae424cff5e8495d1f064da24b6ef9e1c19d1d1adad2dca7142372782023f66b4b4223170a49b96ba3834266fe878
 SHA512 
4063d3426922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592
 DIST binutils-2.30-patches-1.tar.xz 13884 BLAKE2B 
86d160144e4ae3213838ccd07d008a96f210dbe8d894f2043420bd0003f8e0611564f77dadf60780da61278bbac41130922703fef69ba8ac451bcae5d9c65cf4
 SHA512 
cf38328bac920c1159e73727a9bb46bd462fa60650c90ee8a3d6221d447c678fdd79c6886efc52e35897d535dd717c1dc363bcb3f201aacd15ace078694456da
+DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B 
a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f
 SHA512 
1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 
2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868
 SHA512 
e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839

diff --git a/sys-devel/binutils/binutils-2.30-r2.ebuild 
b/sys-devel/binutils/binutils-2.30-r2.ebuild
new file mode 100644
index 000..1261d38d4f5
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.30-r2.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/";
+LICENSE="GPL-3+"
+IUSE="+cxx doc multitarget +nls static-libs test"
+
+# Variables that can be set here:
+# PATCH_VER  - the patchset version
+#  Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#- Default: PV
+# PATCH_DEV  - Use download URI 
https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#  for the patchsets
+#  Default: dilfridge :)
+
+PATCH_VER=2
+
+case ${PV} in
+   )
+   BVER="git"
+   EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git";
+   inherit git-r3
+   S=${WORKDIR}/binutils
+   EGIT_CHECKOUT_DIR=${S}
+   ;;
+   *)
+   BVER=${PV}
+   SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz 
https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz";
+   ;;
+esac
+SLOT="${BVER}"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+   
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz";
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+   if [[ ${CATEGORY} == cross-* ]] ; then
+   export CTARGET=${CATEGORY#cross-}
+   fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+   >=sys-devel/binutils-config-3
+   sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+   doc? ( sys-apps/texinfo )
+   test? ( dev-util/de

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

[Anthony G. Basile]

commit: d49d82a85320d07d8e27d19c5e283b2b8ac6ee83
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Apr 29 19:46:54 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Apr 29 19:47:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49d82a8

sys-libs/uclibc-ng: remove older unstable (and broken) versions

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-libs/uclibc-ng/Manifest|   2 -
 sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild | 401 -
 sys-libs/uclibc-ng/uclibc-ng-1.0.29.ebuild | 401 -
 3 files changed, 804 deletions(-)

diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index 7955023afa7..41ecc16a496 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -1,4 +1,2 @@
 DIST uClibc-ng-1.0.26.tar.bz2 2285709 BLAKE2B 
6276f1d080f0c90b5a0ce4a4fc3556070852ad157b9c0a15305108b2f46a2d0f5371dde12ac0a8f05cad7db942cceb8057b5ef351e100a52609f2ebdc6b19634
 SHA512 
48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b
-DIST uClibc-ng-1.0.28.tar.bz2 2299119 BLAKE2B 
1f31b9a98fd669bad42ceeb1b8c33fd65994b0252707b532ad8a71c12f8bd0c4d99bc89ad919a1fbc2526efcf25d2e9f823f889c7c009da98e861269399c97a3
 SHA512 
9e77fece126b6ba6f9903a2fc5689a9f7efb335e38914a3806a7e0831033f5373a4b07e942d28876ed81a6a80b2d64b0fa122dccc4874db263d2d5fb7fef99ba
-DIST uClibc-ng-1.0.29.tar.bz2 2290382 BLAKE2B 
f6968397daaa66d75dff5508bdff4a3d05453a0657474b9ff167d14a0b0d715f22c61708060243efd1064922b4dd1e84987fe9cf1b13aa7bdb85e27b8c65a3b1
 SHA512 
7ab00f2a1c7a87f8d35b7bc51b7a8ad0f9120d8c117be8c03720c09b17d7f9f8b8a633ef7efa3e69f8d292b0357580f055f1542ad2257cff337056c9d3b5e207
 DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 
21888dfe5a68f83b7ba56bb557ecc5aa19fd75cedc82f2ed48073f47655888719feb27943e0309f8101a24fd2fd9165af31d5679f21c00b12f27ebfccf354bac
 SHA512 
ddd1d91dcfdf7be8471afecf13196563ad348c41e2fa8b63ae50b83f103cf8ed8d9f003b51a54a58db2935b84692b7c011a4779582f30610ede44cb583aae742

diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild 
b/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
deleted file mode 100644
index 3b31357d804..000
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.28.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
-   inherit git-r3
-   MY_P=uclibc-ng-${PV}
-else
-   MY_P=uClibc-ng-${PV}
-fi
-
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://uclibc-ng.org/";
-if [[ ${PV} != "" ]] ; then
-   PATCH_VER=""
-   SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2";
-   KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 symlink-compat headers-only"
-RESTRICT="strip"
-
-# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
-#will delete the ld.so sym link prematurely and break the system. So we
-#will hard block and give manual migration instructions.
-# 2) Currently uclibc and uclibc-ng's iconv are in bad shape.  We've been using
-#the breakout library.  The disadvantage here is that we have to sprinkle
-#LDFAGS=-liconv on build systems that need to link against libiconv.
-RDEPEND="
-   !!sys-libs/uclibc
-   iconv? ( dev-libs/libiconv )"
-
-S=${WORKDIR}/${MY_P}
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CHOST} == ${CTARGET} ]] ; then
-   if [[ ${CATEGORY} == cross-* ]] ; then
-   export CTARGET=${CATEGORY#cross-}
-   fi
-fi
-
-is_crosscompile() {
-   [[ ${CHOST} != ${CTARGET} ]]
-}
-
-alt_build_kprefix() {
-   if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
-   echo /usr/include
-   else
-   echo /usr/${CTARGET}/usr/include
-   fi
-}
-
-just_headers() {
-   use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-   # XXX: this wont work for a toolchain which is bi-endian, but we
-   #  dont have any such thing at the moment, so not a big deal
-   touch "${T}"/endian.s
-   $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-   case $(file "${T}"/endian.o) in
-   *" MSB "*) echo "BIG";;
-   *" LSB "*) echo "LITTLE";;
-   *) echo "NFC";;
-   esac
-   rm -f "${T}"/endian.{s,o}
-}
-
-kconfig_q_opt() {
-   local flag=$1; shift
-   case ${flag} in
-   y|n) ;;
-   *) flag=$(usex ${flag} y n) ;;
-   esac
-
-   local var="defs_${flag}"
-   eval "${var}+=( $* )"
-}
-
-get_opt() {
-   (
-   unset ${1}

[gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/files/, sys-libs/uclibc-ng/

[Anthony G. Basile]

commit: 4fdf45d8786ac98ac9f1240948453594f3460fba
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Apr 29 19:46:13 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Apr 29 19:47:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdf45d8

sys-libs/uclibc-ng: fix ld.so.cache on amd64

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/uclibc-ng-1.0.30-fix-ld.so.cache.patch   | 48 ++
 ...ng-1.0.30.ebuild => uclibc-ng-1.0.30-r1.ebuild} |  3 ++
 2 files changed, 51 insertions(+)

diff --git a/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch 
b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch
new file mode 100644
index 000..6b13e0890d2
--- /dev/null
+++ b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch
@@ -0,0 +1,48 @@
+commit 92d250d387e247029900c9074150f45866b29781
+Author: Waldemar Brodkorb 
+Date:   Sun Apr 29 19:34:11 2018 +0200
+
+Revert "ldconfig: add glibc compatibility fix"
+
+This reverts commit 2a3bb4daf5778c5875674cd26a3c75b3d460a042.
+
+This is breaking ld.so.cache usage. Seen on Gentoo/amd64.
+
+Reported-by: "Anthony G. Basile" 
+
+diff --git a/utils/ldconfig.c b/utils/ldconfig.c
+index 58939d689..e6b788118 100644
+--- a/utils/ldconfig.c
 b/utils/ldconfig.c
+@@ -184,9 +184,10 @@ static char *readsoname(char *name, FILE *infile, int 
expected_type,
+   res = readsoname32(name, infile, expected_type, type);
+   else {
+   res = readsoname64(name, infile, expected_type, type);
+-
+-  // For 64-bit glibc compatibility
+-  *type |= FLAG_X8664_LIB64;
++#if 0
++  /* relies on multilib support which we dont have ... */
++  *type |= LIB_ELF64;
++#endif
+   }
+ 
+   return res;
+@@ -757,7 +758,7 @@ void cache_print(void)
+ 
+   for (fd = 0; fd < header->nlibs; fd++) {
+   printf("\t%s ", strs + libent[fd].sooffset);
+-  switch (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) {
++  switch (libent[fd].flags & ~LIB_ELF64) {
+   case LIB_DLL:
+   printf("(libc4)");
+   break;
+@@ -770,7 +771,7 @@ void cache_print(void)
+   case LIB_ELF_LIBC5:
+   case LIB_ELF_LIBC6:
+   printf("(libc%d%s)",
+- (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) 
+ 3,
++ (libent[fd].flags & ~LIB_ELF64) + 3,
+  libent[fd].flags & LIB_ELF64 ? "/64" : "");
+   break;
+   default:

diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.30.ebuild 
b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
similarity index 99%
rename from sys-libs/uclibc-ng/uclibc-ng-1.0.30.ebuild
rename to sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
index 3b31357d804..ca35a2cc5bc 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.30.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
@@ -252,6 +252,9 @@ src_prepare() {
# We want to get rid of this and just have ABI = 0.
eapply "${FILESDIR}"/uclibc-compat-r1.patch
 
+   # Critical fix for ld.so.cache
+   eapply "${FILESDIR}"/${P}-fix-ld.so.cache.patch
+
# We need to change the major.minor.sublevel of uclibc-ng.
# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
# If we really want the ABI bump, we'll have to hack the gcc

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

[Sergei Trofimovich]

commit: 0a81a58941df3666319fcd943f43b205fb3c58d9
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Apr 29 19:11:37 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 29 19:41:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a81a589

media-gfx/exiv2: stable 0.26_p20180319 for sparc

Bug: https://bugs.gentoo.org/647808
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

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

diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild 
b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 09c446bf32e..0f76ab11066 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = * ]]; then
 else
COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris 
~x86-solaris"
 fi
 inherit cmake-multilib python-any-r1
 

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

[Sergei Trofimovich]

commit: 917c291406209814c569d8e1820a8ec96608f77c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Apr 29 19:10:12 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 29 19:41:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917c2914

app-admin/eselect: stable 1.4.12 for sparc

Bug: https://bugs.gentoo.org/653746
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

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

diff --git a/app-admin/eselect/eselect-1.4.12.ebuild 
b/app-admin/eselect/eselect-1.4.12.ebuild
index 09f28f29d91..ed032c86e34 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz";
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed

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

[Sergei Trofimovich]

commit: 5393cdf47136677cbf8455f937b992f2082dc55b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Apr 29 19:39:47 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr 29 19:41:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5393cdf4

sys-fs/encfs: keyworded 1.9.2 for sparc

Bug: https://bugs.gentoo.org/630486
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 sys-fs/encfs/encfs-1.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index 12b573ed9cb..f51c6b663be 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="

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

[Andreas Sturmlechner]

commit: 55dd8bb9d34c6a2a9f538e9b6fdbd4d2d4bb7c20
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 19:09:27 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 19:09:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55dd8bb9

sys-auth/elogind: 236.1 version bump

Bug: https://bugs.gentoo.org/644118
Bug: https://bugs.gentoo.org/649834
Closes: https://bugs.gentoo.org/654166
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-auth/elogind/Manifest   |   1 +
 sys-auth/elogind/elogind-236.1.ebuild   | 118 
 sys-auth/elogind/files/elogind-236.1-docs.patch |  24 +
 3 files changed, 143 insertions(+)

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 25d08cb3a62..fb21f216ddf 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1 +1,2 @@
 DIST elogind-235.2.tar.gz 975652 BLAKE2B 
c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378
 SHA512 
6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
+DIST elogind-236.1.tar.gz 1050387 BLAKE2B 
d0d295210eb07374cae738f55b472d9410f68c9e7f318dd736b5fcb5c0409c3da144988d8042b1e3b103d34d7a02471b4e316a924c9b1640c605fc73972de3da
 SHA512 
ab4989f4467ef001bb8b837035bee870beaf5ec5fa2389649bdcad2fe7bbf82691bfd3176cf9a3bf3b5c232c77210f431f2d38ebdbfd09f5a7868cd50e476c59

diff --git a/sys-auth/elogind/elogind-236.1.ebuild 
b/sys-auth/elogind/elogind-236.1.ebuild
new file mode 100644
index 000..4a29aef9281
--- /dev/null
+++ b/sys-auth/elogind/elogind-236.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info meson pam udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+acl debug doc +pam +policykit selinux"
+
+COMMON_DEPEND="
+   sys-apps/util-linux
+   sys-libs/libcap
+   virtual/libudev:=
+   acl? ( sys-apps/acl )
+   pam? ( virtual/pam )
+   selinux? ( sys-libs/libselinux )
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.2
+   app-text/docbook-xml-dtd:4.5
+   app-text/docbook-xsl-stylesheets
+   dev-util/gperf
+   dev-util/intltool
+   sys-devel/libtool
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   !sys-apps/systemd
+"
+PDEPEND="
+   sys-apps/dbus
+   policykit? ( sys-auth/polkit )
+"
+
+PATCHES=( "${FILESDIR}/${P}-docs.patch" )
+
+pkg_setup() {
+   local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+   if use kernel_linux; then
+   linux-info_pkg_setup
+   fi
+}
+
+src_prepare() {
+   default
+   xdg_environment_reset
+}
+
+src_configure() {
+   local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 
2)"
+   local cgroupmode="legacy"
+
+   if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
+   cgroupmode="hybrid"
+   elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
+   cgroupmode="unified"
+   fi
+
+   local emesonargs=(
+   -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+   -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+   -Dpamlibdir=$(getpam_mod_dir)
+   -Dudevrulesdir="$(get_udevdir)"/rules.d
+   --libdir="${EPREFIX}"/usr/$(get_libdir)
+   -Drootlibdir="${EPREFIX}"/$(get_libdir)
+   -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
+   -Drootprefix="${EPREFIX}/"
+   
-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+   -Dman=auto
+   -Dsmack=true
+   -Dcgroup-controller=openrc
+   -Ddefault-hierarchy=${cgroupmode}
+   -Ddefault-kill-user-processes=false
+   -Dacl=$(usex acl true false)
+   -Ddebug=$(usex debug elogind false)
+   --buildtype $(usex debug debug release)
+   -Dhtml=$(usex doc auto false)
+   -Dpam=$(usex pam true false)
+   -Dselinux=$(usex selinux true false)
+   )
+
+   meson_src_configure
+}
+
+src_install() {
+   DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
+   meson_src_install
+
+   newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+   sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > 
${PN}.conf || die
+   newconfd ${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+   if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
+   elog "elogind is cu

[gentoo-commits] repo/user/ssnb:master commit in: app-emulation/opennebula/, app-emulation/opennebula/files/

[Samuel Bernardo]

commit: 6ded7a27e6253a7e68d472b19158ef257d54f6a4
Author: Samuel Bernardo  gmail  com>
AuthorDate: Sun Apr 29 19:07:17 2018 +
Commit: Samuel Bernardo  gmail  com>
CommitDate: Sun Apr 29 19:07:17 2018 +
URL:https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=6ded7a27

correct opennebula service dependency with mysqld

 app-emulation/opennebula/Manifest | 2 +-
 app-emulation/opennebula/files/opennebula.service | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/opennebula/Manifest 
b/app-emulation/opennebula/Manifest
index c86c762..10c1ecd 100644
--- a/app-emulation/opennebula/Manifest
+++ b/app-emulation/opennebula/Manifest
@@ -13,7 +13,7 @@ AUX opennebula-scheduler.service 351 BLAKE2B 
c99be34fbcda250ed5aec3101257a4be8d0
 AUX opennebula-sunstone.service 552 BLAKE2B 
cf5075f188055c19830e2052e6581970b2b8e0eed2e4eff938d0ecd91fc99032b6304576a7ca9b1054d3f0eec6a643e84db81fb74bc38daf80a6824c96a439a7
 SHA512 
4d1b7fd67df1f98485f31432fce5800fbee430e03bcfb9463c7b6e03d2ee1ce804ff5bc07d1b3d2ba3fe02f3b4f21db4d4a19c3c2890869af1684c217de03433
 AUX opennebula.confd 189 BLAKE2B 
1c2899def707c77fc5abff2538fc3d106a20d8ccb7d4f5240814dbe7f00cf046934350c825187b0194b2215b5dfde4e3812dd43b6ab8258cbcb554fee4a40cf3
 SHA512 
78378b3046cb2d267502349250155f1f805f86465219cf8644064cf3227323b270777f73637fe5e2136691e8564c99b47a61aae47dda9d6c1177bf50b551d746
 AUX opennebula.initd 913 BLAKE2B 
3ab4d3c1d1d8644e909422b89526f23e168c8b0f4d08495b0844df366438292bc6bccfc4030b51bbcd93d0b60df10b48faaa142ee2ded285b9772a285cc805a2
 SHA512 
74fb19970136d6d1b4a7b9d6279249c47ca7cbb6e4e9f90555a6ffd93963957fbc9ccb1b97c9355211057d715fb947aea968db40f7d89d61fff34c3b1331879e
-AUX opennebula.service 1195 BLAKE2B 
661f42d957b1b12d5d61a7df86e37e4a3e7bdc07ab6bfbba55477bca2184e32b8868d0eed0e8743073fdc4bf219dd89be68d8a2ec71fefd1a0d7b54f39b6f5ea
 SHA512 
70297ac8a1ae8b577a962a8ece3917ac3ec77f980f3dfe620fd00f17fad7c6b8ea5e82841fb3b806119cc561d5bdbfd69f55df9c26c9e4f0609c1a7d0e3db79b
+AUX opennebula.service 1210 BLAKE2B 
8962a8688ee72892c9ebcfd61972ac139799e55f036e36afb505c935c4563c903b39eb78c24e332df36e8234039bed73a01139c5cc3645d7327ccde7cc1a4bf0
 SHA512 
34758f99f97cc9cac2edfd84e45072dc466a7a8fb4f4d7df5d83f8643aaa93cfca100e8740cb71406b85d9ca52a59757c9fff234a27b3dd8fd078d3e4a0ebce6
 AUX sunstone-server.confd 166 BLAKE2B 
88409cce348709fa0dc1794dadefef623245ca838ce4e4cffea3f99deebf93f969b12761ec3761e12c5677a937e4cb3ccf112ad5b1811c1f986fff4d87b11ec4
 SHA512 
fe70685cd1aad949c8f46c85764ff62f67b55477879b5d125f2f5ed176d13171762e9ef953b6d5cd6e27d4fb9f503b9fe7ac4ef0fa1f9790f86f9698d3b82079
 AUX sunstone-server.initd 788 BLAKE2B 
e49f736213f0575d9a040058eff5accd36b00070ed767bb0de39fb0e8e9ae05ed5b34ddf2ae224530b04fd506e7b1f2a4c73ec69ac608b4a5d231bc07653ae6b
 SHA512 
fa2d6ee6e86e2497adc7792e67140810761c7403ffec3a9def57e7568180c99f17561381462648c8cbe43b12e4b36a146e48973de979b321002c1a566beb727e
 AUX tmpfilesd.opennebula.conf 85 BLAKE2B 
f9a99645c91bd1c700f2bcb8c2fb7b2d775d3e362b69c664c5aac43b3d771fb1394fefe68b6ddd734e8e625133f3d965d8a14b38da414b355d3a662567d81225
 SHA512 
d9ce8bd7b6be43e3129acf51eb6b17b06cecd06e4d92a064a168b0296ae3b5703b80255806e0e7f8e533d291e3e65f38cc4a4372a4d811eae725775fdd54e44a

diff --git a/app-emulation/opennebula/files/opennebula.service 
b/app-emulation/opennebula/files/opennebula.service
index 07ca627..5ec6358 100644
--- a/app-emulation/opennebula/files/opennebula.service
+++ b/app-emulation/opennebula/files/opennebula.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OpenNebula management
-After=syslog.target network.target local-fs.target remote-fs.target
+After=syslog.target network.target local-fs.target remote-fs.target 
mysqld.service
 Requires=mysqld.service
 #Before=opennebula-scheduler.service
 #BindTo=opennebula-scheduler.service

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

[Andreas Sturmlechner]

commit: 63d277e65e1eae1d3ccad20ca26376c98b1f1d17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 18:32:22 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 18:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63d277e6

kde-plasma/plasma-workspace: Cleanup nonexistent dep

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
index 59d245fc855..02ce7d9a59d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
-   calendar? ( || ( $(add_frameworks_dep kholidays) $(add_kdeapps_dep 
kholidays) ) )
+   calendar? ( $(add_frameworks_dep kholidays) )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( $(add_frameworks_dep prison) )

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

[Andreas Sturmlechner]

commit: a50c01548737f241fd650aab0fbf432730abb763
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 18:41:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 18:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50c0154

media-sound/coquillo: 2.0.0 version bump

See also: https://github.com/sjuvonen/coquillo/issues/5#issuecomment-385269883

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/coquillo/Manifest  |  1 +
 media-sound/coquillo/coquillo-2.0.0.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
index d194a409c23..e0a914d8f28 100644
--- a/media-sound/coquillo/Manifest
+++ b/media-sound/coquillo/Manifest
@@ -1 +1,2 @@
+DIST coquillo-2.0.0.tar.gz 76090 BLAKE2B 
3c59c251b9658d32c07f136c9af16434d1f6c0e334fea0e1b645770ed5c31392faf0a8aa3529d460d3744e7949c549860a2818af6b12c573ebdafc3b78f01d01
 SHA512 
8432601a0b68e94f5e2a6b1e2bae0410fb4a6db5d0dc7140683c8e1f49df924f10ce97f36efe229785796cb34441ac7d3883865210067f031622db5359598765
 DIST coquillo-2.0_pre20180422.tar.gz 86061 BLAKE2B 
606fa36a91e22ffc618fafb9fc8fa15d13403eb3acbec2ea64296709ddaea26861be872bb8f401a8eff3385b058b8dc4d391faa08d0334630e831185df0b9612
 SHA512 
2abedb24debcb05cdfb17bae535f7b8f8d2e897e2200d1d802757fe4a53e616fa3a7fc2ac1c1e3cf385416e44514fa129c7c880568b3c616f3afe2b3f069

diff --git a/media-sound/coquillo/coquillo-2.0.0.ebuild 
b/media-sound/coquillo/coquillo-2.0.0.ebuild
new file mode 100644
index 000..f82753490f6
--- /dev/null
+++ b/media-sound/coquillo/coquillo-2.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="GUI audio tagger based on Qt and taglib"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/Coquillo?content=141896";
+SRC_URI="https://github.com/sjuvonen/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/musicbrainz:5=
+   media-libs/taglib
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   eqmake5
+}
+
+src_install() {
+   dobin ${PN}
+   doicon extra/${PN}.png
+   domenu extra/${PN}.desktop
+   einstalldocs
+}

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

[Andreas Sturmlechner]

commit: c64f0b4dad03067e299e7b76ed5d9edc9274fd82
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 18:20:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 18:46:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64f0b4d

profiles: Cleanup old package updates

 profiles/updates/2Q-2015 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index c9902b4ec19..2dcc5c1a3de 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -48,7 +48,6 @@ move kde-base/kcalc kde-apps/kcalc
 move kde-base/kcharselect kde-apps/kcharselect
 move kde-base/kcolorchooser kde-apps/kcolorchooser
 move kde-base/kcron kde-apps/kcron
-move kde-base/kde-l10n kde-apps/kde4-l10n
 move kde-base/kdeaccessibility-meta kde-apps/kdeaccessibility-meta
 move kde-base/kdeadmin-meta kde-apps/kdeadmin-meta
 move kde-base/kdebase-meta kde-apps/kdebase-meta
@@ -110,7 +109,6 @@ move kde-base/krdc kde-apps/krdc
 move kde-base/kreversi kde-apps/kreversi
 move kde-base/krfb kde-apps/krfb
 move kde-base/kruler kde-apps/kruler
-move kde-base/kscd kde-apps/kscd
 move kde-base/kshisen kde-apps/kshisen
 move kde-base/ksirk kde-apps/ksirk
 move kde-base/ksnakeduel kde-apps/ksnakeduel

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

[Andreas Sturmlechner]

commit: 8e178aa76ddf6e2e6dbede3e86d0ea21949da402
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 18:30:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 18:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e178aa7

app-office/kmymoney: Cleanup nonexistent dep

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-office/kmymoney/kmymoney-5.0.1-r2.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild 
b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index c1e3975e027..44363179fe0 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -70,10 +70,7 @@ COMMON_DEPEND="
>=net-libs/aqbanking-5.6.5
>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
)
-   holidays? ( || (
-   $(add_frameworks_dep kholidays)
-   $(add_kdeapps_dep kholidays)
-   ) )
+   holidays? ( $(add_frameworks_dep kholidays) )
ofx? ( dev-libs/libofx )
weboob? (
${PYTHON_DEPS}

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

[Andreas Sturmlechner]

commit: 984115c50acaaa978572875b7d19a48e6583d05b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 18:42:58 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 18:46:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984115c5

media-sound/coquillo: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-sound/coquillo/Manifest  |  1 -
 .../coquillo/coquillo-2.0_pre20180422.ebuild   | 41 --
 2 files changed, 42 deletions(-)

diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
index e0a914d8f28..9118d2267c6 100644
--- a/media-sound/coquillo/Manifest
+++ b/media-sound/coquillo/Manifest
@@ -1,2 +1 @@
 DIST coquillo-2.0.0.tar.gz 76090 BLAKE2B 
3c59c251b9658d32c07f136c9af16434d1f6c0e334fea0e1b645770ed5c31392faf0a8aa3529d460d3744e7949c549860a2818af6b12c573ebdafc3b78f01d01
 SHA512 
8432601a0b68e94f5e2a6b1e2bae0410fb4a6db5d0dc7140683c8e1f49df924f10ce97f36efe229785796cb34441ac7d3883865210067f031622db5359598765
-DIST coquillo-2.0_pre20180422.tar.gz 86061 BLAKE2B 
606fa36a91e22ffc618fafb9fc8fa15d13403eb3acbec2ea64296709ddaea26861be872bb8f401a8eff3385b058b8dc4d391faa08d0334630e831185df0b9612
 SHA512 
2abedb24debcb05cdfb17bae535f7b8f8d2e897e2200d1d802757fe4a53e616fa3a7fc2ac1c1e3cf385416e44514fa129c7c880568b3c616f3afe2b3f069

diff --git a/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild 
b/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild
deleted file mode 100644
index 6eb3618c703..000
--- a/media-sound/coquillo/coquillo-2.0_pre20180422.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=05e97cb24d0d296d3becea9854fcb0562302ab4a
-inherit desktop qmake-utils
-
-DESCRIPTION="GUI audio tagger based on Qt and taglib"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/Coquillo?content=141896";
-SRC_URI="https://github.com/sjuvonen/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/musicbrainz:5=
-   media-libs/taglib
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_configure() {
-   eqmake5
-}
-
-src_install() {
-   dobin ${PN}
-   doicon extra/${PN}.png
-   domenu extra/${PN}.desktop
-   einstalldocs
-}

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

[Andreas Sturmlechner]

commit: 758d699b0a2f2171f5d30111d6b65fb0353e2c78
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 29 18:24:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 29 18:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758d699b

media-video/vlc: 3.0.2 version bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-video/vlc/Manifest |   1 +
 media-video/vlc/vlc-3.0.2.ebuild | 497 +++
 2 files changed, 498 insertions(+)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 166eba648e9..a5f18bc13c4 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1,3 @@
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 
10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9
 SHA512 
adde16f4b4bd2d94f104bb3b5df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 
10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca
 SHA512 
f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c
+DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B 
c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c
 SHA512 
907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec20551758a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f

diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
new file mode 100644
index 000..2c2154219fe
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -0,0 +1,497 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = * ]] ; then
+   if [[ ${PV%.} != ${PV} ]] ; then
+   
EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.}.git";
+   else
+   EGIT_REPO_URI="https://git.videolan.org/git/vlc.git";
+   fi
+   SCM="git-r3"
+else
+   if [[ ${MY_P} = ${P} ]] ; then
+   
SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz";
+   else
+   
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz";
+   fi
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator 
virtualx xdg-utils ${SCM}
+
+DESCRIPTION="Media player and framework with support for most multimedia files 
and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/";
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast 
dbus dc1394
+   debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth 
fontconfig
+   +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass 
libav libcaca
+   libnotify +libsamplerate libtar libtiger linsys lirc live lua 
macosx-notifications
+   macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses 
neon nfs ogg
+   omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 
rdp rtsp
+   run-as-root samba schroedinger sdl-image sftp shout sid skins soxr 
speex ssl svg
+   taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc 
vorbis vpx
+   wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx 
cpu_flags_x86_sse
+"
+REQUIRED_USE="
+   chromecast? ( encode )
+   directx? ( ffmpeg )
+   fontconfig? ( truetype )
+   libcaca? ( X )
+   libtar? ( skins )
+   libtiger? ( kate )
+   postproc? ( ffmpeg )
+   skins? ( qt5 truetype X xml )
+   ssl? ( gcrypt )
+   vaapi? ( ffmpeg X )
+   vdpau? ( ffmpeg X )
+"
+RDEPEND="
+   net-dns/libidn:0
+   sys-libs/zlib:0[minizip]
+   virtual/libintl:0
+   virtual/opengl
+   a52? ( media-libs/a52dec:0 )
+   alsa? ( media-libs/alsa-lib:0 )
+   aom? ( media-libs/libaom:= )
+   archive? ( app-arch/libarchive:= )
+   bidi? (
+   dev-libs/fribidi:0
+   media-libs/freetype:2[harfbuzz]
+   media-libs/harfbuzz
+   virtual/ttf-fonts:0
+   )
+   bluray? ( media-libs/libbluray:0= )
+   cddb? ( media-libs/libcddb:0 )
+   chromaprint? ( media-libs/chromaprint:0= )
+   chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+   dbus? ( sys-apps/dbus:0 )
+   dc1394? (
+   media-libs/libdc1394:2
+   sys-libs/libraw1394:0
+   )
+   dts? ( media-libs/libdca:0 )
+   dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/zookeeper-bin/

[Patrick Lauer]

commit: dd3aa29d3fd993d809a1d8dcb4dfca2397a1689d
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Apr 29 18:09:30 2018 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sun Apr 29 18:40:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3aa29d

sys-cluster/zookeeper-bin: Bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-cluster/zookeeper-bin/Manifest |  1 +
 .../zookeeper-bin/zookeeper-bin-3.4.12.ebuild  | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/sys-cluster/zookeeper-bin/Manifest 
b/sys-cluster/zookeeper-bin/Manifest
index 2542dd98ecd..32d110f8b5e 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,2 +1,3 @@
 DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B 
c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f
 SHA512 
4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
 DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 
4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d
 SHA512 
1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
+DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B 
e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8
 SHA512 
026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c

diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild 
b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild
new file mode 100644
index 000..a35bfb4d98d
--- /dev/null
+++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils java-utils-2 user
+
+MY_P="zookeeper"
+MY_PN=${MY_P}-${PV}
+
+DESCRIPTION="A high-performance coordination service for distributed 
applications."
+HOMEPAGE="http://zookeeper.apache.org/";
+SRC_URI="mirror://apache/${MY_P}/${MY_PN}/${MY_PN}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.7"
+
+S=${WORKDIR}/${MY_PN}
+
+INSTALL_DIR=/opt/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+   enewgroup zookeeper
+   enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_prepare() {
+   # python
+   sed -e "s|src/c/zookeeper.c|zookeeper.c|g" \
+   -e "s|../../../|${S}|g" \
+   -i contrib/zkpython/src/python/setup.py || die
+}
+
+src_configure() {
+   cd "${S}"/src/c || die
+   econf
+}
+
+src_compile() {
+   cd "${S}"/src/c || die
+   emake
+}
+
+src_install() {
+   local DATA_DIR=/var/lib/${MY_P}
+
+   # python
+   cd "${S}"/contrib/zkpython/ || die
+   mv src/python/setup.py .
+   mv src/c/* .
+   python_foreach_impl distutils-r1_src_install
+   cd "${S}" || die
+
+   # cleanup sources
+   rm -rf src/ || die
+   rm bin/*.cmd || die
+
+   keepdir "${DATA_DIR}"
+   sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > 
conf/zoo.cfg || die "sed failed"
+   cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
+
+   dodir "${INSTALL_DIR}"
+   cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+   # data dir perms
+   fowners zookeeper:zookeeper "${DATA_DIR}"
+
+   # log dir
+   keepdir /var/log/zookeeper
+   fowners zookeeper:zookeeper /var/log/zookeeper
+
+   # init script
+   newinitd "${FILESDIR}"/zookeeper.initd zookeeper
+   newconfd "${FILESDIR}"/zookeeper.confd zookeeper
+
+   # env file
+   cat > 99"${PN}" <<-EOF
+   PATH=${INSTALL_DIR}/bin
+   CONFIG_PROTECT=${INSTALL_DIR}/conf
+   EOF
+   doenvd 99"${PN}" || die "doenvd failed"
+}

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

[Patrick Lauer]

commit: aa312e2067249d7fddc7150da3a4e3ffb3b3f2f6
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Apr 29 18:30:30 2018 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sun Apr 29 18:40:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa312e20

net-analyzer/zabbix: Bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-analyzer/zabbix/Manifest|   1 +
 net-analyzer/zabbix/zabbix-3.4.8.ebuild | 329 
 2 files changed, 330 insertions(+)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 58876eb9ddf..bde43fa229f 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -7,3 +7,4 @@ DIST zabbix-3.2.9.tar.gz 16098846 BLAKE2B 
a8d7ab803cab075889bbaee10806c1f35be42a
 DIST zabbix-3.4.5.tar.gz 17170228 BLAKE2B 
bd799a3ad25256421bc2a8458019237da17e78d2dd5253485cebbc40df785e550e7cf15fcf8925a225c118e38e9aaad3f7532f909ba3eaff3a175136033ae81a
 SHA512 
e77c8693d687c9f1e3c160f2f41161b5e4ac663f0db69f4bff424da4ba607815ad0148448c6f80a2b9357ad7472016610f4beed173e40c6fcf661874d75c69a4
 DIST zabbix-3.4.6.tar.gz 17162881 BLAKE2B 
cf8a461f720b2f1d4910d8f512ac9949c56b9116fb9ddd1a26687b22da2c3938c4f10e6d0029bf348101e897fe6d352880964aaf5a0f55dd377fb6eec59a5006
 SHA512 
02300b103278f6f2867629a958a8bc5ea8e6cfe5743056b7e2f9d59afdeea04e29f51cae7c5d9847899c45c321a4c15cdaf66203c627fb1d85b3af619afe73ca
 DIST zabbix-3.4.7.tar.gz 17177022 BLAKE2B 
db465ff9c0085922e23ba042b0975d1368abb15408e943aa784e8efb49f7c412761742d1c8cda19c3cf86ea03d358d731cbe022ba3c9b139963f396290e4a272
 SHA512 
8397ee41c3b4efc2fb66638fd7c554ea668fad0a7c79d8aa3ed442cae065e62355c1e16e2008c7a65def775f23e6dfa1d75bbc682c49a45c9db5d7eddf905140
+DIST zabbix-3.4.8.tar.gz 17289635 BLAKE2B 
a90eb47f8a93877aa5131e263f0c00da7cea4e745ee816887dffeb2d40919c1b4251a8ea61fa834699d1d39547c6c366519a3751c266aea47e3d28a1d18c35c3
 SHA512 
a4e3573b3ffc07bf9a5a68b784a56569219caf7dbcadfc2d0eb5d87e1f3aa3b5ddf339b61a41e432487d55d2f4788f1a8a722574b07b8ecb7abd3c99ce7c7d70

diff --git a/net-analyzer/zabbix/zabbix-3.4.8.ebuild 
b/net-analyzer/zabbix/zabbix-3.4.8.ebuild
new file mode 100644
index 000..94b8bc3cdff
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.8.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
+HOMEPAGE="https://www.zabbix.com/";
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz";
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle 
+postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+   proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+   server? ( ^^ ( mysql oracle postgres odbc ) )
+   static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+   ldap? (
+   net-nds/openldap
+   =dev-libs/cyrus-sasl-2*
+   net-libs/gnutls
+   )
+   mysql? ( >=virtual/mysql-5.0.3 )
+   sqlite? ( >=dev-db/sqlite-3.3.5 )
+   postgres? ( dev-db/postgresql:* )
+   oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+   xmpp? ( dev-libs/iksemel )
+   libxml2? ( dev-libs/libxml2 )
+   curl? ( net-misc/curl )
+   openipmi? ( sys-libs/openipmi )
+   ssh? ( net-libs/libssh2 )
+   java? ( virtual/jdk:* )
+   odbc? ( dev-db/unixODBC )
+   ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+   proxy? ( net-analyzer/fping[suid] )
+   server? ( net-analyzer/fping[suid]
+   app-admin/webapp-config
+   dev-libs/libevent )
+   java?   (
+   >=virtual/jre-1.4
+   dev-java/slf4j-api
+   )
+   frontend? (
+   
>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+   || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+   mysql? ( dev-lang/php[mysqli] )
+   odbc? ( dev-lang/php[odbc] )
+   oracle? ( dev-lang/php[oci8-instant-client] )
+   postgres? ( dev-lang/php[postgres] )
+   sqlite? ( dev-lang/php[sqlite] )
+   media-libs/gd[png]
+   app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+   static? (
+   ldap? (
+   net-nds/openldap[static-libs]
+   =dev-libs/cyrus-sasl-2*[static-libs]
+   net-libs/gnutls[static-libs]
+   )
+   mysql? ( >=virtual/mysql-5.0.3[sta

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

[Patrick Lauer]

commit: 7e405f012665e7b4aa1a40f5de8778035eac84d9
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Apr 29 18:38:57 2018 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sun Apr 29 18:40:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e405f01

dev-lang/nqp: Bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-lang/nqp/Manifest   |   1 +
 dev-lang/nqp/nqp-2018.04.ebuild | 159 
 2 files changed, 160 insertions(+)

diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 352a136ff1d..ddf7b90b23a 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,3 +1,4 @@
 DIST nqp-2018.01.tar.gz 3798898 BLAKE2B 
5dc492bc5561a674d3faabb63c881ad97bff3528bc3f8bd75caa7f2e78aa4464849f326c611936106c6f14ca56f4de5f4575407ab134d4218409829c22885b3a
 SHA512 
0bfec280ed2c70bbf25b274632e830838526fef1e8f8c08387b1e79e1ef739dfaafe67dbab17eb24cf33c1b2aa984029dc0740fcc43e463e92f908dfb2360249
 DIST nqp-2018.02.tar.gz 3759551 BLAKE2B 
48713a0d300ec2e296b426784bb22f785969371043046251868c23c1f5710291c4b524d9d2d37fa4634eb910ad817c01e52bc132b3609cb292ae13cdd418c9bd
 SHA512 
57c63d76ac0e44f1017c1cbdc9c128107c46c5339d468e3cb6e909df440cca0f37d2050e909c5cf1b10be7f08a9f33485c762150e5456317a777b14d15216225
 DIST nqp-2018.03.tar.gz 3778268 BLAKE2B 
16e8e3924daa3aecf9987e9c39173fb32a769cd668add4b62bf04feb09755e5442224357610189ae8184c8c5c6fa35b2ce0d29cb708e8c5c0218963e2f918022
 SHA512 
d90fc8c933c31f1013bfdda5a02699c1c668ed5466167d58355c6baa65c294269cb4dbe072452bd14a9bbf180d83e61fedd3354b4404d590304be04e28489460
+DIST nqp-2018.04.tar.gz 3782652 BLAKE2B 
0d36363956a3b150c5dbd7e9c094281680bfe2b87fa509e5a27ffc8be1df8ab82cd89276d9392c11b0912cf4d00d5a668dd6f497f4cfdf4914c40de2b0443c5c
 SHA512 
5cb749577c5e985174c0721b92a00af7a93a5a7b3833718718b825d71d135ba14150b8a6bb065cf21356a37ea082431eacbff8ca63bce6f0ddeaf200494fe646

diff --git a/dev-lang/nqp/nqp-2018.04.ebuild b/dev-lang/nqp/nqp-2018.04.ebuild
new file mode 100644
index 000..558b645a275
--- /dev/null
+++ b/dev-lang/nqp/nqp-2018.04.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="https://github.com/perl6/${PN}.git";
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+   inherit vcs-snapshot
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/";
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+   dev-java/asm:4
+   dev-java/jline:0
+   dev-java/jna:4
+   )
+   moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+   java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+   clang? ( sys-devel/clang )
+   java? ( >=virtual/jdk-1.7 )
+   dev-lang/perl"
+
+pkg_pretend() {
+   if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+   ewarn "NQP is known to fail compilation/installation with 
Rakudo and/or NQP"
+   ewarn "already being installed. So if it fails, try 
uninstalling both"
+   ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new 
installation."
+   ewarn "(see Bug #584394)"
+   fi
+}
+
+java_prepare() {
+   # Don't clean stage0 jars.
+   einfo "Cleaning upstream jars"
+   java-pkg_clean 3rdparty/
+
+   # Don't use jars we just deleted.
+   sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+   src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+   MULTIBUILD_VARIANTS=()
+   use moar && MULTIBUILD_VARIANTS+=( moar )
+   use java && MULTIBUILD_VARIANTS+=( jvm )
+
+   multibuild_copy_sources
+
+   # This will pull in conditional java_prepare
+   default
+}
+
+nqp_configure() {
+   pushd "${BUILD_DIR}" > /dev/null || die
+   local myconfargs=(
+   "--backend=${MULTIBUILD_VARIANT}"
+   "--prefix=/usr" )
+
+   perl Configure.pl "${myconfargs[@]}" || die
+   popd || die
+}
+
+nqp_compile() {
+   if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+   emake -j1 \
+   -C "${BUILD_DIR}" \
+   THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies 
asm-4,jline,jna-4) \
+   JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+   elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+   emake -j1 \
+   -C "${BUILD_DIR}"
+   fi
+}
+
+nqp_test() {
+   emake -j1 \
+   -C "${BUILD_DIR}" \
+   test
+}
+
+nqp_install() {
+   # This is the actual reason we need multibuild.eclass.
+   # We need to distingu