[gentoo-commits] repo/gentoo:master commit in: app-admin/gtkdiskfree/
commit: dd6bc0c01dbe559ed3f416dceae29650978f8b8b Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Sun Jun 19 17:06:46 2016 + Commit: Göktürk Yüksek gentoo org> CommitDate: Mon Jun 20 04:50:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6bc0c0 app-admin/gtkdiskfree: update Homepage Closes: https://github.com/gentoo/gentoo/pull/1697 app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild index 738fcf8..09f86b5 100644 --- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild +++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 inherit autotools-utils flag-o-matic DESCRIPTION="Graphical tool to show free disk space" -HOMEPAGE="https://gitorious.org/gtkdiskfree; +HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree; SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: app-admin/gtkdiskfree/
commit: a1457b2a3681638bb426ecb26e60f5fc9c23fbfc Author: Göktürk Yüksek gentoo org> AuthorDate: Mon Jun 20 04:56:36 2016 + Commit: Göktürk Yüksek gentoo org> CommitDate: Mon Jun 20 04:56:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1457b2a app-admin/gtkdiskfree: fix the license (GPL-2 -> GPL-2+) According to src/main.c, this is licensed under GPL-2+. Package-Manager: portage-2.2.28 app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild | 2 +- app-admin/gtkdiskfree/gtkdiskfree-2.0.2.ebuild| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild index 09f86b5..f5cfe99 100644 --- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild +++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Graphical tool to show free disk space" HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree; SRC_URI="mirror://gentoo/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="nls" diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.2.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.2.ebuild index c5c182b..e703c8c 100644 --- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.2.ebuild +++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.6 2012/07/26 20:48:25 xmw Exp $ @@ -10,7 +10,7 @@ DESCRIPTION="Graphical tool to show free disk space like df" HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree; SRC_URI="https://gitlab.com/mazes_80/${PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="gtk2 nls"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/
commit: 9a38717f032705b1d4d2e2a3004d729b69d9db24 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 04:13:51 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 04:18:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a38717f sys-apps/pciutils: set up a sane pkg-config value #584812 sys-apps/pciutils/pciutils-3.3.1.ebuild | 1 + sys-apps/pciutils/pciutils-3.4.1.ebuild | 1 + sys-apps/pciutils/pciutils-3.5.1.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/sys-apps/pciutils/pciutils-3.3.1.ebuild b/sys-apps/pciutils/pciutils-3.3.1.ebuild index e101142..4f47b92 100644 --- a/sys-apps/pciutils/pciutils-3.3.1.ebuild +++ b/sys-apps/pciutils/pciutils-3.3.1.ebuild @@ -58,6 +58,7 @@ pemake() { CROSS_COMPILE="${CHOST}-" \ CC="$(tc-getCC)" \ AR="$(tc-getAR)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ RANLIB="$(tc-getRANLIB)" \ DNS=$(usex dns) \ IDSDIR='$(SHAREDIR)/misc' \ diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild index 7ef8215..202a380 100644 --- a/sys-apps/pciutils/pciutils-3.4.1.ebuild +++ b/sys-apps/pciutils/pciutils-3.4.1.ebuild @@ -62,6 +62,7 @@ pemake() { CROSS_COMPILE="${CHOST}-" \ CC="$(tc-getCC)" \ AR="$(tc-getAR)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ RANLIB="$(tc-getRANLIB)" \ DNS=$(usex dns) \ IDSDIR='$(SHAREDIR)/misc' \ diff --git a/sys-apps/pciutils/pciutils-3.5.1.ebuild b/sys-apps/pciutils/pciutils-3.5.1.ebuild index 18ef320..4027319 100644 --- a/sys-apps/pciutils/pciutils-3.5.1.ebuild +++ b/sys-apps/pciutils/pciutils-3.5.1.ebuild @@ -66,6 +66,7 @@ pemake() { CROSS_COMPILE="${CHOST}-" \ CC="$(tc-getCC)" \ AR="$(tc-getAR)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ RANLIB="$(tc-getRANLIB)" \ DNS=$(usex dns) \ IDSDIR='$(SHAREDIR)/misc' \
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 2635cfd8efbbdda134c0b7ec2cd97588a01e295b Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:59:56 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:59:56 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=2635cfd8 porting: add O_PATH fallback too porting.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/porting.h b/porting.h index 2d79f28..8f2694b 100644 --- a/porting.h +++ b/porting.h @@ -221,6 +221,9 @@ #ifndef O_CLOEXEC # define O_CLOEXEC 0 #endif +#ifndef O_PATH +# define O_PATH 0 +#endif #define __unused__ __attribute__((__unused__))
[gentoo-commits] proj/pax-utils:master commit in: /
commit: f773cce6933381a48a84638471bb2c50bfbd4f4f Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 04:01:16 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 04:01:16 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f773cce6 scanelf: fix out_format leak fix scanelf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scanelf.c b/scanelf.c index 7190301..5a765b5 100644 --- a/scanelf.c +++ b/scanelf.c @@ -2272,11 +2272,10 @@ static int parseargs(int argc, char *argv[]) xarraypush_str(find_lib_arr, optarg); break; case 'F': { - if (out_format) + if (PAX_UTILS_CLEANUP) { free(out_format); - if (PAX_UTILS_CLEANUP) out_format = xstrdup(optarg); - else + } else out_format = optarg; break; }
[gentoo-commits] proj/portage-utils:master commit in: /
commit: cf604a35700ef2b673e9fe9ce931f3833efab4d5 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:12:57 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:12:57 2016 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=cf604a35 README: update repo URLs README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index cf45a7d..1a8dc3d 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ Current developer list: - Fetching via anon git: - git clone git://git.overlays.gentoo.org/proj/portage-utils.git + git clone git://anongit.gentoo.org/proj/portage-utils.git You can view it online via gitweb: - http://git.overlays.gentoo.org/gitweb/?p=proj/portage-utils.git + https://gitweb.gentoo.org/proj/portage-utils.git/
[gentoo-commits] proj/portage-utils:master commit in: man/
commit: 3040132ef330e83c1a04f05eda333c79ae4868a8 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:10:38 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:10:38 2016 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3040132e man: drop qfile --from docs (part 2) Have to regen the man page after updating its fragment. man/qfile.1 | 63 + 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/man/qfile.1 b/man/qfile.1 index e57e8e3..5bd58c7 100644 --- a/man/qfile.1 +++ b/man/qfile.1 @@ -1,4 +1,4 @@ -.TH qfile "1" "Mar 2016" "Gentoo Foundation" "qfile" +.TH qfile "1" "Jun 2016" "Gentoo Foundation" "qfile" .SH NAME qfile \- list all pkgs owning files .SH SYNOPSIS @@ -148,67 +148,6 @@ Sure, the same differences hold when querying for orphan files: $ ROOT=/mnt qfile -Ro /mnt/bin/* /mnt/bin/dostuff.sh .fi -.SH "READING ARGUMENTS FROM A FILE/STDIN" -.PP -When you try to launch \fBqfile\fP with a large number of arguments, you may -hit the following shell error: -.nf\fI - $ qfile -o $(find /usr/lib) - bash: ./qfile: Argument list too long -.fi -.PP -To avoid that, you must use the \fB\-\-from\fP (\fB\-f\fP) option, which -allows reading your arguments list in a file: -.nf\fI - $ find /usr/lib > ~/usr-lib.list - $ qfile -o -f ~/usr-lib.list - /usr/lib/libMagick-5.5.7-Q16.so.0.0.0 - /usr/lib/libGL.so - ... -.fi -.PP -Your arguments list must be formatted with one file per line, and without any -kind of garbage (no leading or trailing space, no empty line, etc.). The -default \fBfind\fP output format is just fine in general. -.PP -You can also read the arguments list from standard input with the "\fB\-\fP" -pseudo filename, which is useful with shell pipes: -.nf\fI - $ find /usr/lib | qfile -o -f - - /usr/lib/libMagick-5.5.7-Q16.so.0.0.0 - /usr/lib/libGL.so - ... -.fi -.PP -Here is an other example of use. This script lists some files which may be -orphan config files left behind by Portage after uninstallation or upgrade of -some packages: -.nf\fI - #!/bin/bash - SEARCH_PATHS="$(portageq envvar CONFIG_PROTECT)" - SEARCH_MASK="$(portageq envvar CONFIG_PROTECT_MASK) \\ - /etc/runlevels /etc/portage \\ - /etc/ssl/certs /etc/ssh \\ - /etc/bash_completion.d /etc/cups" - for path in ${SEARCH_MASK} ; do - EXCLUDE="${EXCLUDE} -not -path ${path}/*" - done - set -f - find ${SEARCH_PATHS} ${EXCLUDE} | qfile -o -f - -.fi -.PP -\fBIMPORTANT:\fP this script is just a quick example. Do not blindly delete the -files it will list! -.PP -When reading arguments from a file or from stdin, \fBqfile\fP will, for -performances reasons, treat then by groups of 5000 (search owners of the -5000 first files, then of the 5000 following ones, etc.). This magic value -should be fine in most cases, but you can change it if you really want, using -the \fB\-\-max\-args\fP option (\fB\-m\fP). Using a greater value will eat a -bit more memory, but may be a bit faster for really big queries. Be careful -though, using some stupidly high or low value can completly kill the -performances. In short, you probably don't want to touch this option. -.PP .SH "SEARCHING FOR FILE COLLISIONS" .PP A last option of \fBqfile\fP is \fB\-\-exclude\fP (\fB\-x\fP), which will makes
[gentoo-commits] proj/pax-utils:master commit in: /
commit: a17419af271edc0edabe79cb6c9616fafcf15bfd Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:19:40 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:19:40 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a17419af scanelf: avoid leaking root_fd when multiple --root args are passed scanelf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scanelf.c b/scanelf.c index 42fe4c5..3f33d89 100644 --- a/scanelf.c +++ b/scanelf.c @@ -2350,6 +2350,8 @@ static int parseargs(int argc, char *argv[]) case 'I': show_osabi = 1; break; case 'Y': show_eabi = 1; break; case 128: + if (root_fd != AT_FDCWD) + close(root_fd); root_fd = open(optarg, O_RDONLY|O_CLOEXEC); if (root_fd == -1) err("Could not open root: %s", optarg);
[gentoo-commits] proj/portage-utils:master commit in: /, travis/
commit: 00090c9639522b484a4f8c3cf9b9fcb2f7ad6a5c Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:12:05 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:12:05 2016 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=00090c96 travis: add coverity scan integration .travis.yml| 9 - travis/main.sh | 25 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 015172e..fb4c521 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,22 @@ # https://docs.travis-ci.com/ language: c +# Order here matters for implicit matrix generation and coverity scan. +# See travis/main.sh for details. compiler: - - clang - gcc + - clang sudo: false +# Order here matters; see compiler comment above. os: - linux +env: + global: +- secure: "qF/ueXvm1uawirfQL+jK5LSJW1P+ZVXDx5t9HljFP1jC45D/1aqEs1ffaNkvBJohUJy6mABnXN5+ZP0PoQ+ZA01t+6NDc/LrowGP87T02KGwjBukQ9tQK8zVutsT+0CY3qUPhRcaLH5Gt3c+uPDKlLndg/bXWS6cRpMt6tC3VTy+WpAlvHHfZJjSZVYp8qhCattnaZ7GvzqGqbjBZ6X7TrQnwIDdGAyg5r4xnViDxu9lO4ZH4zS6Rc7DxesrqC3zxwPRw5HLNsGbJiGQF3meXH6rVNt1uxKwwOQoDcL0NKiyAMpXwu5iGeuMILoy3KMpFwZFnhyXqMGRORakDuDNB9oMgzp+PB3Zb7TICXbhxbrQ46lSlv0VWkwn3bcJ0lek53NzDUmM2uywvCUYybPgn3xCqY9jG0zwO2ZIACc1ekGh7y0gFXfBoSZGhl1VthV5hWMJ01p/n5jK7XdDmK4G/+0wN2WlHhyvjoF6XyJ+SRC85l6VhpBNbFJA2bGT2Y4+p/CzF7M8DVYR3o+OfCWxsiZyE+Vnmpdg4U829oy97obIuBeCvBd1Vp0hoB+RpzaeqzS69N+S4tgCIXvIdu168HltFaTUPtvIGoDtIAPCaUZC8jVO22cA6RpNkac3HjpLSceYYtdkiph4VuBMwHZj6/N2+m46Y9Uxrh01KzLy/GY=" + addons: apt: packages: diff --git a/travis/main.sh b/travis/main.sh index e333685..7831298 100755 --- a/travis/main.sh +++ b/travis/main.sh @@ -2,6 +2,27 @@ . "${0%/*}"/lib.sh +# We have to do this by hand rather than use the coverity addon because of +# matrix explosion: https://github.com/travis-ci/travis-ci/issues/1975 +coverity_scan() { + local reason + [[ ${TRAVIS_JOB_NUMBER} != *.1 ]] && reason="not first build job" + [[ -n ${TRAVIS_TAG} ]] && reason="git tag" + [[ ${TRAVIS_PULL_REQUEST} == "true" ]] && reason="pull request" + if [[ -n ${reason} ]] ; then + echo "Skipping coverity scan due to: ${reason}" + return + fi + + export COVERITY_SCAN_PROJECT_NAME="${TRAVIS_REPO_SLUG}" + export COVERITY_SCAN_NOTIFICATION_EMAIL="vap...@gentoo.org" + export COVERITY_SCAN_BUILD_COMMAND="make -j${ncpus}" + export COVERITY_SCAN_BUILD_COMMAND_PREPEND="git clean -q -x -d -f; git checkout -f" + export COVERITY_SCAN_BRANCH_PATTERN="master" + + curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh; | bash || : +} + main() { # For local deps like iniparser. export CPPFLAGS="-I${PWD}/../sysroot" @@ -14,5 +35,9 @@ main() { # Debug build w/ASAN and such enabled. m debug m check + + # Do scans last as they like to dirty the tree and some tests + # expect a clean tree (like code style checks). + v --fold="coverity_scan" coverity_scan } main "$@"
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 107cf9e4c69a1e5add5be2e31e3134493f0cac8a Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:20:58 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:20:58 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=107cf9e4 scanelf: avoid leaking out_format when multiple --format args are passed scanelf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scanelf.c b/scanelf.c index 3f33d89..7190301 100644 --- a/scanelf.c +++ b/scanelf.c @@ -2272,7 +2272,8 @@ static int parseargs(int argc, char *argv[]) xarraypush_str(find_lib_arr, optarg); break; case 'F': { - if (out_format) warn("You prob don't want to specify -F twice"); + if (out_format) + free(out_format); if (PAX_UTILS_CLEANUP) out_format = xstrdup(optarg); else
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 4c6b85b04291c96c45cdccf7cb9147f9307e3218 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 02:58:10 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 02:58:10 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=4c6b85b0 paxmacho: fix mem leak when reading macho files paxmacho.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/paxmacho.c b/paxmacho.c index 84aeb86..090fc18 100644 --- a/paxmacho.c +++ b/paxmacho.c @@ -247,7 +247,7 @@ fatobj *readmacho_buffer(const char *filename, char *buffer, size_t buffer_len) /* make sure we have enough bytes to scan */ if (ret->len <= sizeof(struct fat_header)) - return NULL; + goto fail; fhdr = ret->data; /* Check what kind of file this is. Unfortunately we don't have @@ -276,14 +276,14 @@ fatobj *readmacho_buffer(const char *filename, char *buffer, size_t buffer_len) * beware of corrupt files and Java bytecode which shares * the same magic with us :( */ if (sizeof(struct fat_arch) * narchs > bufleft) - return NULL; + goto fail; for (i = 1; i <= narchs; i++) { farch = (struct fat_arch *)dptr; offset = MGET(swapped, farch->offset); if (offset + sizeof(struct mach_header) >= bufleft || read_mach_header(fobj, ret->data + offset) == 0) - return NULL; + goto fail; if (i < narchs) { fobj = fobj->next = xzalloc(sizeof(*fobj)); /* filename and size are necessary for printing */ @@ -300,11 +300,15 @@ fatobj *readmacho_buffer(const char *filename, char *buffer, size_t buffer_len) /* simple Mach-O file, treat as single arch FAT file */ if (ret->len < sizeof(struct mach_header) || read_mach_header(ret, ret->data) == 0) - return NULL; + goto fail; ret->next = NULL; } return ret; + + fail: + free(ret); + return NULL; } /* undo the readmacho() stuff */
[gentoo-commits] proj/pax-utils:master commit in: /
commit: b07684452f66d01de62dc6f4052a3fa8f81b34b9 Author: Mike Frysinger gentoo org> AuthorDate: Sun Jun 19 21:01:04 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Jun 19 21:01:04 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b0768445 paxmacho: tweak case fall through style This makes coverity happy by ignoring the missing break statement here. paxmacho.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/paxmacho.c b/paxmacho.c index 985507d..84aeb86 100644 --- a/paxmacho.c +++ b/paxmacho.c @@ -164,6 +164,7 @@ inline static uint32_t read_mach_header(fatobj *fobj, void *addr) switch (mhdr->magic) { case MH_CIGAM: fobj->swapped = 1; + /* fall through */ case MH_MAGIC: /* 32-bits */ fobj->ismach64 = 0; @@ -172,6 +173,7 @@ inline static uint32_t read_mach_header(fatobj *fobj, void *addr) return mhdr->magic; case MH_CIGAM_64: fobj->swapped = 1; + /* fall through */ case MH_MAGIC_64: /* 64-bits */ fobj->ismach64 = 1;
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 75ab6c592861c877e8b9b477170b46c4e8922b2a Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 02:59:29 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 02:59:29 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=75ab6c59 pspax: fix file leakage when reading the command line pspax.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pspax.c b/pspax.c index 67b7678..c10688f 100644 --- a/pspax.c +++ b/pspax.c @@ -88,6 +88,8 @@ static char *get_proc_name_cmdline(int pfd) fclose(fp); return NULL; } + fclose(fp); + return (str); }
[gentoo-commits] proj/pax-utils:master commit in: /
commit: f2b83d5bfd9904ad32cb6f2f5bd42fea07f8fddd Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:06:17 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:06:17 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f2b83d5b paxelf: use fstat instead of stat && open This fixes a minor race condition. paxelf.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/paxelf.c b/paxelf.c index a353e57..5b6fe24 100644 --- a/paxelf.c +++ b/paxelf.c @@ -629,19 +629,19 @@ elfobj *_readelf(const char *filename, int read_only) struct stat st; int fd; - if (stat(filename, ) == -1) - return NULL; - if ((fd = open(filename, (read_only ? O_RDONLY : O_RDWR))) == -1) return NULL; - /* make sure we have enough bytes to scan e_ident */ - if (st.st_size <= EI_NIDENT) { -close_fd_and_return: + if (fstat(fd, ) == -1) { + close_fd_and_return: close(fd); return NULL; } + /* make sure we have enough bytes to scan e_ident */ + if (st.st_size <= EI_NIDENT) + goto close_fd_and_return; + ret = readelf_fd(filename, fd, st.st_size); if (ret == NULL) goto close_fd_and_return;
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 548c5db10349d6a5ee3d8dbe1da14e55655ca530 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:04:07 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:04:07 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=548c5db1 paxmacho: fix readmacho fd leakage on error If the readmacho_fd helper returns an error for any reason, we don't close the fd. Add logic to handle that scenario. paxmacho.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/paxmacho.c b/paxmacho.c index 142af6e..638453a 100644 --- a/paxmacho.c +++ b/paxmacho.c @@ -190,11 +190,15 @@ inline static uint32_t read_mach_header(fatobj *fobj, void *addr) fatobj *readmacho(const char *filename) { int fd; + fatobj *ret; if ((fd = open(filename, O_RDONLY)) == -1) return NULL; - return readmacho_fd(filename, fd, 0); + ret = readmacho_fd(filename, fd, 0); + if (ret == NULL) + close(fd); + return ret; } fatobj *readmacho_fd(const char *filename, int fd, size_t len)
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 0feba3c91ca51bc68f5ba8688c91f772d81cb0ce Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:02:15 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:02:15 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=0feba3c9 paxmacho: simplify readmacho a bit The readmacho_fd helper will already use fstat on the fd if we pass in a length of 0, so let that work rather than do stat/open since there is a minor race there. paxmacho.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/paxmacho.c b/paxmacho.c index 090fc18..142af6e 100644 --- a/paxmacho.c +++ b/paxmacho.c @@ -189,16 +189,12 @@ inline static uint32_t read_mach_header(fatobj *fobj, void *addr) * arch. */ fatobj *readmacho(const char *filename) { - struct stat st; int fd; - if (stat(filename, ) == -1) - return NULL; - if ((fd = open(filename, O_RDONLY)) == -1) return NULL; - return readmacho_fd(filename, fd, st.st_size); + return readmacho_fd(filename, fd, 0); } fatobj *readmacho_fd(const char *filename, int fd, size_t len)
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 5000f8ea9c3519fc4e028ab050a58b1f314b2633 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:07:12 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:07:12 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=5000f8ea scanelf: use strcpy to make coverity happy We know ret is always 7 bytes, and pax_short_hf_flags always returns 7 bytes (including a NUL terminator), so use strcpy to keep coverity from throwing a warning about missing NUL. scanelf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanelf.c b/scanelf.c index 1f3e356..42fe4c5 100644 --- a/scanelf.c +++ b/scanelf.c @@ -391,7 +391,7 @@ static char *scanelf_file_pax(elfobj *elf, char *found_pax) *found_pax = 1; return (be_wewy_wewy_quiet ? NULL : paxflags); } - strncpy(ret, paxflags, sizeof(ret)); + strcpy(ret, paxflags); } if (be_wewy_wewy_quiet || (be_quiet && !shown))
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 56905522dfd178685b6225c6be89560cb02c445c Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 00:37:04 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 00:37:04 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=56905522 pspax: rewrite core loop to use *at funcs This makes the code a bit simpler & robust. pspax.c | 228 1 file changed, 128 insertions(+), 100 deletions(-) diff --git a/pspax.c b/pspax.c index c64472c..67b7678 100644 --- a/pspax.c +++ b/pspax.c @@ -40,20 +40,47 @@ static pid_t show_pid = 0; static uid_t show_uid = (uid_t)-1; static gid_t show_gid = (gid_t)-1; -static FILE *proc_fopen(pid_t pid, const char *file) +static int proc_open(int pfd, const char *file) { - char path[__PAX_UTILS_PATH_MAX]; - snprintf(path, sizeof(path), PROC_DIR "/%u/%s", pid, file); - path[sizeof(path) - 1] = '\0'; - return fopen(path, "r"); + return openat(pfd, file, O_RDONLY|O_CLOEXEC); } -static char *get_proc_name_cmdline(pid_t pid) +static FILE *proc_fopen(int pfd, const char *file) +{ + int fd; + FILE *fp; + + fd = proc_open(pfd, file); + if (fd == -1) + return NULL; + + fp = fdopen(fd, "re"); + if (fp == NULL) + close(fd); + + return fp; +} + +static elfobj *proc_readelf(int pfd) +{ + int fd; + elfobj *elf; + + fd = proc_open(pfd, "exe"); + if (fd == -1) + return NULL; + + elf = readelf_fd("proc/exe", fd, 0); + close(fd); + return elf; +} + +static char *get_proc_name_cmdline(int pfd) { FILE *fp; static char str[1024]; - fp = proc_fopen(pid, "cmdline"); + fp = proc_fopen(pfd, "cmdline"); if (fp == NULL) return NULL; @@ -64,15 +91,15 @@ static char *get_proc_name_cmdline(pid_t pid) return (str); } -static char *get_proc_name(pid_t pid) +static char *get_proc_name(int pfd) { FILE *fp; static char str[BUFSIZ]; if (wide_output) - return get_proc_name_cmdline(pid); + return get_proc_name_cmdline(pfd); - fp = proc_fopen(pid, "stat"); + fp = proc_fopen(pfd, "stat"); if (fp == NULL) return NULL; @@ -90,12 +117,12 @@ static char *get_proc_name(pid_t pid) return (str+1); } -static int get_proc_maps(pid_t pid) +static int get_proc_maps(int pfd) { FILE *fp; static char str[BUFSIZ]; - if ((fp = proc_fopen(pid, "maps")) == NULL) + if ((fp = proc_fopen(pfd, "maps")) == NULL) return -1; while (fgets(str, sizeof(str), fp)) { @@ -126,12 +153,12 @@ static int get_proc_maps(pid_t pid) return 0; } -static int print_executable_mappings(pid_t pid) +static int print_executable_mappings(int pfd) { FILE *fp; static char str[BUFSIZ]; - if ((fp = proc_fopen(pid, "maps")) == NULL) + if ((fp = proc_fopen(pfd, "maps")) == NULL) return -1; while (fgets(str, sizeof(str), fp)) { @@ -169,28 +196,24 @@ static int print_executable_mappings(pid_t pid) # define NOTE_TO_SELF #endif -static struct passwd *get_proc_passwd(pid_t pid) +static struct passwd *get_proc_passwd(int pfd) { struct stat st; - struct passwd *pwd; - char path[__PAX_UTILS_PATH_MAX]; - - snprintf(path, sizeof(path), PROC_DIR "/%u/stat", pid); + struct passwd *pwd = NULL; - if (stat(path, ) != -1) - if ((pwd = getpwuid(st.st_uid)) != NULL) - return pwd; + if (fstatat(pfd, "stat", , AT_SYMLINK_NOFOLLOW) != -1) + pwd = getpwuid(st.st_uid); - return NULL; + return pwd; } -static char *get_proc_status(pid_t pid, const char *name) +static char *get_proc_status(int pfd, const char *name) { FILE *fp; size_t len; static char str[BUFSIZ]; - if ((fp = proc_fopen(pid, "status")) == NULL) + if ((fp = proc_fopen(pfd, "status")) == NULL) return NULL; len = strlen(name); @@ -208,13 +231,13 @@ static char *get_proc_status(pid_t pid, const char *name) return NULL; } -static char *get_pid_attr(pid_t pid) +static char *get_pid_attr(int pfd) { FILE *fp; char *p; static char buf[BUFSIZ]; - if ((fp = proc_fopen(pid, "attr/current")) == NULL) + if ((fp = proc_fopen(pfd, "attr/current")) == NULL) return NULL; if (fgets(buf, sizeof(buf), fp) != NULL) @@ -225,13 +248,13 @@ static char *get_pid_attr(pid_t pid) return buf; } -static char *get_pid_addr(pid_t pid) +static char *get_pid_addr(int pfd) { FILE *fp; char *p; static char buf[BUFSIZ]; - if ((fp = proc_fopen(pid, "ipaddr")) == NULL) + if ((fp =
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 0091a602c3f8b37b9a8a2948e92b6c7e62beb18a Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 03:00:58 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 03:00:58 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=0091a602 ar: make sure name is always NUL terminated paxinc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/paxinc.c b/paxinc.c index 64a7f3b..bd13ec4 100644 --- a/paxinc.c +++ b/paxinc.c @@ -123,6 +123,7 @@ close_and_ret: } snprintf(ret.name, sizeof(ret.name), "%s:%s", ar->filename, s); + ret.name[sizeof(ret.name) - 1] = '\0'; if ((s=strchr(ret.name+strlen(ar->filename), '/')) != NULL) *s = '\0'; ret.date = atoi(ret.buf.formatted.date);
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 18961bf5da982bfd7142fcd0fc150cc02dbc4b56 Author: Mike Frysinger gentoo org> AuthorDate: Sun Jun 19 21:01:34 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Jun 19 21:01:34 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=18961bf5 scanmacho: check stat return value scanmacho.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scanmacho.c b/scanmacho.c index 5a0afd5..30ee730 100644 --- a/scanmacho.c +++ b/scanmacho.c @@ -415,7 +415,8 @@ static int scanmacho_file(const char *filename, const struct stat *st_cache) if (S_ISLNK(st->st_mode)) { if (!scan_symlink) return 1; - stat(filename, _st); + if (stat(filename, _st)) + return 1; st = _st; }
[gentoo-commits] proj/pax-utils:master commit in: /
commit: ac373d7fa13ca22ff8db50bd147aa8ef4aeef4e3 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jun 20 02:59:49 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jun 20 02:59:49 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=ac373d7f scanelf: enable cleanup for coverity porting.h | 4 scanelf.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/porting.h b/porting.h index c0d5ebc..2d79f28 100644 --- a/porting.h +++ b/porting.h @@ -83,6 +83,10 @@ #ifdef __SANITIZE_ADDRESS__ # define PAX_UTILS_CLEANUP 1 #endif +/* Coverity catches some things we leak on purpose. */ +#ifdef __COVERITY__ +# define PAX_UTILS_CLEANUP 1 +#endif #ifndef PAX_UTILS_CLEANUP # define PAX_UTILS_CLEANUP 0 #endif diff --git a/scanelf.c b/scanelf.c index 57c5156..1f3e356 100644 --- a/scanelf.c +++ b/scanelf.c @@ -2569,6 +2569,9 @@ static void cleanup(void) free(qa_textrels); free(qa_execstack); free(qa_wx_load); + + if (root_fd != AT_FDCWD) + close(root_fd); } int main(int argc, char *argv[])
[gentoo-commits] dev/xmw:master commit in: media-libs/asdcplib/
commit: 2e75e1b2faab338a5d2134f2b3c59dc5949bfd61 Author: Michael Weber xmw de> AuthorDate: Mon Jun 20 01:05:43 2016 + Commit: Michael Weber gentoo org> CommitDate: Mon Jun 20 01:05:43 2016 + URL:https://gitweb.gentoo.org/dev/xmw.git/commit/?id=2e75e1b2 media-libs/asdcplib: Initial import. Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0x71D573A82F434065 media-libs/asdcplib/Manifest | 21 + media-libs/asdcplib/asdcplib-2.5.14.ebuild | 18 ++ media-libs/asdcplib/metadata.xml | 8 3 files changed, 47 insertions(+) diff --git a/media-libs/asdcplib/Manifest b/media-libs/asdcplib/Manifest new file mode 100644 index 000..938b5d9 --- /dev/null +++ b/media-libs/asdcplib/Manifest @@ -0,0 +1,21 @@ +-BEGIN PGP SIGNED MESSAGE- +Hash: SHA256 + +DIST asdcplib-2.5.14.tar.gz 694416 SHA256 260fde96e93f3cdd63aa41ba87996b6dd108f6eadd8518d617df8d65538571b7 SHA512 8bba26251e2c79862585f9a4dddfe6707dd371cec31d2b5aa35fc6f772df9fa6be1f0b5aec923ebe5bbbf18ea06222bc1b322e529adf7e4a8869ffe7f90e5237 WHIRLPOOL c15a161499b212c054555e79fca2a17eaef69de12e1228d11cdd89022dda7d91a284a578bb06579e6371ee37d2a6fce2c2685b0de88fe44dd91d46d75b03544e +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJXZ0FkAAoJEHHVc6gvQ0BlyUoP/iDUi90rRW7D95y1P77y1UZh +9WBmPp661DZT68VPIuSWoa2ZyoiBIDXkIJ0bSvuCAG5IL81x5uHGt6cJAZiHQCFc +l8Dp/lnGt4qXZlBXq3uLLo4cK4LnMwpfhBECGcuu52f9twAFO9gT4WSXIiCkGI3q +2WL1w7VCfQS44UGycl3SNxoAwpmxR4XcvV8xbIgLZMw2sfYZoJOTPDet9gDrRZWq +KrXkfML2Tmv5IarmGDn5u5nrifSEtVqZMauLjIQ9c0P8T7ex7Wq329KR46WPxEBf +WgY75DxWqB5AJrx00QdilPdZmorDYkjwzWEe849KnvJyDicrFoy5M7UkMSalRsNi +TLJPeXXSX0b7kQQ/oYS4Zgxm/fOO8xTLGUd6AA8ok0QNkhVEYv4An/UoTljdfhf1 +gL0HLVTvTn3IePGA2KyhKHfc1f2zt2oj9GFqN3MNQjUSQovi5vKEESxXBhbqEjEl +hSIC5SYMSCgSQVIZlxEuFm/eZEyVPUdED9sLMqvnowT8jmoCiuhtZirq5Q94nkyn +PzPaIbU7a4w89X0PT6Z3VevvoWyWApyhHRoBkRFMsQ2ef019aMj35spyMPIWtwFo +V6BK7XJhr2SaZGudeJTMXKjVkhuL9Kazur/HiJXs2qB9UnBlWNPW2YYuCLg8fAMc +sMZZ9YRXdK8VIZiDsCPd +=CNhu +-END PGP SIGNATURE- diff --git a/media-libs/asdcplib/asdcplib-2.5.14.ebuild b/media-libs/asdcplib/asdcplib-2.5.14.ebuild new file mode 100644 index 000..68a54ae --- /dev/null +++ b/media-libs/asdcplib/asdcplib-2.5.14.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="implementation of SMPTE and the MXF Interop Sound & Picture Track File format" +HOMEPAGE="http://www.cinecert.com/asdcplib/; +SRC_URI="http://download.cinecert.com/${PN}/${P}.tar.gz; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-libs/openssl:0" +DEPEND="${RDEPEND} + virtual/pkgconfig" diff --git a/media-libs/asdcplib/metadata.xml b/media-libs/asdcplib/metadata.xml new file mode 100644 index 000..a535b88 --- /dev/null +++ b/media-libs/asdcplib/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +x...@gentoo.org +Michael Weber + +
[gentoo-commits] repo/gentoo:master commit in: dev-perl/URI/
commit: d6972e47c5fe5aee96aadac1fcbc5341ae624ed6 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jun 19 23:44:15 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Jun 19 23:44:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6972e47 dev-perl/URI: Remove old Package-Manager: portage-2.3.0_rc1 dev-perl/URI/Manifest | 2 -- dev-perl/URI/URI-1.680.0.ebuild | 32 dev-perl/URI/URI-1.690.0.ebuild | 32 3 files changed, 66 deletions(-) diff --git a/dev-perl/URI/Manifest b/dev-perl/URI/Manifest index 67631d3..8868a1f 100644 --- a/dev-perl/URI/Manifest +++ b/dev-perl/URI/Manifest @@ -1,4 +1,2 @@ DIST URI-1.60.tar.gz 81196 SHA256 1f92d3dc64acb8845e9917c945e22b9a5275aeb9ff924eb7873c3b7a5c0d2377 SHA512 8a4ea901ad16595a76eec85f690369f30b2ff46e8f7d8512fb800113b0f30ede7ea7e7f407174e58b95e7e5423c202c032858883b913a4642a6ee489940a6136 WHIRLPOOL 16d470306d23e029c22ad7eaf7fcdf44178b0ef49ed27f254b104006698e2edfe4636f434a0f7161a1c18eb23b451b38b7df6427a2567b3983fd0bc423dc5f60 -DIST URI-1.68.tar.gz 99425 SHA256 c840d30f7657bfd4b2acbb311bd764232911cd3dc97e92415fbd0a242185c358 SHA512 1c17d293c633c909a468887b6aadf9f91a8c0477e5e6be7a97d6573ac58e5ad213c67f122a3d3a20238b7f094d69cef5cd4415caafe1844b18f7300942d5d233 WHIRLPOOL 075a626aab99433a0a8e51f5e03c3751ac1a616ad2a08de08bf10d0e0a7d9272cedfeb8d87235c863b11a90217059c8a92a13b84b1fa81d76fa035847453bca6 -DIST URI-1.69.tar.gz 99836 SHA256 b74b16ea626b6f8061821bb350674c638a98be1fc766eadb24fec6635998b42d SHA512 4e58cd450c58be4c3e0254c8e53bd0b4d3516468efb466c933343efc12191856bfc6c0d5c3de3b523e66d4930c2426f0089d5cd9ece7b4a5b8aff0a9596064cc WHIRLPOOL 331c632a0d4457b07ba03c1fe477065b27bd2abd0c4406f328befb3daca29bee4b1c61fbb34b3a44edb868e941e2957d0c0258384753068d55f15240d44f7d62 DIST URI-1.71.tar.gz 100141 SHA256 9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115 SHA512 db412b75054a4d315eb861060fa4641832c2428b9dfe56bbe35f530c9ba572d4de2061d9782454750293dd5a64f3375830988d8512f410e84a9d599c80458405 WHIRLPOOL 753a5e0ab519236e24ac038cf4b59c8f01ea7648b33df7941809deada06d9bdffccefc07c4ef4bdb0ea37eb3ab9bf3dd04a48d97acafa2cf80368c722f1733f6 diff --git a/dev-perl/URI/URI-1.680.0.ebuild b/dev-perl/URI/URI-1.680.0.ebuild deleted file mode 100644 index 4f01326..000 --- a/dev-perl/URI/URI-1.680.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=ETHER -MODULE_VERSION=1.68 -inherit perl-module - -DESCRIPTION="Uniform Resource Identifiers (absolute and relative)" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND=" - >=virtual/perl-Exporter-5.570.0 - >=virtual/perl-MIME-Base64-2 - virtual/perl-Scalar-List-Utils -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - virtual/perl-File-Temp - >=virtual/perl-Test-Simple-0.960.0 - ) -" - -SRC_TEST=no # see ChangeLog, uses network tests - -mydoc="rfc2396.txt" diff --git a/dev-perl/URI/URI-1.690.0.ebuild b/dev-perl/URI/URI-1.690.0.ebuild deleted file mode 100644 index 037206f..000 --- a/dev-perl/URI/URI-1.690.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=ETHER -MODULE_VERSION=1.69 -inherit perl-module - -DESCRIPTION="Uniform Resource Identifiers (absolute and relative)" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND=" - >=virtual/perl-Exporter-5.570.0 - >=virtual/perl-MIME-Base64-2 - virtual/perl-Scalar-List-Utils -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - virtual/perl-File-Temp - >=virtual/perl-Test-Simple-0.960.0 - ) -" - -SRC_TEST=no # see ChangeLog, uses network tests - -mydoc="rfc2396.txt"
[gentoo-commits] proj/android: New branch: cross-bootstrap
commit: Commit: Ruud Koolen gentoo org> CommitDate: Sun Jun 19 23:27:16 2016 + New branch: cross-bootstrap
[gentoo-commits] proj/android:master commit in: sys-libs/glibc/files/eblits/
commit: 476022c3b1a6fbf19375c1c9802d936be164aa27 Author: Benda Xu gentoo org> AuthorDate: Sun Jun 19 23:22:29 2016 + Commit: Benda XU gentoo org> CommitDate: Sun Jun 19 23:22:29 2016 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=476022c3 sys-libs/glibc: sbin in src_configure sys-libs/glibc/files/eblits/src_configure.eblit | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index ba8f925..5f2fec0 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -127,6 +127,7 @@ glibc_do_configure() { # There is no configure option for this and we need to export it # since the glibc build will re-run configure on itself export libc_cv_slibdir="${EPREFIX}/$(get_libdir)" + export libc_cv_rootsbindir="${EPREFIX}/sbin" # We take care of patching our binutils to use both hash styles, # and many people like to force gnu hash style only, so disable
[gentoo-commits] proj/android:master commit in: sys-apps/portage/, sys-apps/portage/files/
commit: e0ae42e4365e0be78cb94d2a2604374a1a7bb111 Author: Benda Xu gentoo org> AuthorDate: Sun Jun 19 23:21:00 2016 + Commit: Benda XU gentoo org> CommitDate: Sun Jun 19 23:21:00 2016 + URL:https://gitweb.gentoo.org/proj/android.git/commit/?id=e0ae42e4 sys-apps/portage: call ldconfig. Bug: 532100 sys-apps/portage/Manifest | 3 +- .../files/portage-2.3.0-ldconfig-path.patch| 34 ++ sys-apps/portage/portage-2.3.0_rc1-r1.ebuild | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 794f025..6017c18 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,10 +1,11 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 AUX portage-2.2.28-distcc-eprefix.patch 1215 SHA256 15de29f5b8bf9b3f49c730bbeaa4414b55866a82874a54f0ecbbb0f58a16d781 SHA512 bb630624d61d546d2ecfaad18274ae66139d3e0848293c64c69806ae13d380dc979ff658b517801ba407062270a49ca525b62ee89c47b83c324b664b364e37b6 WHIRLPOOL ccc5c5aff1d2b426e9603a16ef455a81ee5ae0cd03043adf704b7b091b536543018a8f32e995c0668fe02fdfc7bec5a6c6b1060162c424061375458fd0e820c8 +AUX portage-2.3.0-ldconfig-path.patch 1349 SHA256 f39a31df3beeedbe031b09a60a62dd0de65487aece21d3755d03de54acb09e0a SHA512 0443a5fc650b5115827091a363223ca769e59f023ce6fbe9f5c90f326c1468c31a6833494e084e95111c98da48992732f1f25ce40f9320e51e9b63b6fa773617 WHIRLPOOL 7378ad8de383670bfeb01564db760dcd122b34f268a73b108980f478cf11c500b366cc82e0069c4367fcfea0d32584544ce3df864d234ce14faf5897eb51d1ab AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa AUX portage-2.3.0-scanelf-path.patch 948 SHA256 b87d80dcdb9588ae92ab8824ad64df43351b89142a9a2f0a0a20dbd3f0b8a8f5 SHA512 fef3ae7a5f6ee4d6a2469670a2ec04b697d4a5cd1950c638fdd3ab4f290f8b45f26f3c521c614140ea22d05be60080bb7c685f3b167a7554a17f51903278a25d WHIRLPOOL a2b6287f7f367e599a70df50cfd541b9d2ddf9f7c72140055cc1674b22997bdacb1a6b414765db63ebdb98f6d8231f59c8e3e223369d8f386c001fd5c6cd2db4 AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928 DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe EBUILD portage-2.2.28.ebuild 11798 SHA256 167af8bf2aaa76fa2b36dce1b3396f81f1bd5af2b0daffc710402780eeb823b3 SHA512 a7500e828da21775412b655eae1f7dac49eab7cd55c18f774ddbec501d4f2c2364cdff94b6d2faa4b230ff9ca63084dd3c8c8d28234c3f40150bb9a02d6e3935 WHIRLPOOL 9267f3f7ecd8aecf126dd4d92b9412dedf0335365798dc411f51d062f0328f852b387b5594f797ee49603fe0355670eb6ff401b71fcf736a944b4e2970da01c5 -EBUILD portage-2.3.0_rc1-r1.ebuild 11604 SHA256 2b2425bce224c20b1491d8917ab6288cf2936cda29426fbf2a3d37f4c936f458 SHA512 b82f75de8aa1e91242eae29864121cf5a1420be8eea715168f8b13ae1dd01d0c1d5e9b18160055a079d1176e4e2a2bb3d6b6f93e8c3052e590c881c31fa07698 WHIRLPOOL c5cb05de853f8e26aa59b9675efac221c800baed720b5fb388816bbe2374cc4452e372ec2d1c45a50e4fe1cfc2317b425814f842aa811406803a2862f9c24db0 +EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL
[gentoo-commits] repo/gentoo:master commit in: app-emacs/ess/
commit: 19c4424eb949cd82877e8099640bc683a1319238 Author: Benda Xu gentoo org> AuthorDate: Sun Jun 19 23:18:33 2016 + Commit: Benda XU gentoo org> CommitDate: Sun Jun 19 23:19:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c4424e app-emacs/ess: keyword ~arm. Package-Manager: portage-2.2.28 app-emacs/ess/ess-16.04.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-emacs/ess/ess-16.04.ebuild b/app-emacs/ess/ess-16.04.ebuild index b91b788..a57364d 100644 --- a/app-emacs/ess/ess-16.04.ebuild +++ b/app-emacs/ess/ess-16.04.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz; LICENSE="GPL-2+ GPL-3+ Texinfo-manual" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" DEPEND="app-text/texi2html virtual/latex-base"
[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/
commit: 16abf63155918668a89444a036c10e015d98c3b0 Author: Benda Xu gentoo org> AuthorDate: Sun Jun 19 22:37:04 2016 + Commit: Benda XU gentoo org> CommitDate: Sun Jun 19 23:19:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16abf631 net-misc/iputils: remove EPREFIX from dosym. ebuild helpers includes EPREFIX by default. Package-Manager: portage-2.2.28 net-misc/iputils/iputils-20151218.ebuild | 4 ++-- net-misc/iputils/iputils-20160308.ebuild | 8 net-misc/iputils/iputils-.ebuild | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild index 58d9956..6611347 100644 --- a/net-misc/iputils/iputils-20151218.ebuild +++ b/net-misc/iputils/iputils-20151218.ebuild @@ -109,7 +109,7 @@ src_compile() { src_install() { into / dobin ping $(usex ipv6 'ping6' '') - use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8 doman doc/ping.8 if use arping ; then @@ -132,7 +132,7 @@ src_install() { if use tracepath && use ipv6 ; then dosbin tracepath6 - dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if use traceroute && use ipv6 ; then diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20160308.ebuild index 8f5de68..4504490 100644 --- a/net-misc/iputils/iputils-20160308.ebuild +++ b/net-misc/iputils/iputils-20160308.ebuild @@ -113,10 +113,10 @@ src_compile() { src_install() { into / dobin ping - dosym ping "${EPREFIX}"/bin/ping4 + dosym ping /bin/ping4 if use ipv6 ; then - dosym ping "${EPREFIX}"/bin/ping6 - dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + dosym ping /bin/ping6 + dosym ping.8 /usr/share/man/man8/ping6.8 fi doman doc/ping.8 @@ -140,7 +140,7 @@ src_install() { if use tracepath && use ipv6 ; then dosbin tracepath6 - dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if use traceroute && use ipv6 ; then diff --git a/net-misc/iputils/iputils-.ebuild b/net-misc/iputils/iputils-.ebuild index 47295b2..ce82c78 100644 --- a/net-misc/iputils/iputils-.ebuild +++ b/net-misc/iputils/iputils-.ebuild @@ -109,7 +109,7 @@ src_compile() { src_install() { into / dobin ping $(usex ipv6 'ping6' '') - use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8 doman doc/ping.8 if use arping ; then @@ -132,7 +132,7 @@ src_install() { if use tracepath && use ipv6 ; then dosbin tracepath6 - dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if use traceroute && use ipv6 ; then
[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/files/eblits/
commit: bf9204c03a17020dd840145b26fd1b5a5ee35127 Author: Benda Xu gentoo org> AuthorDate: Sun Jun 19 22:46:27 2016 + Commit: Benda XU gentoo org> CommitDate: Sun Jun 19 23:19:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9204c0 sys-libs/glibc: specify sbin in src_configure. In configure when prefix=/usr, libc_cv_rootsbindir is set to /sbin instead of /usr/sbin. The same does not apply if prefix=EPREFIX/usr. We force it in Prefix to be consistant. Package-Manager: portage-2.2.28 sys-libs/glibc/files/eblits/src_configure.eblit | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index 5ba094a..396bce5 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -132,6 +132,7 @@ glibc_do_configure() { # There is no configure option for this and we need to export it # since the glibc build will re-run configure on itself + export libc_cv_rootsbindir="${EPREFIX}/sbin" export libc_cv_slibdir="${EPREFIX}/$(get_libdir)" # We take care of patching our binutils to use both hash styles,
[gentoo-commits] proj/portage: Branch deleted: plugin-sync
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:43:00 2016 + Branch deleted: plugin-sync
[gentoo-commits] proj/portage: Branch deleted: license-masking
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:42:24 2016 + Branch deleted: license-masking
[gentoo-commits] proj/portage: Branch deleted: 2.0
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:40:54 2016 + Branch deleted: 2.0
[gentoo-commits] proj/portage: Branch deleted: 2.1.2_5680
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:39:41 2016 + Branch deleted: 2.1.2_5680
[gentoo-commits] proj/portage: Branch deleted: 2.1.7
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:38:50 2016 + Branch deleted: 2.1.7
[gentoo-commits] proj/portage: Branch deleted: 2.1.3
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:38:40 2016 + Branch deleted: 2.1.3
[gentoo-commits] proj/portage: Branch deleted: 2.1.2.9
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:38:30 2016 + Branch deleted: 2.1.2.9
[gentoo-commits] proj/portage: Branch deleted: 2.1.2
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:38:12 2016 + Branch deleted: 2.1.2
[gentoo-commits] proj/portage: Branch deleted: 2.0.53
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:34:02 2016 + Branch deleted: 2.0.53
[gentoo-commits] proj/portage: Branch deleted: 2.1.1
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:33:30 2016 + Branch deleted: 2.1.1
[gentoo-commits] proj/portage: Branch deleted: 2.1
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:33:43 2016 + Branch deleted: 2.1
[gentoo-commits] proj/portage: Branch deleted: 2.1.4
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:33:07 2016 + Branch deleted: 2.1.4
[gentoo-commits] proj/portage: Branch deleted: 2.1.6
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:32:49 2016 + Branch deleted: 2.1.6
[gentoo-commits] proj/portage: Branch deleted: 2.1.9
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:32:13 2016 + Branch deleted: 2.1.9
[gentoo-commits] proj/portage: Branch deleted: 2.2.20.x
commit: Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:31:54 2016 + Branch deleted: 2.2.20.x
[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/
commit: 3d5382f3e2c437285a009db356c719bc3d77bdd9 Author: Zac Medico gentoo org> AuthorDate: Sun Jun 19 21:32:32 2016 + Commit: Zac Medico gentoo org> CommitDate: Sun Jun 19 22:17:13 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3d5382f3 unmerge-backup: check BUILD_TIME of existing binary package (bug 586410) Fix the dblink._quickpkg_dblink method to search for a binary package having identical BUILD_TIME to the installed instance. X-Gentoo-Bug: 586410 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586410 Acked-by: Brian Dolbec gentoo.org> pym/portage/dbapi/vartree.py | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index bfbe356..28ae584 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -5231,12 +5231,19 @@ class dblink(object): def _quickpkg_dblink(self, backup_dblink, background, logfile): + build_time = backup_dblink.getfile('BUILD_TIME') + try: + build_time = long(build_time.strip()) + except ValueError: + build_time = 0 + trees = QueryCommand.get_db()[self.settings["EROOT"]] bintree = trees["bintree"] - binpkg_path = bintree.getname(backup_dblink.mycpv) - if os.path.exists(binpkg_path) and \ - catsplit(backup_dblink.mycpv)[1] not in bintree.invalids: - return os.EX_OK + + for binpkg in reversed( + bintree.dbapi.match('={}'.format(backup_dblink.mycpv))): + if binpkg.build_time == build_time: + return os.EX_OK self.lockdb() try:
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/manifest/, ...
commit: 4062c69dc27a816b377b3eb91dcb1c93b6f2cab0 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jun 5 22:07:59 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Sun Jun 19 22:14:27 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4062c69d repoman: Move manifest generation to modules/commit/manifest.py .../manifest/manifests.py => commit/manifest.py} | 40 ++ .../pym/repoman/modules/scan/manifest/manifests.py | 87 +- repoman/pym/repoman/scanner.py | 6 +- 3 files changed, 13 insertions(+), 120 deletions(-) diff --git a/repoman/pym/repoman/modules/scan/manifest/manifests.py b/repoman/pym/repoman/modules/commit/manifest.py similarity index 72% copy from repoman/pym/repoman/modules/scan/manifest/manifests.py copy to repoman/pym/repoman/modules/commit/manifest.py index 2b8d7af..ce4c024 100644 --- a/repoman/pym/repoman/modules/scan/manifest/manifests.py +++ b/repoman/pym/repoman/modules/commit/manifest.py @@ -5,14 +5,13 @@ import sys # import our initialized portage instance from repoman._portage import portage -from repoman.modules.scan.scanbase import ScanBase from portage import os from portage.package.ebuild.digestgen import digestgen from portage.util import writemsg_level -class Manifests(ScanBase): +class Manifest(object): '''Creates as well as checks pkg Manifest entries/files''' def __init__(self, **kwargs): @@ -20,29 +19,22 @@ class Manifests(ScanBase): @param options: the run time cli options @param portdb: portdb instance - @param qatracker: QATracker instance @param repo_settings: repository settings instance ''' self.options = kwargs.get('options') self.portdb = kwargs.get('portdb') - self.qatracker = kwargs.get('qatracker') self.repoman_settings = kwargs.get('repo_settings').repoman_settings self.generated_manifest = False - def check(self, **kwargs): - '''Perform a changelog and untracked checks on the ebuild + def update_manifest(self, checkdir): + '''Perform a manifest generation for the pkg - @param xpkg: Package in which we check (object). - @param checkdirlist: list of files in the current package directory + @param checkdir: the current package directory @returns: dictionary ''' - checkdir = kwargs.get('checkdir') - xpkg = kwargs.get('xpkg') self.generated_manifest = False self.digest_only = self.options.mode != 'manifest-check' \ and self.options.digest == 'y' - if self.options.pretend: - return False if self.options.mode in ("manifest", 'commit', 'fix') or self.digest_only: failed = False self.auto_assumed = set() @@ -50,7 +42,7 @@ class Manifests(ScanBase): checkdir, self.repoman_settings, self.portdb) if self.options.mode == 'manifest' and self.options.force: portage._doebuild_manifest_exempt_depend += 1 - self.create_manifest(checkdir, fetchlist_dict) + self._create_manifest(checkdir, fetchlist_dict) self.repoman_settings["O"] = checkdir try: self.generated_manifest = digestgen( @@ -91,13 +83,9 @@ class Manifests(ScanBase): return True elif failed: sys.exit(1) - if not self.generated_manifest: - self.digest_check(xpkg, checkdir) - if self.options.mode == 'manifest-check': - return True return False - def create_manifest(self, checkdir, fetchlist_dict): + def _create_manifest(self, checkdir, fetchlist_dict): '''Creates a Manifest file @param checkdir: the directory to generate the Manifest in @@ -121,19 +109,3 @@ class Manifests(ScanBase): mf.write() finally: portage._doebuild_manifest_exempt_depend -= 1 - - def digest_check(self, xpkg, checkdir): - '''Check the manifest entries, report any Q/A errors - - @param xpkg: the cat/pkg name to check - @param checkdir: the directory path to check''' - self.repoman_settings['O'] = checkdir - self.repoman_settings['PORTAGE_QUIET'] = '1' - if not portage.digestcheck([], self.repoman_settings, strict=1): -
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-streamdev/
commit: d8ffe65c5aad45ea802ad5c218676bbafef216e6 Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jun 19 21:28:06 2016 + Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Jun 19 21:29:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ffe65c media-plugins/vdr-streamdev: fixed BadInsIntoDir Package-Manager: portage-2.3.0_rc1 media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild | 5 ++--- media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild index ab17d28..ac29370 100644 --- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild +++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -57,8 +57,7 @@ src_install() { insinto /usr/share/vdr/rcscript newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh - insinto /etc/conf.d - newins "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server + newconfd "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server insinto /etc/vdr/plugins/streamdev-server newins streamdev-server/streamdevhosts.conf streamdevhosts.conf diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild index 3ef2bc7..2bd82d2 100644 --- a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild +++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.1_p20160320.ebuild @@ -59,8 +59,7 @@ src_install() { insinto /usr/share/vdr/rcscript newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh - insinto /etc/conf.d - newins "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server + newconfd "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server insinto /etc/vdr/plugins/streamdev-server newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
[gentoo-commits] repo/gentoo:master commit in: app-misc/gnote/
commit: 5f8551642b77435b0b2580e90ade514d328c2120 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sun Jun 19 20:45:31 2016 + Commit: Alexandre Rostovtsev gentoo org> CommitDate: Sun Jun 19 20:45:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f855164 app-misc/gnote: fix aclocal error (bug #581308) Thanks to Ed Catmur for reporting and the fix. Package-Manager: portage-2.3.0_rc1 app-misc/gnote/gnote-3.18.1.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild index 7aa6fe3..e0afcb2 100644 --- a/app-misc/gnote/gnote-3.18.1.ebuild +++ b/app-misc/gnote/gnote-3.18.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -49,6 +49,10 @@ src_prepare() { # Do not alter CFLAGS sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die + # Prevent m4_copy error when running aclocal, bug #581308 + # m4_copy: won't overwrite defined macro: glib_DEFUN + rm m4/glib-gettext.m4 || die + eautoreconf gnome2_src_prepare
[gentoo-commits] proj/pax-utils:master commit in: travis/, /
commit: c88a1c6b3dd1a5bcbd8f82a7a73751100e128a00 Author: Mike Frysinger gentoo org> AuthorDate: Sun Jun 19 13:30:07 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Jun 19 13:30:07 2016 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=c88a1c6b travis: add coverity scan integration .travis.yml| 12 README.md | 2 +- travis/main.sh | 25 + 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f5f843..37b90c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,26 @@ # https://docs.travis-ci.com/ language: c +# Order here matters for implicit matrix generation and coverity scan. +# See travis/main.sh for details. compiler: - - clang - gcc + - clang sudo: false +# Order here matters; see compiler comment above. os: - linux -# Travis currently runs on OS X 10.9 which does not include *at funcs. -# Disable until they update or we include autotools support. - osx # Travis currently uses Ubuntu 12.04 (Precise) which is too old: it does # not include pyelftools. Disable until they update. env: - - USE_PYTHON=no + global: +- USE_PYTHON=no +- secure: "ePjz/xsdTlf0lhdZtANITiAk2lBAA9wwzB5PK/9aR5i1eBfjgXQgIJLY1y7Lqa4WU8TnSF2mwzd0pYgb320lQMC5rP7aEMAqxVZeG9WmFjet2G5vQ48tDhEJzzDhOpfvQyPehiWqLL6RUhNjE8+kpdK74P7oUFJVIuoQkUn2EuW9eUD9hV6z6tS60C0F4COdE/6DPnBySmqvjm9r9Sdfz1flCI2FXoV7MrrqrwLIx3OMtHmqmM9vGF1d2rGXRADVEGL+ldx9KvdfTLddXhWkCuHZil9YMvQLu0+gTK/g3V02Gh1/xrKmTa6v2RDqimCYDGKdHn0An+tQShYqk2JqJfzvPeysGS8lWfQePaEnHnf6niQN6h4078Ru5jH3D6AFjInrdPEOS3UZsbrJ//7hhUdiHONeQZcVcCVk7bvaJoanjjI9hJaPQXc72u81uyjlXaTOEj/znOAV92WyTaR62cT5r0GR+R7Jp214YR1IyAIB63zQVw2QCNi6W2HpyUEo3d2fOdJdaPwPQL52GxD/i3h4uGh1orYdRL4s/tdqwvYHklE2AGrEAboq2pIkmVirWH9+3+vRTnZ+fyoXD6dqDa0QvkN0pxEwmFy0IvbvTUA+0k6iplDVY21hqoid2OUpus+LjdXT2QALsY9OfMvMPdUaoFSTzWFm1jwZBPqlZN0=" + # Note: OS X deps are maintained in .travis.sh until Travis supports it here. addons: apt: diff --git a/README.md b/README.md index 4913455..fa0f0f8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | HOMEPAGE | https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities | | GIT | git clone git://anongit.gentoo.org/proj/pax-utils.git | | VIEWVCS | https://gitweb.gentoo.org/proj/pax-utils.git/ | -| STATUS | [![Build Status](https://travis-ci.org/gentoo/pax-utils.svg?branch=master)](https://travis-ci.org/gentoo/pax-utils) | +| STATUS | [![Build Status](https://travis-ci.org/gentoo/pax-utils.svg?branch=master)](https://travis-ci.org/gentoo/pax-utils) [![Coverity Status](https://scan.coverity.com/projects/9213/badge.svg)](https://scan.coverity.com/projects/gentoo-pax-utils) | pax-utils is a small set of utilities for peforming Q/A (mostly security) checks on systems (most notably, `scanelf`). It is focused on the ELF diff --git a/travis/main.sh b/travis/main.sh index 58b4ddf..9c8c9c9 100755 --- a/travis/main.sh +++ b/travis/main.sh @@ -2,6 +2,27 @@ . "${0%/*}"/lib.sh +# We have to do this by hand rather than use the coverity addon because of +# matrix explosion: https://github.com/travis-ci/travis-ci/issues/1975 +coverity_scan() { + local reason + [[ ${TRAVIS_JOB_NUMBER} != *.1 ]] && reason="not first build job" + [[ -n ${TRAVIS_TAG} ]] && reason="git tag" + [[ ${TRAVIS_PULL_REQUEST} == "true" ]] && reason="pull request" + if [[ -n ${reason} ]] ; then + echo "Skipping coverity scan due to: ${reason}" + return + fi + + export COVERITY_SCAN_PROJECT_NAME="${TRAVIS_REPO_SLUG}" + export COVERITY_SCAN_NOTIFICATION_EMAIL="vap...@gentoo.org" + export COVERITY_SCAN_BUILD_COMMAND="make -j${ncpus}" + export COVERITY_SCAN_BUILD_COMMAND_PREPEND="git clean -q -x -d -f; git checkout -f" + export COVERITY_SCAN_BRANCH_PATTERN="master" + + curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh; | bash || : +} + main() { if [[ ${TRAVIS_OS_NAME} == "osx" ]] ; then # Note: Linux deps are maintained in .travis.yml. @@ -44,5 +65,9 @@ main() { v ./configure m V=1 fi + + # Do scans last as they like to dirty the tree and some tests + # expect a clean tree (like code style checks). + v --fold="coverity_scan" coverity_scan } main "$@"
[gentoo-commits] repo/gentoo:master commit in: app-emacs/ebuild-mode/, app-emacs/ebuild-mode/files/
commit: f1397137d1b880efe6b4be228edbf7811f924e09 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jun 19 20:08:54 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Jun 19 20:08:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1397137 app-emacs/ebuild-mode: Remove intermediate version. Package-Manager: portage-2.3.0_rc1 app-emacs/ebuild-mode/Manifest | 1 - app-emacs/ebuild-mode/ebuild-mode-1.30.ebuild | 21 - .../ebuild-mode/files/50ebuild-mode-gentoo-1.30.el | 14 -- 3 files changed, 36 deletions(-) diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest index f68f314..2ee63f2 100644 --- a/app-emacs/ebuild-mode/Manifest +++ b/app-emacs/ebuild-mode/Manifest @@ -1,3 +1,2 @@ DIST ebuild-mode-1.29.tar.xz 29296 SHA256 d4f095b1e58f7182218caa2d5839c0dec3eeb4f10386d846a36a895bcb979190 SHA512 bf81a5af269db49c2e9907daf7fc5d457ac07a5b9d921aa8084a55fc9065d71d114ea4210fba393b791e2473d5ab8bf37c2af2724f889061537e37e383574344 WHIRLPOOL 7e6167c79c5a22c9eab1ba91244f8ac18343092b459e8f8aa38308cd4003ec510e8be88d79e44c6432737816679b1c48491d1f3095c4f891eae499ee025c5018 -DIST ebuild-mode-1.30.tar.xz 29308 SHA256 7f270854579cbe78fbcc919d26404dbe9933859ba10b5d975801d63d03a6e76e SHA512 0d45f2bd5c8857745c76bffa7e39a223494cc2362f4c5369ffe93aa5608d6ff98d9d246583a4b2346e9900858a9161f8483e75139d4861d0412afa2dbf4408b2 WHIRLPOOL 95cc9b7a5c1a5257fd9c10fc5144344d12c0edee94b2353f73a93253bb5c21e74b622f5f74804cb315a879b12fbebab957a99cf1140ae9551bc944e9d8470c57 DIST ebuild-mode-1.31.tar.xz 29492 SHA256 09bcea9ede052bf33bde402f472340570fb8eff67196cd69d4ea4820d84edf0e SHA512 8e4868a40966d5b56573425fe41d638ef1bc10a1161759218c22d33cbeb67ed3e1c75553c58a1f1c9e3ff0d2d8b25794404909a2bd19e76be93a037f8f3a0581 WHIRLPOOL d256a716baa2a276e62790e8996815e608c22e6bb2072f62a4089cc8b594d9e5470f7d574c33c23cc6817c74d59d1927e7591f8d8150985641ba61c50d6335c2 diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.30.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.30.ebuild deleted file mode 100644 index a20418c..000 --- a/app-emacs/ebuild-mode/ebuild-mode-1.30.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit readme.gentoo-r1 elisp - -DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs; -SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -DOCS="ChangeLog keyword-generation.sh" -ELISP_TEXINFO="${PN}.texi" -SITEFILE="50${PN}-gentoo-1.30.el" -DOC_CONTENTS="Some optional features may require installation of additional - packages, like app-portage/gentoolkit-dev for echangelog." diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.30.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.30.el deleted file mode 100644 index b16043e..000 --- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.30.el +++ /dev/null @@ -1,14 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'ebuild-mode "ebuild-mode" - "Major mode for Portage .ebuild and .eclass files." t) -(autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode" - "Major mode for Gentoo GLEP 42 news items." t) - -(add-to-list 'auto-mode-alist -'("\\.\\(ebuild\\|eclass\\|eblit\\)\\'" . ebuild-mode)) -(add-to-list 'auto-mode-alist -'("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'" - . gentoo-newsitem-mode)) -(add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode)) -(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode)) -(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\|eblit\\)\\'" 'utf-8)
[gentoo-commits] repo/gentoo:master commit in: app-emacs/ebuild-mode/files/, app-emacs/ebuild-mode/
commit: 96f01189ac17120541e810d82ec7479f814365a4 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jun 19 20:04:02 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Jun 19 20:04:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f01189 app-emacs/ebuild-mode: Version bump. Package-Manager: portage-2.3.0_rc1 app-emacs/ebuild-mode/Manifest | 1 + app-emacs/ebuild-mode/ebuild-mode-1.31.ebuild | 21 + .../ebuild-mode/files/50ebuild-mode-gentoo-1.31.el | 13 + 3 files changed, 35 insertions(+) diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest index 983f4fb..f68f314 100644 --- a/app-emacs/ebuild-mode/Manifest +++ b/app-emacs/ebuild-mode/Manifest @@ -1,2 +1,3 @@ DIST ebuild-mode-1.29.tar.xz 29296 SHA256 d4f095b1e58f7182218caa2d5839c0dec3eeb4f10386d846a36a895bcb979190 SHA512 bf81a5af269db49c2e9907daf7fc5d457ac07a5b9d921aa8084a55fc9065d71d114ea4210fba393b791e2473d5ab8bf37c2af2724f889061537e37e383574344 WHIRLPOOL 7e6167c79c5a22c9eab1ba91244f8ac18343092b459e8f8aa38308cd4003ec510e8be88d79e44c6432737816679b1c48491d1f3095c4f891eae499ee025c5018 DIST ebuild-mode-1.30.tar.xz 29308 SHA256 7f270854579cbe78fbcc919d26404dbe9933859ba10b5d975801d63d03a6e76e SHA512 0d45f2bd5c8857745c76bffa7e39a223494cc2362f4c5369ffe93aa5608d6ff98d9d246583a4b2346e9900858a9161f8483e75139d4861d0412afa2dbf4408b2 WHIRLPOOL 95cc9b7a5c1a5257fd9c10fc5144344d12c0edee94b2353f73a93253bb5c21e74b622f5f74804cb315a879b12fbebab957a99cf1140ae9551bc944e9d8470c57 +DIST ebuild-mode-1.31.tar.xz 29492 SHA256 09bcea9ede052bf33bde402f472340570fb8eff67196cd69d4ea4820d84edf0e SHA512 8e4868a40966d5b56573425fe41d638ef1bc10a1161759218c22d33cbeb67ed3e1c75553c58a1f1c9e3ff0d2d8b25794404909a2bd19e76be93a037f8f3a0581 WHIRLPOOL d256a716baa2a276e62790e8996815e608c22e6bb2072f62a4089cc8b594d9e5470f7d574c33c23cc6817c74d59d1927e7591f8d8150985641ba61c50d6335c2 diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.31.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.31.ebuild new file mode 100644 index 000..d009200 --- /dev/null +++ b/app-emacs/ebuild-mode/ebuild-mode-1.31.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit readme.gentoo-r1 elisp + +DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs; +SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" + +DOCS="ChangeLog keyword-generation.sh" +ELISP_TEXINFO="${PN}.texi" +SITEFILE="50${PN}-gentoo-1.31.el" +DOC_CONTENTS="Some optional features may require installation of additional + packages, like app-portage/gentoolkit-dev for echangelog." diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.31.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.31.el new file mode 100644 index 000..5a09692 --- /dev/null +++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.31.el @@ -0,0 +1,13 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'ebuild-mode "ebuild-mode" + "Major mode for Portage .ebuild and .eclass files." t) +(autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode" + "Major mode for Gentoo GLEP 42 news items." t) + +(add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode)) +(add-to-list 'auto-mode-alist +'("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'" + . gentoo-newsitem-mode)) +(add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode)) +(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode)) +(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
[gentoo-commits] proj/emacs-tools: New tag: ebuild-mode-1.31
commit: Commit: Ulrich Müller gentoo org> CommitDate: Sun Jun 19 19:59:04 2016 + New tag: ebuild-mode-1.31
[gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /
commit: bd85548a49b050b4e8c1444c63d0ad0b888b4089 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jun 19 19:52:23 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Jun 19 19:52:23 2016 + URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=bd85548a Keywords regenerated from eclasses. * ebuild-mode-keywords.el (ebuild-mode-keywords-*): Regenerated. ChangeLog | 4 +++ ebuild-mode-keywords.el | 73 + 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4d52ef..97072fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-06-19 Ulrich Müller+ + * ebuild-mode-keywords.el (ebuild-mode-keywords-*): Regenerated. + 2016-06-08 Ulrich Müller * ebuild-mode.texi (Commands): Update Bugzilla URL to https. diff --git a/ebuild-mode-keywords.el b/ebuild-mode-keywords.el index a46068f..22e45c9 100644 --- a/ebuild-mode-keywords.el +++ b/ebuild-mode-keywords.el @@ -451,8 +451,8 @@ (defvar ebuild-mode-keywords-ghc-package '(("check-for-collisions" "ghc-cabal-version" "ghc-confdir" "ghc-extractportageversion" "ghc-getghc" "ghc-getghcpkg" - "ghc-getghcpkgbin" "ghc-install-pkg" "ghc-is-dynamic" "ghc-libdir" - "ghc-localpkgconfd" "ghc-package-db" "ghc-package-exists" + "ghc-getghcpkgbin" "ghc-host-root" "ghc-install-pkg" "ghc-is-dynamic" + "ghc-libdir" "ghc-localpkgconfd" "ghc-package-db" "ghc-package-exists" "ghc-package_pkg_postinst" "ghc-package_pkg_postrm" "ghc-package_pkg_prerm" "ghc-pkgdeps" "ghc-pm-version" "ghc-recache-db" "ghc-register-pkg" "ghc-reregister" "ghc-sanecabal" @@ -491,6 +491,17 @@ "is_multilib" "should_we_eselect_gnat") font-lock-type-face)) +(defvar ebuild-mode-keywords-gnatbuild-r1 + '(("add_profile_eselect_conf" "create_eselect_conf" + "disgusting_gcc_multilib_HACK" "do_gnat_config" "gcc-abi-map" + "gcc-multilib-configure" "gnatbuild-r1_pkg_postinst" + "gnatbuild-r1_pkg_postrm" "gnatbuild-r1_pkg_setup" + "gnatbuild-r1_src_compile" "gnatbuild-r1_src_configure" + "gnatbuild-r1_src_install" "gnatbuild-r1_src_unpack" + "guess_patch_type_in_dir" "is_crosscompile" "is_multilib" "make_gcc_hard" + "should_we_eselect_gnat" "tc_version_is_at_least") +font-lock-type-face)) + (defvar ebuild-mode-keywords-gnome-games '(("gnome-games_pkg_postinst" "gnome-games_pkg_postrm" "gnome-games_pkg_preinst" "gnome-games_pkg_setup" @@ -662,10 +673,9 @@ font-lock-type-face)) (defvar ebuild-mode-keywords-java-vm-2 - '(("get_system_arch" "install_mozilla_plugin" "java-vm-2_pkg_postinst" - "java-vm-2_pkg_postrm" "java-vm-2_pkg_prerm" "java-vm-2_pkg_setup" - "java-vm_revdep-mask" "java-vm_sandbox-predict" - "java-vm_set-pax-markings" "set_java_env") + '(("get_system_arch" "java-vm-2_pkg_postinst" "java-vm-2_pkg_postrm" + "java-vm-2_pkg_prerm" "java-vm-2_pkg_setup" "java-vm_revdep-mask" + "java-vm_sandbox-predict" "java-vm_set-pax-markings" "set_java_env") font-lock-type-face)) (defvar ebuild-mode-keywords-kde4-base @@ -788,30 +798,10 @@ '(("mozconfig_config") font-lock-type-face)) -(defvar ebuild-mode-keywords-mozconfig-v5.34 - '(("mozconfig_config") -font-lock-type-face)) - -(defvar ebuild-mode-keywords-mozconfig-v5.36 - '(("mozconfig_config") -font-lock-type-face)) - -(defvar ebuild-mode-keywords-mozconfig-v5.38 - '(("mozconfig_config") -font-lock-type-face)) - (defvar ebuild-mode-keywords-mozconfig-v6.38 '(("mozconfig_config") font-lock-type-face)) -(defvar ebuild-mode-keywords-mozconfig-v6.39 - '(("mozconfig_config") -font-lock-type-face)) - -(defvar ebuild-mode-keywords-mozconfig-v6.40 - '(("mozconfig_config") -font-lock-type-face)) - (defvar ebuild-mode-keywords-mozconfig-v6.41 '(("mozconfig_config") font-lock-type-face)) @@ -820,10 +810,6 @@ '(("mozconfig_config") font-lock-type-face)) -(defvar ebuild-mode-keywords-mozconfig-v6.44 - '(("mozconfig_config") -font-lock-type-face)) - (defvar ebuild-mode-keywords-mozconfig-v6.45 '(("mozconfig_config" "mozconfig_install_prefs") font-lock-type-face)) @@ -832,6 +818,10 @@ '(("mozconfig_config" "mozconfig_install_prefs") font-lock-type-face)) +(defvar ebuild-mode-keywords-mozconfig-v6.47 + '(("mozconfig_config" "mozconfig_install_prefs") +font-lock-type-face)) + (defvar ebuild-mode-keywords-mozcoreconf-2 '(("moz_pkgsetup" "mozconfig_annotate" "mozconfig_final" "mozconfig_init" "mozconfig_use_enable" "mozconfig_use_extension" "mozconfig_use_with" @@ -843,6 +833,11 @@ "mozconfig_use_enable" "mozconfig_use_extension" "mozconfig_use_with") font-lock-type-face)) +(defvar ebuild-mode-keywords-mozcoreconf-v4 + '(("moz_pkgsetup" "mozconfig_annotate" "mozconfig_final" "mozconfig_init" + "mozconfig_use_enable"
[gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /
commit: ed55c5f059651691b5d085ec6116b15fa3ac4d7f Author: Ulrich Müller gentoo org> AuthorDate: Sun Jun 19 19:55:48 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Jun 19 19:55:48 2016 + URL:https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=ed55c5f0 Version 1.31 released. ChangeLog| 2 ++ ebuild-mode.el | 2 +- ebuild-mode.texi | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97072fe..e0275e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-06-19 Ulrich Müller+ * Version 1.31 released. + * ebuild-mode-keywords.el (ebuild-mode-keywords-*): Regenerated. 2016-06-08 Ulrich Müller diff --git a/ebuild-mode.el b/ebuild-mode.el index 0476796..659a129 100644 --- a/ebuild-mode.el +++ b/ebuild-mode.el @@ -7,7 +7,7 @@ ;; Christian Faulhammer ;; Ulrich Müller ;; Maintainer: -;; Version: 1.30 +;; Version: 1.31 ;; Keywords: languages, processes ;; This file is free software: you can redistribute it and/or modify diff --git a/ebuild-mode.texi b/ebuild-mode.texi index 2b111cb..23ecd6f 100644 --- a/ebuild-mode.texi +++ b/ebuild-mode.texi @@ -25,7 +25,7 @@ later version published by the Free Software Foundation. @titlepage -@title ebuild-mode 1.30 +@title ebuild-mode 1.31 @subtitle Major mode for ebuilds and eclasses in Gentoo @author Christian Faulhammer @page
[gentoo-commits] repo/gentoo:master commit in: x11-libs/xforms/
commit: 431dedd340935c4b0f6ee39fee6fd7327285b958 Author: Patrice Clement gentoo org> AuthorDate: Sun Jun 19 18:56:33 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sun Jun 19 18:59:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431dedd3 x11-libs/xforms: Regenerate Manifest file. Package-Manager: portage-2.2.28 Gentoo-Bug: https://bugs.gentoo.org/585936 Signed-off-by: Patrice Clement gentoo.org> x11-libs/xforms/Manifest| 2 +- x11-libs/xforms/xforms-1.2.4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest index 0dde223..10738f9 100644 --- a/x11-libs/xforms/Manifest +++ b/x11-libs/xforms/Manifest @@ -1,2 +1,2 @@ DIST xforms-1.0.93sp1.tar.gz 2204088 SHA256 0cbef8c16c478b7fc87cf24be618114f9b7d14dc0a06b61a352bb027dd3b2ca4 SHA512 b352b345f110966741f82645f1282805dd27e4eb16642efedb4f7e0132a109f525da678052b501d1d520014bb7f754f5b53676a83cfab5a249c02db835c66a6a WHIRLPOOL e5d83d3aef7bc06612afa6a64f01bbc101c796ae4baf65198088627fcf9e241285707cf9d92b01927fe5970cc8c0e1f1ceb829037c224e0fbb37f41b4997ab54 -DIST xforms-1.2.4.tar.gz 1438503 SHA256 073aea6514959b81b5a82430df3308abf1072b75c909bb915c0e1ebe86d1a8a3 SHA512 93a37dcb9d5cafbca5a6992ba36234c8f9cf0c658e2a2d664b290f5fc39f1239498d97ea3f88230f097a62ed37813cf3c1bd84e98b92e03f1ac0cecfb62565f8 WHIRLPOOL 08e7c8b9740303a91a8cf61234b62455c06e87c6a79c83a13abf748254fa5a776b0bdfa75c4727ac2425c63e12f2d93397c825b4111d4dc767beb5e82c1e1cef +DIST xforms-1.2.4.tar.gz 1438503 SHA256 80b3c9f30678135cada4de7676789413ac7d4417d32db0f77c8f0f49998012f6 SHA512 58669a64b2390da4f4c8b76b1dc34c2e6a4094ebbcfa7f75e0846db4d5c4455d772d9ef59e5aff09edd777957140015faea129c180600634a8d0962b01b912aa WHIRLPOOL 84a5d1b8c88cd181a1b3477d6468bd8ce1a2546dd951481dd5793baba384629fd19062068b3dba840d46026d70171f4d4a2d4331da6128d221bf67cebb8689e1 diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild index 76d..b99c977 100644 --- a/x11-libs/xforms/xforms-1.2.4.ebuild +++ b/x11-libs/xforms/xforms-1.2.4.ebuild @@ -10,7 +10,7 @@ MY_P="${P/-/_}" DESCRIPTION="A graphical user interface toolkit for X" HOMEPAGE="http://xforms-toolkit.org/; -SRC_URI="http://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" +SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz; LICENSE="LGPL-2.1" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-web/
commit: f0073f3652d8faa8b80e5a9432a418a338881eb2 Author: James Le Cuirot gentoo org> AuthorDate: Sun Jun 19 19:14:12 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jun 19 19:14:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0073f36 dev-java/icedtea-web: Version bump to 1.6.2 Package-Manager: portage-2.3.0_rc1 dev-java/icedtea-web/Manifest | 1 + dev-java/icedtea-web/icedtea-web-1.6.2.ebuild | 87 +++ 2 files changed, 88 insertions(+) diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest index 9aab84a..60ab1af 100644 --- a/dev-java/icedtea-web/Manifest +++ b/dev-java/icedtea-web/Manifest @@ -1 +1,2 @@ DIST icedtea-web-1.6.1.tar.gz 1776222 SHA256 a9b46ab6c9dc303c89651143596bc5abea29242b9bdcabdd2dab7c606592c920 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9 WHIRLPOOL 96826d17daee16dfa99f6439678cc509c94556955839b7e8bc43c1993ee04740f35b0547d56649bb9f7a625b5b2515be9d173b642ccb15cb1dead83a03586a6e +DIST icedtea-web-1.6.2.tar.gz 1824557 SHA256 ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7 WHIRLPOOL 623a8ea5d5f00aa5e323c4f2de4617a4809149a25f3fbcfbbed76b4a5ecd452c372420dcffd2ad303f815c89168d8820d2997d286e0cc3360054a2c28732b603 diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild new file mode 100644 index 000..250c65c --- /dev/null +++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +README_GENTOO_SUFFIX="-r1" + +inherit autotools eutils multilib readme.gentoo-r1 java-pkg-2 xdg-utils + +DESCRIPTION="FOSS Java browser plugin and Web Start implementation" +HOMEPAGE="http://icedtea.classpath.org; +SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz; +LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +IUSE="doc javascript nsplugin tagsoup test" +RESTRICT="test" + +CDEPEND="javascript? ( dev-java/rhino:1.6 ) + nsplugin? ( >=dev-libs/glib-2.16:2= ) + tagsoup? ( dev-java/tagsoup:0 )" + +DEPEND="${CDEPEND} + app-arch/zip + >=virtual/jdk-1.7 + virtual/pkgconfig + nsplugin? ( net-misc/npapi-sdk ) + test? ( >=dev-java/junit-4.8:4 )" + +RDEPEND="${CDEPEND} + >=app-eselect/eselect-java-0.2.0 + >=virtual/jre-1.7 + nsplugin? ( + !dev-java/oracle-jdk-bin[nsplugin] + !dev-java/oracle-jre-bin[nsplugin] + )" + +src_prepare() { + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855 + epatch "${FILESDIR}"/${PN}-1.6-{launchers,respect-ldflags,unused-libs}.patch + + if java-pkg_is-vm-version-ge "1.8" ; then + sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + local tagsoup + use tagsoup && tagsoup="$(java-pkg_getjars tagsoup)" + + local config=( + # Rename javaws to itweb-javaws as eselect java-vm manages + # javaws to prevent a clash with Oracle's implementation. + --program-transform-name='s/^javaws$/itweb-javaws/' + --libdir="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins + --with-java="${EPREFIX}"/usr/bin/java + --with-jdk-home="${JAVA_HOME}" + $(use_enable doc docs) + $(use_enable nsplugin plugin) + $(use_with javascript rhino) + $(use_with tagsoup tagsoup "${tagsoup}") + ) + + # See bug #573060. + xdg_environment_reset + + # Rely on the --with-jdk-home option given above. + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + + econf "${config[@]}" +} + +src_compile() { + default +} + +src_install() { + default + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +}
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 45d209aed63079e071d02eb638af3d46218b9951 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 17:53:02 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 17:53:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d209ae profiles: mask sys-auth/pam_keystore for removal Gentoo-bug: 586172 profiles/package.mask | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index c739f29..0d2ece0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -31,6 +31,10 @@ #--- END OF EXAMPLES --- # Michael Palimaka(19 Jun 2016) +# Ancient, untested, never unmasked. Removal in 30 days. Bug 586172. +sys-auth/pam_keystore + +# Michael Palimaka (19 Jun 2016) # Fails to build. Unmaintained. Dead upstream. # Masked for removal in 30 days. Bug 586348. net-misc/mdidentd @@ -887,10 +891,6 @@ media-libs/shivavg (09 Oct 2009) -# Untested yet; documented only in Russian, help is appreciated. -sys-auth/pam_keystore - # Diego E. Pettenò (08 Aug 2009) # on behalf of QA Team #
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: b0ba7a9de3405049bba2d74a197a80867855f04e Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 17:44:40 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 17:44:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ba7a9d profiles: mask net-misc/mdidentd for removal Gentoo-bug: 586348 profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 12cab31..c739f29 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,11 @@ #--- END OF EXAMPLES --- +# Michael Palimaka(19 Jun 2016) +# Fails to build. Unmaintained. Dead upstream. +# Masked for removal in 30 days. Bug 586348. +net-misc/mdidentd + # Michael Palimaka (16 Jun 2016) # No longer does anything. Masked for removal in 30 days. # Bug 585786.
[gentoo-commits] repo/gentoo:master commit in: licenses/
commit: 723e9ae24e6f86461ac1dd25226838d65824037e Author: Ulrich Müller gentoo org> AuthorDate: Sun Jun 19 17:35:26 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Jun 19 17:35:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723e9ae2 licenses: Formatting fixes. Licenses should be plain text files, not HTML. https://devmanual.gentoo.org/general-concepts/licenses/index.html licenses/HTML-Tidy | 19 +- licenses/gSOAP | 905 - 2 files changed, 416 insertions(+), 508 deletions(-) diff --git a/licenses/HTML-Tidy b/licenses/HTML-Tidy index 3e704e0..eca7acf 100644 --- a/licenses/HTML-Tidy +++ b/licenses/HTML-Tidy @@ -1,17 +1,9 @@ - - - - HTML Tidy License - - - - HTML Tidy HTML parser and pretty printer Copyright (c) 1998-2003 World Wide Web Consortium -(Massachusetts Institute of Technology, European Research +(Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University). All Rights Reserved. @@ -21,7 +13,7 @@ representations or warranties, express or implied, including but not limited to, warranties of merchantability or fitness for any particular purpose or that the use of the software or documentation will not infringe any third party patents, -copyrights, trademarks or other rights. +copyrights, trademarks or other rights. The copyright holders and contributing author(s) will not be held liable for any direct, indirect, special or consequential damages @@ -37,14 +29,9 @@ for any purpose, without fee, subject to the following restrictions: not be misrepresented as being the original source. 3. This Copyright notice may not be removed or altered from any source or altered source distribution. - + The copyright holders and contributing author(s) specifically permit, without fee, and encourage the use of this source code as a component for supporting the Hypertext Markup Language in commercial products. If you use this source code in a product, acknowledgment is not required but would be appreciated. - - - - - diff --git a/licenses/gSOAP b/licenses/gSOAP index 94d783f..4ce2da1 100644 --- a/licenses/gSOAP +++ b/licenses/gSOAP @@ -1,492 +1,413 @@ -http://www.w3.org/TR/REC-html40/loose.dtd;> - - - - div.p { margin-top: 7pt;} - - - - gSOAP Public License - -gSOAP Public License - -Version 1.3a - - - The gSOAP public license is derived from the Mozilla Public License (MPL1.1). -The sections that were deleted from the original MPL1.1 text are 1.0.1, -2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was -added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), -3.5 (deleted the last sentence), and 3.6 (simplified). - - -1DEFINITIONS. - - - - - sep 0mm - 1.0.1. - - 1.1. "Contributor" - -means each entity that creates or contributes to the creation of -Modifications. - 1.2. "Contributor Version" - -means the combination of the Original Code, prior -Modifications used by a Contributor, and the Modifications made by that -particular Contributor. - 1.3. "Covered Code" - -means the Original Code, or Modifications or the combination -of the Original Code, and Modifications, in each case -including portions thereof. - 1.4. "Electronic Distribution Mechanism" - -means a mechanism generally accepted in the software development community for -the electronic transfer of data. - 1.5. "Executable" - -means Covered Code in any form other than Source Code. - 1.6. "Initial Developer" - -means the individual or entity identified as the Initial Developer in the -Source Code notice required by Exhibit A. - 1.7. "Larger Work" - -means a work which combines Covered Code or portions thereof with code not -governed by the terms of this License. - 1.8. "License" - -means this document. - 1.8.1. "Licensable" - -means having the right to grant, to the maximum extent possible, whether at the -time of the initial grant or subsequently acquired, any and all of the rights -conveyed herein. - 1.9. "Modifications" - -means any addition to or deletion from the substance or structure of either the -Original Code or any previous Modifications. When Covered -Code is released as a series of files, a Modification is: - - - - sep 0mm - A. -Any addition to or deletion from the contents of a file containing -Original Code or previous Modifications. - B. -Any new file that
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/
commit: 6a51a460d445f6f003c53f3600756f3a25377fc6 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 16:08:19 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 16:08:36 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a51a460 kde-plasma/plasma-workspace: revision bump to ensure fix from 54f2348de8aed0a30960a340bbd762196da488a2 is propagated Package-Manager: portage-2.3.0_rc1 .../{plasma-workspace-5.6.95.ebuild => plasma-workspace-5.6.95-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.6.95.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.6.95-r1.ebuild similarity index 100% rename from kde-plasma/plasma-workspace/plasma-workspace-5.6.95.ebuild rename to kde-plasma/plasma-workspace/plasma-workspace-5.6.95-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-vcs/blogc-git-receiver/, www-servers/blogc-runserver/
commit: 2c6a8aa092cfa8ce37e63c9d9564764f33d3dc73 Author: Rafael G. Martins gentoo org> AuthorDate: Sun Jun 19 15:53:14 2016 + Commit: Rafael Martins gentoo org> CommitDate: Sun Jun 19 15:53:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6a8aa0 dev-vcs/blogc-git-receiver: www-servers/blogc-runserver: removal Packages were replaced by USE=git and USE=httpd in app-text/blogc. dev-vcs/blogc-git-receiver/Manifest| 1 - .../blogc-git-receiver-0.4.0.ebuild| 41 - .../blogc-git-receiver-.ebuild | 41 - dev-vcs/blogc-git-receiver/metadata.xml| 18 -- profiles/package.mask | 6 www-servers/blogc-runserver/Manifest | 1 - .../blogc-runserver/blogc-runserver-0.1.1.ebuild | 42 -- .../blogc-runserver/blogc-runserver-.ebuild| 42 -- www-servers/blogc-runserver/metadata.xml | 18 -- 9 files changed, 210 deletions(-) diff --git a/dev-vcs/blogc-git-receiver/Manifest b/dev-vcs/blogc-git-receiver/Manifest deleted file mode 100644 index ae7a030..000 --- a/dev-vcs/blogc-git-receiver/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST blogc-git-receiver-0.4.0.tar.xz 240764 SHA256 14d3b60e2568c0995cc1cc4cb656a45aa63a44841f1246b441bb1011c5269d93 SHA512 d1c7cb660d570c66ae25046dfc1ea68ff0f9a76432b0063e7f3a955d5d8564fdb2443791191f94534f94a797e8f46e421554f009ca43ba5fd8f377eabecd57ea WHIRLPOOL 61f92b5280162e270c660e127a104a09a9e136b707333f605783308274978f28542b27a38c009b36d0411bedbf612a4ba8decef0eabc5550b69845fa121bdae4 diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.4.0.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.4.0.ebuild deleted file mode 100644 index 145f1c1..000 --- a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.4.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -if [[ ${PV} = ** ]]; then - EGIT_REPO_URI="git://github.com/blogc/blogc-git-receiver.git - https://github.com/blogc/blogc-git-receiver.git; - inherit git-r3 autotools -fi - -DESCRIPTION="A simple login shell/git hook to deploy blogc websites" -HOMEPAGE="https://github.com/blogc/blogc-git-receiver; - -SRC_URI="https://github.com/blogc/${PN}/releases/download/v${PV}/${P}.tar.xz; -KEYWORDS="~amd64 ~x86" -if [[ ${PV} = ** ]]; then - SRC_URI="" - KEYWORDS="" - DEPEND="=dev-libs/squareball-" -else - DEPEND=">=dev-libs/squareball-0.2.0" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - [[ ${PV} = ** ]] && AT_NO_RECURSIVE=1 eautoreconf - default -} - -src_configure() { - econf \ - --with-squareball=system -} diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-.ebuild deleted file mode 100644 index 145f1c1..000 --- a/dev-vcs/blogc-git-receiver/blogc-git-receiver-.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -if [[ ${PV} = ** ]]; then - EGIT_REPO_URI="git://github.com/blogc/blogc-git-receiver.git - https://github.com/blogc/blogc-git-receiver.git; - inherit git-r3 autotools -fi - -DESCRIPTION="A simple login shell/git hook to deploy blogc websites" -HOMEPAGE="https://github.com/blogc/blogc-git-receiver; - -SRC_URI="https://github.com/blogc/${PN}/releases/download/v${PV}/${P}.tar.xz; -KEYWORDS="~amd64 ~x86" -if [[ ${PV} = ** ]]; then - SRC_URI="" - KEYWORDS="" - DEPEND="=dev-libs/squareball-" -else - DEPEND=">=dev-libs/squareball-0.2.0" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - [[ ${PV} = ** ]] && AT_NO_RECURSIVE=1 eautoreconf - default -} - -src_configure() { - econf \ - --with-squareball=system -} diff --git a/dev-vcs/blogc-git-receiver/metadata.xml b/dev-vcs/blogc-git-receiver/metadata.xml deleted file mode 100644 index 3761186..000 --- a/dev-vcs/blogc-git-receiver/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - rafaelmart...@gentoo.org - Rafael G. Martins - - - A simple login shell/git hook to deploy blogc websites. - - - - raf...@rafaelmartins.eng.br - Rafael G. Martins - - blogc/blogc-git-receiver - - diff --git a/profiles/package.mask b/profiles/package.mask index e303b4d..12cab31 100644 ---
[gentoo-commits] proj/releng:master commit in: releases/weekly/portage/stages/package.keywords/
commit: c03fe1c1a16af644a11b8d015c3f75c245008e70 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Jun 19 15:51:01 2016 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Jun 19 15:51:01 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=c03fe1c1 Keyword latest openssh version to allow root password logins in the live-cds - fixes bug 585232. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> releases/weekly/portage/stages/package.keywords/openssh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/releases/weekly/portage/stages/package.keywords/openssh b/releases/weekly/portage/stages/package.keywords/openssh new file mode 100644 index 000..b3ab130 --- /dev/null +++ b/releases/weekly/portage/stages/package.keywords/openssh @@ -0,0 +1,2 @@ +# Allow root password logins in the live-cds +=net-misc/openssh-7.2_p2-r1
[gentoo-commits] repo/gentoo:master commit in: app-text/blogc/
commit: fecd0522cd0f9d23f64daa59ee72418f3b70b19a Author: Rafael G. Martins gentoo org> AuthorDate: Sun Jun 19 15:46:48 2016 + Commit: Rafael Martins gentoo org> CommitDate: Sun Jun 19 15:46:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fecd0522 app-text/blogc: version bump Package-Manager: portage-2.2.26 app-text/blogc/Manifest | 2 +- app-text/blogc/{blogc-0.10.0.ebuild => blogc-0.10.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest index b56d2e4..d5c2ef2 100644 --- a/app-text/blogc/Manifest +++ b/app-text/blogc/Manifest @@ -1 +1 @@ -DIST blogc-0.10.0.tar.xz 266800 SHA256 6d76d7b3054bc126e3e80ecc9248d8f7fa30d633544c1ce2d5839b413da13008 SHA512 1f1b9b3c6898e7b5251901ba297b101fc9d65820776f6e48af3bf54cb73faaee5d377f1b3ba0464328d73c1c479abd63ff6f61b17f3357fe7c24c508feaa9158 WHIRLPOOL 5e093c024a755f750dbcc0b15eb665858941d79a7c4e62a9f16d06d15a6475dd83338d0e49fc8cffaabe070ebbd37fab8df16411d74e16d234e493cf01fd79ec +DIST blogc-0.10.1.tar.xz 266968 SHA256 c4645607a02ed665ae9b3b07a15a4f54f8312818a3089aa422a5128a7e08b147 SHA512 fa4bec7e1b5395806b59da360b7eda735b6d702c878e27e54eeff57cbabf1a2d86f409cec8d620a80bb673de5c4dda694704e21e118a31dbb82aba25d43cfd58 WHIRLPOOL cf6e73482fa25ccd77d48be2980e9d05e1338eb2c47667f9bc5e39a7591cb7ca04a8878d34086be3dbb3e0d69afd24faec6d742b52a5e2c44e9b226a89315047 diff --git a/app-text/blogc/blogc-0.10.0.ebuild b/app-text/blogc/blogc-0.10.1.ebuild similarity index 100% rename from app-text/blogc/blogc-0.10.0.ebuild rename to app-text/blogc/blogc-0.10.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kglobalaccel/
commit: d62c99907a0c8a2a36d60a716b9852202f9ca967 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 15:12:03 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 15:16:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62c9990 kde-frameworks/kglobalaccel: revision bump to add Qt subslot operator Package-Manager: portage-2.3.0_rc1 .../kglobalaccel/kglobalaccel-5.23.0-r1.ebuild | 32 ++ 1 file changed, 32 insertions(+) diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.23.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.23.0-r1.ebuild new file mode 100644 index 000..736da26 --- /dev/null +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.23.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework to handle global shortcuts" +KEYWORDS="~amd64 ~arm ~x86" +LICENSE="LGPL-2+" +IUSE="nls" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kwindowsystem X) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '' '' '5=') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + x11-libs/libxcb + x11-libs/xcb-util-keysyms + !
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs4support/
commit: fbc238cf67966fc6cafd5dd64bb77105533ea013 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 15:15:57 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 15:16:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc238cf kde-frameworks/kdelibs4support: revision bump to add Qt subslot operator Package-Manager: portage-2.3.0_rc1 .../kdelibs4support-5.23.0-r1.ebuild | 86 ++ 1 file changed, 86 insertions(+) diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.23.0-r1.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.23.0-r1.ebuild new file mode 100644 index 000..2c46b69 --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.23.0-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="libressl X" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 +COMMON_DEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kded) + $(add_frameworks_dep kdesignerplugin) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kunitconversion) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '' '' '5=') + $(add_qt_dep qtnetwork 'ssl') + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qttest) + $(add_qt_dep qtwidgets) + app-text/docbook-xml-dtd:4.2 + virtual/libintl + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + ) +" +RDEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kdoctools) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kitemmodels) + $(add_qt_dep qtxml) + !
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kglobalaccel/
commit: 68ffaba0bcfca6a62df204899b6f89df17d18d24 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 15:11:10 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 15:14:59 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=68ffaba0 kde-frameworks/kglobalaccel: introduce temporary Qt subslot operator Package-Manager: portage-2.3.0_rc1 kde-frameworks/kglobalaccel/kglobalaccel-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-.ebuild index 790fc88..8ff04e3 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel-.ebuild +++ b/kde-frameworks/kglobalaccel/kglobalaccel-.ebuild @@ -12,6 +12,7 @@ KEYWORDS="" LICENSE="LGPL-2+" IUSE="nls" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 RDEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -19,7 +20,7 @@ RDEPEND=" $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kwindowsystem X) $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) + $(add_qt_dep qtgui '' '' '5=') $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) x11-libs/libxcb
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/
commit: a131928b81fe74f6314a51b60081b109f35501d0 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 15:14:48 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 15:14:59 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a131928b kde-frameworks/kdelibs4support: introduce temporary Qt subslot operator Package-Manager: portage-2.3.0_rc1 kde-frameworks/kdelibs4support/kdelibs4support-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild index dbf59c9..0b7620d 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild @@ -12,6 +12,7 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="libressl X" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 COMMON_DEPEND=" $(add_frameworks_dep kauth) $(add_frameworks_dep kcodecs) @@ -40,7 +41,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep solid) $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) + $(add_qt_dep qtgui '' '' '5=') $(add_qt_dep qtnetwork 'ssl') $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg)
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kxmlgui/
commit: bca390aa709b5aadd8ddbd9785ddafc361e1f755 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 15:06:53 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 15:08:19 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bca390aa kde-frameworks/kxmlgui: introduce temporary Qt subslot operator Package-Manager: portage-2.3.0_rc1 kde-frameworks/kxmlgui/kxmlgui-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kxmlgui/kxmlgui-.ebuild b/kde-frameworks/kxmlgui/kxmlgui-.ebuild index e48869d..8011f28 100644 --- a/kde-frameworks/kxmlgui/kxmlgui-.ebuild +++ b/kde-frameworks/kxmlgui/kxmlgui-.ebuild @@ -12,6 +12,7 @@ KEYWORDS="" LICENSE="LGPL-2+" IUSE="attica" +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 RDEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -24,7 +25,7 @@ RDEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) + $(add_qt_dep qtgui '' '' '5=') $(add_qt_dep qtnetwork 'ssl') $(add_qt_dep qtprintsupport) $(add_qt_dep qtwidgets)
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kxmlgui/
commit: 69c06e0ba5a48276a0a6b0d67a7b356eb7a34ad3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 15:08:07 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 15:08:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c06e0b kde-frameworks/kxmlgui: revision bump to add Qt subslot operator Package-Manager: portage-2.3.0_rc1 kde-frameworks/kxmlgui/kxmlgui-5.23.0-r1.ebuild | 43 + 1 file changed, 43 insertions(+) diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.23.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.23.0-r1.ebuild new file mode 100644 index 000..9f4e327 --- /dev/null +++ b/kde-frameworks/kxmlgui/kxmlgui-5.23.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" +KEYWORDS="~amd64 ~arm ~x86" +LICENSE="LGPL-2+" +IUSE="attica" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '' '' '5=') + $(add_qt_dep qtnetwork 'ssl') + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + attica? ( $(add_frameworks_dep attica) ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package attica KF5Attica) + ) + + kde5_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/kronometer/
commit: 5847c792505d4b32c2128eaa8a510afbd3555973 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jun 19 14:55:10 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 14:59:34 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5847c792 x11-misc/kronometer: Fix USE=-handbook and USE=handbook Gentoo-bug: 586220 Package-Manager: portage-2.2.28 x11-misc/kronometer/kronometer-2.1.0.ebuild | 17 + 1 file changed, 17 insertions(+) diff --git a/x11-misc/kronometer/kronometer-2.1.0.ebuild b/x11-misc/kronometer/kronometer-2.1.0.ebuild index ec61f4d..0a34912 100644 --- a/x11-misc/kronometer/kronometer-2.1.0.ebuild +++ b/x11-misc/kronometer/kronometer-2.1.0.ebuild @@ -30,3 +30,20 @@ DEPEND=" $(add_qt_dep qtwidgets) " RDEPEND="${DEPEND}" + +src_prepare() { + kde5_src_prepare + + local docdir=doc-translations + if use_if_iuse handbook && [[ -d ${docdir} ]] ; then + pushd ${docdir} > /dev/null || die + for lang in *; do + if ! has ${lang/_${PN}/} ${LINGUAS} ; then + cmake_comment_add_subdirectory "${lang}/${PN}" + fi + done + popd > /dev/null || die + else + cmake_comment_add_subdirectory ${docdir} + fi +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/
commit: f042f0e1ed0343d695cfbd628544a7ac8d19cab6 Author: Tobias Klausmann gentoo org> AuthorDate: Sun Jun 19 14:39:03 2016 + Commit: Tobias Klausmann gentoo org> CommitDate: Sun Jun 19 14:39:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f042f0e1 media-libs/libv4l-1.10.1-r0: add alpha keyword Gentoo-Bug: 586192 Package-Manager: portage-2.3.0_rc1 media-libs/libv4l/libv4l-1.10.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libv4l/libv4l-1.10.1.ebuild b/media-libs/libv4l/libv4l-1.10.1.ebuild index dacf5ea..bf0cd30 100644 --- a/media-libs/libv4l/libv4l-1.10.1.ebuild +++ b/media-libs/libv4l/libv4l-1.10.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2; LICENSE="LGPL-2.1+" SLOT="0/0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="jpeg" # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
[gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/
commit: 9bf251e458f686597cfb4f1e4a4f056293970515 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jun 19 14:31:40 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jun 19 14:31:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf251e4 www-client/seamonkey: fix typo 's/dir/die/' Package-Manager: portage-2.3.0_rc1 www-client/seamonkey/seamonkey-2.38.ebuild | 4 ++-- www-client/seamonkey/seamonkey-2.39.ebuild | 2 +- www-client/seamonkey/seamonkey-2.40.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www-client/seamonkey/seamonkey-2.38.ebuild b/www-client/seamonkey/seamonkey-2.38.ebuild index 77c945d..c6c17bf 100644 --- a/www-client/seamonkey/seamonkey-2.38.ebuild +++ b/www-client/seamonkey/seamonkey-2.38.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -273,7 +273,7 @@ src_install() { for plugin in gmp-gmpopenh264 ; do echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ "${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || dir + || die done fi diff --git a/www-client/seamonkey/seamonkey-2.39.ebuild b/www-client/seamonkey/seamonkey-2.39.ebuild index 48f1fc6..5d1acd0 100644 --- a/www-client/seamonkey/seamonkey-2.39.ebuild +++ b/www-client/seamonkey/seamonkey-2.39.ebuild @@ -272,7 +272,7 @@ src_install() { for plugin in gmp-gmpopenh264 ; do echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ "${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || dir + || die done fi diff --git a/www-client/seamonkey/seamonkey-2.40.ebuild b/www-client/seamonkey/seamonkey-2.40.ebuild index 5ecd770..502b34c 100644 --- a/www-client/seamonkey/seamonkey-2.40.ebuild +++ b/www-client/seamonkey/seamonkey-2.40.ebuild @@ -277,7 +277,7 @@ src_install() { for plugin in gmp-gmpopenh264 ; do echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ "${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || dir + || die done fi
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kauth/
commit: 53815d0e6783e561151d642198c3cdd1eec364e7 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 14:06:06 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 14:06:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53815d0e kde-frameworks/kauth: revision bump to add Qt subslot operator Package-Manager: portage-2.3.0_rc1 kde-frameworks/kauth/kauth-5.23.0-r1.ebuild | 34 + 1 file changed, 34 insertions(+) diff --git a/kde-frameworks/kauth/kauth-5.23.0-r1.ebuild b/kde-frameworks/kauth/kauth-5.23.0-r1.ebuild new file mode 100644 index 000..619bed0 --- /dev/null +++ b/kde-frameworks/kauth/kauth-5.23.0-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework to let applications perform actions as a privileged user" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="nls +policykit" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0 +RDEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '' '' '5=') + $(add_qt_dep qtwidgets) + policykit? ( sys-auth/polkit-qt[qt5] ) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) +" +PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package policykit PolkitQt5-1) + ) + + kde5_src_configure +}
[gentoo-commits] proj/kde:master commit in: kde-frameworks/kauth/
commit: 0042661b8015d38ba088bca0435b1cdb3d5da6c9 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 14:05:25 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 14:05:46 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0042661b kde-frameworks/kauth: introduce temporary Qt subslot operator Package-Manager: portage-2.3.0_rc1 kde-frameworks/kauth/kauth-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kauth/kauth-.ebuild b/kde-frameworks/kauth/kauth-.ebuild index dde6e97..f387e58 100644 --- a/kde-frameworks/kauth/kauth-.ebuild +++ b/kde-frameworks/kauth/kauth-.ebuild @@ -12,9 +12,10 @@ LICENSE="LGPL-2.1+" KEYWORDS="" IUSE="nls +policykit" +# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0 RDEPEND=" $(add_frameworks_dep kcoreaddons) - $(add_qt_dep qtdbus) + $(add_qt_dep qtdbus '' '' '5=') $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) policykit? ( sys-auth/polkit-qt[qt5] )
[gentoo-commits] repo/gentoo:master commit in: net-im/openfire/
commit: d2e60c5df24204e0f1a83a635d75fa723159ce5b Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jun 19 13:52:54 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jun 19 13:53:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e60c5d net-im/openfire: fix typo 's/dir/die/' Package-Manager: portage-2.3.0_rc1 net-im/openfire/openfire-3.10.0.ebuild | 4 ++-- net-im/openfire/openfire-3.10.1.ebuild | 4 ++-- net-im/openfire/openfire-3.10.2.ebuild | 4 ++-- net-im/openfire/openfire-3.10.3.ebuild | 4 ++-- net-im/openfire/openfire-4.0.0.ebuild | 4 ++-- net-im/openfire/openfire-4.0.1.ebuild | 4 ++-- net-im/openfire/openfire-4.0.2.ebuild | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/net-im/openfire/openfire-3.10.0.ebuild b/net-im/openfire/openfire-3.10.0.ebuild index cf4db24..f47ad14 100644 --- a/net-im/openfire/openfire-3.10.0.ebuild +++ b/net-im/openfire/openfire-3.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ src_compile() { # delete nativeAuth prebuilt libs: #uses outdated unmaintained libshaj, does not support amd64 - rm -rfv target/openfire/resources/nativeAuth || dir + rm -rfv target/openfire/resources/nativeAuth || die } src_install() { diff --git a/net-im/openfire/openfire-3.10.1.ebuild b/net-im/openfire/openfire-3.10.1.ebuild index 6ccd462..957cc4c 100644 --- a/net-im/openfire/openfire-3.10.1.ebuild +++ b/net-im/openfire/openfire-3.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ src_compile() { # delete nativeAuth prebuilt libs: #uses outdated unmaintained libshaj, does not support amd64 - rm -rfv target/openfire/resources/nativeAuth || dir + rm -rfv target/openfire/resources/nativeAuth || die } src_install() { diff --git a/net-im/openfire/openfire-3.10.2.ebuild b/net-im/openfire/openfire-3.10.2.ebuild index cf4db24..f47ad14 100644 --- a/net-im/openfire/openfire-3.10.2.ebuild +++ b/net-im/openfire/openfire-3.10.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ src_compile() { # delete nativeAuth prebuilt libs: #uses outdated unmaintained libshaj, does not support amd64 - rm -rfv target/openfire/resources/nativeAuth || dir + rm -rfv target/openfire/resources/nativeAuth || die } src_install() { diff --git a/net-im/openfire/openfire-3.10.3.ebuild b/net-im/openfire/openfire-3.10.3.ebuild index 6ccd462..957cc4c 100644 --- a/net-im/openfire/openfire-3.10.3.ebuild +++ b/net-im/openfire/openfire-3.10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ src_compile() { # delete nativeAuth prebuilt libs: #uses outdated unmaintained libshaj, does not support amd64 - rm -rfv target/openfire/resources/nativeAuth || dir + rm -rfv target/openfire/resources/nativeAuth || die } src_install() { diff --git a/net-im/openfire/openfire-4.0.0.ebuild b/net-im/openfire/openfire-4.0.0.ebuild index 6ccd462..957cc4c 100644 --- a/net-im/openfire/openfire-4.0.0.ebuild +++ b/net-im/openfire/openfire-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ src_compile() { # delete nativeAuth prebuilt libs: #uses outdated unmaintained libshaj, does not support amd64 - rm -rfv target/openfire/resources/nativeAuth || dir + rm -rfv target/openfire/resources/nativeAuth || die } src_install() { diff --git a/net-im/openfire/openfire-4.0.1.ebuild b/net-im/openfire/openfire-4.0.1.ebuild index 6ccd462..957cc4c 100644 --- a/net-im/openfire/openfire-4.0.1.ebuild +++ b/net-im/openfire/openfire-4.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -48,7 +48,7 @@ src_compile() { # delete nativeAuth prebuilt libs: #uses outdated unmaintained libshaj, does not support amd64 - rm -rfv target/openfire/resources/nativeAuth || dir + rm -rfv target/openfire/resources/nativeAuth || die } src_install() { diff --git a/net-im/openfire/openfire-4.0.2.ebuild b/net-im/openfire/openfire-4.0.2.ebuild index 6ccd462..957cc4c 100644 ---
[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/
commit: 54f2348de8aed0a30960a340bbd762196da488a2 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 13:45:10 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:45:22 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f2348d kde-plasma/plasma-workspace: remove stray git garbage Package-Manager: portage-2.3.0_rc1 kde-plasma/plasma-workspace/files/10-agent-startup.sh | 4 1 file changed, 4 deletions(-) diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh b/kde-plasma/plasma-workspace/files/10-agent-startup.sh index 9f24233..e2c5018 100644 --- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh +++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh @@ -26,11 +26,7 @@ if [ "${GPG_AGENT}" = true ]; then if [ -x /usr/bin/gpgconf ]; then gpgconf --launch gpg-agent >/dev/null 2>&1 if [ $? = 2 ]; then -<<< Updated upstream eval "$(/usr/bin/gpg-agent --enable-ssh-support --daemon)" -=== - eval "$(/usr/bin/gpg-agent --daemon)" ->>> Stashed changes fi fi fi
[gentoo-commits] repo/gentoo:master commit in: dev-libs/purpose/
commit: 076fdccdd0a98e10439c819b4363efe4b17c2273 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 13:39:24 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:42:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076fdccd dev-libs/purpose: revision bump to add Qt subslot operator The QT_VERSION_CHECK macro is used at build-time. Package-Manager: portage-2.3.0_rc1 dev-libs/purpose/purpose-1.1-r1.ebuild | 29 + 1 file changed, 29 insertions(+) diff --git a/dev-libs/purpose/purpose-1.1-r1.ebuild b/dev-libs/purpose/purpose-1.1-r1.ebuild new file mode 100644 index 000..212830a --- /dev/null +++ b/dev-libs/purpose/purpose-1.1-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" +SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.6.0 +DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_kdeapps_dep kaccounts-integration) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui '' '' '5=') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + net-libs/accounts-qt +" +RDEPEND="${DEPEND}"
[gentoo-commits] proj/kde:master commit in: kde-apps/okular/
commit: ab2dcbe096fea49f2f61b96e7e34d8ed50e9d692 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jun 19 13:17:40 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:29:02 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab2dcbe0 kde-apps/okular: Add back USE=mobi Package-Manager: portage-2.2.28 kde-apps/okular/okular-5..ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kde-apps/okular/okular-5..ebuild b/kde-apps/okular/okular-5..ebuild index ef0f70e..f36fd65 100644 --- a/kde-apps/okular/okular-5..ebuild +++ b/kde-apps/okular/okular-5..ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Universal document viewer based on KPDF" HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular; KEYWORDS="" -IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff" +IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript +tiff" # TODO: # * Deactivated media-libs/qimageblitz as there is no Qt5 version yet # * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet @@ -50,6 +50,7 @@ COMMON_DEPEND=" $(add_kdeapps_dep libkexiv2) virtual/jpeg:0 ) + mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) postscript? ( app-text/libspectre ) tiff? ( media-libs/tiff:0 ) @@ -76,6 +77,7 @@ src_configure() { $(cmake-utils_use_find_package djvu DjVuLibre) $(cmake-utils_use_find_package ebook EPub) $(cmake-utils_use_find_package jpeg KF5KExiv2) + $(cmake-utils_use_find_package mobi QMobipocket) $(cmake-utils_use_find_package pdf Poppler) $(cmake-utils_use_find_package postscript LibSpectre) $(cmake-utils_use_find_package tiff TIFF)
[gentoo-commits] proj/kde:master commit in: kde-apps/kdegraphics-mobipocket/
commit: 1d5bd72b6746bf2fff390aa7421db701deb88186 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jun 19 13:16:13 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:29:02 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d5bd72b kde-apps/kdegraphics-mobipocket: Add kf5 version Package-Manager: portage-2.2.28 .../kdegraphics-mobipocket-5..ebuild | 26 ++ kde-apps/kdegraphics-mobipocket/metadata.xml | 3 +++ 2 files changed, 29 insertions(+) diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-5..ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-5..ebuild new file mode 100644 index 000..ebb2b54 --- /dev/null +++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-5..ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +EGIT_BRANCH="frameworks" +inherit kde5 + +DESCRIPTION="Library to support mobipocket ebooks" +KEYWORDS="" +IUSE="+thumbnail" + +DEPEND=" + $(add_qt_dep qtgui) + thumbnail? ( $(add_frameworks_dep kio) ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DBUILD_thumbnailers=$(usex thumbnail) + ) + + kde5_src_configure +} diff --git a/kde-apps/kdegraphics-mobipocket/metadata.xml b/kde-apps/kdegraphics-mobipocket/metadata.xml index 2fdbf33..26ad4fa 100644 --- a/kde-apps/kdegraphics-mobipocket/metadata.xml +++ b/kde-apps/kdegraphics-mobipocket/metadata.xml @@ -5,4 +5,7 @@ k...@gentoo.org Gentoo KDE Project + + Enables thumbnail generation +
[gentoo-commits] repo/gentoo:master commit in: app-doc/root-docs/, app-doc/root-docs/files/
commit: d322a425c7589637583cbac62a0435aae996d7ab Author: Andrew Savchenko gentoo org> AuthorDate: Sun Jun 19 12:47:51 2016 + Commit: Andrew Savchenko gentoo org> CommitDate: Sun Jun 19 13:13:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d322a425 app-doc/root-docs: remove old Package-Manager: portage-2.3.0_rc1 Signed-off-by: Andrew Savchenko gentoo.org> app-doc/root-docs/Manifest | 1 - .../root-docs/files/root-docs-6.02.05-jsroot.patch | 11 -- app-doc/root-docs/root-docs-6.02.05.ebuild | 137 - 3 files changed, 149 deletions(-) diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest index 26a3239..5dee1f4 100644 --- a/app-doc/root-docs/Manifest +++ b/app-doc/root-docs/Manifest @@ -6,5 +6,4 @@ DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53d DIST root6-banner.jpg 32319 SHA256 9d6d226bbe61db257a1796a3ad04dfe97b3bb500a29349ff76bf6a929ed1e104 SHA512 f01dd253f24d59c374042efd239ce023e5ca82d3d617ca6763daf9720b169c4fb27a0f4573ea95d807f0e12095924606372df4940f65ce7d859164314d22b9af WHIRLPOOL 69976abe240235a4f4eb25d61a0ceb183dc5ad5f9e57e9130ae10615329dd23125848f45608e1ad2d65a286d1f191f95336316f7c8f1cc052d396c31433cbe4c DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e -DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955 DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e diff --git a/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch b/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch deleted file mode 100644 index 1ea170e..000 --- a/app-doc/root-docs/files/root-docs-6.02.05-jsroot.patch +++ /dev/null @@ -1,11 +0,0 @@ root-6.02.05/documentation/JSROOT/JSROOT.md.orig 2015-02-09 11:59:47.0 +0300 -+++ root-6.02.05/documentation/JSROOT/JSROOT.md2015-04-05 19:13:24.010358387 +0300 -@@ -198,7 +198,7 @@ -loading... - - --Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __$$$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory. -+Internally, the JSROOT.loadScript(urllist, callback, debug) method is used. It can be useful when some other scripts should be loaded as well. __urllist__ is a string with scripts names, separated by ';' symbol. If a script name starts with __\$\$\$__ (triple dollar sign), the script will be loaded from a location relative to the main JSROOT directory. - This location is automatically detected when JSRootCore.js script is loaded. - - diff --git a/app-doc/root-docs/root-docs-6.02.05.ebuild b/app-doc/root-docs/root-docs-6.02.05.ebuild deleted file mode 100644 index a692385..000 --- a/app-doc/root-docs/root-docs-6.02.05.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROOT_PN="root" -ROOFIT_DOC_PV=2.91-33 -ROOFIT_QS_DOC_PV=3.00 -TMVA_DOC_PV=4.2.0 - -if [[ ${PV} == "" ]] ; then - inherit git-r3 - EVCS_OFFLINE=yes # we need exactly the same checkout as root itself - EGIT_REPO_URI="http://root.cern.ch/git/root.git; -else - SRC_URI="https://root.cern.ch/download/${ROOT_PN}_v${PV}.source.tar.gz; - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${ROOT_PN}-${PV}" -fi -
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 9b1e43fb966eefd05169293368d6621ada5ec250 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 13:16:21 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:18:57 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b1e43fb kde5-functions.eclass: no longer export KDE_GCC_MINIMAL by default KDE_GCC_MINIMAL will now only be exported in packages that require it, as it triggers an expensive pkg_pretend check whenever it is defined. eclass/kde5-functions.eclass | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index a8cc1a3..df5d053 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -39,14 +39,9 @@ esac : ${KDE_APPS_MINIMAL:=14.12.0} # @ECLASS-VARIABLE: KDE_GCC_MINIMAL +# @DEFAULT_UNSET # @DESCRIPTION: # Minimal GCC version to require for the package. -if [[ ${CATEGORY} = kde-frameworks ]]; then - : ${KDE_GCC_MINIMAL:=4.5} -else - : ${KDE_GCC_MINIMAL:=4.8} -fi - # @ECLASS-VARIABLE: KDEBASE # @DESCRIPTION:
[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/, sci-physics/root/
commit: 01b4c23fa6cbf65a0685ed205f7fda06ae895c25 Author: Andrew Savchenko gentoo org> AuthorDate: Sun Jun 19 13:12:11 2016 + Commit: Andrew Savchenko gentoo org> CommitDate: Sun Jun 19 13:13:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b4c23f sci-physics/root: remove old Package-Manager: portage-2.3.0_rc1 Signed-off-by: Andrew Savchenko gentoo.org> sci-physics/root/Manifest | 1 - sci-physics/root/files/root-6.00.01-geocad.patch | 15 - .../root/files/root-6.00.01-prop-flags.patch | 17 - sci-physics/root/root-6.02.05-r2.ebuild| 507 - sci-physics/root/root-6.04.06.ebuild | 4 +- 5 files changed, 2 insertions(+), 542 deletions(-) diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 2104a38..cc37278 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -1,4 +1,3 @@ DIST root_v5.34.26.source.tar.gz 75171961 SHA256 c1fd2a249bb7210914b42e35dba4f1262cfa46b79ef7a41f73d7f08f8c54a643 SHA512 f5da5e20d1763608a32d78c48581e574a3f51aef47ecf6987a4064d1fb3234dfc9f626e041a17213f881f52f807ed6a6da60bf1d24951fa7dc2cadd94f8dd8b4 WHIRLPOOL 77b48b815c971642da68b71732a0ea3372648634281be634037b13cb58488f7075ec8bfc9a684e55d85cd9b038f229be29b19a15dfc829f0ce63a5f17241c23c DIST root_v5.34.32.source.tar.gz 75170203 SHA256 939c7592802a54b6cbc593efb6e51699bf52e92baf6d6b20f486aaa08480fc5f SHA512 6485f2bb544947173e1feb2cfb41d6a176020027f1193d9388700a797ba4badbf497022e6129fdc4879e709460bf1efabf3e51c51840f0c781fa12e631419afc WHIRLPOOL 695147a519415b99e73fdad1cd61bb1944e292628236b5a7cbf1835174c950fa9cb068431a8164f24663323163012ea652db84d082f9f1eb1fcae79489575d9e -DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955 DIST root_v6.04.06.source.tar.gz 99180724 SHA256 6deac9cd71fe2d7a48ea2bcbd793639222c4743275dbc946c158295b1e1fe330 SHA512 ac96ac998ed4894587b7d286d79bcbea7b33f15764cc2513ae089e86c584e2dcb064cd135d44a4bfd2bede368eb772ccbffcd6bf426857a1236f5d7e9f5ce6fd WHIRLPOOL 7ffca036917d798ade31e1a22e9518d567e4267af5d1db555ea0e82c1bc2c7a1f665c8cd76d3ce6511507ab7befea4881580259c6142f1e668edafbcbc5e496e diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch b/sci-physics/root/files/root-6.00.01-geocad.patch deleted file mode 100644 index 2742a74..000 --- a/sci-physics/root/files/root-6.00.01-geocad.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h -index 892f225..86eb9e1 100644 a/geom/geocad/inc/TGeoToOCC.h -+++ b/geom/geocad/inc/TGeoToOCC.h -@@ -13,8 +13,10 @@ - #define ROOT_TGeoToOCC - - //Cascade -+#define Printf Printf_opencascade - #include - #include -+#undef Printf - - //Root - #ifndef ROOT_TGeoXtru diff --git a/sci-physics/root/files/root-6.00.01-prop-flags.patch b/sci-physics/root/files/root-6.00.01-prop-flags.patch deleted file mode 100644 index 3a10024..000 --- a/sci-physics/root/files/root-6.00.01-prop-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/config/Makefile.in b/config/Makefile.in -index dd89044..4fc7de3 100644 a/config/Makefile.in -+++ b/config/Makefile.in -@@ -64,9 +64,9 @@ HOST := @host@ - USECONFIG := @useconfig@ - MKLIBOPTIONS := @mkliboption@ - --EXTRA_CFLAGS := -Iinclude @cflags@ --EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS) -+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS) -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WERROR := @werror@ - WINRTDEBUG := @winrtdebug@ - CTORSINITARRAY := @ctorsinitarray@ diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild deleted file mode 100644 index 9a072ee..000 --- a/sci-physics/root/root-6.02.05-r2.ebuild +++ /dev/null @@ -1,507 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == "" ]] ; then - inherit git-r3 - EGIT_REPO_URI="http://root.cern.ch/git/root.git; -else - SRC_URI="https://root.cern.ch/download/${PN}_v${PV}.source.tar.gz; - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 \ - toolchain-funcs user versionator - -DESCRIPTION="C++ data analysis framework and interpreter from CERN" -HOMEPAGE="https://root.cern.ch; - -SLOT="0/$(get_version_component_range 1-3 ${PV})" -LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA" -IUSE="+X afs avahi doc emacs
[gentoo-commits] proj/kde:master commit in: kde-plasma/powerdevil/
commit: de8e0f2a545961025f26c3b93bdc1a96088d40da Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:52:47 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:18:57 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de8e0f2a kde-plasma/powerdevil: add explicit KDE_GCC_MINIMAL Package-Manager: portage-2.3.0_rc1 kde-plasma/powerdevil/powerdevil-5.6.95.ebuild | 1 + kde-plasma/powerdevil/powerdevil-5.7.49..ebuild | 1 + kde-plasma/powerdevil/powerdevil-.ebuild| 1 + 3 files changed, 3 insertions(+) diff --git a/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild b/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild index 40333ad..c3e9301 100644 --- a/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.6.95.ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_HANDBOOK="true" inherit kde5 diff --git a/kde-plasma/powerdevil/powerdevil-5.7.49..ebuild b/kde-plasma/powerdevil/powerdevil-5.7.49..ebuild index d7b3c02..f45ed4f 100644 --- a/kde-plasma/powerdevil/powerdevil-5.7.49..ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.7.49..ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_HANDBOOK="true" inherit kde5 diff --git a/kde-plasma/powerdevil/powerdevil-.ebuild b/kde-plasma/powerdevil/powerdevil-.ebuild index 98923cf..d27d3a3 100644 --- a/kde-plasma/powerdevil/powerdevil-.ebuild +++ b/kde-plasma/powerdevil/powerdevil-.ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_HANDBOOK="true" inherit kde5
[gentoo-commits] proj/kde:master commit in: eclass/
commit: e11028263c08c98642570765cb256bf99271962c Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 13:08:13 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:18:57 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e1102826 kde5.eclass: only export pkg_pretend if KDE_GCC_MINIMAL is defined Exporting pkg_pretend is expensive, even if the exported function is a noop. As kde5_pkg_pretend is currently only used to check if the active GCC version is recent enough, only export that phase if it will have something to do. The number of situations in which KDE_GCC_MINIMAL is exported will be substantially reduced in a future commit. This will result in a large time saving at the beginning of the emerge process as we will no longer see hundreds of lines of: >>> Running pre-merge checks for kde-foo/bar-123 >>> Running pre-merge checks for kde-foo/baz-123 eclass/kde5.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 7616deb..7c0ce36 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -27,7 +27,7 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then esac fi -if [[ ${CATEGORY} != kde-frameworks ]]; then +if [[ -v KDE_GCC_MINIMAL ]]; then EXPORT_FUNCTIONS pkg_pretend fi
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 31412a689f5325c0f991bcd8a9be59faad300120 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 13:18:18 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:18:57 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31412a68 kde5-functions.eclass: only perform the GCC version check if KDE_GCC_MINIMAL is defined eclass/kde5-functions.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index df5d053..2c45abc 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -76,7 +76,8 @@ export KDE_BUILD_TYPE # @DESCRIPTION: # Determine if the current GCC version is acceptable, otherwise die. _check_gcc_version() { - if [[ ${MERGE_TYPE} != binary ]]; then + if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]]; then + local version=$(gcc-version) local major=${version%.*} local minor=${version#*.}
[gentoo-commits] proj/kde:master commit in: kde-plasma/kdecoration/
commit: cbcd5adfbb119bc0ce1a936150821d1cb6468afc Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:53:23 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:18:57 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbcd5adf kde-plasma/kdecoration: add explicit KDE_GCC_MINIMAL Package-Manager: portage-2.3.0_rc1 kde-plasma/kdecoration/kdecoration-5.6.95.ebuild | 1 + kde-plasma/kdecoration/kdecoration-5.7.49..ebuild | 1 + kde-plasma/kdecoration/kdecoration-.ebuild| 1 + 3 files changed, 3 insertions(+) diff --git a/kde-plasma/kdecoration/kdecoration-5.6.95.ebuild b/kde-plasma/kdecoration/kdecoration-5.6.95.ebuild index e0a82a0..1092e8c 100644 --- a/kde-plasma/kdecoration/kdecoration-5.6.95.ebuild +++ b/kde-plasma/kdecoration/kdecoration-5.6.95.ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 diff --git a/kde-plasma/kdecoration/kdecoration-5.7.49..ebuild b/kde-plasma/kdecoration/kdecoration-5.7.49..ebuild index 1b60871..8c2767e 100644 --- a/kde-plasma/kdecoration/kdecoration-5.7.49..ebuild +++ b/kde-plasma/kdecoration/kdecoration-5.7.49..ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 diff --git a/kde-plasma/kdecoration/kdecoration-.ebuild b/kde-plasma/kdecoration/kdecoration-.ebuild index 1b60871..8c2767e 100644 --- a/kde-plasma/kdecoration/kdecoration-.ebuild +++ b/kde-plasma/kdecoration/kdecoration-.ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5
[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/
commit: e466e0340c14a140bc4c86b650867b6c5671d5d3 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:51:46 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 13:18:57 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e466e034 kde-plasma/kwin: add explicit KDE_GCC_MINIMAL Package-Manager: portage-2.3.0_rc1 kde-plasma/kwin/kwin-5.6.95.ebuild | 1 + kde-plasma/kwin/kwin-5.7.49..ebuild | 1 + kde-plasma/kwin/kwin-.ebuild| 1 + 3 files changed, 3 insertions(+) diff --git a/kde-plasma/kwin/kwin-5.6.95.ebuild b/kde-plasma/kwin/kwin-5.6.95.ebuild index c5feda7..30c1bd6 100644 --- a/kde-plasma/kwin/kwin-5.6.95.ebuild +++ b/kde-plasma/kwin/kwin-5.6.95.ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_HANDBOOK="optional" KDE_TEST="optional" VIRTUALX_REQUIRED="test" diff --git a/kde-plasma/kwin/kwin-5.7.49..ebuild b/kde-plasma/kwin/kwin-5.7.49..ebuild index f708c80..0728aa5 100644 --- a/kde-plasma/kwin/kwin-5.7.49..ebuild +++ b/kde-plasma/kwin/kwin-5.7.49..ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_HANDBOOK="optional" KDE_TEST="optional" VIRTUALX_REQUIRED="test" diff --git a/kde-plasma/kwin/kwin-.ebuild b/kde-plasma/kwin/kwin-.ebuild index f708c80..0728aa5 100644 --- a/kde-plasma/kwin/kwin-.ebuild +++ b/kde-plasma/kwin/kwin-.ebuild @@ -4,6 +4,7 @@ EAPI=6 +KDE_GCC_MINIMAL="4.8" KDE_HANDBOOK="optional" KDE_TEST="optional" VIRTUALX_REQUIRED="test"
[gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/
commit: c303e4fd6d6a3e3217130bfbe96bbc3751fc2a3e Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jun 19 13:06:54 2016 + Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Jun 19 13:06:54 2016 + URL:https://gitweb.gentoo.org/proj/vdr/devel.git/commit/?id=c303e4fd media-video/vdr: repoman test wrt bug 585864 Package-Manager: portage-2.3.0_rc1 Manifest-Sign-Key: 0x93EB5F4DAA5832A1 media-video/vdr/Manifest | 25 - media-video/vdr/vdr-2.3.1.ebuild | 2 ++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 80f251c..d7c8af2 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -1,6 +1,29 @@ +-BEGIN PGP SIGNED MESSAGE- +Hash: SHA256 + AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677 AUX vdr-2.3.1_gentoo.patch 2321 SHA256 57e718074a07f11207d52db465afb05cc61100a7522c6413025e9d0ac49045c2 SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1 WHIRLPOOL d5fe4cce932a9ff784d10dcd237a849ce6dfb4399d54d2e601917b3f570a94c844529451339e43d6559b2461109b4080a6b8e4c48dbc1c570589c0e139c5bd21 DIST extpng-vdr-2.3.1-gentoo-edition-v3.patch.bz2 26475 SHA256 5f4ee97963a2b156f6356773d0c1b4d1def5bc9e098471d44b6e250dd674849b SHA512 83d4fa26390bfb5af3c409563bcdfa25d5aa181acb6847d95044ed951674c95a803a462dbe290df463084187e6c9f496bc01cf06cd4a108497323be0404fe9e8 WHIRLPOOL d3a2e93fa843c3c6f72fad3f80d30b794767bdfdd9c99b499c1c65f3e7d4c84349c17863521577c23783a3f81ba83f48e838df32950d832a1dc625cac5de3dd2 DIST vdr-2.3.1.tar.bz2 891255 SHA256 456d3f0ceb699b92ebeaf9ff4c0c68979724d10b01a89d5250133e6f4c262fa7 SHA512 525078247da68da8b3530d61c6c48cf4920c39b9603bc8a6d8c51f69d2b507a40951412606e3f85648ac8d64e28f1553c8f2fe8be80325e4ec880b2a4e564248 WHIRLPOOL 976ef0f291f9d0c55c9d381252e4e8a7872bc7ede719f8d24bd0b0529ce79838a5ca93b4a037a844ba0df206bf58a66f32b90c915eb67f11619578babb72bf3b -EBUILD vdr-2.3.1.ebuild 8387 SHA256 8af9e4c7c80e9b02e2176e147857dfa520de13b0c55e94483c47f6c846329ac9 SHA512 42375b240cc7782daa732c166a81e6729ca8958cff6853940829e2cbbb6343571d8f519c7c2cc3d836b78c1f7a56f191780c6a7593a5d88e0854f499745e9a28 WHIRLPOOL 6cb5085f492eb0c5820236bdfdcdc583d74e551515fd16a2c2ba51875631475b22eb8f5c1660d3ca89a79f7cc8a7fa8a1baae87ea1cf170a0093795c78f09177 +EBUILD vdr-2.3.1.ebuild 8419 SHA256 594d781644bec65f9b6a7c7a2d39951886595b46ca885524402a32a8c93424a8 SHA512 ef1eaadce798a93002905d1c614ddbe84fb03a4fc8ad0d83e9391bcaaaf24cb1d64c2074a7a53f24e7fce1c3fe1b96fc6156cdccb1b1dc9c64beacc39fa04ee1 WHIRLPOOL 43fb75a5ea4ccad31563163ec193987916c8eedb9620f008966ea034c779076f2a2f3ed272ffe208ecde5cbccd3a2fd6c31db006fe755ce1758349ac03fe610a MISC metadata.xml 1384 SHA256 9475f2bfbb464b0786790e5537584c8d4424e2c9ac36a5318093f49aaf324ef8 SHA512 0b935f2df5e887477a40b0b945ddb264ed28715c767fa632d7d5ceea54b7ccd42fa44be73c8b19d7dbbeab73473a192a6fd859bf94da317adf5a4dd264ce6edd WHIRLPOOL 04a7f62826b6f86e7ca32afa281dc4ffd3f7011b8ec77563580b82cbf9df94521dd99d91bc63278c28482c0ad7fe97e80822df527bca63a6122e5ea0cef09eae +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.1 +Comment: Signed-off-by: Jörg Bornkessel+ +iQJ8BAEBCABmBQJXZpjoXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwRTBBQTFFRTFERjQ0MUQ3QTNGNTIxQzI5 +M0VCNUY0REFBNTgzMkExAAoJEJPrX02qWDKhq68QALVAac6SKbBjT8uIv9YTsi8u +hmv/hdet38FslYvjWKOnSSJcFl7GqIo2pQlkJyyEBglr2xB3O3PDAeiQVwng5GpG +jZUfWGuanbqtmZ+WwZNpu/MHNY7u6ns5hGuPSbRhslmgytFWIgeiSmrd+1sa3e3A +iUTIVeA2htwYH1+ekQvuzU6+9KPgN94ko2m7JEE7fFArKOk3mRRHr8X+vLrsNXBt ++MJhMccZG80V18QgwW7V7t0CRJzBbgN2W2WqLsFqsvYrqoK7Ekyq9MZTRYs6USUM +pLirsnoG7t0wWqNrpCcLlA5w47KFpOols7x45RGV3rj84WECnrY8T+EzeEIyOGsC +JF4uUNo6d0ylRZmCAUU8ApvQsS5U6oafK6mnPdsdJxi3s5OHURUNzfncOp3Zpt0n +25avIVC0BPhuXuv5I8gHyjBi8uBXRDNdDFfPBWo728PfzQDlZqs1WowMllS/gv9j +dxKcwwK4JDr81PXtzseMngEX74GMgn26hsQnG/YYhjYICjMG+qcOXu2AiKREQNMz +1PvjWvJb6AxgGaNPMoXoOHbAT+A6aat2b0AiRQcwsB05KW+9m6TQqeyCxrUiZIag +i9CCojSCjTlKOpXLAC3Ly/2DZFiQ5pmvRannqaCVZ0oGEG2sqmSkHAd2wzT3BPMT +h1bKVDSkZdGFrDQAIcT7 +=yDcp +-END PGP SIGNATURE- diff --git a/media-video/vdr/vdr-2.3.1.ebuild b/media-video/vdr/vdr-2.3.1.ebuild index 1c543e2..4a244c0 100644 --- a/media-video/vdr/vdr-2.3.1.ebuild +++ b/media-video/vdr/vdr-2.3.1.ebuild @@ -310,3 +310,5 @@ pkg_postinst() { elog "To get an idea how to proceed now, have a look at our vdr-guide:" elog "\thttps://wiki.gentoo.org/wiki/VDR; } + +# repoman test wrt bug 585864
[gentoo-commits] proj/elections:master commit in: council-201606/
commit: c9813b8d4aa4db35bfac92e7e8de5abfeab28d1e Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Jun 19 12:41:32 2016 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Jun 19 12:41:32 2016 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=c9813b8d Fix Patrice nick with my apologies. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> council-201606/ballot-council-201606 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/council-201606/ballot-council-201606 b/council-201606/ballot-council-201606 index 2756598..8da62e7 100644 --- a/council-201606/ballot-council-201606 +++ b/council-201606/ballot-council-201606 @@ -4,7 +4,7 @@ dilfridge djc jlec k_f -mounsieurp +monsieurp patrick perfinion rich0
[gentoo-commits] proj/kde:master commit in: media-video/subtitlecomposer/
commit: ad2c88b9cfdce05511bbb0eed2b9c9ab080348b0 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:35:27 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 12:37:30 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ad2c88b9 media-video/subtitlecomposer: KDE_PUNT_BOGUS_DEPS -> KDE_HANDBOOK="forceoptional" Package-Manager: portage-2.3.0_rc1 media-video/subtitlecomposer/subtitlecomposer-.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-video/subtitlecomposer/subtitlecomposer-.ebuild b/media-video/subtitlecomposer/subtitlecomposer-.ebuild index da49322..4949596 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-.ebuild @@ -5,8 +5,7 @@ EAPI=6 CMAKE_MIN_VERSION="3.3" -KDE_PUNT_BOGUS_DEPS=true -KDE_TEST=true +KDE_TEST="forceoptional" inherit kde5 DESCRIPTION="Text-based subtitles editor"
[gentoo-commits] proj/kde:master commit in: media-video/subtitlecomposer/
commit: b24f9675da3412d4752339ded6d199fd127ee053 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:35:45 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 12:37:30 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b24f9675 media-video/subtitlecomposer: don't block self Package-Manager: portage-2.3.0_rc1 media-video/subtitlecomposer/subtitlecomposer-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/subtitlecomposer/subtitlecomposer-.ebuild b/media-video/subtitlecomposer/subtitlecomposer-.ebuild index 4949596..25d7268 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-.ebuild @@ -43,7 +43,7 @@ CDEPEND=" ) " RDEPEND="${CDPEEND} - !media-video/subtitlecomposer:5 + !media-video/subtitlecomposer:4 " DEPEND="${CDEPEND} sys-devel/gettext
[gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/
commit: 7a929beb889dfd4e676dbdc7b0c55f8588aef0ca Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jun 19 12:26:53 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jun 19 12:27:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a929beb dev-lua/lpeg: revert DOCTYPE to use http://, not https:// Package-Manager: portage-2.3.0_rc1 dev-lua/lpeg/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml index e35e783..8bc501c 100644 --- a/dev-lua/lpeg/metadata.xml +++ b/dev-lua/lpeg/metadata.xml @@ -1,5 +1,5 @@ -https://www.gentoo.org/dtd/metadata.dtd;> +http://www.gentoo.org/dtd/metadata.dtd;> v...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-vdr/
commit: 47f30ebd9799023cc6f1f71128c47b994003a7c8 Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jun 19 12:18:13 2016 + Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Jun 19 12:18:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f30ebd app-eselect/eselect-vdr: keyword ~arm64, wrt bug 586364; thx to T.Reufer for testing Package-Manager: portage-2.3.0_rc1 app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild index cb7d0e8..b676633 100644 --- a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild +++ b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" IUSE="" RDEPEND=">=app-admin/eselect-1.2.3"
[gentoo-commits] repo/gentoo:master commit in: sys-process/wait_on_pid/
commit: 736d70e2047dd357d527eb6c26bff3196637247d Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jun 19 12:22:25 2016 + Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Jun 19 12:22:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736d70e2 sys-process/wait_on_pid: keyword ~arm64, wrt bug 586364; thx to T.Reufer for testing Package-Manager: portage-2.3.0_rc1 sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild b/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild index 6a86bdc..b2c400f 100644 --- a/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild +++ b/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/$P.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/$P. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: media-video/vdr/
commit: cba1e330ff192f909f41b1e147156dfbf6f1be1b Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jun 19 12:24:20 2016 + Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Jun 19 12:24:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba1e330 media-video/vdr: keyword ~arm64, wrt bug 586364; thx to T.Reufer for testing Package-Manager: portage-2.3.0_rc1 media-video/vdr/vdr-2.2.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/vdr/vdr-2.2.0.ebuild b/media-video/vdr/vdr-2.2.0.ebuild index d29280e..00db36d 100644 --- a/media-video/vdr/vdr-2.2.0.ebuild +++ b/media-video/vdr/vdr-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,7 +29,7 @@ HOMEPAGE="http://www.tvdr.de/; SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2; -KEYWORDS="~arm amd64 ~ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" SLOT="0" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: media-tv/gentoo-vdr-scripts/
commit: ec13b7e548680748e7431214f5e3774ee8be6366 Author: Joerg Bornkessel gentoo org> AuthorDate: Sun Jun 19 12:20:11 2016 + Commit: Joerg Bornkessel gentoo org> CommitDate: Sun Jun 19 12:20:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec13b7e5 media-tv/gentoo-vdr-scripts: keyword ~arm64, wrt bug 586364; thx to T.Reufer for testing Package-Manager: portage-2.3.0_rc1 media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild index 18fca59..4d53ca3 100644 --- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild +++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="nvram" RDEPEND="nvram? ( sys-power/nvram-wakeup )
[gentoo-commits] proj/kde:master commit in: kde-plasma/libkscreen/
commit: c34bd565b56ddbab7bf392396e7d2cf458e03e6d Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:11:07 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 12:17:14 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c34bd565 kde-plasma/libkscreen: remove X USE flag The X USE flag only controls libxcb, but that is pulled in unconditionally anyway via qtx11extras. Package-Manager: portage-2.3.0_rc1 kde-plasma/libkscreen/libkscreen-5.6.95.ebuild | 12 ++-- kde-plasma/libkscreen/libkscreen-5.7.49..ebuild | 12 ++-- kde-plasma/libkscreen/libkscreen-.ebuild| 12 ++-- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/kde-plasma/libkscreen/libkscreen-5.6.95.ebuild b/kde-plasma/libkscreen/libkscreen-5.6.95.ebuild index f463261..41a965f 100644 --- a/kde-plasma/libkscreen/libkscreen-5.6.95.ebuild +++ b/kde-plasma/libkscreen/libkscreen-5.6.95.ebuild @@ -11,14 +11,14 @@ inherit kde5 DESCRIPTION="Plasma screen management library" SLOT="5/7" KEYWORDS="~amd64 ~x86" -IUSE="X" +IUSE="" DEPEND=" $(add_frameworks_dep kwayland) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtx11extras) - X? ( x11-libs/libxcb ) + x11-libs/libxcb " RDEPEND="${DEPEND} !x11-libs/libkscreen:5 @@ -26,11 +26,3 @@ RDEPEND="${DEPEND} # requires running session RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X XCB) - ) - - kde5_src_configure -} diff --git a/kde-plasma/libkscreen/libkscreen-5.7.49..ebuild b/kde-plasma/libkscreen/libkscreen-5.7.49..ebuild index 8e7b99c..2d9ab65 100644 --- a/kde-plasma/libkscreen/libkscreen-5.7.49..ebuild +++ b/kde-plasma/libkscreen/libkscreen-5.7.49..ebuild @@ -11,14 +11,14 @@ inherit kde5 DESCRIPTION="Plasma screen management library" SLOT="5/7" KEYWORDS="" -IUSE="X" +IUSE="" DEPEND=" $(add_frameworks_dep kwayland) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtx11extras) - X? ( x11-libs/libxcb ) + x11-libs/libxcb " RDEPEND="${DEPEND} !x11-libs/libkscreen:5 @@ -26,11 +26,3 @@ RDEPEND="${DEPEND} # requires running session RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X XCB) - ) - - kde5_src_configure -} diff --git a/kde-plasma/libkscreen/libkscreen-.ebuild b/kde-plasma/libkscreen/libkscreen-.ebuild index 8e7b99c..2d9ab65 100644 --- a/kde-plasma/libkscreen/libkscreen-.ebuild +++ b/kde-plasma/libkscreen/libkscreen-.ebuild @@ -11,14 +11,14 @@ inherit kde5 DESCRIPTION="Plasma screen management library" SLOT="5/7" KEYWORDS="" -IUSE="X" +IUSE="" DEPEND=" $(add_frameworks_dep kwayland) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtx11extras) - X? ( x11-libs/libxcb ) + x11-libs/libxcb " RDEPEND="${DEPEND} !x11-libs/libkscreen:5 @@ -26,11 +26,3 @@ RDEPEND="${DEPEND} # requires running session RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X XCB) - ) - - kde5_src_configure -}
[gentoo-commits] proj/kde:master commit in: kde-plasma/oxygen/
commit: 44fade455ec99ef6dc40f2d146c84dc1d18a3dce Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 19 12:06:59 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 19 12:17:14 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=44fade45 kde-plasma/oxygen: add new dependency Upstream-commit: b869bb0acd66bc3f45a0eefd5e2e7bd7388b696c Package-Manager: portage-2.3.0_rc1 kde-plasma/oxygen/oxygen-5.6.95.ebuild | 1 + kde-plasma/oxygen/oxygen-5.7.49..ebuild | 1 + kde-plasma/oxygen/oxygen-.ebuild| 1 + 3 files changed, 3 insertions(+) diff --git a/kde-plasma/oxygen/oxygen-5.6.95.ebuild b/kde-plasma/oxygen/oxygen-5.6.95.ebuild index e456055..24ad6a3 100644 --- a/kde-plasma/oxygen/oxygen-5.6.95.ebuild +++ b/kde-plasma/oxygen/oxygen-5.6.95.ebuild @@ -20,6 +20,7 @@ RDEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwayland) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_plasma_dep kdecoration) diff --git a/kde-plasma/oxygen/oxygen-5.7.49..ebuild b/kde-plasma/oxygen/oxygen-5.7.49..ebuild index 2c2a9b1..f78559e 100644 --- a/kde-plasma/oxygen/oxygen-5.7.49..ebuild +++ b/kde-plasma/oxygen/oxygen-5.7.49..ebuild @@ -20,6 +20,7 @@ RDEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwayland) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_plasma_dep kdecoration) diff --git a/kde-plasma/oxygen/oxygen-.ebuild b/kde-plasma/oxygen/oxygen-.ebuild index 2c2a9b1..f78559e 100644 --- a/kde-plasma/oxygen/oxygen-.ebuild +++ b/kde-plasma/oxygen/oxygen-.ebuild @@ -20,6 +20,7 @@ RDEPEND=" $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwayland) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_plasma_dep kdecoration)
[gentoo-commits] proj/elections:master commit in: /
commit: d485ef42ae4a6374e6215a3fa3e70d2ad06a4085 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Jun 19 12:13:03 2016 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Jun 19 12:13:03 2016 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=d485ef42 Allow running listify and statify outside of /etc/elections and the repository dir. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> listify | 7 +-- statify | 9 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/listify b/listify index c8c24eb..7ca2bc3 100755 --- a/listify +++ b/listify @@ -8,11 +8,14 @@ # BEGIN { +my $dirname; if(-f '/etc/elections/Votify.pm') { -push @INC, '/etc/elections'; +$dirname = '/etc/elections'; } else { -push @INC, '.' if -f 'Votify.pm'; +use File::Basename; +$dirname = dirname(__FILE__); } +push @INC, $dirname; } use POSIX; diff --git a/statify b/statify index c424696..a26a066 100755 --- a/statify +++ b/statify @@ -8,12 +8,15 @@ # statify: Produce early election statistics # -BEGIN { +BEGIN { +my $dirname; if(-f '/etc/elections/Votify.pm') { -push @INC, '/etc/elections'; +$dirname = '/etc/elections'; } else { -push @INC, '.' if -f 'Votify.pm'; +use File::Basename; +$dirname = dirname(__FILE__); } +push @INC, $dirname; } use POSIX;
[gentoo-commits] proj/elections:master commit in: /
commit: feb500c197990874101ae84aa51a6b718e96ae79 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Jun 19 12:05:35 2016 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Jun 19 12:05:35 2016 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=feb500c1 Allow running votify outside of /etc/elections and the repository dir. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> Votify.pm | 12 ++-- votify| 8 +--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Votify.pm b/Votify.pm index 48e5938..ed5b519 100644 --- a/Votify.pm +++ b/Votify.pm @@ -10,13 +10,13 @@ package Votify; use POSIX; use Cwd qw(abs_path); +use File::Basename; use File::Spec::Functions; use List::Util; use strict; our $datefmt = '%Y-%m-%d %H:%M:%S UTC'; - -our ($basedir) = List::Util::first { -d $_ } ('/etc/elections', '.'); +our ($basedir) = List::Util::first { -d $_ } ('/etc/elections', dirname(__FILE__)); (our $zero = $0) =~ s,.*/,,; our $version = '1.6'; @@ -41,16 +41,16 @@ sub validate_election_dir { my $election_dir = $_; my $election_name = $election_dir; $election_name =~ /.*\//; -return 0 unless -d $election_dir; +return 0 unless -d "$basedir/$election_dir"; return 0 if substr($election_name,0,1) eq "."; my $valid = List::Util::reduce { $a or $b ? 1 : 0; } map { my $file_valid = 0; # Legacy naming: -$file_valid = 1 if -f sprintf("%s/%s-%s", $election_name, $_, $election_name); +$file_valid = 1 if -f sprintf("%s/%s-%s", "$basedir/$election_name", $_, $election_name); # New naming: -$file_valid = 1 if -f sprintf("%s/%s", $election_name, $_); +$file_valid = 1 if -f sprintf("%s/%s", "$basedir/$election_name", $_); #printf "File %s valid=%d\n", $_, $file_valid; $file_valid; } @REQUIRED_FILES; @@ -88,7 +88,7 @@ sub get_single_election_hashref { my %election; foreach my $fn (@REQUIRED_FILES){ #print "Scan $fn\n"; -my @filenames = (sprintf("%s/%s", $election_name, $fn), sprintf("%s/%s-%s", $election_name, $fn, $election_name)); +my @filenames = (sprintf("%s/%s", "$basedir/$election_name", $fn), sprintf("%s/%s-%s", "$basedir/$election_name", $fn, $election_name)); #print Dumper(@filenames); my $filename = abs_path(List::Util::first { -f $_ } @filenames); $election{"${fn}file"} = $filename; diff --git a/votify b/votify index e52881d..4fb688d 100755 --- a/votify +++ b/votify @@ -7,13 +7,15 @@ # votify: generate, verify and submit voting ballots for trustee elections # -#BEGIN { push @INC, (getpwnam 'fox2mike')[7].'/elections' } BEGIN { +my $dirname; if(-f '/etc/elections/Votify.pm') { -push @INC, '/etc/elections'; +$dirname = '/etc/elections'; } else { -push @INC, '.' if -f 'Votify.pm'; +use File::Basename; +$dirname = dirname(__FILE__); } +push @INC, $dirname; } use POSIX;