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

2018-07-06 Thread Michał Górny
commit: 03f1470d007ba040bc5046ce855bdf43cae4703f
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul  7 05:17:09 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul  7 05:31:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f1470d

net-misc/miniupnpd: Bump to 2.1.20180706

 net-misc/miniupnpd/Manifest  |  1 +
 net-misc/miniupnpd/miniupnpd-2.1.20180706.ebuild | 62 
 2 files changed, 63 insertions(+)

diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 2455b87a7b0..4e106d645c2 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,3 +1,4 @@
 DIST miniupnpd-2.0.20180410.tar.gz 224736 BLAKE2B 
76bb4eba8cd3985ff46b1e46543018171a44cee636affb6db75c7b4bfcfa5ef19a678a23467280cf7d199b8fe332cfae6595848c4a2446da2095aecadb82d5f6
 SHA512 
4a3392b3883e72689e6160941b80533f7254dbaf54407fe2899caef8848d7dbe82ece6079fc39446c162053c1ea1dc10912af0a31d71eb16fbfbec0029dbc645
 DIST miniupnpd-2.0.20180422.tar.gz 224942 BLAKE2B 
62ec30de6d3551b9f31ed7eb81ceffaf75eeaa91236114f5532218d748e148574fdc195447beecc5cfd6898c2fe28f3e9bf15755979cf34633388194301a51dc
 SHA512 
338ebb03edfd9448a91277c3cc47843a45c1ee9d9e43ba52cd5f897cca8ddc5cbb53dd291056d30a906c68a5dfe0e5eb50169f7ffefab003fcf440de46b83f42
 DIST miniupnpd-2.0.20180503.tar.gz 225454 BLAKE2B 
d08c1fe050fce4a6f2348ff17f9d03feae04ca99a1b70fd7cc1734f56374f2be73708c5b495cf1a23ae76bd1f0042a90442793a87adb3ed9d0c49678dd8eb0b8
 SHA512 
7615f28d8e41bbe5b7343159a526ba33e643d14e2be7c2382461fda36ecfb3420ef2903e0cc9fa92ffe376f8609feb9403a316244eec0459e78a6b5ad96462ee
+DIST miniupnpd-2.1.20180706.tar.gz 233675 BLAKE2B 
641be6dc6a32383a02711139ac56236dc285041f2bda595a909ed5281a5163d1300212892e011f6256c6cf73b877f0e5e2e93efbfb08a77b0ae7d3dde94c28f6
 SHA512 
90881e08754f9fe3d1ef01da1fe437626d1fef09bea5eab9c1bcf3347e1197038ab87de8c7c454083ba90a86760230a323a6c293307b0fcecefbd5cfb658d227

diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20180706.ebuild 
b/net-misc/miniupnpd/miniupnpd-2.1.20180706.ebuild
new file mode 100644
index 000..9f786c4d43a
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20180706.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/;
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+   net-libs/libnfnetlink:=
+   net-libs/libmnl:=
+   dev-libs/gmp:0=
+   sys-apps/util-linux
+   dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+   sys-apps/lsb-release"
+
+src_prepare() {
+   default
+   mv Makefile.linux Makefile || die
+}
+
+src_configure() {
+   local -a opts
+   opts=(
+   --vendorcfg
+   $(usex igd2 '--igd2' '')
+   $(usex ipv6 '--ipv6' '')
+   $(usex leasefile '--leasefile' '')
+   $(usex portinuse '--portinuse' '')
+   $(usex pcp-peer '--pcp-peer' '')
+   $(usex strict '--strict' '')
+   )
+
+   emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+   # By default, it builds a bunch of unittests that are missing wrapper
+   # scripts in the tarball
+   emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+   emake PREFIX="${ED}" STRIP=true install
+
+   newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+   newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+pkg_postinst() {
+   elog "Please correct the external interface in the top of the two"
+   elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}



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

2018-07-06 Thread Michał Górny
commit: 4af57e212134c59874813b9f58176b65290782ec
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul  7 05:09:38 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul  7 05:31:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af57e21

dev-python/llvmlite: Bump to 0.24.0

 dev-python/llvmlite/Manifest   |  1 +
 dev-python/llvmlite/llvmlite-0.24.0.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 7c564533ece..35c7be317e9 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -4,3 +4,4 @@ DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 
8458037ca49c2c7035cc65539c1dc933f26c69
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 
1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a
 SHA512 
633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 DIST llvmlite-0.23.0.gh.tar.gz 167384 BLAKE2B 
f0f64f389004b8c07b40ad42bfe2aa10b06769c59c6ca84fd89c5c38e0f453bc079d435418fe19bdd5b97b9cac698eae5c537417bee181485390745b8d319fc8
 SHA512 
e4fa0096d73351a73b0509ca312dd79f8b4a50eeae03d7491761c68738e1c4f8204be1c2eefad71e10edfbcaef062dafa4270029e1b254febc580016aff2d3b9
 DIST llvmlite-0.23.2.gh.tar.gz 168206 BLAKE2B 
8ed2c2a84cdad80bcdba95e4e2d0f15b8c0a6cab2114b4c5f6eb32a303e29a9185629cf692acaec1455ac059227a755f621147397ece59343347434572186dff
 SHA512 
f5f0a27ff7d523d3ce9c183b60db1106ee89f2650dfaac9e745414dbf91e14cf3ba9056e694148d07f4caab4b9f9fdd1806aa67f580de1b8b317b906d2c4fe65
+DIST llvmlite-0.24.0.gh.tar.gz 169577 BLAKE2B 
7fedf8b9ec49f537db27a77c5880fb3bb41d126c615e73a4fd503ff781dcd4745c4f708cccd31d9b5544609ab7821e8ef1299856ef13ec3912ad2341af12a3ce
 SHA512 
14b8918f9f58a88596607e697212aa516a99c65f71257d22f09e6b735f517a38f11142a63bf2e8f117c6ceff97153a5e686fa322d62abd14000db7e9ae136900

diff --git a/dev-python/llvmlite/llvmlite-0.24.0.ebuild 
b/dev-python/llvmlite/llvmlite-0.24.0.ebuild
new file mode 100644
index 000..e7d50fc0b39
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.24.0.ebuild
@@ -0,0 +1,55 @@
+# 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 distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/;
+# upstream slacks in making pypi releases
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> 
${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=6
+
+RDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   >=sys-devel/llvm-6.0.0-r1:${LLVM_MAX_SLOT}
+   sys-libs/zlib:0=
+   virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+   "${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+   # disable -flto, we do not force it against user's wishes
+   # add -fPIC, needed to link against shared libraries
+   # plus use those vars to force our CXXFLAGS/LDFLAGS in...
+   export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
+   export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   "${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+   if use examples; then
+   insinto /usr/share/doc/${PF}
+   doins -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+}



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

2018-07-06 Thread Michał Górny
commit: aaaba1c9543a792731cab232a1cbf9125bd4e576
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul  7 05:17:34 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul  7 05:31:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaaba1c9

net-misc/miniupnpd: Clean old up

 net-misc/miniupnpd/Manifest  |  2 -
 net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild | 62 
 net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild | 62 
 3 files changed, 126 deletions(-)

diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 4e106d645c2..364e949bb86 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,4 +1,2 @@
-DIST miniupnpd-2.0.20180410.tar.gz 224736 BLAKE2B 
76bb4eba8cd3985ff46b1e46543018171a44cee636affb6db75c7b4bfcfa5ef19a678a23467280cf7d199b8fe332cfae6595848c4a2446da2095aecadb82d5f6
 SHA512 
4a3392b3883e72689e6160941b80533f7254dbaf54407fe2899caef8848d7dbe82ece6079fc39446c162053c1ea1dc10912af0a31d71eb16fbfbec0029dbc645
-DIST miniupnpd-2.0.20180422.tar.gz 224942 BLAKE2B 
62ec30de6d3551b9f31ed7eb81ceffaf75eeaa91236114f5532218d748e148574fdc195447beecc5cfd6898c2fe28f3e9bf15755979cf34633388194301a51dc
 SHA512 
338ebb03edfd9448a91277c3cc47843a45c1ee9d9e43ba52cd5f897cca8ddc5cbb53dd291056d30a906c68a5dfe0e5eb50169f7ffefab003fcf440de46b83f42
 DIST miniupnpd-2.0.20180503.tar.gz 225454 BLAKE2B 
d08c1fe050fce4a6f2348ff17f9d03feae04ca99a1b70fd7cc1734f56374f2be73708c5b495cf1a23ae76bd1f0042a90442793a87adb3ed9d0c49678dd8eb0b8
 SHA512 
7615f28d8e41bbe5b7343159a526ba33e643d14e2be7c2382461fda36ecfb3420ef2903e0cc9fa92ffe376f8609feb9403a316244eec0459e78a6b5ad96462ee
 DIST miniupnpd-2.1.20180706.tar.gz 233675 BLAKE2B 
641be6dc6a32383a02711139ac56236dc285041f2bda595a909ed5281a5163d1300212892e011f6256c6cf73b877f0e5e2e93efbfb08a77b0ae7d3dde94c28f6
 SHA512 
90881e08754f9fe3d1ef01da1fe437626d1fef09bea5eab9c1bcf3347e1197038ab87de8c7c454083ba90a86760230a323a6c293307b0fcecefbd5cfb658d227

diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild 
b/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild
deleted file mode 100644
index 9f786c4d43a..000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/;
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-   net-libs/libnfnetlink:=
-   net-libs/libmnl:=
-   dev-libs/gmp:0=
-   sys-apps/util-linux
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-   sys-apps/lsb-release"
-
-src_prepare() {
-   default
-   mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-   local -a opts
-   opts=(
-   --vendorcfg
-   $(usex igd2 '--igd2' '')
-   $(usex ipv6 '--ipv6' '')
-   $(usex leasefile '--leasefile' '')
-   $(usex portinuse '--portinuse' '')
-   $(usex pcp-peer '--pcp-peer' '')
-   $(usex strict '--strict' '')
-   )
-
-   emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-   # By default, it builds a bunch of unittests that are missing wrapper
-   # scripts in the tarball
-   emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-   emake PREFIX="${ED}" STRIP=true install
-
-   newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-   newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-   elog "Please correct the external interface in the top of the two"
-   elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}

diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild 
b/net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild
deleted file mode 100644
index 9f786c4d43a..000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/;
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-   net-libs/libnfnetlink:=
-   net-libs/libmnl:=
-   dev-libs/gmp:0=
-   sys-apps/util-linux
-   dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-   sys-apps/lsb-release"
-
-src_prepare() {
-   default
-   mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-   local -a opts
-   

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

2018-07-06 Thread Michał Górny
commit: 256385983cc170fb32a6b40d3e60843cb4afd653
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul  7 05:11:16 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul  7 05:31:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25638598

dev-python/llvmlite: Clean old up

 dev-python/llvmlite/Manifest   |  2 --
 dev-python/llvmlite/llvmlite-0.19.0.ebuild | 54 -
 dev-python/llvmlite/llvmlite-0.23.0.ebuild | 55 --
 3 files changed, 111 deletions(-)

diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 35c7be317e9..4903dcdf039 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,7 +1,5 @@
-DIST llvmlite-0.19.0.tar.gz 97109 BLAKE2B 
c4d22d130d12d7e61e9ddc177e28c6d8c3d0a1bffa0fcd672dd237260d80929c9ae0da428165f379c53276ed464b80f7cb9aec4abc4f66e105c7415db150edb0
 SHA512 
93551bbab519021abdc66ca099b9090b3af54b048adbce8d16f3700c066bbc4f5c24e5234a8a1ac4bfcdf8bf74d0ac52bb7023251ac948af6ef99fbd5a5324c8
 DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B 
ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e
 SHA512 
c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
 DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 
8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183
 SHA512 
25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 
1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a
 SHA512 
633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
-DIST llvmlite-0.23.0.gh.tar.gz 167384 BLAKE2B 
f0f64f389004b8c07b40ad42bfe2aa10b06769c59c6ca84fd89c5c38e0f453bc079d435418fe19bdd5b97b9cac698eae5c537417bee181485390745b8d319fc8
 SHA512 
e4fa0096d73351a73b0509ca312dd79f8b4a50eeae03d7491761c68738e1c4f8204be1c2eefad71e10edfbcaef062dafa4270029e1b254febc580016aff2d3b9
 DIST llvmlite-0.23.2.gh.tar.gz 168206 BLAKE2B 
8ed2c2a84cdad80bcdba95e4e2d0f15b8c0a6cab2114b4c5f6eb32a303e29a9185629cf692acaec1455ac059227a755f621147397ece59343347434572186dff
 SHA512 
f5f0a27ff7d523d3ce9c183b60db1106ee89f2650dfaac9e745414dbf91e14cf3ba9056e694148d07f4caab4b9f9fdd1806aa67f580de1b8b317b906d2c4fe65
 DIST llvmlite-0.24.0.gh.tar.gz 169577 BLAKE2B 
7fedf8b9ec49f537db27a77c5880fb3bb41d126c615e73a4fd503ff781dcd4745c4f708cccd31d9b5544609ab7821e8ef1299856ef13ec3912ad2341af12a3ce
 SHA512 
14b8918f9f58a88596607e697212aa516a99c65f71257d22f09e6b735f517a38f11142a63bf2e8f117c6ceff97153a5e686fa322d62abd14000db7e9ae136900

diff --git a/dev-python/llvmlite/llvmlite-0.19.0.ebuild 
b/dev-python/llvmlite/llvmlite-0.19.0.ebuild
deleted file mode 100644
index 1f4d10f64b1..000
--- a/dev-python/llvmlite/llvmlite-0.19.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 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 distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=4
-
-RDEPEND="
-   dev-python/six[${PYTHON_USEDEP}]
-   sys-devel/llvm:${LLVM_MAX_SLOT}
-   sys-libs/zlib:0=
-   virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-   "${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
-   # disable -flto, we do not force it against user's wishes
-   # add -fPIC, needed to link against shared libraries
-   # plus use those vars to force our CXXFLAGS/LDFLAGS in...
-   export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
-   export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   "${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-   distutils-r1_python_install_all
-   if use examples; then
-   insinto /usr/share/doc/${PF}
-   doins -r examples
-   docompress -x /usr/share/doc/${PF}/examples
-   fi
-}

diff --git a/dev-python/llvmlite/llvmlite-0.23.0.ebuild 
b/dev-python/llvmlite/llvmlite-0.23.0.ebuild
deleted file mode 100644
index e7d50fc0b39..000
--- a/dev-python/llvmlite/llvmlite-0.23.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the 

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: c63848f59c5f960c3e7cd82ed1f5ff1efe2870ba
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 15:25:13 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:12 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=c63848f5

gkeys actionbase.py: Update _set_category for the new keyrings config

All keyings locations can be set individually now

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actionbase.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py
index 23b7161..737c9d6 100644
--- a/gkeys/gkeys/actionbase.py
+++ b/gkeys/gkeys/actionbase.py
@@ -80,13 +80,12 @@ class ActionBase(object):
 
 
 def _set_category(self, cat):
-keyring = self.config.get_key('keyring')
-if not keyring:
+catdir = self.config.get_key('keyrings', cat)
+if not catdir:
 raise Exception("No keyring set.")
 if not cat:
 raise Exception("No category set.")
 self.category = cat
-catdir = os.path.join(keyring, cat)
 self.logger.debug(_unicode("ACTIONS: _set_category; catdir = %s") % 
catdir)
 self._set_trust(cat)
 return catdir



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-gen/gkeygen/

2018-07-06 Thread Brian Dolbec
commit: 81556928866bbd0df549f615a0813bfcb648
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jul  3 07:12:08 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:12 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=81556928

gkeysgen/actions.py: Use gkeys py_input and _unicode declarations

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys-gen/gkeygen/actions.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gkeys-gen/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py
index bd4a6ef..fc7a801 100644
--- a/gkeys-gen/gkeygen/actions.py
+++ b/gkeys-gen/gkeygen/actions.py
@@ -19,13 +19,13 @@ from collections import OrderedDict
 
 if sys.version_info[0] >= 3:
 from urllib.request import urlopen
-py_input = input
-_unicode = str
 else:
 from urllib2 import urlopen
-py_input = raw_input
-_unicode = unicode
 
+from gkeys import (
+py_input,
+_unicode,
+)
 from gkeys.fileops import ensure_dirs
 from gkeys import log
 
@@ -140,7 +140,7 @@ class Actions(object):
 shutil.copy(skelconfpath, newgpgconfpath)
 with open(newgpgconfpath, 'a') as conf:
 for line in urlopen(self.config.get_key('gpg-urls', args.spec)):
-conf.write(_unicode(line.decode('utf-8'))) 
+conf.write(_unicode(line.decode('utf-8')))
 
 
 def genkey(self, args):



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

2018-07-06 Thread Brian Dolbec
commit: 0cef7485299fc61aea928eeb669fcfb7cbaa55fb
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jul  4 23:49:47 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:14 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=0cef7485

gkeys-ldap updateseeds.sh: Shellcheck cleanup

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys-ldap/bin/update-seeds.sh | 52 +-
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index a2e0f87..a29de66 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: update-seeds.sh,v 0.2.1 2014/10/12 dolsen Exp $
 
 FORCE=${1}
@@ -6,22 +6,22 @@ HAS_UPDATES=false
 
 # configuration to run from a checkout with a custom config
 cwd=$(pwd)
-source ${cwd}/update-seeds.conf
-source ${cwd}/testpath
+source "${cwd}/update-seeds.conf"
+source "${cwd}/testpath"
 
 die(){ echo "$@" 1>&2; exit 1; }
 success(){ echo "$@"; exit 0; }
 
 clone_api(){
-local target=dirname ${API_DIR}
-cd target
-git clone ${API_URL}
+local target=dirname "${API_DIR}"
+cd target || die " *** Failed to change directory... exiting"
+git clone "${API_URL}"
 }
 
 clone_gkey_seeds(){
-local target=dirname ${GKEY_SEEDS_DIR}
-cd target
-git clone ${GKEY_SEEDS_URL}
+local target=dirname "${GKEY_SEEDS_DIR}"
+cd target || die " *** Failed to change directory... exiting"
+git clone "${GKEY_SEEDS_URL}"
 }
 
 # start update process
@@ -29,56 +29,56 @@ echo "Beginning seed file update"
 
 echo " *** updating gkey-seeds repo"
 # update api checkout
-if [[ ! -d ${GKEY_SEEDS_DIR} ]]; then
+if [[ ! -d "${GKEY_SEEDS_DIR}" ]]; then
 clone_gkey_seeds
 else
-cd ${GKEY_SEEDS_DIR} && git pull
+cd "${GKEY_SEEDS_DIR}" && git pull
 fi
 
 echo " *** updating api.gentoo.org repo"
 # update api checkout
-if [[ ! -d ${API_DIR} ]]; then
+if [[ ! -d "${API_DIR}" ]]; then
 clone_api
 else
-cd ${API_DIR} && git pull
+cd "${API_DIR}" && git pull
 fi
 
 echo " *** Fetching new seeds from LDAP"
-cd ${GKEYS_DIR}
+cd "${GKEYS_DIR}" || die " *** Failed to change directory... exiting"
 gkeys-ldap update-seeds -C gentoo-devs || die "Seed file generation failed... 
aborting"
 
 echo " *** Checking if seed files are up-to-date"
-if ! diff -q ${GKEYS_DIR}/${GKEYS_SEEDS} ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} > 
/dev/null ;then
+if ! diff -q "${GKEYS_DIR}/${GKEYS_SEEDS}" "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" > 
/dev/null ;then
 HAS_UPDATES=true
 fi
-if [[ "${FORCE}" == "force" || ${HAS_UPDATES} ]] ; then
+if [[ "${FORCE}" == "force" || "${HAS_UPDATES}" ]] ; then
 echo " *** Spotted differences"
 echo " *** Updating old seeds with a new one"
 # copy seeds to gkey-seeds
 echo "  ... cp ${GKEYS_SEEDS} ${API_DIR}/${API_SEEDS}"
-cp ${GKEYS_SEEDS} ${GKEY_SEEDS_DIR}/${GKEY_SEEDS}
+cp "${GKEYS_SEEDS}" "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}"
 else
 success " *** No changes detected"
 exit 0
 fi
 
 echo "Signing new developers.seeds file"
-gkeys sign -n ${GKEYS_SIGN} -F ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} || die " *** 
Signing failed... exiting"
+gkeys sign -n "${GKEYS_SIGN}" -F "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" || die " 
*** Signing failed... exiting"
 
 echo "Committing changes to gkey-seeds repo..."
-cd ${GKEY_SEEDS_DIR}
-git add ${GKEY_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
-git add ${GKEY_SEEDS}.${GKEYS_SIG} || die " *** Failed to add 
${GKEYS_SEEDS}.sig file"
+cd "${GKEY_SEEDS_DIR}" || die " *** Failed to change directory... exiting"
+git add "${GKEY_SEEDS}"  || die " *** Failed to add modified ${GKEYS_SEEDS} 
file"
+git add "${GKEY_SEEDS}.${GKEYS_SIG}" || die " *** Failed to add 
${GKEYS_SEEDS}.sig file"
 git commit -S -m"${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 cd ..
 
 echo "Committing changes to api repo..."
-cp ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} ${API_DIR}/${API_SEEDS} || die " *** Failed 
to copy modified ${GKEYS_SEEDS} file"
-cp ${GKEY_SEEDS_DIR}/${GKEY_SEEDS}.${GKEYS_SIG} 
${API_DIR}/${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to copy modified 
${GKEYS_SEEDS}.${GKEYS_SIG} file"
-cd ${API_DIR}
-git add ${API_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
-git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add 
${GKEYS_SEEDS}.sig file"
+cp "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}" "${API_DIR}/${API_SEEDS}" || die " *** 
Failed to copy modified ${GKEYS_SEEDS} file"
+cp "${GKEY_SEEDS_DIR}/${GKEY_SEEDS}.${GKEYS_SIG}" 
"${API_DIR}/${API_SEEDS}.${GKEYS_SIG}" || die " *** Failed to copy modified 
${GKEYS_SEEDS}.${GKEYS_SIG} file"
+cd "${API_DIR}" || die " *** Failed to change directory... exiting"
+git add "${API_SEEDS}"  || die " *** Failed to add modified ${GKEYS_SEEDS} 
file"
+git add 

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 9aae3603e6785ac216e97c867c09980eefedd7b6
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 20:02:29 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:14 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=9aae3603

gkeys: Update version and authors

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkeys/gkeys/__init__.py b/gkeys/gkeys/__init__.py
index a1e901c..dc19604 100644
--- a/gkeys/gkeys/__init__.py
+++ b/gkeys/gkeys/__init__.py
@@ -9,7 +9,7 @@ from collections import OrderedDict
 from gkeys.action_map import Action_Map, Available_Actions
 
 
-__version__ = '0.2'
+__version__ = '0.3'
 __license__ = 'GPLv2'
 
 if sys.version_info[0] >= 3:
@@ -32,5 +32,5 @@ the GPG keys used for validation on users and Gentoo's 
infrastracutre servers.
 Gentoo Keys is able to verify GPG keys used for Gentoo's release media,
 such as installation CD's, Live DVD's, packages and other GPG signed 
documents.''',
 'sub-cmds': subdata,
-'authors': ['Brian Dolbec ', 'Pavlos Ratis 
'],
+'authors': ['Brian Dolbec ', 'Pavlos Ratis 
', 'aeroniero33 '],
 }



[gentoo-commits] proj/gentoo-keys:master commit in: py2man/

2018-07-06 Thread Brian Dolbec
commit: 46f9dd411d23d4d50f2ad40d58b937cb5ffaec35
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 19:55:43 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:14 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=46f9dd41

gkeys py2man: Add email option

Signed-off-by: Brian Dolbec  gentoo.org>

 py2man/options.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py2man/options.py b/py2man/options.py
index 61a6230..e0ccd81 100644
--- a/py2man/options.py
+++ b/py2man/options.py
@@ -28,6 +28,8 @@ The path to an alternate config file''',
 The logging level to set for the logfile''',
 'dest': '''.IP "-d \\fIDESTINATION\\fR, --dest \\fIDESTINATION"
 The category name of the seed file being added to.''',
+'email': '''.IP "-E \\fIEMAIL\\fR, --email \\fIEMAIL"
+Email parameter for sending email reminders.''',
 'exact': '''.IP "-e, --exact"
 Use CASE matching in searches''',
 'file': '''.IP "-F \\fIFILENAME\\fR, --file \\fIFILENAME"
@@ -77,6 +79,7 @@ SHORT_OPTS = OrderedDict({
 'cleanseed': '[\\fB\\-\\-cleanseed\\fR]',
 'dest': '[\\fB\\-d\\fR \\fIDESTINATION\\fR]',
 'exact': '[\\fB\\-e\\fR]',
+'email': '[\\fB\\-E\\fR]',
 'file': '[\\fB\\-F\\fR \\fIFILENAME\\fR]',
 '1file': '[\\fB\\-F\\fR \\fIFILENAME\\fR]',
 'fingerprint': '[\\fB\\-f\\fR \\fIFINGERPRINT\\fR [\\fIFINGERPRINT\\fR 
...]]',



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 57fc6696d44df48c6a72fd0c1e08741e11f048e8
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 15:28:24 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:13 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=57fc6696

gkeys keyhandler: Additional debug logging

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/keyhandler.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gkeys/gkeys/keyhandler.py b/gkeys/gkeys/keyhandler.py
index 0a02c22..06f4b86 100644
--- a/gkeys/gkeys/keyhandler.py
+++ b/gkeys/gkeys/keyhandler.py
@@ -75,10 +75,11 @@ class KeyHandler(object):
 
 
 def determine_keys(self, args, default_cat=None):
+self.logger.debug(_unicode("KeyHandler: determine_keys; args.category 
= %s"), args.category or default_cat)
 seeds = self.seedhandler.load_category(args.category or default_cat)
 keyring = self.config.get_key('keyring')
 catdir = os.path.join(keyring, args.category)
-self.logger.debug(_unicode("KeyHandler: determine_keys; catdir = %s") 
% catdir)
+self.logger.debug(_unicode("KeyHandler: determine_keys; catdir = %s"), 
catdir)
 kwargs = self.seedhandler.build_gkeydict(args)
 return (catdir, seeds.list(**kwargs))
 
@@ -88,10 +89,12 @@ class KeyHandler(object):
 results = {}
 search_args = [x for x in KEY_OPTIONS if getattr(args, x)]
 if args.category:
+self.logger.debug(_unicode("KeyHandler: key_search; args.category 
= %s"), args.category)
 self.seedhandler.load_category(args.category)
 results[args.category] = self.seedhandler.key_search(args, 
search_args)
 else:
 for cat in sorted(self.config.get_key('seeds')):
+self.logger.debug(_unicode("KeyHandler: key_search; cat = 
%s"), cat)
 self.seedhandler.load_category(cat)
 found = self.seedhandler.key_search(args, search_args)
 if found:



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 8482e689c5000493655cfbdfc38d90b389319dc2
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 15:25:56 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:12 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=8482e689

gkeys actions.py: Additional debug logging

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actions.py | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index f9bba7a..e480613 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -284,6 +284,7 @@ class Actions(ActionBase):
 kwargs = self.seedhandler.build_gkeydict(args)
 keyresults = seeds.list(**kwargs)
 for key in sorted(keyresults):
+self.logger.debug("ACTIONS: listkey; key/keydir:" + 
str(key.keydir))
 if args.fingerprint:
 result = self.gpg.list_keys(key.keydir, kwargs['fingerprint'])
 else:
@@ -775,6 +776,7 @@ class Actions(ActionBase):
 self.logger.debug(_unicode(
 "ACTIONS: verify; keyring category not specified, using 
default: %s")
 % args.category)
+self.logger.debug(_unicode("ACTIONS: verify; keyring category: %s"), 
args.category)
 keys = self.seedhandler.load_category(args.category)
 if not keys:
 return (False, ['No installed keys found, try installkey action.'])
@@ -788,6 +790,7 @@ class Actions(ActionBase):
 args.nick = self.config.get_key('verify-nick')
 messages.append(_unicode("Using config defaults..: %s %s")
 % (args.category, args.nick))
+self.logger.debug(_unicode("ACTIONS: verify; going recursive... 
%s, %s"), args.category, args.nick)
 self.verify_recursion = True
 return self.verify(args, messages)
 elif self.verify_recursion:
@@ -808,6 +811,7 @@ class Actions(ActionBase):
 timestamp_path = None
 isurl = success = verified = False
 if filepath.startswith('http'):
+self.logger.debug(_unicode("ACTIONS: _verify; supplied url, using 
current directory ./%s"), filepath)
 isurl = True
 url = filepath
 filepath = args.destination
@@ -824,6 +828,8 @@ class Actions(ActionBase):
 else:
 climit = 0
 sig_path = None
+get_sig = signature is not None
+self.logger.debug(_unicode("ACTIONS: _verify; supplied signature %s"), 
signature)
 if isurl:
 fetcher = Fetch(self.logger)
 success, msgs = fetcher.fetch_url(url, filepath, signature, 
timestamp_path=timestamp_path,
@@ -851,7 +857,7 @@ class Actions(ActionBase):
 sig_path = None
 elif signature:
 sig_path = os.path.abspath(signature)
-self.logger.info("Verifying file...")
+self.logger.info("Verifying file... %s, %s, %s", key, sig_path, 
filepath)
 verified = False
 results = self.gpg.verify_file(key, sig_path, filepath)
 keyid = key.keyid[0]



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 8c0866aa69f3b0c600d1f2f9ad7942f563409f4a
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 18:50:41 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:14 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=8c0866aa

gkeys actions.py: Exit smoothly if fetch failed to get a new file

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actions.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index fd92a77..539ff26 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -834,6 +834,9 @@ class Actions(ActionBase):
   climit=climit)
 sig_path = fetcher.sig_path
 messages.extend(msgs)
+if not success:
+self.logger.debug(_unicode("ACTIONS: _verify; File not 
downloaded, exiting... %s"), filepath)
+return (False, messages)
 elif signature is not None and os.path.exists(signature):
 sig_path = signature
 else:



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

2018-07-06 Thread Brian Dolbec
commit: 3fb36c4ca353adffd39f40cda2e16969e099c3c1
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jul  4 15:11:06 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:14 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=3fb36c4c

gkeys-ldap updateseeds.sh: Add a force override option

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys-ldap/bin/update-seeds.sh | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index d241cda..a2e0f87 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 # $Id: update-seeds.sh,v 0.2.1 2014/10/12 dolsen Exp $
 
+FORCE=${1}
+HAS_UPDATES=false
+
 # configuration to run from a checkout with a custom config
 cwd=$(pwd)
 source ${cwd}/update-seeds.conf
@@ -46,6 +49,9 @@ gkeys-ldap update-seeds -C gentoo-devs || die "Seed file 
generation failed... ab
 
 echo " *** Checking if seed files are up-to-date"
 if ! diff -q ${GKEYS_DIR}/${GKEYS_SEEDS} ${GKEY_SEEDS_DIR}/${GKEY_SEEDS} > 
/dev/null ;then
+HAS_UPDATES=true
+fi
+if [[ "${FORCE}" == "force" || ${HAS_UPDATES} ]] ; then
 echo " *** Spotted differences"
 echo " *** Updating old seeds with a new one"
 # copy seeds to gkey-seeds



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 653d1b0c231ee789a294d040a67cef141bb11cc0
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 17:51:36 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:13 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=653d1b0c

gkeys seedhandler.py: Simplify code, let verify() handle fetching

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/seedhandler.py | 68 --
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py
index cb082ef..a7bfbaa 100644
--- a/gkeys/gkeys/seedhandler.py
+++ b/gkeys/gkeys/seedhandler.py
@@ -24,6 +24,7 @@ demandload(
 "json:load",
 "gkeys.exception:UpdateDbError",
 "gkeys.fileops:ensure_dirs",
+"gkeys.fileops:updateseeds",
 "gkeys.fetch:Fetch",
 "sslfetch.connections:get_timestamp",
 )
@@ -170,9 +171,10 @@ class SeedHandler(object):
 if category == 'sign':
 catdir = self.config.get_key('sign-keydir')
 else:
-keyrings = self.config.get_key('keyring')
-catdir = os.path.join(keyrings, category)
-self.logger.debug("SeedHandler: load_category; catdir = %s" % catdir)
+#keyrings = self.config.get_key('keyring')
+#catdir = os.path.join(keyrings, category)
+catdir = self.config.get_key('keyrings', category)
+self.logger.debug("SeedHandler: load_category; catdir = %s", catdir)
 try:
 if not nicks:
 nicks = os.listdir(catdir)
@@ -185,11 +187,14 @@ class SeedHandler(object):
 try:
 with open(gkey_path, 'r') as fileseed:
 seed = load(fileseed)
+self.logger.debug("SeedHandler: load_category; loaded seed 
file %s.",
+  gkey_path)
 except IOError as error:
-self.logger.debug("SeedHandler: load_category; IOError 
loading seed file %s."
-  % gkey_path)
+self.logger.debug("SeedHandler: load_category; IOError 
loading seed file %s.",
+  gkey_path)
 self.logger.debug("Error was: %s" % str(error))
 if seed:
+self.logger.debug("SeedHandler: load_category; processing 
seeds: %s", seed)
 for nick in sorted(seed):
 key = seed[nick]
 # GKEY class change auto-update
@@ -206,6 +211,7 @@ class SeedHandler(object):
 self.logger.debug("SeedHandler: load_category; OSError for %s" % 
catdir)
 self.logger.exception("Error was: %s" % str(error))
 self.seeds = seeds
+self.logger.debug("SeedHandler: load_category; seeds loaded: %s", 
seeds)
 return seeds
 
 def fetch_seeds(self, seeds, args, verified_dl=None):
@@ -231,44 +237,40 @@ class SeedHandler(object):
 except KeyError:
 pass
 succeeded = []
-seedsdir = os.path.join(self.config.get_key('seedsdir'))
+seedsdir = os.path.dirname(self.config.get_key('seeds', seeds))
 updatedir = os.path.join(seedsdir, "__updates__")
 mode = int(self.config.get_key('permissions', 'directories'),0)
 ensure_dirs(updatedir, mode=mode)
 self.update_lock = LockDir(updatedir)
 self.update_lock.write_lock()
-fetcher = Fetch(self.logger)
 for (seed, url, filepath) in urls:
 tmppath = os.path.join(updatedir, os.path.split(filepath)[-1])
 # use the real timestamp file for the dl timestamp
 tpath = filepath + ".timestamp"
-# verify the re-fetch cycle timer
-if fetcher.verify_cycle(tpath, climit=60):
-timestamp = get_timestamp(filepath + ".timestamp")
-success, msgs = fetcher.fetch_url(url, tmppath, 
timestamp=timestamp)
-messages.extend(msgs)
-if success:
-verify_info = self.config.get_key('verify-seeds', 
seed).split()
-args.category = verify_info[0]
-args.nick = verify_info[1]
-args.filename = url
-args.signature = tmppath + ".timestamp"
-#args.timestamp = True
-args.destination = tmppath
-verified, messages_ = verified_dl(args)
-messages.append(messages_)
-if verified and not args.fetchonly:
-self.seedsdir_lock = LockDir(seedsdir)
-if updateseeds(tmppath, filepath) and 
updateseeds(args.signature, tpath):
-self.logger.info("Updated seed file...: %s ... OK" % 
(filepath))
-succeeded.append(verified)
-else:
-  

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 5ac5f27889115cd48e89e910a3d12380367cccb6
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Dec 24 09:11:08 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:10 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=5ac5f278

gkeys base.py: Remove the auto-update code from run()

This code was causing the fetch-seed action to fail with empty urls to connect 
to.
This code should also not be running directly from the CliBase class.
I'll move this code to the actions or lib class, to be determined later.

 gkeys/gkeys/base.py | 58 -
 1 file changed, 58 deletions(-)

diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 3ecbd1b..a67b330 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -358,7 +358,6 @@ class CliBase(object):
 return False
 return True
 
-
 def run(self, args):
 '''Run the action selected
 
@@ -366,63 +365,6 @@ class CliBase(object):
 '''
 # establish our actions instance
 self.actions = self.cli_config['Actions'](self.config, 
self.output_results, self.logger)
-# check for seed update
-from sslfetch.connections import Connector
-connector_output = {
- 'info': self.logger.info,
- 'debug': self.logger.debug,
- 'error': self.logger.error,
- 'exception': self.logger.exception,
- 'warning': self.warning_output,
- 'kwargs-info': {},
- 'kwargs-debug': {},
- 'kwargs-error': {},
- 'kwargs-exception': {},
- 'kwargs-warning': {},
-}
-fetcher = Connector(connector_output, None, "Gentoo Keys")
-successes = []
-up_to_date = True
-categories = list(self.config.defaults['seeds'])
-'''Attemp to download seed and seed.sig files for each available 
category'''
-for category in categories:
-filepath = self.config.defaults['seedsdir'] + "/" + category + 
".seeds"
-timestamp_path = filepath + ".timestamp"
-url = self.config.defaults['seedurls'][category]
-success, signedfile, timestamp = fetcher.fetch_file(
-url, filepath, timestamp_path)
-if timestamp != "":
-up_to_date = False
-successes.append(success)
-url += ".sig"
-filepath += ".sig"
-success, signedfile, timestamp = fetcher.fetch_file(
-url, filepath, timestamp_path)
-if timestamp != "":
-up_to_date = False
-successes.append(success)
-if False not in successes and not up_to_date:
-print("Seeds need to be updated")
-ack = None
-while ack not in ("y", "yes", "n", "no"):
-ack = py_input("Would you like to update the seeds now? (y/n) 
").lower()
-if ack in ("y", "yes"):
-custom_args = copy.copy(args)
-for attr in GKEY._fields:
-if attr != "debug":
-custom_args.attr = None
-custom_args.category = None
-custom_args.action = "update-seed"
-print("Updating seeds")
-self.run(custom_args)
-elif False not in successes:
-print("Seeds are up to date")
-else:
-<<< HEAD
-print("Seed update check failed, check your internet connection.")
-===
-print("Seed update check failed, check your internet connection.")
->>> b9e64a9... gkeys actions: Added automatic seeds,keys update capability
 # run the action
 func = getattr(self.actions, '%s'
 % self.cli_config['Action_Map'][args.action]['func'])



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: a7e1d29148a3e2a2718db101797383b79f2adda6
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 15:29:01 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:13 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=a7e1d291

gkeys log.py: Reduce the frequency of new log files, add a timestamp  message

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/log.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkeys/gkeys/log.py b/gkeys/gkeys/log.py
index 4ea5cb1..6916d97 100644
--- a/gkeys/gkeys/log.py
+++ b/gkeys/gkeys/log.py
@@ -51,7 +51,7 @@ def set_logger(namespace=None, logpath='', level=None,
 ensure_dirs(logpath, mode=dirmode, fatal=True)
 os.umask(filemask)
 logname = os.path.join(logpath,
-'%s-%s.log' % (namespace, time.strftime('%Y%m%d-%H:%M')))
+'%s-%s.log' % (namespace, time.strftime('%Y%m%d-%H')))
 file_handler = logging.FileHandler(logname)
 if level:
 file_handler.setLevel(log_levels[level])
@@ -66,7 +66,7 @@ def set_logger(namespace=None, logpath='', level=None,
 #Console_handler.setFormatter(formatter)
 logger.addHandler(Console_handler)
 #print "File logger suppose to be initialized", logger, Console_handler
-logger.debug("Loggers initialized")
+logger.debug(" Loggers initialized  time: %s", 
time.strftime('%Y%m%d-%H:%M:%S') )
 
 return logger
 



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: d2b30942d665fd5a79cef5a933904824273928e7
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 17:49:59 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:13 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=d2b30942

gkeys actions.py: Assign sig_path from fetcher

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 2fe29fb..fd92a77 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -832,6 +832,7 @@ class Actions(ActionBase):
 fetcher = Fetch(self.logger)
 success, msgs = fetcher.fetch_url(url, filepath, signature, 
timestamp_path=timestamp_path,
   climit=climit)
+sig_path = fetcher.sig_path
 messages.extend(msgs)
 elif signature is not None and os.path.exists(signature):
 sig_path = signature



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 0a745d03d5dbfd1b6e31db92a5ce55aa33084c7a
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:40:21 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=0a745d03

gkeys/utils.py: Add get_ack function

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/utils.py | 9 +
 1 file changed, 9 insertions(+)

diff --git a/gkeys/gkeys/utils.py b/gkeys/gkeys/utils.py
index 64f11aa..f08acc1 100644
--- a/gkeys/gkeys/utils.py
+++ b/gkeys/gkeys/utils.py
@@ -39,6 +39,8 @@ try:
 except AttributeError:
 StringTypes = [str]
 
+Y_N = ("y", "yes", "n", "no")
+
 
 def encoder(text, _encoding_):
 return codecs.encode(text, _encoding_, 'replace')
@@ -161,6 +163,13 @@ def path(path_elements):
 return pathname
 
 
+def get_ack(prompt_msg, accepted=Y_N):
+ack = None
+while ack not in accepted:
+ack = py_input(prompt_msg).lower()
+return ack
+
+
 if __name__ == '__main__':
 import doctest
 doctest.testmod(sys.modules[__name__])



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 691285b64caf4497d693462751d81a74934b36a1
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:52:17 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=691285b6

gkeys/fetch.py: New Fetch class

Add sig_path assignment, makes the sig_path available to class instance holders 
like _verify()
Use the lack of a returned timestamp to abort the process
If the main file is not downloaded, then don't bother looking for a signature.
This allows a verify action to exit smoothly.
There is a message about the reason for not downloading, so is not hidden.

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/fetch.py | 63 
 1 file changed, 63 insertions(+)

diff --git a/gkeys/gkeys/fetch.py b/gkeys/gkeys/fetch.py
new file mode 100644
index 000..365124a
--- /dev/null
+++ b/gkeys/gkeys/fetch.py
@@ -0,0 +1,63 @@
+
+from sslfetch.connections import Connector, get_timestamp
+from gkeys import _unicode
+
+EXTENSIONS = ['.sig', '.asc', '.gpg','.gpgsig']
+
+
+class Fetch(object):
+
+def __init__(self, logger):
+self.logger = logger
+connector_output = {
+ 'info': self.logger.info,
+ 'debug': self.logger.debug,
+ 'error': self.logger.error,
+ 'exception': self.logger.exception,
+ # we want any warnings to be printed to the terminal
+ # so assign it to logging.error
+ 'warning': self.logger.error,
+ 'kwargs-info': {},
+ 'kwargs-debug': {},
+ 'kwargs-error': {},
+ 'kwargs-exception': {},
+ 'kwargs-warning': {},
+}
+self.fetcher = Connector(connector_output, None, "Gentoo Keys")
+self.sig_path = None
+
+def fetch_url(self, url, filepath, signature=True, timestamp=None, 
timestamp_path=None, climit=60):
+if not timestamp_path:
+timestamp_path = filepath + ".timestamp"
+messages = []
+self.logger.debug(
+_unicode("FETCH: fetching %s signed file ") % filepath)
+self.logger.debug(
+_unicode("FETCH: timestamp path: %s") % timestamp_path)
+success, signedfile, timestamp = self.fetcher.fetch_file(
+url, filepath, timestamp_path, climit=climit, timestamp=timestamp)
+if timestamp is '':
+self.logger.debug("Fetch.fetch_url; file not downloaded")
+return (False, messages)
+elif not success:
+messages.append(_unicode("File %s cannot be retrieved.") % 
filepath)
+elif '.' + url.rsplit('.', 1)[1] not in EXTENSIONS:
+self.logger.debug("File %s successfully retrieved.", filepath)
+if signature:
+success_fetch = False
+for ext in EXTENSIONS:
+sig_path = filepath + ext
+signature = url + ext
+self.logger.debug(
+_unicode("FETCH: fetching %s signature ")
+% signature)
+success_fetch, sig, timestamp = 
self.fetcher.fetch_file(signature, sig_path)
+if success_fetch:
+self.sig_path = sig_path
+break
+else:
+signature = None
+return (success, messages)
+
+def verify_cycle(self, tpath, climit=60):
+return self.fetcher.verify_cycle(tpath, climit=60)



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: eed71e755fca18ebc271b3a3b72e70c0822f55d2
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:57:23 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:12 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=eed71e75

gkeys: Implement use of the new Fetch class

Signed-off-by: Brian Dolbec  gentoo.org>

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actions.py | 51 +---
 gkeys/gkeys/base.py|  6 +
 gkeys/gkeys/seedhandler.py | 64 ++
 3 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 64d6123..0f03880 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -29,6 +29,7 @@ from snakeoil.demandload import demandload
 
 demandload(
 "gkeys.base:Args",
+"gkeys.fetch:Fetch",
 "json:load",
 )
 
@@ -718,9 +719,7 @@ class Actions(ActionBase):
 
 def installed(self, args):
 '''Lists the installed key directories'''
-if args.category:
-keyring = self.config.get_key('keyring')
-else:
+if not args.category:
 return (False, ["Please specify a category."])
 catdir = self._set_category(args.category)
 self.logger.debug("ACTIONS: installed; catdir = %s" % catdir)
@@ -818,45 +817,10 @@ class Actions(ActionBase):
 climit = 0
 sig_path = None
 if isurl:
-from sslfetch.connections import Connector
-connector_output = {
- 'info': self.logger.info,
- 'debug': self.logger.debug,
- 'error': self.logger.error,
- 'exception': self.logger.exception,
- # we want any warnings to be printed to the terminal
- # so assign it to logging.error
- 'warning': self.logger.error,
- 'kwargs-info': {},
- 'kwargs-debug': {},
- 'kwargs-error': {},
- 'kwargs-exception': {},
- 'kwargs-warning': {},
-}
-fetcher = Connector(connector_output, None, "Gentoo Keys")
-self.logger.debug(
-_unicode("ACTIONS: verify; fetching %s signed file ") % 
filepath)
-self.logger.debug(
-_unicode("ACTIONS: verify; timestamp path: %s") % 
timestamp_path)
-success, signedfile, timestamp = fetcher.fetch_file(
-url, filepath, timestamp_path, climit=climit)
-if not success:
-messages.append(_unicode("File %s cannot be retrieved.") % 
filepath)
-elif '.' + url.rsplit('.', 1)[1] not in EXTENSIONS:
-if not signature:
-success_fetch = False
-for ext in EXTENSIONS:
-sig_path = filepath + ext
-if isurl:
-signature = url + ext
-self.logger.debug(
-_unicode("ACTIONS: verify; fetching %s 
signature ")
-% signature)
-success_fetch, sig, timestamp = 
fetcher.fetch_file(signature, sig_path)
-if success_fetch:
-break
-else:
-signature = None
+fetcher = Fetch(self.logger)
+success, msgs = fetcher.fetch_url(url, filepath, signature, 
timestamp_path=timestamp_path,
+  climit=climit)
+messages.extend(msgs)
 elif signature is not None and os.path.exists(signature):
 sig_path = signature
 else:
@@ -864,9 +828,8 @@ class Actions(ActionBase):
 self.logger.debug(
 _unicode("ACTIONS: verify; local file %s") % filepath)
 success = os.path.isfile(filepath)
-if (not signature
+if (success and not signature
 and '.' + filepath.rsplit('.', 1)[-1] not in EXTENSIONS):
-success_fetch = False
 for ext in EXTENSIONS:
 sig_path = filepath + ext
 sig_path = os.path.abspath(sig_path)

diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index a67b330..2de1493 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -130,6 +130,12 @@ class CliBase(object):
 action='store_true', default=False,
 help='Use CASE matching in searches')
 
+@staticmethod
+def _option_fetcthonly(parser=None):
+parser.add_argument('--fetchonly',
+dest='fetchonly', default=False,
+help="Only fetch the seed file if there is an update or doesn't 
exist locally")
+
 @staticmethod
 def _option_file(parser=None):
 

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 33625064ee63796b6b02ca9f200d3d4ff1707ff9
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 15:31:20 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:13 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=33625064

gkeys lib.py: Additional debug logging

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actions.py | 2 --
 gkeys/gkeys/lib.py | 7 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index e480613..2fe29fb 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -827,8 +827,6 @@ class Actions(ActionBase):
 climit = 60
 else:
 climit = 0
-sig_path = None
-get_sig = signature is not None
 self.logger.debug(_unicode("ACTIONS: _verify; supplied signature %s"), 
signature)
 if isurl:
 fetcher = Fetch(self.logger)

diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py
index a8529f4..7928347 100644
--- a/gkeys/gkeys/lib.py
+++ b/gkeys/gkeys/lib.py
@@ -88,8 +88,8 @@ class GkeysGPG(GPG):
 
 
 def set_keydir(self, keydir, task, fingerprint=True, reset=True):
-self.logger.debug("basedir: %s, keydir: %s" % (self.basedir, keydir))
 self.keydir = pjoin(self.basedir, keydir)
+self.logger.debug("GkeysGPG.set_keydir; keydir: %s, task: %s, 
self.keydir: %s" % (keydir, task, self.keydir))
 self.task = task
 if reset:
 self.config.options['tasks'][task] = 
self.config.defaults['tasks'][task][:]
@@ -98,7 +98,7 @@ class GkeysGPG(GPG):
 task_value.append('--fingerprint')
 task_value.extend(['--homedir', self.keydir])
 self.config.options['tasks'][task].extend(task_value)
-self.logger.debug("set_keydir: New task options: %s" 
%str(self.config.options['tasks'][task]))
+self.logger.debug("GkeysGPG.set_keydir; New task options: %s" 
%str(self.config.options['tasks'][task]))
 return
 
 
@@ -147,6 +147,8 @@ class GkeysGPG(GPG):
 fingerprint, gkey.name))
 result = self.runGPG(task='recv-keys', inputfile=fingerprint)
 self.logger.info('GPG return code: ' + str(result.returncode))
+self.logger.debug("LIB: add_key; fingerprint: %s. type: %s", 
fingerprint, type(fingerprint))
+self.logger.debug("LIB: add_key; gkey.keys: %s. type: %s", 
gkey.keys, [type(key) for key in gkey.keys])
 if result.fingerprint in gkey.keys:
 result.failed = False
 message = "Fingerprints match... Import successful: "
@@ -254,6 +256,7 @@ class GkeysGPG(GPG):
 self.logger.debug("LIB: list_keys(), invalid keydir parameter: %s"
 % str(keydir))
 return []
+self.logger.debug("LIB: list_keys(), keydir parameter: %s"% 
str(keydir))
 if fingerprint:
 task = 'list-key'
 target = fingerprint



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: a297c693402827cec3c5c1740b4559b040903030
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 17:00:59 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:13 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=a297c693

gkeys base.py: Fix fetchonly typo and add to Args class

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 2de1493..8aff933 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -63,6 +63,7 @@ class Args(object):
 self.status = False
 self.timestamp = None
 self.uid = None
+self.fetchonly = None
 
 
 class CliBase(object):
@@ -131,7 +132,7 @@ class CliBase(object):
 help='Use CASE matching in searches')
 
 @staticmethod
-def _option_fetcthonly(parser=None):
+def _option_fetchonly(parser=None):
 parser.add_argument('--fetchonly',
 dest='fetchonly', default=False,
 help="Only fetch the seed file if there is an update or doesn't 
exist locally")
@@ -375,6 +376,7 @@ class CliBase(object):
 func = getattr(self.actions, '%s'
 % self.cli_config['Action_Map'][args.action]['func'])
 self.logger.debug('Main: run; Found action: %s' % args.action)
+self.logger.debug('Main: run; args: %s' % str(args.__dict__))
 success, results = func(args)
 if not results:
 print("No results found.  Check your configuration and that the",



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 80a59eed95c17a8702da10f54f9b6fdf8e90a880
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:52:53 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=80a59eed

gkeys/lock.py: New LockDir class

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/lock.py | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/gkeys/gkeys/lock.py b/gkeys/gkeys/lock.py
new file mode 100644
index 000..5614335
--- /dev/null
+++ b/gkeys/gkeys/lock.py
@@ -0,0 +1,31 @@
+
+import os
+
+from snakeoil import fileutils
+from snakeoil import osutils
+from catalyst.fileops import ensure_dirs
+
+
+LockInUse = osutils.LockException
+
+
+class LockDir(object):
+"""An object that creates locks inside dirs"""
+
+def __init__(self, lockdir):
+#self.gid = 250
+self.lockfile = os.path.join(lockdir, '.gkeys_lock')
+ensure_dirs(lockdir)
+fileutils.touch(self.lockfile, mode=0o664)
+#os.chown(self.lockfile, -1, self.gid)
+self.lock = osutils.FsLock(self.lockfile)
+
+def read_lock(self):
+self.lock.acquire_read_lock()
+
+def write_lock(self):
+self.lock.acquire_write_lock()
+
+def unlock(self):
+# Releasing a write lock is the same as a read lock.
+self.lock.release_write_lock()



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: dfdfd7ccde868f2069de44bb5c3331482177b88d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:50:32 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=dfdfd7cc

gkeys/fileops.py: Add new updateseeds function

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/fileops.py | 28 
 1 file changed, 28 insertions(+)

diff --git a/gkeys/gkeys/fileops.py b/gkeys/gkeys/fileops.py
index 5b89ea8..f6341ca 100644
--- a/gkeys/gkeys/fileops.py
+++ b/gkeys/gkeys/fileops.py
@@ -1,4 +1,6 @@
 import os
+import shutil
+
 from snakeoil.osutils import (ensure_dirs as snakeoil_ensure_dirs)
 
 
@@ -61,3 +63,29 @@ def updatefiles(config, logger, category=None, filename = 
None):
 raise
 return False
 return True
+
+
+def updateseeds(config, logger, src, dst):
+if not src or not dst:
+logger.error("MAIN: updateseeds();  source and/or destination not 
supplied")
+return False
+try:
+if os.path.exists(dst):
+logger.debug(
+"MAIN: updateseeds(); Removing 'old' seed file: %s"
+% dst)
+os.unlink(dst)
+if os.path.exists(src):
+logger.debug(
+"MAIN: updateseeds(); Moving new seed file to: "
+"%s" % dst)
+shutil.move(src, dst)
+except IOError:
+raise
+return False
+return True
+
+
+def rm_files(config, logger, files, lock=None):
+pass
+



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: f048645778033bed905ca391c93234dc9c880067
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:33:38 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=f0486457

gkeys/actions/py: Move the py_input & _unicode import to __init__.py

This way it is done once and can be re-used anywhere in the code.

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/__init__.py | 8 
 gkeys/gkeys/actions.py  | 9 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/gkeys/gkeys/__init__.py b/gkeys/gkeys/__init__.py
index 05fc730..a1e901c 100644
--- a/gkeys/gkeys/__init__.py
+++ b/gkeys/gkeys/__init__.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
+import sys
 
 from collections import OrderedDict
 
@@ -11,6 +12,13 @@ from gkeys.action_map import Action_Map, Available_Actions
 __version__ = '0.2'
 __license__ = 'GPLv2'
 
+if sys.version_info[0] >= 3:
+py_input = input
+_unicode = str
+else:
+py_input = raw_input
+_unicode = unicode
+
 
 subdata = OrderedDict()
 for cmd in Available_Actions:

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 71ed081..64d6123 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -15,18 +15,11 @@ from __future__ import print_function
 
 import itertools
 import os
-import sys
-
-if sys.version_info[0] >= 3:
-py_input = input
-_unicode = str
-else:
-py_input = raw_input
-_unicode = unicode
 
 
 from collections import defaultdict
 
+from gkeys import _unicode, py_input
 from gkeys.actionbase import ActionBase
 from gkeys.gkey import GKEY
 from gkeys.checks import SPECCHECK_SUMMARY, convert_pf, convert_yn



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/

2018-07-06 Thread Brian Dolbec
commit: 6a3a033243058a2724bc6c8d8cb2b2bd6cf73109
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Jul  4 23:02:12 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:12 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=6a3a0332

gkeys actions.py: Add verify() recursion detection and exit

Handles the case of incorrect configuration or keyring problems.
Reported by irc user "puchu" in #gentoo-keys.

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeys/actionbase.py |  1 +
 gkeys/gkeys/actions.py| 10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gkeys/gkeys/actionbase.py b/gkeys/gkeys/actionbase.py
index 3993be4..23b7161 100644
--- a/gkeys/gkeys/actionbase.py
+++ b/gkeys/gkeys/actionbase.py
@@ -43,6 +43,7 @@ class ActionBase(object):
 self._keyhandler = None
 self._gpg = None
 self.category = None
+self.verify_recursion = False
 
 
 @property

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 0f03880..f9bba7a 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -779,7 +779,7 @@ class Actions(ActionBase):
 if not keys:
 return (False, ['No installed keys found, try installkey action.'])
 key = self.seedhandler.seeds.nick_search(args.nick)
-if not key:
+if not key and not self.verify_recursion:
 if args.nick:
 messages.append(_unicode(
 "Failed to find.: %s in category: %s")
@@ -788,7 +788,15 @@ class Actions(ActionBase):
 args.nick = self.config.get_key('verify-nick')
 messages.append(_unicode("Using config defaults..: %s %s")
 % (args.category, args.nick))
+self.verify_recursion = True
 return self.verify(args, messages)
+elif self.verify_recursion:
+messages.append(_unicode(
+"Failed to find.: %s in category: %s")
+% (args.category, args.nick))
+messages.append("...giving up")
+self.verify_recursion = False
+return (False, ['No installed verification keys found, try 
installkey action.'])
 return self._verify(args, key, messages)
 
 



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-ldap/bin/

2018-07-06 Thread Brian Dolbec
commit: 96860a8921918b9b516afef1f322b7b059b58035
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Jan  3 02:07:22 2017 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:10 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=96860a89

gkeys-ldap update-seeds.sh: Add -S option to git commits to ensure they are gpg 
signed

This way if the git config is not set to enforce signing, this will ensure it 
is signed.

 gkeys-ldap/bin/update-seeds.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkeys-ldap/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index ed44df7..d241cda 100755
--- a/gkeys-ldap/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
@@ -63,7 +63,7 @@ echo "Committing changes to gkey-seeds repo..."
 cd ${GKEY_SEEDS_DIR}
 git add ${GKEY_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add ${GKEY_SEEDS}.${GKEYS_SIG} || die " *** Failed to add 
${GKEYS_SEEDS}.sig file"
-git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
+git commit -S -m"${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 cd ..
 
@@ -73,7 +73,7 @@ cp ${GKEY_SEEDS_DIR}/${GKEY_SEEDS}.${GKEYS_SIG} 
${API_DIR}/${API_SEEDS}.${GKEYS_
 cd ${API_DIR}
 git add ${API_SEEDS}  || die " *** Failed to add modified ${GKEYS_SEEDS} file"
 git add ${API_SEEDS}.${GKEYS_SIG} || die " *** Failed to add 
${GKEYS_SEEDS}.sig file"
-git commit -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
+git commit -S -m "${GKEYS_COMMIT_MSG}" || die " *** Failed to commit updates"
 git push --signed origin master || die " *** git push failed"
 
 echo "Pushing the log file to ${LOG_UPLOAD_URL}"



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/etc/

2018-07-06 Thread Brian Dolbec
commit: 0d1aee43cfde530a4abcdbdfffe6b0c17bbe05ee
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Jul  5 19:28:03 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:12 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=0d1aee43

gkets etc/*: Update for individual keyring locations.

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/etc/gkeys.conf| 7 +++
 gkeys/etc/gkeys.conf.sample | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index 392df74..c3b1b91 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -66,6 +66,13 @@ directories: 0o775
 files: 0o022
 
 
+[keyrings]
+# configured locations of keyrings
+gentoo: %(gkeysdir)s/keyrings/gentoo
+gentoo-devs: %(gkeysdir)s/keyrings/gentoo-devs
+user: %(homedir)s/.gnupg
+
+
 [seeds]
 
 # file is a json text file of: nick, name, keydir, fingerprint

diff --git a/gkeys/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
index d9a42c0..ace3ddd 100644
--- a/gkeys/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf.sample
@@ -51,6 +51,13 @@ directories: 0o775
 files: 0o002
 
 
+[keyrings]
+# configured locations of keyrings
+gentoo: %(gkeysdir)s/keyrings/gentoo
+gentoo-devs: %(gkeysdir)s/keyrings/gentoo-devs
+user: %(homedir)s/.gnupg
+
+
 [seeds]
 
 # file is a json text file of: nick, name, keydir, fingerprint



[gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeysgpg/

2018-07-06 Thread Brian Dolbec
commit: 17e3e3ad8ebb4e1590ebe801bf97af29dd066fba
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jul  2 21:39:16 2018 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Jul  7 05:22:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=17e3e3ad

gkeysgpg/cli.py: Fix doctring typos

Signed-off-by: Brian Dolbec  gentoo.org>

 gkeys/gkeysgpg/cli.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkeys/gkeysgpg/cli.py b/gkeys/gkeysgpg/cli.py
index cdc984c..8d591f0 100644
--- a/gkeys/gkeysgpg/cli.py
+++ b/gkeys/gkeysgpg/cli.py
@@ -56,7 +56,7 @@ class Main(CliBase):
 def __call__(self, args=None):
 """Main class call function
 
-@param args: Optional list of argumanets to parse and action to run
+@param args: Optional list of arguments to parse and action to run
  Defaults to sys.argv[1:]
 """
 if args:
@@ -72,7 +72,7 @@ class Main(CliBase):
 def run(self, args):
 '''Run the gpg command option
 
-@param args: list of argumanets to parse
+@param args: list of arguments to parse
 '''
 # establish our actions instance
 self.actions = self.cli_config['Actions'](self.config, 
self.output_results, self.logger)



[gentoo-commits] repo/gentoo:master commit in: app-i18n/tagainijisho/

2018-07-06 Thread Mike Gilbert
commit: 3a3b25aac42001958428fd927492b9ad52f69965
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Jul  6 21:40:29 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3b25aa

app-i18n/tagainijisho: Fix DICT_LANG.

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

 app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild | 2 +-
 app-i18n/tagainijisho/tagainijisho-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild 
b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
index a84140be2b2..41902e9a643 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
@@ -173,7 +173,7 @@ src_configure() {
done
 
local mycmakeargs=(
-   -DDICT_LANG="${dict_langs}${dict_langs:-;}"
+   -DDICT_LANG="${dict_langs:-;}"
-DEMBED_SQLITE=OFF
)
 

diff --git a/app-i18n/tagainijisho/tagainijisho-.ebuild 
b/app-i18n/tagainijisho/tagainijisho-.ebuild
index da6473ad98a..11c02a413f1 100644
--- a/app-i18n/tagainijisho/tagainijisho-.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-.ebuild
@@ -173,7 +173,7 @@ src_configure() {
done
 
local mycmakeargs=(
-   -DDICT_LANG="${dict_langs}${dict_langs:-;}"
+   -DDICT_LANG="${dict_langs:-;}"
-DEMBED_SQLITE=OFF
)
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/kcm-fcitx/, app-i18n/fcitx-configtool/, ...

2018-07-06 Thread Mike Gilbert
commit: 377ef988adc7db47387510f6c21129a087f82d36
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Jul  6 22:05:19 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377ef988

app-i18n/*fcitx*, app-i18n/mozc: Update URIs.

Fcitx moved from GitHub to GitLab.
https://groups.google.com/forum/#!topic/fcitx-announce/wfN2eH27T0o
https://groups.google.com/forum/#!topic/fcitx-dev/Om0THKaeFvc
https://groups.google.com/forum/#!topic/fcitx/SLNIRcuTq_o

 app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild  | 6 +++---
 app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild | 6 +++---
 app-i18n/fcitx-anthy/metadata.xml  | 2 +-
 app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild  | 6 +++---
 app-i18n/fcitx-chewing/fcitx-chewing-4..ebuild | 6 +++---
 app-i18n/fcitx-chewing/metadata.xml| 2 +-
 app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild  | 4 ++--
 app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4..ebuild | 6 +++---
 app-i18n/fcitx-cloudpinyin/metadata.xml| 2 +-
 app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild   | 6 +++---
 app-i18n/fcitx-configtool/fcitx-configtool-4..ebuild   | 6 +++---
 app-i18n/fcitx-configtool/metadata.xml | 2 +-
 app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild| 6 +++---
 app-i18n/fcitx-hangul/fcitx-hangul-4..ebuild   | 6 +++---
 app-i18n/fcitx-hangul/metadata.xml | 2 +-
 app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild  | 6 +++---
 app-i18n/fcitx-libpinyin/fcitx-libpinyin-4..ebuild | 6 +++---
 app-i18n/fcitx-libpinyin/metadata.xml  | 2 +-
 app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild| 6 +++---
 app-i18n/fcitx-m17n/fcitx-m17n-4..ebuild   | 6 +++---
 app-i18n/fcitx-m17n/metadata.xml   | 2 +-
 app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild  | 8 
 app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild | 6 +++---
 app-i18n/fcitx-qt5/metadata.xml| 2 +-
 app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild| 8 
 app-i18n/fcitx-rime/fcitx-rime-4..ebuild   | 6 +++---
 app-i18n/fcitx-rime/metadata.xml   | 2 +-
 app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild| 6 +++---
 app-i18n/fcitx-sayura/fcitx-sayura-4..ebuild   | 6 +++---
 app-i18n/fcitx-sayura/metadata.xml | 2 +-
 app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild  | 6 +++---
 app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4..ebuild | 6 +++---
 app-i18n/fcitx-sunpinyin/metadata.xml  | 2 +-
 app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild  | 6 +++---
 app-i18n/fcitx-table-extra/fcitx-table-extra-4..ebuild | 6 +++---
 app-i18n/fcitx-table-extra/metadata.xml| 2 +-
 app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild| 4 ++--
 app-i18n/fcitx-unikey/fcitx-unikey-4..ebuild   | 6 +++---
 app-i18n/fcitx-unikey/metadata.xml | 2 +-
 app-i18n/fcitx/fcitx-4.2.9.6.ebuild| 6 +++---
 app-i18n/fcitx/fcitx-4..ebuild | 6 +++---
 app-i18n/fcitx/metadata.xml| 2 +-
 app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild  | 6 +++---
 app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild   | 6 +++---
 app-i18n/kcm-fcitx/metadata.xml| 2 +-
 app-i18n/mozc/mozc-2.23.2815.102.ebuild| 4 ++--
 app-i18n/mozc/mozc-.ebuild | 4 ++--
 47 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild 
b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index bffc2b76829..7f2661d3e6b 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.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,11 +8,11 @@ inherit cmake-utils gnome2-utils
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3
 
-   EGIT_REPO_URI="https://github.com/fcitx/fcitx-anthy;
+   EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-anthy.git;
 fi
 
 DESCRIPTION="Japanese Anthy input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy;
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy;
 if [[ "${PV}" =~ (^|\.)$ ]]; then
SRC_URI=""
 else

diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild 
b/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
index c5fba16429b..a0729a41bd3 100644

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

2018-07-06 Thread Mike Gilbert
commit: 8ddedb2a6194622a89c003dfdb9bb2a4452ca9e8
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Jul  6 21:19:50 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ddedb2a

dev-libs/protobuf-c: Fix building with >=dev-libs/protobuf-3.6.0.

 .../files/protobuf-c-1.3.0-protobuf-3.6.patch  | 202 +
 dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild |   5 +-
 2 files changed, 206 insertions(+), 1 deletion(-)

diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch 
b/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch
new file mode 100644
index 000..d6d8ffe9325
--- /dev/null
+++ b/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch
@@ -0,0 +1,202 @@
+https://github.com/protobuf-c/protobuf-c/pull/309
+https://github.com/protobuf-c/protobuf-c/pull/328
+
+--- /protoc-c/c_field.cc
 /protoc-c/c_field.cc
+@@ -189,7 +189,7 @@
+ FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor)
+   : descriptor_(descriptor),
+ field_generators_(
+-  new scoped_ptr[descriptor->field_count()]) {
++  new std::unique_ptr[descriptor->field_count()]) {
+   // Construct all the FieldGenerators.
+   for (int i = 0; i < descriptor->field_count(); i++) {
+ field_generators_[i].reset(MakeGenerator(descriptor->field(i)));
+--- /protoc-c/c_field.h
 /protoc-c/c_field.h
+@@ -117,7 +117,7 @@
+ 
+  private:
+   const Descriptor* descriptor_;
+-  scoped_array > field_generators_;
++  std::unique_ptr[] > field_generators_;
+ 
+   static FieldGenerator* MakeGenerator(const FieldDescriptor* field);
+ 
+--- /protoc-c/c_file.cc
 /protoc-c/c_file.cc
+@@ -83,13 +83,13 @@
+  const string& dllexport_decl)
+   : file_(file),
+ message_generators_(
+-  new scoped_ptr[file->message_type_count()]),
++  new std::unique_ptr[file->message_type_count()]),
+ enum_generators_(
+-  new scoped_ptr[file->enum_type_count()]),
++  new std::unique_ptr[file->enum_type_count()]),
+ service_generators_(
+-  new scoped_ptr[file->service_count()]),
++  new std::unique_ptr[file->service_count()]),
+ extension_generators_(
+-  new scoped_ptr[file->extension_count()]) {
++  new std::unique_ptr[file->extension_count()]) {
+ 
+   for (int i = 0; i < file->message_type_count(); i++) {
+ message_generators_[i].reset(
+--- /protoc-c/c_file.h
 /protoc-c/c_file.h
+@@ -98,13 +98,13 @@
+  private:
+   const FileDescriptor* file_;
+ 
+-  scoped_array > message_generators_;
+-  scoped_array > enum_generators_;
+-  scoped_array > service_generators_;
+-  scoped_array > extension_generators_;
++  std::unique_ptr[] > message_generators_;
++  std::unique_ptr[] > enum_generators_;
++  std::unique_ptr[] > service_generators_;
++  std::unique_ptr[] > 
extension_generators_;
+ 
+   // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}.
+-  vector package_parts_;
++  std::vector package_parts_;
+ 
+   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
+ };
+--- /protoc-c/c_generator.cc
 /protoc-c/c_generator.cc
+@@ -80,13 +80,13 @@
+ //   "foo=bar,baz,qux=corge"
+ // parses to the pairs:
+ //   ("foo", "bar"), ("baz", ""), ("qux", "corge")
+-void ParseOptions(const string& text, vector >* output) {
+-  vector parts;
++void ParseOptions(const string& text, std::vector 
>* output) {
++  std::vector parts;
+   SplitStringUsing(text, ",", );
+ 
+   for (unsigned i = 0; i < parts.size(); i++) {
+ string::size_type equals_pos = parts[i].find_first_of('=');
+-pair value;
++std::pair value;
+ if (equals_pos == string::npos) {
+   value.first = parts[i];
+   value.second = "";
+@@ -105,7 +105,7 @@
+ const string& parameter,
+ OutputDirectory* output_directory,
+ string* error) const {
+-  vector > options;
++  std::vector > options;
+   ParseOptions(parameter, );
+ 
+   // -
+@@ -149,7 +149,7 @@
+ 
+   // Generate header.
+   {
+-scoped_ptr output(
++std::unique_ptr output(
+   output_directory->Open(basename + ".h"));
+ io::Printer printer(output.get(), '$');
+ file_generator.GenerateHeader();
+@@ -157,7 +157,7 @@
+ 
+   // Generate cc file.
+   {
+-scoped_ptr output(
++std::unique_ptr output(
+   output_directory->Open(basename + ".c"));
+ io::Printer printer(output.get(), '$');
+ file_generator.GenerateSource();
+--- /protoc-c/c_helpers.cc
 /protoc-c/c_helpers.cc
+@@ -177,7 +177,7 @@
+ }
+ 
+ string FullNameToLower(const string _name) {
+-  vector pieces;
++  std::vector pieces;
+   SplitStringUsing(full_name, ".", );
+   string rv = "";
+   for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -188,7 +188,7 @@
+   return rv;
+ }
+ string 

[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/

2018-07-06 Thread Mike Gilbert
commit: d9121c3a8f0bd4ae654559a369f27da110ff0de8
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Jul  6 22:11:56 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9121c3a

app-i18n/fcitx-qt5: Version bump (1.2.3).

 app-i18n/fcitx-qt5/Manifest   |  1 +
 app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild | 40 +++
 2 files changed, 41 insertions(+)

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 619b181fcd6..05eec52503f 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,2 +1,3 @@
 DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B 
c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd
 SHA512 
0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
 DIST fcitx-qt5-1.2.2.tar.xz 134216 BLAKE2B 
9922dafaa42937737f5ef0018f519e83ed3c3105bef5a30505b323239c999ac8c921435b2bb72b35a73ebf1a9b7787ecd4ad405d8b6311e806e3bcbcbd79ff5e
 SHA512 
902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3
+DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 
0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af
 SHA512 
e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
new file mode 100644
index 000..2c54b501abd
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git;
+fi
+
+DESCRIPTION="Fcitx input method module for Qt 5"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5;
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz;
+fi
+
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE=""
+
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5=
+   dev-qt/qtwidgets:5
+   virtual/libintl
+   x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+   kde-frameworks/extra-cmake-modules:5
+   virtual/pkgconfig"
+
+DOCS=()



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

2018-07-06 Thread Mike Gilbert
commit: c1694bf6284cf83ed6370739989d95bfbeb01db7
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Jun 24 15:25:46 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1694bf6

dev-python/protobuf-python: Version bump (3.6.0.1).

 dev-python/protobuf-python/Manifest|  1 +
 .../protobuf-python/protobuf-python-3.6.0.1.ebuild | 50 ++
 2 files changed, 51 insertions(+)

diff --git a/dev-python/protobuf-python/Manifest 
b/dev-python/protobuf-python/Manifest
index aa6d99043ce..f6e4af7f648 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,3 +1,4 @@
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B 
e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3
 SHA512 
471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 
995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591
 SHA512 
f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 
8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235
 SHA512 
63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4

diff --git a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild 
b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
new file mode 100644
index 000..766a0febd0e
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
@@ -0,0 +1,50 @@
+# 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 distutils-r1
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ 
https://github.com/google/protobuf;
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> 
protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+   ~dev-libs/protobuf-${PV}
+   dev-python/namespace-google[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+   !

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

2018-07-06 Thread Mike Gilbert
commit: c7f012d40c5238950ee3df63e1f862916316458f
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Jul  6 21:23:33 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f012d4

dev-libs/protobuf-c: Install static library only with USE="static-libs". Minor 
cleanup.

 dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild 
b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
index 260f81c9689..bed34d3628b 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c/;
+HOMEPAGE="https://github.com/protobuf-c/protobuf-c;
 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz;
 
 LICENSE="BSD-2"
@@ -20,7 +20,6 @@ IUSE="static-libs test"
 
 RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-   test? ( ${AUTOTOOLS_DEPEND} )
virtual/pkgconfig[${MULTILIB_USEDEP}]"
 
 PATCHES=(
@@ -32,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
default
-   if ! use test ; then
+   if ! use test; then
eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
fi
 
@@ -41,5 +40,6 @@ src_prepare() {
 
 multilib_src_configure() {
ECONF_SOURCE="${S}" \
-   econf "${myeconfargs[@]}"
+   econf \
+   $(use_enable static-libs static)
 }



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/, app-i18n/fcitx/

2018-07-06 Thread Mike Gilbert
commit: a794a92c2f98a230f0628daa07c7ff9b4957f40d
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Jul  6 22:21:36 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a794a92c

app-i18n/*fcitx*: Delete old versions.

 app-i18n/fcitx-qt5/Manifest   |   2 -
 app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild |  40 
 app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild |  48 --
 app-i18n/fcitx/Manifest   |   1 -
 app-i18n/fcitx/fcitx-4.2.9.5.ebuild   | 150 --
 5 files changed, 241 deletions(-)

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 05eec52503f..5959966f61d 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,3 +1 @@
-DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B 
c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd
 SHA512 
0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
-DIST fcitx-qt5-1.2.2.tar.xz 134216 BLAKE2B 
9922dafaa42937737f5ef0018f519e83ed3c3105bef5a30505b323239c999ac8c921435b2bb72b35a73ebf1a9b7787ecd4ad405d8b6311e806e3bcbcbd79ff5e
 SHA512 
902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3
 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 
0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af
 SHA512 
e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
deleted file mode 100644
index c353b639401..000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)$ ]]; then
-   inherit git-r3
-
-   EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5;
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5;
-if [[ "${PV}" =~ (^|\.)$ ]]; then
-   SRC_URI=""
-else
-   SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz;
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5=
-   dev-qt/qtwidgets:5
-   virtual/libintl
-   x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-   dev-qt/qtconcurrent:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig"
-
-DOCS=()

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
deleted file mode 100644
index 69572891889..000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)$ ]]; then
-   inherit git-r3
-
-   EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git;
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5;
-if [[ "${PV}" =~ (^|\.)$ ]]; then
-   SRC_URI=""
-else
-   SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz;
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5=
-   dev-qt/qtwidgets:5
-   virtual/libintl
-   x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-   dev-qt/qtconcurrent:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig"
-
-DOCS=()
-
-src_prepare() {
-   # https://gitlab.com/fcitx/fcitx-qt5/issues/34
-   # 
https://gitlab.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6
-   sed -e "/^#include \"batchdialog.h\"$/i\\#include " -i 
quickphrase-editor/batchdialog.cpp || die
-
-   cmake-utils_src_prepare
-}

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 799e2637725..cfcbad155f7 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,3 @@
-DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 
0124aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d
 SHA512 

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

2018-07-06 Thread Mike Gilbert
commit: 52c7cd4159d9a0b9eda57de784e36c0aafb73fee
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Jun 24 14:27:31 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c7cd41

dev-libs/protobuf: Version bump (3.6.0.1).

 dev-libs/protobuf/Manifest |   1 +
 .../protobuf-3.6.0-disable_no-warning-test.patch   |  19 ++
 .../protobuf-3.6.0-protoc_input_output_files.patch | 233 +
 .../files/protobuf-3.6.0-system_libraries.patch| 121 +++
 dev-libs/protobuf/protobuf-3.6.0.1.ebuild  | 105 ++
 5 files changed, 479 insertions(+)

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index aa6d99043ce..f6e4af7f648 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,3 +1,4 @@
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B 
e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3
 SHA512 
471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 
995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591
 SHA512 
f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 
8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235
 SHA512 
63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4

diff --git 
a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch 
b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
new file mode 100644
index 000..834f6b0d1ab
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only 
purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
 /src/Makefile.am
+@@ -717,7 +717,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+  protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+   $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+   $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -900,4 +900,4 @@
+ 
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+-protobuf-lite-arena-test no-warning-test
++protobuf-lite-arena-test

diff --git 
a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch 
b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
new file mode 100644
index 000..f515b6cd1a4
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
@@ -0,0 +1,233 @@
+https://github.com/google/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
 /src/google/protobuf/compiler/command_line_interface.cc
+@@ -931,6 +931,28 @@
+   }
+ 
+   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++  in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++  if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." << 
std::endl;
++return 1;
++  }
++}
++if (!protobuf_out_path_.empty()) {
++  out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++  if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." << 
std::endl;
++close(in_fd);
++return 1;
++  }
++}
++
+ if (codec_type_.empty()) {
+   // HACK:  Define an EmptyMessage type to use for decoding.
+   DescriptorPool pool;
+@@ -939,13 +961,20 @@
+   file.add_message_type()->set_name("EmptyMessage");
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

2018-07-06 Thread Mike Gilbert
commit: ff5c8c0b0c9989e72df95f3bec12bc8083d157b0
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Jun 24 14:49:01 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul  7 02:02:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5c8c0b

dev-java/protobuf-java: Version bump (3.6.0.1).

 dev-java/protobuf-java/Manifest|  1 +
 .../protobuf-java/protobuf-java-3.6.0.1.ebuild | 37 ++
 2 files changed, 38 insertions(+)

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index aa6d99043ce..f6e4af7f648 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,3 +1,4 @@
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B 
e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3
 SHA512 
471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 
995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591
 SHA512 
f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B 
f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544
 SHA512 
09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 
8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235
 SHA512 
63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4

diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
new file mode 100644
index 000..bc88cf88156
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ 
https://github.com/google/protobuf;
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> 
protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux 
~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+   >=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+   !

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-07-06 Thread Andrey Utkin
commit: 0732fe3e762b640eae848ea4accdae9d137a3471
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Jul  7 01:32:19 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Jul  7 01:33:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0732fe3e

net-wireless/hostapd: s/!use/! use/g

Fix syntax issue which caused errors.
In all relevant ebuilds including stable.

Suggested-by: Matt Turner  gentoo.org>
Bug: https://bugs.gentoo.org/660378
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r4.ebuild | 6 +++---
 net-wireless/hostapd/hostapd-2.6-r5.ebuild | 6 +++---
 net-wireless/hostapd/hostapd-2.6-r6.ebuild | 6 +++---
 net-wireless/hostapd/hostapd-.ebuild   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index a0403321ea5..6f00dd91246 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -82,7 +82,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -183,7 +183,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -198,7 +198,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
index 67f105b8c77..82e50e8b7f0 100644
--- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -85,7 +85,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -186,7 +186,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -201,7 +201,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-2.6-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
index ffca9d29e16..484677f3913 100644
--- a/net-wireless/hostapd/hostapd-2.6-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@@ -88,7 +88,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -189,7 +189,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -204,7 +204,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
 

diff --git a/net-wireless/hostapd/hostapd-.ebuild 
b/net-wireless/hostapd/hostapd-.ebuild
index 7cf65530325..2b99c9ab887 100644
--- a/net-wireless/hostapd/hostapd-.ebuild
+++ b/net-wireless/hostapd/hostapd-.ebuild
@@ -86,7 +86,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-   if use internal-tls && !use libressl; then
+   if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -187,7 +187,7 @@ src_configure() {
 src_compile() {
emake V=1
 
-   if use libressl || !use internal-tls; then
+   if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -202,7 +202,7 @@ src_install() {
dosbin ${PN}
 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-07-06 Thread Andrey Utkin
commit: 447db89c9723c30d65da760c049ac775ee60c685
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Jul  7 01:39:40 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Jul  7 01:39:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447db89c

net-wireless/hostapd: drop old 2.6-r1

2.6-r4 is the new stable revision.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/hostapd-2.6-r1.ebuild | 226 -
 1 file changed, 226 deletions(-)

diff --git a/net-wireless/hostapd/hostapd-2.6-r1.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r1.ebuild
deleted file mode 100644
index 8a0d613bea7..000
--- a/net-wireless/hostapd/hostapd-2.6-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils systemd
-
-# bogus commit to force manifest regeneration #596462
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi;
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
-   kernel_linux? (
-   dev-libs/libnl:3
-   crda? ( net-wireless/crda )
-   )
-   netlink? ( net-libs/libnfnetlink )
-   sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-   # Allow users to apply patches to src/drivers for example,
-   # i.e. anything outside ${S}/${PN}
-   pushd ../ >/dev/null || die
-   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-   eapply 
"${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
-   default
-   popd >/dev/null || die
-
-   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-   "${S}/hostapd.conf" || die
-
-}
-
-src_configure() {
-   local CONFIG="${S}/.config"
-
-   # toolchain setup
-   echo "CC = $(tc-getCC)" > ${CONFIG}
-
-   # EAP authentication methods
-   echo "CONFIG_EAP=y" >> ${CONFIG}
-   echo "CONFIG_ERP=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-   if use ssl; then
-   # SSL authentication methods
-   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-   echo "CONFIG_TLSV11=y" >> ${CONFIG}
-   echo "CONFIG_TLSV12=y" >> ${CONFIG}
-   fi
-
-   if use wps; then
-   # Enable Wi-Fi Protected Setup
-   echo "CONFIG_WPS=y" >> ${CONFIG}
-   echo "CONFIG_WPS2=y" >> ${CONFIG}
-   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-   einfo "Enabling Wi-Fi Protected Setup support"
-   fi
-
-   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-   echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-
-   einfo "Enabling drivers: "
-
-   # drivers
-   echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-   einfo "  HostAP driver enabled"
-   echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-   einfo "  Wired driver enabled"
-   echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-   einfo "  Prism54 driver enabled"
-   echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-   einfo "  None driver enabled"
-
-   einfo "  nl80211 driver enabled"
-   echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-
-   # epoll
-   echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}

[gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/

2018-07-06 Thread Andrey Utkin
commit: 0760b9f7094e991d19ce4f5807142ff852876776
Author: Andrey Utkin  gentoo  org>
AuthorDate: Sat Jul  7 00:22:58 2018 +
Commit: Andrey Utkin  gentoo  org>
CommitDate: Sat Jul  7 01:25:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0760b9f7

net-wireless/hostapd: add backported bugfix

Suggested-by: Matt Turner  gentoo.org>
Bug: https://bugs.gentoo.org/660384
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-wireless/hostapd/Manifest  |   1 +
 net-wireless/hostapd/hostapd-2.6-r6.ebuild | 259 +
 2 files changed, 260 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 34faab85331..45eaaa812e7 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1,3 @@
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B 
c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011
 SHA512 
e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B 
fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981
 SHA512 
cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
+DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 
62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e661865e77759d33e38c8a5647537c0098e772f032a368b82be709
 SHA512 
c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612

diff --git a/net-wireless/hostapd/hostapd-2.6-r6.ebuild 
b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
new file mode 100644
index 000..ffca9d29e16
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi;
+EXTRAS_VER="2.6-r6"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+   https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+   libressl? ( dev-libs/libressl:0= )
+   !libressl? (
+   internal-tls? ( dev-libs/libtommath )
+   !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+   )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+   if use internal-tls; then
+   if use libressl; then
+   elog "libressl flag takes precedence over internal-tls"
+   else
+   ewarn "internal-tls implementation is experimental and 
provides fewer features"
+   fi
+   fi
+}
+
+src_prepare() {
+   # Allow users to apply patches to src/drivers for example,
+   # i.e. anything outside ${S}/${PN}
+   pushd ../ >/dev/null || die
+
+   # Add LibreSSL compatibility patch bug (#567262)
+   eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
+   # 
https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+
+   eapply 
"${WORKDIR}/${EXTRAS_NAME}/nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch"
+
+   default
+   popd >/dev/null || die
+
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   restore_config "${CONFIG}"
+   if 

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

2018-07-06 Thread Andreas Sturmlechner
commit: aefa18a4b002a96c1a560d2bcabb1f692dd21256
Author: Diogo Pereira  gmail  com>
AuthorDate: Fri Jul  6 22:34:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 22:54:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aefa18a4

dev-python/pyacoustid: version bump to 1.1.5

Closes: https://bugs.gentoo.org/653966
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/pyacoustid/Manifest|  1 +
 dev-python/pyacoustid/pyacoustid-1.1.5.ebuild | 32 +++
 2 files changed, 33 insertions(+)

diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 16fbea4bc06..b2cab13fe92 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1 +1,2 @@
 DIST pyacoustid-1.0.0.tar.gz 10476 BLAKE2B 
363bf1bee4c124fc57126febf50c34a395ded074df8d3b9661b015b6b653f473ef79837f2078b7b21375d3b3624f75b1070d3c28ab3fa4d619e1ae088129898c
 SHA512 
4eabf32e7d958bf7330e852184f5ddf3105007179ca2c45b75c1a5b0f0898649e703aa333cffccac85eb7b18b54255f2e5d588897adfb9f0ef2596e9c0b2fe5a
+DIST pyacoustid-1.1.5.tar.gz 11846 BLAKE2B 
920894d914f5eac15bd62fab7a018937691e8eb7774fe65821bd6a8088e81dba19d178866bfd01b991750c6298714a1b51f948da987207a6adad1e0c1689afa4
 SHA512 
5b71446b9adbc73335b5962081e880365580b8e0aac746e8137e8819ba91d73ec41814eba13fd1b04c5bad5f2b5a3aaad57db118981ab4eac9dea12f709afe91

diff --git a/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild 
b/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild
new file mode 100644
index 000..413c07cfff8
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
+HOMEPAGE="https://pypi.org/project/pyacoustid/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/audioread[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   media-libs/chromaprint"
+
+src_install() {
+   distutils-r1_src_install
+
+   if use examples ; then
+   docinto examples
+   dodoc aidmatch.py fpcalc.py
+   docompress -x /usr/share/doc/${PF}/examples/
+   fi
+}



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

2018-07-06 Thread Andreas Sturmlechner
commit: 26917dcd3c594be01693b710ddc772476a917021
Author: Diogo Pereira  gmail  com>
AuthorDate: Wed Jun 27 21:37:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 22:54:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26917dcd

dev-python/pyacoustid: update metadata

- Add myself as proxied maintainer
- Add upstream GitHub repository information

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

 dev-python/pyacoustid/metadata.xml | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev-python/pyacoustid/metadata.xml 
b/dev-python/pyacoustid/metadata.xml
index cc75a3ff517..2bc25277529 100644
--- a/dev-python/pyacoustid/metadata.xml
+++ b/dev-python/pyacoustid/metadata.xml
@@ -1,11 +1,20 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   sir.su...@gmail.com
+   Diogo Pereira
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Chromaprint and its associated Acoustid Web service make up a 
high-quality, open-source acoustic fingerprinting system. This package provides 
Python bindings for both the fingerprinting algorithm library, which is written 
in C but portable, and the Web service, which provides fingerprint lookups.


pyacoustid
+   beetbox/pyacoustid
+   https://github.com/beetbox/pyacoustid/issues

 



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, app-office/libreoffice/

2018-07-06 Thread Andreas Sturmlechner
commit: 2754c0139ea7c5ef43d9f538c12efd6ee6f49d2a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jul  6 22:48:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 22:51:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2754c013

app-office/libreoffice: Update patchset to fix 32-bit build

Bug: https://bugs.gentoo.org/650208
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-office/libreoffice/Manifest| 1 +
 app-office/libreoffice/libreoffice-6.0.5.2.ebuild  | 2 +-
 app-office/libreoffice/libreoffice-6.0..ebuild | 2 +-
 profiles/arch/x86/package.use.mask | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 98f36b64b1a..fa36b63ddf5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 
BLAKE2B 51db6bd9058
 DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 
82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e
 SHA512 
712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 
0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416
 SHA512 
f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 
8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa
 SHA512 
d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
+DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B 
d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1
 SHA512 
ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
 DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B 
d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a
 SHA512 
796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 
690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6
 SHA512 
8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2

diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild 
b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
index b1c28905c33..f8ee3a7fc14 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/;
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${MY_PV} == ** ]] && SCM_ECLASS="git-r3"
 inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic 
gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 
qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}

diff --git a/app-office/libreoffice/libreoffice-6.0..ebuild 
b/app-office/libreoffice/libreoffice-6.0..ebuild
index b1c28905c33..3df147edf4c 100644
--- a/app-office/libreoffice/libreoffice-6.0..ebuild
+++ b/app-office/libreoffice/libreoffice-6.0..ebuild
@@ -18,7 +18,7 @@ DEV_URI="
 ADDONS_URI="https://dev-www.libreoffice.org/src/;
 
 BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+PATCHSET="${PN}-6.0.5.2-patchset-01.tar.xz"
 
 [[ ${MY_PV} == ** ]] && SCM_ECLASS="git-r3"
 inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic 
gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 
qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}

diff --git a/profiles/arch/x86/package.use.mask 
b/profiles/arch/x86/package.use.mask
index c0d59e4c2d2..c9a3ef9916d 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -14,7 +14,6 @@ media-video/mpv -vulkan
 
 

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-sqlite3/

2018-07-06 Thread Sergei Trofimovich
commit: d0d1c0816ed65ff692ca462a224f090fdb7b3129
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul  6 21:14:20 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  6 22:33:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d1c081

dev-scheme/guile-sqlite3: new package, a depend of guix-0.15.0

Package implements sqlite3 bindings for guile.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-scheme/guile-sqlite3/Manifest  |  1 +
 .../guile-sqlite3/guile-sqlite3-0.1.0.ebuild   | 30 ++
 dev-scheme/guile-sqlite3/metadata.xml  |  7 +
 3 files changed, 38 insertions(+)

diff --git a/dev-scheme/guile-sqlite3/Manifest 
b/dev-scheme/guile-sqlite3/Manifest
new file mode 100644
index 000..47df83f56e7
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/Manifest
@@ -0,0 +1 @@
+DIST v0.1.0.tar.gz 23832 BLAKE2B 
cff04a320ab239bf0d90c01ffc4e557bf5bf2978a433fcca0413b09f3c3b2ee5ed75f3655077dc493ae42a11a8e027f0a17b74c97e3eecadfb67f2e0e7912693
 SHA512 
8c1f58024c464e5628162e3ba1bf129809403bcc5d2329b55b6628f419ff8d5ead21d87f0bdcbb458ce5798d62184af177616bbfbeb653c34450c716f6b3ab26

diff --git a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild 
b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
new file mode 100644
index 000..97067155562
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Guile bindings of sqlite3"
+HOMEPAGE="https://notabug.org/civodul/guile-sqlite3.git;
+SRC_URI="https://notabug.org/civodul/guile-sqlite3/archive/v${PV}.tar.gz;
+
+LICENSE="LGPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-scheme/guile-2.0.11:=
+   dev-db/sqlite:3=
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+   default
+
+   # upstream tag on top of source tree. has no autogenerated files
+   eautoreconf
+}

diff --git a/dev-scheme/guile-sqlite3/metadata.xml 
b/dev-scheme/guile-sqlite3/metadata.xml
new file mode 100644
index 000..2907abeb0c4
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   sly...@gentoo.org
+
+



[gentoo-commits] repo/gentoo:master commit in: games-emulation/zsnes/files/, games-emulation/zsnes/

2018-07-06 Thread Sergei Trofimovich
commit: c068f68557e6a0d7d2f5232221900205076429aa
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul  6 22:32:25 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  6 22:33:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c068f685

games-emulation/zsnes: apply stack realignment to more functions

Expand existing stack realignment hack to more C functions
that get called from early init assembly. Fixes zsnes startup
for me.

Bug: https://bugs.gentoo.org/503138
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../zsnes/files/zsnes-1.51-stack-align-v2.patch|  56 ++
 games-emulation/zsnes/zsnes-1.51-r7.ebuild | 122 +
 2 files changed, 178 insertions(+)

diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch 
b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch
new file mode 100644
index 000..35613a95359
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch
@@ -0,0 +1,56 @@
+zsnes call C initialization code from assembler.
+
+Example backtrace:
+
+Thread 1 "zsnes" received signal SIGSEGV, Segmentation fault.
+=> 0xf7550275 <+37>:vmovdqa (%esp),%xmm1
+...
+#13 0x5699ef82 in InitSound () at linux/audio.c:336
+#14 0x569a25af in initwinvideo () at linux/sdllink.c:1080
+#15 0x5699fc13 in initvideo () at linux/sdllink.c:1298
+#16 0x56f9d5bc in regptwa ()
+#17 0x56a34b50 in SA1tableG ()
+#18 0x56f84788 in selcB800 ()
+...
+
+Call to 'initwinvideo' (first C function) looks like that:
+  NEWSYM InitPreGame   ; Executes before starting/continuing a game
+  mov byte[pressed+1],2
+  pushad
+  call Start60HZ
+  %ifdef __OPENGL__
+  call drawscreenwin
+  %endif
+  call initwinvideo
+
+Note: pushad / call does not 16-byte maintain stack alignment
+and breaks i386 ABI.
+
+We apply realignment attribute to all functions noticed by users.
+Bug: https://bugs.gentoo.org/503138
+--- src/linux/sdllink.c.old
 src/linux/sdllink.c
+@@ -773,11 +773,11 @@ BOOL InitInput()
+ {
+   InitJoystickInput();
+   return TRUE;
+ }
+ 
+-int startgame()
++int __attribute__((force_align_arg_pointer)) startgame()
+ {
+   static bool ranonce = false;
+   int status;
+ 
+   if (!ranonce)
+--- a/linux/sdllink.c
 b/linux/sdllink.c
+@@ -897,7 +897,7 @@ bool OGLModeCheck()
+return(cvidmode > 4);
+ }
+ 
+-void initwinvideo(void)
++void __attribute__((force_align_arg_pointer)) initwinvideo(void)
+ {
+   DWORD newmode = 0;
+ 

diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild 
b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
new file mode 100644
index 000..9613a4888e8
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
+HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/;
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="ao custom-cflags +debug opengl pax_kernel png"
+
+RDEPEND="
+   media-libs/libsdl[sound,video,abi_x86_32(-)]
+   >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
+   ao? ( media-libs/libao[abi_x86_32(-)] )
+   debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
+   opengl? ( virtual/opengl[abi_x86_32(-)] )
+   png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+"
+DEPEND="${RDEPEND}
+   dev-lang/nasm
+   debug? ( virtual/pkgconfig )
+"
+
+S="${WORKDIR}/${PN}_${PV//./_}/src"
+
+PATCHES=(
+   # Fixing compilation without libpng installed
+   "${FILESDIR}"/${P}-libpng.patch
+
+   # Fix bug #186111
+   # Fix bug #214697
+   # Fix bug #170108
+   # Fix bug #260247
+   "${FILESDIR}"/${P}-archopt-july-23-update.patch
+   "${FILESDIR}"/${P}-gcc43.patch
+   "${FILESDIR}"/${P}-libao-thread.patch
+   "${FILESDIR}"/${P}-depbuild.patch
+   "${FILESDIR}"/${P}-CC-quotes.patch
+
+   # Fix compability with libpng15 wrt #378735
+   "${FILESDIR}"/${P}-libpng15.patch
+
+   # Fix buffer overwrite #257963
+   "${FILESDIR}"/${P}-buffer.patch
+   # Fix gcc47 compile #419635
+   "${FILESDIR}"/${P}-gcc47.patch
+   # Fix stack alignment issue #503138
+   "${FILESDIR}"/${P}-stack-align-v2.patch
+
+   "${FILESDIR}"/${P}-cross-compile.patch
+   "${FILESDIR}"/${P}-arch.patch
+)
+
+src_prepare() {
+   default
+
+   # The sdl detection logic uses AC_PROG_PATH instead of
+   # AC_PROG_TOOL, so force the var to get set the way we
+   # need for things to work correctly.
+   tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config
+
+   sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
+
+  

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

2018-07-06 Thread Sergei Trofimovich
commit: 8a8acff70a555851946a478742ca154372a8e041
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul  6 21:20:59 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  6 22:33:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8acff7

sys-apps/guix: bump up to 0.15.0

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sys-apps/guix/Manifest   |   1 +
 sys-apps/guix/guix-0.15.0.ebuild | 151 +++
 2 files changed, 152 insertions(+)

diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 72cad7890cc..df9a23319f5 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,6 @@
 DIST guix-0.13.0.tar.gz 18490387 BLAKE2B 
e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f
 SHA512 
39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
 DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 
257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c
 SHA512 
635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69
+DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 
6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be
 SHA512 
5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f
 DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 
2948976 BLAKE2B 
3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a
 SHA512 
b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
 DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 
BLAKE2B 
b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc
 SHA512 
d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
 DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 
BLAKE2B 
a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11
 SHA512 
f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c

diff --git a/sys-apps/guix/guix-0.15.0.ebuild b/sys-apps/guix/guix-0.15.0.ebuild
new file mode 100644
index 000..45aca6b4d2c
--- /dev/null
+++ b/sys-apps/guix/guix-0.15.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools readme.gentoo-r1 user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/;
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+   "aarch64-linux  20170217 guile-2.0.14.tar.xz"
+   "armhf-linux20150101 guile-2.0.11.tar.xz"
+   "i686-linux 20131110 guile-2.0.9.tar.xz"
+   "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+   "x86_64-linux   20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+   local system_date_guilep uri
+   for system_date_guilep in "${BOOT_GUILE[@]}"; do
+   # $1  $2   $3
+   # "armhf-linux20150101 guile-2.0.11.tar.xz"
+   set -- ${system_date_guilep}
+   uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+   # ${uri} -> 
guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+   echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+   done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+   local system_date_guilep
+   for system_date_guilep in "${BOOT_GUILE[@]}"; do
+   # $1  $2   $3
+   # "armhf-linux20150101 guile-2.0.11.tar.xz"
+   set -- ${system_date_guilep}
+   cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap 
gnu/packages/bootstrap/$1/$3 || die
+   done
+}
+
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+   $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+   dev-libs/libgcrypt:0=
+   >=dev-scheme/guile-2:=[regex,networking,threads]
+   dev-scheme/bytestructures
+   dev-scheme/guile-git
+   dev-scheme/guile-json
+   dev-scheme/guile-sqlite3
+   net-libs/gnutls[guile]
+   sys-libs/zlib
+   

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

2018-07-06 Thread Lars Wendler
commit: 5925a392615234dd3df0511ab52876467da76301
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul  6 22:21:02 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul  6 22:21:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5925a392

dev-libs/libinput: Bump to version 1.11.2

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-libs/libinput/Manifest   |  1 +
 dev-libs/libinput/libinput-1.11.2.ebuild | 61 
 2 files changed, 62 insertions(+)

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index a388032af6f..1e44da53844 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -2,3 +2,4 @@ DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 
3f23808635406eeb66cd6b4ce2a2dbaed69ee
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B 
ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892
 SHA512 
b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
 DIST libinput-1.11.0.tar.xz 485976 BLAKE2B 
f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8
 SHA512 
382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
 DIST libinput-1.11.1.tar.xz 485064 BLAKE2B 
15ab0fddee37323f3df0b52e297ac5b0995e7db6531854852a21c7182474df0ffb136886e3d305d987dcb4f82e9f1cf3724e2f34448ef40ed1df10bd27cb2218
 SHA512 
3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
+DIST libinput-1.11.2.tar.xz 485600 BLAKE2B 
97b07493693e24be1bde3e7792c83c33b9ed4d64afbbecc1a5b77b4470fe9ff03cfbb2b4dc36f6cc5a9d58003410797979d7fbbb539d921bb9cddb5f8fb1cf0e
 SHA512 
cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65

diff --git a/dev-libs/libinput/libinput-1.11.2.ebuild 
b/dev-libs/libinput/libinput-1.11.2.ebuild
new file mode 100644
index 000..0635ed1b8fa
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.11.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/;
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live 
system.
+# Other tests are just about logs, exported symbols and autotest of the test 
library.
+RESTRICT="test"
+
+RDEPEND="
+   input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+   >=dev-libs/libevdev-1.3
+   >=sys-libs/mtdev-1.1
+   virtual/libudev:=
+   virtual/udev
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   >=app-doc/doxygen-1.8.3
+   >=media-gfx/graphviz-2.38.0
+   )
+"
+#  test? (
+#  >=dev-libs/check-0.9.10
+#  dev-util/valgrind
+#  sys-libs/libunwind )
+
+src_configure() {
+   # gui can be built but will not be installed
+   local emesonargs=(
+   -Ddebug-gui=false
+   -Ddocumentation="$(usex doc true false)"
+   -Dlibwacom="$(usex input_devices_wacom true false)"
+   -Dtests="$(usex test true false)"
+   -Dudev-dir="$(get_udevdir)"
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+   if use doc ; then
+   docinto html
+   dodoc -r "${BUILD_DIR}"/html/.
+   fi
+   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+   udevadm hwdb --update --root="${ROOT%/}"
+}



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

2018-07-06 Thread Lars Wendler
commit: 5d79c7e4a3f62da5299a89b8378badd8ea5f7bb4
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul  6 22:21:41 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul  6 22:21:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d79c7e4

dev-libs/libinput: Removed old.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-libs/libinput/Manifest   |  1 -
 dev-libs/libinput/libinput-1.11.0.ebuild | 61 
 2 files changed, 62 deletions(-)

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 1e44da53844..6dc1f8e19a6 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,4 @@
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 
3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b
 SHA512 
b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.10.7.tar.xz 494648 BLAKE2B 
ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892
 SHA512 
b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
-DIST libinput-1.11.0.tar.xz 485976 BLAKE2B 
f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8
 SHA512 
382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
 DIST libinput-1.11.1.tar.xz 485064 BLAKE2B 
15ab0fddee37323f3df0b52e297ac5b0995e7db6531854852a21c7182474df0ffb136886e3d305d987dcb4f82e9f1cf3724e2f34448ef40ed1df10bd27cb2218
 SHA512 
3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
 DIST libinput-1.11.2.tar.xz 485600 BLAKE2B 
97b07493693e24be1bde3e7792c83c33b9ed4d64afbbecc1a5b77b4470fe9ff03cfbb2b4dc36f6cc5a9d58003410797979d7fbbb539d921bb9cddb5f8fb1cf0e
 SHA512 
cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65

diff --git a/dev-libs/libinput/libinput-1.11.0.ebuild 
b/dev-libs/libinput/libinput-1.11.0.ebuild
deleted file mode 100644
index 0635ed1b8fa..000
--- a/dev-libs/libinput/libinput-1.11.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/;
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz;
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-# Tests require write access to udev rules directory which is a no-no for live 
system.
-# Other tests are just about logs, exported symbols and autotest of the test 
library.
-RESTRICT="test"
-
-RDEPEND="
-   input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-   >=dev-libs/libevdev-1.3
-   >=sys-libs/mtdev-1.1
-   virtual/libudev:=
-   virtual/udev
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? (
-   >=app-doc/doxygen-1.8.3
-   >=media-gfx/graphviz-2.38.0
-   )
-"
-#  test? (
-#  >=dev-libs/check-0.9.10
-#  dev-util/valgrind
-#  sys-libs/libunwind )
-
-src_configure() {
-   # gui can be built but will not be installed
-   local emesonargs=(
-   -Ddebug-gui=false
-   -Ddocumentation="$(usex doc true false)"
-   -Dlibwacom="$(usex input_devices_wacom true false)"
-   -Dtests="$(usex test true false)"
-   -Dudev-dir="$(get_udevdir)"
-   )
-   meson_src_configure
-}
-
-src_install() {
-   meson_src_install
-   if use doc ; then
-   docinto html
-   dodoc -r "${BUILD_DIR}"/html/.
-   fi
-   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
-   udevadm hwdb --update --root="${ROOT%/}"
-}



[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/

2018-07-06 Thread Andreas Sturmlechner
commit: a2b7a8a673f2ac3b5821cbcc6b5893e64e8dabab
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Fri Jul  6 21:59:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 22:08:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b7a8a6

app-benchmarks/stress-ng: bump to version 0.09.32

Closes: https://bugs.gentoo.org/659680
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9014

 app-benchmarks/stress-ng/Manifest |  1 +
 app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild | 28 +++
 2 files changed, 29 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest 
b/app-benchmarks/stress-ng/Manifest
index cf52f61dd84..944cdc7df1c 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 DIST stress-ng-0.09.31.tar.xz 350760 BLAKE2B 
5f839b4a4020cb3f1c5cfeafafefc576dd36f4d6c600f4cce917837ddf3f2e70349b0b76037dc2ee0e3d96fca172d65b01629559f705bdbf6f975978a79f58b1
 SHA512 
01fc32bac51adcbf98907c73bfc0c54ec9d04355d3959e7dcba208dbd85c314310cf6c5b4fe092dad53bfca54d7dfe6d292b75845bc0b0998e43f9907dbc50ac
+DIST stress-ng-0.09.32.tar.xz 352176 BLAKE2B 
c63315d619e5a712c6196dd83f8edbd2fff1b2cc2d84de67cf201b068b4dfaeaf7e130dd59b938e089298ecdc389bb7af0220076425e4de749837f46502085aa
 SHA512 
1c6ff00b46a9d05050838ea429a67be8ff899fecb13d4a9d010875d6ccc0c218c780a70efc84addc1bf874e663a47b0d1440d1f99a9c40336460c0ae4a5f702d

diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild 
b/app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild
new file mode 100644
index 000..728b7fb8433
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/;
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libaio
+   dev-libs/libbsd
+   dev-libs/libgcrypt:0=
+   net-misc/lksctp-tools
+   sys-apps/attr
+   sys-apps/keyutils
+   sys-libs/libapparmor
+   sys-libs/libcap
+   sys-libs/zlib:="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" )



[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/

2018-07-06 Thread Andreas Sturmlechner
commit: 5b596cf1bb84479c6ccf22ed933bf2c07a97fe4d
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Fri Jul  6 22:00:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 22:08:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b596cf1

app-benchmarks/stress-ng: drop old version

Bug: https://bugs.gentoo.org/659680
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-benchmarks/stress-ng/Manifest |  1 -
 app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild | 28 ---
 2 files changed, 29 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest 
b/app-benchmarks/stress-ng/Manifest
index 944cdc7df1c..d8ebd4e917a 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.09.31.tar.xz 350760 BLAKE2B 
5f839b4a4020cb3f1c5cfeafafefc576dd36f4d6c600f4cce917837ddf3f2e70349b0b76037dc2ee0e3d96fca172d65b01629559f705bdbf6f975978a79f58b1
 SHA512 
01fc32bac51adcbf98907c73bfc0c54ec9d04355d3959e7dcba208dbd85c314310cf6c5b4fe092dad53bfca54d7dfe6d292b75845bc0b0998e43f9907dbc50ac
 DIST stress-ng-0.09.32.tar.xz 352176 BLAKE2B 
c63315d619e5a712c6196dd83f8edbd2fff1b2cc2d84de67cf201b068b4dfaeaf7e130dd59b938e089298ecdc389bb7af0220076425e4de749837f46502085aa
 SHA512 
1c6ff00b46a9d05050838ea429a67be8ff899fecb13d4a9d010875d6ccc0c218c780a70efc84addc1bf874e663a47b0d1440d1f99a9c40336460c0ae4a5f702d

diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild 
b/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
deleted file mode 100644
index 7652a40c8cf..000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/;
-SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libaio
-   dev-libs/libbsd
-   dev-libs/libgcrypt:0=
-   net-misc/lksctp-tools
-   sys-apps/attr
-   sys-apps/keyutils
-   sys-libs/libapparmor
-   sys-libs/libcap
-   sys-libs/zlib:="
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )



[gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, profiles/base/, profiles/arch/amd64/, ...

2018-07-06 Thread Göktürk Yüksek
commit: 438e36ddf944c86ce960fa17e9848ada2b2b6a74
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Fri Jul  6 22:01:19 2018 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Fri Jul  6 22:06:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438e36dd

sys-apps/rng-tools: bump to v6.3

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 profiles/arch/amd64/package.use.mask   |  4 ++
 profiles/base/package.use.mask |  5 ++
 sys-apps/rng-tools/Manifest|  1 +
 .../rng-tools-6.3-jitterentropy-linking-fix.patch  | 36 +++
 sys-apps/rng-tools/metadata.xml|  3 +
 sys-apps/rng-tools/rng-tools-6.3.ebuild| 69 ++
 6 files changed, 118 insertions(+)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index 17a74679451..e1df758480b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Göktürk Yüksek  (6 Jul 2018)
+# Dependency app-crypt/jitterentropy is keyworded for amd64
+sys-apps/rng-tools -jitterentropy
+
 # Rick Farina  (27 Jun 2018)
 # Catalyst has support for assembling bootloader on this arch
 dev-util/catalyst -system-bootloader

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ed235414678..cff38ab6aaf 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Göktürk Yüksek  (6 Jul 2018)
+# Dependency app-crypt/jitterentropy is keyworded for
+# only a subset of the archs rng-tools supports
+sys-apps/rng-tools jitterentropy
+
 # Andreas Sturmlechner  (18 Jun 2018)
 # Qt4 is dead and going away. Bug #638260
 sci-libs/ViSP qt4

diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index a72ffa68065..b5c76696588 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,4 +1,5 @@
 DIST rng-tools-5.tar.gz 122182 BLAKE2B 
de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245
 SHA512 
58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
 DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 
4102c03ced36b33f9db6f7e5f77e8f918c4b9286a4c94cfd9ea9645c394f054fb3165255c3beb0f73d897d066831301f69a64e2758296b4418808343c97f3269
 SHA512 
388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9
 DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 
646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2
 SHA512 
ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174
+DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 
4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9
 SHA512 
c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13
 DIST rng-tools-6.tar.gz 26024 BLAKE2B 
a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62
 SHA512 
2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4

diff --git 
a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch 
b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
new file mode 100644
index 000..f7b87c88715
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
@@ -0,0 +1,36 @@
+From c9f795da2dbeb0e85025f6264321aef1ba12059e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= 
+Date: Fri, 6 Jul 2018 17:20:28 -0400
+Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
+
+---
+ Makefile.am | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b80e9a0..5d33aaf 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -2,9 +2,7 @@
+ ## Toplevel Makefile.am for rng-tools
+ ##
+ if JITTER
+- JSUBDIR = jitterentropy-library
+- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
+- AM_CPPFLAGS = -I./jitterentropy-library
++ jitterentropy_LIBS = -ljitterentropy
+ endif
+ 
+ SUBDIRS   = contrib tests $(JSUBDIR) 
+@@ -33,7 +31,7 @@ if JITTER
+ rngd_SOURCES  += rngd_jitter.c
+ endif
+ 
+-rngd_LDADD= librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} 
${openssl_LIBS}
++rngd_LDADD= librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} 
${libxml2_LIBS} 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/jitterentropy/, app-crypt/jitterentropy/files/

2018-07-06 Thread Göktürk Yüksek
commit: 0c858706cfe15be83cbf86ff847c8f2ed2565c89
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Fri Jul  6 19:24:15 2018 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Fri Jul  6 22:06:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c858706

app-crypt/jitterentropy: initial commit with version 2.1.1

The Jitter RNG provides a noise source using the CPU execution timing
jitter.

It is an optional dependency for >=rng-tools-6.3.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-crypt/jitterentropy/Manifest   |  1 +
 .../files/jitterentropy-2.1.1-destdir-fix.patch| 37 +++
 app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild | 41 ++
 app-crypt/jitterentropy/metadata.xml   | 18 ++
 4 files changed, 97 insertions(+)

diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
new file mode 100644
index 000..32b6d5221e5
--- /dev/null
+++ b/app-crypt/jitterentropy/Manifest
@@ -0,0 +1 @@
+DIST jitterentropy-2.1.1.tar.gz 23804 BLAKE2B 
e208c87b414939485c16c6e94460020164e77089d5ac69f8627f8f1dfb38f211ff985c7fa5d32f647f1b06f065f86dc9070aea9b481e8251ecdecbfb4724ce08
 SHA512 
fb1b76278e03f425be06c8b66532e3997a07f91645393317f42681b1113bd31dfdf348bd18c92d0dfc153c85b75f8f968fe070e988f1a02e4ef4e09435b6cef8

diff --git 
a/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch 
b/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch
new file mode 100644
index 000..cdcc2a57756
--- /dev/null
+++ b/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch
@@ -0,0 +1,37 @@
+From 4b5dc596547e0833e2cccf65efa46ecbe7d0b99c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= 
+Date: Fri, 6 Jul 2018 14:41:52 -0400
+Subject: [PATCH] Makefile: add support for $(DESTDIR) in install target
+
+Allow install target to install into an arbitrary root instead of '/'
+by prefixing $(PREFIX) with $(DESTDIR).
+---
+ Makefile | 12 +++-
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c38b800..2c778f2 100644
+--- a/Makefile
 b/Makefile
+@@ -44,11 +44,13 @@ scan:  $(OBJS)
+   scan-build --use-analyzer=/usr/bin/clang $(CC) -shared 
-Wl,-soname,lib$(NAME).so.$(LIBMAJOR) -o lib$(NAME).so.$(LIBVERSION) $(OBJS) 
$(LDFLAGS)
+ 
+ install:
+-  install -m 644 doc/$(NAME).3 $(PREFIX)/share/man/man3/
+-  gzip -9 $(PREFIX)/share/man/man3/$(NAME).3
+-  install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/
+-  $(RM) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+-  ln -s lib$(NAME).so.$(LIBVERSION) 
$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
++  install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
++  install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
++  gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
++  install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
++  install -m 0755 -s lib$(NAME).so.$(LIBVERSION) 
$(DESTDIR)$(PREFIX)/$(LIBDIR)/
++  $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
++  ln -s lib$(NAME).so.$(LIBVERSION) 
$(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+ 
+ clean:
+   @- $(RM) $(NAME)
+-- 
+2.17.0
+

diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild 
b/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
new file mode 100644
index 000..70e643f4080
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hardware RNG based on CPU timing jitter"
+HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library;
+SRC_URI="https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.1-destdir-fix.patch
+)
+
+S="${WORKDIR}/${PN}-library-${PV}"
+
+src_prepare() {
+   default
+
+   # Disable man page compression on install
+   sed -e '/\tgzip.*man/ d' -i Makefile || die
+   # Let the package manager handle stripping
+   sed -e '/\tinstall.*-s / s/-s //g' -i Makefile || die
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)"
+}
+
+src_install() {
+   emake PREFIX="${EPREFIX}/usr" \
+ LIBDIR="$(get_libdir)" \
+ DESTDIR="${D}" install
+   dosym lib${PN}.so.${PV} "/usr/$(get_libdir)"/lib${PN}.so
+   doheader ${PN}.h ${PN}-base-user.h
+}

diff --git a/app-crypt/jitterentropy/metadata.xml 
b/app-crypt/jitterentropy/metadata.xml
new file mode 100644
index 000..4cf1945b408
--- /dev/null
+++ b/app-crypt/jitterentropy/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   gokt...@gentoo.org
+   Göktürk Yüksek
+
+
+   The Jitter RNG 

[gentoo-commits] repo/gentoo:master commit in: dev-java/dnsjava/

2018-07-06 Thread Patrice Clement
commit: 17cbbe79b97bbfa1a6d20aeffb62619d6f1cdbb3
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Jul  6 21:59:14 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jul  6 21:59:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cbbe79

dev-java/dnsjava: version bump.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-java/dnsjava/Manifest |  1 +
 dev-java/dnsjava/dnsjava-2.1.8.ebuild | 50 +++
 2 files changed, 51 insertions(+)

diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
index 0ef6cac488e..8241ec16e4d 100644
--- a/dev-java/dnsjava/Manifest
+++ b/dev-java/dnsjava/Manifest
@@ -1,2 +1,3 @@
 DIST dnsjava-2.1.6.tar.gz 1087908 BLAKE2B 
af9edda95d8cdd9c02b39c5a86646efc85cef576361d4ab765ce65d8b6e20621bcbdc9e32327f8ae1a3e2cbb83e60d61736ce9d71ae3bd091b0fca306727e158
 SHA512 
0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497
 DIST dnsjava-2.1.7.tar.gz 1078980 BLAKE2B 
16fd027c6f46463d6b4322bcf88943a3f06186d853a7e5615b8829d93aee897dca489dec00d61af857d58df566905c559e1c8d9922f5592ef2146bc715dc9b0b
 SHA512 
07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd
+DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 
761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1
 SHA512 
d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b

diff --git a/dev-java/dnsjava/dnsjava-2.1.8.ebuild 
b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
new file mode 100644
index 000..9cb312e010d
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of DNS in Java"
+HOMEPAGE="http://www.dnsjava.org/;
+SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+   test? (
+   dev-java/junit:0
+   dev-java/ant-junit:0
+   )"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="run_tests"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
+
+src_prepare() {
+   default
+   java-pkg_clean
+   #epatch "${FILESDIR}"/*.patch
+}
+
+src_install() {
+   java-pkg_newjar "${P}.jar"
+
+   einstalldocs
+   use doc && java-pkg_dojavadoc doc
+   use source && java-pkg_dosrc org/
+}
+
+src_test() {
+   EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
+}



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

2018-07-06 Thread Andreas Sturmlechner
commit: 784449da19027b79ac828230f6c87d01ab0d1430
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 24 15:18:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784449da

net-misc/snarf: EAPI7, improve ebuild

 net-misc/snarf/snarf-7.0-r4.ebuild | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/net-misc/snarf/snarf-7.0-r4.ebuild 
b/net-misc/snarf/snarf-7.0-r4.ebuild
new file mode 100644
index 000..dacf70a7a6c
--- /dev/null
+++ b/net-misc/snarf/snarf-7.0-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
+HOMEPAGE="https://www.xach.com/snarf/;
+SRC_URI="https://www.xach.com/snarf/${P}.tar.gz;
+
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=(
+   "${FILESDIR}"/snarf-basename-patch.diff
+   "${FILESDIR}"/snarf-unlink-empty.diff
+   "${FILESDIR}"/snarf-fix-off-by-ones.diff
+)
+
+src_compile() {
+   emake CC="$(tc-getCC)"
+}
+
+src_install() {
+   dobin snarf
+   doman snarf.1
+   dodoc ChangeLog README TODO
+}
+
+pkg_postinst() {
+   elog 'To use snarf with portage, try these settings in your make.conf'
+   elog
+   elog '  FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"'
+   elog '  RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"'
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-06 Thread Andreas Sturmlechner
commit: 1a09f8900a68d4fae17d11d3b0dfbce9017f
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:30:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a09f890

games-fps/urbanterror-data: Bump to 4.3.4

Bug: https://bugs.gentoo.org/658962
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9017

 games-fps/urbanterror-data/Manifest|  1 +
 .../urbanterror-data/urbanterror-data-4.3.4.ebuild | 65 ++
 2 files changed, 66 insertions(+)

diff --git a/games-fps/urbanterror-data/Manifest 
b/games-fps/urbanterror-data/Manifest
index a43a3e00145..0d0c3b281c1 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -2,3 +2,4 @@ DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B 
a4562c81169274e6f7685c9
 DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 
2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3
 SHA512 
2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B 
d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d
 SHA512 
cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B 
edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730
 SHA512 
f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
+DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 
95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577
 SHA512 
05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
new file mode 100644
index 000..0fbf3555118
--- /dev/null
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit check-reqs eutils
+
+ENGINE_PV=${PV}
+
+MY_PN=UrbanTerror
+MY_PV=43_full
+
+DESCRIPTION="Data files for UrbanTerror"
+HOMEPAGE="http://www.urbanterror.info;
+
+# load the base image and save it as .0 file
+# use 43_full-2.zip as upstream fixed something back then
+SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
+
+# fetch updates recursively for |4.3.x-4.3.0|
+if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+fi
+unset MY_CTR
+
+LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}43"
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
+
+src_prepare() {
+   default
+
+   # apply updates we fetched before
+   # again recursively for |4.3.x - 4.3.0|
+   local MY_CTR
+   if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   cp -dfpr \
+   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+   fi
+}
+
+src_install() {
+   insinto /usr/share/urbanterror/q3ut4
+   doins q3ut4/*.pk3
+   # These files are *essential* for startup
+   newins q3ut4/server_example.cfg server.cfg
+   newins q3ut4/autoexec_example.cfg autoexec.cfg
+
+   dodoc q3ut4/readme43.txt
+   docinto examples
+   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-07-06 Thread Andreas Sturmlechner
commit: 68da6677f50156630d9d8463996da24d878fd7d1
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:31:01 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68da6677

games-fps/urbanterror: Drop old version 4.3.3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-fps/urbanterror/Manifest |   2 -
 .../urbanterror/urbanterror-4.3.3_p20180218.ebuild | 167 
 .../urbanterror/urbanterror-4.3.3_p20180410.ebuild | 170 -
 3 files changed, 339 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 24fb99b754a..d52c2c83a4b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,3 +1 @@
-DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
-DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B 
c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd
 SHA512 
ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
 DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 
179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218
 SHA512 
8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef

diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
deleted file mode 100644
index e211e749ba5..000
--- a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="d93f05de38a6cae60fbf0f073aace64b3adc7aaf"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE="|| ( client server )
-   voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
-   "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? ( media-libs/libvorbis:= )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.3
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local my_arch=$(usex amd64 "x86_64" "i386")
-
-   emake \
-   ARCH=${my_arch} \
-   DEFAULT_BASEDIR="/usr/share/urbanterror" \
-   BUILD_CLIENT=$(usex "client" 1 0) \
-   BUILD_SERVER=$(usex "server" 1 0) \
-   BUILD_BASEGAME=1 \
-   BUILD_MISSIONPACK=0 \
-   BUILD_GAME_SO=0 \
-   BUILD_GAME_QVM=0 \
-   BUILD_STANDALONE=1 \
-   SERVERBIN="Quake3-UrT-Ded" \
-   CLIENTBIN="Quake3-UrT" \
-   USE_RENDERER_DLOPEN=0 \
-   USE_YACC=0 \
-   BASEGAME="q3ut4"\
-   BASEGAME_CFLAGS="${CFLAGS}" \
-   USE_OPENAL=$(usex "openal" 1 0) \
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-   USE_CURL=$(usex 

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

2018-07-06 Thread Andreas Sturmlechner
commit: fe24c81c447c2e0eacd1194024c0fc3e0ddd3167
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Mon Jul  2 12:06:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe24c81c

dev-util/vint: verbump to 0.3.19

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

 dev-util/vint/Manifest   |  1 +
 dev-util/vint/vint-0.3.19.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index a9bc75ea435..25608badb87 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1 +1,2 @@
 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 
0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53
 SHA512 
1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
+DIST vint-0.3.19.tar.gz 96755 BLAKE2B 
0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5
 SHA512 
b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9

diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
new file mode 100644
index 000..1e5cc17ad27
--- /dev/null
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -0,0 +1,39 @@
+# 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 distutils-r1
+
+DESCRIPTION="Lint tool for Vim script language"
+HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/;
+SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+   >=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
+   >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+   virtual/python-enum34[${PYTHON_USEDEP}]
+   virtual/python-pathlib[${PYTHON_USEDEP}]
+   virtual/python-typing[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+   >=dev-python/pytest-3.3.2[${PYTHON_USEDEP}]
+   >=dev-python/pytest-cov-2.5.1[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep 
'>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+   )
+"
+
+python_test() {
+   py.test -v || die "Test suite failed with ${EPYTHON}"
+}



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

2018-07-06 Thread Andreas Sturmlechner
commit: 93732127da94577948bdc3bad38d0f344854b4b5
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 24 15:23:36 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93732127

net-misc/netpipe: EAPI7, improve ebuild

 net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild 
b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
new file mode 100644
index 000..dbdaac08b10
--- /dev/null
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting 
techniques"
+HOMEPAGE="https://www.wudika.de/~jan/netpipe/;
+SRC_URI="https://www.wudika.de/~jan/${PN}/${PN}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+   sed -i \
+   -e "s:^OPT=.*:OPT = ${CFLAGS} ${LDFLAGS}:" \
+   -e "s:^CC=.*:CC = $(tc-getCC):" \
+   Makefile || die "sed failed"
+   default
+}
+
+src_install() {
+   dobin netpipe
+   dodoc DOCUMENTATION INSTALL TECH-NOTES
+}



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

2018-07-06 Thread Andreas Sturmlechner
commit: d52f35a6e816bfa67b4144f74866342d6c668a41
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 24 15:07:58 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52f35a6

net-misc/snarf: use HTTPs

Closes: https://github.com/gentoo/gentoo/pull/9023

 net-misc/snarf/snarf-7.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/snarf/snarf-7.0-r3.ebuild 
b/net-misc/snarf/snarf-7.0-r3.ebuild
index ad4c94916f1..398ad27531d 100644
--- a/net-misc/snarf/snarf-7.0-r3.ebuild
+++ b/net-misc/snarf/snarf-7.0-r3.ebuild
@@ -7,8 +7,8 @@ inherit eutils
 
 IUSE=""
 DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
-SRC_URI="http://www.xach.com/snarf/${P}.tar.gz;
-HOMEPAGE="http://www.xach.com/snarf/;
+SRC_URI="https://www.xach.com/snarf/${P}.tar.gz;
+HOMEPAGE="https://www.xach.com/snarf/;
 KEYWORDS="alpha amd64 ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"



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

2018-07-06 Thread Andreas Sturmlechner
commit: 3b93411d2e401cbd569f2f4390061964652ad0a0
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 24 14:53:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b93411d

app-text/htmlrecode: EAPI7, improve ebuild

 app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild | 41 ++
 1 file changed, 41 insertions(+)

diff --git a/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild 
b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
new file mode 100644
index 000..4b9258115b9
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recodes HTML file using a new character set"
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html;
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2;
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-ar.patch" )
+
+src_prepare() {
+   touch .depend argh/.depend || die
+   default
+}
+
+src_configure() { :; }
+
+src_compile() {
+   local makeopts=(
+   AR="$(tc-getAR)"
+   CPPDEBUG=
+   CXX="$(tc-getCXX)"
+   CXXFLAGS="${CXXFLAGS}"
+   LDFLAGS="${LDFLAGS}"
+   )
+   emake "${makeopts[@]}" -C argh libargh.a
+   emake "${makeopts[@]}" htmlrecode
+}
+
+src_install() {
+   dobin htmlrecode
+   dodoc README.html
+}



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

2018-07-06 Thread Andreas Sturmlechner
commit: 31316d3d3e68e7282fff7dc25ee365e5449a5509
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 24 15:19:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31316d3d

net-misc/netpipe: use HTTPs

Closes: https://github.com/gentoo/gentoo/pull/9024

 net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild | 4 ++--
 net-misc/netpipe/netpipe-1.0.0_beta2.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild 
b/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
index ec826724d25..af216cb7ee0 100644
--- a/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=0
 inherit toolchain-funcs
 
 DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting 
techniques"
-HOMEPAGE="http://www.wudika.de/~jan/netpipe/;
-SRC_URI="http://www.wudika.de/~jan/${PN}/${PN}.tar.gz;
+HOMEPAGE="https://www.wudika.de/~jan/netpipe/;
+SRC_URI="https://www.wudika.de/~jan/${PN}/${PN}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild 
b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
index a32e5c187ac..4c8855a3fed 100644
--- a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
@@ -6,8 +6,8 @@ EAPI=0
 inherit toolchain-funcs
 
 DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting 
techniques"
-HOMEPAGE="http://www.wudika.de/~jan/netpipe/;
-SRC_URI="http://www.wudika.de/~jan/netpipe/${PN}.tar.gz;
+HOMEPAGE="https://www.wudika.de/~jan/netpipe/;
+SRC_URI="https://www.wudika.de/~jan/netpipe/${PN}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-06 Thread Andreas Sturmlechner
commit: 32d63e76b6e810dd50bcf403ab9f1da30cf161f0
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:30:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d63e76

games-fps/urbanterror-data: Drop old version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../urbanterror-data/urbanterror-data-4.3.3.ebuild | 65 --
 1 file changed, 65 deletions(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
deleted file mode 100644
index 0fbf3555118..000
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit check-reqs eutils
-
-ENGINE_PV=${PV}
-
-MY_PN=UrbanTerror
-MY_PV=43_full
-
-DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info;
-
-# load the base image and save it as .0 file
-# use 43_full-2.zip as upstream fixed something back then
-SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
-
-# fetch updates recursively for |4.3.x-4.3.0|
-if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-fi
-unset MY_CTR
-
-LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
-
-src_prepare() {
-   default
-
-   # apply updates we fetched before
-   # again recursively for |4.3.x - 4.3.0|
-   local MY_CTR
-   if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   cp -dfpr \
-   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-   fi
-}
-
-src_install() {
-   insinto /usr/share/urbanterror/q3ut4
-   doins q3ut4/*.pk3
-   # These files are *essential* for startup
-   newins q3ut4/server_example.cfg server.cfg
-   newins q3ut4/autoexec_example.cfg autoexec.cfg
-
-   dodoc q3ut4/readme43.txt
-   docinto examples
-   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
-}



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

2018-07-06 Thread Andreas Sturmlechner
commit: eefaa285f02f3f87690e6e754b58fd38274788bc
Author: Diogo Pereira  gmail  com>
AuthorDate: Wed Jun 27 03:55:53 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefaa285

media-sound/pnmixer: update maintainer

Add myself as proxied maintainer.

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

 media-sound/pnmixer/metadata.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
index 0877b41108a..6c7b2a84125 100644
--- a/media-sound/pnmixer/metadata.xml
+++ b/media-sound/pnmixer/metadata.xml
@@ -1,6 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   sir.su...@gmail.com
+   Diogo Pereira
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

PNMixer is a simple mixer application designed to run in your 
system
tray. It integrates nicely into desktop environments that don't 
have



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

2018-07-06 Thread Andreas Sturmlechner
commit: 90299da861f668eed9ec525fee56672c035b8c62
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Jun 28 18:39:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90299da8

net-dns/valtz: use HTTPs

Closes: https://github.com/gentoo/gentoo/pull/9020

 net-dns/valtz/valtz-0.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/valtz/valtz-0.7.ebuild b/net-dns/valtz/valtz-0.7.ebuild
index 7df2526b1de..6601585cf11 100644
--- a/net-dns/valtz/valtz-0.7.ebuild
+++ b/net-dns/valtz/valtz-0.7.ebuild
@@ -4,8 +4,8 @@
 EAPI=0
 
 DESCRIPTION="Validation tool for tinydns-data zone files"
-SRC_URI="http://x42.com/software/valtz/${PN}.tgz;
-HOMEPAGE="http://x42.com/software/valtz/;
+SRC_URI="https://x42.com/software/valtz/${PN}.tgz;
+HOMEPAGE="https://x42.com/software/valtz/;
 IUSE=""
 
 SLOT="0"



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

2018-07-06 Thread Andreas Sturmlechner
commit: 888941185b4a5a3ee95a1f3dd86c1093d7d18ef6
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Jun 28 18:40:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88894118

net-dns/valtz: add EAPI7 ebuild

 net-dns/valtz/valtz-0.7-r1.ebuild | 20 
 1 file changed, 20 insertions(+)

diff --git a/net-dns/valtz/valtz-0.7-r1.ebuild 
b/net-dns/valtz/valtz-0.7-r1.ebuild
new file mode 100644
index 000..4e9cc257f22
--- /dev/null
+++ b/net-dns/valtz/valtz-0.7-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Validation tool for tinydns-data zone files"
+SRC_URI="https://x42.com/software/valtz/${PN}.tgz;
+HOMEPAGE="https://x42.com/software/valtz/;
+IUSE=""
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+   dobin valtz
+   dodoc README CHANGES
+}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/linssid/

2018-07-06 Thread Andreas Sturmlechner
commit: 74f10fd5ab8923dd012d5a161d6c3f4efe024da7
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Thu Jul  5 08:19:19 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f10fd5

net-wireless/linssid: drop old version

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-wireless/linssid/Manifest  |  1 -
 net-wireless/linssid/linssid-3.5-r1.ebuild | 70 --
 2 files changed, 71 deletions(-)

diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 240b5a574f0..fbb32192ee6 100644
--- a/net-wireless/linssid/Manifest
+++ b/net-wireless/linssid/Manifest
@@ -1,2 +1 @@
-DIST linssid_3.5.orig.tar.gz 396769 BLAKE2B 
f2d04af5d990a51cce8501309fcf14090e262b531ec6b914c3373d4bf0cb2d2bfed9ead81a21e2dfe5a3f7bf2cef3d400aadb216604317946a8dc4938298246a
 SHA512 
874f428a6a6de34404b57601f016f9e417e75578ec5c5c0661fa614f2bde80d732132d31880f7b947a7178b0fcaf6b00bb3c317a652346d50009ce814b46f7b1
 DIST linssid_3.6.orig.tar.gz 397541 BLAKE2B 
35d56cc9439a3a117200c59a03dad3a53bbecbe522a5592ba4cd6a5d37332c4b8c6ec065b7357643bda6b7b54462d720e3ee0b3efcb5a80e14c809330d84fc2b
 SHA512 
066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5

diff --git a/net-wireless/linssid/linssid-3.5-r1.ebuild 
b/net-wireless/linssid/linssid-3.5-r1.ebuild
deleted file mode 100644
index 3b0e116ee02..000
--- a/net-wireless/linssid/linssid-3.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Graphical wireless scanning for Linux"
-HOMEPAGE="https://sourceforge.net/projects/linssid/;
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="policykit"
-
-DEPEND="dev-libs/boost:=
-   dev-qt/qtcore:5
-   dev-qt/qtopengl:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   x11-libs/qwt:6[opengl,qt5(+),svg]"
-
-RDEPEND="net-wireless/iw
-   x11-libs/libxkbcommon[X]
-   policykit? ( sys-auth/polkit )
-   !policykit? ( app-admin/sudo
-   x11-libs/gksu )
-   ${DEPEND}"
-
-S="${WORKDIR}/${P}/${PN}-app"
-
-DOCS=( README_${PV} )
-
-src_prepare() {
-   # Use system qwt for compiling
-   sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro 
|| die
-
-   # Fix lib path for x11-libs/qwt
-   if use amd64; then
-   sed -i -e 
"s/lib\/libqwt-qt5.so.6/\/$(get_libdir)\/libqwt6-qt5.so.6/" linssid-app.pro || 
die
-   fi
-
-   # Enable 'gksu' when a user don't want policykit
-   if ! use policykit; then
-   sed -i -e 's/Exec=.*/Exec=gksu linssid/' linssid.desktop || die
-   fi
-
-   default
-}
-
-src_configure() {
-   eqmake5
-}
-
-src_install() {
-   emake INSTALL_ROOT="${D}" install
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   xdg_mimeinfo_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/linssid/

2018-07-06 Thread Andreas Sturmlechner
commit: b24c9c0018244fd1e21978b92593ef4e22234b0b
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Thu Jul  5 08:17:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24c9c00

net-wireless/linssid: don't use hard coded path for qwt6-qt5

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

 net-wireless/linssid/linssid-3.6.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net-wireless/linssid/linssid-3.6.ebuild 
b/net-wireless/linssid/linssid-3.6.ebuild
index 3b0e116ee02..79d6ce72d29 100644
--- a/net-wireless/linssid/linssid-3.6.ebuild
+++ b/net-wireless/linssid/linssid-3.6.ebuild
@@ -37,9 +37,7 @@ src_prepare() {
sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro 
|| die
 
# Fix lib path for x11-libs/qwt
-   if use amd64; then
-   sed -i -e 
"s/lib\/libqwt-qt5.so.6/\/$(get_libdir)\/libqwt6-qt5.so.6/" linssid-app.pro || 
die
-   fi
+   sed -i -e '/libqwt-qt5.so.6/c\LIBS += -lqwt6-qt5' linssid-app.pro || die
 
# Enable 'gksu' when a user don't want policykit
if ! use policykit; then



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

2018-07-06 Thread Andreas Sturmlechner
commit: 5cf14cfa6ad3942a2827d3bf01590f7aeb4d18ed
Author: Diogo Pereira  gmail  com>
AuthorDate: Fri Jul  6 21:32:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf14cfa

media-sound/pnmixer: version bump to 0.7.2

- Make gettext dependency optional, controlled by the nls USE flag
- New doc USE flag, for building the documentation using doxygen

Closes: https://bugs.gentoo.org/657242
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/pnmixer/Manifest |  1 +
 media-sound/pnmixer/pnmixer-0.7.2.ebuild | 51 
 2 files changed, 52 insertions(+)

diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 08d1b59c3ae..346ad164820 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -1,2 +1,3 @@
 DIST pnmixer-0.6_pre20111213.tar.xz 131328 BLAKE2B 
dabfa6e8270116eb325dc6dfd59c6f650975f1efce27603b0495f11efebd743aaba17ad19efba82d4c1d75753418a89295277853c9095d6a4fffdf6b17c5b9fe
 SHA512 
967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4
 DIST pnmixer-0.7.1.tar.gz 237949 BLAKE2B 
87b309f3dd844009abe5f5bb2c5ca16ba80069932c2833a9d472130a6f0d7c36a050dc393bca097372c44fca5f90742cfad07c40a6f51ff877080f5eee25b2d2
 SHA512 
08d83424d921ef6112700fe8c3b55e147ace7767698a9d3ee4bb79ed0e727be7bcc82d55d3debc4b805e75f07c5702443be157e1bccce44d76072c36f8825816
+DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 
368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489
 SHA512 
9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186

diff --git a/media-sound/pnmixer/pnmixer-0.7.2.ebuild 
b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
new file mode 100644
index 000..346e7d99739
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer;
+SRC_URI="https://github.com/nicklan/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc libnotify nls"
+
+RDEPEND="dev-libs/glib:2
+   media-libs/alsa-lib
+   x11-libs/gtk+:3
+   x11-libs/libX11
+   libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   media-gfx/graphviz
+   )
+   nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_LIBNOTIFY="$(usex libnotify)"
+   -DENABLE_NLS="$(usex nls)"
+   -DBUILD_DOCUMENTATION="$(usex doc)"
+   -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-07-06 Thread Andreas Sturmlechner
commit: 358fca68df1bfb0e7099e260b1d22c9d6ade0c3d
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:30:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358fca68

games-fps/urbanterror: Bump to 4.3.4_p20180627

Closes: https://bugs.gentoo.org/658962
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.4_p20180627.ebuild | 170 +
 2 files changed, 171 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 66630f2fd9b..24fb99b754a 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1,3 @@
 DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
 DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B 
c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd
 SHA512 
ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
+DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 
179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218
 SHA512 
8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
new file mode 100644
index 000..04d4459533e
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE="|| ( client server )
+   voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
+   "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
+)
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? ( media-libs/libvorbis:= )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.4
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local myemakeargs=(
+   ARCH=$(usex amd64 "x86_64" "i686" )
+   DEFAULT_BASEDIR="/usr/share/urbanterror"
+   BUILD_CLIENT=$(usex "client" 1 0)
+   BUILD_SERVER=$(usex "server" 1 0)
+   BUILD_BASEGAME=1
+   BUILD_MISSIONPACK=0
+   BUILD_GAME_SO=0
+   BUILD_GAME_QVM=0
+   BUILD_STANDALONE=1
+   SERVERBIN="Quake3-UrT-Ded"
+   CLIENTBIN="Quake3-UrT"
+   USE_RENDERER_DLOPEN=0
+   USE_YACC=0
+   BASEGAME="q3ut4"
+   BASEGAME_CFLAGS="${CFLAGS}"
+   USE_OPENAL=$(usex "openal" 1 0)
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+   USE_CURL=$(usex "curl" 1 0)
+   USE_CURL_DLOPEN=$(usex "curl" 1 0)
+   

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

2018-07-06 Thread Andreas Sturmlechner
commit: 5fdc6adbe259d242a72b0b086b9e8f2e164dde1a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jun 24 14:46:46 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdc6adb

app-text/htmlrecode: use HTTPs

Closes: https://github.com/gentoo/gentoo/pull/9021

 app-text/htmlrecode/htmlrecode-1.3.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild 
b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
index 62baa2ad62e..1174c57d9c7 100644
--- a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
+++ b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Recodes HTML file using a new character set"
-HOMEPAGE="http://bisqwit.iki.fi/source/htmlrecode.html;
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2;
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html;
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2;
 
 KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2"



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

2018-07-06 Thread Sergei Trofimovich
commit: bacb85aabf5112d77daecf02a1028522b0fa7eb1
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jul  4 16:29:11 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  6 20:44:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacb85aa

sys-apps/nix: remove unused patch

 sys-apps/nix/files/nix-1.11.6-per-user.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/sys-apps/nix/files/nix-1.11.6-per-user.patch 
b/sys-apps/nix/files/nix-1.11.6-per-user.patch
deleted file mode 100644
index 9cea685c59a..000
--- a/sys-apps/nix/files/nix-1.11.6-per-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-By default created symlink poins to a directory not accessible by user.
-Make a symlink the same way NixOS does symlinking.
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 672d1f0..e3b0978 100644
 a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -6,3 +6,3 @@ if [ -n "$HOME" ]; then
- echo "creating $NIX_LINK" >&2
--_NIX_DEF_LINK=@localstatedir@/nix/profiles/default
-+_NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
- @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"



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

2018-07-06 Thread Sergei Trofimovich
commit: 48f201e4132579d760bac89bb02085d864489a38
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jul  4 16:28:24 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  6 20:44:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f201e4

media-sound/xmms2: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/9048

 media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch  | 123 ---
 media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch  | 171 -
 media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch  | 388 -
 media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch  | 296 
 media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch  | 154 
 media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch  | 106 --
 media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch  | 147 
 media-sound/xmms2/files/xmms2-0.8-cpython.patch|   9 -
 .../xmms2/files/xmms2-0.8-cython-0.19.1.patch  |  47 ---
 .../xmms2/files/xmms2-0.8-ffmpeg-0.11.patch|  18 -
 media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch |  50 ---
 media-sound/xmms2/files/xmms2-0.8-libav-9.patch|  20 --
 media-sound/xmms2/files/xmms2-0.8-memset.patch |  19 -
 media-sound/xmms2/files/xmms2-0.8-modpug.patch |  11 -
 media-sound/xmms2/files/xmms2-0.8-samba-4.patch|  30 --
 15 files changed, 1589 deletions(-)

diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch 
b/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch
deleted file mode 100644
index 21ed6492a44..000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-commit 8831bc77d705c03b3f8081de0520dd10afa85c69
-Author: Uli Franke 
-Date:   Tue Jan 17 23:23:46 2012 +0100
-
-BUG(2509): Avoid unaligned reads in avcodec xform.
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index fe58fc5..1b4a659 100644
 a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -36,6 +36,9 @@ typedef struct {
-   guint buffer_size;
-   gboolean no_demuxer;
- 
-+  gchar *read_out_buffer;
-+  gint read_out_buffer_size;
-+
-   guint channels;
-   guint samplerate;
-   xmms_sample_format_t sampleformat;
-@@ -107,6 +110,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
- 
-   avcodec_close (data->codecctx);
-   av_free (data->codecctx);
-+  av_free (data->read_out_buffer);
- 
-   g_string_free (data->outbuf, TRUE);
-   g_free (data->buffer);
-@@ -132,6 +136,9 @@ xmms_avcodec_init (xmms_xform_t *xform)
-   data->buffer_size = AVCODEC_BUFFER_SIZE;
-   data->codecctx = NULL;
- 
-+  data->read_out_buffer = av_malloc (AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+  data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+
-   xmms_xform_private_data_set (xform, data);
- 
-   avcodec_init ();
-@@ -196,7 +203,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
-   } else {
-   /* A demuxer plugin forgot to give decoder config? */
-   xmms_log_error ("Decoder config data not found!");
--  return FALSE;
-+  goto err;
-   }
-   }
- 
-@@ -220,7 +227,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- 
-   /* some codecs need to have something read before they set
-* the samplerate and channels correctly, unfortunately... */
--  if ((ret = xmms_avcodec_read (xform, buf, 42, )) > 0) {
-+  if ((ret = xmms_avcodec_read (xform, buf, sizeof (buf), 
)) > 0) {
-   g_string_insert_len (data->outbuf, 0, buf, ret);
-   } else {
-   XMMS_DBG ("First read failed, codec is not working...");
-@@ -251,6 +258,9 @@ err:
-   if (data->codecctx) {
-   av_free (data->codecctx);
-   }
-+  if (data->read_out_buffer) {
-+  av_free (data->read_out_buffer);
-+  }
-   g_string_free (data->outbuf, TRUE);
-   g_free (data->extradata);
-   g_free (data);
-@@ -263,8 +273,7 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t 
*buf, gint len,
-xmms_error_t *error)
- {
-   xmms_avcodec_data_t *data;
--  char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
--  gint outbufsize, bytes_read = 0;
-+  gint bytes_read = 0;
-   guint size;
- 
-   data = xmms_xform_private_data_get (xform);
-@@ -330,9 +339,9 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t 
*buf, gint len,
-   packet.data = data->buffer;
-   packet.size = data->buffer_length;
- 
--  outbufsize = sizeof (outbuf);
--  bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) 
outbuf,
--  , );
-+  data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+  bytes_read = avcodec_decode_audio3 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/spl/, sys-fs/zfs-kmod/, sys-fs/zfs/

2018-07-06 Thread Jonathan Vasquez
commit: d8468290f9b5a6fb92ff8727b07f6c16457e95a6
Author: Jonathan Vasquez  gentoo  org>
AuthorDate: Fri Jul  6 20:31:27 2018 +
Commit: Jonathan Vasquez  gentoo  org>
CommitDate: Fri Jul  6 20:33:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8468290

sys-fs/zfs: stabilizing 0.7.9 on amd64.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild | 2 +-
 sys-fs/zfs/zfs-0.7.9.ebuild   | 2 +-
 sys-kernel/spl/spl-0.7.9.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
index d71cf40662e..c8153afff87 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
@@ -10,7 +10,7 @@ if [ ${PV} == "" ]; then
 else

SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz;
S="${WORKDIR}/zfs-${PV}"
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils

diff --git a/sys-fs/zfs/zfs-0.7.9.ebuild b/sys-fs/zfs/zfs-0.7.9.ebuild
index 50e65577414..e8cc8f1940d 100644
--- a/sys-fs/zfs/zfs-0.7.9.ebuild
+++ b/sys-fs/zfs/zfs-0.7.9.ebuild
@@ -10,7 +10,7 @@ if [ ${PV} == "" ] ; then
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else

SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz;
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 
systemd toolchain-funcs udev

diff --git a/sys-kernel/spl/spl-0.7.9.ebuild b/sys-kernel/spl/spl-0.7.9.ebuild
index d8a0446f573..871dba52938 100644
--- a/sys-kernel/spl/spl-0.7.9.ebuild
+++ b/sys-kernel/spl/spl-0.7.9.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
 else

SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 inherit flag-o-matic linux-info linux-mod autotools-utils



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

2018-07-06 Thread Mike Gilbert
commit: 41523faa26fe1abeb3f18c4c08588dbc89ae395c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jul  6 20:28:15 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jul  6 20:29:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41523faa

dev-python/numba: run tests in verbose mode

Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247

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

diff --git a/dev-python/numba/numba-0.37.0.ebuild 
b/dev-python/numba/numba-0.37.0.ebuild
index d716ed6e7c5..9c836f6b01c 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -29,8 +29,8 @@ DEPEND="${RDEPEND}
 "
 
 python_test() {
-   cd "${BUILD_DIR}"/lib* || die
-   ${EPYTHON} -c "import numba; numba.test()" || die
+   cd "${BUILD_DIR}/lib" || die
+   ${EPYTHON} -m numba.runtests -v || die
 }
 
 python_install_all() {



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

2018-07-06 Thread William Hubbs
commit: ec5655b2080f0f77cefe4ae9ba999644f99ad468
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Jul  6 20:12:18 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Jul  6 20:20:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5655b2

dev-util/meson: Add ~x64-macos keyword to 0.46.1

This keyword was dropped for an unknown reason.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/meson/meson-0.46.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meson/meson-0.46.1.ebuild 
b/dev-util/meson/meson-0.46.1.ebuild
index 30c7a1010f9..6f8702115d6 100644
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ b/dev-util/meson/meson-0.46.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-   KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 
~sh sparc x86 ~amd64-fbsd ~x64-solaris"
+   KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 
~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1



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

2018-07-06 Thread William Hubbs
commit: 860674d1ce1ccc8208bbb08823d831312e7a4f74
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Jul  6 19:45:59 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Jul  6 20:20:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860674d1

dev-util/meson: 0.47.0 bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/meson/Manifest|  1 +
 dev-util/meson/meson-0.47.0.ebuild | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b989ce95417..0d03d3f0b1d 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,3 +2,4 @@ DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 
7391776d2f480f43c6cf0bfae3665c16a61c4a2
 DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 
820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724
 SHA512 
704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
 DIST meson-0.46.0.tar.gz 1200258 BLAKE2B 
8f1fdae2456d262abff6078084c8f3ca7a4163e709fe9cdf99fad4b9f42ee42750e66db4dd66728df5c26f2622b9a55388f6c165cbcc022513622df2ebcf7d72
 SHA512 
f2985bfd19477c2f6cd773d7cd0453084e850c0924e110261dcfe183d1534d9d1098ca032fac050d3913893c94a20a2277daa1c12f0cee4fe368a91d136a0c15
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 
3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76
 SHA512 
beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
+DIST meson-0.47.0.tar.gz 1246932 BLAKE2B 
0191c383488132393fe3e3fb9e71ca0bb0906b8c856bfa72d6352b890246c14bacfe86f4f75c065b0d7197b30570dc63d53d0e7d6a0f25cafe0e85442e89c971
 SHA512 
02a9aa481c6cce011be9bd3ada523c45f503c70c1c6c8c826241c16a84c8ccbb06de2caced8c748850c24b7a696705c8c72847f935fd720edbd286235390fd94

diff --git a/dev-util/meson/meson-0.47.0.ebuild 
b/dev-util/meson/meson-0.47.0.ebuild
new file mode 100644
index 000..a02f93d684e
--- /dev/null
+++ b/dev-util/meson/meson-0.47.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://github.com/mesonbuild/meson;
+   inherit git-r3
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+   ${EPYTHON} run_tests.py || die
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   insinto /usr/share/vim/vimfiles
+   doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+   insinto /usr/share/zsh/site-functions
+   doins data/shell-completions/zsh/_meson
+}



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

2018-07-06 Thread William Hubbs
commit: 2b599562b81bc54221b91410940721f5ee032414
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Jul  6 20:20:05 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Jul  6 20:20:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b599562

dev-util/meson: sync live ebuild

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/meson/meson-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meson/meson-.ebuild b/dev-util/meson/meson-.ebuild
index 37aab5a3b43..a02f93d684e 100644
--- a/dev-util/meson/meson-.ebuild
+++ b/dev-util/meson/meson-.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1



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

2018-07-06 Thread William Hubbs
commit: d5edec156ec6b7069e7715145e06174c51216701
Author: William Hubbs  gentoo  org>
AuthorDate: Fri Jul  6 20:05:18 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri Jul  6 20:20:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5edec15

dev-util/meson: Add ~x64-macos keyword to 0.46.0

This keyword was dropped for an unknown reason.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/meson/meson-0.46.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/meson/meson-0.46.0.ebuild 
b/dev-util/meson/meson-0.46.0.ebuild
index 37aab5a3b43..a02f93d684e 100644
--- a/dev-util/meson/meson-0.46.0.ebuild
+++ b/dev-util/meson/meson-0.46.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/

2018-07-06 Thread Jonathan Vasquez
commit: 70ffe53880c2d20ee5911a846e5a42df2d1ca070
Author: Jonathan Vasquez  gentoo  org>
AuthorDate: Fri Jul  6 20:10:12 2018 +
Commit: Jonathan Vasquez  gentoo  org>
CommitDate: Fri Jul  6 20:10:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ffe538

net-vpn/tinc: version bump to 1.1_pre16 and minor improvements.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-vpn/tinc/Manifest  |  1 +
 ...-paths.patch => tinc-1.1_pre15-fix-paths.patch} |  0
 ...-paths.patch => tinc-1.1_pre16-fix-paths.patch} | 47 +-
 net-vpn/tinc/tinc-1.1_pre15.ebuild |  8 +++-
 ...tinc-1.1_pre15.ebuild => tinc-1.1_pre16.ebuild} |  8 +++-
 5 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index ca1d7e95537..959505f8846 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 
542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da
 SHA512 
f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 
8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd
 SHA512 
b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B 
e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e
 SHA512 
29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
+DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B 
c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b
 SHA512 
b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43

diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch 
b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
similarity index 100%
copy from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
copy to net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch

diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch 
b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
similarity index 56%
rename from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
index 519677dd503..30cafee8787 100644
--- a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
@@ -1,44 +1,55 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
 tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.0 -0400
-+++ tinc-1.1pre14/src/names.c  2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
-   if(!pidfilename)
-   xasprintf(, "%s" SLASH "pid", confbase);
+diff -Naur tinc-1.1pre16.orig/src/names.c tinc-1.1pre16/src/names.c
+--- tinc-1.1pre16.ori/src/names.c  2018-04-02 10:41:12.0 -0400
 tinc-1.1pre16/src/names.c  2018-07-06 15:11:35.970680875 -0400
+@@ -103,47 +103,13 @@
+   }
+ 
  #else
 -  bool fallback = false;
+-
 -  if(daemon) {
--  if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
+-  if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
 -  fallback = true;
+-  }
 -  } else {
 -  char fname[PATH_MAX];
--  snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
+-  snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
+-
 -  if(access(fname, R_OK)) {
--  snprintf(fname, sizeof fname, "%s" SLASH "pid", 
confbase);
--  if(!access(fname, R_OK))
+-  snprintf(fname, sizeof(fname), "%s" SLASH "pid", 
confbase);
+-
+-  if(!access(fname, R_OK)) {
 -  fallback = true;
+-  }
 -  }
--  }
-+  if(!logfilename)
++  if(!logfilename) {
 +  xasprintf(, "/var/log" SLASH "%s.log", identname);
+   }
  
 -  if(!fallback) {
--  if(!logfilename)
+-  if(!logfilename) {
 -  xasprintf(, LOCALSTATEDIR SLASH "log" SLASH 
"%s.log", identname);
+-  }
 -
--  if(!pidfilename)
+-  if(!pidfilename) {
 -  xasprintf(, LOCALSTATEDIR SLASH "run" SLASH 
"%s.pid", identname);
+-  }
 -  } else {
--  if(!logfilename)
+-  if(!logfilename) {
 -  xasprintf(, "%s" SLASH "log", 

[gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/

2018-07-06 Thread Ian Stakenvicius
commit: 8c0b67f658a2f3d0c63cedfa0bc413484285a786
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Fri Jul  6 19:40:30 2018 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Fri Jul  6 19:40:30 2018 +
URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=8c0b67f6

dev-lang/spidermonkey:  bump to 60.0.2_pre2 for testing

 dev-lang/spidermonkey/Manifest |   2 +
 .../spidermonkey/spidermonkey-60.0.2_pre2.ebuild   | 141 +
 2 files changed, 143 insertions(+)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 6e0cd77..4898262 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -3,8 +3,10 @@ DIST mozjs-24.2.0.tar.bz2 15624530 BLAKE2B 
633f3e42011a8395aa4e60842c2de1cb47269
 DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 
42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4
 SHA512 
debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206
 DIST mozjs-45.0.2.tar.bz2 97508152 BLAKE2B 
89600f7e2a3effe71ad140646110aaf3be91cc5313cf227f1d16e796e249e287cc8dbf2599aa4277f2652a83ec3570f58c1c51ef319632254b9ac5caec46bb9a
 SHA512 
84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d
 DIST mozjs-52.4.0_pre20171003.tar.bz2 30588541 BLAKE2B 
ca3dace6f22d510d6d9f087f236100cae4b913b8d194fdec77f2a32b82276613417344fc4d899fca0d908ecb981d59f7e5608e7cd62f6f134dbcdf87f89a3276
 SHA512 
80e006ed7550b64dad7cf78335dd9f2d34f50ad486439887f0088eb3817242d24cf7c1d9325e2dcd4a01fd5c5f54d710873113b97fd914ccd961fa46a71653fa
+DIST mozjs-60.0.2pre2.tar.bz2 32269656 BLAKE2B 
c922acfe5d1ade58d48b69a771cfbdb2108cc964c6ee699d4fd02a4854a0217704ccf10cfcda388e6563b39a7283473585002d381de0c5d717b3e6ea89251866
 SHA512 
8f3332a60bf041df9b1541d00e3015d6ce16d5a44172c05973e44233471896c0ba1a4cefe3510ebca557b10d0f708c64b59c0276cf72b023601756696b651cff
 DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B 
a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a
 SHA512 
39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4
 DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 
8bcf9477de47ef3b882cd3281efa7f77c16ce11fc93f6a620917adf629fde8290af1dd69f0930a889aacfee3603bf60eb9c1e718a1dfd3e218a1013b6192
 SHA512 
88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3
+DIST spidermonkey-60.0-patches-02.tar.xz 3024 BLAKE2B 
03dfb0508a15cbad309d6e6c79677829e6a31bf714e8a02683533f0610666df52d1d3f51058c0895667906f604b682bd1545a984ab3ba745244702722792d742
 SHA512 
8e7e969822c4fb85172a5a52b8c6533318101ea8f777f78a749763836995bfecf408d8fd9bb68a4989045e8d6eb9fc0060dedb2eb48c84069318cc2eed0a1fea
 DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 
4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7
 SHA512 
6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a
 DIST spidermonkey-slot17-patches-01.tar.xz 2748 BLAKE2B 
a55504d726f925096de7e066a1d323154bc796018644f347bc1d012ea6ee8441cc19f30689e06fd26bab5a5d2e8376e90bf2c1930a588be8b48865f7bbc524ea
 SHA512 
21a90f85d156de3cca9811317507162a458f908bb447924fcfbf49b7bb70496b611ce7df90b90775316b8ceafda56692be3bf856b168b83ed40b8a5c668eed3f
 DIST spidermonkey-slot24-patches-01.tar.xz 3444 BLAKE2B 
f207577db223d51e315d473f0eefa8a2805fab49acd952fa5796eb4e967c82c76965afcdea1b55ac98c5e94f4321f40c1ea9079d5ebee99fdef950bddee91ab2
 SHA512 
712250983f726eb2fe7ae243e9ca510b6e5b8fa0f221fe5120c2e2f75334f7e4b10b8ab172869d7333a120529dbc2a513c170533d5ad5af27a2643ce1384bbdb

diff --git a/dev-lang/spidermonkey/spidermonkey-60.0.2_pre2.ebuild 
b/dev-lang/spidermonkey/spidermonkey-60.0.2_pre2.ebuild
new file mode 100644
index 000..b43a855
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-60.0.2_pre2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+inherit autotools toolchain-funcs pax-utils mozcoreconf-v5
+
+MY_PN="mozjs"
+MY_P="${MY_PN}-${PV/_rc/.rc}"
+MY_P="${MY_P/_pre/pre}"
+DESCRIPTION="Stand-alone JavaScript C++ library"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey;
+SRC_URI="https://archive.mozilla.org/pub/spidermonkey/prereleases/60/pre2/${MY_P}.tar.bz2
+   https://dev.gentoo.org/~axs/distfiles/${PN}-60.0-patches-02.tar.xz;
+
+LICENSE="NPL-1.1"
+SLOT="52"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd"
+IUSE="debug +jit 

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

2018-07-06 Thread Mike Gilbert
commit: 9e77925b1c2dbb5af6c419bcd25cafc0fdf709dd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jul  6 19:09:17 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jul  6 19:09:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e77925b

dev-lang/python: bump to 3.7.0

Closes: https://bugs.gentoo.org/659578
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247

 dev-lang/python/Manifest|   2 +
 dev-lang/python/python-3.7.0.ebuild | 331 
 2 files changed, 333 insertions(+)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1b585bf29c6..6bd4f45d838 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -9,6 +9,7 @@ DIST Python-3.6.3.tar.xz 16974296 BLAKE2B 
8220fc0c2eaa315d3972085b0f531f169adb6c
 DIST Python-3.6.4.tar.xz 16992824 BLAKE2B 
2347a70bb25468221178b1542ddd4376f136a515f2873ee1f640c4629eb77a9608af0f6be37128ba3e8ad614ebc17e7be20b73384983533aa77bca4403ea7935
 SHA512 
09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32528d00772221eb3126b12cb95b62c3ac3e852f4951e6f2eb406c88c848a2
 DIST Python-3.6.5.tar.xz 17049912 BLAKE2B 
f393e9563a18a46c457afcd2e174d9eacda20fe2b0ae5461e11c582fa4d27b85c01bbe7b602f45511b6b44f635c6330205b12fb3e8325ffd07e87b78a8258889
 SHA512 
6b26fcd296b9bd8e67861eff10d14db7507711ddba947288d16d6def53135c39326b7f969c04bb2b2993f924d9e7ad3f5c5282a3915760bc0885cf0a8ea5eb51
 DIST Python-3.6.6.tar.xz 17156744 BLAKE2B 
fa4333149f84570cc4a0d1ec76c819610888750a51268b9db7d05df7d9c11e5ed72daff5d81b404015d9c678cb034d8a32034262ce73629ee8f96772853a706c
 SHA512 
c71f87c5906e770322a14cacad228655659f782207db826320449d12bf86091c3662f317e1773158dec52f8b052eaedfb4c03b561cc2a6cfcd381597fd2d2b04
+DIST Python-3.7.0.tar.xz 16922100 BLAKE2B 
cd2afd9ad1847ca793bc64ecb637906c35e0c8da8392d626cce3ebf19be5ccde1e6dcc499b933359cb24dcdbd024b3aaa916f96ed893b1f52d9825e404f27e5f
 SHA512 
8bb11233fb67ee9ab8ed1b72f8fdc62f66e26a6beaaeb92448bce681cf065269833b1658d3ed2459127f25ba43adb0eab73cf27c59834a2a803fb529b4216739
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 
0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad
 SHA512 
6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 
5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591
 SHA512 
687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
 DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 BLAKE2B 
7fb3cc7dcd987debd5aa263d8e26b21aad439d8e3177c06c3683406a53bbda9652175673b09b6300f6a5b62148190cd8a75c9b65a5de04d770866733fcc0ebcb
 SHA512 
108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8
@@ -17,3 +18,4 @@ DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 
4a7d71feff18c7c8c109bed1
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 
3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1
 SHA512 
2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3
 DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 
7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc
 SHA512 
90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
 DIST python-gentoo-patches-3.6.6.tar.xz 13876 BLAKE2B 
4be56b54e70c9b83209734097e03a7dbaa8f46ae13e268fc6a7f465ffd052ce03ca9e1fc45f1d432f2de17d4ce16ca8bc684b24344862cd8f52f9d1a90d90b7a
 SHA512 
534b9eaefcbc45908119852a103bf10e400a8628c66aa599812fbceda36810d626d33e6701d1b7866e4df68397f717df6a217cb414049ca6f378eff9f43a27ab
+DIST python-gentoo-patches-3.7.0.tar.xz 12268 BLAKE2B 
758b635ff53b6f7bfabb1db632ee2a5c14b163d6d6f14e4e44c31c9ac1591d411f597d42b05707f586f9ff7c3a030703502307bae732bcf003987939eb5b036d
 SHA512 
19dd5bac06bb40622e74e3b16c7fba83f1178417e686eaf61b2b207602c76beebc8c78d675e401ec4d18add1ca033fd47baf2e48e9abb487593b7d821bcaf509

diff --git a/dev-lang/python/python-3.7.0.ebuild 
b/dev-lang/python/python-3.7.0.ebuild
new file mode 100644
index 000..d1ab60b3112
--- /dev/null
+++ b/dev-lang/python/python-3.7.0.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.7.0"
+
+DESCRIPTION="An interpreted, interactive, 

[gentoo-commits] repo/gentoo:master commit in: media-tv/plex-media-server/

2018-07-06 Thread Jonathan Vasquez
commit: ef357d36cc2ee3a855d8c7f3cfc74b26864560c0
Author: Jonathan Vasquez  gentoo  org>
AuthorDate: Fri Jul  6 18:15:40 2018 +
Commit: Jonathan Vasquez  gentoo  org>
CommitDate: Fri Jul  6 18:15:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef357d36

media-tv/plex-media-server: Fixes Bug 659702.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 ...ia-server-1.13.2.ebuild => plex-media-server-1.13.2-r1.ebuild} | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild 
b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
similarity index 90%
rename from media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
rename to media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
index 63a8831254d..62c09b5f2ab 100644
--- a/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
@@ -135,7 +135,13 @@ _handle_multilib() {
 # so it doesn't try to rebuild libraries that can't be rebuilt.
 _mask_plex_libraries_revdep() {
dodir /etc/revdep-rebuild/
-   echo 
"SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/plexmediaserver\"" > 
"${ED}"/etc/revdep-rebuild/80plexmediaserver
+
+   # Bug: 659702. The upstream plex binary installs its precompiled 
package to /usr/lib.
+   # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no 
longer rely
+   # on the implicit symlink automatically satisfying our revdep 
requirement when we use $(get_libdir).
+   # Thus we will match upstream's directory automatically. If upstream 
switches their location,
+   # then so should we.
+   echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > 
"${ED}"/etc/revdep-rebuild/80plexmediaserver
 }
 
 # Remove execstack flags from some libraries/executables



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

2018-07-06 Thread Aric Belsito
commit: 211be5f192c7391618b3c8747535c2dda122
Author: Aric Belsito  gmail  com>
AuthorDate: Fri Jul  6 15:50:08 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Fri Jul  6 15:50:08 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=211be5f1

dev-libs/elfutils: version bump to 0.173

 dev-libs/elfutils/Manifest  |  1 +
 dev-libs/elfutils/elfutils-0.173.ebuild | 78 +
 2 files changed, 79 insertions(+)

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 03b2e42..3fdccde 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,2 +1,3 @@
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 
03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06
 SHA512 
aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 
7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce
 SHA512 
b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2
+DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B 
c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb
 SHA512 
7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3

diff --git a/dev-libs/elfutils/elfutils-0.173.ebuild 
b/dev-libs/elfutils/elfutils-0.173.ebuild
new file mode 100644
index 000..f3c5fb5
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.173.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement 
for libelf)"
+HOMEPAGE="http://elfutils.org/;
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2;
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
+IUSE="bzip2 lzma nls static-libs test +threads +utils"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+   lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+   !dev-libs/libelf"
+DEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )
+   >=sys-devel/flex-2.5.4a
+   sys-devel/m4
+   elibc_musl? (
+   sys-libs/argp-standalone
+   sys-libs/fts-standalone
+   sys-libs/obstack-standalone
+   )"
+
+PATCHES=("${FILESDIR}"/${PN}-0.118-PaX-support.patch)
+
+src_prepare() {
+   default
+   # Add MUSL patches
+   epatch "${FILESDIR}"/${PN}-0.170-musl-obstack-fts.patch
+   epatch "${FILESDIR}"/${PN}-0.171-musl-libs.patch
+   epatch "${FILESDIR}"/${PN}-0.171-musl-utils.patch
+
+   eautoreconf
+
+   if ! use static-libs; then
+   sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' 
lib{asm,dw,elf}/Makefile.in || die
+   fi
+   sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+   use test && append-flags -g #407135
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf \
+   $(use_enable nls) \
+   $(use_enable threads thread-safety) \
+   --program-prefix="eu-" \
+   --with-zlib \
+   --disable-symbol-versioning \
+   $(use_with bzip2 bzlib) \
+   $(use_with lzma)
+}
+
+multilib_src_test() {
+   env 
LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm"
 \
+   LC_ALL="C" \
+   emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   dodoc NOTES
+   # These build quick, and are needed for most tests, so don't
+   # disable their building when the USE flag is disabled.
+   if ! use utils; then
+   rm -rf "${ED}"/usr/bin || die
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

2018-07-06 Thread Craig Andrews
commit: 1e20ff0bed7df35a55a117663918a39062868765
Author: Craig Andrews  gentoo  org>
AuthorDate: Fri Jul  6 14:37:22 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Jul  6 15:03:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e20ff0b

media-tv/kodi: LICENSE.gpl was renamed to LICENSE.md

See https://github.com/xbmc/xbmc/commit/40fe25d9c4890e6d64e74b70eecee84a82d04928

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-tv/kodi/kodi-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-tv/kodi/kodi-.ebuild b/media-tv/kodi/kodi-.ebuild
index 554523916ae..50e6c8b36d3 100644
--- a/media-tv/kodi/kodi-.ebuild
+++ b/media-tv/kodi/kodi-.ebuild
@@ -296,7 +296,7 @@ src_install() {
 
pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
-   rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+   rm "${ED%/}"/usr/share/doc/*/{LICENSE.md,copying.txt}* || die
 
newicon media/icon48x48.png kodi.png
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/

2018-07-06 Thread Richard Farina
commit: e2e04946ba31485ac196377edde9acb53d55d8e3
Author: Zero_Chaos  gentoo  org>
AuthorDate: Fri Jul  6 14:32:43 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Fri Jul  6 14:32:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e04946

net-wireless/lorcon: bug #660494

whoops, re-add stable version

Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --force

 net-wireless/lorcon/Manifest|  1 +
 net-wireless/lorcon/lorcon-0.0_p20150109.ebuild | 73 +
 2 files changed, 74 insertions(+)

diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 94c11c88bc6..9b556bcf187 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1 +1,2 @@
+DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B 
e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce
 SHA512 
acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
 DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B 
d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51
 SHA512 
7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9

diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild 
b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
new file mode 100644
index 000..702bd34a3a2
--- /dev/null
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A generic library for injecting 802.11 frames"
+HOMEPAGE="http://802.11ninja.net/lorcon;
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://code.google.com/p/lorcon/;
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz;
+   KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+
+DEPEND="
+   python? ( ${PYTHON_DEPS} )
+   dev-libs/libnl:3=
+   net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}"/${P}
+
+src_unpack() {
+   if [[ ${PV} == "" ]] ; then
+   git-r3_src_unpack
+   cp -R "${S}/" "${WORKDIR}/all"
+   fi
+   default_src_unpack
+}
+
+src_prepare() {
+   sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.c
+   use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+   default_src_configure
+}
+
+src_compile() {
+   default_src_compile
+   if use python; then
+   LDFLAGS+=" -L${S}/.libs/"
+   cd pylorcon2 || die
+   distutils-r1_src_compile
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${ED}" install
+   if use python; then
+   cd pylorcon2 || die
+   distutils-r1_src_install
+   fi
+}
+
+src_test() {
+   :
+}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/

2018-07-06 Thread Richard Farina
commit: 1ffdd4f724a73324e461d636729ac39d5d3c0898
Author: Zero_Chaos  gentoo  org>
AuthorDate: Fri Jul  6 14:27:23 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Fri Jul  6 14:27:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ffdd4f7

net-wireless/lorcon: fix to not compile against installed version

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../{lorcon-0.0_p20180409.ebuild => lorcon-0.0_p20180409-r1.ebuild}| 3 +++
 net-wireless/lorcon/lorcon-.ebuild | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409.ebuild 
b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
similarity index 88%
rename from net-wireless/lorcon/lorcon-0.0_p20180409.ebuild
rename to net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
index 59c2b9799b2..0348df63540 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20180409.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
@@ -46,6 +46,9 @@ src_unpack() {
 
 src_prepare() {
sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.c
+   sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.h
+   sed -i 's##"../lorcon_packet.h"#' 
pylorcon2/PyLorcon2.c
+   sed -i 's##"../lorcon_packet.h"#' 
pylorcon2/PyLorcon2.h
sed -i 's##"../lorcon_multi.h"#' 
pylorcon2/PyLorcon2.c
sed -i 's##"../lorcon_multi.h"#' 
pylorcon2/PyLorcon2.h
default

diff --git a/net-wireless/lorcon/lorcon-.ebuild 
b/net-wireless/lorcon/lorcon-.ebuild
index 59c2b9799b2..0348df63540 100644
--- a/net-wireless/lorcon/lorcon-.ebuild
+++ b/net-wireless/lorcon/lorcon-.ebuild
@@ -46,6 +46,9 @@ src_unpack() {
 
 src_prepare() {
sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.c
+   sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.h
+   sed -i 's##"../lorcon_packet.h"#' 
pylorcon2/PyLorcon2.c
+   sed -i 's##"../lorcon_packet.h"#' 
pylorcon2/PyLorcon2.h
sed -i 's##"../lorcon_multi.h"#' 
pylorcon2/PyLorcon2.c
sed -i 's##"../lorcon_multi.h"#' 
pylorcon2/PyLorcon2.h
default



[gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/

2018-07-06 Thread Jeroen Roovers
commit: 6fd892e9890c935de70b78eaeb3036051d6aebaf
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jul  6 14:22:26 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jul  6 14:23:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd892e9

www-client/vivaldi-snapshot: Version 1.16.1230.3_p1.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 www-client/vivaldi-snapshot/Manifest   |   3 +
 .../vivaldi-snapshot-1.16.1230.3_p1.ebuild | 115 +
 2 files changed, 118 insertions(+)

diff --git a/www-client/vivaldi-snapshot/Manifest 
b/www-client/vivaldi-snapshot/Manifest
index 6a7c4dbf206..95299c81116 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -4,3 +4,6 @@ DIST vivaldi-snapshot-1.16.1221.3_p1-i386.deb 54401486 BLAKE2B 
6fcb7b85460daf625
 DIST vivaldi-snapshot-1.16.1226.3_p1-amd64.deb 54931368 BLAKE2B 
fecdbf62cf301a051f0798545847aba381f803b69165c470f6057247b626b31c0194f1bdf88f7bfeda57cbcc7d2b14d21efbf9e60cd177f37d9cd65d7edd6f36
 SHA512 
88a5c72cc2b0558d9819eb17525f00d3a049b01ebd80734ddbcc0b5928f188b3b6f081b7ed1e1a403cf2a071b009d5b26ea5af2b72b26b45eb42e644f5a47236
 DIST vivaldi-snapshot-1.16.1226.3_p1-armhf.deb 48799752 BLAKE2B 
4bf6ddf1ff1869c1a4614615046de27367dce9bf6c02208701740e12a3e6ef0c821ec486129feee8b2886c6a7f744d57115e5e8c2077e5540c71b70faadef4cd
 SHA512 
d53eeba114f0502c0e045fc3a5d5531654f36bafeb34666ecea3798c4ceda8966f7079fb80c55617789c16ee273529f9ff6b872c56d63b430997bd2901cae6af
 DIST vivaldi-snapshot-1.16.1226.3_p1-i386.deb 54406672 BLAKE2B 
42e979c5b16d3f4d7ba3cf22c63b84b8991d14a13b3f1d8950cc1e504800cbb4a25a560b515201ebc4292a6aef6254008150926dbab5bb806ab70bfc84da0b7a
 SHA512 
b7f50f377ede4a3a9ccb90dece883f5ca289f875b4397c0aa9151c60ab80378eed4dc198a0aa4d3960bfb766061510277f8b53f3a72c29532940b3878d04d887
+DIST vivaldi-snapshot-1.16.1230.3_p1-amd64.deb 54948576 BLAKE2B 
e32ed93d6e5692f4e2dd21e7fb93edfe67408e346e3ab264f7dbc0f536245d32d06573edc396efb9c7eff5e7eb02ceb1965321c104e6be556998102aba6c65bc
 SHA512 
6e60ddc456525012a02648cff70aa1908635da79b0711cea6b9a296d983969f2fe2e22f0dc78ee29d362403a4cb5dacacc8e3d3f302e4fc5170cd508639fd348
+DIST vivaldi-snapshot-1.16.1230.3_p1-armhf.deb 48827914 BLAKE2B 
53166df94706501b96c185cc97681cec6a1a227ceb74f5974a6e63b5f70148195fde0ddfda978c7694f480460d915ad7f8f5c3b68217835847a7b2d109362923
 SHA512 
a1483e209a82886b24fe067218b27f72667aa40f92382db560008d5198a018df43ec076c17f2059e03c2a41402f8f862799537385660007dff30b29e899cc127
+DIST vivaldi-snapshot-1.16.1230.3_p1-i386.deb 54437300 BLAKE2B 
0465cfed1663a1595d9361ed9677019edfe10ef9b3e3c39ddf450c86ad9f23aa56307a95c048fc67dfee9d0e440e2519498b8913bde306f4eff159a429b1276c
 SHA512 
3c24a26f8797ec844bbbf385ea6139ee27c4cd9dce09958ac4e21143b65fad0bfaca56b35caba4f22401cf0e3279471e034520deb4ec1b424a7f18bacf3e

diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild 
b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild
new file mode 100644
index 000..e897c38d5d1
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+   am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he 
hi
+   hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr 
sv
+   sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs 
xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/;
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_;
+SRC_URI="
+   amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+   arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+   x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+   virtual/libiconv
+"
+RDEPEND="
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/nspr
+   dev-libs/nss
+   media-libs/alsa-lib
+   media-libs/fontconfig
+   media-libs/freetype
+   media-libs/speex
+   net-print/cups
+   sys-apps/dbus
+   sys-libs/libcap
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf
+   x11-libs/gtk+:2
+   x11-libs/libX11
+   x11-libs/libXScrnSaver
+   x11-libs/libXcomposite
+   x11-libs/libXcursor
+   x11-libs/libXdamage
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXi
+   x11-libs/libXrandr
+   x11-libs/libXrender
+   x11-libs/libXtst
+   x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+   unpack_deb ${A}
+}
+
+src_prepare() {
+   iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > 

[gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/

2018-07-06 Thread Jeroen Roovers
commit: 05a2f7411d9123d15f857410a89da10391250810
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jul  6 14:23:10 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jul  6 14:23:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a2f741

www-client/vivaldi-snapshot: Old.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 www-client/vivaldi-snapshot/Manifest   |   3 -
 .../vivaldi-snapshot-1.16.1221.3_p1.ebuild | 117 -
 2 files changed, 120 deletions(-)

diff --git a/www-client/vivaldi-snapshot/Manifest 
b/www-client/vivaldi-snapshot/Manifest
index 95299c81116..9c74b666171 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,3 @@
-DIST vivaldi-snapshot-1.16.1221.3_p1-amd64.deb 54929464 BLAKE2B 
580f04ba12bd88bd23167bd02d6c808ecbf310e7e63cee213556d520de61771344e35063f4c8afdeae90c8358e323731dc75281704cd8a6680d334b87f16f4f5
 SHA512 
0ac69d286e2982a001831d6f989b02e5ba47dcce3b19280dcb8360ad591fe9c5af725eb8916aa6d7052dee0759cd8e93b29d7f26094285d314f8bd87eef6f88d
-DIST vivaldi-snapshot-1.16.1221.3_p1-armhf.deb 48793424 BLAKE2B 
3caf45b1e0a5b89b13f81b6c0a50523596173f0c56fcbfe4de984283959721c396e2bcbc464f256d60d9643d45cd4c4c627a9de06c84ac3b896511e9f72db829
 SHA512 
73b5c85333e4a8c98cb245cd8802f8ec062021cd8ba8ae9d518f4da766c344e3b26f44cdb3c343cf2b3bc16c80ef2a59e73ec382a052b812395c7f3625017414
-DIST vivaldi-snapshot-1.16.1221.3_p1-i386.deb 54401486 BLAKE2B 
6fcb7b85460daf62596643d6d8d81472d502b11de64bbd5075671f80cb63a83970b5f925326245f102fcaf814b9f64e3e4dfd4f034ccc31f19e775a734223420
 SHA512 
0d18164aa5e8e0034f96c50b359b73a34533a7fbff3534e47437830e117836529d20bcd22a452e5c8c91c39546c2df314347153cf420be4dbbf8dc4bcb589817
 DIST vivaldi-snapshot-1.16.1226.3_p1-amd64.deb 54931368 BLAKE2B 
fecdbf62cf301a051f0798545847aba381f803b69165c470f6057247b626b31c0194f1bdf88f7bfeda57cbcc7d2b14d21efbf9e60cd177f37d9cd65d7edd6f36
 SHA512 
88a5c72cc2b0558d9819eb17525f00d3a049b01ebd80734ddbcc0b5928f188b3b6f081b7ed1e1a403cf2a071b009d5b26ea5af2b72b26b45eb42e644f5a47236
 DIST vivaldi-snapshot-1.16.1226.3_p1-armhf.deb 48799752 BLAKE2B 
4bf6ddf1ff1869c1a4614615046de27367dce9bf6c02208701740e12a3e6ef0c821ec486129feee8b2886c6a7f744d57115e5e8c2077e5540c71b70faadef4cd
 SHA512 
d53eeba114f0502c0e045fc3a5d5531654f36bafeb34666ecea3798c4ceda8966f7079fb80c55617789c16ee273529f9ff6b872c56d63b430997bd2901cae6af
 DIST vivaldi-snapshot-1.16.1226.3_p1-i386.deb 54406672 BLAKE2B 
42e979c5b16d3f4d7ba3cf22c63b84b8991d14a13b3f1d8950cc1e504800cbb4a25a560b515201ebc4292a6aef6254008150926dbab5bb806ab70bfc84da0b7a
 SHA512 
b7f50f377ede4a3a9ccb90dece883f5ca289f875b4397c0aa9151c60ab80378eed4dc198a0aa4d3960bfb766061510277f8b53f3a72c29532940b3878d04d887

diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1221.3_p1.ebuild 
b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1221.3_p1.ebuild
deleted file mode 100644
index 0b21131251e..000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1221.3_p1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-   am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he 
hi
-   hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr 
sv
-   sw ta te th tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs 
xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/;
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_;
-SRC_URI="
-   amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-   arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-   x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-   virtual/libiconv
-"
-RDEPEND="
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   media-libs/alsa-lib
-   media-libs/fontconfig
-   media-libs/freetype
-   media-libs/speex
-   net-print/cups
-   sys-apps/dbus
-   sys-libs/libcap
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf
-   x11-libs/gtk+:2
-   x11-libs/libX11
-   x11-libs/libXScrnSaver
-   x11-libs/libXcomposite
-   x11-libs/libXcursor
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXi
-   x11-libs/libXrandr
-   x11-libs/libXrender
-   x11-libs/libXtst
-   x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-   unpack_deb ${A}
-}
-
-src_prepare() {
-   iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > 
"${T}"/${PN}.desktop || die
-   mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-   

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

2018-07-06 Thread Ian Stakenvicius
commit: dfed90b24aec6c1544027c5b8d4de74e51c86595
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Fri Jul  6 14:21:33 2018 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Fri Jul  6 14:22:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfed90b2

dev-lang/spidermonkey: bump 38.x to 38.3.0 and stabilize

Stabilized for amd64 and x86 by maintainer after testing.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-lang/spidermonkey/Manifest  | 2 +-
 .../{spidermonkey-38.2.1_rc0.ebuild => spidermonkey-38.3.0.ebuild}  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index ed181dec4ec..86c2ecad3b9 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,7 +1,7 @@
 DIST js-1.7.0.tar.gz 1165607 BLAKE2B 
61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c
 SHA512 
9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 
76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be
 SHA512 
2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-24.2.0.tar.bz2 15624530 BLAKE2B 
633f3e42011a8395aa4e60842c2de1cb472692a0d9355c1e2c49e1ef943605cafaea0c836f9044adfceb38d7e04a0941b895474d08097f641bfca4494c5c5fe4
 SHA512 
49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4
-DIST mozjs-38.2.1.rc0.tar.bz2 25012381 BLAKE2B 
314c8efe11d7daf0918d367a249f5dfd466a665002639627cee0c4857f9419b3ab1af6a006c46893ba027c724971658c3b9d32cd155ed0ab13299198a46288c0
 SHA512 
60262c7619cc418569aec81775a671105acbc5bf372273828868f2fbbbc4ea33f78380f7455710816bfcdae828fb4115a08234d599cb30d0db859fcba17f019d
+DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 
42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4
 SHA512 
debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206
 DIST mozjs-45.0.2.tar.bz2 97508152 BLAKE2B 
89600f7e2a3effe71ad140646110aaf3be91cc5313cf227f1d16e796e249e287cc8dbf2599aa4277f2652a83ec3570f58c1c51ef319632254b9ac5caec46bb9a
 SHA512 
84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d
 DIST mozjs-52.4.0_pre20171003.tar.bz2 30588541 BLAKE2B 
ca3dace6f22d510d6d9f087f236100cae4b913b8d194fdec77f2a32b82276613417344fc4d899fca0d908ecb981d59f7e5608e7cd62f6f134dbcdf87f89a3276
 SHA512 
80e006ed7550b64dad7cf78335dd9f2d34f50ad486439887f0088eb3817242d24cf7c1d9325e2dcd4a01fd5c5f54d710873113b97fd914ccd961fa46a71653fa
 DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B 
a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a
 SHA512 
39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4

diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
similarity index 96%
rename from dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
rename to dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
index 4f65d974ce9..0e1816b71ef 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
@@ -6,10 +6,10 @@ WANT_AUTOCONF="2.1"
 inherit autotools toolchain-funcs pax-utils mozcoreconf-v4
 
 MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_/.}"
+MY_P="${MY_PN}-${PV/_/.}sfink2"
 DESCRIPTION="Stand-alone JavaScript C library"
 
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey;
-SRC_URI="https://people.mozilla.org/~sstangl/${MY_P}.tar.bz2
+SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2
https://dev.gentoo.org/~axs/distfiles/${PN}-slot38-patches-01.tar.xz;
 
 LICENSE="NPL-1.1"
@@ -20,7 +20,7 @@ IUSE="debug +jit minimal static-libs +system-icu test"
 RESTRICT="ia64? ( test )"
 
 #S="${WORKDIR}/${MY_P%.rc*}"
-S="${WORKDIR}/${MY_PN}-${SLOT}.0.0"
+S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
 
 RDEPEND=">=dev-libs/nspr-4.10.10



[gentoo-commits] proj/sci:master commit in: app-doc/root-docs/, app-doc/root-docs/files/

2018-07-06 Thread Justin Bronder
commit: 212422dad739e5280fb19a8acf8409374183c9c1
Author: Justin Bronder  gentoo  org>
AuthorDate: Fri Jul  6 14:12:02 2018 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Fri Jul  6 14:12:02 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=212422da

app-doc/root-docs: removal due to migration of sci-physics/root

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/root-docs-6.00.01-makehtml.patch |  55 --
 app-doc/root-docs/metadata.xml |  22 
 app-doc/root-docs/root-docs-.ebuild| 112 -
 3 files changed, 189 deletions(-)

diff --git a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch 
b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
deleted file mode 100644
index 613468629..0
--- a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 600e8db..afad025 100644
 a/Makefile
-+++ b/Makefile
-@@ -1072,16 +1072,7 @@ $(ROOTPCH): $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) 
$(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
- 
- ifeq ($(BUILDX11),yes)
- ifeq ($(BUILDASIMAGE),yes)
--html: rootexecs postbin changelog releasenotes
--ifneq ($(USECONFIG),FALSE)
--  @if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
--|| [ "`which root.exe`" -ot "bin/root.exe" ]; then \
--echo 'ERROR: root.exe has not been installed by this build.'; \
--echo '   Run "make install" before running "make html".'; \
--exit 1; \
--  fi
--endif
--  @$(MAKELOGHTML)
-+html: compiledata releasenotes
-   @$(MAKEHTML)
- else
- html:
-diff --git a/build/unix/makehtml.sh b/build/unix/makehtml.sh
-index a94e790..8b4589d 100755
 a/build/unix/makehtml.sh
-+++ b/build/unix/makehtml.sh
-@@ -1,16 +1,16 @@
- #! /bin/sh
- 
- dir=`pwd`
--ROOT=$dir/bin/root
-+ROOT=root
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
--   $ROOT -n -l -b -q hsimple.C
-+   $ROOT -n -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
--   $ROOT -n -l -b -q cernbuild.C
-+   $ROOT -n -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
- 
-@@ -20,7 +20,7 @@ echo ""
- 
- # To generate the full documentation, we do need to
- # use the graphics engine, so do not use '-b'.
--$ROOT -n -l <
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   birc...@gentoo.org
-   Andrew Savchenko
-   
-   
-   sci-phys...@gentoo.org
-   Gentoo Physics Project
-   
-   
-This package contains the automatically generated ROOT class
-documentation.
-
-   
-   Generate html API documentation
-   Build HttpServer documentation
-   Provide all math related documentation
-   Default to A4 paper size and metric 
measurement. Letter will be used otherwise
-   
-

diff --git a/app-doc/root-docs/root-docs-.ebuild 
b/app-doc/root-docs/root-docs-.ebuild
deleted file mode 100644
index 0d5916f42..0
--- a/app-doc/root-docs/root-docs-.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ROOT_PN="root"
-ROOFIT_DOC_PV=2.91-33
-ROOFIT_QS_DOC_PV=3.00
-TMVA_DOC_PV=4.2.0
-
-inherit eutils git-r3 multilib virtualx
-
-DESCRIPTION="Documentation for ROOT Data Analysis Framework"
-HOMEPAGE="http://root.cern.ch/drupal;
-SRC_URI=""
-EGIT_REPO_URI="http://root.cern.ch/git/root.git;
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="api +math +metric http"
-
-VIRTUALX_REQUIRED="api"
-
-DEPEND="
-   app-text/pandoc
-   app-text/texlive
-   dev-haskell/pandoc-citeproc[bibutils]
-   virtual/pkgconfig
-   api? (
-   media-fonts/dejavu
-   ~sci-physics/root-${PV}[X,graphviz,opengl]
-   )"
-RDEPEND=""
-
-DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-6.00.01-makehtml.patch
-)
-
-src_prepare() {
-   default
-   # prefixify the configure script
-   sed -i \
-   -e "s:/usr:${EPREFIX}/usr:g" \
-   configure || die "prefixify configure failed"
-}
-
-src_configure() {
-   # we need only to setup paths here, html docs doesn't depend on USE 
flags
-   if use api; then
-   ./configure \
-   --prefix="${EPREFIX}/usr" \
-   --etcdir="${EPREFIX}/etc/root" \
-   --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-   
--tutdir="${EPREFIX}/usr/share/doc/${PF}/examples/tutorials" \
-   
--testdir="${EPREFIX}/usr/share/doc/${PF}/examples/tests" \
-   --with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
-   

[gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/

2018-07-06 Thread Justin Bronder
commit: 854e59ed4c4d28e6e165da84022274fb7675d401
Author: Justin Bronder  gentoo  org>
AuthorDate: Fri Jul  6 14:06:24 2018 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Fri Jul  6 14:06:24 2018 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=854e59ed

sci-physics/root: in main tree

Removal per https://bugs.gentoo.org/573264

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --force

 sci-physics/root/files/proofd.confd|  12 -
 sci-physics/root/files/proofd.initd|  25 --
 .../root/files/root-5.28.00b-glibc212.patch|  11 -
 sci-physics/root/files/root-5.32.00-afs.patch  |  33 --
 sci-physics/root/files/root-5.32.00-cfitsio.patch  |  13 -
 sci-physics/root/files/root-5.32.00-chklib64.patch |  24 --
 sci-physics/root/files/root-5.34.13-unuran.patch   |  40 --
 sci-physics/root/files/root-6.00.01-dotfont.patch  |  58 ---
 sci-physics/root/files/root-6.00.01-llvm.patch |  13 -
 .../root/files/root-6.06.00-nobyte-compile.patch   |  39 --
 sci-physics/root/files/rootd.confd |   8 -
 sci-physics/root/files/rootd.initd |  27 --
 sci-physics/root/metadata.xml  |  29 --
 sci-physics/root/root-.ebuild  | 444 -
 14 files changed, 776 deletions(-)

diff --git a/sci-physics/root/files/proofd.confd 
b/sci-physics/root/files/proofd.confd
deleted file mode 100644
index 81720a7eb..0
--- a/sci-physics/root/files/proofd.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# conf.d file for proof daemon
-#
-# Please refer to the proofd(1) man(1) page for more information on 
-# command line parameters. 
-#
-PROOFD_OPTS=
-
-# Specify your base of your PROOF directory here.  If left blank, it
-# will use the system default (e.g., /usr/share/root/proof). 
-# Note, however, that ROOT recommends that this directory is shared (via
-# NFS or similar) among all the nodes of the cluster.
-PROOF_DIR=

diff --git a/sci-physics/root/files/proofd.initd 
b/sci-physics/root/files/proofd.initd
deleted file mode 100644
index b0839466b..0
--- a/sci-physics/root/files/proofd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-need root-file-server
-use logger
-}
-
-start() {
-ebegin "Starting parallel ROOT facility server"
-start-stop-daemon --start --quiet \
-   --pidfile /var/run/proofd.pid \
-   --exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
-pidof /usr/bin/proofd > /var/run/proofd.pid
-eend $?
-}
-
-stop() {
-ebegin "Stopping parallel ROOT facility server"
-start-stop-daemon --stop --quiet \
-   --pidfile /var/run/proofd.pid \
-   --exec /usr/bin/proofd
-eend $?
-}

diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch 
b/sci-physics/root/files/root-5.28.00b-glibc212.patch
deleted file mode 100644
index a36543139..0
--- a/sci-physics/root/files/root-5.28.00b-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 root.orig/net/auth/src/TAFS.cxx2010-09-14 03:22:22.647915854 +0400
-+++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400
-@@ -11,6 +11,7 @@
- 
- #ifndef WIN32
- #   include 
-+#   include 
- #else
- #   define ssize_t int
- #   include 
-

diff --git a/sci-physics/root/files/root-5.32.00-afs.patch 
b/sci-physics/root/files/root-5.32.00-afs.patch
deleted file mode 100644
index 2bf31798e..0
--- a/sci-physics/root/files/root-5.32.00-afs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 root/net/auth/src/TAFS.cxx.orig2011-12-04 00:56:29.405007770 +0400
-+++ root/net/auth/src/TAFS.cxx 2011-12-04 00:56:35.534709259 +0400
-@@ -138,7 +138,7 @@
-   } else {
-  if (isatty(0) != 0 && isatty(1) != 0) {
- Gl_config("noecho", 1);
--pw = Getline((char *) prompt.Data());
-+pw = const_cast( Getline((char *) prompt.Data()) );
- Gl_config("noecho", 0);
-  } else {
- Warning("TAFS", "not tty: cannot prompt for passwd: failure");
 root/core/clib/src/strlcat.c.orig  2011-12-04 01:49:26.495179487 +0400
-+++ root/core/clib/src/strlcat.c   2011-12-04 01:50:41.407524763 +0400
-@@ -38,7 +38,7 @@
-  * Returns strlen(src) + MIN(siz, strlen(initial dst)).
-  * If retval >= siz, truncation occurred.
-  */
--size_t
-+size_t __attribute__((weak))
- strlcat(char *dst, const char *src, size_t siz)
- {
- register char *d = dst;
 root/core/clib/src/strlcpy.c.orig  2011-12-04 01:49:34.329797251 +0400
-+++ root/core/clib/src/strlcpy.c   2011-12-04 01:50:49.051151843 +0400
-@@ -36,7 +36,7 @@
-  * will be copied.  Always NUL terminates (unless siz == 0).
-  * Returns strlen(src); if retval >= siz, truncation occurred.
-  */
--size_t
-+size_t __attribute__((weak))
- strlcpy(char *dst, const char *src, size_t siz)
- {
- register char *d = dst;

diff 

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

2018-07-06 Thread Thomas Deutschmann
commit: 6b8677480c6f0bc1c5021d4d72d9feaa18254cb6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:38:02 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:42:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b867748

dev-python/qscintilla-python: x86 stable (bug #659708)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

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

diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild 
b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
index ab5f9388efb..89c17104767 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"



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

2018-07-06 Thread Thomas Deutschmann
commit: d82d9335a9727e3bad99cdc8513c305d89ff289e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:32:20 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:41:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82d9335

sys-apps/osinfo-db: x86 stable (bug #660314)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sys-apps/osinfo-db/osinfo-db-20180531.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild 
b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
index 9e69a433ac6..db4a3c50856 100644
--- a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}



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

2018-07-06 Thread Thomas Deutschmann
commit: d7b060f7a9f47cc20e3e438da3b6d42e65600196
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:34:59 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:41:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b060f7

x11-libs/gtksourceview: x86 stable (bug #660314)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild 
b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
index db3725e9918..60b26cd3d09 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
>=dev-libs/glib-2.48:2



[gentoo-commits] repo/gentoo:master commit in: sys-boot/woeusb/

2018-07-06 Thread Thomas Deutschmann
commit: 128d59454ef5105c8de75c2c402623879feb01f5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:39:08 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:42:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128d5945

sys-boot/woeusb: x86 stable (bug #659342)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sys-boot/woeusb/woeusb-3.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild 
b/sys-boot/woeusb/woeusb-3.1.5.ebuild
index d1da4080908..803545692f5 100644
--- a/sys-boot/woeusb/woeusb-3.1.5.ebuild
+++ b/sys-boot/woeusb/woeusb-3.1.5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="minimal"
 
 RDEPEND="



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

2018-07-06 Thread Thomas Deutschmann
commit: a5a2e4c971e47ce8d18e854584deee635e60e4bb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:24:21 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:41:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a2e4c9

media-libs/hamlib: x86 stable (bug #659114)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

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

diff --git a/media-libs/hamlib/hamlib-3.2.ebuild 
b/media-libs/hamlib/hamlib-3.2.ebuild
index eac2786bab6..5b7abf81949 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 x86 ~x86-fbsd"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"



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

2018-07-06 Thread Thomas Deutschmann
commit: da6b603c58b14cbac392dcd67b1fdd766968cc01
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:37:38 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:42:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6b603c

x11-libs/qscintilla: x86 stable (bug #659708)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 x11-libs/qscintilla/qscintilla-2.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild 
b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index 1b74d6e2214..e21f66bf760 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="designer doc"
 
 DEPEND="



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

2018-07-06 Thread Thomas Deutschmann
commit: 27c2f84c320d765c6ca320c2bead06acdb5b0873
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:25:36 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:41:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c2f84c

dev-tex/latexdiff: x86 stable (bug #659494)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-tex/latexdiff/latexdiff-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild 
b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
index e0f6ef9dbd5..a8b5b047776 100644
--- a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git;
 else
SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 fi
 
 LICENSE="GPL-3"



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

2018-07-06 Thread Thomas Deutschmann
commit: e66b56aee92e07f56c1cc8f685f3db0cc26366fe
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jul  6 13:31:10 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jul  6 13:41:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66b56ae

net-misc/networkmanager: x86 stable (bug #660314)

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-misc/networkmanager/networkmanager-1.10.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild 
b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index 3d3830010e1..c5534157fd1 100644
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271



  1   2   >