[gentoo-commits] repo/gentoo:master commit in: dev-util/a8/, dev-util/a8/files/
commit: efa3fbf6cba3aa901f4f72e5a09c376fe5f1f06a Author: Julian Ospald gentoo org> AuthorDate: Sat Sep 19 23:46:40 2015 + Commit: Julian Ospald gentoo org> CommitDate: Sat Sep 19 23:47:18 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa3fbf6 dev-util/a8: version bump to 1.0 dev-util/a8/Manifest| 1 + dev-util/a8/a8-1.0.ebuild | 49 + dev-util/a8/files/a8-1.0-argparse.patch | 13 + 3 files changed, 63 insertions(+) diff --git a/dev-util/a8/Manifest b/dev-util/a8/Manifest index 723d59d..4e10d1f 100644 --- a/dev-util/a8/Manifest +++ b/dev-util/a8/Manifest @@ -1 +1,2 @@ DIST a8-0.11.tar.gz 39435 SHA256 0ef94e70f0b97de0ecfdd7297f70435b52efbdf3a04e0b8ba1927d3535cca7f2 SHA512 253aa8161a195d4dd1d1fb392338478c179b5878e672d94baffa99a5e7e42f1deeb6d1dc8bbc9f3991411ca231d054a71ab96be1aae7925a22347d478832e0a2 WHIRLPOOL f64d61b6a59d03c2cd9e78f57c01842ea0b7e2c3542aa533cdf7c15d6c9e41750d4581ca5d7348beb311754e273e168275e36d80daca00ca58e999559f3ef348 +DIST a8-1.0.tar.gz 45677 SHA256 7a843a2a3c9ebd372ea7f746009f15b158dc64f72aa8c24fc6b69a5796dc7b7f SHA512 61abe87423ccfa1f3ec121fd1c29f25aa11d4c6a5d1b3e164f580aab59697a2dd24a456bb0fb80dd04f61ee283fa3abeb6e9de602b4f00aef5c82201b75fbd81 WHIRLPOOL 91f0c7f456c8ba664fe35483acbb6556194680ef2cb5bd807ce702b1ad08a782aff4acaf6d10fdc6e74f6b5b87b82bcdd694ff819bc13b8b1138f8c455fa diff --git a/dev-util/a8/a8-1.0.ebuild b/dev-util/a8/a8-1.0.ebuild new file mode 100644 index 000..f479756 --- /dev/null +++ b/dev-util/a8/a8-1.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 eutils gnome2-utils + +DESCRIPTION="An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and a file browser" +HOMEPAGE="https://github.com/aliafshar/a8; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=dev-python/dbus-python-1[${PYTHON_USEDEP}] + dev-python/logbook[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/pygtk-2.22[${PYTHON_USEDEP}] + >=dev-python/pygtkhelpers-0.4.3[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=x11-libs/vte-0.28.2-r206:0[python,${PYTHON_USEDEP}]" +RDEPEND="${DEPEND} + app-editors/gvim + app-editors/vim" + +PATCHES=( "${FILESDIR}"/${P}-argparse.patch ) + +python_install_all() { + distutils-r1_python_install_all + doicon -s 48 a8/data/icons/a8.png + make_desktop_entry ${PN} ${PN} ${PN} 'Development;IDE' +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/dev-util/a8/files/a8-1.0-argparse.patch b/dev-util/a8/files/a8-1.0-argparse.patch new file mode 100644 index 000..3357b18 --- /dev/null +++ b/dev-util/a8/files/a8-1.0-argparse.patch @@ -0,0 +1,13 @@ +https://code.google.com/p/abominade/issues/detail?id=26 +https://bugzilla.redhat.com/show_bug.cgi?id=700596 + +--- a8-0.11/setup.py a8-0.11/setup.py +@@ -19,7 +19,6 @@ + 'psutil', + 'logbook', + 'pygtkhelpers>=0.4.3', +-'argparse', + 'pyyaml', + ], + packages = [
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: f4714cbbb90bd40fcbcec933529a3b3936611af9 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 15:09:43 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:08 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f4714cbb repoman/main.py: Split LICENSE checks to checks/ebuild/variables/ pym/repoman/checks/ebuilds/variables/license.py | 47 + pym/repoman/main.py | 21 +++ 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/license.py b/pym/repoman/checks/ebuilds/variables/license.py new file mode 100644 index 000..bdc859c --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/license.py @@ -0,0 +1,47 @@ + +'''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/main.py b/pym/repoman/main.py index 7b36852..08d79eb 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -63,6 +63,7 @@ from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks +from repoman.checks.ebuilds.variables.license import LicenseChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -299,6 +300,7 @@ liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) descriptioncheck = DescriptionChecks(qatracker) +licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated) ## for xpkg in effective_scanlist: @@ -617,22 +619,9 @@ for xpkg in effective_scanlist: # license checks if not badlicsyntax: - # Parse the LICENSE variable, remove USE conditions and - # flatten it. - licenses = portage.dep.use_reduce(myaux["LICENSE"], matchall=1, flat=True) - # Check each entry to ensure that it exists in PORTDIR's - # license directory. - for lic in licenses: - # Need to check for "||" manually as no portage - # function will remove it without removing values. - if lic not in liclist and lic != "||": - qatracker.add_error( - "LICENSE.invalid", - xpkg + "/" + y_ebuild + ".ebuild: %s" % lic) - elif lic in liclist_deprecated: - qatracker.add_error( - "LICENSE.deprecated", -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: ea818918314a1480b380ad8905693290d8c69385 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:50:26 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:07 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ea818918 repoman/main.py: Split DESCRIPTION checks to checks/ebuild/variables/ .../checks/ebuilds/variables/description.py| 32 ++ pym/repoman/main.py| 13 - 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/description.py b/pym/repoman/checks/ebuilds/variables/description.py new file mode 100644 index 000..a2b1057 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/description.py @@ -0,0 +1,32 @@ + +'''description.py +Perform checks on the DESCRIPTION variable. +''' + +from repoman.qa_data import max_desc_len + + +class DescriptionChecks(object): + '''Perform checks on the DESCRIPTION variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + self._checkTooLong(pkg, ebuild) + + def _checkTooLong(self, pkg, ebuild): + # 14 is the length of DESCRIPTION="" + if len(pkg._metadata['DESCRIPTION']) > max_desc_len: + self.qatracker.add_error( + 'DESCRIPTION.toolong', + "%s: DESCRIPTION is %d characters (max %d)" % + (ebuild.relative_path, len( + pkg._metadata['DESCRIPTION']), max_desc_len)) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 42600cd..7b36852 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err @@ -68,7 +69,7 @@ from repoman.modules.commit import repochecks from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, - qawarnings, qacats, max_desc_len, missingvars, + qawarnings, qacats, missingvars, suspect_virtual, suspect_rdepend, valid_restrict) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata @@ -297,6 +298,7 @@ keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) +descriptioncheck = DescriptionChecks(qatracker) ## for xpkg in effective_scanlist: @@ -436,12 +438,9 @@ for xpkg in effective_scanlist: myqakey = var + ".virtual" qatracker.add_error(myqakey, ebuild.relative_path) - # 14 is the length of DESCRIPTION="" - if len(myaux['DESCRIPTION']) > max_desc_len: - qatracker.add_error( - 'DESCRIPTION.toolong', - "%s: DESCRIPTION is %d characters (max %d)" % - (ebuild.relative_path, len(myaux['DESCRIPTION']), max_desc_len)) + ### + descriptioncheck.check(pkg, ebuild) + ### keywords = myaux["KEYWORDS"].split()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: dfbca13b96e7dc73157030be3c1e8ae8ee6311b3 Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:25:34 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:30 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfbca13b repoman/actions.py: Split out thick_manifest() pym/repoman/actions.py | 101 + 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index af50c1b..974de62 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -146,55 +146,7 @@ class Actions(object): # committed in one big commit at the end. print() elif not self.repo_settings.repo_config.thin_manifest: - if self.vcs_settings.vcs == 'cvs': - headerstring = "'\$(Header|Id).*\$'" - elif self.vcs_settings.vcs == "svn": - svn_keywords = dict((k.lower(), k) for k in [ - "Rev", - "Revision", - "LastChangedRevision", - "Date", - "LastChangedDate", - "Author", - "LastChangedBy", - "URL", - "HeadURL", - "Id", - "Header", - ]) - - for myfile in myupdates: - - # for CVS, no_expansion contains files that are excluded from expansion - if self.vcs_settings.vcs == "cvs": - if myfile in no_expansion: - continue - - # for SVN, expansion contains files that are included in expansion - elif self.vcs_settings.vcs == "svn": - if myfile not in expansion: - continue - - # Subversion keywords are case-insensitive - # in svn:keywords properties, - # but case-sensitive in contents of files. - enabled_keywords = [] - for k in expansion[myfile]: - keyword = svn_keywords.get(k.lower()) - if keyword is not None: - enabled_keywords.append(keyword) - - headerstring = "'\$(%s).*\$'" % "|".join(enabled_keywords) - - myout = repoman_getstatusoutput( - "egrep -q %s %s" % (headerstring, portage._shell_quote(myfile))) - if myout[0] == 0: - myheaders.append(myfile) - - print("%s have headers that will change." % green(str(len(myheaders - print( - "* Files with headers will" - " cause the manifests to be changed and committed separately.") + self.thick_manifest(myupdates, myheaders, no_expansion, expansion) logging.info("myupdates: %s", myupdates) logging.info("myheaders: %s", myheaders) @@ -814,3 +766,54 @@ class Actions(object): except OSError: pass + + def thick_manifest(self, myupdates, myheaders, no_expansion, expansion): + if self.vcs_settings.vcs == 'cvs': + headerstring = "'\$(Header|Id).*\$'" + elif self.vcs_settings.vcs == "svn": + svn_keywords = dict((k.lower(), k) for k in [ + "Rev", + "Revision", + "LastChangedRevision", + "Date", + "LastChangedDate", + "Author", + "LastChangedBy", + "URL", + "HeadURL", + "Id", + "Header", + ]) + + for myfile in myupdates: + +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, bin/
commit: cd688c0561235873a125c3191d6872da47c67240 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 04:07:02 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:09 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cd688c05 repoman: Create repoman_main() Create an initial repoamn_main() Update bin/repoman script Clean up unused variables Move commitmessage from global scope to the function. Clean up some demarcation lines. Signed-off-by: Brian Dolbec gentoo.org> bin/repoman |5 +- pym/repoman/main.py | 2728 +-- 2 files changed, 1362 insertions(+), 1371 deletions(-) diff --git a/bin/repoman b/bin/repoman index 4e18b6c..05d842f 100755 --- a/bin/repoman +++ b/bin/repoman @@ -30,11 +30,10 @@ pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") sys.path.insert(0, pym_path) import portage portage._internal_caller = True -#from repoman.main import repoman_main +from repoman.main import repoman_main try: - #repoman_main(sys.argv[1:]) - from repoman import main + repoman_main(sys.argv[1:]) except IOError as e: if e.errno == errno.EACCES: print("\nRepoman: Need user access") diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 006afc9..e3d0472 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -88,8 +88,6 @@ if sys.hexversion >= 0x300: util.initialize_logger() -commitmessage = None - bad = create_color_func("BAD") live_eclasses = portage.const.LIVE_ECLASSES @@ -102,1487 +100,1481 @@ def sort_key(item): return item[2].sub_path -# Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to -# behave incrementally. -repoman_incrementals = tuple( - x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS') -config_root = os.environ.get("PORTAGE_CONFIGROOT") -repoman_settings = portage.config(config_root=config_root, local_config=False) - -if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ - repoman_settings.get('TERM') == 'dumb' or \ - not sys.stdout.isatty(): - nocolor() - -options, arguments = parse_args( - sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", "")) - -if options.version: - print("Portage", portage.VERSION) - sys.exit(0) - -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 -# commit (like if Manifest generation fails). -can_force = True +def repoman_main(argv): + # Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to + # behave incrementally. + repoman_incrementals = tuple( + x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS') + config_root = os.environ.get("PORTAGE_CONFIGROOT") + repoman_settings = portage.config(config_root=config_root, local_config=False) -portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings) -if portdir is None: - sys.exit(1) + if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ + repoman_settings.get('TERM') == 'dumb' or \ + not sys.stdout.isatty(): + nocolor() -myreporoot = os.path.basename(portdir_overlay) -myreporoot += mydir[len(portdir_overlay):] -## + options, arguments = parse_args( + sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", "")) -vcs_settings = VCSSettings(options, repoman_settings) + if options.version: + print("Portage", portage.VERSION) + sys.exit(0) + 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 + # commit (like if Manifest generation fails). + can_force = True -repo_settings = RepoSettings( - config_root, portdir, portdir_overlay, - repoman_settings, vcs_settings, options, qawarnings) - -repoman_settings = repo_settings.repoman_settings + portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings) + if portdir is None: + sys.exit(1) -portdb = repo_settings.portdb -## + myreporoot = os.path.basename(portdir_overlay) + myreporoot += mydir[len(portdir_overlay):] + + vcs_settings = VCSSettings(options, repoman_settings) + + repo_settings = RepoSettings( + config_root, portdir, portdir_overlay, +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 2f194c3aa5182694c1c94e9225a78bac9a54ebbd Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 02:07:27 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:29 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2f194c3a repoman/actions.py: Break out changes detectection into sudo vcs plugins pym/repoman/actions.py | 215 +++-- 1 file changed, 120 insertions(+), 95 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 611c0dd..1f70815 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -74,102 +74,9 @@ class Actions(object): self._vcs_deleted(mydeleted) - if self.vcs_settings.vcs == "cvs": - mycvstree = cvstree.getentries("./", recursive=1) - mychanged = cvstree.findchanged(mycvstree, recursive=1, basedir="./") - mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./") - myremoved = portage.cvstree.findremoved(mycvstree, recursive=1, basedir="./") - bin_blob_pattern = re.compile("^-kb$") - no_expansion = set(portage.cvstree.findoption( - mycvstree, bin_blob_pattern, recursive=1, basedir="./")) - - if self.vcs_settings.vcs == "svn": - with repoman_popen("svn status") as f: - svnstatus = f.readlines() - mychanged = [ - "./" + elem.split()[-1:][0] - for elem in svnstatus - if (elem[:1] in "MR" or elem[1:2] in "M")] - mynew = [ - "./" + elem.split()[-1:][0] - for elem in svnstatus - if elem.startswith("A")] - myremoved = [ - "./" + elem.split()[-1:][0] - for elem in svnstatus - if elem.startswith("D")] - - # Subversion expands keywords specified in svn:keywords properties. - with repoman_popen("svn propget -R svn:keywords") as f: - props = f.readlines() - expansion = dict( - ("./" + prop.split(" - ")[0], prop.split(" - ")[1].split()) - for prop in props if " - " in prop) - - elif self.vcs_settings.vcs == "git": - with repoman_popen( - "git diff-index --name-only " - "--relative --diff-filter=M HEAD") as f: - mychanged = f.readlines() - mychanged = ["./" + elem[:-1] for elem in mychanged] - - with repoman_popen( - "git diff-index --name-only " - "--relative --diff-filter=A HEAD") as f: - mynew = f.readlines() - mynew = ["./" + elem[:-1] for elem in mynew] - - with repoman_popen( - "git diff-index --name-only " - "--relative --diff-filter=D HEAD") as f: - myremoved = f.readlines() - myremoved = ["./" + elem[:-1] for elem in myremoved] - - if self.vcs_settings.vcs == "bzr": - with repoman_popen("bzr status -S .") as f: - bzrstatus = f.readlines() - mychanged = [ - "./" + elem.split()[-1:][0].split('/')[-1:][0] - for elem in bzrstatus - if elem and elem[1:2] == "M"] - mynew = [ - "./" + elem.split()[-1:][0].split('/')[-1:][0] - for elem in bzrstatus - if elem and (elem[1:2] in "NK" or elem[0:1] == "R")] - myremoved = [ - "./" + elem.split()[-1:][0].split('/')[-1:][0] - for elem in bzrstatus - if elem.startswith("-")] - myremoved = [ - "./" + elem.split()[-3:-2][0].split('/')[-1:][0] - for elem in bzrstatus - if elem and (elem[1:2] == "K" or elem[0:1] == "R")] - # Bazaar expands nothing. - - if self.vcs_settings.vcs == "hg": - with repoman_popen("hg status --no-status --modified .") as f: - mychanged =
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: e2adc59fff70a8d464d3be03231103bce67ab6a2 Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 03:25:28 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:30 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2adc59f repoman/actions.py: Split out the changelog code to it's own function pym/repoman/actions.py | 191 + 1 file changed, 99 insertions(+), 92 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index e9bf147..d70dd82 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -132,102 +132,14 @@ class Actions(object): print("* no commit message? aborting commit.") sys.exit(1) commitmessage = commitmessage.rstrip() - changelog_msg = commitmessage + + myupdates, broken_changelog_manifests = self.changelogs( + myupdates, mymanifests, myremoved, mychanged, myautoadd, + mynew, commitmessage) commit_footer = self.get_commit_footer() commitmessage += commit_footer - broken_changelog_manifests = [] - if self.options.echangelog in ('y', 'force'): - logging.info("checking for unmodified ChangeLog files") - committer_name = utilities.get_committer_name(env=self.repoman_settings) - for x in sorted(vcs_files_to_cps( - chain(myupdates, mymanifests, myremoved), - self.scanner.repolevel, self.scanner.reposplit, self.scanner.categories)): - catdir, pkgdir = x.split("/") - checkdir = self.repo_settings.repodir + "/" + x - checkdir_relative = "" - if self.scanner.repolevel < 3: - checkdir_relative = os.path.join(pkgdir, checkdir_relative) - if self.scanner.repolevel < 2: - checkdir_relative = os.path.join(catdir, checkdir_relative) - checkdir_relative = os.path.join(".", checkdir_relative) - - changelog_path = os.path.join(checkdir_relative, "ChangeLog") - changelog_modified = changelog_path in self.scanner.changed.changelogs - if changelog_modified and self.options.echangelog != 'force': - continue - - # get changes for this package - cdrlen = len(checkdir_relative) - check_relative = lambda e: e.startswith(checkdir_relative) - split_relative = lambda e: e[cdrlen:] - clnew = list(map(split_relative, filter(check_relative, mynew))) - clremoved = list(map(split_relative, filter(check_relative, myremoved))) - clchanged = list(map(split_relative, filter(check_relative, mychanged))) - - # Skip ChangeLog generation if only the Manifest was modified, - # as discussed in bug #398009. - nontrivial_cl_files = set() - nontrivial_cl_files.update(clnew, clremoved, clchanged) - nontrivial_cl_files.difference_update(['Manifest']) - if not nontrivial_cl_files and self.options.echangelog != 'force': - continue - - new_changelog = utilities.UpdateChangeLog( - checkdir_relative, committer_name, changelog_msg, - os.path.join(self.repo_settings.repodir, 'skel.ChangeLog'), - catdir, pkgdir, - new=clnew, removed=clremoved, changed=clchanged, - pretend=self.options.pretend) - if new_changelog is None: - writemsg_level( - "!!! Updating the ChangeLog failed\n", - level=logging.ERROR, noiselevel=-1) - sys.exit(1) - - # if the ChangeLog was just created, add it to vcs - if new_changelog: - myautoadd.append(changelog_path) - # myautoadd is appended to
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 37b282b789db59e7d12abd7904cf49c550e38142 Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:03:54 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:30 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=37b282b7 repoman/actions.py: Remove unused variable pym/repoman/actions.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 405a8c7..2318ce2 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -110,8 +110,6 @@ class Actions(object): " --commitmsgfile='%s'\n" % self.options.commitmsgfile) else: raise - # We've read the content so the file is no longer needed. - commitmessagefile = None if not commitmessage or not commitmessage.strip(): msg_prefix = "" if self.scanner.repolevel > 1:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 50639f3d31486c1279a96739ef00466536bf6aeb Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:34:01 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:01:42 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=50639f3d repoman/actions.py: Split out get_new_commit_message() pym/repoman/actions.py | 39 ++- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 4f516da..9d97b20 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -111,24 +111,8 @@ class Actions(object): else: raise if not commitmessage or not commitmessage.strip(): - msg_prefix = "" - if self.scanner.repolevel > 1: - msg_prefix = "/".join(self.scanner.reposplit[1:]) + ": " + commitmessage = self.get_new_commit_message(qa_output) - try: - editor = os.environ.get("EDITOR") - if editor and utilities.editor_is_executable(editor): - commitmessage = utilities.get_commit_message_with_editor( - editor, message=qa_output, prefix=msg_prefix) - else: - commitmessage = utilities.get_commit_message_with_stdin() - except KeyboardInterrupt: - logging.fatal("Interrupted; exiting...") - sys.exit(1) - if (not commitmessage or not commitmessage.strip() - or commitmessage.strip() == msg_prefix): - print("* no commit message? aborting commit.") - sys.exit(1) commitmessage = commitmessage.rstrip() myupdates, broken_changelog_manifests = self.changelogs( @@ -826,3 +810,24 @@ class Actions(object): portage.writemsg("!!! Disabled FEATURES='sign'\n") self.repo_settings.sign_manifests = False + + def get_new_commit_message(self, qa_output): + msg_prefix = "" + if self.scanner.repolevel > 1: + msg_prefix = "/".join(self.scanner.reposplit[1:]) + ": " + + try: + editor = os.environ.get("EDITOR") + if editor and utilities.editor_is_executable(editor): + commitmessage = utilities.get_commit_message_with_editor( + editor, message=qa_output, prefix=msg_prefix) + else: + commitmessage = utilities.get_commit_message_with_stdin() + except KeyboardInterrupt: + logging.fatal("Interrupted; exiting...") + sys.exit(1) + if (not commitmessage or not commitmessage.strip() + or commitmessage.strip() == msg_prefix): + print("* no commit message? aborting commit.") + sys.exit(1) + return commitmessage
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 13255057f276b7ec1fe14528490502b5916ed879 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 15:29:11 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:09 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=13255057 repoman: Move the primary checks loop to it's own class and file Only minimal changes were done for this initial move. The _scan_ebuilds() needs major hacking up into manageable chunks. Clean out code separation demarcation lines These lines were originally used to mark places where code was removed. And replaced with a class instance and/or function call. Signed-off-by: Brian Dolbec gentoo.org> pym/repoman/main.py| 756 ++--- pym/repoman/scanner.py | 715 ++ 2 files changed, 743 insertions(+), 728 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index e3d0472..2b2f91d 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -4,7 +4,6 @@ from __future__ import print_function, unicode_literals -import copy import errno import io import logging @@ -15,7 +14,6 @@ import sys import tempfile import platform from itertools import chain -from pprint import pformat from os import path as osp if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): @@ -30,14 +28,12 @@ portage._disable_legacy_globals() from portage import os from portage import _encodings from portage import _unicode_encode -from _emerge.Package import Package from _emerge.UserQuery import UserQuery import portage.checksum import portage.const import portage.repository.config -from portage import cvstree, normalize_path +from portage import cvstree from portage import util -from portage.dep import Atom from portage.process import find_binary, spawn from portage.output import ( bold, create_color_func, green, nocolor, red) @@ -47,40 +43,18 @@ from portage.util import writemsg_level from portage.package.ebuild.digestgen import digestgen from repoman.argparser import parse_args -from repoman.checks.directories.files import FileChecks -from repoman.checks.ebuilds.checks import run_checks, checks_init -from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks -from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks -from repoman.checks.ebuilds.fetches import FetchChecks -from repoman.checks.ebuilds.keywords import KeywordChecks -from repoman.checks.ebuilds.isebuild import IsEbuild -from repoman.checks.ebuilds.thirdpartymirrors import ThirdPartyMirrors -from repoman.checks.ebuilds.manifests import Manifests -from repoman.check_missingslot import check_missingslot -from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid -from repoman.checks.ebuilds.pkgmetadata import PkgMetadata -from repoman.checks.ebuilds.use_flags import USEFlagChecks -from repoman.checks.ebuilds.variables.description import DescriptionChecks -from repoman.checks.ebuilds.variables.eapi import EAPIChecks -from repoman.checks.ebuilds.variables.license import LicenseChecks -from repoman.checks.ebuilds.variables.restrict import RestrictChecks -from repoman.ebuild import Ebuild +from repoman.checks.ebuilds.checks import checks_init from repoman.errors import err from repoman.gpg import gpgsign, need_signature -from repoman.modules.commit import repochecks -from repoman.profile import check_profiles, dev_profile_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, - qawarnings, qacats, missingvars, - suspect_virtual, suspect_rdepend) -from repoman.qa_tracker import QATracker -from repoman.repos import RepoSettings, repo_metadata -from repoman.scan import Changes, scan + qawarnings, qacats) +from repoman.repos import RepoSettings +from repoman.scanner import Scanner from repoman._subprocess import repoman_popen, repoman_getstatusoutput from repoman import utilities from repoman.vcs.vcs import ( git_supports_gpg_sign, vcs_files_to_cps, VCSSettings) -from repoman.vcs.vcsstatus import VCSStatus if sys.hexversion >= 0x300: @@ -90,21 +64,11 @@ util.initialize_logger() bad = create_color_func("BAD") -live_eclasses = portage.const.LIVE_ECLASSES -non_ascii_re = re.compile(r'[^\x00-\x7f]') - # A sane umask is needed for files that portage creates. os.umask(0o22) -def sort_key(item): - return item[2].sub_path - def repoman_main(argv): - # Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to - # behave incrementally. - repoman_incrementals = tuple( - x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS') config_root = os.environ.get("PORTAGE_CONFIGROOT") repoman_settings = portage.config(config_root=config_root, local_config=False) @@ -142,30 +106,9 @@ def repoman_main(argv): repo_settings =
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: b6e251f2f8c1aae87092306813898f5af03e9bec Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 02:59:11 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:30 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b6e251f2 repoman/actions.py: Split out the commit footer to a function pym/repoman/actions.py | 95 ++ 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 1f70815..e9bf147 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -133,53 +133,8 @@ class Actions(object): sys.exit(1) commitmessage = commitmessage.rstrip() changelog_msg = commitmessage - portage_version = getattr(portage, "VERSION", None) - gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "") - dco_sob = self.repoman_settings.get("DCO_SIGNED_OFF_BY", "") - if portage_version is None: - sys.stderr.write("Failed to insert portage version in message!\n") - sys.stderr.flush() - portage_version = "Unknown" - - report_options = [] - if self.options.force: - report_options.append("--force") - if self.options.ignore_arches: - report_options.append("--ignore-arches") - if self.scanner.include_arches is not None: - report_options.append( - "--include-arches=\"%s\"" % - " ".join(sorted(self.scanner.include_arches))) - - if self.vcs_settings.vcs == "git": - # Use new footer only for git (see bug #438364). - commit_footer = "\n\nPackage-Manager: portage-%s" % portage_version - if report_options: - commit_footer += "\nRepoMan-Options: " + " ".join(report_options) - if self.repo_settings.sign_manifests: - commit_footer += "\nManifest-Sign-Key: %s" % (gpg_key, ) - if dco_sob: - commit_footer += "\nSigned-off-by: %s" % (dco_sob, ) - else: - unameout = platform.system() + " " - if platform.system() in ["Darwin", "SunOS"]: - unameout += platform.processor() - else: - unameout += platform.machine() - commit_footer = "\n\n" - if dco_sob: - commit_footer += "Signed-off-by: %s\n" % (dco_sob, ) - commit_footer += "(Portage version: %s/%s/%s" % \ - (portage_version, self.vcs_settings.vcs, unameout) - if report_options: - commit_footer += ", RepoMan options: " + " ".join(report_options) - if self.repo_settings.sign_manifests: - commit_footer += ", signed Manifest commit with key %s" % \ - (gpg_key, ) - else: - commit_footer += ", unsigned Manifest commit" - commit_footer += ")" + commit_footer = self.get_commit_footer() commitmessage += commit_footer broken_changelog_manifests = [] @@ -797,3 +752,51 @@ class Actions(object): expansion = {} return (mynew, mychanged, myremoved, no_expansion, expansion) + + def get_commit_footer(self): + portage_version = getattr(portage, "VERSION", None) + gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "") + dco_sob = self.repoman_settings.get("DCO_SIGNED_OFF_BY", "") + report_options = [] + if self.options.force: + report_options.append("--force") + if self.options.ignore_arches: + report_options.append("--ignore-arches") + if self.scanner.include_arches is not None: + report_options.append( + "--include-arches=\"%s\"" % + " ".join(sorted(self.scanner.include_arches))) + + if portage_version is None: + sys.stderr.write("Failed to insert portage version in message!\n") + sys.stderr.flush() + portage_version = "Unknown" + # Use new footer only for git (see bug #438364). + if self.vcs_settings.vcs in ["git"]: + commit_footer =
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 70f468194c669a265d9635740b27a6ddbb1f7dbd Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:26:39 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:31 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=70f46819 repoman/actions.py: Splitout clear_attic() pym/repoman/actions.py | 38 +- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 974de62..5b55ff8 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -166,23 +166,7 @@ class Actions(object): # inside the $Header path. This code detects the problem and corrects it # so that the Manifest will generate correctly. See bug #169500. # Use binary mode in order to avoid potential character encoding issues. - cvs_header_re = re.compile(br'^#\s*\$Header.*\$$') - attic_str = b'/Attic/' - attic_replace = b'/' - for x in myheaders: - f = open( - _unicode_encode(x, encoding=_encodings['fs'], errors='strict'), - mode='rb') - mylines = f.readlines() - f.close() - modified = False - for i, line in enumerate(mylines): - if cvs_header_re.match(line) is not None and \ - attic_str in line: - mylines[i] = line.replace(attic_str, attic_replace) - modified = True - if modified: - portage.util.write_atomic(x, b''.join(mylines), mode='wb') + self.clear_attic(myheaders) if self.scanner.repolevel == 1: utilities.repoman_sez( @@ -817,3 +801,23 @@ class Actions(object): print( "* Files with headers will" " cause the manifests to be changed and committed separately.") + + + def clear_attic(self, myheaders): + cvs_header_re = re.compile(br'^#\s*\$Header.*\$$') + attic_str = b'/Attic/' + attic_replace = b'/' + for x in myheaders: + f = open( + _unicode_encode(x, encoding=_encodings['fs'], errors='strict'), + mode='rb') + mylines = f.readlines() + f.close() + modified = False + for i, line in enumerate(mylines): + if cvs_header_re.match(line) is not None and \ + attic_str in line: + mylines[i] = line.replace(attic_str, attic_replace) + modified = True + if modified: + portage.util.write_atomic(x, b''.join(mylines), mode='wb')
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 29ad7e00f57b6bfb3b5f6916add9ed0dcba969f5 Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:10:03 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:30 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=29ad7e00 repoman/actions.py: Split out priming_commit() pym/repoman/actions.py | 91 ++ 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 2318ce2..af50c1b 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -208,49 +208,7 @@ class Actions(object): # will change and need a priming commit before the Manifest # can be committed. if (myupdates or myremoved) and myheaders: - myfiles = myupdates + myremoved - fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") - mymsg = os.fdopen(fd, "wb") - mymsg.write(_unicode_encode(commitmessage)) - mymsg.close() - - separator = '-' * 78 - - print() - print(green("Using commit message:")) - print(green(separator)) - print(commitmessage) - print(green(separator)) - print() - - # Having a leading ./ prefix on file paths can trigger a bug in - # the cvs server when committing files to multiple directories, - # so strip the prefix. - myfiles = [f.lstrip("./") for f in myfiles] - - commit_cmd = [self.vcs_settings.vcs] - commit_cmd.extend(self.vcs_settings.vcs_global_opts) - commit_cmd.append("commit") - commit_cmd.extend(self.vcs_settings.vcs_local_opts) - commit_cmd.extend(["-F", commitmessagefile]) - commit_cmd.extend(myfiles) - - try: - if self.options.pretend: - print("(%s)" % (" ".join(commit_cmd),)) - else: - retval = spawn(commit_cmd, env=self.repo_settings.commit_env) - if retval != os.EX_OK: - writemsg_level( - "!!! Exiting on %s (shell) " - "error code: %s\n" % (self.vcs_settings.vcs, retval), - level=logging.ERROR, noiselevel=-1) - sys.exit(retval) - finally: - try: - os.unlink(commitmessagefile) - except OSError: - pass + self.priming_commit(myupdates, myremoved, commitmessage) # When files are removed and re-added, the cvs server will put /Attic/ # inside the $Header path. This code detects the problem and corrects it @@ -809,3 +767,50 @@ class Actions(object): os.unlink(commitmessagefile) except OSError: pass + + + def priming_commit(self, myupdates, myremoved, commitmessage): + myfiles = myupdates + myremoved + fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") + mymsg = os.fdopen(fd, "wb") + mymsg.write(_unicode_encode(commitmessage)) + mymsg.close() + + separator = '-' * 78 + + print() + print(green("Using commit message:")) + print(green(separator)) + print(commitmessage) + print(green(separator)) + print() + + # Having a leading ./ prefix on file paths can trigger a bug in + # the cvs server when committing files to multiple directories, + # so strip the prefix. + myfiles = [f.lstrip("./") for f in myfiles] + + commit_cmd = [self.vcs_settings.vcs] + commit_cmd.extend(self.vcs_settings.vcs_global_opts) + commit_cmd.append("commit") + commit_cmd.extend(self.vcs_settings.vcs_local_opts) + commit_cmd.extend(["-F", commitmessagefile]) + commit_cmd.extend(myfiles) + + try: + if self.options.pretend: + print("(%s)" % (" ".join(commit_cmd),)) + else: +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: 2fe4697d7fdf7a201582c1c9ac0b01a682b5016b Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 15:23:33 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:08 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2fe4697d repoman/main.py: Split RESTRICT checks to checks/ebuild/variables/ pym/repoman/checks/ebuilds/variables/restrict.py | 41 pym/repoman/main.py | 25 --- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py b/pym/repoman/checks/ebuilds/variables/restrict.py new file mode 100644 index 000..215b792 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/restrict.py @@ -0,0 +1,41 @@ + +'''restrict.py +Perform checks on the RESTRICT variable. +''' + +# import our initialized portage instance +from repoman._portage import portage + +from repoman.qa_data import valid_restrict + + +class RestrictChecks(object): + '''Perform checks on the RESTRICT variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, package, ebuild, y_ebuild): + myrestrict = None + + try: + myrestrict = portage.dep.use_reduce( + pkg._metadata["RESTRICT"], matchall=1, flat=True) + except portage.exception.InvalidDependString as e: + self. qatracker.add_error( + "RESTRICT.syntax", + "%s: RESTRICT: %s" % (ebuild.relative_path, e)) + del e + + if myrestrict: + myrestrict = set(myrestrict) + mybadrestrict = myrestrict.difference(valid_restrict) + + if mybadrestrict: + for mybad in mybadrestrict: + self.qatracker.add_error( + "RESTRICT.invalid", + package + "/" + y_ebuild + ".ebuild: %s" % mybad) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 08d79eb..8497833 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -64,6 +64,7 @@ from repoman.checks.ebuilds.use_flags import USEFlagChecks from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.checks.ebuilds.variables.license import LicenseChecks +from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -71,7 +72,7 @@ from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, missingvars, - suspect_virtual, suspect_rdepend, valid_restrict) + suspect_virtual, suspect_rdepend) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata from repoman.scan import Changes, scan @@ -301,6 +302,7 @@ rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) descriptioncheck = DescriptionChecks(qatracker) licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated) +restrictcheck = RestrictChecks(qatracker) ## for xpkg in effective_scanlist: @@ -623,24 +625,9 @@ for xpkg in effective_scanlist: licensecheck.check(pkg, xpkg, ebuild, y_ebuild) # - # restrict checks - myrestrict = None - try: - myrestrict = portage.dep.use_reduce( - myaux["RESTRICT"], matchall=1, flat=True) - except portage.exception.InvalidDependString as e: - qatracker.add_error( - "RESTRICT.syntax", - "%s: RESTRICT: %s" % (ebuild.relative_path, e)) - del e - if myrestrict: - myrestrict = set(myrestrict) - mybadrestrict = myrestrict.difference(valid_restrict) - if mybadrestrict: - for mybad in mybadrestrict: - qatracker.add_error( - "RESTRICT.invalid", - xpkg + "/" + y_ebuild + ".ebuild: %s" % mybad) + # + restrictcheck.check(pkg, xpkg, ebuild, y_ebuild) + #
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 9add60dcaac5837a1c47b3675b1e86ced9fbfb65 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 00:13:13 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:08 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9add60dc repoman/main.py: Move some functions out of the main code definition Move gpgsign and need_signature to their own file: gpg.py Move sort_key() to the main body ahead of the main code. Add new file gpg.py pym/repoman/gpg.py | 79 + pym/repoman/main.py | 78 +--- 2 files changed, 86 insertions(+), 71 deletions(-) diff --git a/pym/repoman/gpg.py b/pym/repoman/gpg.py new file mode 100644 index 000..a6c4c5f --- /dev/null +++ b/pym/repoman/gpg.py @@ -0,0 +1,79 @@ + +import errno +import logging +import subprocess +import sys + +import portage +from portage import os +from portage import _encodings +from portage import _unicode_encode +from portage.exception import MissingParameter +from portage.process import find_binary + + +# Setup the GPG commands +def gpgsign(filename, repoman_settings, options): + gpgcmd = repoman_settings.get("PORTAGE_GPG_SIGNING_COMMAND") + if gpgcmd in [None, '']: + raise MissingParameter("PORTAGE_GPG_SIGNING_COMMAND is unset!" + " Is make.globals missing?") + if "${PORTAGE_GPG_KEY}" in gpgcmd and \ + "PORTAGE_GPG_KEY" not in repoman_settings: + raise MissingParameter("PORTAGE_GPG_KEY is unset!") + if "${PORTAGE_GPG_DIR}" in gpgcmd: + if "PORTAGE_GPG_DIR" not in repoman_settings: + repoman_settings["PORTAGE_GPG_DIR"] = \ + os.path.expanduser("~/.gnupg") + logging.info( + "Automatically setting PORTAGE_GPG_DIR to '%s'" % + repoman_settings["PORTAGE_GPG_DIR"]) + else: + repoman_settings["PORTAGE_GPG_DIR"] = \ + os.path.expanduser(repoman_settings["PORTAGE_GPG_DIR"]) + if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK): + raise portage.exception.InvalidLocation( + "Unable to access directory: PORTAGE_GPG_DIR='%s'" % + repoman_settings["PORTAGE_GPG_DIR"]) + gpgvars = {"FILE": filename} + for k in ("PORTAGE_GPG_DIR", "PORTAGE_GPG_KEY"): + v = repoman_settings.get(k) + if v is not None: + gpgvars[k] = v + gpgcmd = portage.util.varexpand(gpgcmd, mydict=gpgvars) + if options.pretend: + print("(" + gpgcmd + ")") + else: + # Encode unicode manually for bug #310789. + gpgcmd = portage.util.shlex_split(gpgcmd) + + if sys.hexversion < 0x302 and sys.hexversion >= 0x300 and \ + not os.path.isabs(gpgcmd[0]): + # Python 3.1 _execvp throws TypeError for non-absolute executable + # path passed as bytes (see http://bugs.python.org/issue8513). + fullname = find_binary(gpgcmd[0]) + if fullname is None: + raise portage.exception.CommandNotFound(gpgcmd[0]) + gpgcmd[0] = fullname + + gpgcmd = [ + _unicode_encode(arg, encoding=_encodings['fs'], errors='strict') + for arg in gpgcmd] + rValue = subprocess.call(gpgcmd) + if rValue == os.EX_OK: + os.rename(filename + ".asc", filename) + else: + raise portage.exception.PortageException( + "!!! gpg exited with '" + str(rValue) + "' status") + +def need_signature(filename): + try: + with open( + _unicode_encode( + filename, encoding=_encodings['fs'], errors='strict'), + 'rb') as f: + return b"BEGIN PGP SIGNED MESSAGE" not in f.readline() + except IOError as e: + if e.errno in (errno.ENOENT, errno.ESTALE): + return False + raise diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 4dbc09e..e276aba 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -38,7 +38,6 @@ import portage.repository.config from portage import cvstree, normalize_path from portage import util from portage.dep import Atom -from portage.exception import MissingParameter from portage.process import find_binary, spawn from portage.output import ( bold, create_color_func, green, nocolor, red) @@ -67,6 +66,7 @@ from
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: f0fb6cd1e492c1e6f0d26c483dc0a0ebcbc8ecb8 Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 00:48:05 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:59:32 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0fb6cd1 repoman: Move the remaining actions to an Actions class Fix regression from which always runs commit mode. Error found by Mike Gilbert actions.py: Assign repoman_settings from the repo_settings variable Add a return to the end perform(), it just didn't seem right to leave it hanging. pym/repoman/{main.py => actions.py} | 662 +-- pym/repoman/main.py | 756 ++-- 2 files changed, 302 insertions(+), 1116 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/actions.py old mode 100755 new mode 100644 similarity index 66% copy from pym/repoman/main.py copy to pym/repoman/actions.py index 2b2f91d..611c0dd --- a/pym/repoman/main.py +++ b/pym/repoman/actions.py @@ -1,337 +1,80 @@ -#!/usr/bin/python -bO -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -from __future__ import print_function, unicode_literals import errno import io import logging +import platform import re import signal import subprocess import sys import tempfile -import platform from itertools import chain -from os import path as osp -if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): - pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__ #, "pym") - sys.path.insert(0, pym_path) -# import our centrally initialized portage instance -from repoman._portage import portage -portage._internal_caller = True -portage._disable_legacy_globals() - +from _emerge.UserQuery import UserQuery +import portage +from portage import cvstree from portage import os from portage import _encodings from portage import _unicode_encode -from _emerge.UserQuery import UserQuery -import portage.checksum -import portage.const -import portage.repository.config -from portage import cvstree -from portage import util -from portage.process import find_binary, spawn from portage.output import ( - bold, create_color_func, green, nocolor, red) -from portage.output import ConsoleStyleFile, StyleWriter -from portage.util import formatter -from portage.util import writemsg_level + bold, create_color_func, green, red) from portage.package.ebuild.digestgen import digestgen +from portage.process import find_binary, spawn +from portage.util import writemsg_level -from repoman.argparser import parse_args -from repoman.checks.ebuilds.checks import checks_init +from repoman._subprocess import repoman_popen, repoman_getstatusoutput from repoman.errors import err from repoman.gpg import gpgsign, need_signature -from repoman.qa_data import ( - format_qa_output, format_qa_output_column, qahelp, - qawarnings, qacats) -from repoman.repos import RepoSettings -from repoman.scanner import Scanner -from repoman._subprocess import repoman_popen, repoman_getstatusoutput from repoman import utilities -from repoman.vcs.vcs import ( - git_supports_gpg_sign, vcs_files_to_cps, VCSSettings) - - -if sys.hexversion >= 0x300: - basestring = str - -util.initialize_logger() +from repoman.vcs.vcs import git_supports_gpg_sign, vcs_files_to_cps bad = create_color_func("BAD") -# A sane umask is needed for files that portage creates. -os.umask(0o22) - - -def repoman_main(argv): - config_root = os.environ.get("PORTAGE_CONFIGROOT") - repoman_settings = portage.config(config_root=config_root, local_config=False) - - if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ - repoman_settings.get('TERM') == 'dumb' or \ - not sys.stdout.isatty(): - nocolor() - - options, arguments = parse_args( - sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", "")) - - if options.version: - print("Portage", portage.VERSION) - sys.exit(0) - - 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 - # commit (like if Manifest generation fails). - can_force = True - - portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings) - if portdir is None: - sys.exit(1) - - myreporoot = os.path.basename(portdir_overlay) - myreporoot += mydir[len(portdir_overlay):] - - vcs_settings = VCSSettings(options, repoman_settings) - - repo_settings = RepoSettings( -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: f0f1958d8e21b3a11eb6a1a4441527f7f3d5c60a Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 03:59:10 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:00:30 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0f1958d repoman/actions.py: split out a manifest function pym/repoman/actions.py | 110 + 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index d70dd82..405a8c7 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -330,59 +330,7 @@ class Actions(object): level=logging.ERROR, noiselevel=-1) sys.exit(retval) - if True: - myfiles = mymanifests[:] - # If there are no header (SVN/CVS keywords) changes in - # the files, this Manifest commit must include the - # other (yet uncommitted) files. - if not myheaders: - myfiles += myupdates - myfiles += myremoved - myfiles.sort() - - fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") - mymsg = os.fdopen(fd, "wb") - mymsg.write(_unicode_encode(commitmessage)) - mymsg.close() - - commit_cmd = [] - if self.options.pretend and self.vcs_settings.vcs is None: - # substitute a bogus value for pretend output - commit_cmd.append("cvs") - else: - commit_cmd.append(self.vcs_settings.vcs) - commit_cmd.extend(self.vcs_settings.vcs_global_opts) - commit_cmd.append("commit") - commit_cmd.extend(self.vcs_settings.vcs_local_opts) - if self.vcs_settings.vcs == "hg": - commit_cmd.extend(["--logfile", commitmessagefile]) - commit_cmd.extend(myfiles) - else: - commit_cmd.extend(["-F", commitmessagefile]) - commit_cmd.extend(f.lstrip("./") for f in myfiles) - - try: - if self.options.pretend: - print("(%s)" % (" ".join(commit_cmd),)) - else: - retval = spawn(commit_cmd, env=self.repo_settings.commit_env) - if retval != os.EX_OK: - if self.repo_settings.repo_config.sign_commit and self.vcs_settings.vcs == 'git' and \ - not git_supports_gpg_sign(): - # Inform user that newer git is needed (bug #403323). - logging.error( - "Git >=1.7.9 is required for signed commits!") - - writemsg_level( - "!!! Exiting on %s (shell) " - "error code: %s\n" % (self.vcs_settings.vcs, retval), - level=logging.ERROR, noiselevel=-1) - sys.exit(retval) - finally: - try: - os.unlink(commitmessagefile) - except OSError: - pass + self.add_manifest(mymanifests, myheaders, myupdates, myremoved, commitmessage) print() if self.vcs_settings.vcs: @@ -807,3 +755,59 @@ class Actions(object): myupdates += myautoadd return myupdates, broken_changelog_manifests + + + def add_manifest(self, mymanifests, myheaders, myupdates, myremoved, + commitmessage): + myfiles = mymanifests[:] + # If there are no header (SVN/CVS keywords) changes in + # the files, this Manifest commit must include the + # other (yet uncommitted) files. + if not myheaders: + myfiles += myupdates + myfiles += myremoved + myfiles.sort() + + fd, commitmessagefile = tempfile.mkstemp(".repoman.msg") + mymsg = os.fdopen(fd, "wb") +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 22fc20dea05f86d061826dc39026e10a8fec1497 Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:27:19 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:01:42 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=22fc20de repoamn/actions.py: Split out sign_manifest() pym/repoman/actions.py | 31 ++- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 5b55ff8..4f516da 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -186,19 +186,7 @@ class Actions(object): digestgen(mysettings=self.repoman_settings, myportdb=self.repo_settings.portdb) if self.repo_settings.sign_manifests: - try: - for x in sorted(vcs_files_to_cps( - chain(myupdates, myremoved, mymanifests), - self.scanner.repolevel, self.scanner.reposplit, self.scanner.categories)): - self.repoman_settings["O"] = os.path.join(self.repo_settings.repodir, x) - manifest_path = os.path.join(self.repoman_settings["O"], "Manifest") - if not need_signature(manifest_path): - continue - gpgsign(manifest_path, self.repoman_settings, self.options) - except portage.exception.PortageException as e: - portage.writemsg("!!! %s\n" % str(e)) - portage.writemsg("!!! Disabled FEATURES='sign'\n") - self.repo_settings.sign_manifests = False + self.sign_manifests(myupdates, myremoved, mymanifests) if self.vcs_settings.vcs == 'git': # It's not safe to use the git commit -a option since there might @@ -821,3 +809,20 @@ class Actions(object): modified = True if modified: portage.util.write_atomic(x, b''.join(mylines), mode='wb') + + + def sign_manifest(self, myupdates, myremoved, mymanifests): + try: + for x in sorted(vcs_files_to_cps( + chain(myupdates, myremoved, mymanifests), + self.scanner.repolevel, self.scanner.reposplit, self.scanner.categories)): + self.repoman_settings["O"] = os.path.join(self.repo_settings.repodir, x) + manifest_path = os.path.join(self.repoman_settings["O"], "Manifest") + if not need_signature(manifest_path): + continue + gpgsign(manifest_path, self.repoman_settings, self.options) + except portage.exception.PortageException as e: + portage.writemsg("!!! %s\n" % str(e)) + portage.writemsg("!!! Disabled FEATURES='sign'\n") + self.repo_settings.sign_manifests = False +
[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/, dev-lang/python/
commit: c0d97a27e1a8ab3e695624d222c46bc80a6de618 Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 20 02:07:40 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 20 02:07:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d97a27 dev-lang/python: Fix cross-compiling for 3.5 Package-Manager: portage-2.2.20_p169_p6532 dev-lang/python/files/3.5-secondary-targets.patch | 19 +++ dev-lang/python/python-3.5.0.ebuild | 4 2 files changed, 23 insertions(+) diff --git a/dev-lang/python/files/3.5-secondary-targets.patch b/dev-lang/python/files/3.5-secondary-targets.patch new file mode 100644 index 000..eb3b0c7 --- /dev/null +++ b/dev-lang/python/files/3.5-secondary-targets.patch @@ -0,0 +1,19 @@ +Mark all targets as "secondary" + +This allows make to avoid rebuilding unnecessary intermediate files, which +is useful when cross-compiling. + +See Parser/pgen and Programs/_freeze_importlib in Makefile.pre.in. + +diff --git a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in b/Makefile.pre.in +@@ -1672,6 +1672,8 @@ + .PHONY: smelly funny patchcheck touch altmaninstall commoninstall + .PHONY: gdbhooks + ++.SECONDARY: ++ + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY + # Local Variables: + # mode: makefile diff --git a/dev-lang/python/python-3.5.0.ebuild b/dev-lang/python/python-3.5.0.ebuild index ca56f88..1dcd769 100644 --- a/dev-lang/python/python-3.5.0.ebuild +++ b/dev-lang/python/python-3.5.0.ebuild @@ -66,6 +66,7 @@ src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" + epatch "${FILESDIR}/3.5-secondary-targets.patch" sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ configure.ac \ @@ -171,6 +172,9 @@ src_configure() { } src_compile() { + # Avoid regenerating these for cross-compiles + touch Include/graminit.h Python/graminit.c Python/importlib.h Python/importlib_external.h || die + cd "${BUILD_DIR}" || die emake CPPFLAGS= CFLAGS= LDFLAGS=
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
commit: f450eae9e2390e8a2372d0c9e166c5b1438f2513 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 19:08:41 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 19:08:41 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f450eae9 app-emulation/vmware-modules: Add patch for Kernel 4.2, bug 559602 Package-Manager: portage-2.2.20.1 .../vmware-modules/files/279-4.2-00-cookie.patch | 79 ++ .../vmware-modules/vmware-modules-279.6.ebuild | 1 + 2 files changed, 80 insertions(+) diff --git a/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch new file mode 100644 index 000..e2ab8a1 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch @@ -0,0 +1,79 @@ +See https://bugs.gentoo.org/show_bug.cgi?id=559602 +Patch by Mike Auty+ +diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +index 4811abd..2cbc1f6 100644 +--- a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +@@ -38,7 +38,9 @@ + static struct dentry *InodeOpLookup(struct inode *dir, + struct dentry *dentry, unsigned int flags); + static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else + static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -207,7 +209,12 @@ static void * + static int + #endif + InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink +- struct nameidata *nd) // OUT: stores result ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++void **cookie ++#else ++struct nameidata *nd ++#endif ++) // OUT: stores result + { +int ret; +VMBlockInodeInfo *iinfo; +diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +index acb2803..4811abd 100644 +--- a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +@@ -199,7 +199,9 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink + * + */ + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char * ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void * + #else + static int +@@ -222,8 +224,12 @@ InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink + goto out; +} + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ return *cookie = (char *)(iinfo->name); ++#else +nd_set_link(nd, iinfo->name); +ret = 0; ++#endif + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) +diff --git a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h +index 23b5d19..d129f7b 100644 +--- a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h +@@ -78,8 +78,13 @@ + + extern struct proto vmnet_proto; + #ifdef VMW_NETDEV_HAS_NET ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) + # define compat_sk_alloc(_bri, _pri) sk_alloc(_net, \ +-PF_NETLINK, _pri, _proto) ++ PF_NETLINK, _pri, _proto, 1) ++# else ++# define compat_sk_alloc(_bri, _pri) sk_alloc(_net, \ ++ PF_NETLINK, _pri, _proto) ++# endif + #else + # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, _proto, 1) + #endif diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild index 4a78931..f10f4ee 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild @@ -98,6 +98,7 @@ src_prepare() { kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-cookie.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/
commit: f109b857fc65d8ded4170d6e14114b35902e3035 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:42:53 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:42:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f109b857 gnome-extra/cinnamon-control-center: amd64 stable wrt bug #558050 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" .../cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild index 2467a03..9c735c8 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar. LICENSE="GPL-2+" SLOT="0" IUSE="+colord +cups input_devices_wacom" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" # False positives caused by nested configure scripts QA_CONFIGURE_OPTIONS=".*"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/http-attoparsec/
commit: d1123b3ac7acc1d31f58511ed42576ace19edded Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:42:40 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:42:40 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1123b3a dev-haskell/http-attoparsec: amd64 stable wrt bug #534986 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r1.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r1.ebuild index 9ad0fd1..c98e6fd 100644 --- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r1.ebuild +++ b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
[gentoo-commits] repo/gentoo:master commit in: net-misc/openconnect/
commit: 57a772a741f5c8b52c998dc76dc276511f1bb1c4 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 19:09:24 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 19:09:24 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a772a7 net-misc/openconnect: amd64 stable wrt bug #558968 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" net-misc/openconnect/openconnect-7.06-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-misc/openconnect/openconnect-7.06-r1.ebuild index 76711e2..c375b4b 100644 --- a/net-misc/openconnect/openconnect-7.06-r1.ebuild +++ b/net-misc/openconnect/openconnect-7.06-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="doc +gnutls gssapi java libproxy nls static-libs" ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW" for lang in $ILINGUAS; do
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
commit: 2d35dd5128f6e72d52a9077aad9614b5d1d12efa Author: Matthias Maier gentoo org> AuthorDate: Sun Sep 20 03:25:16 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 20 03:25:16 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d35dd51 sci-visualization/paraview: Version bump to 4.4.0 Package-Manager: portage-2.2.20.1 sci-visualization/paraview/Manifest| 1 + .../files/paraview-4.4.0-removesqlite.patch| 550 + sci-visualization/paraview/paraview-4.4.0.ebuild | 300 +++ 3 files changed, 851 insertions(+) diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 0ce9e37..011c260 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1 +1,2 @@ DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0 +DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b diff --git a/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch new file mode 100644 index 000..6016b8d --- /dev/null +++ b/sci-visualization/paraview/files/paraview-4.4.0-removesqlite.patch @@ -0,0 +1,550 @@ +diff --git a/VTK/IO/SQL/CMakeLists.txt b/VTK/IO/SQL/CMakeLists.txt +index a62a0b3..25089d9 100644 +--- a/VTK/IO/SQL/CMakeLists.txt b/VTK/IO/SQL/CMakeLists.txt +@@ -28,3 +28,4 @@ set_source_files_properties( + ) + + vtk_module_library(vtkIOSQL ${Module_SRCS} ${SQLite_SRCS}) ++target_link_libraries(vtkIOSQL -lsqlite3) +diff --git a/VTK/IO/SQL/module.cmake b/VTK/IO/SQL/module.cmake +index f00bfd0..db7792f 100644 +--- a/VTK/IO/SQL/module.cmake b/VTK/IO/SQL/module.cmake +@@ -5,7 +5,7 @@ vtk_module(vtkIOSQL + vtkIOCore + PRIVATE_DEPENDS + vtksys +-vtksqlite # We should consider splitting this into a module. ++# vtksqlite # We should consider splitting this into a module. + TEST_DEPENDS + vtkIOLegacy + vtkTestingIOSQL +diff --git a/VTK/IO/SQL/vtkSQLiteDatabase.cxx b/VTK/IO/SQL/vtkSQLiteDatabase.cxx +index 8651670..07acfc2 100644 +--- a/VTK/IO/SQL/vtkSQLiteDatabase.cxx b/VTK/IO/SQL/vtkSQLiteDatabase.cxx +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include + + vtkStandardNewMacro(vtkSQLiteDatabase); + +@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char* password, int mode) + } + } + +- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); ++ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); + +- if (result != VTK_SQLITE_OK) ++ if (result != SQLITE_OK) + { + vtkDebugMacro(<<"SQLite open() failed. Error code is " + << result << " and message is " +- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); ++ << sqlite3_errmsg(this->SQLiteInstance) ); + +-vtk_sqlite3_close(this->SQLiteInstance); ++sqlite3_close(this->SQLiteInstance); + return false; + } + else +@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close() + } + else + { +-int result = vtk_sqlite3_close(this->SQLiteInstance); +-if (result != VTK_SQLITE_OK) ++int result = sqlite3_close(this->SQLiteInstance); ++if (result != SQLITE_OK) + { + vtkWarningMacro(<< "Close(): SQLite returned result code " << result); + } +@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetTables() + if (!status) + { + vtkErrorMacro(<< "GetTables(): Database returned error: " +- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); ++ << sqlite3_errmsg(this->SQLiteInstance) ); + query->Delete(); + return this->Tables; + } +@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetRecord(const char *table) + if (!status) + { + vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " +- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); ++ << sqlite3_errmsg(this->SQLiteInstance) ); + query->Delete(); + return NULL; + } +@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const char* URL) + // -- + bool vtkSQLiteDatabase::HasError() + { +-
[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/
commit: 09594cd7a7569f2e3b79d2acde56bb01b7cc1cdd Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:42:48 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:42:48 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09594cd7 gnome-base/gnome-control-center: amd64 stable wrt bug #558050 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild index 0d44da8..c56204b 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16 LICENSE="GPL-2+" SLOT="2" IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" # False positives caused by nested configure scripts QA_CONFIGURE_OPTIONS=".*"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/
commit: e326cd4988465b5534b2c00ceaa49752ef6e7ce8 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 19:08:41 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 19:10:23 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e326cd49 app-emulation/vmware-modules: Add patch for Kernel 4.2, bug 559602 Package-Manager: portage-2.2.20.1 .../vmware-modules/files/279-4.2-00-cookie.patch | 79 ++ .../vmware-modules/vmware-modules-279.6.ebuild | 1 + 2 files changed, 80 insertions(+) diff --git a/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch new file mode 100644 index 000..e2ab8a1 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch @@ -0,0 +1,79 @@ +See https://bugs.gentoo.org/show_bug.cgi?id=559602 +Patch by Mike Auty+ +diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +index 4811abd..2cbc1f6 100644 +--- a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +@@ -38,7 +38,9 @@ + static struct dentry *InodeOpLookup(struct inode *dir, + struct dentry *dentry, unsigned int flags); + static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else + static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -207,7 +209,12 @@ static void * + static int + #endif + InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink +- struct nameidata *nd) // OUT: stores result ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++void **cookie ++#else ++struct nameidata *nd ++#endif ++) // OUT: stores result + { +int ret; +VMBlockInodeInfo *iinfo; +diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +index acb2803..4811abd 100644 +--- a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c +@@ -199,7 +199,9 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink + * + */ + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char * ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void * + #else + static int +@@ -222,8 +224,12 @@ InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink + goto out; +} + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ return *cookie = (char *)(iinfo->name); ++#else +nd_set_link(nd, iinfo->name); +ret = 0; ++#endif + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) +diff --git a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h +index 23b5d19..d129f7b 100644 +--- a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h +@@ -78,8 +78,13 @@ + + extern struct proto vmnet_proto; + #ifdef VMW_NETDEV_HAS_NET ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) + # define compat_sk_alloc(_bri, _pri) sk_alloc(_net, \ +-PF_NETLINK, _pri, _proto) ++ PF_NETLINK, _pri, _proto, 1) ++# else ++# define compat_sk_alloc(_bri, _pri) sk_alloc(_net, \ ++ PF_NETLINK, _pri, _proto) ++# endif + #else + # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, _proto, 1) + #endif diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild index 4a78931..f10f4ee 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild @@ -98,6 +98,7 @@ src_prepare() { kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-cookie.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user
[gentoo-commits] repo/gentoo:master commit in: net-libs/libnftnl/
commit: 69ecf1e1b0101e12926a8a9a3fe84cca744c5096 Author: Manuel Rüger gentoo org> AuthorDate: Sat Sep 19 19:38:58 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 19 19:43:54 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ecf1e1 net-libs/libnftnl: Version bump Package-Manager: portage-2.2.20_p168 net-libs/libnftnl/Manifest | 1 + net-libs/libnftnl/libnftnl-1.0.5.ebuild | 58 + 2 files changed, 59 insertions(+) diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest index 4853992..4fb56bc 100644 --- a/net-libs/libnftnl/Manifest +++ b/net-libs/libnftnl/Manifest @@ -1,2 +1,3 @@ DIST libnftnl-1.0.3.tar.bz2 356264 SHA256 cf0ae7eab6a6866192a1fbd6b370a8a2cbe2066fe3975ab44939fd50747c27f7 SHA512 6fba3f3a0c3d98e0c3200edbd45910e326f0864383dc695fa77580d47d3fe541c50518f62d2dbfc50b2378b9b311aec28b3321ef18f59a321e0a3f0817952181 WHIRLPOOL 70219737c4d865bdfe9f58803377d3a10619198cb486623d03d30a43b0d159ded9d625505cb0209fe30585dbe3413d136d2fdd6552a6ce2339151bedb1c94c9a DIST libnftnl-1.0.4.tar.bz2 367016 SHA256 8f1fbf9bcf87bf68e782f464fb05428d476c2e9a0bec91c6cda7a389a21969d0 SHA512 ed4230581c139c004c39a9ef3e6d548cfad43d1f3c47e83db328b7ae6c6d7fa70b194699d7f18472fa7fb819c943a85b6997be0f2d2b926745dd5cdbdbf81a41 WHIRLPOOL f899694c2d45fc073af694f5bd6edcae70abead69ef37a3f84a290e6b3dbb246029337e14378e4b3af4a4040f9c407db247f4d8636b8986e3f0d5b48783c20bd +DIST libnftnl-1.0.5.tar.bz2 367016 SHA256 f6d4f5a702e38bc7987f2363f9fcd65930e8b702595c221a497e2f3a359be497 SHA512 85c71aaaeeafdffe09f2591f26d49d41e9f511a53ed313fe642b4968eae8aac1246a53d5908fc737c6eb9cc4f5f3ef2a4eaa17fe33db453a1fd60f2f9d5c5a1d WHIRLPOOL 15fb25aa9e23bfdcb19ab21ea1d6eadd22e5acc0c38e761e4637a06136c809f5a5827ac58643515432e1394e3e8d4575df11e52b5f16ca787157317e5e2ae463 diff --git a/net-libs/libnftnl/libnftnl-1.0.5.ebuild b/net-libs/libnftnl/libnftnl-1.0.5.ebuild new file mode 100644 index 000..4961da1 --- /dev/null +++ b/net-libs/libnftnl/libnftnl-1.0.5.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit base linux-info toolchain-funcs + +DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem" +HOMEPAGE="http://netfilter.org/projects/nftables/; + +LICENSE="GPL-2" +SLOT="0/4" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="examples json static-libs test xml" +SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2; + +RDEPEND=">=net-libs/libmnl-1.0.0 + xml? ( >=dev-libs/mini-xml-2.6 ) + json? ( >=dev-libs/jansson-2.3 )" +DEPEND="virtual/pkgconfig + ${RDEPEND}" + +REQUIRED_USE="test? ( json xml )" + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with xml xml-parsing) \ + $(use_with json json-parsing) +} + +src_install() { + default + gen_usr_ldscript -a nftnl + prune_libtool_files + + if use examples; then + find examples/ -name 'Makefile*' -delete + dodoc -r examples/ + docompress -x /usr/share/doc/${PF}/examples + fi +} + +src_test() { + default + cd tests || die + ./test-script.sh || die +}
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/seawater/
commit: 2af1f0ec4c0d3261b757a88570308fbbb4dd0939 Author: Julian Ospald gentoo org> AuthorDate: Sat Sep 19 23:51:09 2015 + Commit: Julian Ospald gentoo org> CommitDate: Sat Sep 19 23:51:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af1f0ec sci-geosciences/seawater: version bump to 3.3.4 sci-geosciences/seawater/Manifest | 1 + sci-geosciences/seawater/seawater-3.3.4.ebuild | 30 ++ 2 files changed, 31 insertions(+) diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest index c1370f9..3c82227 100644 --- a/sci-geosciences/seawater/Manifest +++ b/sci-geosciences/seawater/Manifest @@ -1,3 +1,4 @@ DIST seawater-2.0.1.tar.gz 2680741 SHA256 e343ef9dba9cc5806b4040af5a63132e2d04bab6406216d5041f81f76d4b25cf SHA512 9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79 WHIRLPOOL 7bdff25f7f2152aa8c4c4184a05397b01a718b5198f821aabb1389acd54860038e5655c6f18e9a63ff699e61c4e66911e33e4085e03021f77452cb185e674ec6 DIST seawater-3.3.2.tar.gz 33073 SHA256 41363a6e280db6f047c40eb87fe9f576ce17e991514dfaeb82444ab5e25950c8 SHA512 221c7e9716247b2a79b1182a4acac7e01c68298262f31d5ff53267c8f4e9d4302f2f46bab5361300742c4eae2a44eff3521b34ef380cfaeb2aaa9f0bdd28df6c WHIRLPOOL ced79e7bdfdc037ee73ee17608735b695de1ef2b99f1d5166e7453b3f272ee73533f3a9e2ccba62d2d98119061ae9a0bd5e11acafd88f469b007fc7619d9c052 DIST seawater-3.3.3.tar.gz 22839 SHA256 8a4f2597141621b7d68ad5145054f4d2a8343eab83fe6453634ddcf49cb39afc SHA512 73f377786c0396f6e052d654d34877aaf28c08ba732321fe11a89a77e809acebada6585d5ffd3481855ead2de9ec6641b48bf771b3d5e6a0cf82bf7383567e49 WHIRLPOOL 26618ec60f55dbf0cbb39cbf1980a93b867e63f367333b080a67b7bb5b5965bfffce021704061908273f0a634535b189eb22f9827a742d1c0ed9942cefccbf0f +DIST seawater-3.3.4.tar.gz 22899 SHA256 1ec2c21b9fac3133d5c18ab654e3ff7c7167d9f437fcc16ee8d355e609533411 SHA512 1e448c0473809ae5022eda6b695d67db85a22767d068d7a025bdb1ad49a09f0f336e5f43b6a2fd869d39082895e45e7fa4ae2af98c1f2d613d28393f88ef27af WHIRLPOOL 62a759200bb73dc9ec048e61a165718a4e4ce68129f62b182d082eb4b9b120a6cc46f0a1e3365f6711b2f5c98c7803f7d3d13223c55948818635877793819e6c diff --git a/sci-geosciences/seawater/seawater-3.3.4.ebuild b/sci-geosciences/seawater/seawater-3.3.4.ebuild new file mode 100644 index 000..61d43cf --- /dev/null +++ b/sci-geosciences/seawater/seawater-3.3.4.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +inherit distutils-r1 + +DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water" +HOMEPAGE="https://pypi.python.org/pypi/seawater/; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="test" # seems there are files missing + +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/oct2py[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + )" + +python_test() { + esetup.py test +}
[gentoo-commits] proj/portage:master commit in: man/
commit: afea444b15c31a0cf0805c2f66b9af4d7208a374 Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 20 02:17:13 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:24:56 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=afea444b man: Document repoman ci as a synonym for repoman commit man/repoman.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/man/repoman.1 b/man/repoman.1 index 59d8ca4..e2b9c66 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -139,6 +139,9 @@ Check Manifests for missing or incorrect digests .TP .B commit Scan directory tree for QA issues; if OK, commit via VCS +.TP +.B ci +Synonym for commit .SH QA KEYWORDS .TP .B CVS/Entries.IO_error
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-beautify/
commit: 59a89b94443e71e3939bd1baf743394d1f48a42b Author: Tobias Klausmann gentoo org> AuthorDate: Sat Sep 19 18:40:13 2015 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Sep 19 19:39:59 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a89b94 dev-ruby/ruby-beautify: add ~alpha keyword Gentoo-Bug: 553470 Package-Manager: portage-2.2.20.1 dev-ruby/ruby-beautify/ruby-beautify-0.93.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/ruby-beautify/ruby-beautify-0.93.2.ebuild b/dev-ruby/ruby-beautify/ruby-beautify-0.93.2.ebuild index c2c70f4..935f391 100644 --- a/dev-ruby/ruby-beautify/ruby-beautify-0.93.2.ebuild +++ b/dev-ruby/ruby-beautify/ruby-beautify-0.93.2.ebuild @@ -16,6 +16,6 @@ DESCRIPTION="a cli tool (and module) to beautify ruby code" HOMEPAGE="https://github.com/erniebrodeur/ruby-beautify; LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" SLOT="0" IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/gherkin/
commit: 1d899e09404d811d54377853f19c1aaff07633fc Author: Tobias Klausmann gentoo org> AuthorDate: Sat Sep 19 18:40:26 2015 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Sep 19 19:40:02 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d899e09 dev-ruby/gherkin: add ~alpha keyword Gentoo-Bug: 553470 Package-Manager: portage-2.2.20.1 dev-ruby/gherkin/gherkin-2.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/gherkin/gherkin-2.12.2.ebuild b/dev-ruby/gherkin/gherkin-2.12.2.ebuild index 49f5d3b..004e57a 100644 --- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild +++ b/dev-ruby/gherkin/gherkin-2.12.2.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin; LICENSE="MIT" SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" SLOT="0" IUSE="doc test"
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-Exception/
commit: 48fcf714604b59f75f250b24abd8a39eaa60ff98 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 20:29:21 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 21:06:14 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48fcf714 dev-perl/Test-Exception: Version bump Package-Manager: portage-2.2.20.1 dev-perl/Test-Exception/Manifest | 1 + .../Test-Exception/Test-Exception-0.400.0.ebuild | 29 ++ 2 files changed, 30 insertions(+) diff --git a/dev-perl/Test-Exception/Manifest b/dev-perl/Test-Exception/Manifest index 227a951..a2bc6e1 100644 --- a/dev-perl/Test-Exception/Manifest +++ b/dev-perl/Test-Exception/Manifest @@ -1,2 +1,3 @@ DIST Test-Exception-0.32.tar.gz 18131 SHA256 ba4427e6004797ece8dce93c61d1d6c82df891b0f017e7d4a5c2505fa05c5a47 SHA512 fd394c2e3d24fc822810b77bd3bfe12ca75f59519ac0a0307f028be84a48386d12273967f0431f8c3a6671762c6426523420f620621ba7332c3268bc3a0706af WHIRLPOOL db6bdfbd4d1d45991ee9ecd78af37cc19911620a585a3284716faf3f80458194956ee8339a738fd3723b5b428bca4d70cff4467e30a3ce1b719c3a60239414d0 DIST Test-Exception-0.38.tar.gz 15349 SHA256 7c6aa4c208c043c38631e2af8d28abf76d32a3dcd2ff4a94591f009a6ed3eab5 SHA512 9c0176e8d5bcf803ccec4e980ebc6057f15b5cd40c4df422c1e5a87db7df8f18f5f623340190ac9010b67eba7c0c1a1ede83b54ea18dca704d937d5bcb8c6d78 WHIRLPOOL e807354608b3eecb4f9d4806e6862f12d389a830f311a916da089c49023332382f7de82c94da4a81369f3f6d8a2c72a26882f04b6096d15249ba0e16aef46b52 +DIST Test-Exception-0.40.tar.gz 14801 SHA256 d92ccb566d93140abc93b07ec4c13e9b14c8f8f7d7858a2ab575d83b3bb51b26 SHA512 cf85ef0d1991b0797a5823f827a9ad33ceac78f163b97afab19e9c3a11e3cf7505c5a37518dadb5636db42f0337f53df8e0045a5f3fe2200159ee4d83a591902 WHIRLPOOL b141d86bda79b30ad3f040f63d65e34e119b463f1b0f4c0e591a8d42b1149ff3554f6537477278ffc36549451a9634195d512c3fc6249b50e3088b8e1cadbe7d diff --git a/dev-perl/Test-Exception/Test-Exception-0.400.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.400.0.ebuild new file mode 100644 index 000..d5dfedd --- /dev/null +++ b/dev-perl/Test-Exception/Test-Exception-0.400.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=EXODIST +MODULE_VERSION=0.40 +inherit perl-module + +DESCRIPTION="Test functions for exception based code" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Exporter + >=dev-perl/Sub-Uplevel-0.180.0 + virtual/perl-Test-Simple + >=virtual/perl-Test-Harness-2.30.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( virtual/perl-Test-Simple ) +" + +SRC_TEST="do parallel"
[gentoo-commits] repo/gentoo:master commit in: dev-perl/TermReadKey/
commit: 34b318b29facefec6f7dbb1197808d92b32037ba Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 20:45:18 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 21:06:16 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b318b2 dev-perl/TermReadKey: Version bump Package-Manager: portage-2.2.20.1 dev-perl/TermReadKey/Manifest | 1 + dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild | 19 +++ 2 files changed, 20 insertions(+) diff --git a/dev-perl/TermReadKey/Manifest b/dev-perl/TermReadKey/Manifest index a3f7d5a..0a8552f 100644 --- a/dev-perl/TermReadKey/Manifest +++ b/dev-perl/TermReadKey/Manifest @@ -1 +1,2 @@ DIST TermReadKey-2.30.02.tar.gz 37645 SHA256 4e2d28c55f55881c486782e8a19d38db84a65c1472f75254f40978530e49545f SHA512 e83d64f16134409fc9768acf612145754b69e0a7cef95de9960659e35e1675511d95742b6fd775a39bcad561aa887e75ca47713366958757bf1db886e5806f5d WHIRLPOOL 677c8d9d8c4762afb61192670be61d15fc2192cc5ee89ef186662adedfbd1266a1878f435504c3570f4ebb3c28edd96029d19031d4f2592c38d2c73a1bc7c83c +DIST TermReadKey-2.33.tar.gz 82916 SHA256 99708f2d157343b79af6d552384fc4cbdf8ab633b727eb547f733fbc1cfdd14d SHA512 ecee70695f8d48f8eeeb6916a7f25aac536e8725815e6c22ed01791f152b55a4203460cb090b00b64ed71e093890b9bc096679223cc97bda0c323e61f105a0ee WHIRLPOOL 1f84792bccf200f938105e49cdcbdab534bf65286b5a0d03a0ebdd7b740e98cdfca0e0e67e5bc817758cb2deba252acb34af3decd16389c3bc130206c768a353 diff --git a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild new file mode 100644 index 000..8aea5a8 --- /dev/null +++ b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=JSTOWE +MODULE_VERSION=2.33 +inherit perl-module + +DESCRIPTION="Change terminal modes, and perform non-blocking reads" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="virtual/perl-ExtUtils-MakeMaker" + +SRC_TEST="do parallel"
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-Command-Simple/
commit: fae016851dd6f7ac6615b44344c8517f683ec14e Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 20:38:03 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 21:06:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae01685 dev-perl/Test-Command-Simple: Version bump Package-Manager: portage-2.2.20.1 dev-perl/Test-Command-Simple/Manifest | 1 + .../Test-Command-Simple-0.50.0.ebuild | 28 ++ 2 files changed, 29 insertions(+) diff --git a/dev-perl/Test-Command-Simple/Manifest b/dev-perl/Test-Command-Simple/Manifest index 96bc043..baaa62e 100644 --- a/dev-perl/Test-Command-Simple/Manifest +++ b/dev-perl/Test-Command-Simple/Manifest @@ -1 +1,2 @@ DIST Test-Command-Simple-0.04.tar.gz 5659 SHA256 8dd5bd30e093ba7b8b5612ccdb3a18af984341a9da5818407699e7b3d38c99d6 SHA512 3ebf1e5453fa2ce4f323b9df028daca90ed41b6b2c3efe9ab60e9f0f8ff83623a232603f0b8b8365138a3eb3c9cf3debdedff822a10dc933410cc5130e572b0f WHIRLPOOL 7c814dc1d5073039a3f581062cdef0fcf59a0b583cf7fdaff5335c5ebe635934790c55ebc27da7f95f691a436795523ab6283db67346397a0d249cba7fb8047a +DIST Test-Command-Simple-0.05.tar.gz 6419 SHA256 4d9dc422f03a620d0c441279f8366d1acf017da9acfdebe68b5a0e5c39c629da SHA512 65c921785d775a782dae9d3a3b81350374cb97bb09dd604aab71aeaed4e6818e32d8fd60c97b88d3d11ff9be8e28f0c082246e4c8981f1e36b6268464fc71c9b WHIRLPOOL bf20fe81bbaed11a2216174bf7bd7edd05ad26df7fe7ff0c64d4148544c696106580564cc6772b76e030db253f6e4e4555e104ea1b7e4d15a07a26d35b1ed5b8 diff --git a/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild b/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild new file mode 100644 index 000..e7d7f21 --- /dev/null +++ b/dev-perl/Test-Command-Simple/Test-Command-Simple-0.50.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=DMCBRIDE +MODULE_VERSION=0.05 + +inherit perl-module + +DESCRIPTION="Test external commands (nearly) as easily as loaded modules" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-0.420.0 + test? ( + virtual/perl-Test-Simple + dev-perl/Test-Pod + dev-perl/Test-Pod-Coverage + ) +" + +SRC_TEST="do parallel"
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-Deep/
commit: 58cb8ea41bfaa351eb3f8383252bb5d01f6eccc2 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 20:35:33 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 21:06:14 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cb8ea4 dev-perl/Test-Deep: Version bump Package-Manager: portage-2.2.20.1 dev-perl/Test-Deep/Manifest | 1 + dev-perl/Test-Deep/Test-Deep-0.117.0.ebuild | 30 + 2 files changed, 31 insertions(+) diff --git a/dev-perl/Test-Deep/Manifest b/dev-perl/Test-Deep/Manifest index 97bfae5..8af87d0 100644 --- a/dev-perl/Test-Deep/Manifest +++ b/dev-perl/Test-Deep/Manifest @@ -1,2 +1,3 @@ DIST Test-Deep-0.110.tar.gz 35504 SHA256 05129ca28a5ae0fb969f994169f1da78fdca684a85f9eb0b32e89c6aa74b2d8b SHA512 04ebad286ab032ff2bc07c4a7ff70f73547c07860b1c83e7ba626fea4f67719fe7e23f63fd96809a96b113557e48177a11f9670ec6ca9c272f4728ee94447d44 WHIRLPOOL dc0e2ceabd6808cae51bdc6ba2ea8171cce4d2ad97cb06e62541a67d875fff76e9d33f5cb6bf68d8a24999a5ffcbe9befd8be7ecda2961b7afa7bd9821eee520 DIST Test-Deep-0.115.tar.gz 38038 SHA256 0f2f5d41e4c4454b01dedf3fa753cd51001b16e5336702e1b2c5b206a1bdc39c SHA512 7918210a5fe44b90ae08fe8a447ef562b9d2534f26a9bf398d0a4f4f07a4766c60cd6fd874c2cc42f57d3e78e35521a5bdde9c621e8bca5b93a1d725fa706c4f WHIRLPOOL 2dfd5f0010091e1e3cd3a49e83d2d1d1b1184a93ae25974380675ea0bc0149295662f657b53b9d79defdc216fc0395193230cad203f6627bf6f095a60a579e0d +DIST Test-Deep-0.117.tar.gz 38366 SHA256 8dabe31cef91456bc2348f85520913bd89f5bc8f694dce4cb1b4e498242813f8 SHA512 88beee962fa85d89b71dcb9a7e00dc9851ccd3211d181e62f8ad739066e5a2466c699514e3bf4089fd9ee335cd687876853b7e1bb2aea1a965d356b272ce WHIRLPOOL e2a5326b92d79f9265568ac0ed17b8c1e7a65a3b32660aa5fb9416d87d6acde77e2d309d03f05aab9a34129ef498a6a9c29285304ce2e70e31f10d3b4390bff2 diff --git a/dev-perl/Test-Deep/Test-Deep-0.117.0.ebuild b/dev-perl/Test-Deep/Test-Deep-0.117.0.ebuild new file mode 100644 index 000..69550ae --- /dev/null +++ b/dev-perl/Test-Deep/Test-Deep-0.117.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=RJBS +MODULE_VERSION=0.117 +inherit perl-module + +DESCRIPTION="Test::Deep - Extremely flexible deep comparison" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="test" + +RDEPEND=" + >=virtual/perl-Scalar-List-Utils-1.90.0 + virtual/perl-Test-Simple +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-Test-Simple + >=dev-perl/Test-NoWarnings-0.20.0 + || ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-Tester-0.40.0 ) + ) +" + +SRC_TEST="do parallel"
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-Class/
commit: babc801d1773fc55e06a3f1cf8ad0a9b8ae5f50d Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 20:41:49 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 21:06:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babc801d dev-perl/Test-Class: Version bump; remove old Package-Manager: portage-2.2.20.1 dev-perl/Test-Class/Manifest | 2 +- dev-perl/Test-Class/Test-Class-0.410.0.ebuild | 24 -- dev-perl/Test-Class/Test-Class-0.500.0.ebuild | 36 +++ 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dev-perl/Test-Class/Manifest b/dev-perl/Test-Class/Manifest index 699a726..69ef1ac 100644 --- a/dev-perl/Test-Class/Manifest +++ b/dev-perl/Test-Class/Manifest @@ -1,3 +1,3 @@ DIST Test-Class-0.39.tar.gz 78655 SHA256 d3a7d9b3ac24580524fc52865529457df4f43c0384f12264e884315d97f4bad5 SHA512 0fb2c2b30c17e1f3a8f787f0384eb4d1d08b4fe0a83fdb4a02aa5d030e5ecde36f8a8f9b8c641fb5bf69f015f03c86c610a2303135b98e5880db10a9908cc4fb WHIRLPOOL bb50a31ea06dd08237ecba77deb80d976b2bb32996de50ca42dbee08754c84b9c1eb1fef5a1019330fea31cf5ede043fdb3e963dd5d578f2fa84160a5727070d -DIST Test-Class-0.41.tar.gz 78297 SHA256 97edc01f236e952357e95c0f77cbbc75fa16093ed254f2cace1bde824777d6fe SHA512 c4f4efb19d65d60744eddc8b3c203473dc1b71a8f865fdf1b04a8583f782854e181d8dcece9712fe6381d208faaab6d3e1f37d4f94e0df80eb11eb2c920d738a WHIRLPOOL ad5174b494f9a42dc10fda8771c3a3c6be94754e754f3a2bfdac5337f9f705c9567642d833732ff27278dd9704becbc964b286eb021701407752b7480fa9a337 DIST Test-Class-0.48.tar.gz 71256 SHA256 2db02f774063fe22e3c259168ac091aa0e77d2f587e005e4a777da63665670d3 SHA512 6d2c90dc221bd7b8019dd0416f86c3aa960ed40fd50e20ca5b28e4cdc3c77646bbd4df04a72811fedd288c8bb3c9393911eb329efe6374eefeeb3fb105462f4c WHIRLPOOL ba09fd09126c39dddc69775be37feaef60530a2e7e6affd712bc1e795582d5edaa875a3a456f1931d4810fdcf827cb7ac6ce4f761d895729ea4551ad2c18e2a1 +DIST Test-Class-0.50.tar.gz 60253 SHA256 099154ed8caf3ff97c71237fab952264ac1c03d9270737a56071cabe65991350 SHA512 27ae19f60a916f5a23cccdc02ff6168e76d5f1cee5df196df4fe50024f7270ee9eaffdf02e9b6de70565c9b6b30606ad0a30477ac8951164b87c641caf960dcc WHIRLPOOL 2cc4935944aa96ed9c24f2d0aee96a493607356446856ef34334e75ddf7fdcb317d565db3c3115af09c317640f43fba5a14baf9184bdf13a42600e4068710245 diff --git a/dev-perl/Test-Class/Test-Class-0.410.0.ebuild b/dev-perl/Test-Class/Test-Class-0.410.0.ebuild deleted file mode 100644 index 278bfab..000 --- a/dev-perl/Test-Class/Test-Class-0.410.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=RJBS -MODULE_VERSION=0.41 -inherit perl-module - -DESCRIPTION="Easily create test classes in an xUnit style" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="test" - -RDEPEND=">=virtual/perl-Storable-2 - >=virtual/perl-Test-Simple-0.78 - dev-perl/MRO-Compat" -DEPEND="${RDEPEND} - >=dev-perl/Module-Build-0.420.0 - test? ( >=dev-perl/Test-Exception-0.25 )" - -SRC_TEST="do" diff --git a/dev-perl/Test-Class/Test-Class-0.500.0.ebuild b/dev-perl/Test-Class/Test-Class-0.500.0.ebuild new file mode 100644 index 000..d700257 --- /dev/null +++ b/dev-perl/Test-Class/Test-Class-0.500.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=ETHER +MODULE_VERSION=0.50 +inherit perl-module + +DESCRIPTION="Easily create test classes in an xUnit/JUnit style" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="test" + +RDEPEND=" + >=virtual/perl-Attribute-Handlers-0.770.0 + virtual/perl-Carp + virtual/perl-File-Spec + >=dev-perl/MRO-Compat-0.110.0 + dev-perl/Module-Runtime + >=virtual/perl-Storable-2.40.0 + virtual/perl-Test-Simple + dev-perl/Try-Tiny +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + virtual/perl-IO + virtual/perl-Test-Simple + >=dev-perl/Test-Exception-0.250.0 + ) +" + +SRC_TEST="do parallel"
[gentoo-commits] repo/gentoo:master commit in: dev-python/dulwich/
commit: 0d163ee4a70932be23a5a44da00d5874997bf35a Author: Manuel Rüger gentoo org> AuthorDate: Sat Sep 19 21:51:43 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 19 21:51:43 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d163ee4 dev-python/dulwich: Version bump Package-Manager: portage-2.2.20.1 dev-python/dulwich/Manifest | 1 + dev-python/dulwich/dulwich-0.11.2.ebuild | 44 2 files changed, 45 insertions(+) diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest index ba80ed8..67b0290 100644 --- a/dev-python/dulwich/Manifest +++ b/dev-python/dulwich/Manifest @@ -1,4 +1,5 @@ DIST dulwich-0.10.0.tar.gz 272600 SHA256 518bb4aa3e5ad81982bfe571594af81ab9f78feb4e33bfade6c1553afff69237 SHA512 a5aa321e1265ee6c96c763a357d204eda7b9d4d6e90e0b18898342f34b9babf4d43857b9974d6bf442f9ba4da54fed4342c5724772cc9028138e8ec75d2e4896 WHIRLPOOL a032b962f106f0b8c9b9dd3238b135a04b6c6787c0344b8c3235c14e0bd3392ee5298776ff318a8bbafacbb60451dd685febd4a01160d017be3ea49541349af9 DIST dulwich-0.10.1a.tar.gz 272688 SHA256 00ab5eb0b6d531879ee0f65dfefd71bce2e21ab3910c28f7789e15b6330b SHA512 dfd2fc71d34c503380de385423fe2e0bc64307803616edafc59805646f526492fa5d17026f1b4c9617b684a25860051999b2f5eb5b6f760a22fe9937ac3f WHIRLPOOL 5dd1439108e43fbcd616f4a05fff97ab5ae440ee6172dbd6f1472566d325957041a12204b2c647f203dccbf49afe0a3c0aff2012c04e71c097847eb22ab129d5 DIST dulwich-0.11.1.tar.gz 289232 SHA256 84efed93011379cdbdc95ee81179d59abf83ef056bbae3d1c52d34ea5db97bc3 SHA512 69dea42a02e00b6ac0cf7bd5749b3761f984ad36bb0c626ecf537ac34f3e815fc5ccec98c33c64e0327307fb56d4f1e326aef4af2f9ff6da2d716e18a25bde44 WHIRLPOOL 904066b6651773e86716f7a54e777db81403e5ca825e15951435b153a94956ce4284af732ecf3db8e81de374e610f34b5b9ca4069a3c55d3b9d62e04622d9697 +DIST dulwich-0.11.2.tar.gz 290404 SHA256 a543e2798da5600fe73ed71470f67bcd92611f4e2491d0ed3a3b61c2f91cbf40 SHA512 c197a0a6777e2cc946a43b484455f3d7e8aa9df099bb0c14c03e655fe28243c1166a5f0df205a4171432d4eca409beafccf16c952c70153dd1f4534a8fcb WHIRLPOOL 0a56082cea945c970e3ab869e622a197ab316a334c7e39a12bf3c978207ca84b1130b85eeb7c524bc8dd68095c72412fa144eb22405fc0bfe98b2d8375f35a0c DIST dulwich-0.9.9.tar.gz 270127 SHA256 084e762c8d4d0c0002823249db57b8e735c99c409dacc2849565dd3c0c288496 SHA512 5039e8e80c51b8ee0df2ba0805fa63d9b476a05c86b6bd9eaf9348ac03a83f0f1208e259ae6bcf40fb2c94ffb57c9b45bff852e367b8bee95c10e672d3dc19d5 WHIRLPOOL 2a79d25f1233d9a6a242d064af179486810555eb3c9803c336ae152095318a32eb8588779cb07f84b073a05bf7f083ba3b3d4c8d2b4f8929b2aa3d01c29a0a01 diff --git a/dev-python/dulwich/dulwich-0.11.2.ebuild b/dev-python/dulwich/dulwich-0.11.2.ebuild new file mode 100644 index 000..77b59d2 --- /dev/null +++ b/dev-python/dulwich/dulwich-0.11.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Pure-Python implementation of the Git file formats and protocols" +HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/gevent[$(python_gen_usedep python2_7)] )" +RDEPEND="" + +DISTUTILS_IN_SOURCE_BUILD=1 + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + # https://github.com/jelmer/dulwich/issues/196 + if [[ "${EPYTHON}" == pypy ]]; then + "${PYTHON}" -m unittest dulwich.tests.test_suite || die "Tests failed under pypy" + else + emake check + fi +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/build/html/. ) + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +}
[gentoo-commits] proj/portage:master commit in: man/
commit: c62a55bcf83805b9278d976772998bc9dd18a75a Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 20 02:17:12 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 02:24:52 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c62a55bc man: repoman commit: Replace reference to "cvs" with "VCS" man/repoman.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/repoman.1 b/man/repoman.1 index abd998b..59d8ca4 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -138,7 +138,7 @@ option if you would like to replace existing distfiles digests. Check Manifests for missing or incorrect digests .TP .B commit -Scan directory tree for QA issues; if OK, commit via cvs +Scan directory tree for QA issues; if OK, commit via VCS .SH QA KEYWORDS .TP .B CVS/Entries.IO_error
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
commit: 781fdf38053da604fcb269c354ad3cd86bd0e0ec Author: Matthias Maier gentoo org> AuthorDate: Sun Sep 20 03:03:17 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 20 03:04:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781fdf38 sci-visualization/paraview: Only keep version 4.3.1 Package-Manager: portage-2.2.20.1 sci-visualization/paraview/Manifest| 2 - .../paraview/files/paraview-4.0.1-Protobuf.patch | 72 --- .../files/paraview-4.0.1-removesqlite.patch| 517 - .../files/paraview-4.0.1-vtk-cg-path.patch | 36 -- .../paraview/files/paraview-4.0.1-vtknetcd.patch | 79 .../files/paraview-4.1.0-glxext-legacy.patch | 9 - .../files/paraview-4.1.0-vtk-freetype.patch| 22 - .../paraview/paraview-4.1.0-r2.ebuild | 302 .../paraview/paraview-4.2.0-r1.ebuild | 300 9 files changed, 1339 deletions(-) diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 98844ec..0ce9e37 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,3 +1 @@ -DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96 -DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512 611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8 WHIRLPOOL 1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7 DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256 d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512 73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3 WHIRLPOOL 3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0 diff --git a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch b/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch deleted file mode 100644 index 6a09a1a..000 --- a/sci-visualization/paraview/files/paraview-4.0.1-Protobuf.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://paraview.org/Bug/view.php?id=13656 - -diff -up ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.0 -0700 -+++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2012-11-13 15:17:53.980027098 -0700 -@@ -81,16 +81,24 @@ - #-- - # Generate the protbuf message file. - #-- --get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) -+if (VTK_USE_SYSTEM_PROTOBUF) -+ set (_PROTOC_COMPILER protoc) -+ set (_PROTOC_DEPEND "") -+else() -+ set (_PROTOC_COMPILER protoc_compiler) -+ set (_PROTOC_DEPEND ${_PROTOC_COMPILER}) -+endif() -+ -+get_target_property(PROTOC_LOCATION ${_PROTOC_COMPILER} LOCATION) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h -${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc - --COMMAND protoc_compiler -+COMMAND ${_PROTOC_COMPILER} - "--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}" ---proto_path "@CMAKE_CURRENT_SOURCE_DIR@" -"${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto" --DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler -+DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto ${_PROTOC_DEPEND} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - -@@ -109,5 +117,9 @@ - vtk_module_library(vtkPVServerImplementationCore - ${Module_SRCS}) - -+if (VTK_USE_SYSTEM_PROTOBUF) -+ target_link_libraries(vtkPVServerImplementationCore ${CMAKE_THREAD_LIBS_INIT}) -+endif() -+ - add_dependencies(vtkPVServerImplementationCore - protobuf_code_generation) -diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf ParaView/ThirdParty/protobuf/CMakeLists.txt ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-08 07:51:51.0 -0700 -+++ ParaView/ThirdParty/protobuf/CMakeLists.txt2012-11-13 15:09:31.526673020 -0700 -@@ -34,7 +34,7 @@ - set
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
commit: a49857b0651a056274c2aab7f887dc7829bb64e3 Author: Matthias Maier gentoo org> AuthorDate: Sun Sep 20 03:00:46 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 20 03:04:08 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49857b0 sci-visualization/paraview: Fix compile for "development -python", bug #560670 Thanks to Dion Moult for tracking this down. Gentoo-Bug: 560670 Package-Manager: portage-2.2.20.1 .../files/paraview-4.3.1-fix-development-install.patch | 16 sci-visualization/paraview/paraview-4.3.1.ebuild | 7 --- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch b/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch new file mode 100644 index 000..4bc5e54 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-4.3.1-fix-development-install.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/show_bug.cgi?id=560670 +http://www.paraview.org/Bug/view.php?id=15655 + +diff --git a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt +index c45b4bf..8616a90 100644 +--- a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt +@@ -650,7 +650,7 @@ vtk_module_library(${vtk-module} + #the pqSGExportStateWizard has subclasses that directly access + #the UI file, and currently we don't have a clean way to break this hard + #dependency, so for no we install this ui file. +-if(PARAVIEW_INSTALL_DEVELOPMENT_FILES) ++if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h" + DESTINATION "${VTK_INSTALL_INCLUDE_DIR}") + endif() diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild index 7d7b44f..c978762 100644 --- a/sci-visualization/paraview/paraview-4.3.1.ebuild +++ b/sci-visualization/paraview/paraview-4.3.1.ebuild @@ -90,12 +90,13 @@ pkg_setup() { src_prepare() { # see patch headers for description epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \ - "${FILESDIR}"/${PN}-4.2.0-removesqlite.patch \ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ + "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ "${FILESDIR}"/${PN}-4.2.0-protobuf.patch \ + "${FILESDIR}"/${PN}-4.2.0-removesqlite.patch \ + "${FILESDIR}"/${PN}-4.2.0-vtk-freetype.patch \ "${FILESDIR}"/${P}-protobuf-2.6.patch \ - "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ - "${FILESDIR}"/${PN}-4.2.0-vtk-freetype.patch + "${FILESDIR}"/${P}-fix-development-install.patch # lib64 fixes sed -i \
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/, sci-visualization/paraview/files/
commit: 1b6729b01b86fe46347b9547efd931fe1e999192 Author: Matthias Maier gentoo org> AuthorDate: Sun Sep 20 02:53:17 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 20 03:04:08 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6729b0 sci-visualization/paraview: Fix compilation with protobuf-2.6 (bug #537988) Gentoo-Bug: 537988 Package-Manager: portage-2.2.20.1 ...buf-2.patch => paraview-4.3.1-protobuf-2.6.patch} | 20 ++-- sci-visualization/paraview/paraview-4.2.0-r1.ebuild | 1 - sci-visualization/paraview/paraview-4.3.1.ebuild | 4 ++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch b/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch similarity index 84% rename from sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch rename to sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch index f1ea7b5..5a7871f 100644 --- a/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch +++ b/sci-visualization/paraview/files/paraview-4.3.1-protobuf-2.6.patch @@ -1,5 +1,11 @@ -diff --git a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto -index 60e084c..aed5832 100644 +https://gitlab.kitware.com/ben.boeckel/paraview/commit/40a62e0bd20ceb73d7a545dab73e975fa07cddbb +http://www.vtk.org/Bug/view.php?id=15442#c34997 + +https://bugs.gentoo.org/show_bug.cgi?id=537988 + +This updates the *.proto files to be compatible with version 2.6 and fixes +a bug that prevented successful compilation with protobuf 2.6. + --- a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto +++ b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto @@ -21,7 +21,7 @@ message Variant { @@ -159,3 +165,13 @@ index 60e084c..aed5832 100644 } } +--- a/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx b/ParaViewCore/ServerManager/Rendering/vtkSMCameraLink.cxx +@@ -363,6 +363,6 @@ void vtkSMCameraLink::LoadState(const vtkSMMessage *msg, vtkSMProxyLocator *loca + void vtkSMCameraLink::UpdateState() + { + this->Superclass::UpdateState(); +- this->State->GetExtension(LinkState::sync_interactive_renders, ++ this->State->SetExtension(LinkState::sync_interactive_renders, + this->GetSynchronizeInteractiveRenders()); + } diff --git a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild index 62bbc1f..925 100644 --- a/sci-visualization/paraview/paraview-4.2.0-r1.ebuild +++ b/sci-visualization/paraview/paraview-4.2.0-r1.ebuild @@ -92,7 +92,6 @@ src_prepare() { "${FILESDIR}"/${P}-removesqlite.patch \ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ "${FILESDIR}"/${P}-protobuf.patch \ - "${FILESDIR}"/${P}-protobuf-2.patch \ "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ "${FILESDIR}"/${P}-vtk-freetype.patch diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild b/sci-visualization/paraview/paraview-4.3.1.ebuild index bba2091..7d7b44f 100644 --- a/sci-visualization/paraview/paraview-4.3.1.ebuild +++ b/sci-visualization/paraview/paraview-4.3.1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 -
[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/
commit: 1f8d5da04b99fbe29882269ec4fa49116442621e Author: Mike Gilbert gentoo org> AuthorDate: Sat Sep 19 18:45:26 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Sep 19 18:45:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8d5da0 dev-lang/python: Add 3.5.0 without keywords Package-Manager: portage-2.2.20 dev-lang/python/Manifest| 2 + dev-lang/python/python-3.5.0.ebuild | 309 2 files changed, 311 insertions(+) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 0b61411..6cfaf1a 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -5,6 +5,7 @@ DIST Python-3.4.0.tar.xz 14084912 SHA256 f13686c0a2d45e7146759e9d5d1cbd8097a0606 DIST Python-3.4.1.tar.xz 14125788 SHA256 c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4 SHA512 09b6390c07334974f189fb1c90bc2310898aef76661b1cecaa2b4d50001fa3df0fa0c63d3471a5a0dc7f9e08dd559d38d3bc45a6c05a816d8b2ed6b2a20e5fa9 WHIRLPOOL c8f879bb5d42a759b0804aa58d90330d9be6f4c29652ec40f07ca7da31510eadbd6b4eceb2b213af9a1af031c8321fc25faccae77763a31814eb0569831b8bfd DIST Python-3.4.2.tar.xz 14223804 SHA256 1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def SHA512 12de5309cfaf91f5292efd660b5abe31581b902fdcc302317b597ffa74c9f5ec14ec1dd55994bcccd50d40473ae344ae19bf917ccfb8ab4906c8777d6ea95b17 WHIRLPOOL 358a2ca605676a7b6decf7cc9edfcf5edd6e15eb7b08e48fbf5f78422d3470a1233830867e3986a6bd564e105726298d3664ad04b90a233f90a46d6b81d8d60f DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3 +DIST Python-3.5.0.tar.xz 14808460 SHA256 d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91 SHA512 f06bd652484aa89371021d0f9fcb08e6e905e90b39ae065d7df75b367e66b7ea43a818ca33ce04aa3d6746b5e8b1b83e90b709ac2203324fb7a595c1017be149 WHIRLPOOL aef3970297911324537e4e1e9d0e179c925bf51fea9d6a6413a08e3f349fd244d834e6fe732e9120669b762c302b47f821de170ce083d2cc39b7e35f51fdd1f0 DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9 DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b DIST python-gentoo-patches-2.7.9-1.tar.xz 12872 SHA256 9d912c55db56b5bfe054a6164614969fc9605f48f2ffec8770941f798a16470a SHA512 cbbae0faa246516361cd39e55d841660471931bb26cae8396a7d3929c9f4b4a3d8d5a76f7fa295deeb6335c26ed95aab18399e34c2603a582743b6e760f2b280 WHIRLPOOL 422ace8a204481458acd9cfd3b3b85e4b02fb2fe656c8ef8473a76444d5a1b54cd9d690e0009904f8c251697f60105769ce6a97c26224548476c0ece6595e484 @@ -13,3 +14,4 @@ DIST python-gentoo-patches-3.4.0-0.tar.xz 12900 SHA256 5e5ca54eaf446c7dde4155e5d DIST python-gentoo-patches-3.4.1-0.tar.xz 11164 SHA256 7d88e40ed02bef2d26802516fc0138a28cca58e298204e6b1a32054f9224fcb6 SHA512 5ecdf6a1ccb8d12b5b7436e1b7f641a41afcd7fde573e9249e3dc0d438bacb1eb6a5255e149388194dbfd2951fee4f8c800199362dfd072ff96776bbbcad0bbe WHIRLPOOL 707f943f9af7c3fc6deed7cfca5a4198f65a34434893840ba8e4f4c2a3d055e8f927069cb8855b5fe20dff643b7e2d41f35f65e1f3f300e350c0f291b4df6bc2 DIST python-gentoo-patches-3.4.2-0.tar.xz 11568 SHA256 86028c50ecb16fdbaae68662d9749f8c5dbbad6359423ed02c7b379d4aaeb7e3 SHA512 786d74df8ca168655f38d052a3e79541fd1d9f58845f8fdc296246208f8ddc61e5a0d95d675432fcac77dda7c0ab419162790d0e39337bce2fb5c5d3f23c9ef4 WHIRLPOOL 5b26c7d5facd93ca334f23057e26e3a2af71d9d590ab270d4619bb57e0d14bc6465c08ea34c53e1ccf347f5938fd0199a0edf2ddada3c3a891a5568f1eb81227 DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1 +DIST python-gentoo-patches-3.5.0-0.tar.xz 11872 SHA256 8d1830aee5f7e019250447ee084203e26143bdf47c95435861e3e0eda5106eb6 SHA512
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 02d98e12323d8326cad91646e87ff714dcc8313d Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 18:57:48 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 18:57:48 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d98e12 profiles: Add bug reference to vmware mask profiles/package.mask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index 31576f8..de256e4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -31,7 +31,7 @@ #--- END OF EXAMPLES --- # Andreas K. Huettel(19 Sep 2015) -# Masked for security reasons, bugs 516044 +# Masked for security reasons, bugs 516044, 552644 # Keeping it in the tree for now for users who cannot upgrade # (commercial product, separate licenses for major versions) =app-emulation/vmware-workstation-9*
[gentoo-commits] repo/gentoo:master commit in: dev-ml/extlib/
commit: 8dc4f8e83c93985ea56aabd94a88c7f2948997f0 Author: Alexis Ballier gentoo org> AuthorDate: Sat Sep 19 19:03:30 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Sat Sep 19 19:03:47 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc4f8e8 dev-ml/extlib: Fix deps. Upstream switched from camlp4 to cppo. Package-Manager: portage-2.2.20.1 dev-ml/extlib/{extlib-1.7.0.ebuild => extlib-1.7.0-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/extlib/extlib-1.7.0.ebuild b/dev-ml/extlib/extlib-1.7.0-r1.ebuild similarity index 87% rename from dev-ml/extlib/extlib-1.7.0.ebuild rename to dev-ml/extlib/extlib-1.7.0-r1.ebuild index 6e51bac..dabc052 100644 --- a/dev-ml/extlib/extlib-1.7.0.ebuild +++ b/dev-ml/extlib/extlib-1.7.0-r1.ebuild @@ -12,11 +12,11 @@ SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-2.1" DEPEND=" >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - || ( dev-ml/camlp4:=
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 6c227bc298a62e2fcaec2a5530af121943b13240 Author: Brian Dolbec gentoo org> AuthorDate: Sun Sep 20 00:18:47 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 00:18:47 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6c227bc2 Fix regression from which always runs commit mode fixes commit: e7607003f01c16b34def04d2069a72f140dfe999 pym/repoman/actions.py | 2 ++ pym/repoman/main.py| 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index fef53da..9d97b20 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -58,11 +58,13 @@ class Actions(object): self._suggest() if self.options.mode != 'commit': self._non_commit(result) + return False else: self._fail(result, can_force) if self.options.pretend: utilities.repoman_sez( "\"So, you want to play it safe. Good call.\"\n") + return True def perform(self, qa_output): diff --git a/pym/repoman/main.py b/pym/repoman/main.py index b6f88b2..1393ff7 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -165,8 +165,8 @@ def repoman_main(argv): # output the results actions = Actions(repo_settings, options, scanner, vcs_settings) - actions.inform(can_force, result) - # perform any other actions - actions.perform(qa_output) + if actions.inform(can_force, result) + # perform any other actions + actions.perform(qa_output) sys.exit(0)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/directories/, pym/repoman/checks/ebuilds/eclasses/, ...
commit: c26a2a2a09699a78d7ff249434a719c4fc8572a6 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 12:24:18 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:07 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c26a2a2a repoman: Apply PEP 8 guidelines again (except for W191) pym/repoman/_portage.py | 1 - pym/repoman/_xml.py | 6 -- pym/repoman/checks/directories/files.py | 17 +++-- pym/repoman/checks/ebuilds/checks.py| 2 +- pym/repoman/checks/ebuilds/eclasses/live.py | 2 +- pym/repoman/checks/ebuilds/eclasses/ruby.py | 2 +- pym/repoman/checks/ebuilds/fetches.py | 29 pym/repoman/checks/ebuilds/isebuild.py | 6 +- pym/repoman/checks/ebuilds/manifests.py | 7 +- pym/repoman/checks/ebuilds/misc.py | 11 ++- pym/repoman/checks/ebuilds/pkgmetadata.py | 42 ++- pym/repoman/checks/ebuilds/thirdpartymirrors.py | 8 +- pym/repoman/checks/ebuilds/use_flags.py | 5 -- pym/repoman/checks/herds/metadata.py| 4 - pym/repoman/ebuild.py | 6 +- pym/repoman/errors.py | 2 - pym/repoman/main.py | 97 +++-- pym/repoman/qa_data.py | 2 - pym/repoman/qa_tracker.py | 13 ++-- pym/repoman/repos.py| 35 + pym/repoman/scan.py | 18 ++--- pym/repoman/vcs/vcs.py | 10 ++- pym/repoman/vcs/vcsstatus.py| 17 ++--- 23 files changed, 163 insertions(+), 179 deletions(-) diff --git a/pym/repoman/_portage.py b/pym/repoman/_portage.py index e72ce9f..0f611f7 100644 --- a/pym/repoman/_portage.py +++ b/pym/repoman/_portage.py @@ -23,4 +23,3 @@ sys.path.insert(0, pym_path) import portage portage._internal_caller = True portage._disable_legacy_globals() - diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index d5b5a5e..7bf6698 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -15,7 +15,6 @@ from repoman._subprocess import repoman_getstatusoutput class _XMLParser(xml.etree.ElementTree.XMLParser): - def __init__(self, data, **kwargs): xml.etree.ElementTree.XMLParser.__init__(self, **kwargs) self._portage_data = data @@ -27,13 +26,11 @@ class _XMLParser(xml.etree.ElementTree.XMLParser): self.parser.StartDoctypeDeclHandler = \ self._portage_StartDoctypeDeclHandler - def _portage_XmlDeclHandler(self, version, encoding, standalone): if self._base_XmlDeclHandler is not None: self._base_XmlDeclHandler(version, encoding, standalone) self._portage_data["XML_DECLARATION"] = (version, encoding, standalone) - def _portage_StartDoctypeDeclHandler( self, doctypeName, systemId, publicId, has_internal_subset): if self._base_StartDoctypeDeclHandler is not None: @@ -61,7 +58,6 @@ class XmlLint(object): self.binary = None self._check_capable() - def _check_capable(self): if self.options.mode == "manifest": return @@ -74,12 +70,10 @@ class XmlLint(object): # this can be problematic if xmllint changes their output self._is_capable = True - @property def capable(self): return self._is_capable - def check(self, checkdir, repolevel): '''Runs checks on the package metadata.xml file diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 87220c0..b1d77df 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -13,8 +13,8 @@ from repoman.vcs.vcs import vcs_new_changed class FileChecks(object): - def __init__(self, qatracker, repoman_settings, repo_settings, portdb, - vcs_settings): + def __init__( + self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -27,7 +27,6 @@ class FileChecks(object): self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - def check(self, checkdir, checkdirlist, checkdir_relative, changed, new): '''Checks the ebuild sources and files for errors @@ -48,10 +47,12 @@ class FileChecks(object): # prohibited characters). See bug #406877. index = -1 if index != -1: -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 9b4efd06b50219decd19e49278155d9bb82e2462 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 02:39:34 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:08 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b4efd06 repoman/repos.py: Fix a regression where the repo is not in repos.conf The regression was introduced when a variable was used to reduce the size of some long lines. The variable was not being reset after the repo was added, so the remaining code was looking at a stale config. It turned out the variable was a dupe of an already properly updated class wide one. Signed-off-by: Brian Dolbec gentoo.org> pym/repoman/repos.py | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py index 700c064..de99fdf 100644 --- a/pym/repoman/repos.py +++ b/pym/repoman/repos.py @@ -30,12 +30,12 @@ class RepoSettings(object): self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - repoman_repos = self.repoman_settings.repositories + self.repositories = self.repoman_settings.repositories # Ensure that current repository is in the list of enabled repositories. self.repodir = os.path.realpath(portdir_overlay) try: - repoman_repos.get_repo_for_location(self.repodir) + self.repositories.get_repo_for_location(self.repodir) except KeyError: self._add_repo(config_root, portdir_overlay) @@ -47,15 +47,15 @@ class RepoSettings(object): # Constrain dependency resolution to the master(s) # that are specified in layout.conf. - self.repo_config = repoman_repos.get_repo_for_location(self.repodir) + self.repo_config = self.repositories.get_repo_for_location(self.repodir) self.portdb.porttrees = list(self.repo_config.eclass_db.porttrees) self.portdir = self.portdb.porttrees[0] self.commit_env = os.environ.copy() # list() is for iteration on a copy. - for repo in list(repoman_repos): + for repo in list(self.repositories): # all paths are canonical if repo.location not in self.repo_config.eclass_db.porttrees: - del repoman_repos[repo.name] + del self.repositories[repo.name] if self.repo_config.allow_provide_virtual: qawarnings.add("virtual.oldstyle")
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/eclasses/, pym/repoman/
commit: f45a855d52e19843f29665a6d3fe16dd3aa6ed41 Author: Tom Wijsman gentoo org> AuthorDate: Wed Jun 4 13:58:31 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:07 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f45a855d repoman/main.py: Split Ruby checks to checks/ebuild/eclass/ruby.py pym/repoman/checks/ebuilds/eclasses/__init__.py | 0 pym/repoman/checks/ebuilds/eclasses/ruby.py | 32 + pym/repoman/main.py | 18 -- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py b/pym/repoman/checks/ebuilds/eclasses/__init__.py new file mode 100644 index 000..e69de29 diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py b/pym/repoman/checks/ebuilds/eclasses/ruby.py new file mode 100644 index 000..abfb166 --- /dev/null +++ b/pym/repoman/checks/ebuilds/eclasses/ruby.py @@ -0,0 +1,32 @@ + +'''live.py +Performs Ruby eclass checks +''' + +from repoman.qa_data import ruby_deprecated + + +class RubyEclassChecks(object): + '''Performs checks for the usage of Ruby eclasses in ebuilds''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"] + + def check(self, pkg, ebuild): + is_inherited = lambda eclass: eclass in pkg.inherited + is_old_ruby_eclass_inherited = filter( + is_inherited, self.old_ruby_eclasses) + + if is_old_ruby_eclass_inherited: + ruby_intersection = pkg.iuse.all.intersection(ruby_deprecated) + + if ruby_intersection: + for myruby in ruby_intersection: + self.qatracker.add_error( + "IUSE.rubydeprecated", + (ebuild.relative_path + ": Deprecated ruby target: %s") + % myruby) \ No newline at end of file diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 39c8e1a..4ded687 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -51,6 +51,7 @@ from repoman.argparser import parse_args from repoman.checks.directories.files import FileChecks from repoman.checks.ebuilds.checks import run_checks, checks_init from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks +from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks from repoman.checks.ebuilds.fetches import FetchChecks from repoman.checks.ebuilds.keywords import KeywordChecks from repoman.checks.ebuilds.isebuild import IsEbuild @@ -67,7 +68,7 @@ from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, max_desc_len, missingvars, - ruby_deprecated, suspect_virtual, suspect_rdepend, valid_restrict) + suspect_virtual, suspect_rdepend, valid_restrict) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata from repoman.scan import Changes, scan @@ -290,6 +291,7 @@ thirdparty = ThirdPartyMirrors(repoman_settings, qatracker) use_flag_checks = USEFlagChecks(qatracker, uselist) keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) +rubyeclasscheck = RubyEclassChecks(qatracker) ## for xpkg in effective_scanlist: @@ -615,18 +617,8 @@ for xpkg in effective_scanlist: ebuild_used_useflags = use_flag_checks.getUsedUseFlags() used_useflags = used_useflags.union(ebuild_used_useflags) # - - # Check for outdated RUBY targets - old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"] - is_old_ruby_eclass_inherited = filter( - lambda e: e in inherited, old_ruby_eclasses) - if is_old_ruby_eclass_inherited: - ruby_intersection = pkg.iuse.all.intersection(ruby_deprecated) - if ruby_intersection: - for myruby in ruby_intersection: - qatracker.add_error("IUSE.rubydeprecated", - (ebuild.relative_path + ": Deprecated ruby target: %s") - % myruby) + rubyeclasscheck.check(pkg, ebuild) + # # license checks if not badlicsyntax:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 5119898c569923ff47671f6dd61b8c0dd38cbbc3 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 04:06:24 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:09 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5119898c repoman: Change name of dev_keywords() due to variable name conflict Signed-off-by: Brian Dolbec gentoo.org> pym/repoman/main.py| 4 ++-- pym/repoman/profile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index e276aba..006afc9 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -68,7 +68,7 @@ from repoman.ebuild import Ebuild from repoman.errors import err from repoman.gpg import gpgsign, need_signature from repoman.modules.commit import repochecks -from repoman.profile import check_profiles, dev_keywords, setup_profile +from repoman.profile import check_profiles, dev_profile_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, missingvars, @@ -243,7 +243,7 @@ scanlist = scan(repolevel, reposplit, startdir, categories, repo_settings) -dev_keywords = dev_keywords(profiles) +dev_keywords = dev_profile_keywords(profiles) qatracker = QATracker() diff --git a/pym/repoman/profile.py b/pym/repoman/profile.py index 11b93c7..0aedbe8 100644 --- a/pym/repoman/profile.py +++ b/pym/repoman/profile.py @@ -28,7 +28,7 @@ class ProfileDesc(object): valid_profile_types = frozenset(['dev', 'exp', 'stable']) -def dev_keywords(profiles): +def dev_profile_keywords(profiles): """ Create a set of KEYWORDS values that exist in 'dev' profiles. These are used
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 94d363c70053449ae52ff26ac2b184f3888cca99 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 02:43:27 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:09 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=94d363c7 repoamn/repos.py: Indent fix Signed-off-by: Brian Dolbec gentoo.org> pym/repoman/repos.py | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py index de99fdf..f16bf7a 100644 --- a/pym/repoman/repos.py +++ b/pym/repoman/repos.py @@ -128,29 +128,29 @@ class RepoSettings(object): sys.exit(1) def _add_repo(self, config_root, portdir_overlay): - self.repo_conf = portage.repository.config - self.repo_name = self.repo_conf.RepoConfig._read_valid_repo_name( - portdir_overlay)[0] - self.layout_conf_data = self.repo_conf.parse_layout_conf(portdir_overlay)[0] - if self.layout_conf_data['repo-name']: - self.repo_name = self.layout_conf_data['repo-name'] - tmp_conf_file = io.StringIO(textwrap.dedent(""" - [%s] - location = %s - """) % (self.repo_name, portdir_overlay)) - # Ensure that the repository corresponding to $PWD overrides a - # repository of the same name referenced by the existing PORTDIR - # or PORTDIR_OVERLAY settings. - self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % ( - self.repoman_settings.get('PORTDIR_OVERLAY', ''), - portage._shell_quote(portdir_overlay)) - self.repositories = self.repo_conf.load_repository_config( - self.repoman_settings, extra_files=[tmp_conf_file]) - # We have to call the config constructor again so that attributes - # dependent on config.repositories are initialized correctly. - self.repoman_settings = portage.config( - config_root=config_root, local_config=False, - repositories=self.repositories) + self.repo_conf = portage.repository.config + self.repo_name = self.repo_conf.RepoConfig._read_valid_repo_name( + portdir_overlay)[0] + self.layout_conf_data = self.repo_conf.parse_layout_conf(portdir_overlay)[0] + if self.layout_conf_data['repo-name']: + self.repo_name = self.layout_conf_data['repo-name'] + tmp_conf_file = io.StringIO(textwrap.dedent(""" + [%s] + location = %s + """) % (self.repo_name, portdir_overlay)) + # Ensure that the repository corresponding to $PWD overrides a + # repository of the same name referenced by the existing PORTDIR + # or PORTDIR_OVERLAY settings. + self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % ( + self.repoman_settings.get('PORTDIR_OVERLAY', ''), + portage._shell_quote(portdir_overlay)) + self.repositories = self.repo_conf.load_repository_config( + self.repoman_settings, extra_files=[tmp_conf_file]) + # We have to call the config constructor again so that attributes + # dependent on config.repositories are initialized correctly. + self.repoman_settings = portage.config( + config_root=config_root, local_config=False, + repositories=self.repositories) ## # future vcs plugin functions
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: 0b5e6ce8553a1a754a045d24817496ef2bff41c4 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:40:39 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:07 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0b5e6ce8 repoman/main.py: Split EAPI checks to checks/ebuilds/variables/eapi.py pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/checks/ebuilds/variables/eapi.py | 44 pym/repoman/main.py | 12 +++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py new file mode 100644 index 000..e69de29 diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py b/pym/repoman/checks/ebuilds/variables/eapi.py new file mode 100644 index 000..2f8b1cb --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/eapi.py @@ -0,0 +1,44 @@ + +'''eapi.py +Perform checks on the EAPI variable. +''' + + +class EAPIChecks(object): + '''Perform checks on the EAPI variable.''' + + def __init__(self, qatracker, repo_settings): + ''' + @param qatracker: QATracker instance + @param repo_settings: Repository settings + ''' + self.qatracker = qatracker + self.repo_settings = repo_settings + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + eapi = pkg._metadata["EAPI"] + + if not self._checkBanned(ebuild, eapi): + self._checkDeprecated(ebuild, eapi) + + def _checkBanned(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_banned(eapi): + self.qatracker.add_error( + "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False + + def _checkDeprecated(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_deprecated(eapi): + self.qatracker.add_error( + "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 1e23387..42600cd 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -295,6 +296,7 @@ use_flag_checks = USEFlagChecks(qatracker, uselist) keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) +eapicheck = EAPIChecks(qatracker, repo_settings) ## for xpkg in effective_scanlist: @@ -396,13 +398,9 @@ for xpkg in effective_scanlist: inherited = pkg.inherited live_ebuild = live_eclasses.intersection(inherited) - if repo_settings.repo_config.eapi_is_banned(eapi): - qatracker.add_error( - "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) - - elif repo_settings.repo_config.eapi_is_deprecated(eapi): - qatracker.add_error( - "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + ### + eapicheck.check(pkg, ebuild) + ### for k, v in myaux.items(): if not isinstance(v, basestring):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 00e55dbca2cb5597f00786e4a2b98b41353294ee Author: Brian Dolbec gentoo org> AuthorDate: Mon Nov 17 02:07:13 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:08 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=00e55dbc repoman/main.py: Update dependency.perlcore error to us qatracker Update the original code added after the re-write had started. This brings it up to date with teh new stats tracking class instance. pym/repoman/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 8497833..4dbc09e 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -560,7 +560,9 @@ for xpkg in effective_scanlist: qatracker.add_error('dependency.perlcore', ebuild.relative_path + ": %s: please use '%s' instead of '%s'" % - (mytype, atom.replace("perl-core/","virtual/perl-"), atom)) + (mytype, + atom.replace("perl-core/","virtual/perl-"), + atom)) if buildtime and \ not is_blocker and \
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/
commit: c0d5f1a033ba73a3557be7daab1a488c3b9984c8 Author: Tom Wijsman gentoo org> AuthorDate: Wed Jun 4 14:17:49 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Sep 20 01:54:07 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c0d5f1a0 repoman/main.py: More KEYWORDS checks to checks/ebuilds/keywords.py pym/repoman/checks/ebuilds/keywords.py | 64 ++ pym/repoman/main.py| 32 + 2 files changed, 59 insertions(+), 37 deletions(-) diff --git a/pym/repoman/checks/ebuilds/keywords.py b/pym/repoman/checks/ebuilds/keywords.py index b724269..235c751 100644 --- a/pym/repoman/checks/ebuilds/keywords.py +++ b/pym/repoman/checks/ebuilds/keywords.py @@ -21,7 +21,7 @@ class KeywordChecks(object): def check( self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs, changed, - live_ebuild): + live_ebuild, kwlist, profiles): '''Perform the check. @param pkg: Package in which we check (object). @@ -33,21 +33,32 @@ class KeywordChecks(object): @param changed: Changes instance @param slot_keywords: A dictionary of keywords per slot. @param live_ebuild: A boolean that determines if this is a live ebuild. + @param kwlist: A list of all global keywords. + @param profiles: A list of all profiles. ''' if not self.options.straight_to_stable: self._checkAddedWithStableKeywords( package, ebuild, y_ebuild, keywords, changed) + self._checkForDroppedKeywords( pkg, ebuild, ebuild_archs, live_ebuild) + self._checkForInvalidKeywords( + pkg, package, y_ebuild, kwlist, profiles) + + self._checkForMaskLikeKeywords( + package, y_ebuild, keywords, kwlist) + self.slot_keywords[pkg.slot].update(ebuild_archs) + def _isKeywordStable(self, keyword): + return not keyword.startswith("~") and not keyword.startswith("-") + def _checkAddedWithStableKeywords( self, package, ebuild, y_ebuild, keywords, changed): catdir, pkgdir = package.split("/") - is_stable = lambda kw: not kw.startswith("~") and not kw.startswith("-") - stable_keywords = list(filter(is_stable, keywords)) + stable_keywords = list(filter(self._isKeywordStable, keywords)) if stable_keywords: if ebuild.ebuild_path in changed.new_ebuilds and catdir != "virtual": stable_keywords.sort() @@ -64,6 +75,47 @@ class KeywordChecks(object): elif ebuild_archs and "*" not in ebuild_archs and not live_ebuild: dropped_keywords = previous_keywords.difference(ebuild_archs) if dropped_keywords: - self.qatracker.add_error("KEYWORDS.dropped", - "%s: %s" % - (ebuild.relative_path, " ".join(sorted(dropped_keywords + self.qatracker.add_error( + "KEYWORDS.dropped", "%s: %s" % ( + ebuild.relative_path, + " ".join(sorted(dropped_keywords + + def _checkForInvalidKeywords( + self, pkg, package, y_ebuild, kwlist, profiles): + myuse = pkg._metadata["KEYWORDS"].split() + + for mykey in myuse: + if mykey not in ("-*", "*", "~*"): + myskey = mykey + + if not self._isKeywordStable(myskey[:1]): + myskey = myskey[1:] + + if myskey not in kwlist: + 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): + + # KEYWORDS="-*" is a stupid replacement for package.mask + # and screws general KEYWORDS
[gentoo-commits] repo/gentoo:master commit in: app-portage/g-sorcery/
commit: 3442577f185d97f3187e2cfbfab03fad83f47768 Author: Mike Gilbert gentoo org> AuthorDate: Sat Sep 19 18:34:59 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Sep 19 18:45:50 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3442577f app-portage/g-sorcery: Drop pointless use of python_gen_usedep Package-Manager: portage-2.2.20_p168 app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild | 4 ++-- app-portage/g-sorcery/g-sorcery-0.2.1.ebuild | 6 +++--- app-portage/g-sorcery/g-sorcery-0.2.ebuild| 6 +++--- app-portage/g-sorcery/g-sorcery-.ebuild | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild b/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild index 11b6561..ff81725 100644 --- a/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild +++ b/app-portage/g-sorcery/g-sorcery-0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -PDEPEND=">=app-portage/layman-2.2.0[g-sorcery,$(python_gen_usedep 'python*')]" +PDEPEND=">=app-portage/layman-2.2.0[g-sorcery,${PYTHON_USEDEP}]" python_install_all() { distutils-r1_python_install_all diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild index 4bbe99c..125480d 100644 --- a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild +++ b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild @@ -17,11 +17,11 @@ SLOT="0" IUSE="bson git" KEYWORDS="~amd64 ~hppa ~x86" -DEPEND="bson? ( dev-python/pymongo[$(python_gen_usedep 'python*')] ) +DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) git? ( dev-vcs/git ) - sys-apps/portage[$(python_gen_usedep 'python*')]" + sys-apps/portage[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),$(python_gen_usedep 'python*')]" +PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]" python_test() { PYTHONPATH="." "${PYTHON}" scripts/run_tests.py diff --git a/app-portage/g-sorcery/g-sorcery-0.2.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.ebuild index 532b33a..7228ddd 100644 --- a/app-portage/g-sorcery/g-sorcery-0.2.ebuild +++ b/app-portage/g-sorcery/g-sorcery-0.2.ebuild @@ -17,10 +17,10 @@ SLOT="0" IUSE="bson" KEYWORDS="~amd64 ~hppa ~x86" -DEPEND="bson? ( dev-python/pymongo[$(python_gen_usedep 'python*')] ) - sys-apps/portage[$(python_gen_usedep 'python*')]" +DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + sys-apps/portage[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),$(python_gen_usedep 'python*')]" +PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]" python_test() { PYTHONPATH="." "${PYTHON}" scripts/run_tests.py diff --git a/app-portage/g-sorcery/g-sorcery-.ebuild b/app-portage/g-sorcery/g-sorcery-.ebuild index ac8fe71..7536261 100644 --- a/app-portage/g-sorcery/g-sorcery-.ebuild +++ b/app-portage/g-sorcery/g-sorcery-.ebuild @@ -18,11 +18,11 @@ LICENSE="GPL-2" SLOT="0" IUSE="bson git" -DEPEND="bson? ( dev-python/pymongo[$(python_gen_usedep 'python*')] ) +DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] ) git? ( dev-vcs/git ) - sys-apps/portage[$(python_gen_usedep 'python*')]" + sys-apps/portage[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),$(python_gen_usedep 'python*')]" +PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]" python_test() { PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/
commit: 153d0b983a099d6c0812953c48534fd22ccaa283 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 18:53:29 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 18:54:22 2015 + URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=153d0b98 app-emulation/vmware-modules: Filter some ricer CFLAGS, bug 477270 Package-Manager: portage-2.2.20.1 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 2 +- app-emulation/vmware-modules/vmware-modules-279.6.ebuild| 2 +- app-emulation/vmware-modules/vmware-modules-304.2.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 1d24b19..7d798a4 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -44,7 +44,7 @@ pkg_setup() { BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse + filter-flags -mfpmath=sse -mavx -mpclmul -maes for mod in ${VMWARE_MODULE_LIST}; do MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)" diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild index 356ead7..4a78931 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild @@ -58,7 +58,7 @@ pkg_setup() { BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse + filter-flags -mfpmath=sse -mavx -mpclmul -maes for mod in ${VMWARE_MODULE_LIST}; do MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)" diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild index 5406bf8..173592f 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild @@ -58,7 +58,7 @@ pkg_setup() { BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse + filter-flags -mfpmath=sse -mavx -mpclmul -maes for mod in ${VMWARE_MODULE_LIST}; do MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vmware-modules/
commit: 086a9c0a2026988cc664fe5f8b72efd4105db117 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 18:53:29 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 18:53:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086a9c0a app-emulation/vmware-modules: Filter some ricer CFLAGS, bug 477270 Package-Manager: portage-2.2.20.1 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 2 +- app-emulation/vmware-modules/vmware-modules-279.6.ebuild| 2 +- app-emulation/vmware-modules/vmware-modules-304.2.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index 1d24b19..7d798a4 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -44,7 +44,7 @@ pkg_setup() { BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse + filter-flags -mfpmath=sse -mavx -mpclmul -maes for mod in ${VMWARE_MODULE_LIST}; do MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)" diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild index 356ead7..4a78931 100644 --- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild @@ -58,7 +58,7 @@ pkg_setup() { BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse + filter-flags -mfpmath=sse -mavx -mpclmul -maes for mod in ${VMWARE_MODULE_LIST}; do MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)" diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild index 5406bf8..173592f 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild @@ -58,7 +58,7 @@ pkg_setup() { BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse + filter-flags -mfpmath=sse -mavx -mpclmul -maes for mod in ${VMWARE_MODULE_LIST}; do MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
[gentoo-commits] repo/gentoo:master commit in: dev-python/py/
commit: 64dae3cb3527d257ec151d7baedb1da9ff3098d4 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 19:02:42 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 19:02:42 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64dae3cb dev-python/py: amd64/arm/hppa/ia64/ppc64/ppc/sparc/x86 stable, (ALLARCHES policy) wrt bug #560598 Package-Manager: portage-2.2.20.1 dev-python/py/py-1.4.30.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild index 6bf911f..7d8deee 100644 --- a/dev-python/py/py-1.4.30.ebuild +++ b/dev-python/py/py-1.4.30.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test" RDEPEND=""
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
commit: b00082619558b9f98dbf506abbcec1c61b6bb2b6 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Sep 19 17:12:12 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 19 20:00:56 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0008261 media-plugins/kipi-plugins: Fix DEPENDs, expoblending patch Package-Manager: portage-2.2.20.1 .../kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch | 9 - media-plugins/kipi-plugins/kipi-plugins-.ebuild | 5 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch index d548f34..2293826 100644 --- a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch +++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch @@ -1,14 +1,13 @@ --- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200 +++ b/CMakeLists.txt 2015-09-15 19:07:39.0 +0200 -@@ -310,7 +310,10 @@ +@@ -310,7 +310,9 @@ add_subdirectory(kmlexport) add_subdirectory(sendimages) add_subdirectory(flashexport) -add_subdirectory(expoblending) -+ +if(ENABLE_expoblending) +add_subdirectory(expoblending) +endif() - - if(BUILD_VIEWERS) - add_subdirectory(advancedslideshow) + add_subdirectory(flickr) + add_subdirectory(smug) + add_subdirectory(imageshack) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index c78bc7c..cba7fba 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -80,10 +80,6 @@ COMMONDEPEND=" media-libs/tiff:0 virtual/jpeg:0 calendar? ( $(add_kdeapps_dep kcalcore) ) - geolocator? ( - $(add_frameworks_dep kbookmarks) - $(add_kdeapps_dep libkgeomap) - ) mediawiki? ( net-libs/libmediawiki:5 ) opengl? ( dev-qt/qtopengl:5 @@ -127,7 +123,6 @@ src_prepare() { sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die } - undetect_lib geolocator KGEOMAP undetect_lib mediawiki undetect_lib vkontakte KVKONTAKTE
[gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/
commit: 86d434346f4abc496ed16cf1465be9a8d84c8f42 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Sep 19 20:28:13 2015 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Sep 19 20:28:55 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d43434 dev-python/pillow: add ~alpha keyword Gentoo-Bug: 553838 Package-Manager: portage-2.2.20.1 dev-python/pillow/pillow-2.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pillow/pillow-2.8.1.ebuild b/dev-python/pillow/pillow-2.8.1.ebuild index ac048de..4f994eb 100644 --- a/dev-python/pillow/pillow-2.8.1.ebuild +++ b/dev-python/pillow/pillow-2.8.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip" LICENSE="HPND" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )"
[gentoo-commits] proj/grs:tinhat-xfce4 commit in: core/var/lib/portage/, core/etc/skel/.config/Thunar/, ...
commit: e42594533f46923b717fa38802c1f4c172d74d36 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 21:19:48 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 21:19:48 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=e4259453 Bring pkgs in line with original Tin Hat. core/etc/skel/.config/Thunar/accels.scm| 3 - core/etc/skel/.config/Thunar/uca.xml | 13 - core/etc/skel/.config/dconf/user | Bin 640 -> 0 bytes core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini | 11 - core/etc/skel/.config/smplayer/smplayer.ini| 560 - core/etc/skel/.config/xfce4/helpers.rc | 4 +- core/etc/skel/.config/xfce4/panel/cpugraph-12.rc | 17 + .../xfce4/panel/launcher-12/13698963011.desktop| 11 - .../xfce4/panel/launcher-17/13679616986.desktop| 14 - .../xfce4/panel/launcher-17/13954274922.desktop| 10 + .../xfce4/panel/launcher-18/13954274581.desktop| 10 + .../xfce4/panel/launcher-18/14180858892.desktop| 31 -- .../xfce4/panel/launcher-20/13732436141.desktop| 17 - .../xfce4/panel/launcher-20/13954275323.desktop| 15 + .../xfce4/panel/launcher-22/13699065271.desktop| 11 - .../xfce4/panel/launcher-22/13954275454.desktop| 14 + .../etc/skel/.config/xfce4/panel/whiskermenu-25.rc | 22 + .../xfce4/xfconf/xfce-perchannel-xml/ristretto.xml | 9 + .../xfconf/xfce-perchannel-xml/xfce4-panel.xml | 64 ++- core/var/lib/portage/world.CYCLE.2 | 59 ++- 20 files changed, 186 insertions(+), 709 deletions(-) diff --git a/core/etc/skel/.config/Thunar/accels.scm b/core/etc/skel/.config/Thunar/accels.scm deleted file mode 100644 index 4f9adb8..000 --- a/core/etc/skel/.config/Thunar/accels.scm +++ /dev/null @@ -1,3 +0,0 @@ -; Thunar GtkAccelMap rc-file -*- scheme -*- -; this file is an automated accelerator map dump -; diff --git a/core/etc/skel/.config/Thunar/uca.xml b/core/etc/skel/.config/Thunar/uca.xml deleted file mode 100644 index 2f0c866..000 --- a/core/etc/skel/.config/Thunar/uca.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - utilities-terminal - Open Terminal Here - 1438016245738870-1 - exo-open --working-directory %f --launch TerminalEmulator - Example for a custom action - * - - - - diff --git a/core/etc/skel/.config/dconf/user b/core/etc/skel/.config/dconf/user deleted file mode 100644 index 07bbf83..000 Binary files a/core/etc/skel/.config/dconf/user and /dev/null differ diff --git a/core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini b/core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini deleted file mode 100644 index cf12a1f..000 --- a/core/etc/skel/.config/gtk-2.0/gtkfilechooser.ini +++ /dev/null @@ -1,11 +0,0 @@ -[Filechooser Settings] -LocationMode=path-bar -ShowHidden=false -ShowSizeColumn=true -GeometryX=36 -GeometryY=92 -GeometryWidth=952 -GeometryHeight=585 -SortColumn=name -SortOrder=ascending -StartupMode=recent diff --git a/core/etc/skel/.config/smplayer/smplayer.ini b/core/etc/skel/.config/smplayer/smplayer.ini deleted file mode 100644 index 9770e05..000 --- a/core/etc/skel/.config/smplayer/smplayer.ini +++ /dev/null @@ -1,560 +0,0 @@ -[update_checker] -checked_date=@Variant(\0\0\0\xe\0%{\x9c) -last_known_version=0.8.5.5487 - -[smplayer] -stable_version=0.8.5 -check_for_new_version=true - -[actions] -open_file=Ctrl+F -open_directory= -open_playlist= -open_vcd= -open_audio_cd= -open_dvd= -open_dvd_folder= -open_url=Ctrl+U -close=Ctrl+X -clear_recents= -favorites_menu= -tv_menu= -edit_tv_list= -jump_tv_list= -next_tv=H -previous_tv=L -radio_menu= -edit_radio_list= -jump_radio_list= -next_radio=Shift+H -previous_radio=Shift+L -play= -play_or_pause=Media Play -pause=Space -pause_and_frame_step= -stop=Media Stop -frame_step=. -rewind1=Left -rewind2=Down -rewind3=PgDown -forward1=Right -forward2=Up -forward3=PgUp -set_a_marker= -set_b_marker= -clear_ab_markers= -repeat= -jump_to=Ctrl+J -normal_speed=Backspace -halve_speed={ -double_speed=} -dec_speed=[ -inc_speed=] -dec_speed_4= -inc_speed_4= -dec_speed_1= -inc_speed_1= -fullscreen=F -compact=Ctrl+C -video_equalizer=Ctrl+E -screenshot=S -multiple_screenshots=Shift+D -video_preview= -flip= -mirror= -postprocessing= -autodetect_phase= -deblock= -dering= -gradfun= -add_noise= -add_letterbox= -upscaling= -audio_equalizer= -mute=M -decrease_volume="9, /" -increase_volume="0, *" -dec_audio_delay=- -inc_audio_delay=+ -audio_delay= -load_audio_file= -unload_audio_file= -extrastereo_filter= -karaoke_filter= -volnorm_filter= -load_subs= -unload_subs= -dec_sub_delay=Z -inc_sub_delay=X -sub_delay= -dec_sub_pos=R -inc_sub_pos=T -dec_sub_scale=Shift+R -inc_sub_scale=Shift+T -dec_sub_step=G -inc_sub_step=Y -use_ass_lib= -use_forced_subs_only= -subtitle_visibility=V -show_find_sub_dialog= -upload_subtitles= -show_playlist=Ctrl+L -show_file_properties=Ctrl+I
[gentoo-commits] repo/gentoo:master commit in: app-misc/ckb/
commit: 9cfbe321d68e054a2f492f497d50ac5b8b2960aa Author: Manuel Rüger gentoo org> AuthorDate: Sat Sep 19 22:19:57 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 19 22:19:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfbe321 app-misc/ckb: Remove old Package-Manager: portage-2.2.20.1 app-misc/ckb/Manifest | 2 -- app-misc/ckb/ckb-0.1.5.ebuild | 46 --- app-misc/ckb/ckb-0.2.ebuild | 46 --- 3 files changed, 94 deletions(-) diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest index 9808798..4a4d7e5 100644 --- a/app-misc/ckb/Manifest +++ b/app-misc/ckb/Manifest @@ -1,3 +1 @@ -DIST ckb-0.1.5.tar.gz 370107 SHA256 944e2735ca397287fbbadcff4f6946a7bcfd2a1a4d12f5e121a79e6b4fd39f8a SHA512 2f6b876e09c3f012c09d7d0f80ce21c80325d2588427074aeb9eb287b2aae58fdb66290bbd3643eeb7d6523d8230b6787c6517dd8a996db5af13c00fc8e84414 WHIRLPOOL 2b3fe82e407246487464d3888b908126c034965f6cdd89fd9155e3cc64d6dee9e6b388c4f7ce83e9085992d663a8f773b5582a56da95e8460cba97a1af5364cd DIST ckb-0.2.1.tar.gz 430544 SHA256 0a44c72ad56cd9c0ee939cafea736b396c7ea72a24466fa0bee1beb4c8100496 SHA512 d8527cb2efc0be4d8bfe5f8ce95faa9c4bb2e7d2a85301591ea170f68cd6e58479ee49ac2de29ae80c8365137c31f78e83c13bc0c6d0a1659d702cfc740125fb WHIRLPOOL a036431118c15515825327b841b864741cdee9f1ec409af06750d82f65e2b8eb02425809a568f41752a943ffb6d729aa2bca143dd522cc867def9189997ea543 -DIST ckb-0.2.tar.gz 422398 SHA256 5d8a4e3dd49117e8af979406af11c4f7898065f258900683a1e26aa867e8871d SHA512 fb10ed3c93aee97f57bcc1419dc5e5d49f167367056d139f763c522b7b500d3489df04978d384cbc2533636c87bacc66632bbe0215fe4adf625d8c836d16a1ea WHIRLPOOL ee9df503909d1b7a6cb04e0062a4917a4e8c52f8b85ad480702863a6a3de11c84179954758bdb5cf0fc9970890a0f4ca1c5077b53fd3977873d5cf807ef49081 diff --git a/app-misc/ckb/ckb-0.1.5.ebuild b/app-misc/ckb/ckb-0.1.5.ebuild deleted file mode 100644 index 8c4a97a..000 --- a/app-misc/ckb/ckb-0.1.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qmake-utils systemd - -DESCRIPTION="Corsair K65/K70/K95 Driver" -HOMEPAGE="https://github.com/ccMSC/ckb; -SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-libs/quazip[qt5] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5" -RDEPEND="${DEPEND}" - -DOCS=( README.md BUILD.md DAEMON.md ) - -src_prepare() { - sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die - sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip/" src/ckb/ckb.pro || die -} - -src_configure() { - eqmake5 -} - -src_install() { - dobin bin/ckb bin/ckb-daemon - dodir /usr/bin/ckb-animations - exeinto /usr/bin/ckb-animations - doexe bin/ckb-animations/* - - newinitd "${FILESDIR}"/ckb.initd ckb-daemon - domenu usr/ckb.desktop - doicon usr/ckb.png - systemd_dounit service/systemd/ckb-daemon.service -} diff --git a/app-misc/ckb/ckb-0.2.ebuild b/app-misc/ckb/ckb-0.2.ebuild deleted file mode 100644 index 8c4a97a..000 --- a/app-misc/ckb/ckb-0.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qmake-utils systemd - -DESCRIPTION="Corsair K65/K70/K95 Driver" -HOMEPAGE="https://github.com/ccMSC/ckb; -SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-libs/quazip[qt5] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5" -RDEPEND="${DEPEND}" - -DOCS=( README.md BUILD.md DAEMON.md ) - -src_prepare() { - sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die - sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip/" src/ckb/ckb.pro || die -} - -src_configure() { - eqmake5 -} - -src_install() { - dobin bin/ckb bin/ckb-daemon - dodir /usr/bin/ckb-animations - exeinto /usr/bin/ckb-animations - doexe bin/ckb-animations/* - - newinitd "${FILESDIR}"/ckb.initd ckb-daemon - domenu usr/ckb.desktop - doicon usr/ckb.png - systemd_dounit service/systemd/ckb-daemon.service -}
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-troveclient/
commit: 2884b214573feca2e76ea278462ffbe51f6cc5c0 Author: Matthew Thode gentoo org> AuthorDate: Sun Sep 20 01:08:21 2015 + Commit: Matt Thode gentoo org> CommitDate: Sun Sep 20 01:08:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2884b214 dev-python/python-troveclient: adding py3 support to troveclient Package-Manager: portage-2.2.20.1 dev-python/python-troveclient/python-troveclient-1.3.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild index 94b3bd7..31deb70 100644 --- a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild +++ b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: dev-lang/mmix/, dev-lang/mmix/files/
commit: c7f7df5434de4a699fd95a346651cfa3f4ce148c Author: Matthias Maier gentoo org> AuthorDate: Sun Sep 20 01:44:38 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 20 01:45:26 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f7df54 dev-lang/mmix: Compilation fix for format-security, bug #533694 Gentoo-Bug: 533694 Package-Manager: portage-2.2.20.1 .../mmix/files/mmix-20131017-format-security.patch | 59 ++ dev-lang/mmix/mmix-20131017.ebuild | 1 + 2 files changed, 60 insertions(+) diff --git a/dev-lang/mmix/files/mmix-20131017-format-security.patch b/dev-lang/mmix/files/mmix-20131017-format-security.patch new file mode 100644 index 000..3824765 --- /dev/null +++ b/dev-lang/mmix/files/mmix-20131017-format-security.patch @@ -0,0 +1,59 @@ +diff --git a/mmix-pipe.w b/mmix-pipe.w +index b7f4536..a1a9a48 100644 +--- a/mmix-pipe.w b/mmix-pipe.w +@@ -1883,7 +1883,7 @@ static void print_specnode_id(a) + octa a; + { + if (a.h==sign_bit) { +-if (a.l<32) printf(special_name[a.l]); ++if (a.l<32) fputs(special_name[a.l], stdout); + else if (a.l<256) printf("g[%d]",a.l); + else printf("l[%d]",a.l-256); + }@+else if (a.h!=(tetra)-1) { +diff --git a/mmix-sim.w b/mmix-sim.w +index cb6995c..176f60c 100644 +--- a/mmix-sim.w b/mmix-sim.w +@@ -2832,7 +2832,7 @@ void trace_print(o) + case hex: fputc('#',stdout);@+print_hex(o);@+return; + case zhex: printf("%08x%08x",o.h,o.l);@+return; + case floating: print_float(o);@+return; +- case handle:@+if (o.h==0 && o.l<3) printf(stream_name[o.l]); ++ case handle:@+if (o.h==0 && o.l<3) fputs(stream_name[o.l], stdout); + else print_int(o);@+return; + } + } +@@ -2843,9 +2843,9 @@ case ')': fputc(right_paren[round_mode],stdout);@+break; + case 't':@+if (x.l) printf(" Yes, -> #"),print_hex(inst_ptr); +else printf(" No");@+break; + case 'g':@+if (!good) printf(" (bad guess)");@+break; +-case 's': printf(special_name[zz]);@+break; ++case 's': fputs(special_name[zz], stdout);@+break; + case '?': p++;@+if (z.l) printf("%c%d",*p,z.l);@+break; +-case 'l': printf(lhs);@+break; ++case 'l': fputs(lhs, stdout);@+break; + case 'r': p=switchable_string;@+break; + + @ @d rhs _string[1] +@@ -2984,9 +2984,9 @@ void scan_option(arg,usage) + fprintf(stderr, + "Usage: %s progfile command line-args...\n",myself); + @.Usage: ...@> +-for (k=0;usage_help[k][0];k++) fprintf(stderr,usage_help[k]); ++for (k=0;usage_help[k][0];k++) fputs(usage_help[k], stderr); + exit(-1); +- }@+else@+ for (k=0;usage_help[k][1]!='b';k++) printf(usage_help[k]); ++ }@+else@+ for (k=0;usage_help[k][1]!='b';k++) fputs(usage_help[k], stdout); + return; + } + } +@@ -3090,7 +3090,7 @@ void catchint(n) + printf("Eh? Sorry, I don't understand `%s'. (Type h for help)\n", + command_buf); + goto interact; +- case 'h':@+ for (k=0;interactive_help[k][0];k++) printf(interactive_help[k]); ++ case 'h':@+ for (k=0;interactive_help[k][0];k++) fputs(interactive_help[k], stdout); + goto interact; + } + check_syntax:@+ if (*p!='\n') { diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20131017.ebuild index d9c9c76..b233a67 100644 --- a/dev-lang/mmix/mmix-20131017.ebuild +++ b/dev-lang/mmix/mmix-20131017.ebuild @@ -25,6 +25,7 @@ S="${WORKDIR}" src_prepare() { epatch "${FILESDIR}"/${PN}-20110420-makefile.patch + epatch "${FILESDIR}"/${PN}-20131017-format-security.patch } src_compile() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/mmix/
commit: 9028ba951d76f6776f1da99a5b09d856aeeca9a0 Author: Matthias Maier gentoo org> AuthorDate: Sun Sep 20 01:12:37 2015 + Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 20 01:45:26 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9028ba95 dev-lang/mmix: Update homepage Package-Manager: portage-2.2.20.1 dev-lang/mmix/mmix-20131017.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20131017.ebuild index 06ed818..d9c9c76 100644 --- a/dev-lang/mmix/mmix-20131017.ebuild +++ b/dev-lang/mmix/mmix-20131017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,7 +7,7 @@ EAPI="5" inherit eutils toolchain-funcs DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator" -HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html; +HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu; SRC_URI="http://mmix.cs.hm.edu/src/${P}.tgz; RESTRICT="mirror"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/vmware-player/files/, app-emulation/vmware-player/
commit: 240cecf8ecae7b8985d446bcd25bd5ca03313a13 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 18:45:15 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 18:45:36 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240cecf8 app-emulation/vmware-player: Drop old for security, bug 516044 Package-Manager: portage-2.2.20.1 app-emulation/vmware-player/Manifest | 2 - app-emulation/vmware-player/files/config-3.0 | 10 - app-emulation/vmware-player/files/vmware-3.0.rc| 33 --- .../vmware-player-5.0.3.1410761.ebuild | 245 - 4 files changed, 290 deletions(-) diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index 834788b..90b6210 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -1,5 +1,3 @@ -DIST VMware-Player-5.0.3-1410761.i386.bundle.tar 220047360 SHA256 cf821022b093c9aef768596131085d0c5adcef25339dddefbc0a214e00645a97 SHA512 4660efa92671b33cd701dc37b86d8a18a84acd4e85b660f6e4e9f60c71bbe744574eb07fd563d6fda2626768eeaa9ee7c64c2f61f9b3cdd0eab666ec62abde48 WHIRLPOOL 39e4a85b176f27c0019ab3d8fde2f91973932e81896b006845f7059a4306ed324b7422857cfa4896c7ef216cca937ae238fdbcee4e5c72df86e49a0d52411652 -DIST VMware-Player-5.0.3-1410761.x86_64.bundle.tar 185425920 SHA256 e2ef55702e06646a4465baa16ddb742dd7f9e8021e8f53670a33d7e8f996c678 SHA512 8560ecfb1525d991ac0d3f665c8a89aae81d429cf94ff56fbd22fbd9f41f5a03a56d874811876aaae8042e81f4b57a298e4d29327dab94492c5ded8a58b81071 WHIRLPOOL 8f1c8997e0e2ff90e227474d9b7791b702d180af9a669a9de62a4bc6e373468bca1d7fa8ea9e28e5491992f2b9b0d6d1370a856751422190cafcd6c04682ed07 DIST VMware-Player-6.0.6-2700073.i386.bundle.tar 230184960 SHA256 f62c97771b9f9b3d62204cb72472bd3b4cf856f5bdc3fd7ea68f786127b4f98e SHA512 91ce0861eab7a122d9bca8f8899f18ed7f59eb20ae2b6a4d1a021aa57cc179e0f8b7aebeeea857c10a8b31deffcb1649cb79e64a927bb80905746dbaaefd WHIRLPOOL 90c51b72ecdf1b1fa9575e74d196e5d3e25cc4433fc74df283ad57e5953d7671c848d2e816cd19ca7216c2af9065c092c29a66c3d42247cb952a1890d99458bf DIST VMware-Player-6.0.6-2700073.x86_64.bundle.tar 198164480 SHA256 090f93c404d01475b4fc55db529f14e88457bde40b20140b5133a43e391dd866 SHA512 abdb5a6e6162ec297bdea4616f40ff734967fb04838ed75103ad7051a6120e4d4510f9fc192bd874382885e48444af4b00fc2dcd5f6d05929c615e5c379ae212 WHIRLPOOL 386b3a2b928ddf4ce149c1738412c46e0292648e54537b1164197d89b5dd5d86448fbe659141c2ca8d6f55ccd709e629d60b20311c69333bd2b33162a59f3a88 DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0 diff --git a/app-emulation/vmware-player/files/config-3.0 b/app-emulation/vmware-player/files/config-3.0 deleted file mode 100644 index cc83931..000 --- a/app-emulation/vmware-player/files/config-3.0 +++ /dev/null @@ -1,10 +0,0 @@ -VMCI_CONFED = "yes" -NETWORKING = "yes" -initscriptdir = "/etc/init.d" -VMBLOCK_CONFED = "yes" -authd.fullpath = "@@VM_INSTALL_DIR@@/sbin/vmware-authd" -gksu.rootMethod = "su" -VSOCK_CONFED = "yes" -libdir = "@@VM_INSTALL_DIR@@/lib/vmware" -bindir = "@@VM_INSTALL_DIR@@/bin" -product.buildNumber = "@@BUILD_NUMBER@@" diff --git a/app-emulation/vmware-player/files/vmware-3.0.rc b/app-emulation/vmware-player/files/vmware-3.0.rc deleted file mode 100644 index 25299fc..000 --- a/app-emulation/vmware-player/files/vmware-3.0.rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - modprobe -a vmmon vmci vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -r vsock vmci vmmon vmblock vmnet - eend $? -} diff --git a/app-emulation/vmware-player/vmware-player-5.0.3.1410761.ebuild b/app-emulation/vmware-player/vmware-player-5.0.3.1410761.ebuild deleted file mode 100644 index 4e416f2..000 --- a/app-emulation/vmware-player/vmware-player-5.0.3.1410761.ebuild +++ /dev/null @@
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 1cd2821457afb33341accea299b31f5f9cbdc050 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Sat Sep 19 18:39:46 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 19 18:45:36 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd28214 profiles: Mask VMware Workstation 9 and modules for security reasons, bug 516044 profiles/package.mask | 7 +++ 1 file changed, 7 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 406e158..31576f8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,13 @@ #--- END OF EXAMPLES --- +# Andreas K. Huettel(19 Sep 2015) +# Masked for security reasons, bugs 516044 +# Keeping it in the tree for now for users who cannot upgrade +# (commercial product, separate licenses for major versions) +=app-emulation/vmware-workstation-9* +=app-emulation/vmware-modules-271* + # Justin Lecher (15 Sep 2015) # Outdated and multiple bugs # Use upstream installer for up to version
[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/
commit: 4e372d85d905b9ddb865d748c1dbf8ae4a1219cc Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 19:02:18 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 19:02:18 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e372d85 dev-python/pytest: amd64/arm/hppa/ia64/ppc64/ppc/sparc/x86 stable, (ALLARCHES policy) wrt bug #560598 Package-Manager: portage-2.2.20.1 dev-python/pytest/pytest-2.7.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/pytest/pytest-2.7.2.ebuild b/dev-python/pytest/pytest-2.7.2.ebuild index dbb5d13..4d64801 100644 --- a/dev-python/pytest/pytest-2.7.2.ebuild +++ b/dev-python/pytest/pytest-2.7.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test" # When bumping, please check setup.py for the proper py version
[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftables/
commit: d87359c37c57ccc0a1b612ca29aa6d723f2e628e Author: Manuel Rüger gentoo org> AuthorDate: Sat Sep 19 21:46:01 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 19 21:46:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87359c3 net-firewall/nftables: Version bump Package-Manager: portage-2.2.20.1 net-firewall/nftables/Manifest| 1 + net-firewall/nftables/nftables-0.5.ebuild | 57 +++ 2 files changed, 58 insertions(+) diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest index a443926..34fa18e 100644 --- a/net-firewall/nftables/Manifest +++ b/net-firewall/nftables/Manifest @@ -1 +1,2 @@ DIST nftables-0.4.tar.bz2 362120 SHA256 f6ca69b75c68915f9f3a3972274ec68354dfbbcfc0b9fc55c813a0525c351d3c SHA512 0932cf987da602285fbf7c7f61328b0d74d687889c2d4a5bd2bd7fe11e8b99433bc5ee53ebbddadf2c90e40acdcb28f6babf07e11feedff815c571c3b782dffc WHIRLPOOL 1604010f260247c2fd98d33ca931eb0be6f38097937983aadfbdf2eb44fd3827212d00e6e6351821ccd8a2696fc696d9e7ec102d447387f930b8fb2afadc22a8 +DIST nftables-0.5.tar.gz 216740 SHA256 b48991f4e9e73b689bc254fa06b3ff3c1f937241d333291cb2ae72c0cd2398b6 SHA512 5d804ac9bb340446e52e5b0e86b726216ecc0d1eb42738cf133ba1acc5b442f720f5644005e02b9e3e8fae4e2bdc64d32560d6c6b1b26fe15bde24d62db51679 WHIRLPOOL 348d511c7ee530e6fb04b9828babad45407e4b60c443aaa8902aa9535705ff54cb78cd5e5c8ba970b57b97406b00718e94ab8a346fceaa82803bdaad84d30285 diff --git a/net-firewall/nftables/nftables-0.5.ebuild b/net-firewall/nftables/nftables-0.5.ebuild new file mode 100644 index 000..2162672 --- /dev/null +++ b/net-firewall/nftables/nftables-0.5.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 autotools linux-info + +DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://netfilter.org/projects/nftables/; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug gmp +readline" +SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + +RDEPEND=">=net-libs/libmnl-1.0.3 + >=net-libs/libnftnl-1.0.5 + gmp? ( dev-libs/gmp ) + readline? ( sys-libs/readline )" +DEPEND="${RDEPEND} + >=app-text/docbook2X-0.8.8-r4 + sys-devel/bison + sys-devel/flex" + +S="${WORKDIR}"/v${PV} + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} + +src_prepare() { + epatch_user + eautoreconf +} + +src_configure() { + econf \ + --sbindir="${EPREFIX}"/sbin \ + $(use_enable debug) \ + $(use_with readline cli) \ + $(use_with !gmp mini_gmp) +} + +src_install() { + default + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.init ${PN} + keepdir /var/lib/nftables +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/bicyclerepair/
commit: 0e0fafdc9338663f68113cfa79bc3120fe4fb39f Author: Patrice Clement gentoo org> AuthorDate: Sat Sep 19 17:41:23 2015 + Commit: Patrice Clement gentoo org> CommitDate: Sat Sep 19 19:21:50 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0fafdc dev-python/bicyclerepair: Stable for ppc+ppc64. Fixes bug 559288. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement gentoo.org> dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild index 794865a..7e3772a 100644 --- a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild +++ b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz" LICENSE="icu GPL-2+" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86" IUSE="emacs" DEPEND="emacs? (
[gentoo-commits] repo/gentoo:master commit in: dev-python/cddb-py/
commit: 8f19a56567b2e629664bcd94310caec4abe0ef5f Author: Patrice Clement gentoo org> AuthorDate: Sat Sep 19 17:39:29 2015 + Commit: Patrice Clement gentoo org> CommitDate: Sat Sep 19 19:21:44 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f19a565 dev-python/cddb-py: Stable for ppc+ppc64. Fixes bug 559290. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement gentoo.org> dev-python/cddb-py/cddb-py-1.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild index c9fd342..0c00639 100644 --- a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild +++ b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/cddb-py/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc ~x86" IUSE="" S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/
commit: bd3cb1c6f3848b2d80c5c0b98227b2c3b1a2829f Author: Patrice Clement gentoo org> AuthorDate: Sat Sep 19 18:26:44 2015 + Commit: Patrice Clement gentoo org> CommitDate: Sat Sep 19 19:21:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3cb1c6 dev-python/pytest: Clean up old. Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement gentoo.org> dev-python/pytest/Manifest| 1 - dev-python/pytest/pytest-2.7.1.ebuild | 61 --- 2 files changed, 62 deletions(-) diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index dade778..d9fee15 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,3 +1,2 @@ -DIST pytest-2.7.1.tar.gz 531671 SHA256 530f23c79e1b13850e93f3a59720f1eca75bad01307dc4fd694a6a19619fb9cb SHA512 1bc23bf67a7400b48b718ef3a03591a3b2047d58b633c6eb16ca4732a9198b3fbbce5a2bfc93097322988b65498ee1a7278d7e035e10d91e6b58d1d3b2a61eba WHIRLPOOL d8eb985d967d8e4b48cab2df58b1e7415bb961087e9a53f4336dc830291b0aa5d4679a49429d6cd67510ec19470a397e07a7c505fdee509c1ff508847b9c DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420dd10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06 DIST pytest-2.7.3.tar.gz 548235 SHA256 d5a9c3db3515ab95902ba08c09d1e941a21a440dc2d65f31bac02667508a9efc SHA512 ad9b57f202c60c247dd4753fb8391e3e88b390e34de678ea12384d81d76693dd37e04f11f6da19a6eda2c74a73db23789856ccaa325d32b4beb6bff86d9e4173 WHIRLPOOL 4aecd53142e503083abe2631bf403509c515d52176c430b7ab1e0becdf404e0fce4bad4343a4ab62525a6e008de0c35b4fac4a352d06938288dbf8deb8a4a250 diff --git a/dev-python/pytest/pytest-2.7.1.ebuild b/dev-python/pytest/pytest-2.7.1.ebuild deleted file mode 100644 index 535b170..000 --- a/dev-python/pytest/pytest-2.7.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 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 pypy3 ) -inherit distutils-r1 - -DESCRIPTION="py.test: simple powerful testing with Python" -HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -# When bumping, please check setup.py for the proper py version -PY_VER="1.4.25" -RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" - -#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30 -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pexpect[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - # Disable versioning of py.test script to avoid collision with - # versioning performed by the eclass. - sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" - grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" - - # Prevent un-needed d'loading - sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - mkdir doc/en/.build || die - emake -C doc/en html - fi -} - -python_test() { - # test_nose.py not written to suit py3.2 in pypy3 - if [[ "${EPYTHON}" == pypy3 ]]; then - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \ - --ignore=testing/test_nose.py \ - || die "tests failed with ${EPYTHON}" - else - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \ - || die "tests failed with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && dohtml -r doc/en/_build/html/ - distutils-r1_python_install_all -}
[gentoo-commits] repo/gentoo:master commit in: profiles/arch/alpha/
commit: c189e02c60be24874d98e5761b2a42be8bbd98d9 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Sep 19 18:24:04 2015 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Sep 19 18:25:46 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c189e02c app-portage/layman: mask g-sorcery USE flag on alpha g-sorcery pulls in a lot of dependencies, some of which do not even compile on alpha. Gentoo-Bug: 552330 profiles/arch/alpha/package.use.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index e6124c1..ca3a5f7 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -2,6 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Tobias Klausmann(19 Sep 2015) +# app-portage/g-sorcery pulls in pymongo and a whole host of deps that don't +# work on alpha. Mask USE flag for layman accordingly +app-portage/layman -g-sorcery + # Brian Evans (17 Sep 2015) # Mask new USE flags for percona-server which are not available on alpha dev-db/percona-server tokudb tokudb-backup-plugin
[gentoo-commits] repo/gentoo:master commit in: games-action/powermanga/
commit: c1017388e19295987af898da1fbb08e26fa799fa Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:39:38 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:39:38 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1017388 games-action/powermanga: amd64 stable wrt bug #558874 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" games-action/powermanga/powermanga-0.93.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-action/powermanga/powermanga-0.93.1.ebuild b/games-action/powermanga/powermanga-0.93.1.ebuild index c9063d1..15bf42e 100644 --- a/games-action/powermanga/powermanga-0.93.1.ebuild +++ b/games-action/powermanga/powermanga-0.93.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://linux.tlk.fr/games/Powermanga/download/${P}.tgz; LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="" RDEPEND=">=media-libs/libsdl-1.2[sound,joystick,video]
[gentoo-commits] repo/gentoo:master commit in: dev-games/goatee/
commit: 9166a53c1957e305aff40f950822c5de3cbad3ad Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:39:27 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:39:27 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9166a53c dev-games/goatee: amd64 stable wrt bug #554266 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" dev-games/goatee/goatee-0.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/goatee/goatee-0.3.0.ebuild b/dev-games/goatee/goatee-0.3.0.ebuild index 2f4bce7..c95f789 100644 --- a/dev-games/goatee/goatee-0.3.0.ebuild +++ b/dev-games/goatee/goatee-0.3.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=">=dev-haskell/mtl-2.1:=[profile?]
[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/
commit: 868b5dec85cd32c602eb2d07040e4715d37ffcd2 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:39:22 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:39:22 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868b5dec games-strategy/wesnoth: amd64 stable wrt bug #558872 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" games-strategy/wesnoth/wesnoth-1.12.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/wesnoth/wesnoth-1.12.4.ebuild b/games-strategy/wesnoth/wesnoth-1.12.4.ebuild index 080e59e..9727e0f 100644 --- a/games-strategy/wesnoth/wesnoth-1.12.4.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.12.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="dbus dedicated doc fribidi nls server" RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/connectagram/
commit: 059094ff23b99dec7942ab33a293d8af036f2fea Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:39:44 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:39:44 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059094ff games-puzzle/connectagram: amd64 stable wrt bug #558950 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" games-puzzle/connectagram/connectagram-1.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1.ebuild index e1443bc..6fb4a5f 100644 --- a/games-puzzle/connectagram/connectagram-1.2.1.ebuild +++ b/games-puzzle/connectagram/connectagram-1.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2; LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" RDEPEND=">=dev-qt/qtcore-5.2:5
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/tanglet/
commit: bc011ee0f325643a6579ac24ba6e6df7db43b626 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 18:39:33 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 18:39:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc011ee0 games-puzzle/tanglet: amd64 stable wrt bug #558948 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" games-puzzle/tanglet/tanglet-1.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1.ebuild index 052bdb8..b4fa537 100644 --- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild +++ b/games-puzzle/tanglet/tanglet-1.3.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2; LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND="sys-libs/zlib
[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: core/etc/grs/
commit: e35d4907b4c24885b3eefeb2423d48443a28f3b9 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:16:26 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:29:59 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=e35d4907 world.conf: tweak flags for consistent @world. core/etc/grs/world.conf | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index a8ddb3d..31d92ea 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -4411,7 +4411,7 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X package.use : media-fonts/font-cursor-misc:0 -nls X [media-fonts/font-misc-misc:0] -package.use : media-fonts/font-misc-misc:0 -nls X +package.use : media-fonts/font-misc-misc:0 nls X [media-fonts/font-schumacher-misc:0] package.use : media-fonts/font-schumacher-misc:0 -nls X @@ -7414,6 +7414,9 @@ package.use : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k [virtual/jpeg:0] package.use : virtual/jpeg:0 static-libs +[virtual/libmysqlclient:0] +package.use : virtual/libmysqlclient:0 static-libs + [virtual/libgudev:0] package.use : virtual/libgudev:0 -introspection -systemd static-libs
[gentoo-commits] proj/grs:desktop-amd64-musl-hardened commit in: core/etc/grs/
commit: ca7c61f8ae23bdfbb243d17da5e939654eee61d7 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:16:26 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:30:08 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=ca7c61f8 world.conf: tweak flags for consistent @world. core/etc/grs/world.conf | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index ae696f4..30155e9 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -4341,7 +4341,7 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X package.use : media-fonts/font-cursor-misc:0 -nls X [media-fonts/font-misc-misc:0] -package.use : media-fonts/font-misc-misc:0 -nls X +package.use : media-fonts/font-misc-misc:0 nls X [media-fonts/font-schumacher-misc:0] package.use : media-fonts/font-schumacher-misc:0 -nls X @@ -7300,6 +7300,9 @@ package.use : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k [virtual/jpeg:0] package.use : virtual/jpeg:0 static-libs +[virtual/libmysqlclient:0] +package.use : virtual/libmysqlclient:0 static-libs + [virtual/libgudev:0] package.use : virtual/libgudev:0 -introspection -systemd static-libs
[gentoo-commits] proj/grs:desktop-amd64-x32-hardened commit in: core/etc/grs/
commit: ff1b41375eac8c4152a827d32d71f8c100eb9397 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:16:26 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:30:17 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=ff1b4137 world.conf: tweak flags for consistent @world. core/etc/grs/world.conf | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 0d4323e..7b409cf 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -4339,7 +4339,7 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X package.use : media-fonts/font-cursor-misc:0 -nls X [media-fonts/font-misc-misc:0] -package.use : media-fonts/font-misc-misc:0 -nls X +package.use : media-fonts/font-misc-misc:0 nls X [media-fonts/font-schumacher-misc:0] package.use : media-fonts/font-schumacher-misc:0 -nls X @@ -7286,6 +7286,9 @@ package.use : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k [virtual/jpeg:0] package.use : virtual/jpeg:0 static-libs +[virtual/libmysqlclient:0] +package.use : virtual/libmysqlclient:0 static-libs + [virtual/libgudev:0] package.use : virtual/libgudev:0 -introspection -systemd static-libs
[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: core/etc/grs/
commit: 2d7916d7b7afad72dbe59b2fa6b5210380a4b575 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:29:18 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:33:56 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=2d7916d7 world.conf: move dev-perl/text-reform to dev-perl/Text-Reform. core/etc/grs/world.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 31d92ea..4b34d8f 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -2308,6 +2308,9 @@ package.use : dev-perl/Text-CSV_XS:0 -test [dev-perl/Text-Format:0] package.use : dev-perl/Text-Format:0 -test +[dev-perl/Text-Reform:0] +package.use : dev-perl/Text-Reform:0 -test + [dev-perl/Tie-Array-Sorted:0] package.use : dev-perl/Tie-Array-Sorted:0 -test @@ -2371,9 +2374,6 @@ package.use : dev-perl/module-info:0 -test [dev-perl/net-server:0] package.use : dev-perl/net-server:0 ipv6 -[dev-perl/text-reform:0] -package.use : dev-perl/text-reform:0 -test - [dev-php/smarty-docs:0] package.use : dev-php/smarty-docs:0 -html pdf
[gentoo-commits] proj/pax-utils: New tag: v1.1.3
commit: Commit: Mike Frysinger gentoo org> CommitDate: Sat Sep 19 06:27:23 2015 + New tag: v1.1.3
[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/, x11-misc/virtualgl/
commit: 945fef13fa4820de9ebafdf8c399d19f74418954 Author: Pacho Ramos gentoo org> AuthorDate: Sat Sep 19 08:48:29 2015 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Sep 19 08:48:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945fef13 Fix handling of SDDM (#539340 by Rafal Lalik) Package-Manager: portage-2.2.20.1 x11-misc/virtualgl/files/vgl.confd-r2| 27 + x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild | 83 2 files changed, 110 insertions(+) diff --git a/x11-misc/virtualgl/files/vgl.confd-r2 b/x11-misc/virtualgl/files/vgl.confd-r2 new file mode 100644 index 000..a0cf7c5 --- /dev/null +++ b/x11-misc/virtualgl/files/vgl.confd-r2 @@ -0,0 +1,27 @@ +# /etc/conf.d/vgl + +DISPLAY="${DISPLAY:-:0}" + +# Make it a function in case we have to repeat it in init script later +set_xauth() { + +# common case (works in almost all tested environments (except of lightdm)): +XAUTHORITY="$(ps wwax -C X,Xorg -o args= --sort=-stime | grep -m 1 -o '\B[-]auth\s*/var\S*' | cut -d ' ' -f 2)" + +# kdm and some others: +# XAUTHORITY="$(find /var/run/xauth/A${DISPLAY}-*|tail -n1)" + +# gdm: +# XAUTHORITY="/var/gdm/${DISPLAY}.Xauth" + +# slim: +# XAUTHORITY="/var/run/slim.auth" + +# lightdm: +# XAUTHORITY="/var/run/lightdm/root/${DISPLAY}" + +# lxdm: +# XAUTHORITY="/var/run/lxdm/lxdm-${DISPLAY}.auth" + +} +set_xauth diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild new file mode 100644 index 000..926a7d7 --- /dev/null +++ b/x11-misc/virtualgl/virtualgl-2.4.1-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-multilib multilib systemd + +DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" +HOMEPAGE="http://www.virtualgl.org/; + +MY_PN="VirtualGL" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" +SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz" + +SLOT="0" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +RDEPEND=" + ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] ) + media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXv[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + amd64? ( abi_x86_32? ( + >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] + >=x11-libs/libX11-1.6.2[abi_x86_32] + >=x11-libs/libXext-1.3.2[abi_x86_32] + >=x11-libs/libXv-1.0.10[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32] + >=virtual/opengl-7.0-r1[abi_x86_32] + ) ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + # Use /var/lib, bug #428122 + sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ + server/vglrun.in server/vglgenkey server/vglserver_config || die + + default +} + +src_configure() { + abi_configure() { + local mycmakeargs=( + $(cmake-utils_use ssl VGL_USESSL) + -DVGL_DOCDIR=/usr/share/doc/"${P}" + -DTJPEG_INCLUDE_DIR=/usr/include + -DVGL_LIBDIR=/usr/$(get_libdir) + -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so + -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) + -DVGL_FAKELIBDIR=/usr/fakelib/${ABI} + ) + cmake-utils_src_configure + } + multilib_parallel_foreach_abi abi_configure +} + +src_install() { + cmake-multilib_src_install + + # Make config dir + dodir /var/lib/VirtualGL + fowners root:video /var/lib/VirtualGL + fperms 0750 /var/lib/VirtualGL + newinitd "${FILESDIR}/vgl.initd-r2" vgl + newconfd "${FILESDIR}/vgl.confd-r2" vgl + + exeinto /usr/libexec + doexe "${FILESDIR}/vgl-helper.sh" + systemd_dounit "${FILESDIR}/vgl.service" + + # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + mv "${D}"/usr/bin/{,v}glxinfo || die + + # Remove license files, bug 536284 + rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die +}
[gentoo-commits] proj/perl-overlay:master commit in: dev-perl/Padre-Plugin-Autoformat/
commit: 20695befffa909218e4acb3d526e8e5ad56136b0 Author: Kent Fredric gmail com> AuthorDate: Sat Sep 19 02:57:37 2015 + Commit: Kent Fredric gmail com> CommitDate: Sat Sep 19 02:57:37 2015 + URL:https://gitweb.gentoo.org/proj/perl-overlay.git/commit/?id=20695bef dev-perl/Padre-Plugin-Autoformat: Fix deps, esp dev-perl/Text-Autoformat Package-Manager: portage-2.2.17 ...d => Padre-Plugin-Autoformat-1.220.0-r2.ebuild} | 22 +- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dev-perl/Padre-Plugin-Autoformat/Padre-Plugin-Autoformat-1.220.0-r1.ebuild b/dev-perl/Padre-Plugin-Autoformat/Padre-Plugin-Autoformat-1.220.0-r2.ebuild similarity index 51% rename from dev-perl/Padre-Plugin-Autoformat/Padre-Plugin-Autoformat-1.220.0-r1.ebuild rename to dev-perl/Padre-Plugin-Autoformat/Padre-Plugin-Autoformat-1.220.0-r2.ebuild index c6913bf..0bd8a80 100644 --- a/dev-perl/Padre-Plugin-Autoformat/Padre-Plugin-Autoformat-1.220.0-r1.ebuild +++ b/dev-perl/Padre-Plugin-Autoformat/Padre-Plugin-Autoformat-1.220.0-r2.ebuild @@ -12,12 +12,24 @@ DESCRIPTION="reformat your text within Padre" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=dev-perl/Module-Build-0.36.01" -RDEPEND="app-editors/padre - dev-perl/text-autoformat" +IUSE="test" +# r: File::Basename -> perl +# r: File::Spec::Functions -> File-Spec +RDEPEND=" + >=app-editors/padre-0.570.0 + dev-perl/Text-Autoformat + virtual/perl-File-Spec +" +# t: Test::More -> Test-Simple +DEPEND=" + ${RDEPEND} + >=dev-perl/Module-Build-0.360.100 + test? ( + >=dev-perl/Locale-Msgfmt-0.150.0 + virtual/perl-Test-Simple + ) +" src_test() { VIRTUALX_COMMAND="perl-module_src_test" virtualmake }
[gentoo-commits] proj/perl-overlay:master commit in: dev-perl/Plack-Middleware-FixMissingBodyInRedirect/
commit: 8bcbc1110bf1a7670a134bb1bd30c8289c17187f Author: Kent Fredric gmail com> AuthorDate: Sun Aug 30 11:24:35 2015 + Commit: Kent Fredric gmail com> CommitDate: Sun Aug 30 11:24:35 2015 + URL:https://gitweb.gentoo.org/proj/perl-overlay.git/commit/?id=8bcbc111 dev-perl/Plack-Middleware-FixMissingBodyInRedirect: Fix/update invalid remote-id in metadata.xml Package-Manager: portage-2.2.17 dev-perl/Plack-Middleware-FixMissingBodyInRedirect/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-perl/Plack-Middleware-FixMissingBodyInRedirect/metadata.xml b/dev-perl/Plack-Middleware-FixMissingBodyInRedirect/metadata.xml index 67f24f7..e56a745 100644 --- a/dev-perl/Plack-Middleware-FixMissingBodyInRedirect/metadata.xml +++ b/dev-perl/Plack-Middleware-FixMissingBodyInRedirect/metadata.xml @@ -7,7 +7,7 @@ Michele Beltrame - Plack::Middleware::FixMissingBodyInRedirect + Plack-Middleware-FixMissingBodyInRedirect Plack::Middleware::FixMissingBodyInRedirect
[gentoo-commits] proj/grs:desktop-amd64-hardened commit in: core/etc/grs/
commit: 128f4f7e5e4c69ca1ce047a92e9d94c0b9b16d3d Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:16:26 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:16:26 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=128f4f7e world.conf: tweak flags for consistent @world. core/etc/grs/world.conf | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 0d4323e..7b409cf 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -4339,7 +4339,7 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X package.use : media-fonts/font-cursor-misc:0 -nls X [media-fonts/font-misc-misc:0] -package.use : media-fonts/font-misc-misc:0 -nls X +package.use : media-fonts/font-misc-misc:0 nls X [media-fonts/font-schumacher-misc:0] package.use : media-fonts/font-schumacher-misc:0 -nls X @@ -7286,6 +7286,9 @@ package.use : virtual/ffmpeg:0 -libav -truetype -vdpau -x264 X encode gsm jpeg2k [virtual/jpeg:0] package.use : virtual/jpeg:0 static-libs +[virtual/libmysqlclient:0] +package.use : virtual/libmysqlclient:0 static-libs + [virtual/libgudev:0] package.use : virtual/libgudev:0 -introspection -systemd static-libs
[gentoo-commits] repo/gentoo:master commit in: app-misc/pax-utils/
commit: 5cb4ae639035b227110e2410ac353f4199a698d1 Author: Mike Frysinger gentoo org> AuthorDate: Sat Sep 19 06:26:29 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Sep 19 06:26:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb4ae63 app-misc/pax-utils: version bump to 1.1.3 app-misc/pax-utils/Manifest | 1 + app-misc/pax-utils/pax-utils-1.1.3.ebuild | 58 +++ 2 files changed, 59 insertions(+) diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest index 13bb481..e8b1d25 100644 --- a/app-misc/pax-utils/Manifest +++ b/app-misc/pax-utils/Manifest @@ -6,4 +6,5 @@ DIST pax-utils-1.0.5.tar.xz 622532 SHA256 f69a9938e4af7912d26d585094bc0203e43571 DIST pax-utils-1.0.tar.xz 619104 SHA256 c39fcc181c7c6a03527687d9977e1c2ce2b47b28918426a057d56b43a429e312 SHA512 ec44e5f848e64ba70eeb2ca670189c84a0b0d36ee745ae956ee56d291dd3c5b3fe56527867a52e264babfbaaad49ec59338fadc297256a7a4708cf65f97db4c5 WHIRLPOOL 86f91917d7723066a849f2225987b9739f3c484626735c77ee27286ea1785e316b374110226688ad8d380b90b5aa140e1060cc2411cd6d1d250a1918ed33d575 DIST pax-utils-1.1.1.tar.xz 627640 SHA256 9ea1f28b3665da08fd80384e56d2a71bfa9f279983e683a162eb4993b2df8d3e SHA512 a8680f9bc99edef56d24175b5967dd967daaa8ae40c0c68f0e9ff3a23ac90a7cb341c99a47a0f6e29504c3f2740039920258a69267ee89549525d02306a8d70e WHIRLPOOL 7ee993224d54d82527c99d9d46c30f2bca0e464660b2ebedaf43076287894247db8111e3f5b558140f03b743939939849f03bcb134b2ac7776bb30553a183c45 DIST pax-utils-1.1.2.tar.xz 627732 SHA256 49390215f6a4773a9c0a99a6de90ff768d13ce2eb4ba1a869603b81f697fce3e SHA512 7a97ff3f68ef67084d1785c95aed2bef5c3bd6fe0c67b96310bd236dc0a403ab5fa86d2b719bdc493b6d6ce07e43af41cc1ff3aa0bd726f2896494079996bff7 WHIRLPOOL c94e1c55a183ce6a6d44a0993ca6c3c34d41f1fad43dabdc9994357747a159e1578e61f13634c4379d324640c4b1d67073e82992f521964acd64598fa7c342f8 +DIST pax-utils-1.1.3.tar.xz 627536 SHA256 b80c923c0231a17aa2db5fce3d81c3b7d061cd8e6b356fecceadb2e9a8ee9bc6 SHA512 0bd5efe455edfbe06e938fab62f7d452bcefe6f426881bfebc8252bf386807a3f50ffa9cadbf8cf4aa514839ba94d3f28b16fea163ae738ef8fdeed28fe9204c WHIRLPOOL 1730c25bfda22d4523c8d8f30fe01a09790131efbfeae21ef1e1917c8fdcd9f8aa0053194c7f32a254fa70b963594e5f399f79f287793afd5b8b7fbafcafc806 DIST pax-utils-1.1.tar.xz 627392 SHA256 97ed475ae9f91cf5ca47eeb39abe6033db77e480469dad7c7823ed16be2475ad SHA512 24569a8bbcd635b163f1dc84d4a74dac2e89fc5a18bdb0ead8db78dde5f0661f3d4d51118818f028bc5359447a2d9156ab394ffb26b5c64e377f3bf4536cecb5 WHIRLPOOL e5d1782904bd31ad93e09486ee01bf0af7a33db7bde6eaefdfeaaa462632b1f66633065509b7b79bf493030b0c104472446f7aaf7fbc549564715ffebe5eeb38 diff --git a/app-misc/pax-utils/pax-utils-1.1.3.ebuild b/app-misc/pax-utils/pax-utils-1.1.3.ebuild new file mode 100644 index 000..fc79319 --- /dev/null +++ b/app-misc/pax-utils/pax-utils-1.1.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils toolchain-funcs unpacker + +DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities; +SRC_URI="mirror://gentoo/${P}.tar.xz + http://dev.gentoo.org/~solar/pax/${P}.tar.xz + http://dev.gentoo.org/~vapier/dist/${P}.tar.xz; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="caps debug python seccomp" + +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( dev-python/pyelftools ) + seccomp? ( sys-libs/libseccomp )" +DEPEND="${RDEPEND} + caps? ( virtual/pkgconfig ) + seccomp? ( virtual/pkgconfig ) + app-arch/xz-utils" + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux || \ + has_version '
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 9575f819a56b7bc4cb501fb63185b43084b66bd5 Author: Mike Frysinger gentoo org> AuthorDate: Sat Sep 19 06:17:45 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Sep 19 06:17:45 2015 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=9575f819 security: fix build on systems w/out si_syscall Make sure we do not try to use si_syscall when it isn't available. URL: https://bugs.gentoo.org/560098 security.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/security.c b/security.c index af06dcb..8776a80 100644 --- a/security.c +++ b/security.c @@ -44,11 +44,14 @@ static int pax_seccomp_rules_add(scmp_filter_ctx ctx, int syscalls[], size_t num static void pax_seccomp_sigal(__unused__ int signo, siginfo_t *info, __unused__ void *context) { +#ifdef si_syscall warn("seccomp violated: syscall %i", info->si_syscall); fflush(stderr); -#ifdef si_syscall warn(" syscall = %s", seccomp_syscall_resolve_num_arch(seccomp_arch_native(), info->si_syscall)); + fflush(stderr); +#else + warn("seccomp violated: syscall unknown (no si_syscall)"); #endif kill(getpid(), SIGSYS); _exit(1);
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 1f7a936b5cd7673275540ef73fdeb29fba821a15 Author: Mike Frysinger gentoo org> AuthorDate: Sat Sep 19 05:08:46 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Sep 19 05:08:46 2015 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=1f7a936b security: whitelist the futex syscall When building with openmp, often libpthread is linked in and code automatically generated using it. That means lower mutexes end up calling the futex syscall. This isn't just when pax-utils is built with openmp, but it also applies when libraries it links with are built with openmp. Reported-by: florianmey gmx.de URL: https://bugs.gentoo.org/559814 security.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/security.c b/security.c index da881e8..af06dcb 100644 --- a/security.c +++ b/security.c @@ -123,6 +123,9 @@ static void pax_seccomp_init(bool allow_forking) SCMP_SYS(_llseek), SCMP_SYS(mprotect), + /* Syscalls listed because of compiler settings. */ + SCMP_SYS(futex), + /* Syscalls listed because of sandbox. */ SCMP_SYS(readlink),
[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/
commit: 89417912ce79d5e1f497625ce13ed02b2003b08b Author: Mike Frysinger gentoo org> AuthorDate: Sat Sep 19 02:30:08 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Sep 19 06:24:46 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89417912 media-tv/kodi: run the codegenerator when USE=java #558798 Since we don't include the precompiled generated files when USE=java, make sure we explicitly run the bootstrap step since the build doesn't handle it for us. media-tv/kodi/kodi-15.1.ebuild | 6 -- media-tv/kodi/kodi-.ebuild | 6 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild index f8a9d2a..912c5e5 100644 --- a/media-tv/kodi/kodi-15.1.ebuild +++ b/media-tv/kodi/kodi-15.1.ebuild @@ -9,7 +9,7 @@ EAPI="5" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite" -inherit eutils linux-info python-single-r1 multiprocessing autotools +inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs CODENAME="Isengard" case ${PV} in @@ -172,7 +172,9 @@ src_prepare() { multijob_finish elibtoolize - [[ ${PV} == "" ]] && emake -f codegenerator.mk + if [[ ${PV} == "" ]] || use java ; then #558798 + tc-env_build emake -f codegenerator.mk + fi # Disable internal func checks as our USE/DEPEND # stuff handles this just fine already #408395 diff --git a/media-tv/kodi/kodi-.ebuild b/media-tv/kodi/kodi-.ebuild index 5c7905d..165dacb 100644 --- a/media-tv/kodi/kodi-.ebuild +++ b/media-tv/kodi/kodi-.ebuild @@ -9,7 +9,7 @@ EAPI="5" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite" -inherit eutils linux-info python-single-r1 multiprocessing autotools +inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs CODENAME="Isengard" case ${PV} in @@ -172,7 +172,9 @@ src_prepare() { multijob_finish elibtoolize - [[ ${PV} == "" ]] && emake -f codegenerator.mk + if [[ ${PV} == "" ]] || use java ; then #558798 + tc-env_build emake -f codegenerator.mk + fi # Disable internal func checks as our USE/DEPEND # stuff handles this just fine already #408395
[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: core/var/lib/portage/, core/etc/grs/
commit: 654aaec4ec7432eb11ea0450e5edf160feb294c5 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 07:39:30 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 07:39:30 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=654aaec4 Drop x2goserver because it requires USE=nls. core/etc/grs/world.conf| 6 -- core/var/lib/portage/world.CYCLE.4 | 1 - 2 files changed, 7 deletions(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 4b34d8f..c8c8d1d 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -4410,9 +4410,6 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X [media-fonts/font-cursor-misc:0] package.use : media-fonts/font-cursor-misc:0 -nls X -[media-fonts/font-misc-misc:0] -package.use : media-fonts/font-misc-misc:0 nls X - [media-fonts/font-schumacher-misc:0] package.use : media-fonts/font-schumacher-misc:0 -nls X @@ -6496,9 +6493,6 @@ package.use : net-misc/wol:0 -nls [net-misc/wput:0] package.use : net-misc/wput:0 -debug -nls ssl -[net-misc/x2goserver:0] -package.use : net-misc/x2goserver:0 -postgres fuse sqlite - [net-misc/youtube-dl:0] package.use : net-misc/youtube-dl:0 -offensive -test diff --git a/core/var/lib/portage/world.CYCLE.4 b/core/var/lib/portage/world.CYCLE.4 index a881bcf..a99a18b 100644 --- a/core/var/lib/portage/world.CYCLE.4 +++ b/core/var/lib/portage/world.CYCLE.4 @@ -2730,7 +2730,6 @@ net-misc/wakeonlan net-misc/whatmask net-misc/wol net-misc/wput -net-misc/x2goserver net-misc/yandex-disk net-misc/youtube-viewer net-misc/ytalk
[gentoo-commits] proj/grs:desktop-amd64-musl-hardened commit in: core/etc/grs/
commit: fd41bc441e6cb6510243e48a2e1b4b49ee5444c2 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:29:18 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:33:49 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=fd41bc44 world.conf: move dev-perl/text-reform to dev-perl/Text-Reform. core/etc/grs/world.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 30155e9..aa7de55 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -2259,6 +2259,9 @@ package.use : dev-perl/Text-CSV_XS:0 -test [dev-perl/Text-Format:0] package.use : dev-perl/Text-Format:0 -test +[dev-perl/Text-Reform:0] +package.use : dev-perl/Text-Reform:0 -test + [dev-perl/Tie-Array-Sorted:0] package.use : dev-perl/Tie-Array-Sorted:0 -test @@ -2322,9 +2325,6 @@ package.use : dev-perl/module-info:0 -test [dev-perl/net-server:0] package.use : dev-perl/net-server:0 ipv6 -[dev-perl/text-reform:0] -package.use : dev-perl/text-reform:0 -test - [dev-php/smarty-docs:0] package.use : dev-php/smarty-docs:0 -html pdf
[gentoo-commits] proj/grs:desktop-amd64-x32-hardened commit in: core/etc/grs/
commit: 20c72d4aebf34f106484ff220299ce9e9294e613 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:29:18 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:34:50 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=20c72d4a world.conf: move dev-perl/text-reform to dev-perl/Text-Reform. core/etc/grs/world.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 7b409cf..9520a1c 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -2262,6 +2262,9 @@ package.use : dev-perl/Text-CSV_XS:0 -test [dev-perl/Text-Format:0] package.use : dev-perl/Text-Format:0 -test +[dev-perl/Text-Reform:0] +package.use : dev-perl/Text-Reform:0 -test + [dev-perl/Tie-Array-Sorted:0] package.use : dev-perl/Tie-Array-Sorted:0 -test @@ -2325,9 +2328,6 @@ package.use : dev-perl/module-info:0 -test [dev-perl/net-server:0] package.use : dev-perl/net-server:0 ipv6 -[dev-perl/text-reform:0] -package.use : dev-perl/text-reform:0 -test - [dev-php/smarty-docs:0] package.use : dev-php/smarty-docs:0 -html pdf
[gentoo-commits] proj/sci: Branch deleted: lapack-multibuild
commit: Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 19 06:57:05 2015 + Branch deleted: lapack-multibuild
[gentoo-commits] proj/sci: Branch deleted: cuda
commit: Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 19 07:10:52 2015 + Branch deleted: cuda
[gentoo-commits] proj/sci: Branch deleted: jlec
commit: Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 19 07:10:58 2015 + Branch deleted: jlec
[gentoo-commits] proj/sci: Branch deleted: fixing
commit: Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 19 07:11:02 2015 + Branch deleted: fixing
[gentoo-commits] proj/grs:desktop-amd64-hardened commit in: core/etc/grs/
commit: 8a721dc7f666a91df03d84709e5cfae4fc05c365 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Sep 19 06:29:18 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 19 06:29:18 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=8a721dc7 world.conf: move dev-perl/text-reform to dev-perl/Text-Reform. core/etc/grs/world.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf index 7b409cf..9520a1c 100644 --- a/core/etc/grs/world.conf +++ b/core/etc/grs/world.conf @@ -2262,6 +2262,9 @@ package.use : dev-perl/Text-CSV_XS:0 -test [dev-perl/Text-Format:0] package.use : dev-perl/Text-Format:0 -test +[dev-perl/Text-Reform:0] +package.use : dev-perl/Text-Reform:0 -test + [dev-perl/Tie-Array-Sorted:0] package.use : dev-perl/Tie-Array-Sorted:0 -test @@ -2325,9 +2328,6 @@ package.use : dev-perl/module-info:0 -test [dev-perl/net-server:0] package.use : dev-perl/net-server:0 ipv6 -[dev-perl/text-reform:0] -package.use : dev-perl/text-reform:0 -test - [dev-php/smarty-docs:0] package.use : dev-php/smarty-docs:0 -html pdf
[gentoo-commits] proj/dotnet:master commit in: eclass/
commit: 7e367361cb29ff4c8dbad720fe142b6c2c78a672 Author: ArsenShnurkov gmail com> AuthorDate: Fri Sep 18 04:38:47 2015 + Commit: Heather Cynede gentoo org> CommitDate: Fri Sep 18 04:38:47 2015 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=7e367361 missed function eclass/mpt-r20150903.eclass | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eclass/mpt-r20150903.eclass b/eclass/mpt-r20150903.eclass index 930a70e..427338d 100644 --- a/eclass/mpt-r20150903.eclass +++ b/eclass/mpt-r20150903.eclass @@ -25,13 +25,21 @@ empt-gitmodules() { empt-sln() { "${TOOLS_PATH}/empt-sln" $@ || die } + # @FUNCTION: empt-csproj # @DESCRIPTION: wraps mpt-csproj empt-csproj() { "${TOOLS_PATH}/empt-csproj" $@ || die } -# @FUNCTION: eempt-machine + +# @FUNCTION: empt-machine # @DESCRIPTION: wraps empt-machine empt-machine() { "${TOOLS_PATH}/empt-machine" $@ || die } + +# @FUNCTION: empt-nuget +# @DESCRIPTION: wraps empt-nuget +empt-nuget() { + "${TOOLS_PATH}/empt-nuget" $@ || die +}
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
commit: 7c528924b36e66dac17a4b528cbeb467e36f086c Author: Alexis Ballier gentoo org> AuthorDate: Sat Sep 19 11:59:28 2015 + Commit: Alexis Ballier gentoo org> CommitDate: Sat Sep 19 11:59:28 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c528924 sci-electronics/gazebo: remove old. Package-Manager: portage-2.2.20.1 sci-electronics/gazebo/Manifest | 1 - sci-electronics/gazebo/files/bullet_283.patch | 41 sci-electronics/gazebo/gazebo-5.1.0.ebuild| 69 --- 3 files changed, 111 deletions(-) diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 7bfa15f..be018d6 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,2 +1 @@ DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74 -DIST gazebo5_5.1.0.tar.bz2 49544340 SHA256 eac72ca2633deb7ea0f5e775c1208f0743d98c8b53083607df77bae6e38ab0b1 SHA512 d3222d9d98cc9d1c52bc1bb24e12ece7ff8d8506782f9cd2d574a1aca8556e33d93781f4d2c91eacfe317a35c7cddfa2c4a4fdb58da1f348142f6a887de3c981 WHIRLPOOL 5e9e01195b02581d684ee0c5e30f9ace0210a7b61a59a63b7a3c01c8c672230ad026f998ed93583eafb9b640c73c9df350e578a774d9579fdb8574570fa0bd94 diff --git a/sci-electronics/gazebo/files/bullet_283.patch b/sci-electronics/gazebo/files/bullet_283.patch deleted file mode 100644 index cc1649b..000 --- a/sci-electronics/gazebo/files/bullet_283.patch +++ /dev/null @@ -1,41 +0,0 @@ -# HG changeset patch -# User Steve Peters-# Date 1430782295 25200 -# Branch issue_1074 -# Node ID 05b7ee5db6f524e19b6cca54d66208cb48a0854c -# Parent 2cbd32c6246166f6f50af3503553180e7c1cd4a4 -Fix build when compiled against bullet 2.83 - -diff --git a/gazebo/physics/bullet/BulletHinge2Joint.cc b/gazebo/physics/bullet/BulletHinge2Joint.cc a/gazebo/physics/bullet/BulletHinge2Joint.cc -+++ b/gazebo/physics/bullet/BulletHinge2Joint.cc -@@ -211,8 +211,12 @@ - return math::Angle(); - } - -- btRotationalLimitMotor *motor = --this->bulletHinge2->getRotationalLimitMotor(_index); -+#ifndef LIBBULLET_VERSION_GT_282 -+ btRotationalLimitMotor -+#else -+ btRotationalLimitMotor2 -+#endif -+*motor = this->bulletHinge2->getRotationalLimitMotor(_index); - if (motor) - return motor->m_hiLimit; - -@@ -229,8 +233,12 @@ - return math::Angle(0.0); - } - -- btRotationalLimitMotor *motor = --this->bulletHinge2->getRotationalLimitMotor(_index); -+#ifndef LIBBULLET_VERSION_GT_282 -+ btRotationalLimitMotor -+#else -+ btRotationalLimitMotor2 -+#endif -+ *motor = this->bulletHinge2->getRotationalLimitMotor(_index); - if (motor) - return motor->m_loLimit; - diff --git a/sci-electronics/gazebo/gazebo-5.1.0.ebuild b/sci-electronics/gazebo/gazebo-5.1.0.ebuild deleted file mode 100644 index d32b6ba..000 --- a/sci-electronics/gazebo/gazebo-5.1.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils versionator vcs-snapshot flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/; -SRC_URI="https://bitbucket.org/osrf/gazebo/get/${PN}$(get_major_version)_${PV}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 libav test" - -RDEPEND=" - >=dev-libs/protobuf-2.3.0 - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - dev-libs/libtar - dev-cpp/tbb - >=dev-games/ogre-1.7.4 - sci-libs/libccd - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - sci-libs/gts - >=sci-physics/bullet-2.82 - >=dev-libs/sdformat-2.3.1 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/boost:=[threads] - sci-libs/gdal - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage -" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - app-text/ronn - virtual/pkgconfig -" -S="${WORKDIR}/${PN}$(get_major_version)_${PV}" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/bullet_283.patch" - "${FILESDIR}/ffmpeg29.patch" -) - -src_configure() { - # doesnt build without it - append-cxxflags "-std=c++11" - # doesnt build with as-needed either - append-ldflags "-Wl,--no-as-needed" - - has_version '>=sci-physics/bullet-2.83' && append-cppflags "-DLIBBULLET_VERSION_GT_282=1" - - local mycmakeargs=( - "-DUSE_UPSTREAM_CFLAGS=OFF" -