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

2016-01-30 Thread Michael Palimaka
commit: 76af0a40a82f321337bcbc4699f3f11c27a4619c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jan 30 08:16:00 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan 30 08:16:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76af0a40

media-gfx/graphite2: fix function call

The function was renamed in e4b034ec87ff80561b18d52ee07df66b04a50cab but usage
was never checked for because it is supposed to be a private function.

Gentoo-bug: 573362

Package-Manager: portage-2.2.27

 media-gfx/graphite2/graphite2-1.2.1.ebuild| 2 +-
 media-gfx/graphite2/graphite2-1.2.4-r1.ebuild | 2 +-
 media-gfx/graphite2/graphite2-1.2.4.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/graphite2/graphite2-1.2.1.ebuild 
b/media-gfx/graphite2/graphite2-1.2.1.ebuild
index 0cb3b12..b9f54cb 100644
--- a/media-gfx/graphite2/graphite2-1.2.1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.1.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
 
# fix perl linking
if use perl; then
-   _check_build_dir init
+   _cmake_check_build_dir init
sed -i \
-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
contrib/perl/Build.PL || die

diff --git a/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild 
b/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild
index 42b25cf..6a40a4c 100644
--- a/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.4-r1.ebuild
@@ -69,7 +69,7 @@ multilib_src_configure() {
 
# fix perl linking
if multilib_is_native_abi && use perl; then
-   _check_build_dir init
+   _cmake_check_build_dir init
sed -i \
-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
"${S}"/contrib/perl/Build.PL || die

diff --git a/media-gfx/graphite2/graphite2-1.2.4.ebuild 
b/media-gfx/graphite2/graphite2-1.2.4.ebuild
index 4d5525c..067c996 100644
--- a/media-gfx/graphite2/graphite2-1.2.4.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.4.ebuild
@@ -48,7 +48,7 @@ src_prepare() {
 
# fix perl linking
if use perl; then
-   _check_build_dir init
+   _cmake_check_build_dir init
sed -i \
-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
contrib/perl/Build.PL || die



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/cvs/, pym/repoman/modules/vcs/bzr/, ...

2016-01-30 Thread Brian Dolbec
commit: 7c06bfba625e89ccad8c8c565999893028e01119
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jan 30 01:58:36 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:22 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7c06bfba

repoman: Migrate actions.py vcs code to the vcs modules

Add missing changes code to the existing Changes classes.
This removes the duplicated code in the Actions class.
It alsosspeeds up the run by not calling the vcs binary to scan for changes a 
second time.
Optimize the code for the vcs modules.

 pym/repoman/actions.py   | 208 ---
 pym/repoman/modules/vcs/None/__init__.py |   1 +
 pym/repoman/modules/vcs/bzr/__init__.py  |   1 +
 pym/repoman/modules/vcs/bzr/changes.py   |  15 ++-
 pym/repoman/modules/vcs/changes.py   |  13 ++
 pym/repoman/modules/vcs/cvs/__init__.py  |   1 +
 pym/repoman/modules/vcs/cvs/changes.py   |  13 +-
 pym/repoman/modules/vcs/git/__init__.py  |   1 +
 pym/repoman/modules/vcs/git/changes.py   |  20 +--
 pym/repoman/modules/vcs/hg/__init__.py   |   1 +
 pym/repoman/modules/vcs/hg/changes.py|  27 +++-
 pym/repoman/modules/vcs/settings.py  |   5 +-
 pym/repoman/modules/vcs/svn/__init__.py  |   1 +
 pym/repoman/modules/vcs/svn/changes.py   |  24 +++-
 14 files changed, 118 insertions(+), 213 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 3fd940c..8cf4a97 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -16,7 +16,6 @@ from itertools import chain
 from _emerge.UserQuery import UserQuery
 
 import portage
-from portage import cvstree
 from portage import os
 from portage import _encodings
 from portage import _unicode_encode
@@ -26,8 +25,7 @@ from portage.package.ebuild.digestgen import digestgen
 from portage.process import find_binary, spawn
 from portage.util import writemsg_level
 
-from repoman._subprocess import repoman_popen, repoman_getstatusoutput
-from repoman.errors import err
+from repoman._subprocess import repoman_getstatusoutput
 from repoman.gpg import gpgsign, need_signature
 from repoman import utilities
 from repoman.modules.vcs.vcs import vcs_files_to_cps
@@ -71,13 +69,11 @@ class Actions(object):
 
 
def perform(self, qa_output):
-   myunadded, mydeleted = self._vcs_unadded()
+   myautoadd = self._vcs_autoadd()
 
-   myautoadd = self._vcs_autoadd(myunadded)
+   self._vcs_deleted()
 
-   self._vcs_deleted(mydeleted)
-
-   changes = self.get_vcs_changed(mydeleted)
+   changes = self.get_vcs_changed()
 
mynew, mychanged, myremoved, no_expansion, expansion = changes
 
@@ -127,8 +123,8 @@ class Actions(object):
 
print("* %s files being committed..." % 
green(str(len(myupdates))), end=' ')
 
-   if self.vcs_settings.vcs not in ('cvs', 'svn'):
-   # With git, bzr and hg, there's never any keyword 
expansion, so
+   if self.vcs_settings.needs_keyword_expansion:
+   # With some VCS types there's never any keyword 
expansion, so
# there's no need to regenerate manifests and all files 
will be
# committed in one big commit at the end.
print()
@@ -261,62 +257,8 @@ class Actions(object):
sys.exit(1)
 
 
-   def _vcs_unadded(self):
-   myunadded = []
-   mydeleted = []
-   if self.vcs_settings.vcs == "cvs":
-   try:
-   myvcstree = portage.cvstree.getentries("./", 
recursive=1)
-   myunadded = portage.cvstree.findunadded(
-   myvcstree, recursive=1, basedir="./")
-   except SystemExit:
-   raise  # TODO propagate this
-   except:
-   err("Error retrieving CVS tree; exiting.")
-   if self.vcs_settings.vcs == "svn":
-   try:
-   with repoman_popen("svn status --no-ignore") as 
f:
-   svnstatus = f.readlines()
-   myunadded = [
-   "./" + elem.rstrip().split()[1]
-   for elem in svnstatus
-   if elem.startswith("?") or 
elem.startswith("I")]
-   except SystemExit:
-   raise  # TODO propagate this
-   except:
-   err("Error retrieving SVN info; exiting.")
-   if self.vcs_settings.vcs == "git":
-   # get list of files not under version control or missing
-   myf = repoman_popen("git ls-files 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/cvs/, pym/repoman/modules/vcs/bzr/, ...

2016-01-30 Thread Brian Dolbec
commit: 7ed3cb06a165bdd933a2faf43ff839920cf5d704
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jan 30 07:58:04 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:58:04 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7ed3cb06

repoman: Create docstrings for all new vcs module files

 pym/repoman/modules/vcs/None/changes.py |  9 -
 pym/repoman/modules/vcs/None/status.py  | 35 ++---
 pym/repoman/modules/vcs/bzr/__init__.py |  2 +-
 pym/repoman/modules/vcs/bzr/changes.py  |  9 -
 pym/repoman/modules/vcs/bzr/status.py   | 30 
 pym/repoman/modules/vcs/changes.py  |  3 +++
 pym/repoman/modules/vcs/cvs/__init__.py |  2 +-
 pym/repoman/modules/vcs/cvs/changes.py  |  9 -
 pym/repoman/modules/vcs/cvs/status.py   | 18 +
 pym/repoman/modules/vcs/git/__init__.py |  2 +-
 pym/repoman/modules/vcs/git/changes.py  |  9 -
 pym/repoman/modules/vcs/git/status.py   | 33 +++
 pym/repoman/modules/vcs/hg/__init__.py  |  2 +-
 pym/repoman/modules/vcs/hg/changes.py   |  9 -
 pym/repoman/modules/vcs/hg/status.py| 31 +
 pym/repoman/modules/vcs/settings.py |  2 +-
 pym/repoman/modules/vcs/svn/__init__.py |  2 +-
 pym/repoman/modules/vcs/svn/changes.py  |  9 -
 pym/repoman/modules/vcs/svn/status.py   | 27 ++---
 19 files changed, 221 insertions(+), 22 deletions(-)

diff --git a/pym/repoman/modules/vcs/None/changes.py 
b/pym/repoman/modules/vcs/None/changes.py
index f95af69..759b554 100644
--- a/pym/repoman/modules/vcs/None/changes.py
+++ b/pym/repoman/modules/vcs/None/changes.py
@@ -1,4 +1,6 @@
-
+'''
+None module Changes class submodule
+'''
 
 from repoman.modules.vcs.changes import ChangesBase
 
@@ -11,7 +13,12 @@ class Changes(ChangesBase):
vcs = 'None'
 
def __init__(self, options):
+   '''Class init
+
+   @param options: commandline options
+   '''
super(Changes, self).__init__(options)
 
def scan(self):
+   '''VCS type scan function, looks for all detectable changes'''
pass

diff --git a/pym/repoman/modules/vcs/None/status.py 
b/pym/repoman/modules/vcs/None/status.py
index b23fa10..d6e5ca0 100644
--- a/pym/repoman/modules/vcs/None/status.py
+++ b/pym/repoman/modules/vcs/None/status.py
@@ -1,24 +1,53 @@
-
+'''
+None (non-VCS) module Status class submodule
+'''
 
 
 class Status(object):
+   '''Performs status checks on the svn repository'''
 
def __init__(self, qatracker, eadded):
+   '''Class init
+
+   @param qatracker: QATracker class instance
+   @param eadded: list
+   '''
self.qatracker = qatracker
self.eadded = eadded
 
def check(self, checkdir, checkdir_relative, xpkg):
+   '''Perform the svn status check
+
+   @param checkdir: string of the directory being checked
+   @param checkdir_relative: string of the relative directory 
being checked
+   @param xpkg: string of the package being checked
+   @returns: boolean
+   '''
return True
 
@staticmethod
-   def supports_gpg_sign():
+   def detect_conflicts(options):
+   '''Are there any merge conflicts present in the VCS tracking 
system
+
+   @param options: command line options
+   @returns: Boolean
+   '''
return False
 
@staticmethod
-   def detect_conflicts(options):
+   def supports_gpg_sign():
+   '''Does this vcs system support gpg commit signatures
+
+   @returns: Boolean
+   '''
return False
 
@staticmethod
def isVcsDir(dirname):
+   '''Is the directory belong to the vcs system
+
+   @param dirname: string, directory name
+   @returns: Boolean
+   '''
return False
 

diff --git a/pym/repoman/modules/vcs/bzr/__init__.py 
b/pym/repoman/modules/vcs/bzr/__init__.py
index 1192782..4490ed8 100644
--- a/pym/repoman/modules/vcs/bzr/__init__.py
+++ b/pym/repoman/modules/vcs/bzr/__init__.py
@@ -1,7 +1,7 @@
 # Copyright 2014-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-doc = """BZR plug-in module for portage.
+doc = """Bazaar (bzr) plug-in module for portage.
 Performs variaous Bazaar actions and checks on repositories."""
 __doc__ = doc[:]
 

diff --git a/pym/repoman/modules/vcs/bzr/changes.py 
b/pym/repoman/modules/vcs/bzr/changes.py
index dab5d73..751d803 100644
--- a/pym/repoman/modules/vcs/bzr/changes.py
+++ b/pym/repoman/modules/vcs/bzr/changes.py
@@ -1,4 +1,6 @@
-
+'''
+Bazaar module Changes class submodule
+'''
 
 from 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: a780c83a7085b3472bd2be0b7f5dbeb17c48ada7
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 23:23:52 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a780c83a

repoman: Migrate code to a new MtimeChecks class in directories plugin

 pym/repoman/modules/scan/directories/__init__.py |  9 +
 pym/repoman/modules/scan/directories/mtime.py| 24 
 pym/repoman/scanner.py   |  5 +
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pym/repoman/modules/scan/directories/__init__.py 
b/pym/repoman/modules/scan/directories/__init__.py
index bcc6eca..ec18d30 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -19,6 +19,15 @@ module_spec = {
'func_kwargs': {
},
},
+   'mtime-module': {
+   'name': "mtime",
+   'sourcefile': "mtime",
+   'class': "MtimeChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_kwargs': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/modules/scan/directories/mtime.py 
b/pym/repoman/modules/scan/directories/mtime.py
new file mode 100644
index 000..e113cdd
--- /dev/null
+++ b/pym/repoman/modules/scan/directories/mtime.py
@@ -0,0 +1,24 @@
+
+
+class MtimeChecks(object):
+
+   def __init__(self, **kwargs):
+   self.vcs_settings = kwargs.get('vcs_settings')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   changed = kwargs.get('changed')
+   pkg = kwargs.get('pkg')
+   if not self.vcs_settings.vcs_preserves_mtime:
+   if ebuild.ebuild_path not in changed.new_ebuilds and \
+   ebuild.ebuild_path not in 
changed.ebuilds:
+   pkg.mtime = None
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.check])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index dcb955c..d15 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -294,6 +294,7 @@ class Scanner(object):
('arches', 'ArchChecks'), ('depend', 
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby', 
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict', 
'RestrictChecks'),
+   ('mtime', 'MtimeChecks'),
]:
if mod[0]:
mod_class = 
MODULE_CONTROLLER.get_class(mod[0])
@@ -322,10 +323,6 @@ class Scanner(object):
continue
 
# Syntax Checks
-   if not self.vcs_settings.vcs_preserves_mtime:
-   if dynamic_data['ebuild'].ebuild_path not in 
self.changed.new_ebuilds and \
-   dynamic_data['ebuild'].ebuild_path not 
in self.changed.ebuilds:
-   dynamic_data['pkg'].mtime = None
try:
# All ebuilds should have utf_8 encoding.
f = io.open(



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 72261db29238b4100d0bffe9f08409a41abf4902
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jan  4 07:57:36 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=72261db2

repoman: Move the large depency checks loop to a new plugin 
ProfileDependsChecks class

 pym/repoman/modules/scan/depend/__init__.py |   9 ++
 pym/repoman/modules/scan/depend/profile.py  | 211 
 pym/repoman/repos.py|   1 +
 pym/repoman/scanner.py  | 181 +---
 4 files changed, 228 insertions(+), 174 deletions(-)

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
index ebc716c..cddb7f1 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -19,6 +19,15 @@ module_spec = {
'func_desc': {
},
},
+   'profile-module': {
+   'name': "profile",
+   'sourcefile': "profile",
+   'class': "ProfileDependsChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/modules/scan/depend/profile.py 
b/pym/repoman/modules/scan/depend/profile.py
new file mode 100644
index 000..91c52cc
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/profile.py
@@ -0,0 +1,211 @@
+# -*- coding:utf-8 -*-
+
+
+import copy
+from pprint import pformat
+
+from _emerge.Package import Package
+
+# import our initialized portage instance
+from repoman._portage import portage
+from portage.dep import Atom
+
+
+def sort_key(item):
+   return item[2].sub_path
+
+
+class ProfileDependsChecks(object):
+
+   def __init__(self, **kwargs):
+   self.qatracker = kwargs.get('qatracker')
+   self.portdb = kwargs.get('portdb')
+   self.profiles = kwargs.get('profiles')
+   self.options = kwargs.get('options')
+   self.repo_settings = kwargs.get('repo_settings')
+   self.include_arches = kwargs.get('include_arches')
+   self.caches = kwargs.get('caches')
+   self.repoman_incrementals = kwargs.get('repoman_incrementals')
+   self.env = kwargs.get('env')
+   self.have = kwargs.get('have')
+   self.dev_keywords = kwargs.get('dev_keywords')
+
+   def check(self, **kwargs):
+   arches = kwargs.get('arches')
+   ebuild = kwargs.get('ebuild')
+   pkg = kwargs.get('pkg')
+   baddepsyntax = kwargs.get('baddepsyntax')
+   unknown_pkgs = kwargs.get('unknown_pkgs')
+
+   relevant_profiles = []
+   for keyword, arch, groups in arches:
+   if arch not in self.profiles:
+   # A missing profile will create an error 
further down
+   # during the KEYWORDS verification.
+   continue
+
+   if self.include_arches is not None:
+   if arch not in self.include_arches:
+   continue
+
+   relevant_profiles.extend(
+   (keyword, groups, prof) for prof in 
self.profiles[arch])
+
+   relevant_profiles.sort(key=sort_key)
+
+   for keyword, groups, prof in relevant_profiles:
+
+   is_stable_profile = prof.status == "stable"
+   is_dev_profile = prof.status == "dev" and \
+   self.options.include_dev
+   is_exp_profile = prof.status == "exp" and \
+   self.options.include_exp_profiles == 'y'
+   if not (is_stable_profile or is_dev_profile or 
is_exp_profile):
+   continue
+
+   dep_settings = self.caches['arch'].get(prof.sub_path)
+   if dep_settings is None:
+   dep_settings = portage.config(
+   config_profile_path=prof.abs_path,
+   
config_incrementals=self.repoman_incrementals,
+   
config_root=self.repo_settings.config_root,
+   local_config=False,
+   
_unmatched_removal=self.options.unmatched_removal,
+   env=self.env, 
repositories=self.repo_settings.repoman_settings.repositories)
+   dep_settings.categories = 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/

2016-01-30 Thread Brian Dolbec
commit: bba3caf93818dbe175d4104f2eafe5179d646435
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 21:19:59 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bba3caf9

repoman: Migrate some additional Dependency code to the plugin

 pym/repoman/modules/scan/depend/depend.py | 13 -
 pym/repoman/scanner.py| 22 +++---
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/pym/repoman/modules/scan/depend/depend.py 
b/pym/repoman/modules/scan/depend/depend.py
index 8a0ff48..7f1d007 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+
 
 from _emerge.Package import Package
 
@@ -121,7 +123,16 @@ class DependChecks(object):
qacat = m + ".syntax"
self.qatracker.add_error(
qacat, "%s: %s: %s" % (ebuild.relative_path, m, 
b))
-   return {'continue': False, 'unknown_pkgs': unknown_pkgs, 
'type_list': type_list}
+
+   # data required for some other tests
+   badlicsyntax = len([z for z in type_list if z == "LICENSE"])
+   badprovsyntax = len([z for z in type_list if z == "PROVIDE"])
+   baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax
+   badlicsyntax = badlicsyntax > 0
+   #badprovsyntax = badprovsyntax > 0
+
+   return {'continue': False, 'unknown_pkgs': unknown_pkgs, 
'type_list': type_list,
+   'badlicsyntax': badlicsyntax, 'baddepsyntax': 
baddepsyntax}
 
@property
def runInPkgs(self):

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 5c35519..804a3f2 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -327,26 +327,10 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   if dynamic_data['live_ebuild'] and 
self.repo_settings.repo_config.name == "gentoo":
-   self.liveeclasscheck.check(
-   dynamic_data['pkg'], xpkg, 
dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords, 
self.repo_metadata['pmaskdict'])
-
-   unknown_pkgs = set()
-   baddepsyntax = False
-   badlicsyntax = False
-   badprovsyntax = False
-   # catpkg = catdir + "/" + y_ebuild
-
-   badlicsyntax = len([z for z in 
dynamic_data['type_list'] if z == "LICENSE"])
-   badprovsyntax = len([z for z in 
dynamic_data['type_list'] if z == "PROVIDE"])
-   baddepsyntax = len(dynamic_data['type_list']) != 
badlicsyntax + badprovsyntax
-   badlicsyntax = badlicsyntax > 0
-   badprovsyntax = badprovsyntax > 0
-
used_useflags = 
used_useflags.union(dynamic_data['ebuild_UsedUseFlags'])
 
# license checks
-   if not badlicsyntax:
+   if not dynamic_data['badlicsyntax']:
self.licensecheck.check(dynamic_data['pkg'], 
xpkg, dynamic_data['ebuild'], y_ebuild)
 
self.restrictcheck.check(dynamic_data['pkg'], xpkg, 
dynamic_data['ebuild'], y_ebuild)
@@ -452,7 +436,7 @@ class Scanner(object):
dep_settings.usemask = 
dep_settings._use_manager.getUseMask(
dynamic_data['pkg'], 
stable=dep_settings._parent_stable)
 
-   if not baddepsyntax:
+   if not dynamic_data['baddepsyntax']:
ismasked = not 
dynamic_data['ebuild'].archs or \
dynamic_data['pkg'].cpv not in 
self.portdb.xmatch("match-visible",
Atom("%s::%s" % 
(dynamic_data['pkg'].cp, self.repo_settings.repo_config.name)))
@@ -542,7 +526,7 @@ class Scanner(object):
% 
(dynamic_data['ebuild'].relative_path, mytype, keyword,

prof, pformat(atoms, indent=6)))
 
-   if not baddepsyntax and dynamic_data['unknown_pkgs']:
+   if not dynamic_data['baddepsyntax'] and 
dynamic_data['unknown_pkgs']:
type_map = {}
for mytype, atom in 
dynamic_data['unknown_pkgs']:
type_map.setdefault(mytype, 
set()).add(atom)



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: ecb12dd210c1452c3690702640161d252e8baf00
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 11:56:25 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:18 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ecb12dd2

repoman: Migrate more metadata checks to ebuild_metadata.py

 .../modules/scan/metadata/ebuild_metadata.py   | 32 --
 pym/repoman/scanner.py | 17 
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py 
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 2dc1db2..77c947e 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -5,6 +5,8 @@
 import re
 import sys
 
+from repoman.qa_data import missingvars
+
 if sys.hexversion >= 0x300:
basestring = str
 
@@ -16,7 +18,7 @@ class EbuildMetadata(object):
def __init__(self, **kwargs):
self.qatracker = kwargs.get('qatracker')
 
-   def check(self, **kwargs):
+   def invalidchar(self, **kwargs):
ebuild = kwargs.get('ebuild')
for k, v in ebuild.metadata.items():
if not isinstance(v, basestring):
@@ -28,9 +30,35 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() + 
1))
+   return {'continue': False}
+
+   def missing(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   for pos, missing_var in enumerate(missingvars):
+   if not ebuild.metadata.get(missing_var):
+   if kwargs.get('catdir') == "virtual" and \
+   missing_var in ("HOMEPAGE", "LICENSE"):
+   continue
+   if kwargs.get('live_ebuild') and missing_var == 
"KEYWORDS":
+   continue
+   myqakey = missingvars[pos] + ".missing"
+   self.qatracker.add_error(myqakey, '%s/%s.ebuild'
+   % (kwargs.get('xpkg'), 
kwargs.get('y_ebuild')))
+   return {'continue': False}
+
+   def old_virtual(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
if ebuild.metadata.get("PROVIDE"):
self.qatracker.add_error("virtual.oldstyle", 
ebuild.relative_path)
+   return {'continue': False}
 
+   def virtual(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   if kwargs.get('catdir') == "virtual":
+   for var in ("HOMEPAGE", "LICENSE"):
+   if ebuild.metadata.get(var):
+   myqakey = var + ".virtual"
+   self.qatracker.add_error(myqakey, 
ebuild.relative_path)
return {'continue': False}
 
@property
@@ -39,4 +67,4 @@ class EbuildMetadata(object):
 
@property
def runInEbuilds(self):
-   return (True, [self.check])
+   return (True, [self.invalidchar, self.missing, 
self.old_virtual, self.virtual])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 803e5a3..5c35519 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -327,23 +327,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-
-   for pos, missing_var in enumerate(missingvars):
-   if not 
dynamic_data['ebuild'].metadata.get(missing_var):
-   if dynamic_data['catdir'] == "virtual" 
and \
-   missing_var in ("HOMEPAGE", 
"LICENSE"):
-   continue
-   if dynamic_data['live_ebuild'] and 
missing_var == "KEYWORDS":
-   continue
-   myqakey = missingvars[pos] + ".missing"
-   self.qatracker.add_error(myqakey, xpkg 
+ "/" + y_ebuild + ".ebuild")
-
-   if dynamic_data['catdir'] == "virtual":
-   for var in ("HOMEPAGE", "LICENSE"):
-   if 
dynamic_data['ebuild'].metadata.get(var):
-   myqakey = var + ".virtual"
-   
self.qatracker.add_error(myqakey, dynamic_data['ebuild'].relative_path)
-
if 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/

2016-01-30 Thread Brian Dolbec
commit: 10c025076814bab93b655bca5557d4c8a717408e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jan  4 08:09:33 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=10c02507

repoman: Create a new DependUnknown plugin class

 pym/repoman/modules/scan/depend/__init__.py |  9 +
 pym/repoman/modules/scan/depend/unknown.py  | 30 +
 pym/repoman/scanner.py  | 10 +-
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
index cddb7f1..9fd7970 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+   'unknown-module': {
+   'name': "unknown",
+   'sourcefile': "unknown",
+   'class': "DependUnknown",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/modules/scan/depend/unknown.py 
b/pym/repoman/modules/scan/depend/unknown.py
new file mode 100644
index 000..61d51b9
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/unknown.py
@@ -0,0 +1,30 @@
+# -*- coding:utf-8 -*-
+
+
+class DependUnknown(object):
+
+   def __init__(self, **kwargs):
+   self.qatracker = kwargs.get('qatracker')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   baddepsyntax = kwargs.get('baddepsyntax')
+   unknown_pkgs = kwargs.get('unknown_pkgs')
+
+   if not baddepsyntax and unknown_pkgs:
+   type_map = {}
+   for mytype, atom in unknown_pkgs:
+   type_map.setdefault(mytype, set()).add(atom)
+   for mytype, atoms in type_map.items():
+   self.qatracker.add_error(
+   "dependency.unknown", "%s: %s: %s"
+   % (ebuild.relative_path, mytype, ", 
".join(sorted(atoms
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.check])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 48b60a4..1e61eb6 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -290,6 +290,7 @@ class Scanner(object):
('mtime', 'MtimeChecks'), ('multicheck', 
'MultiCheck'),
# Options.is_forced() is used to bypass further 
checks
('options', 'Options'), ('profile', 
'ProfileDependsChecks'),
+   ('unknown', 'DependUnknown'),
]:
if mod[0]:
mod_class = 
MODULE_CONTROLLER.get_class(mod[0])
@@ -317,15 +318,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   if not dynamic_data['baddepsyntax'] and 
dynamic_data['unknown_pkgs']:
-   type_map = {}
-   for mytype, atom in 
dynamic_data['unknown_pkgs']:
-   type_map.setdefault(mytype, 
set()).add(atom)
-   for mytype, atoms in type_map.items():
-   self.qatracker.add_error(
-   "dependency.unknown", "%s: %s: 
%s"
-   % 
(dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms
-
# check if there are unused local USE-descriptions in 
metadata.xml
# (unless there are any invalids, to avoid noise)
if dynamic_data['allvalid']:



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 75d44c473dfe67a828c33a6ce3f097ab3c483f13
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 11:31:26 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:18 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=75d44c47

scanner.py: Migrate another metadata check to ebuild_metadata

 pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++
 pym/repoman/scanner.py   | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py 
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 143a40e..2dc1db2 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -28,6 +28,9 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() + 
1))
+   if ebuild.metadata.get("PROVIDE"):
+   self.qatracker.add_error("virtual.oldstyle", 
ebuild.relative_path)
+
return {'continue': False}
 
@property

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 006c3f7..803e5a3 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -327,8 +327,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   if dynamic_data['ebuild'].metadata.get("PROVIDE"):
-   self.qatracker.add_error("virtual.oldstyle", 
dynamic_data['ebuild'].relative_path)
 
for pos, missing_var in enumerate(missingvars):
if not 
dynamic_data['ebuild'].metadata.get(missing_var):



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/, pym/repoman/modules/scan/ebuild/

2016-01-30 Thread Brian Dolbec
commit: 7d70b3ebb3a4614e13a7e15a96c6f57100b52cec
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jan  4 04:44:05 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7d70b3eb

repoman: Create a new MultiCheck class plugin

Move ebuilds/ checks.py and errors.py to the scan/ebuild plugin.
Remove the checks_init from main(), initialize it in the MultiCheck
class where it is needed.

 pym/repoman/checks/ebuilds/__init__.py |  0
 pym/repoman/main.py|  2 -
 pym/repoman/modules/scan/ebuild/__init__.py|  9 +
 .../ebuilds => modules/scan/ebuild}/checks.py  |  2 +-
 .../ebuilds => modules/scan/ebuild}/errors.py  |  0
 pym/repoman/modules/scan/ebuild/multicheck.py  | 43 ++
 pym/repoman/scanner.py | 21 +--
 7 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/__init__.py 
b/pym/repoman/checks/ebuilds/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8784685..890e034 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -26,7 +26,6 @@ from portage.util import formatter
 
 from repoman.actions import Actions
 from repoman.argparser import parse_args
-from repoman.checks.ebuilds.checks import checks_init
 from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats)
@@ -65,7 +64,6 @@ def repoman_main(argv):
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")
-   checks_init(experimental_inherit=True)
 
# Set this to False when an extraordinary issue (generally
# something other than a QA issue) makes it impossible to

diff --git a/pym/repoman/modules/scan/ebuild/__init__.py 
b/pym/repoman/modules/scan/ebuild/__init__.py
index a22e736..e712e4b 100644
--- a/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/pym/repoman/modules/scan/ebuild/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+   'multicheck-module': {
+   'name': "multicheck",
+   'sourcefile': "multicheck",
+   'class': "MultiCheck",
+   'description': doc,
+   'functions': ['check'],
+   'func_kwargs': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/checks/ebuilds/checks.py 
b/pym/repoman/modules/scan/ebuild/checks.py
similarity index 99%
rename from pym/repoman/checks/ebuilds/checks.py
rename to pym/repoman/modules/scan/ebuild/checks.py
index 5420e51..be59b05 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/modules/scan/ebuild/checks.py
@@ -21,7 +21,7 @@ from portage.eapi import (
eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard,
eapi_exports_AA, eapi_has_pkg_pretend)
 
-import repoman.checks.ebuilds.errors as errors
+from . import errors
 
 
 class LineCheck(object):

diff --git a/pym/repoman/checks/ebuilds/errors.py 
b/pym/repoman/modules/scan/ebuild/errors.py
similarity index 100%
rename from pym/repoman/checks/ebuilds/errors.py
rename to pym/repoman/modules/scan/ebuild/errors.py

diff --git a/pym/repoman/modules/scan/ebuild/multicheck.py 
b/pym/repoman/modules/scan/ebuild/multicheck.py
new file mode 100644
index 000..989d695
--- /dev/null
+++ b/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -0,0 +1,43 @@
+
+import io
+
+from portage import _encodings, _unicode_encode
+
+from .checks import run_checks, checks_init
+
+
+class MultiCheck(object):
+   '''Class to run multiple different checks on an ebuild'''
+
+   def __init__(self, **kwargs):
+   self.qatracker = kwargs.get('qatracker')
+   self.options = kwargs.get('options')
+   checks_init(self.options.experimental_inherit == 'y')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   pkg = kwargs.get('pkg')
+   try:
+   # All ebuilds should have utf_8 encoding.
+   f = io.open(
+   _unicode_encode(ebuild.full_path, 
encoding=_encodings['fs'],
+   errors='strict'),
+   mode='r', encoding=_encodings['repo.content'])
+   try:
+   for check_name, e in run_checks(f, pkg):
+   self.qatracker.add_error(
+   check_name, 
ebuild.relative_path + ': %s' % e)
+   finally:
+ 

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

2016-01-30 Thread Brian Dolbec
commit: 9ff97354f8b8666b1b391422e43618cf55894d7e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 05:33:17 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:21 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ff97354

repoman: Enable verbosity option to be useful for setting the logging level

Verbosity option was not being used internally.
Convert debug print's added to proper debug messages.

 pym/repoman/main.py| 13 ++---
 pym/repoman/scanner.py | 35 +++
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 890e034..6921005 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -19,7 +19,6 @@ from portage import os
 import portage.checksum
 import portage.const
 import portage.repository.config
-from portage import util
 from portage.output import create_color_func, nocolor
 from portage.output import ConsoleStyleFile, StyleWriter
 from portage.util import formatter
@@ -37,13 +36,14 @@ from repoman.modules.vcs.settings import VCSSettings
 if sys.hexversion >= 0x300:
basestring = str
 
-util.initialize_logger()
-
 bad = create_color_func("BAD")
 
 # A sane umask is needed for files that portage creates.
 os.umask(0o22)
 
+LOGLEVEL = logging.WARNING
+portage.util.initialize_logger(LOGLEVEL)
+
 
 def repoman_main(argv):
config_root = os.environ.get("PORTAGE_CONFIGROOT")
@@ -61,6 +61,13 @@ def repoman_main(argv):
print("Portage", portage.VERSION)
sys.exit(0)
 
+   logger = logging.getLogger()
+
+   if options.verbosity > 0:
+   logger.setLevel(LOGLEVEL - 10 * options.verbosity)
+   else:
+   logger.setLevel(LOGLEVEL)
+
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 4dd5408..8623812 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -19,13 +19,13 @@ from portage.module import Modules
 
 MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan")
 # initial development debug info
-#print("module path:", path)
+logging.debug("module path: %s", MODULES_PATH)
 
 MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
 
-# initial development debug info
-#print(module_controller.module_names)
 MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
+# initial development debug info
+logging.debug("module_names: %s", MODULE_NAMES)
 
 
 class Scanner(object):
@@ -200,7 +200,7 @@ class Scanner(object):
for mod in ['manifests', 'isebuild', 'keywords', 'files', 
'vcsstatus',
'fetches', 'pkgmetadata']:
mod_class = MODULE_CONTROLLER.get_class(mod)
-   print("Initializing class name:", mod_class.__name__)
+   logging.debug("Initializing class name: %s", 
mod_class.__name__)
self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
 
def scan_pkgs(self, can_force):
@@ -208,7 +208,7 @@ class Scanner(object):
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
-   logging.info("checking package %s" % xpkg)
+   logging.info("checking package %s", xpkg)
# save memory by discarding xmatch caches from previous 
package(s)
self.caches['arch_xmatch'].clear()
self.eadded = []
@@ -236,7 +236,7 @@ class Scanner(object):
# need to set it up for ==> self.modules or some other 
ordered list
for mod in ['Manifests', 'IsEbuild', 'KeywordChecks', 
'FileChecks',
'VCSStatus', 'FetchChecks', 
'PkgMetadata']:
-   print("scan_pkgs(): module:", mod)
+   logging.debug("scan_pkgs; module: %s", mod)
do_it, functions = self.modules[mod].runInPkgs
if do_it:
for func in functions:
@@ -300,7 +300,7 @@ class Scanner(object):
logging.debug("do_it: %s, functions: %s", 
do_it, [x.__name__ for x in functions])
if do_it:
for func in functions:
-   print("\tRunning function:", 
func)
+   logging.debug("\tRunning 
function: %s", func)
rdata = func(**dynamic_data)

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/manifest/, pym/repoman/checks/ebuilds/variables/, ...

2016-01-30 Thread Brian Dolbec
commit: 53e01dbfb4fa7a426b9752b400125881f3f4b30d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jan  6 03:08:08 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:21 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=53e01dbf

repoman: Delete unused subpkgs

 pym/repoman/checks/ebuilds/variables/__init__.py | 0
 pym/repoman/modules/fix/__init__.py  | 0
 pym/repoman/modules/full/__init__.py | 0
 pym/repoman/modules/manifest/__init__.py | 0
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py 
b/pym/repoman/checks/ebuilds/variables/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/fix/__init__.py 
b/pym/repoman/modules/fix/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/full/__init__.py 
b/pym/repoman/modules/full/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/manifest/__init__.py 
b/pym/repoman/modules/manifest/__init__.py
deleted file mode 100644
index e69de29..000



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/checks/ebuilds/variables/, ...

2016-01-30 Thread Brian Dolbec
commit: 0172019530d7a71d04f4ded5cda8008edbaab739
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 23:10:48 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=01720195

repoman: Migrate RestrictChecks to a plugin module

 pym/repoman/modules/scan/metadata/__init__.py  |  9 +++
 .../scan/metadata}/restrict.py | 29 +++---
 pym/repoman/scanner.py |  9 +--
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index c8f3609..4f376e1 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -46,6 +46,15 @@ module_spec = {
'func_desc': {
},
},
+   'restrict-metadata': {
+   'name': "restrict",
+   'sourcefile': "restrict",
+   'class': "RestrictChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py 
b/pym/repoman/modules/scan/metadata/restrict.py
similarity index 54%
rename from pym/repoman/checks/ebuilds/variables/restrict.py
rename to pym/repoman/modules/scan/metadata/restrict.py
index 215b792..93ca298 100644
--- a/pym/repoman/checks/ebuilds/variables/restrict.py
+++ b/pym/repoman/modules/scan/metadata/restrict.py
@@ -12,21 +12,23 @@ from repoman.qa_data import valid_restrict
 class RestrictChecks(object):
'''Perform checks on the RESTRICT variable.'''
 
-   def __init__(self, qatracker):
+   def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
-   self.qatracker = qatracker
+   self.qatracker = kwargs.get('qatracker')
 
-   def check(self, pkg, package, ebuild, y_ebuild):
+   def check(self, **kwargs):
+   xpkg = kwargs.get('xpkg')
+   ebuild = kwargs.get('ebuild')
+   y_ebuild = kwargs.get('y_ebuild')
myrestrict = None
 
try:
myrestrict = portage.dep.use_reduce(
-   pkg._metadata["RESTRICT"], matchall=1, 
flat=True)
+   ebuild.metadata["RESTRICT"], matchall=1, 
flat=True)
except portage.exception.InvalidDependString as e:
-   self. qatracker.add_error(
-   "RESTRICT.syntax",
+   self.qatracker.add_error("RESTRICT.syntax",
"%s: RESTRICT: %s" % (ebuild.relative_path, e))
del e
 
@@ -36,6 +38,15 @@ class RestrictChecks(object):
 
if mybadrestrict:
for mybad in mybadrestrict:
-   self.qatracker.add_error(
-   "RESTRICT.invalid",
-   package + "/" + y_ebuild + 
".ebuild: %s" % mybad)
+   
self.qatracker.add_error("RESTRICT.invalid",
+   "%s/%s.ebuild: %s" % (xpkg, 
y_ebuild, mybad))
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.check])
+

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 55f3d56..dcb955c 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
 from portage.dep import Atom
 from portage.output import green
 from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
 from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
 from repoman.repos import repo_metadata
@@ -211,10 +210,6 @@ class Scanner(object):
print("Initializing class name:", mod_class.__name__)
self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
 
-   # initialize our checks classes here before the big xpkg loop
-   self.restrictcheck = RestrictChecks(self.qatracker)
-
-
def scan_pkgs(self, can_force):
dynamic_data = {'can_force': can_force}
for xpkg in self.effective_scanlist:
@@ -298,7 +293,7 @@ class Scanner(object):
('description', 'DescriptionChecks'), 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/

2016-01-30 Thread Brian Dolbec
commit: 8159e492350890c59d364def406561a35d363d73
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 17:33:26 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:18 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8159e492

repoman: Move ebuild_archs to the Ebuild class

 pym/repoman/modules/scan/ebuild/ebuild.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py 
b/pym/repoman/modules/scan/ebuild/ebuild.py
index 953f425..2414028 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -36,6 +36,7 @@ class Ebuild(ScanBase):
self.eapi = None
self.inherited = None
self.keywords = None
+   self.archs = None
 
def _set_paths(self, **kwargs):
repolevel = kwargs.get('repolevel')



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/options/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 926a641c8fd26eba5a85d3f372682e61d06dc50d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jan  4 07:55:55 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=926a641c

repoman: Create a new Options class plugin

This handles an options.force bypass using the is_forced() from withing the 
plugin system.

 pym/repoman/modules/scan/options/__init__.py | 24 
 pym/repoman/modules/scan/options/options.py  | 22 ++
 pym/repoman/scanner.py   | 10 ++
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/pym/repoman/modules/scan/options/__init__.py 
b/pym/repoman/modules/scan/options/__init__.py
new file mode 100644
index 000..2d3d9d2
--- /dev/null
+++ b/pym/repoman/modules/scan/options/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Options plug-in module for repoman.
+Performs option related actions on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'options',
+   'description': doc,
+   'provides':{
+   'options-module': {
+   'name': "options",
+   'sourcefile': "options",
+   'class': "Options",
+   'description': doc,
+   'functions': ['is_forced'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/modules/scan/options/options.py 
b/pym/repoman/modules/scan/options/options.py
new file mode 100644
index 000..b592884
--- /dev/null
+++ b/pym/repoman/modules/scan/options/options.py
@@ -0,0 +1,22 @@
+
+
+class Options(object):
+
+   def __init__(self, **kwargs):
+   self.options = kwargs.get('options')
+
+   def is_forced(self, **kwargs):
+   if self.options.force:
+   # The dep_check() calls are the most expensive QA test. 
If --force
+   # is enabled, there's no point in wasting time on these 
since the
+   # user is intent on forcing the commit anyway.
+   return {'continue': True}
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.is_forced])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 9fe5f26..b9c53a0 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -291,6 +291,8 @@ class Scanner(object):
('use_flags', 'USEFlagChecks'), ('ruby', 
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict', 
'RestrictChecks'),
('mtime', 'MtimeChecks'), ('multicheck', 
'MultiCheck'),
+   # Options.is_forced() is used to bypass further 
checks
+   ('options', 'Options'),
]:
if mod[0]:
mod_class = 
MODULE_CONTROLLER.get_class(mod[0])
@@ -318,14 +320,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   # Syntax Checks
-
-   if self.options.force:
-   # The dep_check() calls are the most expensive 
QA test. If --force
-   # is enabled, there's no point in wasting time 
on these since the
-   # user is intent on forcing the commit anyway.
-   continue
-
relevant_profiles = []
for keyword, arch, groups in dynamic_data['arches']:
if arch not in self.profiles:



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 96c4b3db3f34c1e5f0996fd7975a73c846cd7ff5
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jan  4 08:37:22 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=96c4b3db

repoman: Create a metadata UnusedCheck and final pkg checks

Create a plugin loop for any final pkg checks.
Create the one plugin for the unused use-descriptions in mteadata.xml.

 pym/repoman/modules/scan/metadata/__init__.py |  9 +++
 pym/repoman/modules/scan/metadata/unused.py   | 32 
 pym/repoman/scanner.py| 36 ---
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index 4f376e1..f619764 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -55,6 +55,15 @@ module_spec = {
'func_desc': {
},
},
+   'unused-metadata': {
+   'name': "unused",
+   'sourcefile': "unused",
+   'class': "UnusedCheck",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/modules/scan/metadata/unused.py 
b/pym/repoman/modules/scan/metadata/unused.py
new file mode 100644
index 000..5eb6716
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/unused.py
@@ -0,0 +1,32 @@
+
+
+class UnusedCheck(object):
+
+   def __init__(self, **kwargs):
+   self.qatracker = kwargs.get('qatracker')
+
+   def check(self, **kwargs):
+   xpkg = kwargs.get('xpkg')
+   muselist = kwargs.get('muselist')
+   used_useflags = kwargs.get('used_useflags')
+   # check if there are unused local USE-descriptions in 
metadata.xml
+   # (unless there are any invalids, to avoid noise)
+   if kwargs.get('allvalid'):
+   for myflag in muselist.difference(used_useflags):
+   self.qatracker.add_error(
+   "metadata.warning",
+   "%s/metadata.xml: unused local 
USE-description: '%s'"
+   % (xpkg, myflag))
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (False, [])
+
+   @property
+   def runInFinal(self):
+   return (True, [self.check])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 1e61eb6..4dd5408 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -270,7 +270,6 @@ class Scanner(object):
 
 
def _scan_ebuilds(self, ebuildlist, dynamic_data):
-   xpkg = dynamic_data['xpkg']
# detect unused local USE-descriptions
dynamic_data['used_useflags'] = set()
 
@@ -318,11 +317,30 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   # check if there are unused local USE-descriptions in 
metadata.xml
-   # (unless there are any invalids, to avoid noise)
-   if dynamic_data['allvalid']:
-   for myflag in 
dynamic_data['muselist'].difference(dynamic_data['used_useflags']):
-   self.qatracker.add_error(
-   "metadata.warning",
-   "%s/metadata.xml: unused local 
USE-description: '%s'"
-   % (xpkg, myflag))
+   # Final checks
+   # initialize per pkg plugin final checks here
+   # need to set it up for ==> self.modules_list or some other 
ordered list
+   xpkg_complete = False
+   for mod in [('unused', 'UnusedChecks')]:
+   if mod[0]:
+   mod_class = MODULE_CONTROLLER.get_class(mod[0])
+   print("Initializing class name:", 
mod_class.__name__)
+   self.modules[mod[1]] = mod_class(**self.kwargs)
+   print("scan_ebuilds final checks: module:", mod[1])
+   do_it, functions = self.modules[mod[1]].runInFinal
+   # print("do_it", do_it, "functions", functions)
+   if do_it:
+   for func in functions:
+   print("\tRunning function:", func)
+   rdata = func(**dynamic_data)

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/

2016-01-30 Thread Brian Dolbec
commit: b6818e7a118a8e82a71b394ae2a5ee79576a1e4e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jan 21 18:29:07 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:21 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b6818e7a

repoman: Fix a traceback due to xmlint not being installed for a manifest 
generation

Mike helped find teh fact that self.binary was None, causing the misleading 
traceback.
Tighten up the logic in XmlLint.
Bypass the PkgMetadata check for manifest mode.

floppym@naomi btrfs-progs % repoman manifest
>>> Creating Manifest for /home/floppym/repos/gentoo/sys-fs/btrfs-progs
Traceback (most recent call last):
  File "/home/floppym/bin/repoman", line 37, in 
repoman_main(sys.argv[1:])
  File "/home/floppym/src/portage/pym/repoman/main.py", line 111, in 
repoman_main
can_force = scanner.scan_pkgs(can_force)
  File "/home/floppym/src/portage/pym/repoman/scanner.py", line 242, in 
scan_pkgs
rdata = func(**dynamic_data)
  File 
"/home/floppym/src/portage/pym/repoman/modules/scan/metadata/pkgmetadata.py", 
line 180, in check
if not self.xmllint.check(checkdir, repolevel):
  File "/home/floppym/src/portage/pym/repoman/_xml.py", line 98, in check
os.path.join(checkdir, "metadata.xml"
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'

 pym/repoman/_xml.py  | 2 +-
 pym/repoman/modules/scan/metadata/pkgmetadata.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index 2661f14..f7ff9fb 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -60,6 +60,7 @@ class XmlLint(object):
self.repoman_settings = repoman_settings
self._is_capable = metadata_dtd is not None
self.binary = None
+   self._is_capable = False
self._check_capable()
 
def _check_capable(self):
@@ -68,7 +69,6 @@ class XmlLint(object):
self.binary = find_binary('xmllint')
if not self.binary:
print(red("!!! xmllint not found. Can't check 
metadata.xml.\n"))
-   self._is_capable = False
elif not self._is_capable:
if not fetch_metadata_dtd(self.metadata_dtd, 
self.repoman_settings):
sys.exit(1)

diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py 
b/pym/repoman/modules/scan/metadata/pkgmetadata.py
index 220fd23..8e93457 100644
--- a/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -71,6 +71,9 @@ class PkgMetadata(ScanBase):
repolevel = kwargs.get('repolevel')
 
self.musedict = {}
+   if self.options.mode in ['manifest']:
+   return {'continue': False, 'muselist': 
frozenset(self.musedict)}
+
# metadata.xml file check
if "metadata.xml" not in checkdirlist:
self.qatracker.add_error("metadata.missing", xpkg + 
"/metadata.xml")



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

2016-01-30 Thread Brian Dolbec
commit: 024d955e3f0fdab6942aaeb323e1e90051028b54
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 21:55:33 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=024d955e

repoman: Migrate additional dynamic data setting to the USEFlagsChecks

 pym/repoman/scanner.py | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 804a3f2..c8539cb 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -286,7 +286,7 @@ class Scanner(object):
def _scan_ebuilds(self, ebuildlist, dynamic_data):
xpkg = dynamic_data['xpkg']
# detect unused local USE-descriptions
-   used_useflags = set()
+   dynamic_data['used_useflags'] = set()
 
for y_ebuild in ebuildlist:
dynamic_data['y_ebuild'] = y_ebuild
@@ -327,8 +327,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   used_useflags = 
used_useflags.union(dynamic_data['ebuild_UsedUseFlags'])
-
# license checks
if not dynamic_data['badlicsyntax']:
self.licensecheck.check(dynamic_data['pkg'], 
xpkg, dynamic_data['ebuild'], y_ebuild)
@@ -538,7 +536,7 @@ class Scanner(object):
# check if there are unused local USE-descriptions in 
metadata.xml
# (unless there are any invalids, to avoid noise)
if dynamic_data['allvalid']:
-   for myflag in 
dynamic_data['muselist'].difference(used_useflags):
+   for myflag in 
dynamic_data['muselist'].difference(dynamic_data['used_useflags']):
self.qatracker.add_error(
"metadata.warning",
"%s/metadata.xml: unused local 
USE-description: '%s'"



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...

2016-01-30 Thread Brian Dolbec
commit: 2276e88232518f103aaab5484bb65dde2354e288
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 23:09:27 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2276e882

repoman: Migrate license checks to a plugin module

 pym/repoman/checks/ebuilds/variables/license.py | 47 --
 pym/repoman/modules/scan/metadata/__init__.py   |  9 +
 pym/repoman/modules/scan/metadata/license.py| 53 +
 pym/repoman/scanner.py  |  7 +---
 4 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/variables/license.py 
b/pym/repoman/checks/ebuilds/variables/license.py
deleted file mode 100644
index bdc859c..000
--- a/pym/repoman/checks/ebuilds/variables/license.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-'''description.py
-Perform checks on the LICENSE variable.
-'''
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class LicenseChecks(object):
-   '''Perform checks on the LICENSE variable.'''
-
-   def __init__(self, qatracker, liclist, liclist_deprecated):
-   '''
-   @param qatracker: QATracker instance
-   @param liclist: List of licenses.
-   @param liclist: List of deprecated licenses.
-   '''
-   self.qatracker = qatracker
-   self.liclist = liclist
-   self.liclist_deprecated = liclist_deprecated
-
-   def check(
-   self, pkg, package, ebuild, y_ebuild):
-   '''
-   @param pkg: Package in which we check (object).
-   @param package: Package in which we check (string).
-   @param ebuild: Ebuild which we check (object).
-   @param y_ebuild: Ebuild which we check (string).
-   '''
-
-   # Parse the LICENSE variable, remove USE conditions and flatten 
it.
-   licenses = portage.dep.use_reduce(
-   pkg._metadata["LICENSE"], matchall=1, flat=True)
-
-   # Check each entry to ensure that it exists in 
${PORTDIR}/licenses/.
-   for lic in licenses:
-   # Need to check for "||" manually as no portage
-   # function will remove it without removing values.
-   if lic not in self.liclist and lic != "||":
-   self.qatracker.add_error(
-   "LICENSE.invalid",
-   package + "/" + y_ebuild + ".ebuild: 
%s" % lic)
-   elif lic in self.liclist_deprecated:
-   self.qatracker.add_error(
-   "LICENSE.deprecated",
-   "%s: %s" % (ebuild.relative_path, lic))

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index 83aac7f..c8f3609 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -37,6 +37,15 @@ module_spec = {
'func_desc': {
},
},
+   'license-metadata': {
+   'name': "license",
+   'sourcefile': "license",
+   'class': "LicenseChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/modules/scan/metadata/license.py 
b/pym/repoman/modules/scan/metadata/license.py
new file mode 100644
index 000..b022b20
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/license.py
@@ -0,0 +1,53 @@
+
+'''license.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+   '''Perform checks on the LICENSE variable.'''
+
+   def __init__(self, **kwargs):
+   '''
+   @param qatracker: QATracker instance
+   @param repo_metadata: dictionary of various repository items.
+   '''
+   self.qatracker = kwargs.get('qatracker')
+   self.repo_metadata = kwargs.get('repo_metadata')
+
+   def check(self, **kwargs):
+   '''
+   @param xpkg: Package in which we check (string).
+   @param ebuild: Ebuild which we check (object).
+   @param y_ebuild: Ebuild which we check (string).
+   '''
+   xpkg = kwargs.get('xpkg')
+   ebuild = kwargs.get('ebuild')
+   y_ebuild = kwargs.get('y_ebuild')
+   if not kwargs.get('badlicsyntax'):
+   # Parse the 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/checks/ebuilds/variables/, ...

2016-01-30 Thread Brian Dolbec
commit: 40b9ed5989fd3793ef23a6a23b529362e8327c8d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 17:36:26 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:17 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=40b9ed59

repoman: Migrate DescriptionChecks to the plugin system

 pym/repoman/modules/scan/metadata/__init__.py|  9 +
 .../scan/metadata}/description.py| 20 ++--
 pym/repoman/scanner.py   |  5 +
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index bacedf5..83aac7f 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+   'description-metadata': {
+   'name': "description",
+   'sourcefile': "description",
+   'class': "DescriptionChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/checks/ebuilds/variables/description.py 
b/pym/repoman/modules/scan/metadata/description.py
similarity index 66%
rename from pym/repoman/checks/ebuilds/variables/description.py
rename to pym/repoman/modules/scan/metadata/description.py
index a2b1057..3570607 100644
--- a/pym/repoman/checks/ebuilds/variables/description.py
+++ b/pym/repoman/modules/scan/metadata/description.py
@@ -9,20 +9,19 @@ from repoman.qa_data import max_desc_len
 class DescriptionChecks(object):
'''Perform checks on the DESCRIPTION variable.'''
 
-   def __init__(self, qatracker):
+   def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
-   self.qatracker = qatracker
+   self.qatracker = kwargs.get('qatracker')
 
-   def check(self, pkg, ebuild):
+   def checkTooLong(self, **kwargs):
'''
@param pkg: Package in which we check (object).
@param ebuild: Ebuild which we check (object).
'''
-   self._checkTooLong(pkg, ebuild)
-
-   def _checkTooLong(self, pkg, ebuild):
+   ebuild = kwargs.get('ebuild')
+   pkg = kwargs.get('pkg')
# 14 is the length of DESCRIPTION=""
if len(pkg._metadata['DESCRIPTION']) > max_desc_len:
self.qatracker.add_error(
@@ -30,3 +29,12 @@ class DescriptionChecks(object):
"%s: DESCRIPTION is %d characters (max %d)" %
(ebuild.relative_path, len(
pkg._metadata['DESCRIPTION']), 
max_desc_len))
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.checkTooLong])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 28142ae..27c1be9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -21,7 +21,6 @@ from repoman.checks.ebuilds.checks import run_checks
 from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
 from repoman.check_missingslot import check_missingslot
 from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
 from repoman.checks.ebuilds.variables.license import LicenseChecks
 from repoman.checks.ebuilds.variables.restrict import RestrictChecks
 from repoman.modules.commit import repochecks
@@ -219,7 +218,6 @@ class Scanner(object):
# initialize our checks classes here before the big xpkg loop
self.use_flag_checks = USEFlagChecks(self.qatracker, uselist)
self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
-   self.descriptioncheck = DescriptionChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist, 
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
 
@@ -304,6 +302,7 @@ class Scanner(object):
for mod in [('ebuild', 'Ebuild'), ('live', 
'LiveEclassChecks'),
('eapi', 'EAPIChecks'), ('ebuild_metadata', 
'EbuildMetadata'),
('thirdpartymirrors', 'ThirdPartyMirrors'),
+   ('description', 'DescriptionChecks'),
]:
if mod[0]:
mod_class = 

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

2016-01-30 Thread Brian Dolbec
commit: e7c06075a76b572006f3d6e83ec50001db2e1f59
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jan 21 18:51:16 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:21 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e7c06075

metadata.py: Resolve error when moving metadata.dtd

If DISTDIR and PORTDIR/metadata/dtd live on different filesystems,
os.rename() will fail. Use shutil.move() instead.

 pym/repoman/metadata.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py
index f1fa53a..e95ad41 100644
--- a/pym/repoman/metadata.py
+++ b/pym/repoman/metadata.py
@@ -19,6 +19,7 @@ from repoman._portage import portage
 
 from portage import exception
 from portage import os
+from portage import shutil
 from portage.output import green
 
 if sys.hexversion >= 0x300:
@@ -143,7 +144,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings):
except portage.exception.PortageException:
pass
 
-   os.rename(metadata_dtd_tmp, metadata_dtd)
+   shutil.move(metadata_dtd_tmp, metadata_dtd)
finally:
try:
os.unlink(metadata_dtd_tmp)



[gentoo-commits] proj/kde:master commit in: sys-block/partitionmanager/

2016-01-30 Thread Michael Palimaka
commit: 31b7df03bc8231c6c4f0e862ac806c16d70c96ec
Author: Andrius Å tikonas  stikonas  eu>
AuthorDate: Fri Jan 29 16:58:51 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan 30 08:31:37 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31b7df03

sys-block/partitionmanager: kf5-based kdesu workaround is now unnecessary

Upstream-commit: 53e1413d0673bbef3f6706cc6a961b38f44dc3d5

 sys-block/partitionmanager/partitionmanager-.ebuild | 6 --
 1 file changed, 6 deletions(-)

diff --git a/sys-block/partitionmanager/partitionmanager-.ebuild 
b/sys-block/partitionmanager/partitionmanager-.ebuild
index e9f8f26..d704c5d 100644
--- a/sys-block/partitionmanager/partitionmanager-.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-.ebuild
@@ -35,9 +35,3 @@ RDEPEND="${DEPEND}
$(add_plasma_dep kde-cli-tools kdesu 5.5.2)
!sys-block/partitionmanager:0
 "
-
-src_prepare() {
-   kde5_src_prepare
-
-   sed -i -e 's/"kdesu"/"kdesu5"/' src/util/guihelpers.cpp || die
-}



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/, ...

2016-01-30 Thread Brian Dolbec
commit: 47f880cf6ffa44309dd85e4e54ee5b0cf3043498
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 23:09:27 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:57 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=47f880cf

repoman: Migrate license checks to a plugin module

 pym/repoman/checks/ebuilds/variables/license.py | 47 --
 pym/repoman/modules/scan/metadata/__init__.py   |  9 +
 pym/repoman/modules/scan/metadata/license.py| 53 +
 pym/repoman/scanner.py  |  7 +---
 4 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/variables/license.py 
b/pym/repoman/checks/ebuilds/variables/license.py
deleted file mode 100644
index bdc859c..000
--- a/pym/repoman/checks/ebuilds/variables/license.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-'''description.py
-Perform checks on the LICENSE variable.
-'''
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class LicenseChecks(object):
-   '''Perform checks on the LICENSE variable.'''
-
-   def __init__(self, qatracker, liclist, liclist_deprecated):
-   '''
-   @param qatracker: QATracker instance
-   @param liclist: List of licenses.
-   @param liclist: List of deprecated licenses.
-   '''
-   self.qatracker = qatracker
-   self.liclist = liclist
-   self.liclist_deprecated = liclist_deprecated
-
-   def check(
-   self, pkg, package, ebuild, y_ebuild):
-   '''
-   @param pkg: Package in which we check (object).
-   @param package: Package in which we check (string).
-   @param ebuild: Ebuild which we check (object).
-   @param y_ebuild: Ebuild which we check (string).
-   '''
-
-   # Parse the LICENSE variable, remove USE conditions and flatten 
it.
-   licenses = portage.dep.use_reduce(
-   pkg._metadata["LICENSE"], matchall=1, flat=True)
-
-   # Check each entry to ensure that it exists in 
${PORTDIR}/licenses/.
-   for lic in licenses:
-   # Need to check for "||" manually as no portage
-   # function will remove it without removing values.
-   if lic not in self.liclist and lic != "||":
-   self.qatracker.add_error(
-   "LICENSE.invalid",
-   package + "/" + y_ebuild + ".ebuild: 
%s" % lic)
-   elif lic in self.liclist_deprecated:
-   self.qatracker.add_error(
-   "LICENSE.deprecated",
-   "%s: %s" % (ebuild.relative_path, lic))

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index 83aac7f..c8f3609 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -37,6 +37,15 @@ module_spec = {
'func_desc': {
},
},
+   'license-metadata': {
+   'name': "license",
+   'sourcefile': "license",
+   'class': "LicenseChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/modules/scan/metadata/license.py 
b/pym/repoman/modules/scan/metadata/license.py
new file mode 100644
index 000..b022b20
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/license.py
@@ -0,0 +1,53 @@
+
+'''license.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+   '''Perform checks on the LICENSE variable.'''
+
+   def __init__(self, **kwargs):
+   '''
+   @param qatracker: QATracker instance
+   @param repo_metadata: dictionary of various repository items.
+   '''
+   self.qatracker = kwargs.get('qatracker')
+   self.repo_metadata = kwargs.get('repo_metadata')
+
+   def check(self, **kwargs):
+   '''
+   @param xpkg: Package in which we check (string).
+   @param ebuild: Ebuild which we check (object).
+   @param y_ebuild: Ebuild which we check (string).
+   '''
+   xpkg = kwargs.get('xpkg')
+   ebuild = kwargs.get('ebuild')
+   y_ebuild = kwargs.get('y_ebuild')
+   if not kwargs.get('badlicsyntax'):
+   # Parse the 

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

2016-01-30 Thread Brian Dolbec
commit: 2918b96c51f63a80cc71b81829b6178fbd8df204
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jan 21 18:51:16 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:51:58 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2918b96c

metadata.py: Resolve error when moving metadata.dtd

If DISTDIR and PORTDIR/metadata/dtd live on different filesystems,
os.rename() will fail. Use shutil.move() instead.

 pym/repoman/metadata.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py
index f1fa53a..e95ad41 100644
--- a/pym/repoman/metadata.py
+++ b/pym/repoman/metadata.py
@@ -19,6 +19,7 @@ from repoman._portage import portage
 
 from portage import exception
 from portage import os
+from portage import shutil
 from portage.output import green
 
 if sys.hexversion >= 0x300:
@@ -143,7 +144,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings):
except portage.exception.PortageException:
pass
 
-   os.rename(metadata_dtd_tmp, metadata_dtd)
+   shutil.move(metadata_dtd_tmp, metadata_dtd)
finally:
try:
os.unlink(metadata_dtd_tmp)



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...

2016-01-30 Thread Brian Dolbec
commit: 30dc26f0a6ed55b5b2c9449464e1e524b7188da7
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 17:36:26 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:42 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=30dc26f0

repoman: Migrate DescriptionChecks to the plugin system

 pym/repoman/modules/scan/metadata/__init__.py|  9 +
 .../scan/metadata}/description.py| 20 ++--
 pym/repoman/scanner.py   |  5 +
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index bacedf5..83aac7f 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+   'description-metadata': {
+   'name': "description",
+   'sourcefile': "description",
+   'class': "DescriptionChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/checks/ebuilds/variables/description.py 
b/pym/repoman/modules/scan/metadata/description.py
similarity index 66%
rename from pym/repoman/checks/ebuilds/variables/description.py
rename to pym/repoman/modules/scan/metadata/description.py
index a2b1057..3570607 100644
--- a/pym/repoman/checks/ebuilds/variables/description.py
+++ b/pym/repoman/modules/scan/metadata/description.py
@@ -9,20 +9,19 @@ from repoman.qa_data import max_desc_len
 class DescriptionChecks(object):
'''Perform checks on the DESCRIPTION variable.'''
 
-   def __init__(self, qatracker):
+   def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
-   self.qatracker = qatracker
+   self.qatracker = kwargs.get('qatracker')
 
-   def check(self, pkg, ebuild):
+   def checkTooLong(self, **kwargs):
'''
@param pkg: Package in which we check (object).
@param ebuild: Ebuild which we check (object).
'''
-   self._checkTooLong(pkg, ebuild)
-
-   def _checkTooLong(self, pkg, ebuild):
+   ebuild = kwargs.get('ebuild')
+   pkg = kwargs.get('pkg')
# 14 is the length of DESCRIPTION=""
if len(pkg._metadata['DESCRIPTION']) > max_desc_len:
self.qatracker.add_error(
@@ -30,3 +29,12 @@ class DescriptionChecks(object):
"%s: DESCRIPTION is %d characters (max %d)" %
(ebuild.relative_path, len(
pkg._metadata['DESCRIPTION']), 
max_desc_len))
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.checkTooLong])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 28142ae..27c1be9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -21,7 +21,6 @@ from repoman.checks.ebuilds.checks import run_checks
 from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
 from repoman.check_missingslot import check_missingslot
 from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
 from repoman.checks.ebuilds.variables.license import LicenseChecks
 from repoman.checks.ebuilds.variables.restrict import RestrictChecks
 from repoman.modules.commit import repochecks
@@ -219,7 +218,6 @@ class Scanner(object):
# initialize our checks classes here before the big xpkg loop
self.use_flag_checks = USEFlagChecks(self.qatracker, uselist)
self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
-   self.descriptioncheck = DescriptionChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist, 
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
 
@@ -304,6 +302,7 @@ class Scanner(object):
for mod in [('ebuild', 'Ebuild'), ('live', 
'LiveEclassChecks'),
('eapi', 'EAPIChecks'), ('ebuild_metadata', 
'EbuildMetadata'),
('thirdpartymirrors', 'ThirdPartyMirrors'),
+   ('description', 'DescriptionChecks'),
]:
if mod[0]:
mod_class = 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/

2016-01-30 Thread Brian Dolbec
commit: 8be9e2ce43f38c43d7ca2b7bd4971dc8f89609b1
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 11:31:26 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:55 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8be9e2ce

scanner.py: Migrate another metadata check to ebuild_metadata

 pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++
 pym/repoman/scanner.py   | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py 
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 143a40e..2dc1db2 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -28,6 +28,9 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() + 
1))
+   if ebuild.metadata.get("PROVIDE"):
+   self.qatracker.add_error("virtual.oldstyle", 
ebuild.relative_path)
+
return {'continue': False}
 
@property

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 006c3f7..803e5a3 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -327,8 +327,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-   if dynamic_data['ebuild'].metadata.get("PROVIDE"):
-   self.qatracker.add_error("virtual.oldstyle", 
dynamic_data['ebuild'].relative_path)
 
for pos, missing_var in enumerate(missingvars):
if not 
dynamic_data['ebuild'].metadata.get(missing_var):



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/, ...

2016-01-30 Thread Brian Dolbec
commit: db134658ee50894ef42fece504a93540f681a00d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 23:10:48 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:51:52 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=db134658

repoman: Migrate RestrictChecks to a plugin module

 pym/repoman/modules/scan/metadata/__init__.py  |  9 +++
 .../scan/metadata}/restrict.py | 29 +++---
 pym/repoman/scanner.py |  9 +--
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/__init__.py 
b/pym/repoman/modules/scan/metadata/__init__.py
index c8f3609..4f376e1 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -46,6 +46,15 @@ module_spec = {
'func_desc': {
},
},
+   'restrict-metadata': {
+   'name': "restrict",
+   'sourcefile': "restrict",
+   'class': "RestrictChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py 
b/pym/repoman/modules/scan/metadata/restrict.py
similarity index 54%
rename from pym/repoman/checks/ebuilds/variables/restrict.py
rename to pym/repoman/modules/scan/metadata/restrict.py
index 215b792..93ca298 100644
--- a/pym/repoman/checks/ebuilds/variables/restrict.py
+++ b/pym/repoman/modules/scan/metadata/restrict.py
@@ -12,21 +12,23 @@ from repoman.qa_data import valid_restrict
 class RestrictChecks(object):
'''Perform checks on the RESTRICT variable.'''
 
-   def __init__(self, qatracker):
+   def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
-   self.qatracker = qatracker
+   self.qatracker = kwargs.get('qatracker')
 
-   def check(self, pkg, package, ebuild, y_ebuild):
+   def check(self, **kwargs):
+   xpkg = kwargs.get('xpkg')
+   ebuild = kwargs.get('ebuild')
+   y_ebuild = kwargs.get('y_ebuild')
myrestrict = None
 
try:
myrestrict = portage.dep.use_reduce(
-   pkg._metadata["RESTRICT"], matchall=1, 
flat=True)
+   ebuild.metadata["RESTRICT"], matchall=1, 
flat=True)
except portage.exception.InvalidDependString as e:
-   self. qatracker.add_error(
-   "RESTRICT.syntax",
+   self.qatracker.add_error("RESTRICT.syntax",
"%s: RESTRICT: %s" % (ebuild.relative_path, e))
del e
 
@@ -36,6 +38,15 @@ class RestrictChecks(object):
 
if mybadrestrict:
for mybad in mybadrestrict:
-   self.qatracker.add_error(
-   "RESTRICT.invalid",
-   package + "/" + y_ebuild + 
".ebuild: %s" % mybad)
+   
self.qatracker.add_error("RESTRICT.invalid",
+   "%s/%s.ebuild: %s" % (xpkg, 
y_ebuild, mybad))
+   return {'continue': False}
+
+   @property
+   def runInPkgs(self):
+   return (False, [])
+
+   @property
+   def runInEbuilds(self):
+   return (True, [self.check])
+

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 55f3d56..dcb955c 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
 from portage.dep import Atom
 from portage.output import green
 from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
 from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
 from repoman.repos import repo_metadata
@@ -211,10 +210,6 @@ class Scanner(object):
print("Initializing class name:", mod_class.__name__)
self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
 
-   # initialize our checks classes here before the big xpkg loop
-   self.restrictcheck = RestrictChecks(self.qatracker)
-
-
def scan_pkgs(self, can_force):
dynamic_data = {'can_force': can_force}
for xpkg in self.effective_scanlist:
@@ -298,7 +293,7 @@ class Scanner(object):
('description', 'DescriptionChecks'), 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/modules/scan/use/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: fbad4f7dfb991ffd486d26ca4e84cd61aaf62981
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Jan  8 01:37:39 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:55 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fbad4f7d

repoman: Create USEFlagChecks class plugin

 pym/repoman/modules/scan/use/__init__.py   | 24 +++
 .../ebuilds => modules/scan/use}/use_flags.py  | 36 ++
 pym/repoman/scanner.py |  8 ++---
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/pym/repoman/modules/scan/use/__init__.py 
b/pym/repoman/modules/scan/use/__init__.py
new file mode 100644
index 000..80fa213
--- /dev/null
+++ b/pym/repoman/modules/scan/use/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Use plug-in module for repoman.
+Performs use flag checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'use',
+   'description': doc,
+   'provides':{
+   'use-module': {
+   'name': "use_flags",
+   'sourcefile': "use_flags",
+   'class': "USEFlagChecks",
+   'description': doc,
+   'functions': ['check', 'getUsedUseFlags'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/checks/ebuilds/use_flags.py 
b/pym/repoman/modules/scan/use/use_flags.py
similarity index 74%
rename from pym/repoman/checks/ebuilds/use_flags.py
rename to pym/repoman/modules/scan/use/use_flags.py
index ac21b47..acc7dd3 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/modules/scan/use/use_flags.py
@@ -9,31 +9,39 @@ from repoman._portage import portage
 
 from portage import eapi
 from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from repoman.modules.scan.scanbase import ScanBase
 
 
-class USEFlagChecks(object):
+class USEFlagChecks(ScanBase):
'''Performs checks on USE flags listed in the ebuilds and 
metadata.xml'''
 
-   def __init__(self, qatracker, globalUseFlags):
-   '''
+   def __init__(self, **kwargs):
+   '''Class init
+
@param qatracker: QATracker instance
@param globalUseFlags: Global USE flags
'''
-   self.qatracker = qatracker
-   self.globalUseFlags = globalUseFlags
+   super(USEFlagChecks, self).__init__(**kwargs)
+   self.qatracker = kwargs.get('qatracker')
+   self.globalUseFlags = kwargs.get('uselist')
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
 
-   def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+   def check(self, **kwargs):
'''Perform the check.
 
@param pkg: Package in which we check (object).
-   @param package: Package in which we check (string).
+   @param xpkg: Package in which we check (string).
@param ebuild: Ebuild which we check (object).
@param y_ebuild: Ebuild which we check (string).
-   @param localUseFlags: Local USE flags of the package
+   @param muselist: Local USE flags of the package
'''
+   pkg = kwargs.get('pkg')
+   package = kwargs.get('xpkg')
+   ebuild = kwargs.get('ebuild')
+   y_ebuild = kwargs.get('y_ebuild')
+   localUseFlags = kwargs.get('muselist')
# reset state variables for the run
self.useFlags = []
self.defaultUseFlags = []
@@ -41,10 +49,9 @@ class USEFlagChecks(object):
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
-
-   def getUsedUseFlags(self):
-   '''Get the USE flags that this check has seen'''
-   return self.usedUseFlags
+   used_useflags = 
kwargs.get('used_useflags').union(self.usedUseFlags)
+   return {'continue': False, 'ebuild_UsedUseFlags': 
self.usedUseFlags,
+   'used_useflags': used_useflags}
 
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
@@ -88,3 +95,8 @@ class USEFlagChecks(object):
"REQUIRED_USE.syntax",
"%s: REQUIRED_USE: %s" % 
(ebuild.relative_path, e))
del e
+
+   @property
+   def runInEbuilds(self):
+   '''Ebuild level scans'''
+   return (True, [self.check])

diff --git a/pym/repoman/scanner.py 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/, net-analyzer/rrdtool/files/

2016-01-30 Thread Jeroen Roovers
commit: c4d9d954e1c9bad782f1e319cc052d121126bf3e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Jan 30 09:23:34 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Jan 30 09:24:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d9d954

net-analyzer/rrdtool: Fix test failures (bug #573210 by Paolo Pedroni).

Package-Manager: portage-2.2.27

 .../rrdtool/files/rrdtool-1.5.5-rpn1.output|   3 +
 net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild   | 186 +
 2 files changed, 189 insertions(+)

diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output 
b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output
new file mode 100644
index 000..4a7696d
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rpn1.output
@@ -0,0 +1,3 @@
+print[0] = "30.769231"
+print[1] = "72.00"
+print[2] = "0.00"

diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild 
b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
new file mode 100644
index 000..df6ea73
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=true
+DISTUTILS_SINGLE_IMPL=true
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/;
+SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd 
~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+   >=dev-libs/glib-2.28.7:2[static-libs(+)?]
+   >=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
+   dbi? ( dev-db/libdbi[static-libs(+)?] )
+   graph? (
+   >=media-libs/libpng-1.5.10:0=[static-libs(+)?]
+   >=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
+   >=x11-libs/pango-1.28
+   )
+   lua? ( dev-lang/lua:*[deprecated] )
+   perl? ( dev-lang/perl:= )
+   python? ( ${PYTHON_DEPS} )
+   rados? ( sys-cluster/ceph )
+   tcl? ( dev-lang/tcl:0= )
+   tcpd? ( sys-apps/tcp-wrappers )
+"
+
+DEPEND="
+   ${CDEPEND}
+   sys-apps/groff
+   virtual/pkgconfig
+   virtual/awk
+"
+RDEPEND="
+   ${CDEPEND}
+"
+PDEPEND="
+   ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+python_compile() {
+   cd bindings/python || die
+   distutils-r1_python_compile
+}
+
+python_install() {
+   cd bindings/python || die
+   distutils-r1_python_install
+}
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # At the next version bump, please see if you actually still need this
+   # before adding versions
+   cp "${FILESDIR}"/${P}-rpn1.output tests/rpn1.output || die
+   cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
+
+   epatch \
+   "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
+   "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
+   "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
+   "${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
+   "${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
+
+   # bug 456810
+   # no time to sleep
+   sed -i \
+   -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
+   -e 's|^sleep 1$||g' \
+   -e '/^dnl.*png/s|^dnl||g' \
+   configure.ac || die
+
+   # Python bindings are built/installed manually
+   sed -i \
+   -e '/^all-local:/s| @COMP_PYTHON@||' \
+   bindings/Makefile.am || die
+
+   if ! use graph; then
+   sed -i \
+   -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
+   -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
+   tests/Makefile.am || die
+   fi
+
+   echo ${PV/_rc*/} >> VERSION || die
+
+   export rd_cv_gcc_flag__Werror=no
+
+   eautoreconf
+}
+
+src_configure() {
+   filter-flags -ffast-math
+
+   export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+   # to solve bug #260380
+   [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
+
+   # Stub configure.ac
+   local myconf=()
+   if ! use tcpd; then
+   myconf+=( "--disable-libwrap" )
+   fi
+   if ! use dbi; then
+   myconf+=( "--disable-libdbi" )
+   fi
+   if ! use rados; then
+   myconf+=( "--disable-librados" )
+   fi
+
+   econf \
+   $(use_enable 

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

2016-01-30 Thread Pacho Ramos
commit: b5eaa5b1590c3ccdb014120cc2698a289fcef0e0
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:32:27 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:32:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5eaa5b1

net-libs/libtorrent: x86 stable, bug #522706

Package-Manager: portage-2.2.26

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

diff --git a/net-libs/libtorrent/libtorrent-0.13.6.ebuild 
b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
index 9614040..327f90f 100644
--- a/net-libs/libtorrent/libtorrent-0.13.6.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris"
 IUSE="debug ipv6 libressl ssl test"
 
 RDEPEND="



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

2016-01-30 Thread Pacho Ramos
commit: 01fa2d144eb56d11fb8d86c97e083363b56b921b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:36:31 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:36:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fa2d14

net-misc/sobby: x86 stable, bug #569304

Package-Manager: portage-2.2.26

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

diff --git a/net-misc/sobby/sobby-0.4.8-r1.ebuild 
b/net-misc/sobby/sobby-0.4.8-r1.ebuild
index 8143684..8987445 100644
--- a/net-misc/sobby/sobby-0.4.8-r1.ebuild
+++ b/net-misc/sobby/sobby-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gobby.0x539.de/;
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="zeroconf"
 
 RDEPEND="



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

2016-01-30 Thread Pacho Ramos
commit: dcc99ecee84c21863dbdaeaf12972eeb0ab78633
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:36:11 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:36:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc99ece

app-editors/gobby: x86 stable, bug #569304

Package-Manager: portage-2.2.26

 app-editors/gobby/gobby-0.4.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/gobby/gobby-0.4.13-r1.ebuild 
b/app-editors/gobby/gobby-0.4.13-r1.ebuild
index f9d58c6..f8ef4e9 100644
--- a/app-editors/gobby/gobby-0.4.13-r1.ebuild
+++ b/app-editors/gobby/gobby-0.4.13-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gobby.0x539.de/;
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="gnome zeroconf"
 
 RDEPEND="



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

2016-01-30 Thread Pacho Ramos
commit: eaa2ada39b5bf4c9f9033ee975007b764ebc92ca
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:40:15 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:40:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa2ada3

media-sound/seq24: x86 stable, bug #572964

Package-Manager: portage-2.2.26

 media-sound/seq24/seq24-0.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/seq24/seq24-0.9.3.ebuild 
b/media-sound/seq24/seq24-0.9.3.ebuild
index 688d74a..c459e5f 100644
--- a/media-sound/seq24/seq24-0.9.3.ebuild
+++ b/media-sound/seq24/seq24-0.9.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="jack lash"
 
 RDEPEND="media-libs/alsa-lib



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

2016-01-30 Thread Pacho Ramos
commit: 024c60d6583c1cf51a62d3fc5efc321c1a46e65b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:38:19 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:38:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c60d6

media-sound/amsynth: x86 stable, bug #569534

Package-Manager: portage-2.2.26

 media-sound/amsynth/amsynth-1.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/amsynth/amsynth-1.5.1.ebuild 
b/media-sound/amsynth/amsynth-1.5.1.ebuild
index cce6179..c3cf70c 100644
--- a/media-sound/amsynth/amsynth-1.5.1.ebuild
+++ b/media-sound/amsynth/amsynth-1.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa dssi jack lash oss sndfile"
 
 RDEPEND="dev-cpp/gtkmm:2.4



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

2016-01-30 Thread Pacho Ramos
commit: 4a9e575ca700c86a8fdcabf0c0dc7c22ba2c2778
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:35:46 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:35:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9e575c

net-libs/obby: x86 stable, bug #569304

Package-Manager: portage-2.2.26

 net-libs/obby/obby-0.4.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/obby/obby-0.4.8-r1.ebuild 
b/net-libs/obby/obby-0.4.8-r1.ebuild
index 0005523..ba7bbcb 100644
--- a/net-libs/obby/obby-0.4.8-r1.ebuild
+++ b/net-libs/obby/obby-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gobby.0x539.de/;
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="ipv6 nls static-libs zeroconf"
 
 RDEPEND="



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

2016-01-30 Thread Pacho Ramos
commit: c4ce46f20c9ccd46ace2ddb636b93bf98a7aa202
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:35:05 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:35:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ce46f2

x11-libs/flowcanvas: x86 stable, bug #568798

Package-Manager: portage-2.2.26

 x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild 
b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
index 6534ef1..0506818 100644
--- a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc"
 
 RDEPEND="dev-libs/boost



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

2016-01-30 Thread Pacho Ramos
commit: 665552d27fe8f4f0782cebc0d261b76309b071c3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:38:52 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:38:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=665552d2

dev-python/polygon: x86 stable, bug #570648

Package-Manager: portage-2.2.26

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

diff --git a/dev-python/polygon/polygon-2.0.6.ebuild 
b/dev-python/polygon/polygon-2.0.6.ebuild
index ab58800..44f0174 100644
--- a/dev-python/polygon/polygon-2.0.6.ebuild
+++ b/dev-python/polygon/polygon-2.0.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.bitbucket.org/jraedler/${PN}2/downloads/Polygon2-${PV}.zip;
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="app-arch/unzip"
 



[gentoo-commits] repo/gentoo:master commit in: media-radio/svxlink/

2016-01-30 Thread Pacho Ramos
commit: 57654fd32bb1db290de26a605ea37f098cfb7ddf
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:39:40 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:39:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57654fd3

media-radio/svxlink: x86 stable, bug #571270

Package-Manager: portage-2.2.26

 media-radio/svxlink/svxlink-15.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-radio/svxlink/svxlink-15.11.ebuild 
b/media-radio/svxlink/svxlink-15.11.ebuild
index 37b5d45..5c084ae 100644
--- a/media-radio/svxlink/svxlink-15.11.ebuild
+++ b/media-radio/svxlink/svxlink-15.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sm0svx/${PN}/archive/15.11.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/tcl:0



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

2016-01-30 Thread Pacho Ramos
commit: c40f285cbb3e9a1c54a22ebe0af20b8e26068775
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:39:10 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:39:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40f285c

dev-python/visual: x86 stable, bug #570648

Package-Manager: portage-2.2.26

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

diff --git a/dev-python/visual/visual-5.74-r1.ebuild 
b/dev-python/visual/visual-5.74-r1.ebuild
index e8381b7..5790096 100644
--- a/dev-python/visual/visual-5.74-r1.ebuild
+++ b/dev-python/visual/visual-5.74-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2;
 
 LICENSE="HPND Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc examples"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



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

2016-01-30 Thread Pacho Ramos
commit: ec0501d8acb508fe5bb59f261df585bcc5018ea7
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:33:06 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:33:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0501d8

net-p2p/rtorrent: x86 stable, bug #522706

Package-Manager: portage-2.2.26

 net-p2p/rtorrent/rtorrent-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild 
b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
index 2cd320d..ef94751 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris"
 IUSE="daemon debug ipv6 selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}



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

2016-01-30 Thread Pacho Ramos
commit: 5fc1294390b406fe218a68bbad430ed765c086ef
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:34:10 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:34:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc12943

media-gfx/inkscape: x86 stable, bug #568412

Package-Manager: portage-2.2.26

 media-gfx/inkscape/inkscape-0.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild 
b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
index a4a4b12..6a6c270 100644
--- a/media-gfx/inkscape/inkscape-0.91-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux 
~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris 
~x86-solaris"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms 
nls spell static-libs visio wpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



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

2016-01-30 Thread Pacho Ramos
commit: 4c9fce7d499055901ea7c12a76b9985c08969b40
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:34:40 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:34:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9fce7d

net-libs/net6: x86 stable, bug #568786

Package-Manager: portage-2.2.26

 net-libs/net6/net6-1.3.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/net6/net6-1.3.14-r1.ebuild 
b/net-libs/net6/net6-1.3.14-r1.ebuild
index f49b184..e3d5ff6 100644
--- a/net-libs/net6/net6-1.3.14-r1.ebuild
+++ b/net-libs/net6/net6-1.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz;
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~x86"
+KEYWORDS="amd64 ~arm hppa ppc x86"
 IUSE="nls static-libs"
 
 RDEPEND="dev-libs/libsigc++:2



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

2016-01-30 Thread Pacho Ramos
commit: ced99ef869bfc13ff1a00db229f7833041877b8f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 09:37:24 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 09:37:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced99ef8

net-libs/obby: move to ~ppc as nothing needs it stable on ppc, bug #569304

Package-Manager: portage-2.2.26

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

diff --git a/net-libs/obby/obby-0.4.8.ebuild b/net-libs/obby/obby-0.4.8.ebuild
index d0b7c2c..77dd227 100644
--- a/net-libs/obby/obby-0.4.8.ebuild
+++ b/net-libs/obby/obby-0.4.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://gobby.0x539.de/;
 SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="avahi ipv6 nls static-libs"
 
 RDEPEND="net-libs/net6



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/arches/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 691541feccdfcbf06004e4e545851337780c56e3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 19:11:22 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:17 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=691541fe

repoman: Create a new ArchChecks class plugin

 pym/repoman/modules/scan/arches/__init__.py | 24 +++
 pym/repoman/modules/scan/arches/arches.py   | 64 +
 pym/repoman/scanner.py  | 47 +
 3 files changed, 90 insertions(+), 45 deletions(-)

diff --git a/pym/repoman/modules/scan/arches/__init__.py 
b/pym/repoman/modules/scan/arches/__init__.py
new file mode 100644
index 000..d080c30
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Arches plug-in module for repoman.
+Performs archs checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'arches',
+   'description': doc,
+   'provides':{
+   'archs-module': {
+   'name': "arches",
+   'sourcefile': "arches",
+   'class': "ArchChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/modules/scan/arches/arches.py 
b/pym/repoman/modules/scan/arches/arches.py
new file mode 100644
index 000..2c32028
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -0,0 +1,64 @@
+# -*- coding:utf-8 -*-
+
+
+class ArchChecks(object):
+
+   def __init__(self, **kwargs):
+   self.options = kwargs.get('options')
+   self.repo_settings = kwargs.get('repo_settings')
+   self.profiles = kwargs.get('profiles')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   if self.options.ignore_arches:
+   arches = [[
+   self.repo_settings.repoman_settings["ARCH"], 
self.repo_settings.repoman_settings["ARCH"],
+   
self.repo_settings.repoman_settings["ACCEPT_KEYWORDS"].split()]]
+   else:
+   arches = set()
+   for keyword in ebuild.keywords:
+   if keyword[0] == "-":
+   continue
+   elif keyword[0] == "~":
+   arch = keyword[1:]
+   if arch == "*":
+   for expanded_arch in 
self.profiles:
+   if expanded_arch == 
"**":
+   continue
+   arches.add(
+   (keyword, 
expanded_arch, (
+   
expanded_arch, "~" + expanded_arch)))
+   else:
+   arches.add((keyword, arch, 
(arch, keyword)))
+   else:
+   # For ebuilds with stable keywords, 
check if the
+   # dependencies are satisfiable for 
unstable
+   # configurations, since use.stable.mask 
is not
+   # applied for unstable configurations 
(see bug
+   # 563546).
+   if keyword == "*":
+   for expanded_arch in 
self.profiles:
+   if expanded_arch == 
"**":
+   continue
+   arches.add(
+   (keyword, 
expanded_arch, (expanded_arch,)))
+   arches.add(
+   (keyword, 
expanded_arch,
+   
(expanded_arch, "~" + expanded_arch)))
+   else:
+   arches.add((keyword, keyword, 
(keyword,)))
+   arches.add((keyword, keyword,
+   (keyword, "~" + 
keyword)))
+   if not arches:
+   # Use an 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/modules/scan/use/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 93c291f79572c27c51d90ead0b203c3560e25649
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Jan  8 01:37:39 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:17 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=93c291f7

repoman: Create USEFlagChecks class plugin

 pym/repoman/modules/scan/use/__init__.py   | 24 +++
 .../ebuilds => modules/scan/use}/use_flags.py  | 36 ++
 pym/repoman/scanner.py |  8 ++---
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/pym/repoman/modules/scan/use/__init__.py 
b/pym/repoman/modules/scan/use/__init__.py
new file mode 100644
index 000..80fa213
--- /dev/null
+++ b/pym/repoman/modules/scan/use/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Use plug-in module for repoman.
+Performs use flag checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'use',
+   'description': doc,
+   'provides':{
+   'use-module': {
+   'name': "use_flags",
+   'sourcefile': "use_flags",
+   'class': "USEFlagChecks",
+   'description': doc,
+   'functions': ['check', 'getUsedUseFlags'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/checks/ebuilds/use_flags.py 
b/pym/repoman/modules/scan/use/use_flags.py
similarity index 74%
rename from pym/repoman/checks/ebuilds/use_flags.py
rename to pym/repoman/modules/scan/use/use_flags.py
index ac21b47..acc7dd3 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/modules/scan/use/use_flags.py
@@ -9,31 +9,39 @@ from repoman._portage import portage
 
 from portage import eapi
 from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from repoman.modules.scan.scanbase import ScanBase
 
 
-class USEFlagChecks(object):
+class USEFlagChecks(ScanBase):
'''Performs checks on USE flags listed in the ebuilds and 
metadata.xml'''
 
-   def __init__(self, qatracker, globalUseFlags):
-   '''
+   def __init__(self, **kwargs):
+   '''Class init
+
@param qatracker: QATracker instance
@param globalUseFlags: Global USE flags
'''
-   self.qatracker = qatracker
-   self.globalUseFlags = globalUseFlags
+   super(USEFlagChecks, self).__init__(**kwargs)
+   self.qatracker = kwargs.get('qatracker')
+   self.globalUseFlags = kwargs.get('uselist')
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
 
-   def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+   def check(self, **kwargs):
'''Perform the check.
 
@param pkg: Package in which we check (object).
-   @param package: Package in which we check (string).
+   @param xpkg: Package in which we check (string).
@param ebuild: Ebuild which we check (object).
@param y_ebuild: Ebuild which we check (string).
-   @param localUseFlags: Local USE flags of the package
+   @param muselist: Local USE flags of the package
'''
+   pkg = kwargs.get('pkg')
+   package = kwargs.get('xpkg')
+   ebuild = kwargs.get('ebuild')
+   y_ebuild = kwargs.get('y_ebuild')
+   localUseFlags = kwargs.get('muselist')
# reset state variables for the run
self.useFlags = []
self.defaultUseFlags = []
@@ -41,10 +49,9 @@ class USEFlagChecks(object):
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
-
-   def getUsedUseFlags(self):
-   '''Get the USE flags that this check has seen'''
-   return self.usedUseFlags
+   used_useflags = 
kwargs.get('used_useflags').union(self.usedUseFlags)
+   return {'continue': False, 'ebuild_UsedUseFlags': 
self.usedUseFlags,
+   'used_useflags': used_useflags}
 
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
@@ -88,3 +95,8 @@ class USEFlagChecks(object):
"REQUIRED_USE.syntax",
"%s: REQUIRED_USE: %s" % 
(ebuild.relative_path, e))
del e
+
+   @property
+   def runInEbuilds(self):
+   '''Ebuild level scans'''
+   return (True, [self.check])

diff --git a/pym/repoman/scanner.py 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/keywords/

2016-01-30 Thread Brian Dolbec
commit: 6fe1e8ceee67f8d91ac94c319c603b1955109267
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 18:28:58 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:17 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6fe1e8ce

repoman: Complete KeywordChecks migration

 pym/repoman/modules/scan/keywords/keywords.py | 47 ---
 pym/repoman/scanner.py|  3 +-
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/pym/repoman/modules/scan/keywords/keywords.py 
b/pym/repoman/modules/scan/keywords/keywords.py
index 484d7d5..e34c891 100644
--- a/pym/repoman/modules/scan/keywords/keywords.py
+++ b/pym/repoman/modules/scan/keywords/keywords.py
@@ -19,6 +19,8 @@ class KeywordChecks(ScanBase):
super(KeywordChecks, self).__init__(**kwargs)
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
+   self.repo_metadata = kwargs.get('repo_metadata')
+   self.profiles = kwargs.get('profiles')
self.slot_keywords = {}
 
def prepare(self, **kwargs):
@@ -45,21 +47,19 @@ class KeywordChecks(ScanBase):
live_ebuild = kwargs.get('live_ebuild')
if not self.options.straight_to_stable:
self._checkAddedWithStableKeywords(
-   package, ebuild, y_ebuild, keywords, changed)
+   xpkg, ebuild, y_ebuild, ebuild.keywords, 
changed)
 
-   self._checkForDroppedKeywords(
-   pkg, ebuild, ebuild_archs, live_ebuild)
+   self._checkForDroppedKeywords(pkg, ebuild, ebuild.archs, 
live_ebuild)
 
-   self._checkForInvalidKeywords(
-   pkg, package, y_ebuild, kwlist, profiles)
+   self._checkForInvalidKeywords(ebuild, xpkg, y_ebuild)
 
-   self._checkForMaskLikeKeywords(
-   package, y_ebuild, keywords, kwlist)
+   self._checkForMaskLikeKeywords(xpkg, y_ebuild, ebuild.keywords)
 
-   self.slot_keywords[pkg.slot].update(ebuild_archs)
+   self.slot_keywords[pkg.slot].update(ebuild.archs)
return {'continue': False}
 
-   def _isKeywordStable(self, keyword):
+   @staticmethod
+   def _isKeywordStable(keyword):
return not keyword.startswith("~") and not 
keyword.startswith("-")
 
def _checkAddedWithStableKeywords(
@@ -88,9 +88,8 @@ class KeywordChecks(ScanBase):
ebuild.relative_path,
" 
".join(sorted(dropped_keywords
 
-   def _checkForInvalidKeywords(
-   self, pkg, package, y_ebuild, kwlist, profiles):
-   myuse = pkg._metadata["KEYWORDS"].split()
+   def _checkForInvalidKeywords(self, ebuild, xpkg, y_ebuild):
+   myuse = ebuild.keywords
 
for mykey in myuse:
if mykey not in ("-*", "*", "~*"):
@@ -99,20 +98,16 @@ class KeywordChecks(ScanBase):
if not self._isKeywordStable(myskey[:1]):
myskey = myskey[1:]
 
-   if myskey not in kwlist:
+   if myskey not in self.repo_metadata['kwlist']:
+   
self.qatracker.add_error("KEYWORDS.invalid",
+   "%s/%s.ebuild: %s" % (xpkg, 
y_ebuild, mykey))
+   elif myskey not in self.profiles:
self.qatracker.add_error(
"KEYWORDS.invalid",
-   "%s/%s.ebuild: %s" % (
-   package, y_ebuild, 
mykey))
-   elif myskey not in profiles:
-   self.qatracker.add_error(
-   "KEYWORDS.invalid",
-   "%s/%s.ebuild: %s (profile 
invalid)" % (
-   package, y_ebuild, 
mykey))
-
-   def _checkForMaskLikeKeywords(
-   self, package, y_ebuild, keywords, kwlist):
+   "%s/%s.ebuild: %s (profile 
invalid)"
+   % (xpkg, y_ebuild, 
mykey))
 
+   def _checkForMaskLikeKeywords(self, xpkg, y_ebuild, keywords):
# KEYWORDS="-*" is a stupid replacement for package.mask
# and screws general KEYWORDS semantics
if "-*" in keywords:
@@ -121,12 +116,12 @@ class KeywordChecks(ScanBase):
for kw in keywords:
   

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/

2016-01-30 Thread Brian Dolbec
commit: 5c902e7d714087284f1ed68f80b588eaf2a00617
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 20:38:11 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:17 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5c902e7d

repoman: New DependChecks class plugin

Migrate code from _scan_ebuilds to the plugin system.

 pym/repoman/modules/scan/depend/__init__.py |  24 +
 pym/repoman/modules/scan/depend/depend.py   | 132 
 pym/repoman/scanner.py  | 119 ++---
 3 files changed, 163 insertions(+), 112 deletions(-)

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
new file mode 100644
index 000..ebc716c
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Depend plug-in module for repoman.
+Performs Dependency checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'depend',
+   'description': doc,
+   'provides':{
+   'depend-module': {
+   'name': "depend",
+   'sourcefile': "depend",
+   'class': "DependChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/modules/scan/depend/depend.py 
b/pym/repoman/modules/scan/depend/depend.py
new file mode 100644
index 000..8a0ff48
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -0,0 +1,132 @@
+
+from _emerge.Package import Package
+
+from repoman.check_missingslot import check_missingslot
+# import our initialized portage instance
+from repoman._portage import portage
+from repoman.qa_data import suspect_virtual, suspect_rdepend
+
+
+class DependChecks(object):
+
+   def __init__(self, **kwargs):
+   self.qatracker = kwargs.get('qatracker')
+   self.portdb = kwargs.get('portdb')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   pkg = kwargs.get('pkg')
+
+   unknown_pkgs = set()
+
+   inherited_java_eclass = "java-pkg-2" in ebuild.inherited or \
+   "java-pkg-opt-2" in ebuild.inherited,
+   inherited_wxwidgets_eclass = "wxwidgets" in ebuild.inherited
+   # operator_tokens = set(["||", "(", ")"])
+   type_list, badsyntax = [], []
+   for mytype in Package._dep_keys + ("LICENSE", "PROPERTIES", 
"PROVIDE"):
+   mydepstr = ebuild.metadata[mytype]
+
+   buildtime = mytype in Package._buildtime_keys
+   runtime = mytype in Package._runtime_keys
+   token_class = None
+   if mytype.endswith("DEPEND"):
+   token_class = portage.dep.Atom
+
+   try:
+   atoms = portage.dep.use_reduce(
+   mydepstr, matchall=1, flat=True,
+   is_valid_flag=pkg.iuse.is_valid_flag, 
token_class=token_class)
+   except portage.exception.InvalidDependString as e:
+   atoms = None
+   badsyntax.append(str(e))
+
+   if atoms and mytype.endswith("DEPEND"):
+   if runtime and \
+   "test?" in mydepstr.split():
+   self.qatracker.add_error(
+   mytype + '.suspect',
+   "%s: 'test?' USE conditional in 
%s" %
+   (ebuild.relative_path, mytype))
+
+   for atom in atoms:
+   if atom == "||":
+   continue
+
+   is_blocker = atom.blocker
+
+   # Skip dependency.unknown for blockers, 
so that we
+   # don't encourage people to remove 
necessary blockers,
+   # as discussed in bug 382407. We use 
atom.without_use
+   # due to bug 525376.
+   if not is_blocker and \
+   not 
self.portdb.xmatch("match-all", atom.without_use) and \
+   not 
atom.cp.startswith("virtual/"):
+   unknown_pkgs.add((mytype, 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/eclasses/, pym/repoman/, ...

2016-01-30 Thread Brian Dolbec
commit: 897c1e88fa8bb1bdebfa5ba1123fe7d37768ad24
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Jan  8 08:46:01 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 07:50:18 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=897c1e88

repoman: Create RubyEclassChecks class plugin

 pym/repoman/checks/ebuilds/eclasses/__init__.py|  0
 pym/repoman/modules/scan/eclasses/__init__.py  |  9 +
 .../{checks/ebuilds => modules/scan}/eclasses/ruby.py  | 18 ++
 pym/repoman/scanner.py |  9 ++---
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py 
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/scan/eclasses/__init__.py 
b/pym/repoman/modules/scan/eclasses/__init__.py
index ed9a7c7..126f2a6 100644
--- a/pym/repoman/modules/scan/eclasses/__init__.py
+++ b/pym/repoman/modules/scan/eclasses/__init__.py
@@ -19,6 +19,15 @@ module_spec = {
'func_kwargs': {
},
},
+   'ruby-module': {
+   'name': "ruby",
+   'sourcefile': "ruby",
+   'class': "RubyEclassChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_kwargs': {
+   },
+   },
}
 }
 

diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py 
b/pym/repoman/modules/scan/eclasses/ruby.py
similarity index 62%
rename from pym/repoman/checks/ebuilds/eclasses/ruby.py
rename to pym/repoman/modules/scan/eclasses/ruby.py
index e8d36ea..4dc5d62 100644
--- a/pym/repoman/checks/ebuilds/eclasses/ruby.py
+++ b/pym/repoman/modules/scan/eclasses/ruby.py
@@ -4,19 +4,23 @@ Performs Ruby eclass checks
 '''
 
 from repoman.qa_data import ruby_deprecated
+from repoman.modules.scan.scanbase import ScanBase
 
 
-class RubyEclassChecks(object):
+class RubyEclassChecks(ScanBase):
'''Performs checks for the usage of Ruby eclasses in ebuilds'''
 
-   def __init__(self, qatracker):
+   def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
-   self.qatracker = qatracker
+   super(RubyEclassChecks, self).__init__(**kwargs)
+   self.qatracker = kwargs.get('qatracker')
self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
 
-   def check(self, pkg, ebuild):
+   def check(self, **kwargs):
+   pkg = kwargs.get('pkg')
+   ebuild = kwargs.get('ebuild')
is_inherited = lambda eclass: eclass in pkg.inherited
is_old_ruby_eclass_inherited = filter(
is_inherited, self.old_ruby_eclasses)
@@ -30,3 +34,9 @@ class RubyEclassChecks(object):
"IUSE.rubydeprecated",
(ebuild.relative_path + ": 
Deprecated ruby target: %s")
% myruby)
+   return {'continue': False}
+
+   @property
+   def runInEbuilds(self):
+   '''Ebuild level scans'''
+   return (True, [self.check])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 23642c3..006c3f7 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
 from portage.dep import Atom
 from portage.output import green
 from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
 from repoman.checks.ebuilds.variables.license import LicenseChecks
 from repoman.checks.ebuilds.variables.restrict import RestrictChecks
 from repoman.modules.commit import repochecks
@@ -214,7 +213,6 @@ class Scanner(object):
self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
 
# initialize our checks classes here before the big xpkg loop
-   self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist, 
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
 
@@ -301,7 +299,7 @@ class Scanner(object):
('thirdpartymirrors', 'ThirdPartyMirrors'),
('description', 'DescriptionChecks'), (None, 
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend', 
'DependChecks'),
-   ('use_flags', 'USEFlagChecks'),
+   ('use_flags', 'USEFlagChecks'), ('ruby', 
'RubyEclassChecks'),
]:
if 

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

2016-01-30 Thread Michael Palimaka
commit: 2c8c406e43ced399e8bdea50766d7722e6216ee8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jan 30 08:08:29 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan 30 08:10:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8c406e

media-libs/vigra: fix function call

The function was renamed in e4b034ec87ff80561b18d52ee07df66b04a50cab but usage
was never checked for because it is supposed to be a private function.

Gentoo-bug: 573296

Package-Manager: portage-2.2.27

 media-libs/vigra/vigra-1.10.0.ebuild | 2 +-
 media-libs/vigra/vigra-1.9.0.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/vigra/vigra-1.10.0.ebuild 
b/media-libs/vigra/vigra-1.10.0.ebuild
index 1f84ed4..1710741 100644
--- a/media-libs/vigra/vigra-1.10.0.ebuild
+++ b/media-libs/vigra/vigra-1.10.0.ebuild
@@ -95,7 +95,7 @@ src_configure() {
python_foreach_impl vigra_configure
else
# required for docdir
-   _check_build_dir init
+   _cmake_check_build_dir init
vigra_configure
fi
 }

diff --git a/media-libs/vigra/vigra-1.9.0.ebuild 
b/media-libs/vigra/vigra-1.9.0.ebuild
index dda3d6a..1ff5bca 100644
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -64,7 +64,7 @@ src_configure() {
local libdir=$(get_libdir)
 
# required for ddocdir
-   _check_build_dir init
+   _cmake_check_build_dir init
local mycmakeargs=(
-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
-DLIBDIR_SUFFIX=${libdir/lib}



[gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/

2016-01-30 Thread Michael Sterrett
commit: ac06b9ed615f35d75f92f8aad7666a528acf123c
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Jan 30 08:42:04 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Jan 30 08:42:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac06b9ed

games-rpg/manaplus: version bump

Package-Manager: portage-2.2.26

 games-rpg/manaplus/Manifest |  1 +
 games-rpg/manaplus/manaplus-1.6.1.16.ebuild | 71 +
 2 files changed, 72 insertions(+)

diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index 2f298b8..8407e27 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,2 +1,3 @@
 DIST manaplus-1.5.11.21.tar.xz 9556540 SHA256 
57b6e0d8a730f56060062aa0d6e6baafc100860aa2cc4ba5120d21772410aae6 SHA512 
145479b9b6912064356f842910c2a5bbb16bacc7372b898d98f237514722bbac4c6f3fe49ee30942b6e38820cfe9d3508ba5ac64b858a6003e27569327729d7d
 WHIRLPOOL 
628009c082219c63f42892881060dff3784ae419d3d6dab95357272774d0d0545a97cf0d7190157e3338ac38e7f821fe9e3a893f24ee10be71ec6ac83c097722
 DIST manaplus-1.5.12.19.tar.xz 9581180 SHA256 
8b28cbb1f385124411f4d7c2dc7066b0c0226d9afa905401ebf79c90c4e5aa69 SHA512 
afbf40c22f93a2ff7720cacebfeb90ea6669061ba5bab2f45a78bd11b890ca516606b6d260903eaa04b0cf0e3e49dce9301c030de50ffceeb70329d1284e0369
 WHIRLPOOL 
2fcf321101d6178942db6f51bbd38f88d6423f097ae8fd0d6415d5df2096dbd10e188e008166e57fb3f359edc9c1315dcfad78b546ba8804dabe9984cd00a066
+DIST manaplus-1.6.1.16.tar.xz 9610164 SHA256 
393678d7de6d0253e53756bb689d2f778ed4c402215c8d72c576fdb6da963aef SHA512 
2ba77b8d79e765cad7ecf3074eec49791a3f68d4fa66eed9bbf13adf23e94c35b55d8587850352e0855a7320c828dc886224fa4aa6260cd449a850ba469dd0be
 WHIRLPOOL 
f7dfdb3a0693f55d2202f488f0bfd036cb23f821c14962105c73ea16c5969f0c7bd53e2d5abd416f5d588be73de461bc1d58ff9269ed4c55cd4064644a759805

diff --git a/games-rpg/manaplus/manaplus-1.6.1.16.ebuild 
b/games-rpg/manaplus/manaplus-1.6.1.16.ebuild
new file mode 100644
index 000..193b66e
--- /dev/null
+++ b/games-rpg/manaplus/manaplus-1.6.1.16.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org;
+SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl"
+
+RDEPEND="
+   >=dev-games/physfs-1.0.0
+   dev-libs/libxml2
+   media-libs/libpng:0=
+   media-libs/libsdl2[X,opengl?,video]
+   media-libs/sdl2-gfx
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-mixer[vorbis]
+   media-libs/sdl2-net
+   media-libs/sdl2-ttf
+   net-misc/curl
+   sys-libs/zlib
+   x11-libs/libX11
+   x11-misc/xdg-utils
+   x11-apps/xmessage
+   media-fonts/dejavu
+   media-fonts/wqy-microhei
+   media-fonts/liberation-fonts
+   media-fonts/mplus-outline-fonts
+   nls? ( virtual/libintl )
+   opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )"
+
+src_configure() {
+   CONFIG_SHELL=/bin/bash \
+   egamesconf \
+   --with-sdl2 \
+   --without-internalsdlgfx \
+   --localedir=/usr/share/locale \
+   --prefix="/usr" \
+   --bindir="${GAMES_BINDIR}" \
+   $(use_with opengl) \
+   $(use_enable nls)
+}
+
+src_install() {
+   default
+   dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+   dosym /usr/share/fonts/dejavu/DejaVuSans.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+   dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
+   dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
+   dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed-bold.ttf
+   dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed.ttf
+   dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
+   dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
+   dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
+   dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf 
"${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
+   dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/manifest/, pym/repoman/checks/ebuilds/variables/, ...

2016-01-30 Thread Brian Dolbec
commit: 78806bc9ba84d355f1a796ae893e8a4a00fe707f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jan  6 03:08:08 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:51:58 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=78806bc9

repoman: Delete unused subpkgs

 pym/repoman/checks/ebuilds/variables/__init__.py | 0
 pym/repoman/modules/fix/__init__.py  | 0
 pym/repoman/modules/full/__init__.py | 0
 pym/repoman/modules/manifest/__init__.py | 0
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py 
b/pym/repoman/checks/ebuilds/variables/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/fix/__init__.py 
b/pym/repoman/modules/fix/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/full/__init__.py 
b/pym/repoman/modules/full/__init__.py
deleted file mode 100644
index e69de29..000

diff --git a/pym/repoman/modules/manifest/__init__.py 
b/pym/repoman/modules/manifest/__init__.py
deleted file mode 100644
index e69de29..000



[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/git/, pym/repoman/modules/vcs/cvs/, ...

2016-01-30 Thread Brian Dolbec
commit: 6d102b25d75d5b2b5a96242ab2cc9e28b75d13fd
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jan 30 01:58:36 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:51:59 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6d102b25

repoman: Migrate actions.py vcs code to the vcs modules

Add missing changes code to the existing Changes classes.
This removes the duplicated code in the Actions class.
It alsosspeeds up the run by not calling the vcs binary to scan for changes a 
second time.
Optimize the code for the vcs modules.

 pym/repoman/actions.py   | 208 ---
 pym/repoman/modules/vcs/None/__init__.py |   1 +
 pym/repoman/modules/vcs/bzr/__init__.py  |   1 +
 pym/repoman/modules/vcs/bzr/changes.py   |  15 ++-
 pym/repoman/modules/vcs/changes.py   |  13 ++
 pym/repoman/modules/vcs/cvs/__init__.py  |   1 +
 pym/repoman/modules/vcs/cvs/changes.py   |  13 +-
 pym/repoman/modules/vcs/git/__init__.py  |   1 +
 pym/repoman/modules/vcs/git/changes.py   |  20 +--
 pym/repoman/modules/vcs/hg/__init__.py   |   1 +
 pym/repoman/modules/vcs/hg/changes.py|  27 +++-
 pym/repoman/modules/vcs/settings.py  |   5 +-
 pym/repoman/modules/vcs/svn/__init__.py  |   1 +
 pym/repoman/modules/vcs/svn/changes.py   |  24 +++-
 14 files changed, 118 insertions(+), 213 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 3fd940c..8cf4a97 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -16,7 +16,6 @@ from itertools import chain
 from _emerge.UserQuery import UserQuery
 
 import portage
-from portage import cvstree
 from portage import os
 from portage import _encodings
 from portage import _unicode_encode
@@ -26,8 +25,7 @@ from portage.package.ebuild.digestgen import digestgen
 from portage.process import find_binary, spawn
 from portage.util import writemsg_level
 
-from repoman._subprocess import repoman_popen, repoman_getstatusoutput
-from repoman.errors import err
+from repoman._subprocess import repoman_getstatusoutput
 from repoman.gpg import gpgsign, need_signature
 from repoman import utilities
 from repoman.modules.vcs.vcs import vcs_files_to_cps
@@ -71,13 +69,11 @@ class Actions(object):
 
 
def perform(self, qa_output):
-   myunadded, mydeleted = self._vcs_unadded()
+   myautoadd = self._vcs_autoadd()
 
-   myautoadd = self._vcs_autoadd(myunadded)
+   self._vcs_deleted()
 
-   self._vcs_deleted(mydeleted)
-
-   changes = self.get_vcs_changed(mydeleted)
+   changes = self.get_vcs_changed()
 
mynew, mychanged, myremoved, no_expansion, expansion = changes
 
@@ -127,8 +123,8 @@ class Actions(object):
 
print("* %s files being committed..." % 
green(str(len(myupdates))), end=' ')
 
-   if self.vcs_settings.vcs not in ('cvs', 'svn'):
-   # With git, bzr and hg, there's never any keyword 
expansion, so
+   if self.vcs_settings.needs_keyword_expansion:
+   # With some VCS types there's never any keyword 
expansion, so
# there's no need to regenerate manifests and all files 
will be
# committed in one big commit at the end.
print()
@@ -261,62 +257,8 @@ class Actions(object):
sys.exit(1)
 
 
-   def _vcs_unadded(self):
-   myunadded = []
-   mydeleted = []
-   if self.vcs_settings.vcs == "cvs":
-   try:
-   myvcstree = portage.cvstree.getentries("./", 
recursive=1)
-   myunadded = portage.cvstree.findunadded(
-   myvcstree, recursive=1, basedir="./")
-   except SystemExit:
-   raise  # TODO propagate this
-   except:
-   err("Error retrieving CVS tree; exiting.")
-   if self.vcs_settings.vcs == "svn":
-   try:
-   with repoman_popen("svn status --no-ignore") as 
f:
-   svnstatus = f.readlines()
-   myunadded = [
-   "./" + elem.rstrip().split()[1]
-   for elem in svnstatus
-   if elem.startswith("?") or 
elem.startswith("I")]
-   except SystemExit:
-   raise  # TODO propagate this
-   except:
-   err("Error retrieving SVN info; exiting.")
-   if self.vcs_settings.vcs == "git":
-   # get list of files not under version control or missing
-   myf = repoman_popen("git ls-files 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/arches/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: e16d23c5b8f746b4809f49336f8e45f462c58ce9
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 19:11:22 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:55 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e16d23c5

repoman: Create a new ArchChecks class plugin

 pym/repoman/modules/scan/arches/__init__.py | 24 +++
 pym/repoman/modules/scan/arches/arches.py   | 64 +
 pym/repoman/scanner.py  | 47 +
 3 files changed, 90 insertions(+), 45 deletions(-)

diff --git a/pym/repoman/modules/scan/arches/__init__.py 
b/pym/repoman/modules/scan/arches/__init__.py
new file mode 100644
index 000..d080c30
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Arches plug-in module for repoman.
+Performs archs checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'arches',
+   'description': doc,
+   'provides':{
+   'archs-module': {
+   'name': "arches",
+   'sourcefile': "arches",
+   'class': "ArchChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/modules/scan/arches/arches.py 
b/pym/repoman/modules/scan/arches/arches.py
new file mode 100644
index 000..2c32028
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -0,0 +1,64 @@
+# -*- coding:utf-8 -*-
+
+
+class ArchChecks(object):
+
+   def __init__(self, **kwargs):
+   self.options = kwargs.get('options')
+   self.repo_settings = kwargs.get('repo_settings')
+   self.profiles = kwargs.get('profiles')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   if self.options.ignore_arches:
+   arches = [[
+   self.repo_settings.repoman_settings["ARCH"], 
self.repo_settings.repoman_settings["ARCH"],
+   
self.repo_settings.repoman_settings["ACCEPT_KEYWORDS"].split()]]
+   else:
+   arches = set()
+   for keyword in ebuild.keywords:
+   if keyword[0] == "-":
+   continue
+   elif keyword[0] == "~":
+   arch = keyword[1:]
+   if arch == "*":
+   for expanded_arch in 
self.profiles:
+   if expanded_arch == 
"**":
+   continue
+   arches.add(
+   (keyword, 
expanded_arch, (
+   
expanded_arch, "~" + expanded_arch)))
+   else:
+   arches.add((keyword, arch, 
(arch, keyword)))
+   else:
+   # For ebuilds with stable keywords, 
check if the
+   # dependencies are satisfiable for 
unstable
+   # configurations, since use.stable.mask 
is not
+   # applied for unstable configurations 
(see bug
+   # 563546).
+   if keyword == "*":
+   for expanded_arch in 
self.profiles:
+   if expanded_arch == 
"**":
+   continue
+   arches.add(
+   (keyword, 
expanded_arch, (expanded_arch,)))
+   arches.add(
+   (keyword, 
expanded_arch,
+   
(expanded_arch, "~" + expanded_arch)))
+   else:
+   arches.add((keyword, keyword, 
(keyword,)))
+   arches.add((keyword, keyword,
+   (keyword, "~" + 
keyword)))
+   if not arches:
+   # Use an 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 0b5a15fbbd8d012f82f9014d6ef013fb00efcd0c
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 11:56:25 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:56 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0b5a15fb

repoman: Migrate more metadata checks to ebuild_metadata.py

 .../modules/scan/metadata/ebuild_metadata.py   | 32 --
 pym/repoman/scanner.py | 17 
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py 
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 2dc1db2..77c947e 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -5,6 +5,8 @@
 import re
 import sys
 
+from repoman.qa_data import missingvars
+
 if sys.hexversion >= 0x300:
basestring = str
 
@@ -16,7 +18,7 @@ class EbuildMetadata(object):
def __init__(self, **kwargs):
self.qatracker = kwargs.get('qatracker')
 
-   def check(self, **kwargs):
+   def invalidchar(self, **kwargs):
ebuild = kwargs.get('ebuild')
for k, v in ebuild.metadata.items():
if not isinstance(v, basestring):
@@ -28,9 +30,35 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() + 
1))
+   return {'continue': False}
+
+   def missing(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   for pos, missing_var in enumerate(missingvars):
+   if not ebuild.metadata.get(missing_var):
+   if kwargs.get('catdir') == "virtual" and \
+   missing_var in ("HOMEPAGE", "LICENSE"):
+   continue
+   if kwargs.get('live_ebuild') and missing_var == 
"KEYWORDS":
+   continue
+   myqakey = missingvars[pos] + ".missing"
+   self.qatracker.add_error(myqakey, '%s/%s.ebuild'
+   % (kwargs.get('xpkg'), 
kwargs.get('y_ebuild')))
+   return {'continue': False}
+
+   def old_virtual(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
if ebuild.metadata.get("PROVIDE"):
self.qatracker.add_error("virtual.oldstyle", 
ebuild.relative_path)
+   return {'continue': False}
 
+   def virtual(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   if kwargs.get('catdir') == "virtual":
+   for var in ("HOMEPAGE", "LICENSE"):
+   if ebuild.metadata.get(var):
+   myqakey = var + ".virtual"
+   self.qatracker.add_error(myqakey, 
ebuild.relative_path)
return {'continue': False}
 
@property
@@ -39,4 +67,4 @@ class EbuildMetadata(object):
 
@property
def runInEbuilds(self):
-   return (True, [self.check])
+   return (True, [self.invalidchar, self.missing, 
self.old_virtual, self.virtual])

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 803e5a3..5c35519 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -327,23 +327,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
 
-
-   for pos, missing_var in enumerate(missingvars):
-   if not 
dynamic_data['ebuild'].metadata.get(missing_var):
-   if dynamic_data['catdir'] == "virtual" 
and \
-   missing_var in ("HOMEPAGE", 
"LICENSE"):
-   continue
-   if dynamic_data['live_ebuild'] and 
missing_var == "KEYWORDS":
-   continue
-   myqakey = missingvars[pos] + ".missing"
-   self.qatracker.add_error(myqakey, xpkg 
+ "/" + y_ebuild + ".ebuild")
-
-   if dynamic_data['catdir'] == "virtual":
-   for var in ("HOMEPAGE", "LICENSE"):
-   if 
dynamic_data['ebuild'].metadata.get(var):
-   myqakey = var + ".virtual"
-   
self.qatracker.add_error(myqakey, dynamic_data['ebuild'].relative_path)
-
if 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/

2016-01-30 Thread Brian Dolbec
commit: 2291a59e4a7b1c81f155545c39d5b5fd6d97dce9
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 17:33:26 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:56 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2291a59e

repoman: Move ebuild_archs to the Ebuild class

 pym/repoman/modules/scan/ebuild/ebuild.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py 
b/pym/repoman/modules/scan/ebuild/ebuild.py
index 953f425..2414028 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -36,6 +36,7 @@ class Ebuild(ScanBase):
self.eapi = None
self.inherited = None
self.keywords = None
+   self.archs = None
 
def _set_paths(self, **kwargs):
repolevel = kwargs.get('repolevel')



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

2016-01-30 Thread Brian Dolbec
commit: 0664515fa7da71204eafdb832e9be74edfee0be9
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 05:33:17 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:51:58 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0664515f

repoman: Enable verbosity option to be useful for setting the logging level

Verbosity option was not being used internally.
Convert debug print's added to proper debug messages.

 pym/repoman/main.py| 13 ++---
 pym/repoman/scanner.py | 35 +++
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 890e034..6921005 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -19,7 +19,6 @@ from portage import os
 import portage.checksum
 import portage.const
 import portage.repository.config
-from portage import util
 from portage.output import create_color_func, nocolor
 from portage.output import ConsoleStyleFile, StyleWriter
 from portage.util import formatter
@@ -37,13 +36,14 @@ from repoman.modules.vcs.settings import VCSSettings
 if sys.hexversion >= 0x300:
basestring = str
 
-util.initialize_logger()
-
 bad = create_color_func("BAD")
 
 # A sane umask is needed for files that portage creates.
 os.umask(0o22)
 
+LOGLEVEL = logging.WARNING
+portage.util.initialize_logger(LOGLEVEL)
+
 
 def repoman_main(argv):
config_root = os.environ.get("PORTAGE_CONFIGROOT")
@@ -61,6 +61,13 @@ def repoman_main(argv):
print("Portage", portage.VERSION)
sys.exit(0)
 
+   logger = logging.getLogger()
+
+   if options.verbosity > 0:
+   logger.setLevel(LOGLEVEL - 10 * options.verbosity)
+   else:
+   logger.setLevel(LOGLEVEL)
+
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 4dd5408..8623812 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -19,13 +19,13 @@ from portage.module import Modules
 
 MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan")
 # initial development debug info
-#print("module path:", path)
+logging.debug("module path: %s", MODULES_PATH)
 
 MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
 
-# initial development debug info
-#print(module_controller.module_names)
 MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
+# initial development debug info
+logging.debug("module_names: %s", MODULE_NAMES)
 
 
 class Scanner(object):
@@ -200,7 +200,7 @@ class Scanner(object):
for mod in ['manifests', 'isebuild', 'keywords', 'files', 
'vcsstatus',
'fetches', 'pkgmetadata']:
mod_class = MODULE_CONTROLLER.get_class(mod)
-   print("Initializing class name:", mod_class.__name__)
+   logging.debug("Initializing class name: %s", 
mod_class.__name__)
self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
 
def scan_pkgs(self, can_force):
@@ -208,7 +208,7 @@ class Scanner(object):
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
-   logging.info("checking package %s" % xpkg)
+   logging.info("checking package %s", xpkg)
# save memory by discarding xmatch caches from previous 
package(s)
self.caches['arch_xmatch'].clear()
self.eadded = []
@@ -236,7 +236,7 @@ class Scanner(object):
# need to set it up for ==> self.modules or some other 
ordered list
for mod in ['Manifests', 'IsEbuild', 'KeywordChecks', 
'FileChecks',
'VCSStatus', 'FetchChecks', 
'PkgMetadata']:
-   print("scan_pkgs(): module:", mod)
+   logging.debug("scan_pkgs; module: %s", mod)
do_it, functions = self.modules[mod].runInPkgs
if do_it:
for func in functions:
@@ -300,7 +300,7 @@ class Scanner(object):
logging.debug("do_it: %s, functions: %s", 
do_it, [x.__name__ for x in functions])
if do_it:
for func in functions:
-   print("\tRunning function:", 
func)
+   logging.debug("\tRunning 
function: %s", func)
rdata = func(**dynamic_data)

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/

2016-01-30 Thread Brian Dolbec
commit: 32cd11a76a023009e6359d608b21e2dc3ab1c58e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Jan  3 20:38:11 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 06:33:55 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=32cd11a7

repoman: New DependChecks class plugin

Migrate code from _scan_ebuilds to the plugin system.

 pym/repoman/modules/scan/depend/__init__.py |  24 +
 pym/repoman/modules/scan/depend/depend.py   | 132 
 pym/repoman/scanner.py  | 119 ++---
 3 files changed, 163 insertions(+), 112 deletions(-)

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
new file mode 100644
index 000..ebc716c
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Depend plug-in module for repoman.
+Performs Dependency checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+   'name': 'depend',
+   'description': doc,
+   'provides':{
+   'depend-module': {
+   'name': "depend",
+   'sourcefile': "depend",
+   'class': "DependChecks",
+   'description': doc,
+   'functions': ['check'],
+   'func_desc': {
+   },
+   },
+   }
+}
+

diff --git a/pym/repoman/modules/scan/depend/depend.py 
b/pym/repoman/modules/scan/depend/depend.py
new file mode 100644
index 000..8a0ff48
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -0,0 +1,132 @@
+
+from _emerge.Package import Package
+
+from repoman.check_missingslot import check_missingslot
+# import our initialized portage instance
+from repoman._portage import portage
+from repoman.qa_data import suspect_virtual, suspect_rdepend
+
+
+class DependChecks(object):
+
+   def __init__(self, **kwargs):
+   self.qatracker = kwargs.get('qatracker')
+   self.portdb = kwargs.get('portdb')
+
+   def check(self, **kwargs):
+   ebuild = kwargs.get('ebuild')
+   pkg = kwargs.get('pkg')
+
+   unknown_pkgs = set()
+
+   inherited_java_eclass = "java-pkg-2" in ebuild.inherited or \
+   "java-pkg-opt-2" in ebuild.inherited,
+   inherited_wxwidgets_eclass = "wxwidgets" in ebuild.inherited
+   # operator_tokens = set(["||", "(", ")"])
+   type_list, badsyntax = [], []
+   for mytype in Package._dep_keys + ("LICENSE", "PROPERTIES", 
"PROVIDE"):
+   mydepstr = ebuild.metadata[mytype]
+
+   buildtime = mytype in Package._buildtime_keys
+   runtime = mytype in Package._runtime_keys
+   token_class = None
+   if mytype.endswith("DEPEND"):
+   token_class = portage.dep.Atom
+
+   try:
+   atoms = portage.dep.use_reduce(
+   mydepstr, matchall=1, flat=True,
+   is_valid_flag=pkg.iuse.is_valid_flag, 
token_class=token_class)
+   except portage.exception.InvalidDependString as e:
+   atoms = None
+   badsyntax.append(str(e))
+
+   if atoms and mytype.endswith("DEPEND"):
+   if runtime and \
+   "test?" in mydepstr.split():
+   self.qatracker.add_error(
+   mytype + '.suspect',
+   "%s: 'test?' USE conditional in 
%s" %
+   (ebuild.relative_path, mytype))
+
+   for atom in atoms:
+   if atom == "||":
+   continue
+
+   is_blocker = atom.blocker
+
+   # Skip dependency.unknown for blockers, 
so that we
+   # don't encourage people to remove 
necessary blockers,
+   # as discussed in bug 382407. We use 
atom.without_use
+   # due to bug 525376.
+   if not is_blocker and \
+   not 
self.portdb.xmatch("match-all", atom.without_use) and \
+   not 
atom.cp.startswith("virtual/"):
+   unknown_pkgs.add((mytype, 

[gentoo-commits] proj/grs:desktop-amd64-musl-hardened commit in: core/etc/grs/

2016-01-30 Thread Anthony G. Basile
commit: 4baef19134c6e94d78659ce4991ae8a6571ab746
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Jan 30 20:28:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan 30 20:28:42 2016 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=4baef191

world: keyword accept ~amd64 for ~app-crypt/gnupg-2.1.9

 core/etc/grs/world.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index b76be87..a39b91c 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -261,7 +261,7 @@ package.use : app-crypt/gcr:0 -debug -test gtk 
introspection vala
 
 [app-crypt/gnupg:0]
 package.use : app-crypt/gnupg:0 -doc -nls -selinux -static -tools -usb bzip2 
gnutls ldap readline smartcard
-package.accept_keywords : =app-crypt/gnupg-2.1.8 ~amd64
+package.accept_keywords : ~app-crypt/gnupg-2.1.9 ~amd64
 
 [app-crypt/gpa:0]
 package.use : app-crypt/gpa:0 -nls



[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: core/etc/grs/

2016-01-30 Thread Anthony G. Basile
commit: 71c91415234453d0efa53f2f6fe3e0fe4a374237
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Jan 30 20:28:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan 30 20:29:55 2016 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=71c91415

world: keyword accept ~amd64 for ~app-crypt/gnupg-2.1.9

 core/etc/grs/world.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 1e36883..25d2fb4 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -265,7 +265,7 @@ package.use : app-crypt/gcr:0 -debug -test gtk 
introspection vala
 
 [app-crypt/gnupg:0]
 package.use : app-crypt/gnupg:0 -doc -nls -selinux -static -tools -usb bzip2 
gnutls ldap readline smartcard
-package.accept_keywords : =app-crypt/gnupg-2.1.8 ~amd64
+package.accept_keywords : ~app-crypt/gnupg-2.1.9 ~amd64
 package.env : app-crypt/gnupg:0 app-crypt_gnupg_0
 env : LDFLAGS="-lintl"
 



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/ppc64/, profiles/arch/ia64/, profiles/arch/powerpc/ppc32/, ...

2016-01-30 Thread Pacho Ramos
commit: 9af008cb8b918552575e33a42295a1301d23c2ee
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 20:01:17 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 20:01:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af008cb

package.use.stable.mask: gvfs[google] needs stuff that won't be stabilized in 
most arches

 profiles/arch/alpha/package.use.stable.mask | 1 +
 profiles/arch/arm/package.use.stable.mask   | 1 +
 profiles/arch/ia64/package.use.stable.mask  | 1 +
 profiles/arch/powerpc/ppc32/package.use.stable.mask | 1 +
 profiles/arch/powerpc/ppc64/package.use.stable.mask | 1 +
 profiles/arch/sparc/package.use.stable.mask | 1 +
 6 files changed, 6 insertions(+)

diff --git a/profiles/arch/alpha/package.use.stable.mask 
b/profiles/arch/alpha/package.use.stable.mask
index 79c97f0..793eb08 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -44,6 +44,7 @@ gnome-base/gvfs nfs
 # Mask due Gnome3 not going to be stabilized on this arch
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 mail-client/balsa webkit
 media-gfx/gimp webkit
 media-plugins/gst-plugins-meta modplug

diff --git a/profiles/arch/arm/package.use.stable.mask 
b/profiles/arch/arm/package.use.stable.mask
index 29d7ebc..c27ecdf 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -46,6 +46,7 @@ www-client/qupzilla kde
 # Mask due Gnome3 not going to be stabilized on this arch
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 net-libs/libproxy webkit
 >=net-libs/webkit-gtk-2.4 geoloc
 >=x11-libs/gtk+-3.12.2 cloudprint

diff --git a/profiles/arch/ia64/package.use.stable.mask 
b/profiles/arch/ia64/package.use.stable.mask
index d3c39ad..a9079c9 100644
--- a/profiles/arch/ia64/package.use.stable.mask
+++ b/profiles/arch/ia64/package.use.stable.mask
@@ -22,6 +22,7 @@
 # Mask due Gnome3 not going to be stabilized on this arch
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 >=net-libs/webkit-gtk-2.4 geoloc
 >=x11-libs/gtk+-3.12.2 cloudprint
 x11-libs/gksu gnome

diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask 
b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 9a98f66..06986f8 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -36,6 +36,7 @@ dev-java/swt webkit
 dev-libs/libpeas seed
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 mail-client/balsa webkit
 media-gfx/gimp webkit
 >=net-libs/webkit-gtk-2.4 geoloc

diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask 
b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index ba6e9d5..565bf5a 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -33,6 +33,7 @@ dev-qt/qtdemo openvg
 dev-java/swt webkit
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 >=net-libs/webkit-gtk-2.4 geoloc
 >=x11-libs/gtk+-3.12.2 cloudprint
 x11-libs/gksu gnome

diff --git a/profiles/arch/sparc/package.use.stable.mask 
b/profiles/arch/sparc/package.use.stable.mask
index 7d3039c..154a62a 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -32,6 +32,7 @@ sys-fs/dmraid klibc
 # Mask due Gnome3 not going to be stabilized on this arch
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 >=net-libs/webkit-gtk-2.4 geoloc
 >=x11-libs/gtk+-3.12.2 cloudprint
 x11-libs/gksu gnome



[gentoo-commits] proj/grs:desktop-amd64-hardened commit in: core/etc/grs/

2016-01-30 Thread Anthony G. Basile
commit: dc95456048138404d07575222c7ff9f54fee8979
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Jan 30 20:28:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan 30 20:28:58 2016 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=dc954560

world: keyword accept ~amd64 for ~app-crypt/gnupg-2.1.9

 core/etc/grs/world.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 126eb27..d3acfb8 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -261,7 +261,7 @@ package.use : app-crypt/gcr:0 -debug -test gtk 
introspection vala
 
 [app-crypt/gnupg:0]
 package.use : app-crypt/gnupg:0 -doc -nls -selinux -static -tools -usb bzip2 
gnutls ldap readline smartcard
-package.accept_keywords : =app-crypt/gnupg-2.1.8 ~amd64
+package.accept_keywords : ~app-crypt/gnupg-2.1.9 ~amd64
 
 [app-crypt/gpa:0]
 package.use : app-crypt/gpa:0 -nls



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

2016-01-30 Thread Fabian Groffen
commit: d62d237424b7225ce320ec0564082163f9defbbd
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan 30 20:48:38 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan 30 20:48:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62d2374

profiles/prefix/package.mask: replicate llvm mask until I figure out why 
profiles/package.mask isn't applied in Prefix

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

diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 06feb292..66a43ff 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -10,6 +10,11 @@
 #
 
 
+# Bernard Cafarelli  (27 Jan 2016)
+# New llvm version, masked for testing
+=sys-devel/llvm-3.8.0*
+=sys-devel/clang-3.8.0*
+
 # Fabian Groffen  (11 Feb 2014)
 # Fails to compile, bug #493464
 =sys-devel/autogen-5.18.1



[gentoo-commits] proj/betagarden:master commit in: www-client/chromium-bin-debian/

2016-01-30 Thread Sebastian Pipping
commit: da4ad416c1882936c0ea88907d008b5436b0a0c9
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Jan 30 15:53:21 2016 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Jan 30 15:53:56 2016 +
URL:https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=da4ad416

www-client/chromium-bin-debian: 48.0.2564.82_p2

 ... => chromium-bin-debian-48.0.2564.82_p2.ebuild} | 34 ++
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git 
a/www-client/chromium-bin-debian/chromium-bin-debian-42.0.2311.135_p2.ebuild 
b/www-client/chromium-bin-debian/chromium-bin-debian-48.0.2564.82_p2.ebuild
similarity index 62%
rename from 
www-client/chromium-bin-debian/chromium-bin-debian-42.0.2311.135_p2.ebuild
rename to 
www-client/chromium-bin-debian/chromium-bin-debian-48.0.2564.82_p2.ebuild
index 06092b5..f08152d 100644
--- a/www-client/chromium-bin-debian/chromium-bin-debian-42.0.2311.135_p2.ebuild
+++ b/www-client/chromium-bin-debian/chromium-bin-debian-48.0.2564.82_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,17 @@ MY_PN=${PN%%-bin-debian}
 
 DESCRIPTION="Chromium build from Debian unstable"
 HOMEPAGE="http://packages.debian.org/sid/chromium;
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN:0:8}-browser/${PN:0:8}_${MY_PV}_amd64.deb
+   
mirror://debian/pool/main/c/crystalhd/libcrystalhd3_0.0~git20110715.fdd2f19-11_amd64.deb
+   
mirror://debian/pool/main/f/ffmpeg/libavcodec-ffmpeg56_2.8.5-1+b1_amd64.deb
+   
mirror://debian/pool/main/f/ffmpeg/libavformat-ffmpeg56_2.8.5-1+b1_amd64.deb
+   
mirror://debian/pool/main/f/ffmpeg/libavutil-ffmpeg54_2.8.5-1+b1_amd64.deb
+   
mirror://debian/pool/main/f/ffmpeg/libswresample-ffmpeg1_2.8.5-1+b1_amd64.deb
+   mirror://debian/pool/main/g/game-music-emu/libgme0_0.6.0-3_amd64.deb
+   mirror://debian/pool/main/g/gnutls28/libgnutls30_3.4.8-2_amd64.deb
+   
mirror://debian/pool/main/k/krb5/libgssapi-krb5-2_1.13.2+dfsg-4_amd64.deb
+   
mirror://debian/pool/main/libs/libssh/libssh-gcrypt-4_0.6.3-4+deb8u1_amd64.deb
+   mirror://debian/pool/main/s/shine/libshine3_3.1.0-2.1_amd64.deb"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,6 +31,9 @@ IUSE=""
 DEPEND="app-arch/dpkg"
 RDEPEND="
app-accessibility/speech-dispatcher
+   app-arch/snappy
+   app-crypt/mit-krb5
+   dev-libs/atk
dev-libs/expat
dev-libs/glib:2
dev-libs/libevent
@@ -33,20 +46,26 @@ RDEPEND="
media-libs/flac
media-libs/fontconfig
media-libs/freetype
+   media-libs/libbluray
>=media-libs/libjpeg-turbo-1.3.1
-   media-libs/harfbuzz
media-libs/libvpx
-   media-libs/speex
+   media-libs/openjpeg:0/5
+   media-libs/schroedinger
+   media-libs/soxr
+   media-libs/x265
+   media-libs/zvbi
>=media-sound/pulseaudio-2.0
+   media-sound/twolame
+   media-sound/wavpack
=sys-devel/gcc-4.9[cxx]
sys-apps/pciutils
-   sys-libs/libcap
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+
+   x11-libs/libva
x11-libs/libX11
x11-libs/libXScrnSaver
x11-libs/libXcomposite
@@ -65,13 +84,16 @@ S=${WORKDIR}
 QA_PREBUILT="usr/lib*/${MY_PN}/*"
 
 src_install() {
-   mv "${S}"/{usr,etc} "${D}"/ || die
+   mv usr etc "${D}"/ || die
 
local libdir=$(get_libdir)
[[ "${libdir}" != lib ]] && {
mv "${D}"/usr/{lib,"${libdir}"} || die
}
 
+   # Make it find ffmpeg
+   mv "${D}"/usr/${libdir}/x86_64{-linux-gnu,} || die
+
echo sid > "${D}"/etc/debian_version || die
 
# Link to Flash (not in RDEPEND)



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

2016-01-30 Thread Tobias Klausmann
commit: af47806d79a906dbd8d8fc22ae9cfc36d9d3982d
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Jan 30 16:51:46 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Jan 30 16:51:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af47806d

net-misc/ntp: add alpha keyword

Gentoo-Bug: 572452

Package-Manager: portage-2.2.27

 net-misc/ntp/ntp-4.2.8_p6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/ntp/ntp-4.2.8_p6.ebuild b/net-misc/ntp/ntp-4.2.8_p6.ebuild
index 20ad350..4e8f009 100644
--- a/net-misc/ntp/ntp-4.2.8_p6.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p6.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux 
~ia64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux 
~ia64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux 
snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/

2016-01-30 Thread Jason Zaman
commit: 8796183777154929efc6b058e462cc7037eb0817
Author: Nicolas Iooss  m4x  org>
AuthorDate: Sun Dec 20 15:28:50 2015 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 17:16:56 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=87961837

Label OpenSSH systemd unit files

On Arch Linux, OpenSSH unit files are:
/usr/lib/systemd/system/sshdgenkeys.service
/usr/lib/systemd/system/sshd.service
/usr/lib/systemd/system/sshd@.service
/usr/lib/systemd/system/sshd.socket

On Debian jessie, the unit files are:
/lib/systemd/system/ssh.service
/lib/systemd/system/ssh@.service
/lib/systemd/system/ssh.socket

On Fedora 22, the unit files are:
/usr/lib/systemd/system/sshd-keygen.service
/usr/lib/systemd/system/sshd.service
/usr/lib/systemd/system/sshd@.service
/usr/lib/systemd/system/sshd.socket

Use a pattern which matches every sshd unit and introduce an other type
for ssh-keygen units.

 policy/modules/services/ssh.fc | 4 
 policy/modules/services/ssh.te | 6 ++
 2 files changed, 10 insertions(+)

diff --git a/policy/modules/services/ssh.fc b/policy/modules/services/ssh.fc
index fd6c218..027c8a8 100644
--- a/policy/modules/services/ssh.fc
+++ b/policy/modules/services/ssh.fc
@@ -10,6 +10,10 @@ HOME_DIR/\.ssh(/.*)? 
gen_context(system_u:object_r:ssh_home_t,s0)
 /usr/lib/openssh/ssh-keysign   --  
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
 /usr/lib/ssh/ssh-keysign   --  
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
 
+/usr/lib/systemd/system/ssh.*  --  
gen_context(system_u:object_r:sshd_unit_t,s0)
+/usr/lib/systemd/system/sshdgenkeys.*  --  
gen_context(system_u:object_r:sshd_keygen_unit_t,s0)
+/usr/lib/systemd/system/sshd-keygen.*  --  
gen_context(system_u:object_r:sshd_keygen_unit_t,s0)
+
 /usr/libexec/openssh/ssh-keysign --
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
 
 /usr/sbin/sshd --  
gen_context(system_u:object_r:sshd_exec_t,s0)

diff --git a/policy/modules/services/ssh.te b/policy/modules/services/ssh.te
index d83662a..917187a 100644
--- a/policy/modules/services/ssh.te
+++ b/policy/modules/services/ssh.te
@@ -47,6 +47,12 @@ type sshd_tmp_t;
 files_tmp_file(sshd_tmp_t)
 files_poly_parent(sshd_tmp_t)
 
+type sshd_keygen_unit_t;
+init_unit_file(sshd_keygen_unit_t)
+
+type sshd_unit_t;
+init_unit_file(sshd_unit_t)
+
 ifdef(`enable_mcs',`
init_ranged_daemon_domain(sshd_t, sshd_exec_t, s0 - mcs_systemhigh)
 ')



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

2016-01-30 Thread Tobias Klausmann
commit: 576be74682af1c40847ef9b4b7ca49b150420e4d
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Jan 30 17:42:36 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Jan 30 17:43:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576be746

app-arch/snappy: add alpha keyword

Gentoo-Bug: 571868

Package-Manager: portage-2.2.27

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

diff --git a/app-arch/snappy/snappy-1.1.3.ebuild 
b/app-arch/snappy/snappy-1.1.3.ebuild
index c880558..ac1324b 100644
--- a/app-arch/snappy/snappy-1.1.3.ebuild
+++ b/app-arch/snappy/snappy-1.1.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd 
~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_prepare() {



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

2016-01-30 Thread Tobias Klausmann
commit: affc79735b2198f4a9792a750efc03d6dfc734e0
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Jan 30 17:42:27 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Jan 30 17:43:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affc7973

media-video/ffmpeg: add alpha keyword

Gentoo-Bug: 571868

Package-Manager: portage-2.2.27

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

diff --git a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild 
b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
index 496937b..8384147 100644
--- a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
@@ -55,7 +55,7 @@ LICENSE="
samba? ( GPL-3 )
 "
 if [ "${PV#}" = "${PV}" ] ; then
-   KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ppc64 x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+   KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ppc64 x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.



[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/

2016-01-30 Thread Alexis Ballier
commit: 82075dd45f46b928be13521857246adc603aba94
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:30:29 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82075dd4

dev-ml/eliom: enable ppx by default

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/eliom/eliom-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ml/eliom/eliom-5.0.0.ebuild b/dev-ml/eliom/eliom-5.0.0.ebuild
index eeac149..eccf3a5 100644
--- a/dev-ml/eliom/eliom-5.0.0.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="doc +ocamlopt ppx"
+IUSE="doc +ocamlopt +ppx"
 
 RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
>=dev-ml/js_of_ocaml-2.5-r1:=



[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/

2016-01-30 Thread Alexis Ballier
commit: 16f345e93b1b661cd38053fac3c7cbb388051548
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:30:10 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f345e9

dev-ml/eliom: bump ppx_tools dep

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/eliom/eliom-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ml/eliom/eliom-5.0.0.ebuild b/dev-ml/eliom/eliom-5.0.0.ebuild
index bd99b3e..eeac149 100644
--- a/dev-ml/eliom/eliom-5.0.0.ebuild
+++ b/dev-ml/eliom/eliom-5.0.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
dev-ml/ocaml-ssl:=
>=dev-ml/lwt-2.5.0:=
dev-ml/calendar:=
-   ppx? ( dev-ml/ppx_tools:= )"
+   ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
 DEPEND="${RDEPEND}
dev-ml/opam"
 



[gentoo-commits] repo/gentoo:master commit in: dev-ml/js_of_ocaml/

2016-01-30 Thread Alexis Ballier
commit: 4e9923a56d22e6f36e152433ddc8c1196ff5e63f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:02:58 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9923a5

dev-ml/js_of_ocaml: bump to 2.7

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/Manifest   |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 46 +++
 2 files changed, 47 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 5905692..fa92aea 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.6.tar.gz 1291882 SHA256 
c1f066d09524c6be2d40cfb387de49b337837dcc8f2f746a207f37706ca66460 SHA512 
2c4e294b7946757d9b05ec640e130cbee6a0130c03eb3a2188988fb956c1f0e2738c32e97abc461e748e667e7d31e386c5470942df84ddbcf5903d41b133e8c8
 WHIRLPOOL 
abf477caa49edc65b5e577a90dd86641f12b6757e6f2c9034fe08d51cc1ac11209b73e8fdd88de420ed0277d8715bb085c10d29b237854cdebb8a9e36f8e22fe
+DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 
52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 
ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b
 WHIRLPOOL 
278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
new file mode 100644
index 000..4f423b9
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt doc +deriving"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+   >=dev-ml/lwt-2.4.4:=
+   dev-ml/react:=
+   dev-ml/reactiveData:=
+   >=dev-ml/tyxml-3.6:=
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ml/eliom/

2016-01-30 Thread Alexis Ballier
commit: 61a1c0393ae1ac0e9716c7852c6f03bcdc30d33f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:26:15 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a1c039

dev-ml/eliom: bump to 5.0.0

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/eliom/Manifest   |  1 +
 dev-ml/eliom/eliom-5.0.0.ebuild | 57 +
 dev-ml/eliom/metadata.xml   |  3 +++
 3 files changed, 61 insertions(+)

diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
index 5909867..d175232 100644
--- a/dev-ml/eliom/Manifest
+++ b/dev-ml/eliom/Manifest
@@ -1 +1,2 @@
 DIST eliom-4.2.tar.gz 699337 SHA256 
30d180b72d21177d09b311785e08e54cc221b148d969f17334f8be6eecfb783d SHA512 
c7c75dc00defe0c269aba4e4fbdc00a824b781b124e3f51747e29533c4aeedaecb68c7ebcb38b4cc9a51c3796abdfa680ba0702a83415911406b25cd07ad66c7
 WHIRLPOOL 
2a36deeb10cbf3b29c76b33185de1c848615293830f7a3701c2d87025be0ed575cdadf238c696ad4716e50f2b0258febef7b7039a1980aafeaf6e1c483ec46ca
+DIST eliom-5.0.0.tar.gz 728278 SHA256 
6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 
1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887
 WHIRLPOOL 
ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca

diff --git a/dev-ml/eliom/eliom-5.0.0.ebuild b/dev-ml/eliom/eliom-5.0.0.ebuild
new file mode 100644
index 000..bd99b3e
--- /dev/null
+++ b/dev-ml/eliom/eliom-5.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib findlib
+
+DESCRIPTION="A web framework to program client/server applications"
+HOMEPAGE="http://ocsigen.org/eliom/;
+SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt ppx"
+
+RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
+   >=dev-ml/js_of_ocaml-2.5-r1:=
+   >=www-servers/ocsigenserver-2.5:=
+   >=dev-ml/tyxml-3.6:=
+   >=dev-ml/deriving-0.6:=
+   >=dev-ml/reactiveData-0.2:=
+   dev-ml/ocaml-ipaddr:=
+   dev-ml/react:=
+   dev-ml/ocaml-ssl:=
+   >=dev-ml/lwt-2.5.0:=
+   dev-ml/calendar:=
+   ppx? ( dev-ml/ppx_tools:= )"
+DEPEND="${RDEPEND}
+   dev-ml/opam"
+
+src_compile() {
+   if use ocamlopt ; then
+   emake PPX=$(usex ppx true false) all
+   else
+   emake PPX=$(usex ppx true false) byte
+   fi
+   use doc && emake doc
+   emake man
+}
+
+src_install() {
+   opam-installer \
+   --prefix="${ED}/usr" \
+   --libdir="${D}/$(ocamlc -where)" \
+   --docdir="${ED}/usr/share/doc/${PF}" \
+   --mandir="${ED}/usr/share/man" \
+   || die
+   dodoc CHANGES README.md
+   if use doc ; then
+   docinto client/html
+   dodoc -r _build/src/lib/client/api.docdir/*
+   docinto server/html
+   dodoc -r _build/src/lib/server/api.docdir/*
+   fi
+}

diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
index d6e3988..7d63e48 100644
--- a/dev-ml/eliom/metadata.xml
+++ b/dev-ml/eliom/metadata.xml
@@ -8,4 +8,7 @@
   
 ocsigen/eliom
   
+  
+   Enable PPX syntax extension support.
+  
 



[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/

2016-01-30 Thread Alexis Ballier
commit: 75debffc16b272fe48e28f897bb4d64784657336
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:14:26 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75debffc

dev-ml/ppx_tools: initial import; ebuild by me

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/ppx_tools/Manifest|  1 +
 dev-ml/ppx_tools/metadata.xml| 11 +++
 dev-ml/ppx_tools/ppx_tools-0.99.2.ebuild | 30 ++
 3 files changed, 42 insertions(+)

diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
new file mode 100644
index 000..0181b80
--- /dev/null
+++ b/dev-ml/ppx_tools/Manifest
@@ -0,0 +1 @@
+DIST ppx_tools_0.99.2.tar.gz 15877 SHA256 
98128022ea0574d769a263eb9b73be06200eec4bac9adb8dc44df289a77c4dec SHA512 
1ed8b3a670e233e77988d10c777003384c86c124b8b7e4cec41c0a3e0de280f818b7cbbddc59c49644517899ce0ef022407db6d4aaf29c559abc0788dce11594
 WHIRLPOOL 
f04ecf57ab457ce2ea58b93a50215f49f257597ce4176a4cd3fe8ffb230ab1a898a479d2bbab3df2675b71f7123c556d3a7cd84e8b2263389ea02f3990585924

diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml
new file mode 100644
index 000..e9fc8c8
--- /dev/null
+++ b/dev-ml/ppx_tools/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+m...@gentoo.org
+Gentoo ML Project
+  
+  
+ocsigen/tyxml
+  
+

diff --git a/dev-ml/ppx_tools/ppx_tools-0.99.2.ebuild 
b/dev-ml/ppx_tools/ppx_tools-0.99.2.ebuild
new file mode 100644
index 000..3a85d10
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-0.99.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools;
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${PN}_${PV}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.02:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${PN}_${PV}"
+
+src_compile() {
+   emake -j1
+}
+
+src_install() {
+   findlib_src_install
+   dodoc README.md
+}



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

2016-01-30 Thread Alexis Ballier
commit: 3518f0153f27c0681fcb311ebc6a822380122e0c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:41:03 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:41:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3518f015

media-video/ffmpeg: Drop aacplus & vo-aacenc in live ebuild.

Those have been dropped upstream. Internal encoder should be superior to 
vo-aacenc and fdk-aac should be superior to aacplus for AAC-HE

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/ffmpeg/ffmpeg-.ebuild | 16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index 94e2419..32720de 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -47,10 +47,6 @@ LICENSE="
!gpl? ( LGPL-3 )
)
encode? (
-   aac? (
-   gpl? ( GPL-3 )
-   !gpl? ( LGPL-3 )
-   )
amrenc? (
gpl? ( GPL-3 )
!gpl? ( LGPL-3 )
@@ -94,8 +90,8 @@ FFMPEG_FLAG_MAP=(
 
 # Same as above but for encoders, i.e. they do something only with USE=encode.
 FFMPEG_ENCODER_FLAG_MAP=(
-   aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
-   aacplus:libaacplus faac:libfaac kvazaar:libkvazaar nvenc:nvenc
+   amrenc:libvo-amrwbenc mp3:libmp3lame
+   faac:libfaac kvazaar:libkvazaar nvenc:nvenc
openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
@@ -167,8 +163,6 @@ RDEPEND="
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
encode? (
-   aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-   aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] 
)
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] 
)
faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
@@ -293,7 +287,7 @@ REQUIRED_USE="
${GPL_REQUIRED_USE}
${CPU_REQUIRED_USE}"
 RESTRICT="
-   encode? ( faac? ( bindist ) aacplus? ( bindist ) nvenc? ( bindist ) )
+   encode? ( faac? ( bindist ) nvenc? ( bindist ) )
gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
@@ -322,10 +316,10 @@ multilib_src_configure() {
ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
 
# Licensing.
-   if use aac || use amrenc ; then
+   if use amrenc ; then
myconf+=( --enable-version3 )
fi
-   if use aacplus || use faac || use nvenc ; then
+   if use faac || use nvenc ; then
myconf+=( --enable-nonfree )
fi
else



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

2016-01-30 Thread Hans de Graaff
commit: 5c382bb6914a1a78874709ab1cf5633090a9771e
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Jan 30 16:21:04 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Jan 30 16:41:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c382bb6

dev-ruby/rainbow: add 2.1.0

Package-Manager: portage-2.2.26

 dev-ruby/rainbow/Manifest |  1 +
 dev-ruby/rainbow/rainbow-2.1.0.ebuild | 23 +++
 2 files changed, 24 insertions(+)

diff --git a/dev-ruby/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index ef37b6f..486c9a3 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -1,2 +1,3 @@
 DIST rainbow-git-1.1.4.tgz 10301 SHA256 
f8815c1e017ec3939114047f0af779feb88e637432ed9edebe0ab74dc133d236 SHA512 
ca46337628a93530ccb10d66fad428248bea62c5a103485afff68584370a325a31f4d1f2a52e1228c1faa65c6f3cc2e19af22ee24ef3a61aa707899f04c4f546
 WHIRLPOOL 
c493498b9eeb3281af79251a7bc2f5c4175773ee8f3b018fdbad75f4f2ac047238afa1ee4bf8186eeed8f808c1b8692df47fd5b01758fe0d3bf6ae00d77e421d
 DIST rainbow-git-2.0.0.tgz 10480 SHA256 
d3b2bc51449429669e91c5edea05f973cc0568cff78cf5461f03068c18e127ad SHA512 
1acf0d2a1c0c0d70cad2cebcd65011dc2e53b991e49cde69b909c80b354ee084f86531a793b2d43ac4da6eed55d53c483de9f3f345b548b34c4331ea62494881
 WHIRLPOOL 
41d6702c03c8720c0ad6d62639ea103458d178642ae014914e84d4cc6f4a221a504c8fa5a6aea656db73cc8d625f9fe6712d622ee7808c4d45114a7a3aa31b85
+DIST rainbow-git-2.1.0.tgz 13399 SHA256 
7604afc02ed24cd19f90fe46f210fc66323e49ebf5e1f563045adc3bfa422b18 SHA512 
cf3a280301f98c48d9fd52e95c6bcf41fcf4ff9322627ac09a94abb5dd94f56377e62c5d060065c2b97a427d46d5231db74a77aadc4289e43a5ebf3a19777aa1
 WHIRLPOOL 
bff54cff2b41960cd7cbe6b93abfa9edc9692b87018fc97c4c3f96ba9bd09d20659ff5f77bffeefdd45b027f99cca365288bb9679ef890ae8ebbe68b254e4504

diff --git a/dev-ruby/rainbow/rainbow-2.1.0.ebuild 
b/dev-ruby/rainbow/rainbow-2.1.0.ebuild
new file mode 100644
index 000..aa426c3
--- /dev/null
+++ b/dev-ruby/rainbow/rainbow-2.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Colorize printed text on ANSI terminals"
+HOMEPAGE="https://github.com/sickill/rainbow;
+
+SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> 
${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""



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

2016-01-30 Thread Tobias Klausmann
commit: c189b3cc705ac10d5d131d987f5f4131de3b64c0
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Jan 30 16:41:45 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Jan 30 16:41:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c189b3cc

dev-libs/nss: add alpha keyword

Gentoo-Bug: 571086

Package-Manager: portage-2.2.27

 dev-libs/nss/nss-3.21-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/nss/nss-3.21-r2.ebuild b/dev-libs/nss/nss-3.21-r2.ebuild
index 8eb5e64..216ca07 100644
--- a/dev-libs/nss/nss-3.21-r2.ebuild
+++ b/dev-libs/nss/nss-3.21-r2.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"



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

2016-01-30 Thread Brian Dolbec
commit: 514a4cf4426721eedf482047b0dc0b56fa2e71ca
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jan 30 16:40:05 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jan 30 16:40:31 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=514a4cf4

repoman: Fix commit af88402104c logic for the rewrite code

The logic was opposite for what the new code needed.
The original code skipped the scan for that logic, this code does the scan.
X-Gentoo-Bug: 540882

Commit: af88402104c90e99ab40bff956f58395ea362a6e
Author: Brian Dolbec  gentoo.org> (Wed 27 Jan 2016 12:32:47 PM PST)
Subject: repoman: Re-add an if that bypasses the changes scan (bug 540882)

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

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 04d8b29..84dbdf2 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -172,8 +172,8 @@ class Scanner(object):
 
self.changed = Changes(self.options)
# bypass unneeded VCS operations if not needed
-   if (self.options.if_modified != "y" and
-   self.options.mode in ("manifest", "manifest-check")):
+   if (self.options.if_modified == "y" or
+   self.options.mode not in ("manifest", 
"manifest-check")):
self.changed.scan(self.vcs_settings)
 
self.have = {



[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/

2016-01-30 Thread Robin H. Johnson
commit: 96fac6a648c893ae537cf68ff6d8c98349fe1035
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jan 30 17:06:31 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jan 30 17:06:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fac6a6

x11-wm/awesome: version bump, fixes upstream keybinding bug in 3.5.7.

Package-Manager: portage-2.2.27

 x11-wm/awesome/Manifest |   1 +
 x11-wm/awesome/awesome-3.5.8.ebuild | 140 
 2 files changed, 141 insertions(+)

diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index c2fba59..e01639e 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,3 +1,4 @@
 DIST awesome-3.4.15.tar.bz2 762323 SHA256 
4207f5cbed25d0e7ab35157165d923c2ccf04fded5b3d5fc130134ce9ed5ddfd SHA512 
18bb2659e1e7c18a8917f606d635e968daa31a5be4c6d93a109603aace9b5d8b5fd0b8ac1d13ba3d6f2c5c42661204ce80c5ea322088cd358ec5e164b760c339
 WHIRLPOOL 
74da6197f2e4e5f3d99a11e99c26563f6a145181bab5c017b7ee330041864527551a230ce6dc6109bb5510621fe874921c7caa72c095fa2be6fbdb69e02da1dd
 DIST awesome-3.5.6.tar.xz 720112 SHA256 
37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7 SHA512 
8d89bf46956276a8bcf106bb255c051e8382b08617e17691134a8f3e5db3ec9f7773581c02ce62d23e72499f7b1e60fe4322c211e41219b5bffd1897a96f6cf6
 WHIRLPOOL 
8ec944f1113f7b7b7c6857c02a6c657aec05ddf23674c75a7cf571d4a65720ed4f5f1d28b0fdac032c12ea5e9a54f655d080c6af4e1d314b8c00bf2b9e806d01
 DIST awesome-3.5.7.tar.xz 722864 SHA256 
ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf SHA512 
0b57efa6ba55e28fee56bec96dbf3c47249b2d70b21e1a7760d4367a0ba42d9936c1c6b78afa4aa3050a60cf34189551ea53b208ec8ec9f6563a905463550515
 WHIRLPOOL 
ea368fa058aa1c6a143e6f24231adeb47c5e0d26c462b076d8930a49f72c94097555a542405360c107a9e724f4fcc0993a0ff8b53102dfb072db2a9b04f52d9a
+DIST awesome-3.5.8.tar.xz 723000 SHA256 
7c30c96c57bd72cfed630bbccc344054fe44b37c0a79bdd98075c507af672ec6 SHA512 
be5604821e256e36067750c341ca6f8669e159527b93654c8fc41bcd161da6d87fa0e3c5fccc51821586d163535ac78363d12d99ed81b6fb14e26da59136d5ef
 WHIRLPOOL 
2abe85d034c40dddc2189e8eac6e80c59ad1b92bebb0e1c08f67e8a07a3b8eb420ad352c2f4bf500f15ff854a0c6dfc67aef5c5516a2aada267388d2ac4f

diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild 
b/x11-wm/awesome/awesome-3.5.8.ebuild
new file mode 100644
index 000..cfc244f
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.8.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MIN_VERSION="2.8"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/;
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND="
+   >=dev-lang/lua-5.1:0
+   dev-libs/glib:2
+   >=dev-libs/libxdg-basedir-1
+   >=dev-lua/lgi-0.7
+   x11-libs/cairo[xcb]
+   x11-libs/gdk-pixbuf:2
+   >=x11-libs/libxcb-1.6
+   >=x11-libs/pango-1.19.3[introspection]
+   >=x11-libs/startup-notification-0.10_p20110426
+   >=x11-libs/xcb-util-0.3.8
+   x11-libs/xcb-util-cursor
+   x11-libs/libXcursor
+   >=x11-libs/libX11-1.3.99.901
+   dbus? ( >=sys-apps/dbus-1 )
+   elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+   >=app-text/asciidoc-8.4.5
+   app-text/xmlto
+   dev-util/gperf
+   virtual/pkgconfig
+   media-gfx/imagemagick[png]
+   >=x11-proto/xcb-proto-1.5
+   >=x11-proto/xproto-7.0.15
+   doc? (
+   app-doc/doxygen
+   media-gfx/graphviz
+   )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+   # bug #408025
+   epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+   epatch "${FILESDIR}/${PN}-xsession.patch"
+
+   # bug #507604
+   epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+   # bug #509658
+   epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+
+   # bug #571544
+   # Merged upstream
+   #epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
+
+   epatch_user
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DPREFIX="${EPREFIX}"/usr
+   -DSYSCONFDIR="${EPREFIX}"/etc
+   $(cmake-utils_use_with dbus DBUS)
+   $(cmake-utils_use doc GENERATE_DOC)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   local myargs="all"
+
+   if use doc ; then
+   myargs="${myargs} doc"
+   fi
+   cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if use doc ; then
+   (
+  

[gentoo-commits] proj/musl:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2016-01-30 Thread Anthony G. Basile
commit: db375501bb3b42701ab7b00e15a76ec00779332b
Author: Felix Janda  posteo  de>
AuthorDate: Sat Jan 30 15:58:50 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Jan 30 17:28:05 2016 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=db375501

app-emulation/qemu: bump to 2.5.0

 app-emulation/qemu/Manifest|  13 +-
 .../qemu/files/qemu-2.2.1-CVE-2015-1779-1.patch| 241 --
 .../qemu/files/qemu-2.2.1-CVE-2015-1779-2.patch|  58 -
 .../qemu/files/qemu-2.3.0-CVE-2015-3456.patch  |  86 ---
 .../qemu/files/qemu-2.5.0-CVE-2015-8558.patch  |  50 
 .../qemu/files/qemu-2.5.0-CVE-2015-8567.patch  |  95 +++
 .../qemu/files/qemu-2.5.0-CVE-2015-8701.patch  |  49 
 .../qemu/files/qemu-2.5.0-CVE-2015-8743.patch  |  50 
 .../qemu/files/qemu-2.5.0-CVE-2016-1568.patch  |  41 +++
 app-emulation/qemu/files/qemu-2.5.0-cflags.patch   |  13 +
 ...qemu-2.2.1-r99.ebuild => qemu-2.5.0-r99.ebuild} | 274 -
 11 files changed, 469 insertions(+), 501 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2ecdb66..9fdb00d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -4,11 +4,14 @@ AUX qemu-1.7.0-cflags.patch 300 SHA256 
8f35e55c4bae93e82f9580eabe2d6a2d4660bd053
 AUX qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch 563 SHA256 
99de67d610ad13a1dcf6c67a3c2b5b87fb909220173a956435737f9bea3c371b SHA512 
a29e9a889388a6627ed492a79e66514ffb5e64f9479646982091811548fc2a9bf6682104a6c774d83e645e4b1db39e491afd4efce789fe164623442a7f3e5d00
 WHIRLPOOL 
d3aab06099de263c22f4c71810a3b2cb8602d17731ec76674cd1415e539306555a7b96b789f0daad473600dfa04a83224ff603f7b9a9ac63a4902f74d0e9deb5
 AUX qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch 930 
SHA256 6af6cf9044997710a6d0fbdba30a35c8d775e30d30c032ec97db672f75ec88ac SHA512 
ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea
 WHIRLPOOL 
06b9dd5251ac03405c97b1f5a623b4d86bda2f72fbcd52b90ae4d11a0cfb59cae62df2cb6189405fbe53ab05ff2b7ca8165fda239dbfe5f31ed70abb53b3b9f3
 AUX qemu-2.2.0-_sigev_un.patch 636 SHA256 
f3b9a4d6162c553f3110ad22716305818e2130e2ff5d628faf044fc58a5e3cb5 SHA512 
f72b879daede5184904f64cabb276de96299a37a93fce444d09e9068671009e95a5e5d6b815ec41a5db5b3807de14d470a56bba5806ffd4dfec577577b046ccb
 WHIRLPOOL 
9453ad4966e10d504f3e867fd984642a3c1ee3ae847b5ca56196fd1f9e6c0f2d7b52ca07446212af72fef6d0ded1527a5eb306fa6cd915e8dd9ce11523362bac
-AUX qemu-2.2.1-CVE-2015-1779-1.patch 8631 SHA256 
17ea04bb0571f3a346eb25ce2d61fd7053515767adedfde567fd39205993c600 SHA512 
191dde0754b9466d87cf99a578ac07f0902f373156f4d5ff98540b9099a6fa8e29ba4ca9d4a5a21ae5dbba2b80c36600ea0bd2c31fa0c8734926514015166ab8
 WHIRLPOOL 
2be2f490eb32857b2b218761df3580bc31eb5a89bf1b289a048e9fd489cdb024869399481345b5ecb09a45c4fbf1ee4639062ae1fdbee9781e66ca6cc8af4cac
-AUX qemu-2.2.1-CVE-2015-1779-2.patch 2318 SHA256 
4c0966520bf09df25d99c883f94037e765406dd4097dd704e66361bb07f73679 SHA512 
7a85bc8e00c60c6c36790d1169f0d84d2c75fe81c1700b4f764ddcb0d0587d4b6d228d80e65fead035e3ab99449aad2f559071edf9145ff7a755506f3ff05b0e
 WHIRLPOOL 
078388c50367d41c810a02aa795b6ad0df381582bdd2725ae125243ee5921aa4057494f063a7de49da6b6f6343f37a3c83d96ef6d92c22e722972c8e4ea968dc
-AUX qemu-2.3.0-CVE-2015-3456.patch 2853 SHA256 
efac61bf9c20d5d08ef47bc9d51be5c8bd519f1d970ba3c3506c5760bf807e7d SHA512 
5fed59ae67a962d187418f4bd57cebe901f9bcba817694b5e2a57daf77c34a406ed7c1f278e12d813304e58c48a24493b4e001a9ee4045bab2608f1730715ac7
 WHIRLPOOL 
9ad5237aa1bbe46a8493e331bb9c2152c36f9c877582485e1cf811b09430bad97a9f3b6bc52face7e4287f9c9fe4f1891de154a62ba93ea454c3ed9d44e8f729
+AUX qemu-2.5.0-CVE-2015-8558.patch 1459 SHA256 
d769e6eb6dc0bdb0b982ef5fe7d73cc6bad47233102f53d11c6ed6c9051602d8 SHA512 
42961191890c500675610d5d33e6ff468b07428c6b428ac01bb5c0e3ea88ff611a3532f848d54317458475fef221a06e41761ef14ea61d1b741db73450c4f90d
 WHIRLPOOL 
475679dc1a24bc75012995a9a2122847454701b65ff0b7f8192865b45de49ce08572f129a7cfdeb36521252ed2f80c95e9dddbd64cb8e39fdc5beacc25934798
+AUX qemu-2.5.0-CVE-2015-8567.patch 3108 SHA256 
88b72df4e02407c3b9ca4835c38988b97fcd5aa9c68da6fa47207fe675d4e661 SHA512 
2f0243ec9764d72fe5e7a005a8db40d3d5c4c2edae5c3451087ee3f5c841c96a3112875cf88a19061fa2ce0d04715d247e6eb1eb83e1e5b57ec0b9eb324b8ce6
 WHIRLPOOL 
b432ff3e105da5c0bd20dd1d7da0374f4005b2ac5a9a8c824e96730aeafa89bb8fc125f8b2857fdaf72024082ddbc0c7a28c3e3ffb9114c3d370db1b638c4731
+AUX qemu-2.5.0-CVE-2015-8701.patch 1671 SHA256 
f39e0c6301cffa1b14c3ef0ab72fce0e2acd42170759ef7954234d31602aeb99 SHA512 
d39edf84e2d17e6080bbc4a270732cd73b41fa39d948ee7bc4456e1024c5a69ddfb5e848af3272615f5aa36a3b6410a12f5a73e00ccfa58e0d60d7289d034aa9
 WHIRLPOOL 
352148c367837ba2d6eb5eb39e00c128f0cff3faef159754a41318857bc11a6616be184c24df4767ec2c8c14910ad74fc3be48273f6312b1687910fbcaf7bec3
+AUX qemu-2.5.0-CVE-2015-8743.patch 1777 SHA256 

[gentoo-commits] proj/gnome:master commit in: media-libs/clutter-gtk/

2016-01-30 Thread Priit Laes
commit: ab86109235171cfbad54f0c74b1be6af268acaea
Author: Priit Laes  plaes  org>
AuthorDate: Sat Jan 30 17:32:39 2016 +
Commit: Priit Laes  plaes  org>
CommitDate: Sat Jan 30 17:32:39 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ab861092

media-libs/clutter-gtk: Drop removed clutter eclass usage

 media-libs/clutter-gtk/clutter-gtk-.ebuild | 26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/media-libs/clutter-gtk/clutter-gtk-.ebuild 
b/media-libs/clutter-gtk/clutter-gtk-.ebuild
index e284041..ca18131 100644
--- a/media-libs/clutter-gtk/clutter-gtk-.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-.ebuild
@@ -4,32 +4,31 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
+GNOME2_LA_PUNT="yes"
 
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter gnome.org
+inherit gnome2
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
 
 DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
 HOMEPAGE="https://wiki.gnome.org/Projects/Clutter;
+LICENSE="LGPL-2.1+"
 
 SLOT="1.0"
-IUSE="examples +introspection"
 if [[ ${PV} =  ]]; then
KEYWORDS=""
IUSE="${IUSE} doc"
 else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
+IUSE="X examples gtk +introspection wayland"
 
-# XXX: Needs gtk with X support (!directfb)
 RDEPEND="
-   >=x11-libs/gtk+-3.6.0:3[introspection?]
-   >=media-libs/clutter-1.18:1.0[introspection?]
+   >=x11-libs/gtk+-3.8.0:3[X=,introspection?,wayland=]
+   >=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=]
media-libs/cogl:1.0=[introspection?]
-   introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+   introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 "
 DEPEND="${RDEPEND}
dev-util/gtk-doc-am
@@ -38,10 +37,17 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
-   DOCS="NEWS README"
-   EXAMPLES="examples/{*.c,redhand.png}"
gnome2_src_configure \
--disable-maintainer-flags \
--enable-deprecated \
$(use_enable introspection)
 }
+
+src_install() {
+   gnome2_src_install
+
+   if use examples; then
+   insinto /usr/share/doc/${PF}/examples
+   doins examples/{*.c,redhand.png}
+   fi
+}



[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/

2016-01-30 Thread Priit Laes
commit: 3e3af12ef71fbf1dbc1a54414938e45c8607ffbe
Author: Priit Laes  plaes  org>
AuthorDate: Sat Jan 30 17:29:52 2016 +
Commit: Priit Laes  plaes  org>
CommitDate: Sat Jan 30 17:29:52 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3e3af12e

media-libs/cogl: Update live ebuild to not use removed clutter eclass

 media-libs/cogl/cogl-.ebuild | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-libs/cogl/cogl-.ebuild b/media-libs/cogl/cogl-.ebuild
index 10d4c6d..b1e1c85 100644
--- a/media-libs/cogl/cogl-.ebuild
+++ b/media-libs/cogl/cogl-.ebuild
@@ -3,10 +3,9 @@
 # $Id$
 
 EAPI="5"
-CLUTTER_LA_PUNT="yes"
+GCONF_DEBUG="yes"
 
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
+inherit gnome2 multilib virtualx
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
@@ -53,7 +52,8 @@ COMMON_DEPEND="
 "
 # before clutter-1.7, cogl was part of clutter
 RDEPEND="${COMMON_DEPEND}
-   !

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

2016-01-30 Thread Pacho Ramos
commit: 1150f5154b76841d4d4b52e14b92ae508a376147
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 17:51:43 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 17:51:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1150f515

net-p2p/deluge: PYTHON_REQUIRED_USE needed

Package-Manager: portage-2.2.27

 net-p2p/deluge/deluge-1.3.12.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild 
b/net-p2p/deluge/deluge-1.3.12.ebuild
index 6aa9bf1..4a1199b 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="geoip gtk libnotify setproctitle sound webinterface"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
dev-python/setuptools[${PYTHON_USEDEP}]



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

2016-01-30 Thread Lars Wendler
commit: 7b7f23f63bbf75abda6611a478516aa518a59ccd
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 30 11:01:12 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jan 30 11:01:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7f23f6

media-sound/easytag: Bump to version 2.4.1 (bug #573376).

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/easytag/Manifest |  1 +
 media-sound/easytag/easytag-2.4.1.ebuild | 91 
 2 files changed, 92 insertions(+)

diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index e0f6a30..ac50965 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,3 +1,4 @@
 DIST easytag-2.1.8.tar.xz 2459496 SHA256 
1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9 SHA512 
cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48
 WHIRLPOOL 
ab37d4942bde4a88c233869b3cf84d13dd4a259cd894941bd9c26ec4f3b22c02af3fc7633a09670ee707d0287bb8bb9fc654ea00e0fe694319a6cf24b220420c
 DIST easytag-2.2.6.tar.xz 1016508 SHA256 
26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a SHA512 
abd2f0e0c378c487d6b8f4761db610bf596a97cdfa469d8e597b3965934aa4e3a2e374afb404dcbd68ea124de194f428fee4ec7fe5e2615e87e92be3c9b8a246
 WHIRLPOOL 
9425b6f9a6bda67ac91475d2f972d70b06861d41d9a994d8a2f67fc0110b343dc87b8c83435a30a46ff8faaf9193fda529df8c3e55d4540d90fe461490a3f9a4
 DIST easytag-2.4.0.tar.xz 1342852 SHA256 
b8d882bc168abca96b1b369b10e5b97fa29a7a43f7b33f34489768d111610c3d SHA512 
c2cf8c30871a7505c8fda1d6af71d9792aad64565e1351d616858f545ed05477dd48d41628efc22d2edf1aa0f38ceb91d433a51512f01ea81a512f6c9893da0f
 WHIRLPOOL 
764d6a0a6d824ba4457291fdb314a53f29251c6722ba1da19e59874f3b1269b8e91fd1d0b8d2a991247c67bbc2d9acf0adc3d62121029427a8300ae53127be40
+DIST easytag-2.4.1.tar.xz 1360284 SHA256 
b9ef5f47572f44985922230f94b5ac908d4c7a12430dac662fdf1b48c7e577d5 SHA512 
fc134aab77597a4da92294012e4e48a64b68e0c6f29c9d61779e41594edc7ccc73563074e8a050f6807200af608e1034d2040de716d7234fb2262e5215f3542c
 WHIRLPOOL 
12f31dcf693208f07da323df64d3d781e1de946bbf7e479edc47598557344cecae77ace1147ba7d839054f502b4979c042560e546cbf4b399a496b1bf3263f02

diff --git a/media-sound/easytag/easytag-2.4.1.ebuild 
b/media-sound/easytag/easytag-2.4.1.ebuild
new file mode 100644
index 000..17e2c50
--- /dev/null
+++ b/media-sound/easytag/easytag-2.4.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit fdo-mime gnome.org gnome2-utils
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media 
tags"
+HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG;
+
+LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="opus? ( vorbis )
+   speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.38:2
+   media-libs/libcanberra[gtk3]
+   >=x11-libs/gtk+-3.10:3
+   flac? ( >=media-libs/flac-1.3 )
+   mp3? (
+   >=media-libs/id3lib-3.8.3-r8
+   >=media-libs/libid3tag-0.15.1b-r4
+   )
+   mp4? ( >=media-libs/taglib-1.9.1[mp4] )
+   opus? (
+   >=media-libs/opus-1.1
+   >=media-libs/opusfile-0.4
+   )
+   speex? ( >=media-libs/speex-1.2_rc1 )
+   vorbis? (
+   >=media-libs/libogg-1.3.1
+   >=media-libs/libvorbis-1.3.4
+   )
+   wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}
+   app-text/docbook-xml-dtd:4.4
+   app-text/yelp-tools
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=dev-util/intltool-0.50
+   >=sys-devel/gettext-0.18.3.2
+   virtual/pkgconfig
+   !=dev-util/appdata-tools-0.1.7
+   >=dev-util/desktop-file-utils-0.22
+   )"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e '/^DEPRECATED_CPPFLAGS="/d' \
+   -e '/warning_flags/s: -Werror=.*:":' \
+   configure || die
+}
+
+src_configure() {
+   econf \
+   $(use_enable test appdata-validate) \
+   $(use_enable test tests) \
+   $(use_enable mp3) \
+   $(use_enable mp3 id3v23) \
+   $(use_enable vorbis ogg) \
+   $(use_enable opus) \
+   $(use_enable speex) \
+   $(use_enable flac) \
+   $(use_enable mp4) \
+   $(use_enable wavpack)
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+   gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+   fdo-mime_desktop_database_update

[gentoo-commits] repo/gentoo:master commit in: dev-tex/xcolor/

2016-01-30 Thread Alexis Ballier
commit: df0d8829a814e33aebd7ea526d9aea619e84a226
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 12:31:23 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 12:31:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0d8829

dev-tex/xcolor: add missing pstricks dep, bug #573292

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-tex/xcolor/xcolor-2.11.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-tex/xcolor/xcolor-2.11.ebuild 
b/dev-tex/xcolor/xcolor-2.11.ebuild
index e88a8f7..bb9d3c7 100644
--- a/dev-tex/xcolor/xcolor-2.11.ebuild
+++ b/dev-tex/xcolor/xcolor-2.11.ebuild
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="dev-texlive/texlive-latex"
+RDEPEND="
+   dev-texlive/texlive-latex
+   dev-texlive/texlive-pstricks
+"
 
 DEPEND="${RDEPEND}
app-arch/unzip"



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

2016-01-30 Thread Justin Lecher
commit: da661fc9f247f8b46ab6ec86c92805eb12081cca
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jan 30 15:41:43 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jan 30 15:47:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da661fc9

dev-python/sympy: Better doc building and update virtualx.eclas usage

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/sympy/sympy-0.7.6.1-r1.ebuild | 18 --
 dev-python/sympy/sympy-0.7.6.1.ebuild| 17 -
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild 
b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
index 6a0f6dd..c69a900 100644
--- a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
+++ b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
 
 inherit distutils-r1 eutils virtualx
 
@@ -19,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos ~x64-macos"
 IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test 
texmacs theano"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   doc? ( python_targets_python2_7 )"
+   doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' 
python2_7)
@@ -46,6 +45,10 @@ DEPEND="${RDEPEND}
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
 
+pkg_setup() {
+   use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch
epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch
@@ -67,7 +70,7 @@ python_compile_all() {
 }
 
 python_test() {
-VIRTUALX_COMMAND="./setup.py" virtualmake test
+   virtx "${PYTHON}" setup.py test
 }
 
 python_install() {
@@ -77,8 +80,11 @@ python_install() {
 python_install_all() {
local DOCS=( AUTHORS README.rst )
use doc &&\
-   DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf 
doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\
-   local HTML_DOCS=( doc/_build/html/. ) &&\
+   DOCS+=(
+   doc/_build/cheatsheet/cheatsheet.pdf
+   doc/_build/cheatsheet/combinatoric_cheatsheet.pdf
+   ) && \
+   local HTML_DOCS=( doc/_build/html/. ) && \
doinfo doc/_build/texinfo/${PN}.info
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all

diff --git a/dev-python/sympy/sympy-0.7.6.1.ebuild 
b/dev-python/sympy/sympy-0.7.6.1.ebuild
index 15a78b6..6ae4e9f 100644
--- a/dev-python/sympy/sympy-0.7.6.1.ebuild
+++ b/dev-python/sympy/sympy-0.7.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos ~x64-macos"
 IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test 
texmacs theano"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   doc? ( python_targets_python2_7 )"
+   doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' 
python2_7)
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
 
+pkg_setup() {
+   use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
 python_prepare_all() {
epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch
epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch
@@ -65,7 +69,7 @@ python_compile_all() {
 }
 
 python_test() {
-VIRTUALX_COMMAND="./setup.py" virtualmake test
+   virtx "${PYTHON}" setup.py test
 }
 
 python_install() {
@@ -75,8 +79,11 @@ python_install() {
 python_install_all() {
local DOCS=( AUTHORS README.rst )
use doc &&\
-   DOCS=( ${DOCS[*]} doc/_build/cheatsheet/cheatsheet.pdf 
doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) &&\
-   local HTML_DOCS=( doc/_build/html/. ) &&\
+   DOCS+=(
+   doc/_build/cheatsheet/cheatsheet.pdf
+   doc/_build/cheatsheet/combinatoric_cheatsheet.pdf
+   ) && \
+   local HTML_DOCS=( doc/_build/html/. ) && \
doinfo doc/_build/texinfo/${PN}.info
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all



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

2016-01-30 Thread Justin Lecher
commit: a5596388fbb1521d2b8e87c7357cc026909b0544
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Jan 30 15:45:46 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jan 30 15:47:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5596388

fortran-2.eclass: Fix fortran-2_pkg_setup() for EAPI=6

case statement ignored EAPI > 5

Gentoo-Bugs: https://bugs.gentoo.org/show_bug.cgi?id=573368

Signed-off-by: Justin Lecher  gentoo.org>

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

diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 8627965..66b8100 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -278,7 +278,7 @@ fortran-2_pkg_setup() {
eqawarn "Please migrate your package to a higher EAPI"
eqawarn "or file a bug at https://bugs.gentoo.org;
_fortran-2_pkg_setup ;;
-   4|5)
+   *)
if [[ ${MERGE_TYPE} != binary ]]; then
_fortran-2_pkg_setup
fi



[gentoo-commits] repo/gentoo:master commit in: dev-ml/reactiveData/

2016-01-30 Thread Alexis Ballier
commit: f7786b74a481503746c66d8bb6d33b7fc0f348fd
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:19:19 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7786b74

dev-ml/reactiveData: bump to 0.2 and update homepage / src_uri

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/reactiveData/Manifest|  1 +
 dev-ml/reactiveData/reactiveData-0.2.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/dev-ml/reactiveData/Manifest b/dev-ml/reactiveData/Manifest
index c27121f..3e91283 100644
--- a/dev-ml/reactiveData/Manifest
+++ b/dev-ml/reactiveData/Manifest
@@ -1 +1,2 @@
 DIST reactiveData-0.1.tar.gz 17074 SHA256 
fc755843daaf3bdf1190d9fbfb63e760d4a0378dea2ae4da7b371b696c4cde14 SHA512 
4c1d000d7c8713d365473e924ad22cc285a0d30009e4f3a4c23cb2fed9678209860cbfe9787b4aef24c9d1fe3b8bf2f71609e45bd52abdff5e27adc3afa651c0
 WHIRLPOOL 
4d9de7aca80f7ed6c1f83247170eec7289da9af2030f462a7a5bfe153d532621c1d1ec38dfd4237654da43694bd5972e55a44224513125117b2e7e24d725a95b
+DIST reactiveData-0.2.tar.gz 21063 SHA256 
d80d425d2746ffc7bd1b88e9528b8236a5ca13cca636662dee1a59e96d675367 SHA512 
ed6c82b499f7a740dcf3c39825dd9a98b73ab32d15159e372253a2ca9c8406301cd569654d02f5be2530b491b101587bb628984b0b6f1ce1cc21aab010e518cf
 WHIRLPOOL 
819a6d999d84056967c34c9e451655b86840d30bf88903eb1a55bff41dbf552c6bac9dfa61b2d1a6c76c7806f6f61e307b27f382fc66ee7f380c2da5a4f72817

diff --git a/dev-ml/reactiveData/reactiveData-0.2.ebuild 
b/dev-ml/reactiveData/reactiveData-0.2.ebuild
new file mode 100644
index 000..47f1e3c
--- /dev/null
+++ b/dev-ml/reactiveData/reactiveData-0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Functional reactive programming with incremental changes in data 
structures"
+HOMEPAGE="https://github.com/ocsigen/reactiveData;
+SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+   dev-ml/react:="
+DEPEND="${RDEPEND}
+   dev-ml/findlib
+   dev-ml/opam
+"
+
+src_compile() {
+   ocaml pkg/build.ml \
+   native=$(usex ocamlopt true false) \
+   native-dynlink=$(usex ocamlopt true false) \
+   || die
+}
+
+src_install() {
+   opam-installer \
+   --prefix="${ED}/usr" \
+   --libdir="${D}/$(ocamlc -where)" \
+   --docdir="${ED}/usr/share/doc/${PF}" \
+   || die
+   dodoc README.md
+}



[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/

2016-01-30 Thread Alexis Ballier
commit: 0cc8927af4397ecde0215fb4b37cb7108f594ca3
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:29:36 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc8927a

dev-ml/ppx_tools: bump to 0.99.3.
This version comes from a fork but opam (official ocaml PM) uses this, and 
eliom needs it.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/ppx_tools/Manifest|  1 +
 dev-ml/ppx_tools/ppx_tools-0.99.3.ebuild | 33 
 2 files changed, 34 insertions(+)

diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 0181b80..96063a1 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1 +1,2 @@
 DIST ppx_tools_0.99.2.tar.gz 15877 SHA256 
98128022ea0574d769a263eb9b73be06200eec4bac9adb8dc44df289a77c4dec SHA512 
1ed8b3a670e233e77988d10c777003384c86c124b8b7e4cec41c0a3e0de280f818b7cbbddc59c49644517899ce0ef022407db6d4aaf29c559abc0788dce11594
 WHIRLPOOL 
f04ecf57ab457ce2ea58b93a50215f49f257597ce4176a4cd3fe8ffb230ab1a898a479d2bbab3df2675b71f7123c556d3a7cd84e8b2263389ea02f3990585924
+DIST ppx_tools_0.99.3.tar.gz 16258 SHA256 
79a9430086231e0a5a863f2aaebf3fb32f1ff0c25ab8cdfd11f53b4ce4550787 SHA512 
2b6e4e1168951b5501e930e3de294611ed0652162b8e6a3e5b72d27d602ea4b3cf07bb96dc524347553c30be6d3a7ab5b28ef4d5d69e4de6f6c6e5359e37c32d
 WHIRLPOOL 
0b38432072b25e4c6dafadd5aeac4e19680095c83c2be121f837caeeec8801aa077515e97b94e4c647f05640139d26b4cbfd69e796ba0027ce38009590b04a80

diff --git a/dev-ml/ppx_tools/ppx_tools-0.99.3.ebuild 
b/dev-ml/ppx_tools/ppx_tools-0.99.3.ebuild
new file mode 100644
index 000..f31fbe7
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-0.99.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools;
+# This is the version used by opam.
+# Needed by eliom-5[ppx]
+SRC_URI="http://github.com/diml/ppx_tools/archive/${PN}_${PV}.tar.gz;
+#SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${PN}_${PV}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.02:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${PN}_${PV}"
+
+src_compile() {
+   emake -j1
+}
+
+src_install() {
+   findlib_src_install
+   dodoc README.md
+}



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

2016-01-30 Thread Tobias Klausmann
commit: df3877020c25ef35b91440787619adf691740185
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Jan 30 16:55:11 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Jan 30 16:55:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df387702

media-libs/imlib2: add alpha keyword

Gentoo-Bug: 572884

Package-Manager: portage-2.2.27

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

diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild 
b/media-libs/imlib2/imlib2-1.4.7.ebuild
index 9cf9944..4c5ad61 100644
--- a/media-libs/imlib2/imlib2-1.4.7.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.7.ebuild
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs multilib-minimal eutils
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like 
libXpm"
 HOMEPAGE="https://www.enlightenment.org/;
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
 



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

2016-01-30 Thread Alexis Ballier
commit: 7f2f9091361c05a5f39c2904b21354008fb220fe
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 15:56:44 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 15:56:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2f9091

media-sound/qtractor: bump to 0.7.4

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 media-sound/qtractor/Manifest  |  1 +
 media-sound/qtractor/qtractor-0.7.4.ebuild | 77 ++
 2 files changed, 78 insertions(+)

diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index ac0f669..6f2cbbc 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -2,3 +2,4 @@ DIST qtractor-0.7.0.tar.gz 1447905 SHA256 
5cda28d210e0301dfd1c426b015c0568dab29b
 DIST qtractor-0.7.1.tar.gz 1438633 SHA256 
d0425f7d48f0032fd6ae4fc4b3d8f97d3dd21d08653fb4e26be5c8471da1cd89 SHA512 
fa2210426388d0efdf920f591ad776c582867e9a556efaad3a03b575cd1f5702b686d347ad6a3991db07fcd7142b227d4b812095d91e280a01dc3f8dddfc8ede
 WHIRLPOOL 
af69a1e4c77a58961b63d431fa09eff8a7a5082dd35b8887f173c462e967b4be0843e203d4ca1cc9df9b869fbe3695e3f2187bc052dcbdc3ba7b39669a1f7bd5
 DIST qtractor-0.7.2.tar.gz 1452910 SHA256 
829494f4def9b8579b52ba1d791ef47e3bb2cfcbadda87e0779861db806217c7 SHA512 
3af60cb88f4ce6105dde4a201d0cbb43e694a7e64ecf0558bfa7cd1fa2315e9d12d148524b13f5883e70e10c8eb6b16a3893305546927d9e28fffe43a0e99a08
 WHIRLPOOL 
1a1ef9224f23892d9e309d29fee71143b2a26bec219c5c2fabd1a6e8afe5597ee1330b257be7164fa4c4e9c322daab08efcc1a9e78add7d25d607d4bf7550dce
 DIST qtractor-0.7.3.tar.gz 1457471 SHA256 
872eca726c28e10c264ab75ad6eeb370323adf7ecb7f8bca04137b5f4f12c4ef SHA512 
0035633183572e69253fa8f6f80b0030a5f0a1479584e2649d96f97a63125ebd959a3745902c7a3491ac8d1a19cc12df8fa6982077799a39aae4aa072d55f4ad
 WHIRLPOOL 
f10e43588cc7a3ecc0ba3ab60ef913139554a68ae62461587759b35b99ecd97e2720d0b24913339c0ec5333f8cf707c2b9af48c0ead90394ef713d6a64fe0610
+DIST qtractor-0.7.4.tar.gz 1460881 SHA256 
fae9a5f97fa8d73752536c99b3f6ffb81f03cb19d21e64947c18dba91fa74dda SHA512 
6f9937d1b22f73996e7813112d2968903a86ef33ea069fb38c2fa93870f6eac0667ffd5e97a57e1fbbed9febe63ead4117e4d292c17dbf48bcccd153453e33ef
 WHIRLPOOL 
85d1fdbb821343f17367ddd502ada406b763a99e1d964f4d262c4046ba968aef2d0b03ca8eb65ca70419cbecf5cb2512dc671d26281de674300fd52de8f00d49

diff --git a/media-sound/qtractor/qtractor-0.7.4.ebuild 
b/media-sound/qtractor/qtractor-0.7.4.ebuild
new file mode 100644
index 000..d2f69ae
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.7.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils flag-o-matic eutils
+
+DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
+HOMEPAGE="http://qtractor.sourceforge.net/;
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis 
cpu_flags_x86_sse zlib"
+
+RDEPEND="
+   !qt5? (
+   >=dev-qt/qtcore-4.2:4
+   >=dev-qt/qtgui-4.7:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   dev-qt/qtx11extras:5
+   )
+   media-libs/alsa-lib
+   media-libs/libsndfile
+   media-sound/jack-audio-connection-kit
+   media-libs/ladspa-sdk
+   >=media-libs/lilv-0.16.0
+   media-libs/lv2
+   media-libs/suil
+   dssi? ( media-libs/dssi )
+   mad? ( media-libs/libmad )
+   libsamplerate? ( media-libs/libsamplerate )
+   osc? ( media-libs/liblo )
+   rubberband? ( media-libs/rubberband )
+   vorbis? ( media-libs/libvorbis )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_configure() {
+   econf \
+   $(use_enable mad libmad) \
+   $(use_enable libsamplerate) \
+   $(use_enable vorbis libvorbis) \
+   $(use_enable osc liblo) \
+   --enable-ladspa \
+   $(use_enable dssi) \
+   --enable-lilv \
+   $(use_enable qt5) \
+   $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+   $(use_enable rubberband librubberband) \
+   $(use_enable cpu_flags_x86_sse sse) \
+   $(use_enable zlib libz) \
+   $(use_enable debug)
+
+   if use qt5 ; then
+   eqmake5 ${PN}.pro -o ${PN}.mak
+   else
+   eqmake4 ${PN}.pro -o ${PN}.mak
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+   einstalldocs
+}



[gentoo-commits] repo/gentoo:master commit in: media-plugins/live/

2016-01-30 Thread Alexis Ballier
commit: 3484cc3527b14bdbbf301a54a2867fdb02596f9f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 15:53:21 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 15:56:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3484cc35

media-plugins/live: bump to 2016.01.29

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 media-plugins/live/Manifest   |   1 +
 media-plugins/live/live-2016.01.29.ebuild | 129 ++
 2 files changed, 130 insertions(+)

diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 75d0214..71b3453 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -9,3 +9,4 @@ DIST live.2015.12.22.tar.gz 5644431 SHA256 
d0a8a0d13b79a8e34057d4c5c0a65572c2eba
 DIST live.2016.01.16.tar.gz 630314 SHA256 
980f67cbf353e36275a4019277926f66b8d3d34c87f3a036706130760d4c4415 SHA512 
160c1e43e783ec9de70eaf925ea8b26c9deaa72061b3ed89987418f6fd6c0600a98caeff192d7b1b8c165c60d1f21eb5a784f282a35b8ad7a5a9b6f10f29fb6e
 WHIRLPOOL 
27e01f1f9088070651cd56417236f03cbaf3d9134b618ba46d6c184eec196f59ea0edcdf0534c732c2fe56acd3d493157615540aeb2c417990d9258fa4497314
 DIST live.2016.01.20.tar.gz 630353 SHA256 
ab12dc388c750cee2d275dd4dd767448e2375178a77f4576f5fbd994befdcad4 SHA512 
129a74745ccde26b5e929057e259c0ff549e2e42129c37d411c98f5fd97736e8385e09612ae9aedda32fc78fe29a9d49d69c0fa771cc0dc81fd764e2b153c60a
 WHIRLPOOL 
c89819d8b1fa1fb1984624afe91e391ba16764f2b193ee1fd7ddfd55856f1d374a468e35d287d15c2373b235093a8d512820c5866df1cbbc47e4ce38977b964c
 DIST live.2016.01.24.tar.gz 630466 SHA256 
12c41a5d689b695f86a6323ce54a85f97036996e976df4a3fd93adcb62948c77 SHA512 
f641a6b5a55c8327bd817cc0d4a9e8ce22fea8dbba48fd80b89d889cf84071962b2856a28d6f6a42b11db8157001f5c976fbe4bc607f7d023aa2701c151bc397
 WHIRLPOOL 
a7e88df885e4031aab047ad7da832a112f6707757ea9e5e343d65277141a5988dcd39ef901ff4b9f05e0962f970048e92ac5052ab613399c53356e27138d787f
+DIST live.2016.01.29.tar.gz 630541 SHA256 
44243a962adae64703c00264dd2333cfee15d7edbd79de4e5b47fd486df9ecd1 SHA512 
3cac45d1649f5752a521b6252d7939c4dce4f9b16a37956c44aa1b6c8f76cb133180bc4b753ac3a3861e51b3ef64269050849053bbe6d5883ff03045cc42a71d
 WHIRLPOOL 
40e7a05f2cc2abb5492206d8aa40b7170215a8f5223abff46ee2f9eb059f2b4078aee729f59af288be2bcff4ce6849cbd0a25d6977a63040789c1e6e29bc57f8

diff --git a/media-plugins/live/live-2016.01.29.ebuild 
b/media-plugins/live/live-2016.01.29.ebuild
new file mode 100644
index 000..a787b31
--- /dev/null
+++ b/media-plugins/live/live-2016.01.29.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/;
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+   mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier 
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+   unpack ${A}
+   mkdir -p "${S}"
+   mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+   if use static-libs ; then
+   cp -pPR live live-shared
+   mv live live-static
+   else
+   mv live live-shared
+   fi
+
+   use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+   cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+   case ${CHOST} in
+   *-solaris*)
+   use static-libs && { sed -i \
+   -e '/^COMPILE_OPTS /s/$/ -DSOLARIS 
-DXLOCALE_NOT_USED/' \
+   -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ 
-lsocket -lnsl/' \
+   live-static/config.gentoo \
+   || die ; }
+   sed -i \
+   -e '/^COMPILE_OPTS /s/$/ -DSOLARIS 
-DXLOCALE_NOT_USED/' \
+   -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ 
-lsocket -lnsl/' \
+   live-shared/config.gentoo-so-r1 \
+   || die
+   ;;
+   *-darwin*)
+   use static-libs && { sed -i \
+   -e '/^COMPILE_OPTS /s/$/ -DBSD=1 
-DHAVE_SOCKADDR_LEN=1/' \
+   -e '/^LINK /s/$/ /' \
+

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

2016-01-30 Thread Alexis Ballier
commit: 9a13cdb680b4b3762ac952ba885cf74a3e7bd877
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 15:55:13 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 15:56:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a13cdb6

media-libs/zimg: bump to 2.0.4

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 media-libs/zimg/Manifest  |  1 +
 media-libs/zimg/zimg-2.0.4.ebuild | 37 +
 2 files changed, 38 insertions(+)

diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index f4bb303..98cbb0e 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,3 +1,4 @@
 DIST zimg-2.0.1.tar.gz 174318 SHA256 
be2557bf944dad07edbaf37d3fd5f1911627294b8d0992a8530048e84df082d8 SHA512 
213952b2e51fad2f92d989104be188ff6cdc71b0910a1201a5f772e45b1fa90f522a62e85d8725037560e4505f40958a5497d731f3d03f7b890bfdaa5d0ae13c
 WHIRLPOOL 
4918e22cc76a613a1641aba55f5f2d652186ef84a5719d250dfb499d0c8be8c7dd688dcf95d18e93f152479fad4a8543addf5c9a149fc030f354a090e741bcbb
 DIST zimg-2.0.2.tar.gz 174415 SHA256 
b9c7bac9e6ad53dfa94215c28440167d72d41109df10278673789f8e531f2142 SHA512 
f638e19d898c2c60009447d26e7098c1ec2aeac1d71234c17fa32e9d14a8506b549dae68c994b6be88938355bcf4e0f1f4efd5db7273ff15fa776260c978c123
 WHIRLPOOL 
859b7bcde2d6d3672312c8202df89e9c6c0aea2037e2c5179261ea39c6f321c8c872e7e1605bb225b97d3f1ef1942cba32ab96433c96816eee67f78e90b9fe5b
 DIST zimg-2.0.3.tar.gz 17 SHA256 
521b109348d4570e5b9a313b8549caaf882062740f4a20acd036d033149ae125 SHA512 
2029bb55345344195364d08d97c2f830be5034926c2506caba7b05493ce4f3053b3c7086b2cf860d5839a87fac18582dde07c089ba4792a002b980fe7829c29e
 WHIRLPOOL 
04062ce2919900c69e878afb4bc8f3a64cbf0c9f1293d0cf8c4bafc4ffe39ee5a00d1047543e8621a1a557d334ec7c160cbebe54946c604be5fac607fa2c23c3
+DIST zimg-2.0.4.tar.gz 174469 SHA256 
e3b1f5b9f8ce750f96b9bc9801ff5d6aa931d35300d67711826e397df43c5245 SHA512 
2184df60fc870d901e2c039c4a944edae2a9153d879da1d89fbc59ea8af6830922347accd3b1aae85d6efaebc59bdb7e2c4f3cab1e554b85cb42abb3c83235ea
 WHIRLPOOL 
6692a06866aef78631e61edbdd0f794950ae177fe051f2c48a5a00f66879ea276238435f4d3b1dcbfad23eb19473f3fafb3d8a7b858cdb8336e1afc00d2d5bc9

diff --git a/media-libs/zimg/zimg-2.0.4.ebuild 
b/media-libs/zimg/zimg-2.0.4.ebuild
new file mode 100644
index 000..73b4cb9
--- /dev/null
+++ b/media-libs/zimg/zimg-2.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+
+SCM=""
+
+if [ "${PV#}" != "${PV}" ] ; then
+   SCM="git-r3"
+   EGIT_REPO_URI="https://github.com/sekrit-twc/zimg;
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg;
+
+if [ "${PV#}" = "${PV}" ] ; then
+   
SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   autotools-multilib_src_configure \
+   $(use_enable cpu_flags_x86_sse x86simd)
+}



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

2016-01-30 Thread Pacho Ramos
commit: a62079ddda10039b692df7a77fb4ec572027b2e5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jan 30 16:15:40 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jan 30 16:15:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62079dd

net-libs/webkit-gtk: Version bump

Package-Manager: portage-2.2.27

 net-libs/webkit-gtk/Manifest |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild | 263 +++
 2 files changed, 264 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 66b4911..c0570d3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 
dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 
1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039
 WHIRLPOOL 
60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744
+DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 
990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 
f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b
 WHIRLPOOL 
7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 
afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 
5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98
 WHIRLPOOL 
26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 
3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 
b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb
 WHIRLPOOL 
1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
new file mode 100644
index 000..749979f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils 
python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/;
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz;
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd 
~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer 
+introspection +jit nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+REQUIRED_USE="
+   geoloc? ( introspection )
+   gles2? ( egl )
+   introspection? ( gstreamer )
+   nsplugin? ( X )
+   webgl? ( ^^ ( gles2 opengl ) )
+   !webgl? ( ?? ( gles2 opengl ) )
+   || ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+   dev-db/sqlite:3=
+   >=dev-libs/glib-2.36:2
+   >=dev-libs/icu-3.8.1-r1:=
+   >=dev-libs/libxml2-2.8:2
+   >=dev-libs/libxslt-1.1.7
+   >=media-libs/fontconfig-2.8:1.0
+   >=media-libs/freetype-2.4.2:2
+   >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+   >=media-libs/libpng-1.4:0=
+   media-libs/libwebp:=
+   >=net-libs/gnutls-3
+   >=net-libs/libsoup-2.42:2.4[introspection?]
+   virtual/jpeg:0=
+   >=x11-libs/cairo-1.10.2:=
+   >=x11-libs/gtk+-3.14:3[introspection?]
+   x11-libs/libnotify
+   >=x11-libs/pango-1.30.0
+
+   aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+   egl? ( media-libs/mesa[egl] )
+   geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+   gles2? ( media-libs/mesa[gles2] )
+   gnome-keyring? ( app-crypt/libsecret )
+   gstreamer? (
+   >=media-libs/gstreamer-1.2:1.0
+   >=media-libs/gst-plugins-base-1.2:1.0
+   >=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+   introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+   

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

2016-01-30 Thread Ian Delaney
commit: 2cd49f7b13c5eb393428bc32f9f615ffafa99821
Author: Louis Sautier  gmail  com>
AuthorDate: Fri Jan 29 14:57:15 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Jan 30 16:14:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd49f7b

dev-python/pyenchant: add support for Python 3.5

Package-Manager: portage-2.2.27

 dev-python/pyenchant/pyenchant-1.6.6.ebuild | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild 
b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index aee6148..9d92fa2 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 
 inherit distutils-r1
 
@@ -15,12 +15,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
+IUSE="test"
 
-DEPEND="
-   >=app-text/enchant-${PV%.*}
-   dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=app-text/enchant-${PV%.*}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   test? ( ${RDEPEND} )"
 
 python_test() {
if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then



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

2016-01-30 Thread Ian Delaney
commit: 728ab577c5f533cbd9fe65585e35b28c896189bf
Author: Ian Delaney  gentoo  org>
AuthorDate: Sat Jan 30 16:18:13 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Jan 30 16:20:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728ab577

Merge remote-tracking branch 'remotes/sbraz/pyenchant'

Pull request: https://github.com/gentoo/gentoo/pull/742

 dev-python/pyenchant/pyenchant-1.6.6.ebuild | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

2016-01-30 Thread Jason Zaman
commit: cc11d23a2c1a1e9d0686cfefc357334e2b05
Author: Nicolas Iooss  m4x  org>
AuthorDate: Mon Jan 18 23:46:04 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 16:43:36 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=cc11d23a

Fix typos in several interfaces

This aims to make every interface description unique.

 policy/modules/contrib/amanda.if| 2 +-
 policy/modules/contrib/ntp.if   | 2 +-
 policy/modules/contrib/shorewall.if | 3 ++-
 policy/modules/contrib/virt.if  | 5 ++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/policy/modules/contrib/amanda.if b/policy/modules/contrib/amanda.if
index ea4cdc7..1de1788 100644
--- a/policy/modules/contrib/amanda.if
+++ b/policy/modules/contrib/amanda.if
@@ -105,7 +105,7 @@ interface(`amanda_rw_dumpdates_files',`
 
 
 ## 
-## Search Amanda library directories.
+## Manage Amanda library directories.
 ## 
 ## 
 ## 

diff --git a/policy/modules/contrib/ntp.if b/policy/modules/contrib/ntp.if
index a0f1691..192e342 100644
--- a/policy/modules/contrib/ntp.if
+++ b/policy/modules/contrib/ntp.if
@@ -63,7 +63,7 @@ interface(`ntp_run',`
 
 
 ## 
-## Execute ntp server in the ntpd domain.
+## Execute ntpdate server in the ntpd domain.
 ## 
 ## 
 ## 

diff --git a/policy/modules/contrib/shorewall.if 
b/policy/modules/contrib/shorewall.if
index 7bd4593..108ce75 100644
--- a/policy/modules/contrib/shorewall.if
+++ b/policy/modules/contrib/shorewall.if
@@ -21,7 +21,8 @@ interface(`shorewall_domtrans',`
 
 ##
 ## 
-## Execute a domain transition to run shorewall.
+## Execute a domain transition to run shorewall
+## using executables from /var/lib.
 ## 
 ## 
 ## 

diff --git a/policy/modules/contrib/virt.if b/policy/modules/contrib/virt.if
index 5b57d50..8016ccc 100644
--- a/policy/modules/contrib/virt.if
+++ b/policy/modules/contrib/virt.if
@@ -194,7 +194,7 @@ interface(`virt_domtrans_bridgehelper',`
 
 ## 
 ## Execute a domain transition to
-## run virt bridgehelper.
+## run virt leaseshelper.
 ## 
 ## 
 ## 
@@ -439,8 +439,7 @@ interface(`virt_manage_config',`
 
 
 ## 
-## Create, read, write, and delete
-## virt image files.
+## Read virt content.
 ## 
 ## 
 ## 



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/, policy/modules/admin/, policy/modules/system/

2016-01-30 Thread Jason Zaman
commit: 0a8aa1bfe479e36ab9fa014dbec5b3c59b0b
Author: Nicolas Iooss  m4x  org>
AuthorDate: Mon Jan 18 23:01:10 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 17:16:57 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=0a8aa1bf

Fix interface descriptions when duplicate ones are found

Distinct interfaces should have different comments

 policy/modules/admin/bootloader.if  |  4 ++--
 policy/modules/kernel/corecommands.if   |  4 ++--
 policy/modules/kernel/corenetwork.if.in |  6 +++---
 policy/modules/kernel/devices.if|  4 ++--
 policy/modules/kernel/domain.if |  2 +-
 policy/modules/kernel/files.if  |  2 +-
 policy/modules/kernel/filesystem.if |  9 +
 policy/modules/kernel/kernel.if |  2 +-
 policy/modules/kernel/storage.if|  4 ++--
 policy/modules/system/iptables.if   |  3 ++-
 policy/modules/system/locallogin.if |  2 +-
 policy/modules/system/miscfiles.if  |  3 ++-
 policy/modules/system/modutils.if   |  2 +-
 policy/modules/system/selinuxutil.if|  2 +-
 policy/modules/system/userdomain.if | 13 +++--
 15 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/policy/modules/admin/bootloader.if 
b/policy/modules/admin/bootloader.if
index cc8df9d..185f749 100644
--- a/policy/modules/admin/bootloader.if
+++ b/policy/modules/admin/bootloader.if
@@ -124,8 +124,8 @@ interface(`bootloader_rw_tmp_files',`
 
 
 ## 
-## Read and write the bootloader
-## temporary data in /tmp.
+## Create, read and write the bootloader
+## runtime data.
 ## 
 ## 
 ## 

diff --git a/policy/modules/kernel/corecommands.if 
b/policy/modules/kernel/corecommands.if
index 917b160..60c1feb 100644
--- a/policy/modules/kernel/corecommands.if
+++ b/policy/modules/kernel/corecommands.if
@@ -199,11 +199,11 @@ interface(`corecmd_getattr_bin_files',`
 
 
 ## 
-## Get the attributes of files in bin directories.
+## Do not audit attempts to get the attributes of files in bin directories.
 ## 
 ## 
 ## 
-## Domain allowed access.
+## Domain to not audit.
 ## 
 ## 
 #

diff --git a/policy/modules/kernel/corenetwork.if.in 
b/policy/modules/kernel/corenetwork.if.in
index 6e0bb9f..4babd24 100644
--- a/policy/modules/kernel/corenetwork.if.in
+++ b/policy/modules/kernel/corenetwork.if.in
@@ -2753,12 +2753,12 @@ interface(`corenet_all_recvfrom_labeled',`
 
 
 ## 
-## Make the specified type usable
-## for labeled ipsec.
+## Allow specified type to set the context of
+## a SPD entry for labeled ipsec associations.
 ## 
 ## 
 ## 
-## Type to be used for labeled ipsec.
+## Domain allowed access.
 ## 
 ## 
 #

diff --git a/policy/modules/kernel/devices.if b/policy/modules/kernel/devices.if
index 591b932..9615efd 100644
--- a/policy/modules/kernel/devices.if
+++ b/policy/modules/kernel/devices.if
@@ -227,7 +227,7 @@ interface(`dev_add_entry_generic_dirs',`
 
 
 ## 
-## Add entries to directories in /dev.
+## Remove entries from directories in /dev.
 ## 
 ## 
 ## 
@@ -2023,7 +2023,7 @@ interface(`dev_read_input',`
 
 
 ## 
-## Read input event devices (/dev/input).
+## Read and write input event devices (/dev/input).
 ## 
 ## 
 ## 

diff --git a/policy/modules/kernel/domain.if b/policy/modules/kernel/domain.if
index 3420b3a..92cc408 100644
--- a/policy/modules/kernel/domain.if
+++ b/policy/modules/kernel/domain.if
@@ -1155,7 +1155,7 @@ interface(`domain_getattr_all_stream_sockets',`
 
 ## 
 ## Do not audit attempts to get the attributes
-## of all domains unix datagram sockets.
+## of all domains unix stream sockets.
 ## 
 ## 
 ## 

diff --git a/policy/modules/kernel/files.if b/policy/modules/kernel/files.if
index 20acc0e..dc13e31 100644
--- a/policy/modules/kernel/files.if
+++ b/policy/modules/kernel/files.if
@@ -1317,7 +1317,7 @@ interface(`files_relabelto_all_file_type_fs',`
 
 
 ## 
-## Relabel a filesystem to the type of a file.
+## Relabel a filesystem to and from the type of a file.
 ## 
 ## 
 ## 

diff --git a/policy/modules/kernel/filesystem.if 
b/policy/modules/kernel/filesystem.if
index b9b30da..c5a1ad1 100644
--- a/policy/modules/kernel/filesystem.if
+++ b/policy/modules/kernel/filesystem.if
@@ -1399,7 +1399,7 @@ interface(`fs_read_cifs_named_pipes',`
 
 
 ## 
-## Read named pipes
+## Read named sockets
 ## on a CIFS or SMB network filesystem.
 ## 
 ## 
@@ -2360,8 +2360,8 @@ interface(`fs_getattr_iso9660_fs',`
 
 
 ## 
-## Read files on an iso9660 filesystem, which
-## is usually used 

[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/

2016-01-30 Thread Jason Zaman
commit: 482a3e8b03cf77c4b3113a5d340aece78da232c0
Author: Chris PeBenito  tresys  com>
AuthorDate: Wed Jan  6 14:09:36 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 17:16:56 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=482a3e8b

Add neverallow for mac_override capability. It is not used by SELinux.

 policy/modules/kernel/domain.te | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/policy/modules/kernel/domain.te b/policy/modules/kernel/domain.te
index dfcf4a7..fa24e36 100644
--- a/policy/modules/kernel/domain.te
+++ b/policy/modules/kernel/domain.te
@@ -1,4 +1,4 @@
-policy_module(domain, 1.13.0)
+policy_module(domain, 1.13.1)
 
 
 #
@@ -35,6 +35,9 @@ attribute set_curr_context;
 # dynamic transition, you should not be using it!!!
 neverallow { domain -set_curr_context } self:process setcurrent;
 
+# No domain needs mac_override as it is unused by SELinux.
+neverallow domain self:capability2 mac_override;
+
 # entrypoint executables
 attribute entry_type;
 



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/

2016-01-30 Thread Jason Zaman
commit: a805901283fe872c7236336867701f1834274307
Author: Laurent Bigonville  bigon  be>
AuthorDate: Mon Dec 14 21:19:24 2015 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 16:45:01 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=a8059012

Give some systemd domain access to /proc/sys/kernel/random/boot_id

 policy/modules/system/systemd.te | 8 
 1 file changed, 8 insertions(+)

diff --git a/policy/modules/system/systemd.te b/policy/modules/system/systemd.te
index 1f70a93..2376af3 100644
--- a/policy/modules/system/systemd.te
+++ b/policy/modules/system/systemd.te
@@ -129,6 +129,8 @@ kernel_dgram_send(systemd_cgroups_t)
 # locale local policy
 #
 
+kernel_read_kernel_sysctls(systemd_locale_t)
+
 files_read_etc_files(systemd_locale_t)
 
 logging_send_syslog_msg(systemd_locale_t)
@@ -145,6 +147,8 @@ optional_policy(`
 # Hostnamed policy
 #
 
+kernel_read_kernel_sysctls(systemd_hostnamed_t)
+
 files_read_etc_files(systemd_hostnamed_t)
 
 logging_send_syslog_msg(systemd_hostnamed_t)
@@ -174,6 +178,8 @@ manage_fifo_files_pattern(systemd_logind_t, 
systemd_logind_var_run_t, systemd_lo
 manage_files_pattern(systemd_logind_t, systemd_logind_var_run_t, 
systemd_logind_var_run_t)
 files_search_pids(systemd_logind_t)
 
+kernel_read_kernel_sysctls(systemd_logind_t)
+
 auth_manage_faillog(systemd_logind_t)
 
 dev_rw_sysfs(systemd_logind_t)
@@ -236,6 +242,8 @@ logging_send_syslog_msg(systemd_sessions_t)
 allow systemd_tmpfiles_t self:capability  { fowner chown fsetid dac_override 
mknod };
 allow systemd_tmpfiles_t self:process { setfscreate getcap };
 
+kernel_read_kernel_sysctls(systemd_tmpfiles_t)
+
 dev_relabel_all_sysfs(systemd_tmpfiles_t)
 dev_read_urand(systemd_tmpfiles_t)
 dev_manage_all_dev_nodes(systemd_tmpfiles_t)



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, policy/modules/kernel/

2016-01-30 Thread Jason Zaman
commit: 17d97f0a9bb787b5feb0fa8aaf23a87bfdc79d00
Author: Nicolas Iooss  m4x  org>
AuthorDate: Sun Dec 20 15:28:49 2015 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 17:16:56 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=17d97f0a

Label OpenSSH files correctly on Arch Linux

On Arch Linux, OpenSSH installs these binary files in /usr/lib/ssh:

* sftp-server (labeled with ssh_keysign_exec_t type in refpolicy)
* ssh-askpass (symlink to x11-ssh-askpass)
* ssh-keysign
* ssh-pkcs11-helper
* x11-ssh-askpass (from x11-ssh-askpass package)

Label all these files but sftp-server as bin_t.

 policy/modules/kernel/corecommands.fc | 1 +
 policy/modules/services/ssh.fc| 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/policy/modules/kernel/corecommands.fc 
b/policy/modules/kernel/corecommands.fc
index 8f12446..beb3ad8 100644
--- a/policy/modules/kernel/corecommands.fc
+++ b/policy/modules/kernel/corecommands.fc
@@ -240,6 +240,7 @@ ifdef(`distro_gentoo',`
 /usr/lib/rpm/rpmq  --  gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/rpm/rpmv  --  gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/sftp-server   --  gen_context(system_u:object_r:bin_t,s0)
+/usr/lib/ssh(/.*)? gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/sudo/sesh --  
gen_context(system_u:object_r:shell_exec_t,s0)
 /usr/lib/systemd/systemd.* --  gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/systemd/system-generators(/.*)? 
gen_context(system_u:object_r:bin_t,s0)

diff --git a/policy/modules/services/ssh.fc b/policy/modules/services/ssh.fc
index 8168244..fd6c218 100644
--- a/policy/modules/services/ssh.fc
+++ b/policy/modules/services/ssh.fc
@@ -7,7 +7,8 @@ HOME_DIR/\.ssh(/.*)?
gen_context(system_u:object_r:ssh_home_t,s0)
 /usr/bin/ssh-agent --  
gen_context(system_u:object_r:ssh_agent_exec_t,s0)
 /usr/bin/ssh-keygen--  
gen_context(system_u:object_r:ssh_keygen_exec_t,s0)
 
-/usr/lib/openssh/ssh-keysign-- 
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
+/usr/lib/openssh/ssh-keysign   --  
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
+/usr/lib/ssh/ssh-keysign   --  
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
 
 /usr/libexec/openssh/ssh-keysign --
gen_context(system_u:object_r:ssh_keysign_exec_t,s0)
 



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/, policy/modules/kernel/

2016-01-30 Thread Jason Zaman
commit: 328fabd9384f9ae1ade19b5186e6174901c3
Author: Chris PeBenito  tresys  com>
AuthorDate: Wed Jan  6 14:22:11 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan 30 17:16:56 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=328fabd9

Module version bump for syslog and systemd changes from Laurent Bigonville

 policy/modules/kernel/corecommands.te | 2 +-
 policy/modules/system/logging.te  | 2 +-
 policy/modules/system/systemd.te  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/policy/modules/kernel/corecommands.te 
b/policy/modules/kernel/corecommands.te
index f8cd213..f2cb295 100644
--- a/policy/modules/kernel/corecommands.te
+++ b/policy/modules/kernel/corecommands.te
@@ -1,4 +1,4 @@
-policy_module(corecommands, 1.21.1)
+policy_module(corecommands, 1.21.2)
 
 
 #

diff --git a/policy/modules/system/logging.te b/policy/modules/system/logging.te
index f2e4984..79f8084 100644
--- a/policy/modules/system/logging.te
+++ b/policy/modules/system/logging.te
@@ -1,4 +1,4 @@
-policy_module(logging, 1.23.0)
+policy_module(logging, 1.23.1)
 
 
 #

diff --git a/policy/modules/system/systemd.te b/policy/modules/system/systemd.te
index 2376af3..8892447 100644
--- a/policy/modules/system/systemd.te
+++ b/policy/modules/system/systemd.te
@@ -1,4 +1,4 @@
-policy_module(systemd, 1.1.1)
+policy_module(systemd, 1.1.2)
 
 #
 #



  1   2   3   >