[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/files/, x11-misc/xkeyboard-config/

2018-02-05 Thread Chí-Thanh Christopher Nguyễn
commit: cba05e849ae9ec7289f44eb2f624030c95b83f4b
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Mon Feb  5 22:28:08 2018 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Mon Feb  5 22:31:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba05e84

x11-misc/xkeyboard-config: add patch to fix pl keyboard layout

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104904
Closes: https://bugs.gentoo.org/show_bug.cgi?id=646434
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...keyboard-config-2.23.1_fix_typo_in_polish.patch | 25 +
 .../xkeyboard-config-2.23.1-r1.ebuild  | 42 ++
 2 files changed, 67 insertions(+)

diff --git 
a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch
 
b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch
new file mode 100644
index 000..7d9e6fca2dc
--- /dev/null
+++ 
b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.23.1_fix_typo_in_polish.patch
@@ -0,0 +1,25 @@
+From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
+From: Gunnar Hjalmarsson 
+Date: Thu, 1 Feb 2018 15:37:46 +0100
+Subject: Fix typo in Polish symbols file
+
+https://bugs.freedesktop.org/show_bug.cgi?id=104904
+---
+ symbols/pl | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/symbols/pl b/symbols/pl
+index 52e7959..800cb85 100644
+--- a/symbols/pl
 b/symbols/pl
+@@ -497,7 +497,6 @@ partial alphanumeric_keys
+include "sun_vndr/pl(sun_type6)"
+ };
+ 
+---
+ //Glagolica
+ partial alphanumeric_keys
+ xkb_symbols "glagolica"
+-- 
+cgit v1.1
+

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild 
b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
new file mode 100644
index 000..4a9d40a48f1
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git";
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig";
+[[ ${PV} == ** ]] || 
SRC_URI="https://www.x.org/releases/individual/data/xkeyboard-config/${P}.tar.bz2";
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="!

[gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/

2018-02-05 Thread Sergei Trofimovich
commit: 6085410f730eb4866c53b433c3337ae0a7e90ff9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 22:34:11 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 22:34:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6085410f

net-proxy/squid: stable 3.5.27-r1 for ia64, bug #645356

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 net-proxy/squid/squid-3.5.27-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild 
b/net-proxy/squid/squid-3.5.27-r1.ebuild
index 61961d6f22c..2f7c9beac30 100644
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp 
selinux logrotate test \
ecap esi ssl-crtd \
mysql postgres sqlite \



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

2018-02-05 Thread Sergei Trofimovich
commit: 6b5f861c024bd4c001232c20f546f23a1ae09305
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 22:36:20 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 22:36:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5f861c

app-editors/xemacs: stable 21.4.24-r1 for hppa, bug #645070

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

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

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 91886480deb..23a21614307 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc ~x86"
 IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"



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

2018-02-05 Thread Sergei Trofimovich
commit: c06371fd4d1ae2413e5e2d05a12463deca0d18be
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 22:44:23 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 22:44:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06371fd

dev-libs/libebml: stable 1.3.5 for ia64, bug #641292

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

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

diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild 
b/dev-libs/libebml/libebml-1.3.5.ebuild
index 5dde7f7bc85..218d957ffa6 100644
--- a/dev-libs/libebml/libebml-1.3.5.ebuild
+++ b/dev-libs/libebml/libebml-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz";
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sys-process/fcron/files/, sys-process/fcron/

2018-02-05 Thread Anthony G. Basile
commit: 542ea24d025c589074ca91c1d71c75a93f9b278e
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Mon Feb  5 22:53:01 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Mon Feb  5 22:53:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ea24d

sys-process/fcron: make check_system_crontabs musl friendly

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...fcron-3.2.1-r2.ebuild => fcron-3.2.1-r3.ebuild} |  3 ++-
 sys-process/fcron/fcron-3.3.0_beta-r1.ebuild   |  3 ++-
 .../files/fcron-3.2.1-musl-getopt-order.patch  | 24 ++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/sys-process/fcron/fcron-3.2.1-r2.ebuild 
b/sys-process/fcron/fcron-3.2.1-r3.ebuild
similarity index 98%
rename from sys-process/fcron/fcron-3.2.1-r2.ebuild
rename to sys-process/fcron/fcron-3.2.1-r3.ebuild
index 604e9afb710..fe5f30de4ec 100644
--- a/sys-process/fcron/fcron-3.2.1-r2.ebuild
+++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
+   "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
 )
 
 pkg_setup() {

diff --git a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild 
b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
index 10f03c92f51..f842946849e 100644
--- a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
+++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
+   "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
 )
 
 S="${WORKDIR}/${MY_P}"

diff --git a/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch 
b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch
new file mode 100644
index 000..801baad9171
--- /dev/null
+++ b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch
@@ -0,0 +1,24 @@
+diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.bash 
fcron-3.2.1/script/check_system_crontabs.bash
+--- fcron-3.2.1.orig/script/check_system_crontabs.bash 2015-03-28 
04:45:42.0 -0400
 fcron-3.2.1/script/check_system_crontabs.bash  2018-02-05 
17:47:04.735425134 -0500
+@@ -256,7 +256,7 @@
+   sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e 
"s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" 
-e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" $FCRONTAB_FILE_TMP
+ 
+   # notify fcron about the updated file
+-  $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab
++  $FCRONTAB_PROG -u systab $FCRONTAB_FILE_TMP
+ }
+ 
+ NEED_REBUILD=0
+diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.sh 
fcron-3.2.1/script/check_system_crontabs.sh
+--- fcron-3.2.1.orig/script/check_system_crontabs.sh   2015-03-28 
04:45:42.0 -0400
 fcron-3.2.1/script/check_system_crontabs.sh2018-02-05 
17:45:48.673612299 -0500
+@@ -265,7 +265,7 @@
+   sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e 
"s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" 
-e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" "$FCRONTAB_FILE_TMP"
+ 
+   # notify fcron about the updated file
+-  "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" "$FCRONTAB_FILE_TMP" -u systab
++  "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" -u systab "$FCRONTAB_FILE_TMP"
+ }
+ 
+ NEED_REBUILD=0



[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/

2018-02-05 Thread Sergei Trofimovich
commit: 46a20882c7b8a3a4de87b43be3628f1a05cf263b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 23:17:13 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 23:21:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a20882

net-print/cups-filters: stable 1.17.9 for ia64, bug #641340

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 net-print/cups-filters/cups-filters-1.17.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild 
b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index 947b950d103..6cb4e8893d8 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "" ]] ; then
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters";
 else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz";
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-fbsd ~m68k-mint"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 
sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters";



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

2018-02-05 Thread Sergei Trofimovich
commit: 3d9e36f798dce2f750c182b9e4ec65f7ccac93ff
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 23:17:08 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 23:21:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9e36f7

net-dns/libidn: stable 1.33-r2 for ia64, bug #631130

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 net-dns/libidn/libidn-1.33-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild 
b/net-dns/libidn/libidn-1.33-r2.ebuild
index 692c6cf9aad..321a2443545 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )



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

2018-02-05 Thread Sergei Trofimovich
commit: 8bd1dc7d6f09296caed0e0b1fc022292005cce30
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 23:17:04 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 23:21:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd1dc7d

app-text/qpdf: stable 7.0.0 for ia64, bug #626446

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 app-text/qpdf/qpdf-7.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
index 1f2e2a2c5f3..a5dae22384e 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emacs/browse-kill-ring/

2018-02-05 Thread Ulrich Müller
commit: 20e84d881f4f5fe79a6aee2142c7d2f3dcf4a720
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Feb  5 20:07:28 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb  5 23:54:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e84d88

app-emacs/browse-kill-ring: use HTTPS

 app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild 
b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
index 506e33f5ccb..cda01a9fd76 100644
--- a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit elisp
 
 DESCRIPTION="An improved interface to kill-ring"
-HOMEPAGE="http://www.emacswiki.org/emacs/BrowseKillRing
+HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
https://github.com/T-J-Teru/browse-kill-ring";
 # taken from upstream git repo
 SRC_URI="mirror://gentoo/${P}.el.bz2"



[gentoo-commits] repo/gentoo:master commit in: app-emacs/circe/

2018-02-05 Thread Ulrich Müller
commit: 4accdd52cbc2bbbeed3a5d08015ed53d20a25040
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Feb  4 16:01:16 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb  5 23:58:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4accdd52

app-emacs/circe: use HTTPS, fix HOMEPAGE

 app-emacs/circe/circe-1.3.ebuild | 4 ++--
 app-emacs/circe/circe-2.7.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emacs/circe/circe-1.3.ebuild b/app-emacs/circe/circe-1.3.ebuild
index f9056ffa00e..cc6e6d9515d 100644
--- a/app-emacs/circe/circe-1.3.ebuild
+++ b/app-emacs/circe/circe-1.3.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="A great IRC client for Emacs"
-HOMEPAGE="http://www.jorgenschaefer.de/software/circe/
-   http://www.emacswiki.org/emacs/Circe";
+HOMEPAGE="https://github.com/jorgenschaefer/circe
+   https://www.emacswiki.org/emacs/Circe";
 SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${P}.tar.gz";
 
 LICENSE="GPL-3+"

diff --git a/app-emacs/circe/circe-2.7.ebuild b/app-emacs/circe/circe-2.7.ebuild
index 447bd4da3a0..8367f297cab 100644
--- a/app-emacs/circe/circe-2.7.ebuild
+++ b/app-emacs/circe/circe-2.7.ebuild
@@ -8,7 +8,7 @@ inherit elisp
 
 DESCRIPTION="A great IRC client for Emacs"
 HOMEPAGE="https://github.com/jorgenschaefer/circe
-   http://www.emacswiki.org/emacs/Circe";
+   https://www.emacswiki.org/emacs/Circe";
 SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3+"



[gentoo-commits] proj/musl:master commit in: dev-lang/rust/

2018-02-05 Thread Aric Belsito
commit: 4a89d331496affd51a02d11bf5277a9a38910162
Author: stefson  yahoo  de>
AuthorDate: Fri Feb  2 15:59:18 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Fri Feb  2 15:59:18 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=4a89d331

dev-lang/rust: attempt to make the build system to honor MAKEOPTS from make.conf

 dev-lang/rust/rust-1.23.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild 
b/dev-lang/rust/rust-1.23.0-r1.ebuild
index 5d7184a..c5b5ff4 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 LLVM_MAX_SLOT=4
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-any-r1 versionator toolchain-funcs llvm
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm
 
 if [[ ${PV} = *beta* ]]; then
betaver=${PV//*beta}
@@ -189,7 +189,7 @@ src_configure() {
 }
 
 src_compile() {
-   ./x.py build || die
+   ./x.py build -j$(makeopts_jobs) || die
 }
 
 src_install() {



[gentoo-commits] proj/musl:master commit in: sys-devel/gdb/

2018-02-05 Thread Aric Belsito
commit: a7581a42143ab6dc4ee6bfee5c7e595db82d3144
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Feb  6 01:02:46 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Feb  6 01:02:46 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=a7581a42

sys-devel/gdb: version bump to 8.1

 sys-devel/gdb/Manifest   |   1 +
 sys-devel/gdb/gdb-8.1.ebuild | 255 +++
 2 files changed, 256 insertions(+)

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index de0f4f2..c681003 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -3,3 +3,4 @@ DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 
2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b61
 DIST gdb-8.0.1-patches-1.tar.xz 8620 BLAKE2B 
8595017a881c41cbe78846fae9f50460aa6a4aa8d3863b17e4b9119d886600ee086b642c44b427a2de29c5f3fd4697df838e85e23aafeac05a6ce3291546f099
 SHA512 
912ad1a51207ca1ec9d3c46e32b07d78a5d3368b617f277532f8a81e40875cc9ec5af8b62f9b1de67aa6d09520c6cc6ad32f48bd44415985d8ad03aa4a1bca7d
 DIST gdb-8.0.1.tar.xz 19583920 BLAKE2B 
c22e314a0fe3ccb84cef6eca66c51af60914160ac9760cbe517628079dfb15ec73a623badf070b3162d4bd9e44937f717fd44e1d569edba4532853c82b31ac1d
 SHA512 
5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1
 DIST gdb-8.0.tar.xz 19588616 BLAKE2B 
148965e33a42787b5fa39650c2b6c48e28895930e36f11b44e8391366be1cc3bd4265ea7df932a7d650291fb20e3f66956c7dff1923025f889e5c035d3bf4207
 SHA512 
e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886
+DIST gdb-8.1.tar.xz 20095080 BLAKE2B 
9332058b8b723261ba215124f42a2d6ba916219efdfb3c23ae1f48fecf131c801bbd31b345f2c8339b23d74da690be0260ac31f8f2e79549b62f0880199bfdec
 SHA512 
ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357

diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild
new file mode 100644
index 000..a6a3d61
--- /dev/null
+++ b/sys-devel/gdb/gdb-8.1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit flag-o-matic eutils python-single-r1
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+   if [[ ${CATEGORY} == cross-* ]] ; then
+   export CTARGET=${CATEGORY#cross-}
+   fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+*)
+   # live git tree
+   EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+   inherit git-2
+   SRC_URI=""
+   ;;
+*.*.50.2???)
+   # weekly snapshots
+   
SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz";
+   ;;
+*.*.*.*.*.*)
+   # fedora versions; note we swap the rpm & fedora core versions.
+   # gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
+   # gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
+   inherit versionator rpm
+   gvcr() { get_version_component_range "$@"; }
+   parse_fedora_ver() {
+   set -- $(get_version_components)
+   MY_PV=$(gvcr 1-$(( $# - 2 )))
+   RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
+   }
+   parse_fedora_ver
+   SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
+   ;;
+*)
+   # Normal upstream release
+   SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+   ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz";
+   ;;
+esac
+
+PATCH_VER="1"
+PATCH_DEV="slyfox"
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/";
+SRC_URI="${SRC_URI}
+   
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+   ${PATCH_VER:+mirror://gentoo/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != * ]] ; then
+   # alpha #562128
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+IUSE="+client lzma multitarget nls +python +server test vanilla xml"
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   || ( client server )
+"
+
+RDEPEND="server? ( !dev-util/gdbserver )
+   client? (
+   >=sys-libs/ncurses-5.2-r2:0=
+   sys-libs/readline:0=
+   lzma? ( app-arch/xz-utils )
+   python? ( ${PYTHON_DEPS} )
+   xml? ( dev-libs/expat )
+   sys-libs/zlib
+   )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   sys-apps/texinfo
+   client? (
+   virtual/yacc
+   test? ( dev-util/dejagnu )
+   nls? ( sys-devel/gettext )
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.11-linux_nat.patch
+   "${FILESDIR}"/${PN}-7.11-missing-stat_h.patch

[gentoo-commits] proj/musl:master commit in: dev-lang/rust/

2018-02-05 Thread Aric Belsito
commit: cf190b860b62512906d48b151f8c2484ac28c503
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Feb  6 01:09:27 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Feb  6 01:09:27 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=cf190b86

dev-lang/rust: add missing "extended" dependency

 dev-lang/rust/rust-1.23.0-r1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild 
b/dev-lang/rust/rust-1.23.0-r1.ebuild
index 5d7184a..7f1948f 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -69,12 +69,17 @@ SRC_URI="https://static.rust-lang.org/dist/${SRC} -> 
rustc-${PV}-src.tar.xz
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
-IUSE="debug doc extended jemalloc system-llvm"
+IUSE="debug doc extended jemalloc libressl system-llvm"
 
 RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
jemalloc? ( dev-libs/jemalloc )
system-llvm? ( sys-devel/llvm:4 )
extended? (
+   libressl? (
+   >=dev-libs/libressl-2.5.0:=
+   

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

2018-02-05 Thread Aric Belsito
commit: 84bf3839de44aecb7112dca27ebe4af1f39d3017
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Feb  6 01:11:27 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Feb  6 01:11:27 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=84bf3839

Merge remote-tracking branch 'github/pr/95'

 dev-lang/rust/rust-1.21.0.ebuild  | 6 +++---
 dev-lang/rust/rust-1.23.0-r1.ebuild   | 6 +++---
 dev-lang/rust/rust-1.23.0.ebuild  | 6 +++---
 dev-util/cargo/cargo-0.22.0-r1.ebuild | 4 ++--
 dev-util/cargo/cargo-0.23.0.ebuild| 4 ++--
 dev-util/cargo/cargo-0.24.0.ebuild| 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)



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

2018-02-05 Thread Aric Belsito
commit: 7a49fe1b07709802afe3d1dff3f19d323606c211
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Feb  6 01:06:46 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Feb  6 01:06:46 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7a49fe1b

Merge remote-tracking branch 'github/pr/97'

 net-analyzer/wireshark/Manifest|   1 +
 .../files/wireshark-1.99.8-qtchooser.patch |  10 +
 .../files/wireshark-2.1.0-sse4_2-r1.patch  |  21 ++
 .../files/wireshark-2.4-androiddump.patch  |  27 ++
 .../wireshark/files/wireshark-2.4.3-libsmi.patch   | 233 
 .../files/wireshark--androiddump.patch |  10 +
 .../files/wireshark-includes-fix-musl.patch|  15 ++
 net-analyzer/wireshark/wireshark-2.4.4.ebuild  | 294 +
 8 files changed, 611 insertions(+)



[gentoo-commits] proj/musl:master commit in: dev-lang/rust/

2018-02-05 Thread Aric Belsito
commit: 1808c612c0dc6b99670bfc32fa75c00782c3764e
Author: stefson  yahoo  de>
AuthorDate: Sat Feb  3 20:46:29 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Sat Feb  3 20:46:29 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=1808c612

dev-lang/rust: backport the fix for MAKEOPTS

 dev-lang/rust/rust-1.21.0.ebuild | 6 +++---
 dev-lang/rust/rust-1.23.0.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild
index e0a13e5..89bfe31 100644
--- a/dev-lang/rust/rust-1.21.0.ebuild
+++ b/dev-lang/rust/rust-1.21.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 LLVM_MAX_SLOT=4
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-any-r1 versionator toolchain-funcs llvm
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm
 
 if [[ ${PV} = *beta* ]]; then
betaver=${PV//*beta}
@@ -173,11 +173,11 @@ src_configure() {
 }
 
 src_compile() {
-   ./x.py build || die
+   ./x.py build -j$(makeopts_jobs) || die
 }
 
 src_install() {
-   env DESTDIR="${D}" ./x.py install || die
+   env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
 
rm "${D}/usr/$(get_libdir)/rustlib/components" || die
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die

diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild
index cf9be2c..f01a389 100644
--- a/dev-lang/rust/rust-1.23.0.ebuild
+++ b/dev-lang/rust/rust-1.23.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 LLVM_MAX_SLOT=4
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-any-r1 versionator toolchain-funcs llvm
+inherit multiprocessing python-any-r1 versionator toolchain-funcs llvm
 
 if [[ ${PV} = *beta* ]]; then
betaver=${PV//*beta}
@@ -178,11 +178,11 @@ src_configure() {
 }
 
 src_compile() {
-   ./x.py build || die
+   ./x.py build -j$(makeopts_jobs) || die
 }
 
 src_install() {
-   env DESTDIR="${D}" ./x.py install || die
+   env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
 
rm "${D}/usr/$(get_libdir)/rustlib/components" || die
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die



[gentoo-commits] proj/musl:master commit in: dev-util/cargo/

2018-02-05 Thread Aric Belsito
commit: 16b43a596efd4262efcd5f07ee50da57cb4afc07
Author: stefson  yahoo  de>
AuthorDate: Sat Feb  3 20:02:26 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Sat Feb  3 20:02:26 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=16b43a59

dev-util/cargo: make the build system honor MAKEOPTS from make.conf

 dev-util/cargo/cargo-0.22.0-r1.ebuild | 4 ++--
 dev-util/cargo/cargo-0.23.0.ebuild| 4 ++--
 dev-util/cargo/cargo-0.24.0.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-util/cargo/cargo-0.22.0-r1.ebuild 
b/dev-util/cargo/cargo-0.22.0-r1.ebuild
index 0b10511..4c1ff2b 100644
--- a/dev-util/cargo/cargo-0.22.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.22.0-r1.ebuild
@@ -121,7 +121,7 @@ wincolor-0.1.4
 ws2_32-sys-0.2.1
 "
 
-inherit bash-completion-r1 cargo versionator
+inherit multiprocessing bash-completion-r1 cargo versionator
 
 case "${CHOST}" in
armv7a-hardfloat-*)
@@ -208,7 +208,7 @@ src_configure() {
 src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
local 
cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
-   ${cargo} build --release || die
+   ${cargo} build --release -j$(makeopts_jobs) || die
 
# Building HTML documentation
use doc && ${cargo} doc

diff --git a/dev-util/cargo/cargo-0.23.0.ebuild 
b/dev-util/cargo/cargo-0.23.0.ebuild
index 6ac0726..21af231 100644
--- a/dev-util/cargo/cargo-0.23.0.ebuild
+++ b/dev-util/cargo/cargo-0.23.0.ebuild
@@ -128,7 +128,7 @@ wincolor-0.1.4
 ws2_32-sys-0.2.1
 "
 
-inherit bash-completion-r1 cargo versionator
+inherit multiprocessing bash-completion-r1 cargo versionator
 
 case "${CHOST}" in
armv7a-hardfloat-*)
@@ -215,7 +215,7 @@ src_configure() {
 src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
local 
cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
-   ${cargo} build --release || die
+   ${cargo} build --release -j$(makeopts_jobs) || die
 
# Building HTML documentation
use doc && ${cargo} doc

diff --git a/dev-util/cargo/cargo-0.24.0.ebuild 
b/dev-util/cargo/cargo-0.24.0.ebuild
index b1c7978..b04241b 100644
--- a/dev-util/cargo/cargo-0.24.0.ebuild
+++ b/dev-util/cargo/cargo-0.24.0.ebuild
@@ -132,7 +132,7 @@ wincolor-0.1.4
 ws2_32-sys-0.2.1
 "
 
-inherit bash-completion-r1 cargo versionator
+inherit multiprocessing bash-completion-r1 cargo versionator
 
 case "${CHOST}" in
armv7a-hardfloat-*)
@@ -217,7 +217,7 @@ src_configure() {
 src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
local 
cargo="${WORKDIR}/cargo-${CARGO_SNAPSHOT_VERSION}-${CARGOHOST}/cargo/bin/cargo"
-   ${cargo} build --release || die
+   ${cargo} build --release -j$(makeopts_jobs) || die
 
# Building HTML documentation
use doc && ${cargo} doc



[gentoo-commits] proj/musl:master commit in: dev-lang/rust/

2018-02-05 Thread Aric Belsito
commit: acc9ccf2b2a378825b1d196481f7fcbe2cb6a5da
Author: stefson  yahoo  de>
AuthorDate: Fri Feb  2 16:08:26 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Fri Feb  2 16:08:26 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=acc9ccf2

dev-lang/rust: attempt to fix MAKEOPTS during src_install as well

 dev-lang/rust/rust-1.23.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild 
b/dev-lang/rust/rust-1.23.0-r1.ebuild
index c5b5ff4..d648ba0 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -193,7 +193,7 @@ src_compile() {
 }
 
 src_install() {
-   env DESTDIR="${D}" ./x.py install || die
+   env DESTDIR="${D}" ./x.py install -j$(makeopts_jobs) || die
 
rm "${D}/usr/$(get_libdir)/rustlib/components" || die
rm "${D}/usr/$(get_libdir)/rustlib/install.log" || die



[gentoo-commits] proj/musl:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

2018-02-05 Thread Aric Belsito
commit: 9c63d18d78a9329fd221409c91a0da5b60465238
Author: Dan Robertson  gmail  com>
AuthorDate: Mon Feb  5 20:20:41 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Mon Feb  5 20:20:41 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9c63d18d

net-analyzer/wireshark: build with udpdump enabled

 net-analyzer/wireshark/Manifest|   1 +
 .../files/wireshark-1.99.8-qtchooser.patch |  10 +
 .../files/wireshark-2.1.0-sse4_2-r1.patch  |  21 ++
 .../files/wireshark-2.4-androiddump.patch  |  27 ++
 .../wireshark/files/wireshark-2.4.3-libsmi.patch   | 233 
 .../files/wireshark--androiddump.patch |  10 +
 .../files/wireshark-includes-fix-musl.patch|  15 ++
 net-analyzer/wireshark/wireshark-2.4.4.ebuild  | 294 +
 8 files changed, 611 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
new file mode 100644
index 000..4987062
--- /dev/null
+++ b/net-analyzer/wireshark/Manifest
@@ -0,0 +1 @@
+DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 
1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e
 SHA512 
b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc

diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch 
b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
new file mode 100644
index 000..4745951
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
@@ -0,0 +1,10 @@
+--- a/acinclude.m4
 b/acinclude.m4
+@@ -2149,7 +2149,6 @@
+   # -qt={version} argument, otherwise we look for particular
+   # tool versions using tool name suffixes.
+   #
+-  AC_PATH_PROG(QTCHOOSER, qtchooser)
+   if test ! -z "$QTCHOOSER"; then
+   #
+   # We found qtchooser; we assume that means that

diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch 
b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
new file mode 100644
index 000..8efe5af
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
 b/configure.ac
+@@ -818,6 +818,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+ 
++AC_ARG_ENABLE(sse4_2,[  --enable-sse4_2 Support SSE4.2 (Streaming 
SIMD Extensions 4.2) instructions],[
+ WS_CFLAGS_saved="$WS_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -844,6 +845,10 @@
+   ac_sse4_2_flag=-xarch=sse4_2
+   fi
+ fi
++],[
++AC_MSG_RESULT(no)
++])
++
+ WS_CFLAGS="$WS_CFLAGS_saved"
+ 
+ if test "x$ac_sse4_2_flag" != x; then

diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch 
b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
new file mode 100644
index 000..e67ab21
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
@@ -0,0 +1,27 @@
+--- a/extcap/androiddump.c
 b/extcap/androiddump.c
+@@ -363,13 +363,13 @@
+ pcap = pcap_open_dead_with_tstamp_precision(encap_ext, PACKET_LENGTH, 
PCAP_TSTAMP_PRECISION_NANO);
+ extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
+ if (!extcap_dumper.dumper.pcap) {
+-g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
++g_warning("Can't open %s for saving packets: %s", fifo, 
pcap_geterr(pcap));
+ pcap_close(pcap);
+ exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP);
+ }
+ extcap_dumper.encap = encap;
+ if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
+-g_warning("Write to %s failed: %s", g_strerror(errno));
++g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
+ }
+ #else
+ int err = 0;
+@@ -416,7 +416,7 @@
+ 
+ pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer);
+ if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
+-g_warning("Write to %s failed: %s", g_strerror(errno));
++g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
+ }
+ #else
+ int err = 0;

diff --git a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch 
b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
new file mode 100644
index 000..288efb7
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
@@ -0,0 +1,233 @@
+From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jo=C3=A3o=20Valverde?= 
+Date: Sun, 5 Nov 2017 12:05:43 +
+Subject: [PATCH 1/1] autotools: Use pkg-config to configure Libsmi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Icecea743739aa7e1a65753f623f311514260d373
+Reviewed-on: https://code.wireshark.org/review/24252
+Petr

[gentoo-commits] proj/musl:master commit in: net-analyzer/wireshark/

2018-02-05 Thread Aric Belsito
commit: 0c5fc8dca2808b93c696b051a5f1345622ea2f38
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Feb  6 01:08:58 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Feb  6 01:08:58 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=0c5fc8dc

net-analyzer/wireshark: add metadata.xml

 net-analyzer/wireshark/metadata.xml   | 62 +++
 net-analyzer/wireshark/wireshark-2.4.4.ebuild |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
new file mode 100644
index 000..1dcbdb4
--- /dev/null
+++ b/net-analyzer/wireshark/metadata.xml
@@ -0,0 +1,62 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   net...@gentoo.org
+   Gentoo network monitoring and analysis project
+   
+   
+   Wireshark is the world's foremost network protocol analyzer, and is the 
de
+   facto (and often de jure) standard across many industries and 
educational
+   institutions. Wireshark has a rich feature set which includes 1) deep
+   inspection of hundreds of protocols, with more being added all the 
time, 2)
+   live capture and offline analysis, 3) standard three-pane packet 
browser, 4)
+   captured network data can be browsed via a GUI, or via the TTY-mode 
TShark
+   utility, 5) the most powerful display filters in the industry, 6) rich 
VoIP
+   analysis, 7) read/write many different capture file formats: tcpdump
+   (libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network
+   Monitor, Network General Sniffer® (compressed and uncompressed), 
Sniffer®
+   Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, 
RADCOM
+   WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual 
Networks
+   Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many 
others, 8)
+   capture files compressed with gzip can be decompressed on the fly, 9) 
live
+   data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, 
USB,
+   Token Ring, Frame Relay, FDDI, and others, 10) decryption support for 
many
+   protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and
+   WPA/WPA2, 11) coloring rules can be applied to the packet list for 
quick,
+   intuitive analysis, 12) output can be exported to XML, PostScript®, 
CSV, or
+   plain text 
+
+   
+   Use the GNU net-dns/c-ares library 
to resolve DNS names
+   Install androiddump, an extcap 
interface to capture from Android devices
+   Install capinfos, to print information 
about capture files
+   Install captype, to print the file types 
of capture files
+   Install ciscodump, extcap interface to 
capture from a remote Cisco router
+   Use dev-libs/libgcrypt to decrypt 
traffic
+   Install dftest, to display filter 
byte-code, for debugging dfilter routines
+   Build documentation in pdf format (US and 
a4 paper sizes)
+   Install dumpcap, to dump network traffic 
from inside wireshark
+   Install editcap, to edit and/or translate 
the format of capture files
+   Use net-libs/libssh (for 
sshdump)
+   Use dev-libs/libxml2 for 
handling XML configuration in dissectors
+   Use app-arch/lz4 for 
compression/decompression
+   Install mergecap, to merge two or more 
capture files into one
+   Use dev-libs/libnl
+   Use net-libs/nghttp2 for HTTP/2 
support
+   Use net-libs/libpcap for network 
packet capturing (build dumpcap, rawshark)
+   Install randpkt, a utility for creating 
pcap trace files full of random packets
+   Install randpktdump, an extcap 
interface to provide access to the random packet generator (randpkt)
+   Install reordercap, to reorder input 
file by timestamp into output file
+   Use media-libs/sbc for playing back 
SBC encoded packets
+   Install sharkd, the daemon variant of 
wireshark
+   Use net-libs/libsmi to resolve 
numeric OIDs into human readable format
+   Use app-arch/snappy for snappy 
compression and decompression
+   Use media-libs/spandsp for for 
G.722 and G.726 codec support in the RTP Player
+   Install sshdump, an extcap interface to 
capture from a remote host through SSH
+   Install text2pcap, to generate a capture 
file from an ASCII hexdump of packets
+   Install tfshark, a terminal-based version 
of the FileShark capability
+   Install tshark, to dump and analyzer 
network traffic from the command line
+   Install udpdump, to get packets exported 
from a source (like a network device or a GSMTAP producer) that are dumped to a 
pcap file
+   
+


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

2018-02-05 Thread Tim Harder
commit: 1c6ccb564a48f18b9b1ca0c61ab895814f195fe9
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Oct 19 18:21:15 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Feb  6 01:51:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6ccb56

dev-python/parso: initial import, required by latest version of jedi

 dev-python/parso/Manifest   |  1 +
 dev-python/parso/metadata.xml   | 12 
 dev-python/parso/parso-0.1.1.ebuild | 35 +++
 3 files changed, 48 insertions(+)

diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
new file mode 100644
index 000..653c0365695
--- /dev/null
+++ b/dev-python/parso/Manifest
@@ -0,0 +1 @@
+DIST parso-0.1.1.tar.gz 376876 BLAKE2B 
ad0b9492273d23da1f4133a2f1e6edd2fa7f2213dbe12868f891863e9286fa0281de7fc6c6924b78a5820f94867971bbc09f18b3d0f2e4832c9c875850205254
 SHA512 
1199651136af1c9f0801a031a197e367f7fa73b5878b863103a506481e8b325e6b305e4260510a567dccf91f298fd7e9e5674f4dc410765ae1f9112f742aa6a0

diff --git a/dev-python/parso/metadata.xml b/dev-python/parso/metadata.xml
new file mode 100644
index 000..0d25fbf1ae0
--- /dev/null
+++ b/dev-python/parso/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+  
+pyt...@gentoo.org
+Python
+  
+  
+parso
+davidhalter/parso
+  
+

diff --git a/dev-python/parso/parso-0.1.1.ebuild 
b/dev-python/parso/parso-0.1.1.ebuild
new file mode 100644
index 000..99e6a66edd9
--- /dev/null
+++ b/dev-python/parso/parso-0.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a python parser that supports error recovery and round-trip 
parsing"
+HOMEPAGE="https://github.com/davidhalter/parso 
https://pypi.python.org/pypi/parso";
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? ( dev-python/sphinx )
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+   py.test -v test || die "tests failed with ${EPYTHON}"
+}
+
+python_compile_all() {
+   use doc && emake -C docs html
+}
+
+python_install_all() {
+   use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
+   distutils-r1_python_install_all
+}



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

2018-02-05 Thread Tim Harder
commit: 2e66431b78d55b5a7efb881f5ef0f99e32b543f6
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Feb  6 01:17:00 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Feb  6 01:51:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e66431b

dev-python/fusepy: update HOMEPAGE and upstream info

 dev-python/fusepy/fusepy-2.0.4-r1.ebuild | 6 +++---
 dev-python/fusepy/metadata.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/fusepy/fusepy-2.0.4-r1.ebuild 
b/dev-python/fusepy/fusepy-2.0.4-r1.ebuild
index 4d274aed3c8..81765709fec 100644
--- a/dev-python/fusepy/fusepy-2.0.4-r1.ebuild
+++ b/dev-python/fusepy/fusepy-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python FUSE bindings using ctypes"
-HOMEPAGE="https://github.com/terencehonles/fusepy";
-SRC_URI="https://github.com/terencehonles/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+HOMEPAGE="https://github.com/fusepy/fusepy";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"

diff --git a/dev-python/fusepy/metadata.xml b/dev-python/fusepy/metadata.xml
index 4158c62ad4d..de0f4f2e620 100644
--- a/dev-python/fusepy/metadata.xml
+++ b/dev-python/fusepy/metadata.xml
@@ -10,6 +10,6 @@
MacFUSE. It's just one file and is implemented using ctypes.


-   terencehonles/fusepy
+   fusepy/fusepy

 



[gentoo-commits] repo/gentoo:master commit in: dev-python/jedi/, dev-python/jedi/files/

2018-02-05 Thread Tim Harder
commit: cdb4a4c747fcabfbdbc5c709c559b1669d0b0ae6
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Feb  6 01:46:31 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Feb  6 01:51:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb4a4c7

dev-python/jedi: version bump to 0.11.1

 dev-python/jedi/Manifest   |  1 +
 .../jedi/files/jedi-0.11.1-exclude-tests.patch | 26 +++
 dev-python/jedi/jedi-0.11.1.ebuild | 51 ++
 3 files changed, 78 insertions(+)

diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 2ac7fdc76cd..aa9d365820a 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1 +1,2 @@
 DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 
8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc
 SHA512 
847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351
+DIST jedi-0.11.1.tar.gz 332402 BLAKE2B 
bc0a8df89c3d8b6387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270
 SHA512 
61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945

diff --git a/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch 
b/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch
new file mode 100644
index 000..a85af80d4c9
--- /dev/null
+++ b/dev-python/jedi/files/jedi-0.11.1-exclude-tests.patch
@@ -0,0 +1,26 @@
+From 4e52acbf26b6d52e26e757cb04817d17c5464331 Mon Sep 17 00:00:00 2001
+From: Dave Halter 
+Date: Sun, 7 Jan 2018 14:13:21 +0100
+Subject: [PATCH] Using setup.py build should not include part of tests
+
+It looks like that we have to not only exclude the test package but also 
'test.*'. Thanks to @david-geiger for noticing this. Fixes #1024.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 3f3b7e54..c7081858 100755
+--- a/setup.py
 b/setup.py
+@@ -32,7 +32,7 @@ setup(name='jedi',
+   license='MIT',
+   keywords='python completion refactoring vim',
+   long_description=readme,
+-  packages=find_packages(exclude=['test']),
++  packages=find_packages(exclude=['test', 'test.*']),
+   install_requires=install_requires,
+   extras_require={'dev': ['docopt']},
+   package_data={'jedi': ['evaluate/compiled/fake/*.pym']},
+-- 
+2.16.1
+

diff --git a/dev-python/jedi/jedi-0.11.1.ebuild 
b/dev-python/jedi/jedi-0.11.1.ebuild
new file mode 100644
index 000..7aac943f7a2
--- /dev/null
+++ b/dev-python/jedi/jedi-0.11.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi";
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? ( dev-python/sphinx )
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   ${RDEPEND}
+   )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.11.1-exclude-tests.patch )
+
+# various misc failures
+RESTRICT="test"
+
+src_prepare() {
+   # skip integration and speed tests
+   rm test/test_{integration,speed}* || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
+   || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+   use doc && emake -C docs html
+}
+
+python_install_all() {
+   use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
+   distutils-r1_python_install_all
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/features/prefix/standalone/kernel-2.6.32+/

2018-02-05 Thread Benda XU
commit: 6caa16fe017fd7df23bfbfaa354016df077ce405
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Feb  6 02:39:30 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Feb  6 02:41:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6caa16fe

p/f/p/s/kernel-2.6.32+: mask net-libs/libnsl

  It is a split-off from glibc-2.26.

 profiles/features/prefix/standalone/kernel-2.6.32+/package.mask | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask 
b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
index 666a526176d..d89543acfa1 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask
@@ -5,3 +5,6 @@
 
 # we just use a universal glibc-2.24 on all ARCHes for simplicity.
 >=sys-libs/glibc-2.24
+
+# libnsl is a split-off from glibc-2.26
+>net-libs/libnsl-0



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

2018-02-05 Thread Benda XU
commit: 68549620265e97d963ebf5d969699b7ebd4eaead
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Jan 13 03:36:10 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Feb  6 03:14:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68549620

sys-apps/opentmpfiles: support Prefix.

Reported-By: Paul Preney, Horea Christian, Cyril de Vaucleroy
Closes: https://bugs.gentoo.org/644484

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild | 53 ++
 1 file changed, 53 insertions(+)

diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild 
b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
new file mode 100644
index 000..cd2b8eff44b
--- /dev/null
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit prefix
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/openrc/${PN}";
+else
+   SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
+   ${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
+HOMEPAGE="https://github.com/openrc/opentmpfiles";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="selinux"
+
+RDEPEND="!

[gentoo-commits] repo/gentoo:master commit in: net-proxy/sshuttle/, net-proxy/sshuttle/files/

2018-02-05 Thread Tim Harder
commit: bb1f8408db50c4ea99c48cd41eafcc98c0460be0
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Feb  6 03:15:57 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Feb  6 03:17:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1f8408

net-proxy/sshuttle: check for more generic remote python versions

 .../sshuttle/files/sshuttle-0.78.3-remote-python.patch  | 13 +
 net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild|  2 ++
 2 files changed, 15 insertions(+)

diff --git a/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch 
b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch
new file mode 100644
index 000..d7404fd45b0
--- /dev/null
+++ b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch
@@ -0,0 +1,13 @@
+Check for more generic remote python versions.
+
+--- sshuttle-0.78.3/sshuttle/ssh.py
 sshuttle-0.78.3/sshuttle/ssh.py
+@@ -116,7 +116,7 @@
+ if python:
+ pycmd = "'%s' -c '%s'" % (python, pyscript)
+ else:
+-pycmd = ("P=python3.5; $P -V 2>/dev/null || P=python; "
++pycmd = ("P=python3; $P -V 2>/dev/null || P=python2; $P -V 
2>/dev/null || P=python; "
+  "exec \"$P\" -c %s") % quote(pyscript)
+ pycmd = ("exec /bin/sh -c %s" % quote(pycmd))
+ argv = (sshl +

diff --git a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild 
b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
index 49502d96180..254601915e1 100644
--- a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
@@ -31,6 +31,8 @@ DEPEND="
 
 CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL 
~NF_NAT"
 
+PATCHES=( "${FILESDIR}"/${P}-remote-python.patch )
+
 python_prepare_all() {
# don't run tests via setup.py pytest
sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die



[gentoo-commits] repo/gentoo:master commit in: net-proxy/sshuttle/

2018-02-05 Thread Tim Harder
commit: 3838105b77316a45453dea09dda8cd8f4e9ba919
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Feb  6 03:01:20 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Feb  6 03:17:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3838105b

net-proxy/sshuttle: initial docs and man page

 net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild | 53 
 1 file changed, 53 insertions(+)

diff --git a/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild 
b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
new file mode 100644
index 000..49502d96180
--- /dev/null
+++ b/net-proxy/sshuttle/sshuttle-0.78.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit linux-info distutils-r1
+
+DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
+HOMEPAGE="https://github.com/sshuttle/sshuttle 
https://pypi.python.org/pypi/sshuttle";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   net-firewall/iptables
+"
+DEPEND="
+   dev-python/sphinx
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   )
+"
+
+CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL 
~NF_NAT"
+
+python_prepare_all() {
+   # don't run tests via setup.py pytest
+   sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+   emake -C docs html man
+}
+
+python_test() {
+   py.test || die "Tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+   HTML_DOCS=( "${S}"/docs/_build/html/. )
+   doman "${S}"/docs/_build/man/*
+   distutils-r1_python_install_all
+}



[gentoo-commits] proj/musl:master commit in: app-editors/emacs/

2018-02-05 Thread Anthony G. Basile
commit: bcde0634fef7e640e201661a89fbd934f2062a49
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Feb  6 07:15:41 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Feb  6 07:15:41 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=bcde0634

app-editors/emacs: remove unused flag from metadata.xml

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-editors/emacs/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 61b8821..64c34d3 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -47,7 +47,7 @@
   Prefer wide Emacs integers (typically 62-bit).
 This option has an effect only on architectures where "long" and
 "long long" types have different size.
-  Enable use of GTK widgets in Emacs buffers
-(requires GTK3)
+  
 
 



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

2018-02-05 Thread Joshua Kinard
commit: 08985154fbbc363599733f0a5b8ef73c487eed56
Author: Joshua Kinard  gentoo  org>
AuthorDate: Tue Feb  6 07:17:20 2018 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Tue Feb  6 07:17:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08985154

dev-python/bz2file: added ~mips to KEYWORDS, per #638776

Signed-off-by: Joshua Kinard  gentoo.org>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-python/bz2file/bz2file-0.98.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/bz2file/bz2file-0.98.ebuild 
b/dev-python/bz2file/bz2file-0.98.ebuild
index 13abc5b1f8c..a3b6e7d6835 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 python_test() {



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

2018-02-05 Thread Joshua Kinard
commit: a133847ddb93cb5afcf3131aeac619c9864185df
Author: Joshua Kinard  gentoo  org>
AuthorDate: Tue Feb  6 07:20:10 2018 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Tue Feb  6 07:20:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a133847d

dev-python/backports-lzma: added ~mips to KEYWORDS, per #638776

Signed-off-by: Joshua Kinard  gentoo.org>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-python/backports-lzma/backports-lzma-0.0.10.ebuild | 2 +-
 dev-python/backports-lzma/backports-lzma-0.0.8.ebuild  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild 
b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index 52da80dba0d..776551285a1 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="app-arch/xz-utils:0=

diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild 
b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
index 178f3c3c7eb..b8a0569c494 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/xz-utils
dev-python/backports[${PYTHON_USEDEP}]"



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

2018-02-05 Thread Joshua Kinard
commit: 425d2403fca857081a62b1463fa8adb513192c55
Author: Joshua Kinard  gentoo  org>
AuthorDate: Tue Feb  6 07:14:43 2018 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Tue Feb  6 07:14:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425d2403

app-portage/gemato: added ~mips to KEYWORDS, per #638776

Signed-off-by: Joshua Kinard  gentoo.org>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-portage/gemato/gemato-10.3-r1.ebuild | 2 +-
 app-portage/gemato/gemato-11.0.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-portage/gemato/gemato-10.3-r1.ebuild 
b/app-portage/gemato/gemato-10.3-r1.ebuild
index 9a0b3df31cd..6dd1dc95ea5 100644
--- a/app-portage/gemato/gemato-10.3-r1.ebuild
+++ b/app-portage/gemato/gemato-10.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test"
 
 MODULE_RDEPEND="

diff --git a/app-portage/gemato/gemato-11.0.ebuild 
b/app-portage/gemato/gemato-11.0.ebuild
index 9a0b3df31cd..6dd1dc95ea5 100644
--- a/app-portage/gemato/gemato-11.0.ebuild
+++ b/app-portage/gemato/gemato-11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test"
 
 MODULE_RDEPEND="



[gentoo-commits] proj/musl:master commit in: net-analyzer/wireshark/

2018-02-05 Thread Anthony G. Basile
commit: dc001f21dffba19a7d4ba80bad0b018628f14e16
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Feb  6 07:25:40 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Feb  6 07:25:40 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=dc001f21

net-analyzer/wireshark: remove unused flag from metadata.xml

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/wireshark/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/wireshark/metadata.xml 
b/net-analyzer/wireshark/metadata.xml
index 1dcbdb4..cf871ba 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -33,7 +33,7 @@
Install capinfos, to print information 
about capture files
Install captype, to print the file types 
of capture files
Install ciscodump, extcap interface to 
capture from a remote Cisco router
-   Use dev-libs/libgcrypt to decrypt 
traffic
+   
Install dftest, to display filter 
byte-code, for debugging dfilter routines
Build documentation in pdf format (US and 
a4 paper sizes)
Install dumpcap, to dump network traffic 
from inside wireshark



[gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/

2018-02-05 Thread Sergei Trofimovich
commit: 85265115f14e00dbb109b749f270233f4a2d0499
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb  6 07:57:26 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb  6 07:57:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85265115

net-proxy/squid: stable 3.5.27-r1 for hppa, bug #645356

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 net-proxy/squid/squid-3.5.27-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild 
b/net-proxy/squid/squid-3.5.27-r1.ebuild
index 2f7c9beac30..dc5029c0563 100644
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp 
selinux logrotate test \
ecap esi ssl-crtd \
mysql postgres sqlite \



[gentoo-commits] proj/musl:master commit in: media-gfx/sane-backends/, media-gfx/sane-backends/files/

2018-02-05 Thread Anthony G. Basile
commit: 396d62c451a9c12862d70469345539b04cfba900
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Feb  6 07:57:29 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Feb  6 07:57:29 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=396d62c4

media-gfx/sane-backends: in tree version works

 media-gfx/sane-backends/Manifest   |   1 -
 .../sane-backends/files/niash_array_index.patch| 140 -
 .../sane-backends-1.0.24-automagic_systemd.patch   |  40 ---
 .../files/sane-backends-1.0.24-cross-compile.patch |  30 --
 .../sane-backends-1.0.24-kodakaio_avahi.patch  |  84 --
 ...ne-backends-1.0.24-saned_pidfile_location.patch |  11 -
 .../sane-backends-1.0.24-systemd_pkgconfig.patch   |  37 ---
 .../files/sane-backends-1.0.24-u_char.patch|  11 -
 .../files/sane-backends-1.0.24-unused-cups.patch   |  42 ---
 media-gfx/sane-backends/files/saned|  10 -
 media-gfx/sane-backends/files/saned.confd  |   2 -
 media-gfx/sane-backends/files/saned.initd  |  12 -
 media-gfx/sane-backends/metadata.xml   |   5 -
 .../sane-backends/sane-backends-1.0.24-r6.ebuild   | 329 -
 14 files changed, 754 deletions(-)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
deleted file mode 100644
index 1ad06f1..000
--- a/media-gfx/sane-backends/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 
27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 
1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5
 WHIRLPOOL 
19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c

diff --git a/media-gfx/sane-backends/files/niash_array_index.patch 
b/media-gfx/sane-backends/files/niash_array_index.patch
deleted file mode 100644
index 236c459..000
--- a/media-gfx/sane-backends/files/niash_array_index.patch
+++ /dev/null
@@ -1,140 +0,0 @@
 backend/niash.c2010-12-02 00:49:58.0 +0100
-+++ backend/niash.c.new2011-09-21 20:09:07.0 +0200
-@@ -82,14 +82,7 @@
-   optThreshold,
- 
- 
--  optLast,
--/* put temporarily disabled options here after optLast */
--
--  optGroupMisc,
--  optLamp,
--
--  optCalibrate,
--  optGamma  /* analog gamma = single number */
-+  optLast
- } EOptionIndex;
- 
- 
-@@ -685,17 +678,6 @@
-   pDesc->size = 0;
-   break;
- 
--case optGamma:
--  pDesc->name = SANE_NAME_ANALOG_GAMMA;
--  pDesc->title = SANE_TITLE_ANALOG_GAMMA;
--  pDesc->desc = SANE_DESC_ANALOG_GAMMA;
--  pDesc->type = SANE_TYPE_FIXED;
--  pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
--  pDesc->constraint.range = &rangeGamma;
--  pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
--  pVal->w = startUpGamma;
--  break;
--
- case optGammaTable:
-   pDesc->name = SANE_NAME_GAMMA_VECTOR;
-   pDesc->title = SANE_TITLE_GAMMA_VECTOR;
-@@ -707,31 +689,6 @@
-   pVal->wa = s->aGammaTable;
-   break;
- 
--case optGroupMisc:
--  pDesc->title = SANE_I18N ("Miscellaneous");
--  pDesc->type = SANE_TYPE_GROUP;
--  pDesc->size = 0;
--  break;
--
--case optLamp:
--  pDesc->name = "lamp";
--  pDesc->title = SANE_I18N ("Lamp status");
--  pDesc->desc = SANE_I18N ("Switches the lamp on or off.");
--  pDesc->type = SANE_TYPE_BOOL;
--  pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
--  /* switch the lamp on when starting for first the time */
--  pVal->w = SANE_TRUE;
--  break;
--
--case optCalibrate:
--  pDesc->name = "calibrate";
--  pDesc->title = SANE_I18N ("Calibrate");
--  pDesc->desc = SANE_I18N ("Calibrates for black and white level.");
--  pDesc->type = SANE_TYPE_BUTTON;
--  pDesc->cap = SANE_CAP_SOFT_SELECT;
--  pDesc->size = 0;
--  break;
--
- case optGroupMode:
-   pDesc->title = SANE_I18N ("Scan Mode");
-   pDesc->desc = "";
-@@ -1007,7 +964,6 @@
-   /* Get options of type SANE_Word */
- case optCount:
- case optDPI:
--case optGamma:
- case optTLX:
- case optTLY:
- case optBRX:
-@@ -1031,17 +987,6 @@
-   strcpy ((char *) pVal, modeList[s->aValues[optMode].w]);
-   break;
- 
--  /* Get options of type SANE_Bool */
--case optLamp:
--  GetLamp (&s->HWParams, &fLampIsOn);
--  *(SANE_Bool *) pVal = fLampIsOn;
--  break;
--
--case optCalibrate:
--  /*  although this option has nothing to read,
-- it's added here to avoid a warning when running scanimage --hel

<    1   2