[gentoo-commits] repo/gentoo:master commit in: media-sound/teamspeak-client-bin/

2018-06-20 Thread Georgy Yakovlev
commit: 3d1e951c022e91668cfd499240565c36cbb636b2
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sat Jun 16 10:56:06 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Jun 21 05:54:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1e951c

media-sound/teamspeak-client-bin: bump to version 3.1.10

Closes: https://bugs.gentoo.org/658222
Closes: https://github.com/gentoo/gentoo/pull/8856
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/teamspeak-client-bin/Manifest | 4 ++--
 ...eak-client-bin-3.1.9.ebuild => teamspeak-client-bin-3.1.10.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/teamspeak-client-bin/Manifest 
b/media-sound/teamspeak-client-bin/Manifest
index b8018bc1e47..af25b788a91 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -1,2 +1,2 @@
-DIST TeamSpeak3-Client-linux_amd64-3.1.9.run 76048588 BLAKE2B 
7eac5590e4f915e072ae29bce7dcf1912a817c499660c88fc4a2f3918482dde7c3c49794200ea00316045f00cb4b02d4275ff860bbcebaba6199aab8c7cd950a
 SHA512 
079afb6b624c56916bb87941b44d62a786ba922d9e69df0c19a4f8930f9d67d7ebc752be2d2f83f971b36fd12e2080cdfc3042b654c2beaba93cf4d8fcafa420
-DIST TeamSpeak3-Client-linux_x86-3.1.9.run 75782289 BLAKE2B 
ccc97995c1bb0813b9b4ab5eca64638f67900f64c49bf4603e88e3b3b609cbed4ae302c4cbeb43718478ceb44e9504d3ea991a8f106b02c12697e3ba123c764a
 SHA512 
235581f29285feb0b940a6e968a7fe2afe22929b3a58f4b555d14c700183d0056022825846a0482c6c1693188dcf9f8ca95a725f328a9614d21b6cee774e5cc6
+DIST TeamSpeak3-Client-linux_amd64-3.1.10.run 75971703 BLAKE2B 
0b48b15d15af5b78d06a3c80b4aae964883bed5508685d22dbfeba30adecf5bc4b7e3dab54ca13f828eae7d2c24640037fb378581d726d81f4df26d5aa8f8929
 SHA512 
5a83c8a24e5af0353d15c28fdc8cfd840fbf071f5a25fbbc8f672bdec0afd374663826d42901329657596a6f3fa88774b3a1d9acad9fcc9fa0f41fc426043b3e
+DIST TeamSpeak3-Client-linux_x86-3.1.10.run 75706398 BLAKE2B 
534079d00510d1d12fbdfd759b9e1f730da0afb4df813afaf389b2f63781d2d27bdaf6bc9ea1f3a92ab31b07a7f1bd190f647a1fc2491f43946396d2db68596f
 SHA512 
81e70223c3257b74334b78928060bf7204ef4d79e5a09dd8b196c628361cdce88d6e8908bc99c2b40997d218fcfc0185073637275c1712a03b241537be3e56e6

diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.9.ebuild 
b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.10.ebuild
similarity index 100%
rename from media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.9.ebuild
rename to media-sound/teamspeak-client-bin/teamspeak-client-bin-3.1.10.ebuild



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

2018-06-20 Thread Hans de Graaff
commit: 4b19d8418fc59c34610136786eac7dee7fdd0066
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jun 21 04:11:11 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jun 21 04:11:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b19d841

dev-ruby/uglifier: add 4.1.12

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-ruby/uglifier/Manifest   |  1 +
 dev-ruby/uglifier/uglifier-4.1.12.ebuild | 33 
 2 files changed, 34 insertions(+)

diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index 272b88c5ca4..e1dd349a771 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -2,4 +2,5 @@ DIST uglifier-2.7.2.gem 84480 BLAKE2B 
a446f21f9b8682ba7ec020d355ec5b6eb573649116
 DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B 
b0263853c882859db8cc04c19e7f7f4bcbcef9d0b4080e414c9e1c86b691307c59d694abb33582485ea432b787f36445a49c39ece298d90806838bc56a4b7360
 SHA512 
5bc577753c175cddd7b3241f7343b75f593141c3bfa9ffa1325f7ade4a9acaf3b47e711007b5708f7cea1a7e9e768cbc3bc845d9eb362f877fe2fc83c047bb57
 DIST uglifier-4.1.10.tar.gz 199064 BLAKE2B 
e7acc4fc2548798fdd673e2b559a7039c8455854f451d6bc1c45d4cdcde7a9d96205e43e16df10717414eff6829c37a58e36a38081410533408e70d3ac297700
 SHA512 
4e3cd4e11c0f4eb019aa03231fcc7ea11a63f7598f07b21a0040219ef618972fcecbfed63ed77300ee32f36f95533c443f48d71bf069488392fec99362a180ed
 DIST uglifier-4.1.11.tar.gz 199761 BLAKE2B 
abbd696fead7dc22d76c3088934b713f3aefc609d5b5f3e0b3b54b68d6c9c832fc695423647c6ca8571142db8864093a533f4d654bb32525f0a7d9e2b04b7665
 SHA512 
bc4b735ef41093e245022d94448f3c1fc6a4e69fad664372924a8770576bbf6ae776863f8c440eaa356f7917643b8c22321fa0154d9d9507ef84f258311c8114
+DIST uglifier-4.1.12.tar.gz 199867 BLAKE2B 
858cd1b04880775815a36515fa34077a59899a58ded15b25aa52f9fd6e232ae7576319ee67e299291f9bbb5b5a03aa883025fd133736328b11cc1e47636bb295
 SHA512 
cef2dcda1c7195e2af50ed94e808ddbf1ec2b95ca27cedea86180e68451d5354029d2995407150c8ee5c5e702353fcf05e205cb81cdd63e0c89bd8c8e48e5a82
 DIST uglifier-4.1.9.tar.gz 198621 BLAKE2B 
3d2534b111e451daca5592559af999185b056fb61efa9ba2e22ef855479fd1ce316a58bbd48138c35c7f5b04813c24235616beb6d6dc0b6b8927a19c6bd8a7b3
 SHA512 
9daa50017f05a4637e2d3eba08500f2d967211c5155e6672e0e64bce713ccbb68ded04e471bd200336d972931ffd7affe50d2c22c6ae8d09d1cd17b080684f81

diff --git a/dev-ruby/uglifier/uglifier-4.1.12.ebuild 
b/dev-ruby/uglifier/uglifier-4.1.12.ebuild
new file mode 100644
index 000..b822aa8c1b9
--- /dev/null
+++ b/dev-ruby/uglifier/uglifier-4.1.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
+HOMEPAGE="https://github.com/lautis/uglifier;
+SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
+
+all_ruby_prepare() {
+   sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || 
die
+}



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

2018-06-20 Thread Hans de Graaff
commit: 9a069cd9a266c524d4fe77277bf7a7e9e11daa51
Author: Hans de Graaff  gentoo  org>
AuthorDate: Thu Jun 21 04:31:20 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Thu Jun 21 04:31:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a069cd9

dev-ruby/highline: add 2.0.0

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-ruby/highline/Manifest  |  1 +
 dev-ruby/highline/highline-2.0.0.ebuild | 34 +
 2 files changed, 35 insertions(+)

diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 77246622fa0..6a6e090f222 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1 +1,2 @@
 DIST highline-1.7.8.gem 224768 BLAKE2B 
683fa70e3ea4bf697ab5a1cd40da2528e2586f8fe12fb0ffb799938f2bfa2efe64fe1424c0ee1f90ae3df69f86a92f44eebcbb2ab34f18b3c4cdbb143e596067
 SHA512 
85f57ab732009cc961b824e252f0b65bbe7c0a8c97849d453773a331016b2ea8fa0efe393bc1a0073eae6d3cf523d97b9434cd73bdceed55bc069be0b6f4b41d
+DIST highline-2.0.0.tar.gz 233750 BLAKE2B 
ac696d63aaf15309a8235d9a0c25e4722b257cda154bd00a420675e1bccedb5f06122f3532ac200685f22753783152255194751f2e3bdc908f80b278f325328c
 SHA512 
d1a96233ffb97b2985e7afebd3755d1b28d89ac2d84a3ec8c04450680c1149f1fcc46f0221242768a2aafa8bfbde4f5a6f3951013c0b5d25a3aa88f1e571b4d8

diff --git a/dev-ruby/highline/highline-2.0.0.ebuild 
b/dev-ruby/highline/highline-2.0.0.ebuild
new file mode 100644
index 000..6a3821d4835
--- /dev/null
+++ b/dev-ruby/highline/highline-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline;
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+all_ruby_prepare() {
+   # fix up gemspec file not to call git
+   sed -i -e '/git ls-files/d' highline.gemspec || die
+
+   # Avoid unneeded dependencies
+   sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+   -e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+   sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+   # Remove almost empty doc directory to allow rdoc recipe to work
+   rm -rf doc || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

2018-06-20 Thread Brian Evans
commit: 24685cd5cecf2a3f6c773ada27bb4822a961790e
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 21 03:55:08 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jun 21 03:55:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24685cd5

dev-db/mariadb: Version bump for 10.1.34

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-db/mariadb/Manifest   |   2 +
 dev-db/mariadb/mariadb-10.1.34.ebuild | 881 ++
 2 files changed, 883 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 86a59a70955..a922815d264 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,6 +4,7 @@ DIST mariadb-10.0.35.tar.gz 66551252 BLAKE2B 
69cc9c78f7c47a4b1760940cb0f395b4053
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 
40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5
 SHA512 
c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 
1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f
 SHA512 
db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 
3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76
 SHA512 
1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e
+DIST mariadb-10.1.34.tar.gz 65298561 BLAKE2B 
3f3af7b8bad68a08f69befd3f3e7bd88b8cf058feb20309dc2cdbd16bf5d015c2cb0d1d9d2fdf831f6183c0b9bb25405124c24b2940467489e05d42c57f7b0a6
 SHA512 
3c18359006b340dcf724d1fce36dcc19916c42492269a7545e0726172b8f7b84860e10725c74e4458dae34572395f1650bf17838e9058544e0a6cfcbffd54f6d
 DIST mariadb-10.2.15.tar.gz 73329750 BLAKE2B 
e588f54d1b8807df1a57b87831294c70a7d21ed73bba96487a091338ee94855c2b796c939057546b9437b2caf96600ef6f7e111557249adaa9e18795a5a35ade
 SHA512 
7702af8787973b15784dc8a89f9d56765725a420e2e68f1924b67c88c134c7d83d324916707fa9e5f05ed747f813f16feefbb477e999a6698b1dcfb5a88f
 DIST mariadb-10.3.6.tar.gz 71064269 BLAKE2B 
681150a26de95cc276276a9b8d0b2c6e4a842dac80f20c2e8b0caeec5823cb956feffb494d18b1f2832e220c392c437424813de7720fb83a5d5c1fca71a4aef9
 SHA512 
cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1
 DIST mariadb-10.3.7.tar.gz 71816160 BLAKE2B 
213cfe2999b48c088e08e8289a6243d79b91e465fce51850a253a121896f69df03f935940f25ac290e15e29f97b3a16f75711044b8986f6ec3841ef8beafa0b4
 SHA512 
b1b3ad9ddc45bdfd3d03888ba160f9991b23187341deac402d5dc4b735511e29767a5dc64ca557bea9bf3d3b413b941ef2e1f5fa30be056dfaec4542a43895f1
@@ -13,3 +14,4 @@ DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 
3e3e19a905961570cea9c1eb
 DIST mysql-extras-20180515-0123Z.tar.bz2 320380 BLAKE2B 
a56e3ef19f4e30628fea9889dbb55379a8c92f08c9c493fe3f524b98fabf3505150fbe7cc65f97fc8b75632b5dd7360ddb9bd1542714c5e9916f94c2792ff3db
 SHA512 
3e0b36ab4cb3f2e7d30f1fb2d8d3a916439611f1714475f2ab0480ba51176f47dcccd40931de4bd0a46b0aca6dfcb62cfc92b6939eed2e61628947bf664008ee
 DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 
48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6
 SHA512 
de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e
 DIST mysql-extras-20180529-0042Z.tar.bz2 321715 BLAKE2B 
c40e7c8de7d24f1ab6208968f3e22aae9e7782f02edef1391d37583ba4a99e67646eba2b9fdcf2a77e3e5a3a86c36632edfebb42b12ab242662cf6913313168d
 SHA512 
a136d9f9567a3bbd396c1e33d1d7b6565be16b5b0a514835299a09b009e9d908328066701bb1c6c19af74225b1d166e3f57af81b277b6d8fad9e63c009523586
+DIST mysql-extras-20180621-0218Z.tar.bz2 321959 BLAKE2B 
f444a3bd5e75c7ef491d175b1fc775a091c12870f4ac1003f0458dd5c7a1c91e09adec78013e828b4d8b16e96060426825b1650def8c22199dd59897b732359e
 SHA512 
20523897dac98b369ab064932507034e547ffd283059285a4fb2bf1d63637c663d4d641dc91c5687de308a50eab3e75788d3cae720259a03d99b7e01f4146762

diff --git a/dev-db/mariadb/mariadb-10.1.34.ebuild 
b/dev-db/mariadb/mariadb-10.1.34.ebuild
new file mode 100644
index 000..7c17c5170b9
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.34.ebuild
@@ -0,0 +1,881 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20180621-0218Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs java-pkg-opt-2 user 
cmake-utils multilib-build
+

[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/files/, sys-libs/zlib/

2018-06-20 Thread Mike Frysinger
commit: 89cbe844bb4c4363270c692f50df5741cc2e78d7
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Jun 21 02:55:38 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jun 21 02:57:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cbe844

sys-libs/zlib: drop install of minizip/crypt.h #658536

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

 .../zlib-1.2.11-minizip-drop-crypt-header.patch|  38 +++
 sys-libs/zlib/zlib-1.2.11-r2.ebuild| 123 +
 2 files changed, 161 insertions(+)

diff --git a/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch 
b/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch
new file mode 100644
index 000..2e0a93e9194
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/658536
+https://github.com/madler/zlib/pull/229
+
+From e490ddad3091574a0c2e3b5a66a8fee9a7ab212f Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup 
+Date: Sun, 19 Feb 2017 16:42:12 +0100
+Subject: [PATCH] minizip: don't install crypt.h
+
+People did mistakenly or unintentionally include crypt.h before,
+don't install this internal header from now.
+---
+ contrib/minizip/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
+index d343011ebc3b..4f46610238d2 100644
+--- a/contrib/minizip/Makefile.am
 b/contrib/minizip/Makefile.am
+@@ -26,13 +26,15 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 
-lz
+ 
+ minizip_includedir = $(includedir)/minizip
+ minizip_include_HEADERS = \
+-  crypt.h \
+   ioapi.h \
+   mztools.h \
+   unzip.h \
+   zip.h \
+   ${iowin32_h}
+ 
++noinst_HEADERS = \
++  crypt.h
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = minizip.pc
+ 
+-- 
+2.17.1
+

diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild 
b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
new file mode 100644
index 000..3133384c67c
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/;
+SRC_URI="https://zlib.net/${P}.tar.gz
+   http://www.gzip.org/zlib/${P}.tar.gz
+   http://www.zlib.net/current/beta/${P}.tar.gz;
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="minizip static-libs"
+
+DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
+RDEPEND="! zlib.pc || die
+   ;;
+   *)
+   emake
+   ;;
+   esac
+   use minizip && emake -C contrib/minizip
+}
+
+sed_macros() {
+   # clean up namespace a little #383179
+   # we do it here so we only have to tweak 2 files
+   sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
+}
+
+multilib_src_install() {
+   case ${CHOST} in
+   *-mingw*|mingw*)
+   emake -f win32/Makefile.gcc install \
+   BINARY_PATH="${ED}/usr/bin" \
+   LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
+   INCLUDE_PATH="${ED}/usr/include" \
+   SHARED_MODE=1
+   # overwrites zlib.pc created from win32/Makefile.gcc #620136
+   insinto /usr/$(get_libdir)/pkgconfig
+   doins zlib.pc
+   ;;
+
+   *)
+   emake install DESTDIR="${D}" LDCONFIG=:
+   gen_usr_ldscript -a z
+   ;;
+   esac
+   sed_macros "${ED}"/usr/include/*.h
+
+   if use minizip ; then
+   emake -C contrib/minizip install DESTDIR="${D}"
+   sed_macros "${ED}"/usr/include/minizip/*.h
+   fi
+
+   use static-libs || rm -f 
"${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
+}
+
+multilib_src_install_all() {
+   dodoc FAQ README ChangeLog doc/*.txt
+   use minizip && dodoc contrib/minizip/*.txt
+}



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

2018-06-20 Thread Mike Frysinger
commit: 3b9f17df19b6c64674257cf039d647ed6a2b99aa
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Jun 20 21:34:49 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jun 21 02:25:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9f17df

net-misc/openssh: move ssh{,d}_config tweaks to a sep func

No functional changes here.  Should make managing src_install easier
as all the sshd_config/ssh_config changes are kept separate.

 net-misc/openssh/openssh-7.7_p1-r101.ebuild | 44 +
 net-misc/openssh/openssh-7.7_p1-r5.ebuild   | 44 +
 2 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/net-misc/openssh/openssh-7.7_p1-r101.ebuild 
b/net-misc/openssh/openssh-7.7_p1-r101.ebuild
index 69618e6b249..d330358e032 100644
--- a/net-misc/openssh/openssh-7.7_p1-r101.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r101.ebuild
@@ -328,40 +328,48 @@ src_test() {
[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
 }
 
-src_install() {
-   emake install-nokeys DESTDIR="${D}"
-   fperms 600 /etc/ssh/sshd_config
-   dobin contrib/ssh-copy-id
-   newinitd "${FILESDIR}"/sshd.rc6.5 sshd
-   newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-   newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-   if use pam ; then
-   sed -i \
-   -e "/^#UsePAM /s:.*:UsePAM yes:" \
-   -e "/^#PasswordAuthentication 
/s:.*:PasswordAuthentication no:" \
-   -e "/^#PrintMotd /s:.*:PrintMotd no:" \
-   -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-   "${ED%/}"/etc/ssh/sshd_config || die
-   fi
-
-   # Gentoo tweaks to default config files
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+   # First the server config.
cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
 
# Allow client to pass locale environment variables #367017
AcceptEnv LANG LC_*
EOF
+
+   # Then the client config.
cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
 
# Send locale environment variables #367017
SendEnv LANG LC_*
EOF
 
+   if use pam ; then
+   sed -i \
+   -e "/^#UsePAM /s:.*:UsePAM yes:" \
+   -e "/^#PasswordAuthentication 
/s:.*:PasswordAuthentication no:" \
+   -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+   -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+   "${ED%/}"/etc/ssh/sshd_config || die
+   fi
+
if use livecd ; then
sed -i \
-e '/^#PermitRootLogin/c# Allow root login with 
password on livecds.\nPermitRootLogin Yes' \
"${ED%/}"/etc/ssh/sshd_config || die
fi
+}
+
+src_install() {
+   emake install-nokeys DESTDIR="${D}"
+   fperms 600 /etc/ssh/sshd_config
+   dobin contrib/ssh-copy-id
+   newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+   newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+   newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+   tweak_ssh_configs
 
if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
insinto /etc/openldap/schema/

diff --git a/net-misc/openssh/openssh-7.7_p1-r5.ebuild 
b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
index 8ce813c89ca..cadc2109835 100644
--- a/net-misc/openssh/openssh-7.7_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
@@ -328,40 +328,48 @@ src_test() {
[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
 }
 
-src_install() {
-   emake install-nokeys DESTDIR="${D}"
-   fperms 600 /etc/ssh/sshd_config
-   dobin contrib/ssh-copy-id
-   newinitd "${FILESDIR}"/sshd.rc6.5 sshd
-   newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-   newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-   if use pam ; then
-   sed -i \
-   -e "/^#UsePAM /s:.*:UsePAM yes:" \
-   -e "/^#PasswordAuthentication 
/s:.*:PasswordAuthentication no:" \
-   -e "/^#PrintMotd /s:.*:PrintMotd no:" \
-   -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-   "${ED%/}"/etc/ssh/sshd_config || die
-   fi
-
-   # Gentoo tweaks to default config files
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+   # First the server config.
cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
 
# Allow client to pass locale environment variables #367017
AcceptEnv LANG LC_*
EOF
+
+   # Then the client config.
cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
 
# Send locale environment variables #367017
SendEnv LANG LC_*
EOF
 
+   if use pam ; then
+   sed -i \
+   -e "/^#UsePAM /s:.*:UsePAM yes:" \
+   -e 

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

2018-06-20 Thread Mike Frysinger
commit: bc13a3787008c4c99e147a7c71f4f19e09557d85
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Jun 20 21:00:59 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jun 21 02:25:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc13a378

sys-apps/xinetd: switch to upstream systemd service unit

 .../xinetd/{xinetd-2.3.15.3-r1.ebuild => xinetd-2.3.15.3-r2.ebuild} | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r1.ebuild 
b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
similarity index 91%
rename from sys-apps/xinetd/xinetd-2.3.15.3-r1.ebuild
rename to sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
index 42b0c854d0e..92bc834e7df 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3-r1.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
@@ -36,6 +36,10 @@ PATCHES=(
 src_prepare() {
default
eautoreconf
+
+   sed -i \
+   -e 's:/usr/bin/kill:/bin/kill:' \
+   "contrib/${PN}.service" || die
 }
 
 src_configure() {
@@ -53,7 +57,7 @@ src_install() {
 
newinitd "${FILESDIR}"/xinetd.rc6 xinetd
newconfd "${FILESDIR}"/xinetd.confd xinetd
-   systemd_dounit "${FILESDIR}/${PN}.service"
+   systemd_dounit "contrib/${PN}.service"
 
newdoc contrib/xinetd.conf xinetd.conf.dist.sample
dodoc README.md CHANGELOG



[gentoo-commits] proj/mysql-extras: New tag: mysql-extras-20180621-0218Z

2018-06-20 Thread Brian Evans
commit: 
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jun 21 02:18:36 2018 +

New tag: mysql-extras-20180621-0218Z




[gentoo-commits] proj/mysql-extras:master commit in: /

2018-06-20 Thread Brian Evans
commit: 6a621f0c274a6a40b4eb610d31bf70076b71e44f
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 21 02:05:32 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jun 21 02:05:32 2018 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=6a621f0c

client-libs: Too much edit in last commit

 20018_all_mariadb-10.1.16-without-clientlibs-tools.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch 
b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
index e6cb129..3487b70 100644
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
@@ -67,6 +67,7 @@ diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
 -MYSQL_ADD_EXECUTABLE(perror perror.c)
  ADD_DEPENDENCIES(perror GenError)
  TARGET_LINK_LIBRARIES(perror mysys)
+
 diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
 --- a/scripts/CMakeLists.txt   2015-06-24 10:28:12.800169100 -0400
 +++ b/scripts/CMakeLists.txt   2015-06-24 10:42:49.682169100 -0400



[gentoo-commits] proj/mysql-extras:master commit in: /

2018-06-20 Thread Brian Evans
commit: 1582310ee6efcb58945a7be8005eac78bfccd0e7
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 21 02:01:42 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jun 21 02:01:42 2018 +
URL:https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=1582310e

client-libs: Fix tests of 10.1

 ..._mariadb-10.1.16-without-clientlibs-tools.patch | 24 +-
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch 
b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
index db1988d..e6cb129 100644
--- a/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+++ b/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
@@ -51,26 +51,22 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
 diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
 --- a/extra/CMakeLists.txt 2015-06-17 10:54:11.0 -0400
 +++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400
-@@ -54,12 +54,14 @@
+@@ -54,10 +54,15 @@
DEPENDS 
${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
  
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
--TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
 +IF(NOT WITHOUT_CLIENTLIBS)
-+  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-+  TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
- 
--MYSQL_ADD_EXECUTABLE(perror perror.c)
--ADD_DEPENDENCIES(perror GenError)
--TARGET_LINK_LIBRARIES(perror mysys)
-+  MYSQL_ADD_EXECUTABLE(perror perror.c)
-+  ADD_DEPENDENCIES(perror GenError)
-+  TARGET_LINK_LIBRARIES(perror mysys)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
++MYSQL_ADD_EXECUTABLE(perror perror.c)
++ELSE(NOT WITHOUT_CLIENTLIBS)
++ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
++ADD_EXECUTABLE(perror perror.c)
 +ENDIF(NOT WITHOUT_CLIENTLIBS)
+ TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
  
- IF(UNIX)
- MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
+-MYSQL_ADD_EXECUTABLE(perror perror.c)
+ ADD_DEPENDENCIES(perror GenError)
+ TARGET_LINK_LIBRARIES(perror mysys)
 diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
 --- a/scripts/CMakeLists.txt   2015-06-24 10:28:12.800169100 -0400
 +++ b/scripts/CMakeLists.txt   2015-06-24 10:42:49.682169100 -0400



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

2018-06-20 Thread Louis Sautier
commit: 8ca8a363b3c46636139c95b21df8d8ad3e138893
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 23:00:25 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 23:02:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca8a363

dev-python/more-itertools: bump to 4.2.0

Use pytest instead of nose because the latter fails.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/more-itertools/Manifest |  1 +
 .../more-itertools/more-itertools-4.2.0.ebuild | 39 ++
 2 files changed, 40 insertions(+)

diff --git a/dev-python/more-itertools/Manifest 
b/dev-python/more-itertools/Manifest
index 25dd56eedc8..1cf128358df 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1 +1,2 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B 
dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4
 SHA512 
575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
+DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 
48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452
 SHA512 
7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77

diff --git a/dev-python/more-itertools/more-itertools-4.2.0.ebuild 
b/dev-python/more-itertools/more-itertools-4.2.0.ebuild
new file mode 100644
index 000..75bf1681331
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-4.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="doc test"
+
+RDEPEND="

[gentoo-commits] proj/openrc:master commit in: src/librc/

2018-06-20 Thread William Hubbs
commit: b2f5531194e33c229462e9f52fa1d9388463f7b7
Author: William Hubbs  gmail  com>
AuthorDate: Wed Jun 20 22:45:01 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jun 20 22:45:01 2018 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b2f55311

librc-misc: convert snprintf calls to xasprintf

 src/librc/librc-misc.c | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
index 9d514bcd..178768c5 100644
--- a/src/librc/librc-misc.c
+++ b/src/librc/librc-misc.c
@@ -237,13 +237,9 @@ static void rc_config_set_value(RC_STRINGLIST *config, 
char *value)
if (token[i] == '\n')
token[i] = 0;
 
-   i = strlen(entry) + strlen(token) + 2;
-   newline = xmalloc(sizeof(char) * i);
-   snprintf(newline, i, "%s=%s", entry, token);
+   xasprintf(, "%s=%s", entry, token);
} else {
-   i = strlen(entry) + 2;
-   newline = xmalloc(sizeof(char) * i);
-   snprintf(newline, i, "%s=", entry);
+   xasprintf(, "%s=", entry);
}
 
replaced = false;
@@ -300,8 +296,7 @@ static RC_STRINGLIST *rc_config_kcl(RC_STRINGLIST *config)
 
if (value != NULL) {
len = varlen + strlen(value) + 2;
-   tmp = xmalloc(sizeof(char) * len);
-   snprintf(tmp, len, "%s=%s", override->value, value);
+   xasprintf(, "%s=%s", override->value, value);
}
 
/*



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

2018-06-20 Thread Georgy Yakovlev
commit: 7cbc5531a7cc4547e97727a25c270426e362c42c
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun 16 19:29:52 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun 20 22:41:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbc5531

media-video/mpv: add vulkan support to 

Implementation details:
- mpv requires at least one enabled vulkan context (X or wayland),
  even though this isn't reflected by the build system. Hence the
  REQUIRED_USE. Without this you cannot enable vulkan backend.
- The appropriate context must be enabled in vulkan-loader.
- mpv technically allows vulkan without shaderc on NVIDIA cards,
  but support for this in NVIDIA drivers is deprecated and going
  away, see [1]. Thus always require shaderc.

[1]: https://github.com/mpv-player/mpv/issues/5867
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-video/mpv/metadata.xml| 1 +
 media-video/mpv/mpv-.ebuild | 9 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index df0200d2936..1eb1494cbbc 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -33,6 +33,7 @@
(Note: these outputs exist for compatibility reasons 
only, avoid if possible)
Install extra tools: mpv_identify.sh, 
mpv_idet.sh, and umpv
Enable subtitles charset discovery via 
app-i18n/uchardet
+   Enable support for various Vulkan-based 
video backends


mpv-player/mpv

diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 8601e37b4bd..f99a57b4a26 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -31,7 +31,7 @@ SLOT="0"
 IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
dvd +egl gbm +iconv jack javascript jpeg lcms +libass libav libcaca 
libmpv
+lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba 
sdl
-   selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+   selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
zsh-completion"
 
 REQUIRED_USE="
@@ -50,6 +50,7 @@ REQUIRED_USE="
v4l? ( || ( alsa oss ) )
vaapi? ( || ( gbm X wayland ) )
vdpau? ( X )
+   vulkan? ( || ( X wayland ) )
wayland? ( egl )
X? ( egl? ( opengl ) )
xv? ( X )
@@ -96,6 +97,10 @@ COMMON_DEPEND="
v4l? ( media-libs/libv4l )
vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
vdpau? ( x11-libs/libvdpau )
+   vulkan? (
+   media-libs/shaderc
+   media-libs/vulkan-loader[X?,wayland?]
+   )
wayland? (
>=dev-libs/wayland-1.6.0
>=dev-libs/wayland-protocols-1.14
@@ -231,10 +236,12 @@ src_configure() {
$(usex vaapi "$(use_enable gbm vaapi-drm)" 
'--disable-vaapi-drm')
$(use_enable libcaca caca)
$(use_enable jpeg)
+   $(use_enable vulkan shaderc)
$(use_enable raspberry-pi rpi)
$(usex libmpv "$(use_enable opengl plain-gl)" 
'--disable-plain-gl')
--disable-mali-fbdev # Only available in overlays.
$(usex opengl '' '--disable-gl')
+   $(use_enable vulkan)
 
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 
577332.



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

2018-06-20 Thread Georgy Yakovlev
commit: a6f05a2071d158c39994764185c64fde8c8724e6
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun 16 20:03:43 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun 20 22:41:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f05a20

media-video/mpv: update 'opengl' USE desc

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-video/mpv/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 1eb1494cbbc..7db45d069b9 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -26,7 +26,8 @@
Enable OSD (On Screen Display) and 
subtitles support via media-libs/libass
Build mpv shared library
Enable Lua scripting, OSC (On Screen 
Controller) GUI and net-misc/youtube-dl hook-script
-   Enable the recommended 'opengl' video 
output
+   Enable the recommended 'opengl' video 
output
+   Enable support for various OpenGL-based 
video backends
Enable support for the Raspberry 
Pi
Enable high quality pitch correction 
via media-libs/rubberband
Enable media-libs/libsdl2 based 
video and audio outputs



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

2018-06-20 Thread Georgy Yakovlev
commit: cbc6a61357dec99a5aaa74489fb62c60b3d8532e
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun 16 20:01:18 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun 20 22:41:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc6a613

media-video/mpv: add vulkan support to 0.28.2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-video/mpv/mpv-0.28.2.ebuild | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/media-video/mpv/mpv-0.28.2.ebuild 
b/media-video/mpv/mpv-0.28.2.ebuild
index 32fac3efe42..d43b6047c64 100644
--- a/media-video/mpv/mpv-0.28.2.ebuild
+++ b/media-video/mpv/mpv-0.28.2.ebuild
@@ -31,8 +31,8 @@ SLOT="0"
 IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav 
libcaca
libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
-   samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv 
zlib
-   zsh-completion"
+   samba sdl selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X
+   +xv zlib zsh-completion"
 
 REQUIRED_USE="
|| ( cli libmpv )
@@ -50,6 +50,7 @@ REQUIRED_USE="
v4l? ( || ( alsa oss ) )
vaapi? ( || ( gbm X wayland ) )
vdpau? ( X )
+   vulkan? ( || ( X wayland ) )
wayland? ( egl )
X? ( egl? ( opengl ) )
xv? ( X )
@@ -96,6 +97,10 @@ COMMON_DEPEND="
v4l? ( media-libs/libv4l )
vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
vdpau? ( x11-libs/libvdpau )
+   vulkan? (
+   media-libs/shaderc
+   media-libs/vulkan-loader[X?,wayland?]
+   )
wayland? (
>=dev-libs/wayland-1.6.0
>=x11-libs/libxkbcommon-0.3.0
@@ -234,10 +239,12 @@ src_configure() {
$(usex vaapi "$(use_enable gbm vaapi-drm)" 
'--disable-vaapi-drm')
$(use_enable libcaca caca)
$(use_enable jpeg)
+   $(use_enable vulkan shaderc)
$(use_enable raspberry-pi rpi)
$(usex libmpv "$(use_enable opengl plain-gl)" 
'--disable-plain-gl')
--disable-mali-fbdev # Only available in overlays.
$(usex opengl '' '--disable-gl')
+   $(use_enable vulkan)
 
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 
577332.



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/arch/x86/, profiles/arch/base/

2018-06-20 Thread Georgy Yakovlev
commit: c6cd6893bcb9512714f3c78d1fb00c64fcff6c4b
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun 16 20:06:32 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun 20 22:42:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6cd6893

profiles: p.use.mask media-video/mpv[vulkan]

mask everywhere but amd64, x86

Closes: https://github.com/gentoo/gentoo/pull/8864
Reviewed-by: Michał Górny  gentoo.org>

 profiles/arch/amd64/package.use.mask | 5 +
 profiles/arch/base/package.use.mask  | 5 +
 profiles/arch/x86/package.use.mask   | 5 +
 3 files changed, 15 insertions(+)

diff --git a/profiles/arch/amd64/package.use.mask 
b/profiles/arch/amd64/package.use.mask
index 4bb059665fa..5109e4af610 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Ilya Tumaykin  (17 Jun 2018)
+# Vulkan support is only available on few selected arches atm.
+# Mask everywhere, unmask where appropriate.
+media-video/mpv -vulkan
+
 # Mikle Kolyada  (02 Jun 2018)
 # Too many untested ruby dependencies
  (17 Jun 2018)
+# Vulkan support is only available on few selected arches atm.
+# Mask everywhere, unmask where appropriate.
+media-video/mpv vulkan
+
 # Nick Sarnie  (29 Apr 2018)
 # media-libs/vulkan-loader and app-emulation/vkd3d are not available everywhere
 app-emulation/wine-any vkd3d vulkan

diff --git a/profiles/arch/x86/package.use.mask 
b/profiles/arch/x86/package.use.mask
index d4d4995e561..9f057c9bc06 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,11 @@
 
 # This file requires >=portage-2.1.1
 
+# Ilya Tumaykin  (17 Jun 2018)
+# Vulkan support is only available on few selected arches atm.
+# Mask everywhere, unmask where appropriate.
+media-video/mpv -vulkan
+
 # Andreas K. Hüttel  (21 May 2018)
 # LO kde support on x86 is broken, see bug 523496
 =app-office/libreoffice-bin-6.0* kde



[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/

2018-06-20 Thread Georgy Yakovlev
commit: c31d001aeedaf97917fa29fa859e16090cc50282
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun 16 18:06:50 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun 20 22:41:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31d001a

media-libs/shaderc: new package

A collection of tools, libraries and tests for shader compilation.
Includes, for example, a GLSL -> SPIR-V compiler as a shared library,
which is required for the upcoming Vulkan support in media-video/mpv.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/shaderc/Manifest|  1 +
 .../shaderc-2017.2-fix-glslang-link-order.patch| 46 +++
 media-libs/shaderc/metadata.xml| 15 
 media-libs/shaderc/shaderc-2017.2.ebuild   | 89 ++
 media-libs/shaderc/shaderc-.ebuild | 85 +
 5 files changed, 236 insertions(+)

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
new file mode 100644
index 000..6e1fa802596
--- /dev/null
+++ b/media-libs/shaderc/Manifest
@@ -0,0 +1 @@
+DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B 
e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b
 SHA512 
558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18

diff --git 
a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch 
b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
new file mode 100644
index 000..2cd24a165e5
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
@@ -0,0 +1,46 @@
+Original upstream PR: https://github.com/google/shaderc/pull/463
+
+From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
+From: Niklas Haas 
+Date: Tue, 29 May 2018 07:34:00 +0200
+Subject: [PATCH] Fix the link order of libglslang and libHLSL
+
+libglslang depends on libHLSL, so the latter needs to be specified last.
+This fixes an issue when trying to build shaderc against system-wide
+versions of libglslang/libHLSL, rather than the in-tree versions from
+third_party.
+
+Additionally, libshaderc_util also depends on SPIRV-Tools
+---
+ glslc/CMakeLists.txt   | 2 +-
+ libshaderc_util/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
+index acf6fb0..0f5d888 100644
+--- a/glslc/CMakeLists.txt
 b/glslc/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_library(glslc STATIC
+ shaderc_default_compile_options(glslc)
+ target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
+ target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
+-  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
++  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(glslc PRIVATE shaderc_util shaderc)
+
+ add_executable(glslc_exe src/main.cc)
+diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
+index 873540a..6d0c465 100644
+--- a/libshaderc_util/CMakeLists.txt
 b/libshaderc_util/CMakeLists.txt
+@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
+
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+-  glslang OSDependent OGLCompiler HLSL glslang SPIRV
+-  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
++  glslang OSDependent OGLCompiler glslang HLSL SPIRV
++  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
+
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_util

diff --git a/media-libs/shaderc/metadata.xml b/media-libs/shaderc/metadata.xml
new file mode 100644
index 000..8935ad3118c
--- /dev/null
+++ b/media-libs/shaderc/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   itumaykin+gen...@gmail.com
+   Coacher
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   google/shaderc
+   
+

diff --git a/media-libs/shaderc/shaderc-2017.2.ebuild 
b/media-libs/shaderc/shaderc-2017.2.ebuild
new file mode 100644
index 000..3657eab08ee
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2017.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="7a23a01742b88329fb2260eda007172135ba25d4"
+MY_P="${PN}-${EGIT_COMMIT}"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc;
+SRC_URI="https://github.com/google/shaderc/archive/${EGIT_COMMIT}.tar.gz -> 
${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+   dev-util/glslang[${MULTILIB_USEDEP}]
+

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

2018-06-20 Thread Patrice Clement
commit: 8ab0b9df79dfae87b9e33e22de761b6660b6b0aa
Author: David Roman  gmail  com>
AuthorDate: Tue Jun 19 19:56:18 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jun 20 22:02:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab0b9df

dev-python/flask-api: new package.

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

 dev-python/flask-api/Manifest |  1 +
 dev-python/flask-api/flask-api-1.0.ebuild | 35 +++
 dev-python/flask-api/metadata.xml | 19 +
 3 files changed, 55 insertions(+)

diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
new file mode 100644
index 000..4e074089118
--- /dev/null
+++ b/dev-python/flask-api/Manifest
@@ -0,0 +1 @@
+DIST flask-api-1.0.tar.gz 18 BLAKE2B 
113bc6a3ba9f548e61ab6c1822491d91f8562c7809929bcd2b0ecc4160a2358532d5da398b7c876cf5e4f3d9dd03bc159da6a1f24621af1e07bc9d9680b87d7f
 SHA512 
425669e54b9f5dbf548acdb9fc2c3c661b8cfc4631d7677f20a838729584c4f970f9fbd47621e5b3155124637f5b8f4b5cb51bc402f7f406108882d46e4908de

diff --git a/dev-python/flask-api/flask-api-1.0.ebuild 
b/dev-python/flask-api/flask-api-1.0.ebuild
new file mode 100644
index 000..a7ae0d383d1
--- /dev/null
+++ b/dev-python/flask-api/flask-api-1.0.ebuild
@@ -0,0 +1,35 @@
+# 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="Browsable web APIs for Flask"
+HOMEPAGE="https://github.com/flask-api/flask-api;
+# pypi mirror don't have docs folder
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+DEPEND="
+   ${RDEPEND}
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+
+python_install_all() {
+   distutils-r1_python_install_all
+   dodoc docs/about/* docs/api-guide/* docs/index.md
+}
+
+python_test() {
+   pytest || die
+}

diff --git a/dev-python/flask-api/metadata.xml 
b/dev-python/flask-api/metadata.xml
new file mode 100644
index 000..9e4d1fa2d5b
--- /dev/null
+++ b/dev-python/flask-api/metadata.xml
@@ -0,0 +1,19 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+proxy-ma...@gentoo.org
+Proxy Maintainers
+
+
+davidroma...@gmail.com
+David Roman
+
+
+pyt...@gentoo.org
+Python
+
+
+flask-api/flask-api
+
+



[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

2018-06-20 Thread Andreas Hüttel
commit: a8117e71f9ae531ca4680eb8bdbf26db10d5a6cf
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Jun 20 21:58:12 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Wed Jun 20 21:58:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8117e71

sys-libs/glibc: ChangeLog.old didnt exist here yet

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-libs/glibc/glibc-2.19-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild 
b/sys-libs/glibc/glibc-2.19-r2.ebuild
index 67d94602c8f..a398dd3650e 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -1251,7 +1251,6 @@ glibc_do_src_install() {
for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
[[ -s ${d} ]] && dodoc ${d}
done
-   dodoc -r ChangeLog.old
 
# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
# creation of the "factory" symlink in pkg_postinst().



[gentoo-commits] repo/gentoo:master commit in: dev-libs/gmp/, dev-libs/gmp/files/, dev-libs/gmp/files/6.0.0a/

2018-06-20 Thread Andreas Hüttel
commit: f0e46f8537913157b3c163a4ecf00c2992ee48c8
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Jun 20 21:52:04 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Wed Jun 20 21:52:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e46f85

dev-libs/gmp: Remove old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/gmp/Manifest  |   6 --
 .../gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff |  22 
 dev-libs/gmp/files/6.0.0a/ppc64-build.diff |  23 -
 dev-libs/gmp/files/gmp-6.1.0-tune-printf.patch |  43 
 dev-libs/gmp/files/gmp-6.1.0-udiv.patch|  61 ---
 dev-libs/gmp/gmp-6.0.0a.ebuild | 114 -
 dev-libs/gmp/gmp-6.1.0.ebuild  | 113 
 dev-libs/gmp/gmp-6.1.1.ebuild  | 113 
 8 files changed, 495 deletions(-)

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 39da1943543..71954ddbaf3 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,9 +1,3 @@
 DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 
0efecd60c7a585f94ec8cbee77541d409c8e3bdeabaca09f7971560fb0fd504ae8e405256913acbef1434146868885c98068ff59efec92c92fdb73b853cf9396
 SHA512 
2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
-DIST gmp-6.0.0a.tar.xz 1904112 BLAKE2B 
eabe9976a7c89e94d9b6aad3c4251f7cbad0f9b8ec597d270cf39d9abbc68207e47604e0ecc1840dbeefb3bd22312cd5451f80046d5a8c577781d2a264b40719
 SHA512 
50368f4368b244b442438ce1768cf0f1166e490d1bafb8feda1ffc90fea3807e7328f30f3faa861799e4f5ff6e3113049ca3231b2f48571e4583fc3d60441816
-DIST gmp-6.1.0.tar.xz 1950316 BLAKE2B 
81303b8c4dc02de202502d7d1e2df5a538ab2ea9bc36b0a0a8c8d030250bf26471e57ecee26144d0758366a8cec8b413dce88e7e1c89f32c7d1f9add1d833d7d
 SHA512 
3647f07914e6c01b28d94f2d9783e50b0ca9f742a694f56d5759e79a057143ded578b71707ff909c6b0f5710862974606461608e73b33af3114b5338670d8630
-DIST gmp-6.1.1.tar.xz 1943164 BLAKE2B 
0cc4d8959f03d8f00be4d393b47936f0a056dd2d88c25a4c705779a1175a39028dc987352186d61ebf2a361cdc67a550ec3fb9965708a35dc029b98a3160e96d
 SHA512 
6ead5fdf15891e0c47b094351497a052cc691973f09c60a8322546418eb615bddb180a93fd7846b88b096b5644cb9d375eab2a4a07af64399f5159eccf3edee2
 DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 
2a864e80799471037a71c10d871f9782c37fe3a0a1734872e90f14a874ecd6551099d67b2ebd07f82a43b0522249a6b46e79952db11a278f87ca8013198f7604
 SHA512 
9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6
-DIST gmp-man-6.0.0a.pdf 1187496 BLAKE2B 
6d10b139cc9d54a5c5a3264393623dc0d8efa561e0040ceec4ec79abe42172d0244e2917a4399268395defa06739fb04c0b2fc005cb833eede07c34fbffbea23
 SHA512 
528972502d65d23b58c47a594a628e648f11cc027bd0894a39b8f892bb421ceabb7f35640a9eede21cea791f5f597ed4661a1f73444c56a6fb31fa6e362d96c2
-DIST gmp-man-6.1.0.pdf 825716 BLAKE2B 
aec5a26abaae4451aad621ee8594f67caf705e6fd730b225ee25dbdd7f4f9fb2447f9234c8763b6f8b2cbd9522b9e1bd6c0c486cf6209bd119884d39178863c1
 SHA512 
cec172766c6f5dce6b7306edbd542a63788df590391b8b2e6fb4e9d48947b2fbb47dd23acaf74eab6d35cb627bcb804e7ebb1d63aa5f043e4daa4558b698a5a0
-DIST gmp-man-6.1.1.pdf 825669 BLAKE2B 
c33e5c77069a39f96d1fb27885adf4851ef4bff806f9709f9cc75161d0c00bfe0cda907471e908e9db76ab4c3d5fdcf42e42ef6da93b906d57ab469eecfd5cb3
 SHA512 
18e6aca87f5ff8848f82456d86233f127328bfbe309e67902c8dd6f25228db344bd3e6cc3a55e48f2c3f19d0a57358bc4ada7cd623799b273030a5119fb1257b
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B 
b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247
 SHA512 
85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3

diff --git a/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff 
b/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff
deleted file mode 100644
index 8b10d09395f..000
--- a/dev-libs/gmp/files/6.0.0a/gmp-6.0.0a-arm-thumb.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-https://gmplib.org/list-archives/gmp-discuss/2014-March/005537.html
-
-# HG changeset patch
-# User Torbjorn Granlund 
-# Date 1396602422 -7200
-# Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40
-# Parent  0194a75b56b21a9196626430af86c5bd9110c42d
-Conditionalise ARM asm on !__thumb__.
-
-diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c
 a/mpn/generic/div_qr_1n_pi1.c  Thu Apr 03 23:58:51 2014 +0200
-+++ b/mpn/generic/div_qr_1n_pi1.c  Fri Apr 04 11:07:02 2014 +0200
-@@ -130,7 +130,7 @@
-"%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC)
- #endif
- 
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32
- #define add_mss(m, sh, sl, ah, al, bh, bl)
\
-   __asm__ (  "adds%2, 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2018-06-20 Thread Mike Pagano
commit: ec5bdfb944950ceb94beec41688a0e9e0f33d62e
Author: Mike Pagano  gentoo  org>
AuthorDate: Wed Jun 20 21:49:13 2018 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jun 20 21:49:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5bdfb9

sys-kernel/gentoo-sources: Linux patch 4.16.17

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-4.16.17.ebuild   | 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index d6e407018a2..1c9947d3351 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -40,6 +40,9 @@ DIST genpatches-4.16-16.extras.tar.xz 17496 BLAKE2B 
402ab3be4571457aa71ad0e4785a
 DIST genpatches-4.16-17.base.tar.xz 430088 BLAKE2B 
c61ffb1627bd214aafdc920c70b3e4f31a07d8849673540e6876c84b5fc55f0c4d264fbbdc15e2042d9e1888a8546dc501c05ba63adb8cce1ac0aaf8d2774b0e
 SHA512 
d8e275656332450b63507abfe4ac18814ceed04aa9c0a8ad387787f1ee69a860d18583b91b4149d545deba88c60176129f88e7a97cec91b056ce5e96b6825aac
 DIST genpatches-4.16-17.experimental.tar.xz 5164 BLAKE2B 
d62882cceced2a9b3ccd1c21d8ace7ebdc1d4fa77caf2c49fa22d8ae087e119d40ed9a9ac88ee5b14d00b9363adaeb7eb1471fbbb30aed1c4b6ee12296102bcc
 SHA512 
78bcca40ba6ccea7d20aab345302895d09d0a61d326268be9e0aa50498fbe341f2aaef9a712a1e3c628e19849314e1cf609a83c92d36b96754865c0eb11e0601
 DIST genpatches-4.16-17.extras.tar.xz 17492 BLAKE2B 
9ad1072b3c62c064a72a5406e80eb7d270df3d2b4e2d4fa24c1f4f01d2b651abd06d3ef7d77cbdd22597e05095f58f1bdf31b36240ec32d3e06aaf01cad7
 SHA512 
880e0edbbe8897bc638ced47a83dff35fb067596f07e4d6b9bb8b2f0c45bd9a1528cc557ded26ca5fe09fe89414c776f5a852385c2f1657d13c8d26f6fabd20a
+DIST genpatches-4.16-18.base.tar.xz 508740 BLAKE2B 
bbdd0ef86712ab8561c1d0272ac163cf165ee35ca496f24f8c587f74004085ed058e26b9bcaa900918badfbaa146dec2dfe73d98072fb4b43fb1fdd33a5097af
 SHA512 
5b4841f67241de83e984d9b83a9643a311f8b8bc18e78536db4b1223e0c7daaee60c75b7e551f42d0ccc1b068241d773d720159dc0446375229e38cfa0a9e140
+DIST genpatches-4.16-18.experimental.tar.xz 5168 BLAKE2B 
536cd42df508c7b528ca5cdd34f215426d07572455c0e26c678b9f044f53574fe1d2ab1488bde7ac306c9e7a3fd9042755bbb98d988f4389592dbd44ca3b0f47
 SHA512 
be5c1a1d6e758486b2d5bdeed44750cf6b9d38a42fdb34aa577b36c496ff25e221bf57243a280e1c4315705fc83e340e855614486d2bbff2528b05b1a35721ef
+DIST genpatches-4.16-18.extras.tar.xz 17496 BLAKE2B 
926ea0dfe37beb6244da243d2dbf37c4e85118f0d56410b4f80b019228d5702d14e514c5324a1ca455e4d69927f30490b152b746340d0feeeae46342cf7ad1de
 SHA512 
69db081086e60a2eaeb2038b3017b8815c7b2d8b6e1b0f20af04f3e8e783d3b6f67263cdf0988314ed6e91fa3561336c7db1949e3fc51ab00b9d7f62803f65c7
 DIST genpatches-4.17-1.base.tar.xz 5392 BLAKE2B 
c0a5d1795ab5ab5dfa064986b53f5f9bdb5ac543795af4a33ce8f3e0e21d0240d7b741caf3971121738963c769f861fbab5744456b350727b29074c6f0f0d090
 SHA512 
06696fa4ee7a6a5e42a10b83401e25b0c6920ae43ca7f2106dcc208e094c74a82ee769f0d97b5ae04b6a997f7d6bc48a36674477112c74a297d6580b225a6080
 DIST genpatches-4.17-1.experimental.tar.xz 5168 BLAKE2B 
679183da1924b81b24e55fad23d57976bd33804f8d2e61bffbb9adf70d2c9d80ea83c2f6db0228baca1adb2ba5c57b8fe528e4e938a45ef9114bbb51a40106c7
 SHA512 
e7f68bf642616a1604f2d76a2e6310bd3f4147d85c29ddef829d0f59a785fd89f2532d854d32e3f4d132812f84ebb081936d2e5c68941ee5131b3004ed5b411b
 DIST genpatches-4.17-1.extras.tar.xz 17496 BLAKE2B 
115e99b501a0119809f2abe84c3bb8a66b2b450f53003441593654c23a4bb653c4b40da1ba31e53f7f4db69c99511b2dd41f53b4adf8bd377714b1ace8abd9e2
 SHA512 
a01c90e36504f17495c8691ba6fa99870fd03b65299730df57e767e2562a90b6a04da24c50983cb8ea12ac276e6805f3b5fdaa30ad175ae5ee28f147f75dc3ec

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.16.17.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-4.16.17.ebuild
new file mode 100644
index 000..d2bc342bb14
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.16.17.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="18"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches;
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/

2018-06-20 Thread Mike Gilbert
commit: 007b95a88ae9fb283ac8855e885f619671718f0e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jun 20 15:33:19 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jun 20 21:46:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007b95a8

www-client/chromium: update patch

 .../chromium/files/chromium-disable_xml_catalogs.patch  | 13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch 
b/www-client/chromium/files/chromium-disable_xml_catalogs.patch
index 7aff36c782a..9f57ed2261c 100644
--- a/www-client/chromium/files/chromium-disable_xml_catalogs.patch
+++ b/www-client/chromium/files/chromium-disable_xml_catalogs.patch
@@ -11,18 +11,7 @@
  #include 
  
  #include 
-@@ -538,10 +542,6 @@
- static bool ShouldAllowExternalLoad(const KURL& url) {
-   String url_string = url.GetString();
- 
--  // libxml should not be configured with catalogs enabled, so it
--  // should not be asking to load default catalogs.
--  CHECK(!IsLibxmlDefaultCatalogFile(url));
--
-   // The most common DTD. There isn't much point in hammering www.w3c.org by
-   // requesting this URL for every XHTML document.
-   if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml;))
-@@ -648,6 +648,9 @@
+@@ -648,6 +652,9 @@ static void InitializeLibXMLIfNecessary() {
if (did_init)
  return;
  



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

2018-06-20 Thread Mike Gilbert
commit: 7559106d73eb9f57fdee1e50bfca158be6eba6a5
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jun 20 21:46:20 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jun 20 21:46:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7559106d

dev-python/vcrpy: skip test requiring network access

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

 .../vcrpy/files/vcrpy-skip-network-tests.patch  | 21 +
 dev-python/vcrpy/vcrpy-1.11.1.ebuild|  6 +-
 dev-python/vcrpy/vcrpy-1.12.0.ebuild|  4 
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch 
b/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
new file mode 100644
index 000..a1f00aa7785
--- /dev/null
+++ b/dev-python/vcrpy/files/vcrpy-skip-network-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/unit/test_stubs.py b/tests/unit/test_stubs.py
+index 7eb0684..a4bc7a1 100644
+--- a/tests/unit/test_stubs.py
 b/tests/unit/test_stubs.py
+@@ -1,7 +1,7 @@
+ from vcr.stubs import VCRHTTPSConnection
+ from vcr.compat import mock
+ from vcr.cassette import Cassette
+-
++import pytest
+ 
+ class TestVCRConnection(object):
+ 
+@@ -11,6 +11,7 @@ class TestVCRConnection(object):
+ assert vcr_connection.real_connection.ssl_version == 
'example_ssl_version'
+ 
+ @mock.patch('vcr.cassette.Cassette.can_play_response_for', 
return_value=False)
++@pytest.mark.skip('requires network access')
+ def testing_connect(*args):
+ vcr_connection = VCRHTTPSConnection('www.google.com')
+ vcr_connection.cassette = Cassette('test', record_mode='all')

diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild 
b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index b50e9d02784..0bc4604553e 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.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=5
@@ -36,6 +36,10 @@ DEPEND="
dev-python/pytest-httpbin[${PYTHON_USEDEP}]
)"
 
+PATCHES=(
+   "${FILESDIR}"/vcrpy-skip-network-tests.patch
+)
+
 python_test() {
py.test -vv -x tests/unit || die
 }

diff --git a/dev-python/vcrpy/vcrpy-1.12.0.ebuild 
b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
index adfcee1807d..2676c410973 100644
--- a/dev-python/vcrpy/vcrpy-1.12.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
@@ -36,6 +36,10 @@ DEPEND="
dev-python/pytest-httpbin[${PYTHON_USEDEP}]
)"
 
+PATCHES=(
+   "${FILESDIR}"/vcrpy-skip-network-tests.patch
+)
+
 python_test() {
py.test -vv -x tests/unit || die
 }



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

2018-06-20 Thread Louis Sautier
commit: c80f79641aac26152dd51eb909156d0ad8868237
Author: Louis Sautier  gentoo  org>
AuthorDate: Tue Jun 19 11:52:08 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 21:45:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80f7964

dev-python/python-ldap: bump to 3.1.0, add Python 3, doc

* Do not override the value of libs because we do not actually link with
  them: https://github.com/python-ldap/python-ldap/issues/224
  This also means libldap_r is now used by default (it was only selected with
  USE="sasl ssl").
* Remove outdated messages related to openldap-2.3.x and python-ldap-2.3.9.
* Fix dependencies, add slot operator to openldap.
* Run all the tests which do not require slapd.
* Bump to EAPI 7.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/python-ldap/Manifest |  1 +
 dev-python/python-ldap/python-ldap-3.1.0.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index a097cbc503a..ce83ee46c20 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,2 +1,3 @@
 DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 
54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74
 SHA512 
bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85
 DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 
2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3
 SHA512 
35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028
+DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 
19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44
 SHA512 
71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a

diff --git a/dev-python/python-ldap/python-ldap-3.1.0.ebuild 
b/dev-python/python-ldap/python-ldap-3.1.0.ebuild
new file mode 100644
index 000..6fda6295121
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.1.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://www.python-ldap.org/en/latest/
+   https://pypi.org/project/python-ldap/;
+if [[ ${PV} == ** ]]; then
+   EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git;
+   inherit git-r3
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+fi
+
+LICENSE="PSF-2"
+SLOT="0"
+IUSE="doc examples sasl ssl test"
+
+# We do not need OpenSSL, it is never directly used:
+# https://github.com/python-ldap/python-ldap/issues/224
+RDEPEND="
+   !dev-python/pyldap
+   >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+   >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+   >net-nds/openldap-2.4.11:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+DEPEND="
+   >net-nds/openldap-2.4.11:=[sasl?,ssl?]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+   sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+   test? (
+   ${RDEPEND}
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+"
+
+python_prepare_all() {
+   # The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
+   # https://github.com/pypa/setuptools_scm/issues/228
+   if [[ ${PV} == ** ]]; then
+   rm -r .git || die
+   fi
+
+   if ! use sasl; then
+   sed -i 's/HAVE_SASL//g' setup.cfg || die
+   fi
+   if ! use ssl; then
+   sed -i 's/HAVE_TLS//g' setup.cfg || die
+   fi
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+   if use doc; then
+   sphinx-build Doc Doc/_build/html || die
+   HTML_DOCS=( Doc/_build/html/. )
+   fi
+}
+
+python_test() {
+   # Run all tests which don't require slapd
+   local ignored_tests=(
+   t_bind.py
+   t_cext.py
+   t_edit.py
+   t_ldapobject.py
+   t_ldap_options.py
+   t_ldap_sasl.py
+   t_ldap_schema_subentry.py
+   t_ldap_syncrepl.py
+   t_slapdobject.py
+   )
+   cd Tests || die
+   py.test ${ignored_tests[@]/#/--ignore } \
+   || die "tests failed with ${EPYTHON}"
+}
+

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

2018-06-20 Thread Louis Sautier
commit: 9d7a8fb9abca501eafe9a811f54cbb00fe1d4019
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 21:40:16 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 21:45:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d7a8fb9

dev-python/python-ldap: sync live ebuild with 3.1.0

Use the official upstream instead of the fork.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/python-ldap/python-ldap-.ebuild | 97 +++---
 1 file changed, 56 insertions(+), 41 deletions(-)

diff --git a/dev-python/python-ldap/python-ldap-.ebuild 
b/dev-python/python-ldap/python-ldap-.ebuild
index ee6ebf08e0e..6fda6295121 100644
--- a/dev-python/python-ldap/python-ldap-.ebuild
+++ b/dev-python/python-ldap/python-ldap-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ DESCRIPTION="Various LDAP-related Python modules"
 HOMEPAGE="https://www.python-ldap.org/en/latest/
https://pypi.org/project/python-ldap/;
 if [[ ${PV} == ** ]]; then
-   EGIT_REPO_URI="https://github.com/xmw/python-ldap.git;
+   EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git;
inherit git-r3
 else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -20,61 +20,76 @@ fi
 
 LICENSE="PSF-2"
 SLOT="0"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-RDEPEND=">=net-nds/openldap-2.4
-   dev-python/pyasn1[${PYTHON_USEDEP}]
-   sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
+IUSE="doc examples sasl ssl test"
+
+# We do not need OpenSSL, it is never directly used:
+# https://github.com/python-ldap/python-ldap/issues/224
+RDEPEND="
+   !dev-python/pyldap
+   >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+   >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+   >net-nds/openldap-2.4.11:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+DEPEND="
+   >net-nds/openldap-2.4.11:=[sasl?,ssl?]
dev-python/setuptools[${PYTHON_USEDEP}]
-   doc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+   sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+   test? (
+   ${RDEPEND}
+   dev-python/pytest[${PYTHON_USEDEP}]
)
 "
-RDEPEND+=" !dev-python/pyldap"
 
 python_prepare_all() {
-   sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) 
/usr/$(get_libdir)/sasl2:" \
-   -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include 
${EPREFIX}/usr/include/sasl:" \
-   -i setup.cfg || die "error fixing setup.cfg"
-
-   local mylibs="ldap"
-   if use sasl; then
-   use ssl && mylibs="ldap_r"
-   mylibs="${mylibs} sasl2"
-   else
-   sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+   # The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
+   # https://github.com/pypa/setuptools_scm/issues/228
+   if [[ ${PV} == ** ]]; then
+   rm -r .git || die
fi
-   use ssl && mylibs="${mylibs} ssl crypto"
-   use elibc_glibc && mylibs="${mylibs} resolv"
 
-   sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
-   -i setup.cfg || die "error setting up libs in setup.cfg"
-
-   # set test expected to fail to expectedFailure
-   sed -e "s:^def test_bad_urls:@unittest.expectedFailure\ndef 
test_bad_urls:" \
-   -i Tests/t_ldapurl.py || die
+   if ! use sasl; then
+   sed -i 's/HAVE_SASL//g' setup.cfg || die
+   fi
+   if ! use ssl; then
+   sed -i 's/HAVE_TLS//g' setup.cfg || die
+   fi
 
distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
-   use doc && emake -C Doc html
+   if use doc; then
+   sphinx-build Doc Doc/_build/html || die
+   HTML_DOCS=( Doc/_build/html/. )
+   fi
 }
 
 python_test() {
-   # XXX: the tests supposedly can start local slapd
-   # but it requires some manual config, it seems.
-
-   "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+   # Run all tests which don't require slapd
+   local ignored_tests=(
+   t_bind.py
+   t_cext.py
+   t_edit.py
+   t_ldapobject.py
+   t_ldap_options.py
+   t_ldap_sasl.py
+   t_ldap_schema_subentry.py
+   t_ldap_syncrepl.py
+   t_slapdobject.py
+   )
+   cd Tests || die
+ 

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

2018-06-20 Thread Louis Sautier
commit: 00d9085672d05ad1b099ee8d3d0e8ee46dafab7d
Author: Louis Sautier  gentoo  org>
AuthorDate: Tue Jun 19 11:22:21 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 21:45:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d90856

dev-python/python-ldap: add GitHub to metadata.xml

Also remove xmw's description as his fork is no longer used.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/python-ldap/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-python/python-ldap/metadata.xml 
b/dev-python/python-ldap/metadata.xml
index 68178bf7225..1a5aee08dfb 100644
--- a/dev-python/python-ldap/metadata.xml
+++ b/dev-python/python-ldap/metadata.xml
@@ -4,7 +4,6 @@

x...@gentoo.org
Michael Weber
-   Upstream of the python3 port


pyt...@gentoo.org
@@ -12,5 +11,7 @@


python-ldap
+   python-ldap/python-ldap
+   
https://github.com/python-ldap/python-ldap/issues

 



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/

2018-06-20 Thread Mike Pagano
commit: a4b407859a18c0d05d461fc4907bf579a9b26e47
Author: Mike Pagano  gentoo  org>
AuthorDate: Wed Jun 20 21:31:45 2018 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jun 20 21:31:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b40785

sys-kernel/gentoo-sources: Linux patch 4.14.51

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-kernel/gentoo-sources/Manifest |  3 +++
 .../gentoo-sources/gentoo-sources-4.14.51.ebuild   | 28 ++
 2 files changed, 31 insertions(+)

diff --git a/sys-kernel/gentoo-sources/Manifest 
b/sys-kernel/gentoo-sources/Manifest
index 0fd9ba12d87..d6e407018a2 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -19,6 +19,9 @@ DIST genpatches-4.14-53.extras.tar.xz 17496 BLAKE2B 
402ab3be4571457aa71ad0e4785a
 DIST genpatches-4.14-54.base.tar.xz 1416012 BLAKE2B 
43b4a3d2f739aa28f78c370f750a2cae4685eefd305119bec12fbe701ff456c3691f7af07a5168cb70aa81d235eee478485a27833d2c279038545c0d3c8a6b9f
 SHA512 
385c548cdb99b80d126c3e48b2444f8aa99818cc2408adad76c95095344e403c8eb9dcecf8dfd830a745c66423fbe3549cab5f9fddf2a259606c42c0b470e373
 DIST genpatches-4.14-54.experimental.tar.xz 5224 BLAKE2B 
b8e988b07ffe7c2fcf93cc5e3d27945b575d6734c3d31df369c5106ae1ca581db760bfa262639cdef7640146811eb395b79d70c21319a0564592c14faa547e5b
 SHA512 
c698bed59b03094e80a59f64a362b0e956237c0004e2e9c5a608889aa14e92d701160ddf149d45e39643cbdb5107d51becca427ed4b0d38219d4b392c27fc31e
 DIST genpatches-4.14-54.extras.tar.xz 17492 BLAKE2B 
f993363b6205021049a653828ee314cf2da0e5e18612cf0d0361ddd83832a4297fa56fbe7be64ec3dfc164836da41fea1058b930f38bf569dddae0f94a3adbd7
 SHA512 
886279967efbc449797424e4f5d68ec9982049ae38fe0d7a3b81aaf058ac58971d32d196c6b70c7a382e09307d56cc599c504d5cb63fafb307a5141c7a4e08f3
+DIST genpatches-4.14-56.base.tar.xz 1459612 BLAKE2B 
cb36e0e5f7c998fb660e320e3a9cf1ad0412bd26fd92af6889c09ce70fbd4a8d7e2f78b8c178828fcfa95859d3cdfc1ed3370b2e8eacb32e8198d91e2bd37480
 SHA512 
35b1c2c915e7c493e53663c4140fbb0708cb2ae5a95dfdf420009ebe7d7df0890f3c1f66b694f46e033af5f24057e779c406cb510ab24d83e00731c6ad696726
+DIST genpatches-4.14-56.experimental.tar.xz 5224 BLAKE2B 
b8e988b07ffe7c2fcf93cc5e3d27945b575d6734c3d31df369c5106ae1ca581db760bfa262639cdef7640146811eb395b79d70c21319a0564592c14faa547e5b
 SHA512 
c698bed59b03094e80a59f64a362b0e956237c0004e2e9c5a608889aa14e92d701160ddf149d45e39643cbdb5107d51becca427ed4b0d38219d4b392c27fc31e
+DIST genpatches-4.14-56.extras.tar.xz 17492 BLAKE2B 
f993363b6205021049a653828ee314cf2da0e5e18612cf0d0361ddd83832a4297fa56fbe7be64ec3dfc164836da41fea1058b930f38bf569dddae0f94a3adbd7
 SHA512 
886279967efbc449797424e4f5d68ec9982049ae38fe0d7a3b81aaf058ac58971d32d196c6b70c7a382e09307d56cc599c504d5cb63fafb307a5141c7a4e08f3
 DIST genpatches-4.16-12.base.tar.xz 262212 BLAKE2B 
95d70087d1e17fa59498be09fb5f73b26843627e0f858979914123d5ed38c48c3d0b6cc8fdcddb0d0a145342f5664032784793a9076692fe0c260b40299c0fc6
 SHA512 
3d029c80a1b00dc90f4781c778815bbacae1713f0b5e2af3c9351ee6d56996efc1e048ef2509c8e002fc8c633158886c5abc24a8663eb7daa97bbe2cf0f9363c
 DIST genpatches-4.16-12.experimental.tar.xz 5168 BLAKE2B 
a65e3d51f96010dc20c5937bdc2d1984c519af9633a2e460a161b2640293ddbec38f2581e0ba6278397d06d9cd9154c8880eb6f31a02ce2f25123ad6b1ff12bd
 SHA512 
1691f82a02d153d5d6f98c53e03db5692693f6e01487b17d025193f973904f488bbe48a73a8e7c9e35ef5f9dfe37e4f3c1087713b891791fad714f18a6a82c49
 DIST genpatches-4.16-12.extras.tar.xz 17496 BLAKE2B 
c7fca4b94f96e36704f4f7aea0daac855515544d54a286dc90791e8318ef172771665ce132872351da9e26a0231f0b3e356cf9380c59ea52358ece117a23157e
 SHA512 
eba699a9b0615b096358e967c1ee68989f1374ba9a4f281f232aca8ea459b30446551346a081b4a61067a4e94fedfbe2e470708801a4e9bc3049b69f6558fa14

diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.51.ebuild 
b/sys-kernel/gentoo-sources/gentoo-sources-4.14.51.ebuild
new file mode 100644
index 000..9505d448a0a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.51.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="56"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches;
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the 
${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+   kernel-2_pkg_postinst
+   einfo "For more info on this patchset, and how to report problems, see:"
+   einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+   kernel-2_pkg_postrm
+}



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

2018-06-20 Thread Louis Sautier
commit: 5a5692e0043b6bf320c2123f333eaf2d97d83a3b
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 20:56:25 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 21:25:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5692e0

dev-python/irc: remove old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/irc/Manifest  |  2 --
 dev-python/irc/irc-11.0.1.ebuild | 40 ---
 dev-python/irc/irc-15.0.2.ebuild | 60 
 3 files changed, 102 deletions(-)

diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index eca4cabcc63..8b4d763aa12 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,3 +1 @@
-DIST irc-11.0.1.zip 120409 BLAKE2B 
dea62b33cbbe6bc9499bf0114ed66edff8cfb0181335c2442df264f334f1b064b8a2eacc65394b18a2af4a2eeeb2a1416dc2f9a3115d7cf70790ec798bc66db1
 SHA512 
fca2fe653d921c9ec65dfb2b072c16658d88d4a22ae91568b1eaf722a90179920808db157f587afe6de0055af3a04a528eb9022122e539150e5635f05b58f466
-DIST irc-15.0.2.tar.gz 81790 BLAKE2B 
03eb70b90d0e3ad7d8d43b6d3cfbe48adc210d724a8d521918321189b06759ad4edac488a66b70a4395e322972a1343c815b2e9d09eb9cc36f5157f280be322a
 SHA512 
5f6daa539a9ae665b0153d97ab11f246040963d9109d84efde0a92cbe200c2a6e8126120eee11b4bc92d65d415946627116b62cde07bebeb68a7105af40f98ab
 DIST irc-15.0.6.tar.gz 81996 BLAKE2B 
b5d329b70404a92d4f69cc3fef2be374b0a1e98e04588b7f2f7f7c241dc3d72122f813b67e48522b7779dfdf90478db6ff10cda3c66b621f7c4a099142d533f0
 SHA512 
48240eb496a3c88310f02cf092b8e19e4aa8d8dc165a9a8a39c313490a69ecc29ac67db297436df5e86e7253e2481bd19bc0429ea9cc359089a5cd6179125c0f

diff --git a/dev-python/irc/irc-11.0.1.ebuild b/dev-python/irc/irc-11.0.1.ebuild
deleted file mode 100644
index 29fbdd70e18..000
--- a/dev-python/irc/irc-11.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-RDEPEND="
-   !>=dev-python/python-irclib-3.2.2[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/jaraco-utils[${PYTHON_USEDEP}]"
-
-DEPEND="app-arch/unzip
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/hgtools-5[${PYTHON_USEDEP}]
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
-   test? ( ${RDEPEND}
-   dev-python/pytest[${PYTHON_USEDEP}]
-   $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 
python2_7) )"
-
-# A doc folder is present however it appears to be used for doctests
-
-python_test() {
-   py.test irc/tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-   use examples && local EXAMPLES=( scripts/. )
-   distutils-r1_python_install_all
-}

diff --git a/dev-python/irc/irc-15.0.2.ebuild b/dev-python/irc/irc-15.0.2.ebuild
deleted file mode 100644
index c58d4a5e56c..000
--- a/dev-python/irc/irc-15.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/jaraco-collections[${PYTHON_USEDEP}]
-   dev-python/jaraco-stream[${PYTHON_USEDEP}]
-   dev-python/jaraco-text[${PYTHON_USEDEP}]
-   >=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
-   dev-python/jaraco-logging[${PYTHON_USEDEP}]
-   >=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
-   dev-python/more-itertools[${PYTHON_USEDEP}]
-   dev-python/pytz[${PYTHON_USEDEP}]
-   >=dev-python/tempora-1.6[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-   test? (
-   ${RDEPEND}
-   >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
-   dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-   )
-   doc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/rst-linker[${PYTHON_USEDEP}]
-   )
-"
-
-python_compile_all() {
-   use doc && esetup.py build_sphinx
-}
-
-python_test() {
-   py.test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-   if use examples; then
-   insinto "/usr/share/doc/${PF}"
-   docompress -x 

[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/

2018-06-20 Thread Tim Harder
commit: 12569ce7f9f03201e63ed71dc110ea82be251299
Author: Tim Harder  gentoo  org>
AuthorDate: Wed Jun 20 02:22:39 2018 +
Commit: Tim Harder  gentoo  org>
CommitDate: Wed Jun 20 21:18:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12569ce7

x11-terms/kitty: version bump to 0.11.1

Drop to py36 to work around f-strings docs issue (bug #658304).

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

 x11-terms/kitty/Manifest   | 1 +
 x11-terms/kitty/{kitty-.ebuild => kitty-0.11.1.ebuild} | 2 +-
 x11-terms/kitty/kitty-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index bf8f4bdaf65..8a78f542f8c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
 DIST kitty-0.10.1.tar.gz 3844251 BLAKE2B 
f2b1e523ae48415c410080ae0b419c96e394bfc145da4c3f73fe865e2b1fbd6f7c8ffd18d4e14ea09c0397b8fceb35ebfce72a49d731886588acea5135d4615a
 SHA512 
5341ebdec5356665db5ed0b9f910dac66860b0b39334c0878a3af637bd3da983c11ab8425794e8ea7b3c90f6d64855d8acda4531f25726c01ab355293f033a08
 DIST kitty-0.11.0.tar.gz 3907898 BLAKE2B 
aed74721a332b41cdfb798097797a4e59c1743d32bf2ae6bf5d90eb571acc5ab93c27f837f17de0f79dcece55ba58b6d178a01df980f19fd5d5c5c11337dba4d
 SHA512 
33e9d0a8de5531d9dad341054dde7986eee9ad9ef1c97809c6ee7f3a5fc5ae210eff59ac02e571c31f233676329143f38f4e95d8971d28b21e6befc362e46984
+DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B 
a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3
 SHA512 
79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb
 DIST kitty-0.9.1.tar.gz 3698447 BLAKE2B 
f7e5c4d365f4fa3f74a348b219ea2433fc1ad05cca68a5ba920b692a4dd5de63fb27cd28159de3af3f11e9a87911bc8600c342ee2bc733317f91e9a7b6226e15
 SHA512 
3690dd7308f37de3282148c80e2afffde08e4dc2c459f78668d461461ff5dad2b39127635cf22f0f160f40823d2fa1a43a7e83d4bcc0b64e4cbc6e5be1988329

diff --git a/x11-terms/kitty/kitty-.ebuild 
b/x11-terms/kitty/kitty-0.11.1.ebuild
similarity index 98%
copy from x11-terms/kitty/kitty-.ebuild
copy to x11-terms/kitty/kitty-0.11.1.ebuild
index e1bdc32f631..a60de5a2102 100644
--- a/x11-terms/kitty/kitty-.ebuild
+++ b/x11-terms/kitty/kitty-0.11.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1 toolchain-funcs gnome2-utils
 

diff --git a/x11-terms/kitty/kitty-.ebuild 
b/x11-terms/kitty/kitty-.ebuild
index e1bdc32f631..a60de5a2102 100644
--- a/x11-terms/kitty/kitty-.ebuild
+++ b/x11-terms/kitty/kitty-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1 toolchain-funcs gnome2-utils
 



[gentoo-commits] proj/linux-patches: New tag: 4.16-18

2018-06-20 Thread Mike Pagano
commit: 
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jun 20 20:54:13 2018 +

New tag: 4.16-18




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

2018-06-20 Thread Louis Sautier
commit: 7da8d14b06a199dc1cf7e69de9a83455bfb4829f
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 20:52:58 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 20:52:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da8d14b

dev-python/jaraco-stream: bump to 1.2, Python 3.6, PyPy{,3}

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/jaraco-stream/Manifest |  1 +
 dev-python/jaraco-stream/jaraco-stream-1.2.ebuild | 58 +++
 2 files changed, 59 insertions(+)

diff --git a/dev-python/jaraco-stream/Manifest 
b/dev-python/jaraco-stream/Manifest
index f7f05e9432c..0f2a55a3ac9 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,2 +1,3 @@
 DIST jaraco.stream-1.1.1.tar.gz 6115 BLAKE2B 
0994abe3c9688722c76e656e87166fa60d4bf45fb22ccc826227629bffb60fe0be78bb7a5f9f00b8766b5ce26d641d4b347d6c0fc73c426b424c230cb7d625b6
 SHA512 
65c8d1652a0d63506cc3cadee590664e6a99e2f770d26f0cea1dce07c54ffe308e1df8619bc728ea81c5ac43c9c6731fe9f71e5d38d2674c4e0d63d635bb5112
 DIST jaraco.stream-1.1.tar.gz 4887 BLAKE2B 
6942db399e3821b176e5c966647aa9337e31dbfe533cbd790b9531fb943b1e5fdb05fa350e9dabdff00817e59b434a0770de32f871176dea34042acf6e2f368a
 SHA512 
5af385084623fbdfe86e9fb620f49b097dee164638bc99622ba557a26cda591e856f1fc4134bc7b73b8f7b61afaf2607686fe20c59c582324a65c22f39d74a13
+DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B 
fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b
 SHA512 
47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9

diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild 
b/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
new file mode 100644
index 000..9c05682fdec
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream;
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+   dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+   test? (
+   ${RDEPEND}
+   >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+   dev-python/more-itertools[${PYTHON_USEDEP}]
+   )
+   doc? (
+   >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+   >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+   if use doc; then
+   sphinx-build docs docs/_build/html || die
+   HTML_DOCS=( docs/_build/html/. )
+   fi
+}
+
+python_test() {
+   # Skip one test which requires network access
+   # Override pytest options to skip flake8
+   PYTHONPATH=. py.test --ignore=jaraco/stream/test_gzip.py \
+   --override-ini="addopts=--doctest-modules" \
+   || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+   find "${ED}" -name '*.pth' -delete || die
+}



[gentoo-commits] proj/linux-patches: New tag: 4.14-56

2018-06-20 Thread Mike Pagano
commit: 
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jun 20 20:50:43 2018 +

New tag: 4.14-56




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

2018-06-20 Thread Louis Sautier
commit: a95920e2109ab0a60392b609708a7a3a6531ef7e
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 20:32:42 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 20:32:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95920e2

dev-python/pymediainfo: add missing doc dependency

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild 
b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
index fe9fd8e02ff..bbd536829e6 100644
--- a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -24,7 +24,10 @@ RDEPEND="
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}]
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+   doc? (
+   dev-python/alabaster[${PYTHON_USEDEP}]
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   )
test? (
${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]



[gentoo-commits] proj/linux-patches: New tag: 4.14-55

2018-06-20 Thread Mike Pagano
commit: 
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jun 20 20:31:04 2018 +

New tag: 4.14-55




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

2018-06-20 Thread Louis Sautier
commit: 96fdbc259ab6b8f7e1babb297e4cf9e4ebab4c82
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 20:26:03 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 20:26:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fdbc25

dev-python/flask-bootstrap: support PyPy, Python 3.6, fix deps

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild | 23 +++---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild 
b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
index 33d02be24a6..939d06eb18c 100644
--- a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+EAPI=7
+PYTHON_COMPAT=( pypy python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ IUSE="doc test"
 RDEPEND="
dev-python/dominate[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
+   dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/visitor[${PYTHON_USEDEP}]
dev-python/wtforms[${PYTHON_USEDEP}]
 "
@@ -30,11 +31,13 @@ DEPEND="
dev-python/flask-debug[${PYTHON_USEDEP}]
dev-python/flask-nav[${PYTHON_USEDEP}]
dev-python/flask-wtf[${PYTHON_USEDEP}]
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
${RDEPEND}
)
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+   doc? (
+   dev-python/alabaster[${PYTHON_USEDEP}]
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   )
 "
 
 python_prepare_all() {
@@ -43,15 +46,13 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-   use doc && emake -C docs html
+   if use doc; then
+   sphinx-build docs docs/_build/html || die
+   HTML_DOCS=( docs/_build/html/. )
+   fi
 }
 
 python_test() {
# Skip one test which requires network access
py.test -k "not test_versions_match" || die "Tests failed with 
${EPYTHON}"
 }
-
-python_install_all() {
-   use doc && local HTML_DOCS=( docs/_build/html/. )
-   distutils-r1_python_install_all
-}



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

2018-06-20 Thread Louis Sautier
commit: dc37c6118a180822da0c28b5f55d7b7e5e85aa13
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 20:07:26 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 20:07:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc37c611

dev-python/flask-nav: add PyPy{,3}, missing dependency

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/flask-nav/flask-nav-0.6.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-python/flask-nav/flask-nav-0.6.ebuild 
b/dev-python/flask-nav/flask-nav-0.6.ebuild
index c9e9879ffa8..e954296d7bf 100644
--- a/dev-python/flask-nav/flask-nav-0.6.ebuild
+++ b/dev-python/flask-nav/flask-nav-0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ IUSE="doc test"
 RDEPEND="
dev-python/dominate[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
+   dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/visitor[${PYTHON_USEDEP}]
 "
 DEPEND="



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

2018-06-20 Thread Louis Sautier
commit: de41b72733be36f969c75a8d8d4e0e7f46cc2ed9
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 19:54:19 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 19:54:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de41b727

dev-python/visitor: support PyPy{,3}

Remove DEPEND on pytest-runner

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/visitor/visitor-0.1.3.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-python/visitor/visitor-0.1.3.ebuild 
b/dev-python/visitor/visitor-0.1.3.ebuild
index a29aadde882..b6ff311f6c1 100644
--- a/dev-python/visitor/visitor-0.1.3.ebuild
+++ b/dev-python/visitor/visitor-0.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -20,7 +20,6 @@ IUSE="test"
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)
 "



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

2018-06-20 Thread Louis Sautier
commit: 84e1f8662c57f2a5f30fdd1b6f9ce42ca013d498
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 19:36:21 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 19:36:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e1f866

dev-python/dominate: add PyPy{,3}

Remove pytest-runner from test DEPENDs, it is not required.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/dominate/dominate-2.3.1.ebuild | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dev-python/dominate/dominate-2.3.1.ebuild 
b/dev-python/dominate/dominate-2.3.1.ebuild
index d149b940eab..a66dafe92b1 100644
--- a/dev-python/dominate/dominate-2.3.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -17,10 +17,7 @@ IUSE="test"
 
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
-   test? (
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
-   )
+   test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_test() {



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

2018-06-20 Thread Louis Sautier
commit: c048771cb2b44e4b2e6e5553eaa62d3795096b05
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 19:22:58 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 19:24:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c048771c

dev-python/flask-debug: support PyPy{,3}, Python 3.6, fix deps

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/flask-debug/flask-debug-0.4.3.ebuild | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild 
b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
index a9dce3dd0e8..cccb072ac7a 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -21,15 +21,15 @@ IUSE="doc test"
 RDEPEND="
dev-python/flask[${PYTHON_USEDEP}]
dev-python/inflection[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
 "
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
${RDEPEND}
+   dev-python/pytest[${PYTHON_USEDEP}]
)
-   doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -40,14 +40,12 @@ python_prepare_all() {
 }
 
 python_compile_all() {
-   use doc && emake -C docs html
+   if use doc; then
+   sphinx-build docs docs/_build/html || die
+   HTML_DOCS=( docs/_build/html/. )
+   fi
 }
 
 python_test() {
py.test || die "Tests failed with ${EPYTHON}"
 }
-
-python_install_all() {
-   use doc && local HTML_DOCS=( docs/_build/html/. )
-   distutils-r1_python_install_all
-}



[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/

2018-06-20 Thread Hans de Graaff
commit: c2eab56c0ebc74172d0eec5592ba862ff4244dc6
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jun 20 19:22:50 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jun 20 19:23:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2eab56c

www-apache/passenger: remove vulnerable version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-apache/passenger/Manifest|   1 -
 www-apache/passenger/passenger-5.1.12.ebuild | 127 ---
 2 files changed, 128 deletions(-)

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 83b775bb13b..cb051c1816a 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,2 +1 @@
-DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 
4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb
 SHA512 
7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a
 DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B 
be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f
 SHA512 
97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967

diff --git a/www-apache/passenger/passenger-5.1.12.ebuild 
b/www-apache/passenger/passenger-5.1.12.ebuild
deleted file mode 100644
index 81449d02095..000
--- a/www-apache/passenger/passenger-5.1.12.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/;
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-   >=dev-ruby/rack-1.0.0:*
-   >=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-   >=dev-libs/libuv-1.8.0
-   net-misc/curl[ssl]
-   apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-   use debug && append-flags -DPASSENGER_DEBUG
-   depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-   epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-   epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-   # Change these with sed instead of a patch so that we can easily use
-   # the toolchain-funcs methods.
-   sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-   -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-   -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-   # Avoid fixed debugging CFLAGs.
-   sed -e '/debugging_cflags/areturn ""' -i 
src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-   # Use sed here so that we can dynamically set the documentation 
directory.
-   sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-   -e 
"s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-   src/ruby_supportlib/phusion_passenger.rb || die
-   sed -i -e 
"s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" 
src/cxx_supportlib/ResourceLocator.h || die
-
-   # Don't install a tool that won't work in our setup.
-   sed -i -e '/passenger-install-apache2-module/d' 
src/ruby_supportlib/phusion_passenger/packaging.rb || die
-   rm -f bin/passenger-install-apache2-module || die "Unable to remove 
unneeded install script."
-
-   # Make sure we use the system-provided version where possible
-   rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove 
vendored code."
-
-   # Avoid building documentation to avoid a dependency on mizuho.
-   #sed -i -e 's/, :doc//' build/packaging.rb || die
-   touch doc/*.html || die
-
-   # Fix hard-coded use of AR
-   sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || 
die
-
-   # Make sure apache support is not attempted with -apache2
-   if ! use apache2 ; then
-   sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-   fi
-}
-
-all_ruby_compile() {
-   if use apache2 ; then
-   V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-APXS2="${APXS}" \
-HTTPD="${APACHE_BIN}" \
-

[gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard/

2018-06-20 Thread Jason Donenfeld
commit: de5acc42d67c05dfaa11b7f15e9b8a61bdbb9c9d
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Wed Jun 20 19:20:30 2018 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Wed Jun 20 19:20:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de5acc42

net-vpn/wireguard: version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-vpn/wireguard/Manifest  | 2 +-
 .../{wireguard-0.0.20180613.ebuild => wireguard-0.0.20180620.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 3d2b074cd93..40c93bee3ea 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1 +1 @@
-DIST WireGuard-0.0.20180613.tar.xz 269316 BLAKE2B 
f2e005391971a9465e8766ca92ea70a7051cda7b9bededd260885df3665444b96ab0099f5d25e7ad060ee5459e4d7f3c94dd4dfcbac1b025f0fe822253679542
 SHA512 
dc61cb61e507bee3d07aa059a0c2f61812641797d041bade49797e31738858951d7ab209e6b5fdcf052a585754c8aa7d5a203474889b193513abfa7e87942181
+DIST WireGuard-0.0.20180620.tar.xz 270920 BLAKE2B 
0878c8561f1f43ad4c68e2359a8bb0c219f5e5c11126f4ec1f788796dabc8dc11475efa189a772097f087ade0a47b7f05efe3695c95c1ec2c3a3c46a2e62f00b
 SHA512 
e67657b21b548f0a82e76fbdc16e1856c2aa6e15828bd16514c398f8a867ce20aa5e280a1b8528910f7f210f0b8af709b46abd6b67c88416174cb2f5e87996bf

diff --git a/net-vpn/wireguard/wireguard-0.0.20180613.ebuild 
b/net-vpn/wireguard/wireguard-0.0.20180620.ebuild
similarity index 100%
rename from net-vpn/wireguard/wireguard-0.0.20180613.ebuild
rename to net-vpn/wireguard/wireguard-0.0.20180620.ebuild



[gentoo-commits] repo/user/sogo-connector:master commit in: app-pda/sogo-connector/, app-pda/sogo-connector/files/

2018-06-20 Thread Fabian Köster
commit: 97b80d209bbb47f79a6c37d13ec55543649eadf3
Author: Fabian Köster  fabian-koester  com>
AuthorDate: Wed Jun 20 19:13:31 2018 +
Commit: Fabian Köster  posteo  de>
CommitDate: Wed Jun 20 19:13:31 2018 +
URL:
https://gitweb.gentoo.org/repo/user/sogo-connector.git/commit/?id=97b80d20

Bump to version 31.0.5

 app-pda/sogo-connector/Manifest| 10 +++---
 .../sogo-connector/files/31.0.5-fix-version.patch  | 13 
 .../files/sogo-connector-24.0.6-makefile.patch | 30 --
 .../sogo-connector/sogo-connector-31.0.2.ebuild| 37 --
 ...-31.0.4.ebuild => sogo-connector-31.0.5.ebuild} |  6 ++--
 5 files changed, 19 insertions(+), 77 deletions(-)

diff --git a/app-pda/sogo-connector/Manifest b/app-pda/sogo-connector/Manifest
index e690257..fad8a12 100644
--- a/app-pda/sogo-connector/Manifest
+++ b/app-pda/sogo-connector/Manifest
@@ -1,6 +1,4 @@
-AUX makefile.patch 710 SHA256 
963eb156004265e92e2f0d52398b4a335e448e1729f512f28582717118f368d0 SHA512 
e6799e54bef3fe57f7920e5682119d3d45bd393c4dd2acd09bf4d874fb410864cf377c5fc3a67844b990c217ca50b33b44c81223562c3a33d00d7775c11d62bb
 WHIRLPOOL 
bea4972950ca1a74093c85a93f5db6d243d508182b7f8064677420c7402d66cfc6c6bea39b32e34695c940157215ceac08dafc8a5a44d53dfca257cc61ed345f
-AUX sogo-connector-24.0.6-makefile.patch 979 SHA256 
16b8b65cce99d05c3de1a7a3e6d0c694d85d7ee75a11a4734c0d6b383ceeba38 SHA512 
9e08f2e4641f82ca406e9ef13e958f462f09a32fc2a8f5b97f50cdbb3e3d7cb9dcc3b7dccc45b80caf6753ffed7a4aa02fdd48287810d56e39bee7b44d5bb8c7
 WHIRLPOOL 
9061298c6f3cf599706ce7d45df98b837dc552acc2db05163f5827a6ded4efe8f35ee2bd72a3fbcddda808921dde24fb16853055ad48f54e0062d0259daf1466
-DIST sogo-connector-31.0.2.zip 294316 SHA256 
da45c22bdb36eb9188f983b71b4f8c23e0ad2a82b10f1fa22fa7ed0aecc66706 SHA512 
22efecde020e640ae52a255c0d870b9c7f8644da1daa4bab1f61cf139d983ca1c32d021f5a9626d45b30c9a01ad20dbc3576a4b19a34ffde5ea7b7c61df00d70
 WHIRLPOOL 
3e28d7737941f298ea1ec028354617071d96de5f4cf2eb2710606e5c242250b74d40de0df857c3c78d25f93e6b4aacadfea36600e67b1ce5e339ac5d98b1b1df
-DIST sogo-connector-31.0.4.tar.gz 167312 SHA256 
e908cb8c80a3bf2a6fc71101056529c06169a2ce537c3332974640155bf326d7 SHA512 
9de9b6640627ecc48820a50d58a702eeab254dd9458619c1078b9b565bf49a24d839a5a192e1ff2fbcf765492603581bb1a0dcf692cd4fd105c1027ed868c98c
 WHIRLPOOL 
5a4719353db793a5e3ed19a95152574dcffa1b86bf6984c17a49c7cca3a2bf7a93f30b9d87d2a12c2361e4e5700fa09801b583c75ffc6d6940fe4c999bd3a891
-EBUILD sogo-connector-31.0.2.ebuild 989 SHA256 
73ea05f45f1bd49529b070aabced428d863ce18a42fc4de8843b34aa0c148500 SHA512 
105a25693e44e72bc2c783e9a948acf688e4be8981c70b9daf33f05e44201840d94643296eaef1dee9b99614bf00a0171398158a9a0267c5fc193d38925ba368
 WHIRLPOOL 
ec3c76f377946de465c71af1eb552d003c86023e3c173c302da20984afa63ef2e5e4af39304d3ed1c3518b04dfedf5cbfd14adfbb1a4a9e60341ce95f668832a
-EBUILD sogo-connector-31.0.4.ebuild 1137 SHA256 
c56d6ccada664a1c5ab2c851c94c39d87183d1c399c8fec1232c5ec3087b4fc7 SHA512 
a61f76a3adf1f5de8cbc03d8ed15009924b453f145dfcac122388d89fd048366d69ef4d28fc53d589cf97d14969f9cc5714190a279dec93841a1df5e95d03fcd
 WHIRLPOOL 
91f238fab9264c1b3e48170f69dd7da4f91d7d2ea1e41ae4ccf51fa9587590f6dd1a006f63c1862da7b149436dc48f5f2f51a553818b5a3f569c84295f149989
+AUX 31.0.5-fix-version.patch 643 BLAKE2B 
7c42146fffa80efb968ca8b9e3ba013fe6ff38d2beeafd94b200e5098240b1ada049167658a7e93858be1daab8edfc13597d4fa0c1d6422ed1907fc413e3a75c
 SHA512 
65373ff11852461495277d0586f87cdb403c0d913ef9467001b67928e161ee9d0737d1ee97afe3e218c30e3304f36e36597eca6e23d9dd8084d462d12c6002b3
+AUX makefile.patch 710 BLAKE2B 
5e1b66e4570c508160fc32bb9d417c3a70c83d505ca9e3797c5320f6aff0b67ea7ac225af0bbfb25538cee45829bef20e1d221bfe90b87d477a9e0a57c0ff267
 SHA512 
e6799e54bef3fe57f7920e5682119d3d45bd393c4dd2acd09bf4d874fb410864cf377c5fc3a67844b990c217ca50b33b44c81223562c3a33d00d7775c11d62bb
+DIST sogo-connector-31.0.5.tar.gz 167269 BLAKE2B 
dd9949e7274a0327a6087b9507a22906ba6bb884cf1167c484d6f488f00fba774881004e36a338eedccdb07e72935c438e7638b471e6d7ec25c7559a81e4be44
 SHA512 
2423257f9218f1d471a1e76168d15a04e81d4e699f617fa10a14cf350570b1cbed397286864647a22313ad6c90bccc87422410c1c55514b6217d5d4f343cbfdf
+EBUILD sogo-connector-31.0.5.ebuild 1042 BLAKE2B 
dac942264585edb8cfc58e424960bad67a670496ebeb07527f7808c5722cca00db5a74b454e172e926f9b08adf9725908a5ffd7e440bf62c49910b538fac69d7
 SHA512 
5a780ed0338b2edfa566a07b740866908f6cb5de6003048432d965a36ba2209f977a957d9c0969d6a9504f83aced422bd6fe822e532bc0993d9410d011b61c59

diff --git a/app-pda/sogo-connector/files/31.0.5-fix-version.patch 
b/app-pda/sogo-connector/files/31.0.5-fix-version.patch
new file mode 100644
index 000..28c6c6f
--- /dev/null
+++ b/app-pda/sogo-connector/files/31.0.5-fix-version.patch
@@ -0,0 +1,13 @@
+Index: sogo-connector.tb31-sogo-connector-31.0.5/install.rdf
+===
+--- sogo-connector.tb31-sogo-connector-31.0.5.orig/install.rdf
 

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

2018-06-20 Thread Louis Sautier
commit: 2b5cb9c9db301d99412f42ccf05ea567203f752b
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 19:10:00 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 19:10:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5cb9c9

dev-python/inflection: do not require pytest-runner for tests

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/inflection/inflection-0.3.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-python/inflection/inflection-0.3.1.ebuild 
b/dev-python/inflection/inflection-0.3.1.ebuild
index b66262a9962..16c59e49cca 100644
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -21,7 +21,6 @@ RDEPEND=""
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
-   dev-python/pytest-runner[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )



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

2018-06-20 Thread Louis Sautier
commit: 1cba96e71a9587c7bebc282c68fefa639d90dc0b
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 19:07:47 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 19:09:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cba96e7

dev-python/inflection: Support PyPy{,3}, fix DESCRIPTION

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/inflection/inflection-0.3.1.ebuild | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-python/inflection/inflection-0.3.1.ebuild 
b/dev-python/inflection/inflection-0.3.1.ebuild
index 864ac21bea5..b66262a9962 100644
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
-DESCRIPTION="A port of Ruby on Rails inflector to Python"
+DESCRIPTION="A port of Ruby on Rails' inflector to Python"
 HOMEPAGE="https://github.com/jpvanhal/inflection;
 # PyPI tarballs don't include doc
 # https://github.com/jpvanhal/inflection/pull/12
@@ -28,14 +28,12 @@ DEPEND="
 "
 
 python_compile_all() {
-   use doc && emake -C docs html
+   if use doc; then
+   sphinx-build docs docs/_build/html || die
+   HTML_DOCS=( docs/_build/html/. )
+   fi
 }
 
 python_test() {
py.test || die "Tests failed with ${EPYTHON}"
 }
-
-python_install_all() {
-   use doc && local HTML_DOCS=( docs/_build/html/. )
-   distutils-r1_python_install_all
-}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

2018-06-20 Thread Sergei Trofimovich
commit: 67cbdcd922d5bcf8defcfee8b760cc998a3b280d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jun 20 18:59:19 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jun 20 18:59:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cbdcd9

sys-devel/gcc: stable 7.3.0-r3 for ia64, bug #658444

Bug: https://bugs.gentoo.org/658444
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 sys-devel/gcc/gcc-7.3.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild 
b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
index 2c4f97df3a3..5a853554906 100644
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.4"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}



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

2018-06-20 Thread Hans de Graaff
commit: 2b8d301ae3689d353196906ab13ab38c595e7578
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jun 20 18:47:03 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jun 20 18:52:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8d301a

dev-ruby/rbnacl: cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-ruby/rbnacl/rbnacl-4.0.2.ebuild | 32 
 dev-ruby/rbnacl/rbnacl-5.0.0.ebuild | 32 
 2 files changed, 64 deletions(-)

diff --git a/dev-ruby/rbnacl/rbnacl-4.0.2.ebuild 
b/dev-ruby/rbnacl/rbnacl-4.0.2.ebuild
deleted file mode 100644
index af64068d6c3..000
--- a/dev-ruby/rbnacl/rbnacl-4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a high-level toolkit for building cryptographic systems 
and protocols"
-HOMEPAGE="https://github.com/cryptosphere/rbnacl;
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-libs/libsodium"
-DEPEND+=" test? ( dev-libs/libsodium )"
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-all_ruby_prepare() {
-   sed -i -e '/coveralls/I s:^:#:' \
-   -e '/bundler/ s:^:#:' \
-   -e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
-}

diff --git a/dev-ruby/rbnacl/rbnacl-5.0.0.ebuild 
b/dev-ruby/rbnacl/rbnacl-5.0.0.ebuild
deleted file mode 100644
index 6453f3b687c..000
--- a/dev-ruby/rbnacl/rbnacl-5.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a high-level toolkit for building cryptographic systems 
and protocols"
-HOMEPAGE="https://github.com/cryptosphere/rbnacl;
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-libs/libsodium"
-DEPEND+=" test? ( dev-libs/libsodium )"
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-all_ruby_prepare() {
-   sed -i -e '/coveralls/I s:^:#:' \
-   -e '/bundler/ s:^:#:' \
-   -e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
-}



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

2018-06-20 Thread Louis Sautier
commit: 8a7b5b98e8290c3dfe7903360f37dc6337513168
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 18:50:23 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 18:51:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7b5b98

dev-python/flask-debug: fix DESCRIPTION

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/flask-debug/flask-debug-0.4.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild 
b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
index d5e0d4fcc1e..a9dce3dd0e8 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 MY_PN="Flask-Debug"
-DESCRIPTION="Configures Flask applications in a canonical way"
+DESCRIPTION="Flask extension that displays various debugging insights during 
development"
 HOMEPAGE="https://github.com/mbr/Flask-Debug;
 # PyPI tarballs don't include tests
 # https://github.com/mbr/Flask-Debug/pull/2



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

2018-06-20 Thread Pacho Ramos
commit: d8dfdbf7200c3b864e98c7ad906501842af8c6b3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:44:35 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:46:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8dfdbf7

wm-icons fixed

 profiles/package.mask | 5 -
 1 file changed, 5 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 3455a40a75a..5f0e0730efb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -278,11 +278,6 @@ games-puzzle/hoh-bin
 games-sports/miniracer
 games-strategy/heroes3-demo
 
-# Pacho Ramos  (17 Jun 2018)
-# Doesn't build (#655174), not required by any package, upstream dead for a
-# long time. Removal in a month.
-x11-themes/wm-icons
-
 # Mart Raudsepp  (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.



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

2018-06-20 Thread Pacho Ramos
commit: d18ef3ea74c2000275cc83a241e74665a8b174f5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:44:10 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:46:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18ef3ea

x11-themes/wm-icons: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-themes/wm-icons/Manifest  |  1 -
 x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild | 53 ---
 2 files changed, 54 deletions(-)

diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index 1eac5e6d54f..35089395098 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,2 +1 @@
 DIST wm-icons-0.4.0.tar.bz2 3433177 BLAKE2B 
d5d04aaa8da0f0bc8c4887de77febd5a7546981c2f7da0b0869bb2ce9e080488c57ddc4ed89374bb24c0b708c3ac77a6890da4a3624cd98db7e4031336098d98
 SHA512 
9b21dbb1ac697520792c1e8bfc6b06d4d9933828759571b7af978a670223841fcfe9adcf7f945de3f3a4a39e0d991045d6086be9b293bd89b67cf937262d53a5
-DIST wm-icons-0.4.0_pre1-cvs-01092003.tar.bz2 2046784 BLAKE2B 
2895aa2d14c2154cb3dd31f41c398593f9564e27a8f9d3960e5e11b24ed2d1138ca3c1e187eaf5c9b982451270eb18762504aac4dc7918a0ff6bdee082d238ae
 SHA512 
c2a8f6d6c460ae326381a3bc7ca23fc21986c757ece09a304da8eec5beff826421e1e3089cb1d0016ad7ddf3c650d27d140924b254e4ebb27cc8b8aad794b4f9

diff --git a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild 
b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
deleted file mode 100644
index 733a3a198bd..000
--- a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM 
in mind"
-HOMEPAGE="http://wm-icons.sourceforge.net/;
-SRC_URI="mirror://gentoo/wm-icons-${PV}-cvs-01092003.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="virtual/awk dev-lang/perl"
-
-S=${WORKDIR}/wm-icons
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.4.0-build.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf --enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
-}
-
-src_install() {
-   # strange makefile...
-   emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
-
-   rm -rf "${D}"/var
-
-   einfo "Setting default aliases..."
-   "${ED%/}/usr/bin/wm-icons-config" --force 
--user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   einfo "Users can use the wm-icons-config utility to create aliases in 
their"
-   einfo "home directory, FVWM users can then set this in their ImagePath"
-   einfo
-   einfo "Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are 
available in"
-   einfo "/usr/share/wm-icons"
-   einfo
-}



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

2018-06-20 Thread Pacho Ramos
commit: a56dd3d5335b60b5e7d291236af54a4564d937c8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:43:50 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:46:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56dd3d5

x11-themes/wm-icons: Make repoman happy

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-themes/wm-icons/wm-icons-0.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild 
b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index 641611583e1..274b254b905 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -25,7 +25,7 @@ DOC_CONTENTS="
Users can use the wm-icons-config utility to create aliases in their
home directory, FVWM users can then set this in their ImagePath.
Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are available in
-/usr/share/wm-icons
+   /usr/share/wm-icons
 "
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: x11-themes/wm-icons/files/, x11-themes/wm-icons/

2018-06-20 Thread Pacho Ramos
commit: 92588b49bef5cfe6f7e16333160d272753c42eb6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:43:25 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:46:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92588b49

x11-themes/wm-icons: Fix install (#655174 by Kevin Korb)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../wm-icons/files/wm-icons-0.4.0-build.patch  | 30 ++
 x11-themes/wm-icons/wm-icons-0.4.0.ebuild  | 28 +---
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch 
b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
index bd92342e1ed..9cc4225ea7b 100644
--- a/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
+++ b/x11-themes/wm-icons/files/wm-icons-0.4.0-build.patch
@@ -1,24 +1,22 @@
 a/configure.in
-+++ b/configure.in
-@@ -129,7 +129,7 @@ AC_OUTPUT(
-   etc/debian-menu-system/Makefile
-   devel/Makefile
-   devel/bin/Makefile
--  bin/Makefile
-+  
-   bin/wm-icons-config
-   doc/Makefile
-   doc/wm-icons.lsm
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -13,8 +13,8 @@ SUBDIRS = bin doc icons etc devel rpm
- # => icondir) is different for the build and install phases, as it
+@@ -14,7 +14,7 @@
  # is for a distribution package building.
+ # Set the default icon set aliases (symlinks).
  install-data-local:
--  # set the default icon set aliases (symlinks)
 -  $(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
-+# set the default icon set aliases (symlinks)
-+  true --user-dir="$(icondir)" --defaults --quiet
++  true
+ 
+ wm-configs _pack-symlinks _unpack-symlinks:
+   cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@
+--- a/Makefile.in
 b/Makefile.in
+@@ -417,7 +417,7 @@
+ # is for a distribution package building.
+ # Set the default icon set aliases (symlinks).
+ install-data-local:
+-  $(bindir)/wm-icons-config --user-dir="$(icondir)" --defaults --quiet
++  true
  
  wm-configs _pack-symlinks _unpack-symlinks:
cd devel/bin && $(MAKE) $(AM_MAKEFLAGS) $@

diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild 
b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index d6932e13238..641611583e1 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+inherit readme.gentoo-r1
 
 DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM 
in mind"
 HOMEPAGE="http://wm-icons.sourceforge.net/;
@@ -12,11 +13,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/awk dev-lang/perl"
-DEPEND="${RDEPEND} sys-devel/autoconf sys-devel/automake sys-apps/sed"
+RDEPEND="
+   virtual/awk
+   dev-lang/perl
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+DOC_CONTENTS="
+   Users can use the wm-icons-config utility to create aliases in their
+   home directory, FVWM users can then set this in their ImagePath.
+   Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are available in
+/usr/share/wm-icons
+"
 
 src_configure() {
-   econf --enable-all-sets \
+   econf \
+   --enable-all-sets \
--enable-icondir="${EPREFIX}"/usr/share/icons/wm-icons
 }
 
@@ -28,13 +42,9 @@ src_install() {
"${ED%/}/usr/bin/wm-icons-config" --force 
--user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
 
einstalldocs
+   readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-   einfo "Users can use the wm-icons-config utility to create aliases in 
their"
-   einfo "home directory, FVWM users can then set this in their ImagePath"
-   einfo
-   einfo "Sample configurations for fvwm1, fvwm2, fvwm95 and scwm are 
available in"
-   einfo "/usr/share/wm-icons"
-   einfo
+   readme.gentoo_print_elog
 }



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

2018-06-20 Thread Louis Sautier
commit: 394a4d2b906d70a90886917966bb1f702118c5d9
Author: Louis Sautier  gentoo  org>
AuthorDate: Wed Jun 20 18:44:14 2018 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Wed Jun 20 18:46:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394a4d2b

dev-python/flask-wtf: Support Python 3.6, fix dependencies

A lot of the dependencies were missing or not needed. Removing
intersphinx from the doc configuration prevents warning during the doc
build.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild | 60 +
 1 file changed, 60 insertions(+)

diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild 
b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
new file mode 100644
index 000..785287cca8f
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="Flask-WTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple integration of Flask and WTForms"
+HOMEPAGE="https://pythonhosted.org/Flask-WTF/ 
https://pypi.org/project/Flask-WTF/;
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+   dev-python/Babel[${PYTHON_USEDEP}]
+   dev-python/flask[${PYTHON_USEDEP}]
+   dev-python/flask-babel[${PYTHON_USEDEP}]
+   dev-python/itsdangerous[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/werkzeug[${PYTHON_USEDEP}]
+   >=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${RDEPEND}
+   dev-python/nose[${PYTHON_USEDEP}]
+   )
+   doc? (
+   ${RDEPEND}
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+   sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+   # tries to access things over the network
+   rm tests/test_recaptcha.py || die
+   distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+   if use doc; then
+   sphinx-build docs docs/_build/html || die
+   HTML_DOCS=( docs/_build/html/. )
+   fi
+}
+
+python_test() {
+   nosetests || die "tests failed with ${EPYTHON}"
+}



[gentoo-commits] repo/gentoo:master commit in: net-mail/courier-imap/

2018-06-20 Thread Pacho Ramos
commit: 3c546d3f63e4d4c543f06c28a6c64e5b4879b741
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:09:57 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:31:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c546d3f

net-mail/courier-imap: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-mail/courier-imap/Manifest   |   1 -
 net-mail/courier-imap/courier-imap-4.18.0.ebuild | 231 ---
 2 files changed, 232 deletions(-)

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index d31af1ee9ea..1cc48dd1ad2 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,3 +1,2 @@
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B 
c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563
 SHA512 
3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
-DIST courier-imap-4.18.0.tar.bz2 3202389 BLAKE2B 
3889d8db1bca082b1a8a1f1c8f04996ddcdf30b46e2aa3d16b45c46987426f75721223fc63810884a8fa2d8f8daf60d85c2909321abf0ef27e77cfcd0dc3c531
 SHA512 
16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B 
dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3
 SHA512 
821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e

diff --git a/net-mail/courier-imap/courier-imap-4.18.0.ebuild 
b/net-mail/courier-imap/courier-imap-4.18.0.ebuild
deleted file mode 100644
index 8226e3abd98..000
--- a/net-mail/courier-imap/courier-imap-4.18.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool systemd
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="http://www.courier-mta.org/;
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
-
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-   gnutls? ( net-libs/gnutls )
-   !gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   >=net-libs/courier-authlib-0.61
-   >=net-libs/courier-unicode-2
-   >=net-mail/mailbase-0.00-r8
-   berkdb? ( sys-libs/db:= )
-   fam? ( virtual/fam )
-   gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-DEPEND="${CDEPEND}
-   dev-lang/perl
-   !mail-mta/courier
-   userland_GNU? ( sys-process/procps )"
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-courier )"
-
-# get rid of old style virtual - bug 350792
-# all blockers really needed?
-RDEPEND="${RDEPEND}
-   !mail-mta/courier
-   !net-mail/bincimap
-   !net-mail/cyrus-imapd
-   !net-mail/uw-imap"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
-   "${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
-)
-
-src_prepare() {
-   default
-
-   # These patches should fix problems detecting BerkeleyDB.
-   # We now can compile with db4 support.
-   if use berkdb ; then
-   eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-   eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-   fi
-
-   eautoreconf
-}
-
-src_configure() {
-   local myconf=""
-
-   # Default to gdbm if both berkdb and gdbm are present.
-   if use gdbm ; then
-   einfo "Building with GDBM support"
-   myconf="${myconf} --with-db=gdbm"
-   elif use berkdb ; then
-   einfo "Building with BerkeleyDB support"
-   myconf="${myconf} --with-db=db"
-   fi
-
-   if use trashquota ; then
-   einfo "Building with Trash Quota Support"
-   myconf="${myconf} --with-trashquota"
-   fi
-
-   use debug && myconf="${myconf} debug=true"
-
-   econf \
-   --disable-root-check \
-   --bindir=/usr/sbin \
-   --sysconfdir="/etc/${PN}" \
-   --libexecdir="/usr/$(get_libdir)/${PN}" \
-   --localstatedir="/var/lib/${PN}" \
-   --with-authdaemonvar="/var/lib/${PN}/authdaemon" \
-   --enable-workarounds-for-imap-client-bugs \
-   --with-mailuser=mail \
-   --with-mailgroup=mail \
-   $(use_with fam) \
-   $(use_with ipv6) \
-   $(use_with gnutls) \
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/hylafaxplus/, net-misc/hylafaxplus/files/

2018-06-20 Thread Pacho Ramos
commit: e12135287fb8c291e96bb5bca3ecd1df5065c6a1
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:21:09 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:31:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1213528

net-misc/hylafaxplus: Version bump (#547968)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/hylafaxplus/Manifest |   1 +
 net-misc/hylafaxplus/files/hylafaxplus-init   |   4 +-
 net-misc/hylafaxplus/files/ldconfig-patch |   4 +-
 net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild | 162 ++
 4 files changed, 167 insertions(+), 4 deletions(-)

diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index f7fcc435011..fe42c6252f6 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1 +1,2 @@
 DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B 
e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42
 SHA512 
ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
+DIST hylafax-5.5.9.tar.gz 1364807 BLAKE2B 
1e63d28dbe42170af65369ceab6b76b30fb264515992bb7f3561722eccae21e2d790e50eab3f1f9bdbb8c48e369166c90271aa8cf37c1905fda44c3b31b18b71
 SHA512 
67ac84df2619db7fb88cd7ad3af4beff9918b2481fc8edf7cc7574941161dd7aa6186cfc49c6cdb2a1f073f6cbf2f2a4ed084ca70ebe288bf7cd8e752cd56b2d

diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init 
b/net-misc/hylafaxplus/files/hylafaxplus-init
index 851cd3b0977..c15f26774a8 100644
--- a/net-misc/hylafaxplus/files/hylafaxplus-init
+++ b/net-misc/hylafaxplus/files/hylafaxplus-init
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Author Geaaru
 # Distributed under the terms of the GNU General Public License v2
 
-opts="zap"
+extra_commands="zap"
 
 depend() {
use lo

diff --git a/net-misc/hylafaxplus/files/ldconfig-patch 
b/net-misc/hylafaxplus/files/ldconfig-patch
index 8b0f4352d51..78a42cf562f 100644
--- a/net-misc/hylafaxplus/files/ldconfig-patch
+++ b/net-misc/hylafaxplus/files/ldconfig-patch
@@ -1,5 +1,5 @@
 faxd/Makefile.LINUXdso.original2011-12-30 18:17:59.0 +0100
-+++ faxd/Makefile.LINUXdso 2011-12-30 18:18:51.0 +0100
+--- a/faxd/Makefile.LINUXdso.original  2011-12-30 18:17:59.0 +0100
 b/faxd/Makefile.LINUXdso   2011-12-30 18:18:51.0 +0100
 @@ -37,7 +37,6 @@
  
  installDSO: libfaxserver.${DSO}

diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild 
b/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
new file mode 100644
index 000..18d1e65d47a
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam toolchain-funcs
+
+MY_PN="${PN/plus/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
+HOMEPAGE="http://hylafax.sourceforge.net;
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="~amd64 ~x86"
+IUSE="jbig html lcms ldap mgetty pam"
+
+DEPEND="
+   >=sys-libs/zlib-1.1.4
+   app-text/ghostscript-gpl
+   virtual/mta
+   media-libs/tiff:0[jbig?]
+   virtual/jpeg:0
+   jbig? ( media-libs/jbigkit )
+   virtual/awk
+   lcms? ( media-libs/lcms )
+   ldap? (  net-nds/openldap )
+   pam? ( virtual/pam )
+   mgetty? ( net-dialup/mgetty[-fax] )
+   !net-dialup/mgetty[fax]
+"
+RDEPEND="${DEPEND}
+   net-mail/metamail
+   !net-dialup/sendpage
+"
+
+S="${WORKDIR}/${MY_P}"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} 
/var/spool/fax/etc/xferfaxlog"
+
+PATCHES=( "${FILESDIR}/ldconfig-patch" )
+
+src_prepare() {
+   default
+
+   # force it not to strip binaries
+   for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
+   hfaxd sendfax sendpage ; do
+   sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
+   "${dir}"/Makefile.in || die "sed failed"
+   done
+
+   sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || 
die "sed on hostname failed"
+
+   # Respect LDFLAGS(at least partially)
+   sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed 
on defs.in failed"
+
+   sed -i -e "s|-fpic|-fPIC|g" \
+   configure || die
+}
+
+src_configure() {
+   do_configure() {
+   echo ./configure --nointeractive ${1}
+   # eval required for quoting in ${my_conf} to work properly, 
better way?
+   eval ./configure --nointeractive ${1} || die "./configure 
failed"
+   }
+  

[gentoo-commits] repo/gentoo:master commit in: net-mail/courier-imap/

2018-06-20 Thread Pacho Ramos
commit: 3b7954f110e5b25f88079b2aff411346ca8f0e73
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:09:03 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:31:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7954f1

net-mail/courier-imap: Version bump (#624004)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-mail/courier-imap/Manifest   |   1 +
 net-mail/courier-imap/courier-imap-4.18.2.ebuild | 241 +++
 2 files changed, 242 insertions(+)

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 9284ad63939..d31af1ee9ea 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,2 +1,3 @@
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B 
c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563
 SHA512 
3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.0.tar.bz2 3202389 BLAKE2B 
3889d8db1bca082b1a8a1f1c8f04996ddcdf30b46e2aa3d16b45c46987426f75721223fc63810884a8fa2d8f8daf60d85c2909321abf0ef27e77cfcd0dc3c531
 SHA512 
16dedefe8a43ef48f76388c65ee7f100aaf12c30d9610f4c85f9adbd1adab374f9a0978930e70c221b551a60ed3d804f6b5e87a979b549f5c8249c34af1a3a64
+DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B 
dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3
 SHA512 
821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e

diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild 
b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
new file mode 100644
index 000..0c5927a7d1a
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools libtool readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="http://www.courier-mta.org/;
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+   gnutls? ( net-libs/gnutls )
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   >=net-libs/courier-authlib-0.66.4
+   >=net-libs/courier-unicode-2
+   >=net-mail/mailbase-0.00-r8
+   berkdb? ( sys-libs/db:= )
+   fam? ( virtual/fam )
+   gdbm? ( >=sys-libs/gdbm-1.8.0 )
+"
+DEPEND="${CDEPEND}
+   dev-lang/perl
+   !mail-mta/courier
+   userland_GNU? ( sys-process/procps )
+"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+   !mail-mta/courier
+   !net-mail/bincimap
+   !net-mail/cyrus-imapd
+   !net-mail/uw-imap
+"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch"
+   "${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+)
+
+src_prepare() {
+   default
+
+   # These patches should fix problems detecting BerkeleyDB.
+   # We now can compile with db4 support.
+   if use berkdb ; then
+   eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+   eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+   fi
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf=""
+
+   # Default to gdbm if both berkdb and gdbm are present.
+   if use gdbm ; then
+   einfo "Building with GDBM support"
+   myconf="${myconf} --with-db=gdbm"
+   elif use berkdb ; then
+   einfo "Building with BerkeleyDB support"
+   myconf="${myconf} --with-db=db"
+   fi
+
+   if use trashquota ; then
+   einfo "Building with Trash Quota Support"
+   myconf="${myconf} --with-trashquota"
+   fi
+
+   use debug && myconf="${myconf} debug=true"
+
+   econf \
+   --disable-root-check \
+   --bindir=/usr/sbin \
+   --sysconfdir="/etc/${PN}" \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-mantle/

2018-06-20 Thread Pacho Ramos
commit: 95ef7b89c923dc8afff676bc0d2d983e258b62b2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 17:45:36 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:31:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ef7b89

dev-vcs/git-mantle: cram needed for tests (#631042 by toralf)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-vcs/git-mantle/git-mantle-0.6.ebuild | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-vcs/git-mantle/git-mantle-0.6.ebuild 
b/dev-vcs/git-mantle/git-mantle-0.6.ebuild
index ac478023a9c..08268e57216 100644
--- a/dev-vcs/git-mantle/git-mantle-0.6.ebuild
+++ b/dev-vcs/git-mantle/git-mantle-0.6.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Generate an overview of changes on a branch"
 HOMEPAGE="https://github.com/roman-neuhauser/git-mantle;
@@ -12,15 +10,18 @@ SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz;
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
+DEPEND="test? ( dev-util/cram )"
 RDEPEND="
dev-vcs/git
app-shells/zsh
 "
 
-src_install(){
+src_install() {
+   # Don't install in /usr/local
emake PREFIX="${ED}/usr" install
+   einstalldocs
 }



[gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/files/, sys-devel/dev86/

2018-06-20 Thread Pacho Ramos
commit: 2ec14c2b5670832a8de8affeab091e42c380d3cd
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 18:29:08 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:31:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec14c2b

sys-devel/dev86: Fix make call (#649940), strip properly (#651462)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-devel/dev86/dev86-0.16.21-r3.ebuild| 78 
 sys-devel/dev86/files/dev86-0.16.21-make.patch | 82 ++
 2 files changed, 160 insertions(+)

diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild 
b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
new file mode 100644
index 000..1ba9e30203d
--- /dev/null
+++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
+HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86;
+SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-devel/bin86"
+DEPEND="${RDEPEND}
+   dev-util/gperf"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-pic.patch"
+   "${FILESDIR}/${PN}-0.16.19-fortify.patch"
+   "${FILESDIR}/${P}-non-void-return-clang.patch"
+   "${FILESDIR}/${PN}-0.16.21-make.patch"
+)
+
+src_prepare() {
+   default
+
+   # elksemu doesn't compile under amd64
+   if use amd64; then
+   einfo "Not compiling elksemu on amd64"
+   sed -i \
+   -e 's,alt-libs elksemu,alt-libs,' \
+   -e 's,install-lib install-emu,install-lib,' \
+   makefile.in || die
+   fi
+
+   sed -i -e "s:-O2 -g:${CFLAGS}:" -e '/INEXE=/s:-s::' makefile.in || die
+   sed -i -e "s:/lib/:/$(get_libdir)/:" bcc/bcc.c || die
+   sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
+   sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
+}
+
+src_compile() {
+   # Don't mess with CPPFLAGS as they tend to break compilation
+   # (bug #343655).
+   unset CPPFLAGS
+
+   # First `make` is also a config, so set all the path vars here
+   emake -j1 \
+   DIST="${D}" \
+   CC="$(tc-getCC)" \
+   LIBDIR="/usr/$(get_libdir)/bcc" \
+   INCLDIR="/usr/$(get_libdir)/bcc"
+
+   export PATH=${S}/bin:${PATH}
+
+   cd bin || die
+   ln -s ncc bcc || die
+   cd .. || die
+
+   cd bootblocks || die
+   emake DIST="${D}"
+}
+
+src_install() {
+   emake -j1 install-all DIST="${D}"
+   dostrip -x "/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
+
+   dobin bootblocks/makeboot
+   # remove all the stuff supplied by bin86
+   rm "${D}"/usr/bin/{as,ld,nm,objdump,size}86 || die
+   rm "${D}"/usr/man/man1/{as,ld}86.1 || die
+
+   dodir /usr/share
+   mv "${D}"/usr/{man,share/man} || die
+}

diff --git a/sys-devel/dev86/files/dev86-0.16.21-make.patch 
b/sys-devel/dev86/files/dev86-0.16.21-make.patch
new file mode 100644
index 000..248ff5814db
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-0.16.21-make.patch
@@ -0,0 +1,82 @@
+From f14f78efcd5c865b470173dc06959c8de61e9711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
+Date: Thu, 8 Mar 2018 19:31:17 +0100
+Subject: [PATCH] build: Always use $(MAKE) to spawn sub-make
+
+Always use $(MAKE) instead of literal 'make' to spawn the correct make
+variant. Otherwise, e.g. when using 'gmake' on FreeBSD the Makefiles
+spawn BSD make and things fail because of incompatible MAKEFLAGS
+set by GNU make.
+---
+ bootblocks/Makefile | 10 +-
+ libbsd/Makefile |  2 +-
+ makefile.in |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/bootblocks/Makefile b/bootblocks/Makefile
+index d954ea1..2887d86 100644
+--- a/bootblocks/Makefile
 b/bootblocks/Makefile
+@@ -55,31 +55,31 @@ fs_min.o: minix.h
+ 
+ bootfile.sys: $(MSRC) $(MINC)
+   @rm -f $(MOBJ)
+-  make 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
++  $(MAKE) 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
+   mv monitor.out bootfile.sys
+   @rm -f $(MOBJ)
+ 
+ boottar.sys: $(MSRC) $(MINC) tarboot.bin
+   @rm -f $(MOBJ)
+-  make 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
++  $(MAKE) 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
+   mv monitor.out boottar.sys
+   @rm -f $(MOBJ)
+ 
+ bootminix.sys: $(MSRC) $(MINC) minix.bin
+   @rm -f $(MOBJ)
+-  make 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
++  $(MAKE) 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
+   mv monitor.out bootminix.sys
+   @rm -f $(MOBJ)
+ 
+ monitor.sys: $(MSRC) $(MINC)
+   @rm -f $(MOBJ)
+-  make monitor.out
++  $(MAKE) 

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-pimp/

2018-06-20 Thread Pacho Ramos
commit: 746cee823ecd5649f29549841cafa046f5b9140d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 17:49:30 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 18:31:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746cee82

dev-vcs/git-pimp: cram needed for tests (#631054 by toralf)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-vcs/git-pimp/git-pimp-0.8.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/git-pimp/git-pimp-0.8.ebuild 
b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
index 26c6c470830..900a55ad38e 100644
--- a/dev-vcs/git-pimp/git-pimp-0.8.ebuild
+++ b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Code review or pull requests as patch email series"
 HOMEPAGE="https://github.com/roman-neuhauser/git-mailz/;
@@ -11,11 +10,11 @@ SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz;
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
 
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=""
+KEYWORDS="~amd64 ~x86"
 
+DEPEND="test? ( dev-util/cram )"
 RDEPEND="
dev-vcs/git
app-shells/zsh
@@ -24,5 +23,7 @@ RDEPEND="
 "
 
 src_install(){
+   # Do not install in /usr/local
emake PREFIX="${ED}/usr" install
+   einstalldocs
 }



[gentoo-commits] repo/gentoo:master commit in: app-crypt/p11-kit/

2018-06-20 Thread Alon Bar-Lev
commit: ef86a051b8785f5bf5885952e9508ef52711f4de
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Jun 20 16:24:20 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Jun 20 16:33:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef86a051

app-crypt/p11-kit: version bump

Closes: https://bugs.gentoo.org/show_bug.cgi?id=658558
Closes: https://bugs.gentoo.org/show_bug.cgi?id=655352
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/p11-kit/Manifest   |  1 +
 app-crypt/p11-kit/p11-kit-0.23.12.ebuild | 60 
 2 files changed, 61 insertions(+)

diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index e9d4e8a0e77..e3f202dbb2b 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,2 +1,3 @@
+DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 
8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2
 SHA512 
ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
 DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 
09d1e1c9c9cc9bd330923f6aa37026b6f3b67fd728e4fdf2c692f0eaa1a27b1a045c263ba66d57063b8a03f8dc1ccd4d20bf5f255fc6e21d8ea600696f45d9ea
 SHA512 
b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f
 DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 
9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a
 SHA512 
6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed

diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild 
b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
new file mode 100644
index 000..cb5f5dc036b
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html 
https://github.com/p11-glue/p11-kit;
+SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+   libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+   trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+pkg_setup() {
+   # disable unsafe tests, bug#502088
+   export FAKED_MODE=1
+}
+
+src_prepare() {
+   if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+   # Solaris 10 and before doesn't know about XPG7 
(XOPEN_SOURCE=700)
+   # drop to XPG6 to make feature_tests.h happy
+   sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || 
die
+   # paths.h isn't available, oddly enough also not used albeit 
included
+   sed -i -e '/#include /d' trust/test-trust.c || die
+   # we don't have SUN_LEN here
+   sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+   p11-kit/server.c || die
+   fi
+   default
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf \
+   $(use_enable trust trust-module) \
+   $(use_with trust trust-paths 
${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+   $(use_enable debug) \
+   $(use_with libffi) \
+   $(use_with asn1 libtasn1)
+
+   if multilib_is_native_abi; then
+   # re-use provided documentation
+   ln -s "${S}"/doc/manual/html doc/manual/html || die
+   fi
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   prune_libtool_files --modules
+}



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

2018-06-20 Thread Alon Bar-Lev
commit: 6121d4a446d95ce942a411b220610471ea35119d
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Jun 20 16:18:16 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Jun 20 16:33:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6121d4a4

dev-libs/xmlsec: version bump

Closes: https://bugs.gentoo.org/show_bug.cgi?id=658594
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/xmlsec/Manifest |  1 +
 dev-libs/xmlsec/xmlsec-1.2.26.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 072e9c5ce72..5bb3a245541 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1 +1,2 @@
 DIST xmlsec1-1.2.25.tar.gz 1839160 BLAKE2B 
af480affa84c47c5656889c8114f147e1d9a5ad0f9a494c8913fd180aa5e2cba4773451c4a5f41781026e7617cccf329057182fc3fc3f2bd4e6f007cbe8ac190
 SHA512 
ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
+DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 
8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b
 SHA512 
1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4

diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild 
b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
new file mode 100644
index 000..70e0604bb85
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and 
decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec;
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
+REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
+   gnutls? ( gcrypt )"
+
+RDEPEND=">=dev-libs/libxml2-2.7.4
+   >=dev-libs/libxslt-1.0.20
+   gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
+   gnutls? ( >=net-libs/gnutls-2.8.0 )
+   nss? (
+   >=dev-libs/nspr-4.4.1
+   >=dev-libs/nss-3.9
+   )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}1-${PV}"
+
+src_prepare() {
+   default
+   # conditionally install extra documentation
+   if ! use doc ; then
+   sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   econf \
+   --enable-pkgconfig \
+   --with-html-dir=/usr/share/doc/${PF}/html \
+   $(use_enable static-libs static) \
+   $(use_with gcrypt gcrypt "") \
+   $(use_with gnutls gnutls "") \
+   $(use_with nss nspr "") \
+   $(use_with nss nss "") \
+   $(use_with openssl openssl "") \
+   $(use_enable openssl aes)
+}
+
+src_test() {
+   emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+   default
+   prune_libtool_files --all
+}



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

2018-06-20 Thread Alon Bar-Lev
commit: c88208d85b3a526766fd02657fcc13373ce51d47
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Wed Jun 20 16:32:59 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Jun 20 16:33:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88208d8

dev-libs/libp11: version bump

Closes: https://bugs.gentoo.org/show_bug.cgi?id=658462
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/libp11/Manifest|  1 +
 dev-libs/libp11/libp11-0.4.7.ebuild | 34 ++
 2 files changed, 35 insertions(+)

diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index b35dd8979d4..8a234e011e8 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1 +1,2 @@
 DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 
4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169
 SHA512 
12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
+DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 
81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091
 SHA512 
8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6

diff --git a/dev-libs/libp11/libp11-0.4.7.ebuild 
b/dev-libs/libp11/libp11-0.4.7.ebuild
new file mode 100644
index 000..ef1ce17e2ae
--- /dev/null
+++ b/dev-libs/libp11/libp11-0.4.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ltprune
+
+DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
+HOMEPAGE="https://github.com/opensc/libp11/wiki;
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl bindist doc static-libs"
+
+RDEPEND="
+   !libressl? ( dev-libs/openssl:0=[bindist=] )
+   libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )"
+
+src_configure() {
+   econf \
+   --enable-shared \
+   $(use_enable static-libs static) \
+   $(use_enable doc api-doc)
+}
+
+src_install() {
+   default
+   prune_libtool_files --all
+}



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

2018-06-20 Thread Matt Turner
commit: abf4bacb3dab8166e7a8d3fa64b7badcd33f1d39
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jun 20 18:10:21 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jun 20 18:10:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf4bacb

profiles: Mask x11-libs/libiterm-mbt for removal

Bug: https://bugs.gentoo.org/658528

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 6abd61d4605..3455a40a75a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner  (20 Jun 2018)
+# No reverse deps after removal of app-i18n/fbiterm
+# Removal in 30 days. Bug #658528
+x11-libs/libiterm-mbt
+
 # Michał Górny  (20 Jun 2018)
 # Multiple serious bugs.  Upstream does not support Gentoo, and getting
 # any fixes applied is very difficult.  Regularly fails to build.



[gentoo-commits] proj/linux-patches:4.17 commit in: /

2018-06-20 Thread Mike Pagano
commit: 28dc1147d04eff810b527e8714a865cdc6cf6023
Author: Mike Pagano  gentoo  org>
AuthorDate: Wed Jun 20 17:46:53 2018 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jun 20 17:46:53 2018 +
URL:https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=28dc1147

kvmclock: Define pvclock_pvti_cpu0_va setter for X86_32. See bug #658544.

 _README|  4 +++
 ...ne-pvclock-pvti-cpu0-va-setter-for-X86-32.patch | 37 ++
 2 files changed, 41 insertions(+)

diff --git a/_README b/_README
index a4cf389..3487ae6 100644
--- a/_README
+++ b/_README
@@ -59,6 +59,10 @@ Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.
 
+Patch:  1700_define-pvclock-pvti-cpu0-va-setter-for-X86-32.patch
+From:   https://bugs.gentoo.org/show_bug.cgi?id=658544
+Desc:   kvmclock: Define pvclock_pvti_cpu0_va setter for X86_32
+
 Patch:  1510_fs-enable-link-security-restrictions-by-default.patch
 From:   
http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/
 Desc:   Enable link security restrictions by default.

diff --git a/1700_define-pvclock-pvti-cpu0-va-setter-for-X86-32.patch 
b/1700_define-pvclock-pvti-cpu0-va-setter-for-X86-32.patch
new file mode 100644
index 000..e52f3a2
--- /dev/null
+++ b/1700_define-pvclock-pvti-cpu0-va-setter-for-X86-32.patch
@@ -0,0 +1,37 @@
+From 42d9186f9ef41d6b50458db13ca34d01595e1ecd Mon Sep 17 00:00:00 2001
+From: Mike Pagano 
+Date: Wed, 20 Jun 2018 12:31:18 -0400
+Subject: [PATCH] kvmclock: Define pvclock_pvti_cpu0_va setter for X86_32
+Cc: mpag...@gentoo.org
+
+setup_vsyscall_timeinfo() is only defined for x86_64, thus
+vclock_set_pvti_cpu0_va() does not get called resulting in
+the failure of ptp_kvm initialization for Linux X86_32 guests.
+The result of this being that the 32 bit guest userspace has
+no /dev/ptp0 device.
+
+See Gentoo bug 658544 located at the following link:
+https://bugs.gentoo.org/658544
+
+Signed-off-by: Mike Pagano 
+Signed-off-by: Andreas Steinmetz 
+---
+ arch/x86/kernel/kvmclock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
+index bf8d1eb7fca3..6aee5c6265b3 100644
+--- a/arch/x86/kernel/kvmclock.c
 b/arch/x86/kernel/kvmclock.c
+@@ -350,7 +350,7 @@ void __init kvmclock_init(void)
+ 
+ int __init kvm_setup_vsyscall_timeinfo(void)
+ {
+-#ifdef CONFIG_X86_64
++#ifdef CONFIG_X86_64 || defined(CONFIG_X86_32)
+   int cpu;
+   u8 flags;
+   struct pvclock_vcpu_time_info *vcpu_time;
+-- 
+2.16.4
+



[gentoo-commits] repo/gentoo:master commit in: net-firewall/sanewall/

2018-06-20 Thread Pacho Ramos
commit: d470885430d84440f323dabe6e083a0e1a6e0653
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 17:18:39 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 17:39:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4708854

net-firewall/sanewall: net-tools needed (#621534 by toralf)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-firewall/sanewall/sanewall-1.1.6-r2.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild 
b/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild
index b70dac95844..5c45521aa61 100644
--- a/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild
+++ b/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild
@@ -13,14 +13,17 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/xz-utils"
-RDEPEND="net-firewall/iptables[ipv6]
+RDEPEND="
+   net-firewall/iptables[ipv6]
sys-apps/iproute2[-minimal]
+   sys-apps/net-tools
virtual/modutils
|| (
net-misc/wget
net-misc/curl
-   )"
+   )
+"
+DEPEND=""
 
 pkg_setup() {
local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT 
~NF_NAT_FTP ~NF_NAT_IRC \



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/, net-libs/libssh2/files/

2018-06-20 Thread Pacho Ramos
commit: ee0c9433da1197186bef013eb84a26c0aad69607
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 17:38:29 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 17:39:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0c9433

net-libs/libssh2: Fix openssl-1.1 memleak (#630804)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/libssh2-1.8.0-openssl11-memleak.patch| 23 ++
 net-libs/libssh2/libssh2-1.8.0-r1.ebuild   |  1 +
 2 files changed, 24 insertions(+)

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch
new file mode 100644
index 000..d7d41f976cc
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.8.0-openssl11-memleak.patch
@@ -0,0 +1,23 @@
+From 97518ca8bda91ce12c503197a98fa71690cb67f9 Mon Sep 17 00:00:00 2001
+From: Will Cosgrove 
+Date: Fri, 12 May 2017 16:34:26 -0700
+Subject: [PATCH] Fix memory leak of crypt_ctx->h using openSSL 1.1+ (#177)
+
+Need to use EVP_CIPHER_CTX_free instead of EVP_CIPHER_CTX_reset.
+---
+ src/openssl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/openssl.h b/src/openssl.h
+index 6aa12192..2bd80b96 100644
+--- a/src/openssl.h
 b/src/openssl.h
+@@ -267,7 +267,7 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
+ #define _libssh2_cipher_3des EVP_des_ede3_cbc
+ 
+ #ifdef HAVE_OPAQUE_STRUCTS
+-#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_reset(*(ctx))
++#define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_free(*(ctx))
+ #else
+ #define _libssh2_cipher_dtor(ctx) EVP_CIPHER_CTX_cleanup(ctx)
+ #endif

diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index 1105b230b82..2e8c25a0743 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch
"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
"${FILESDIR}"/${PN}-1.8.0-openssl11.patch
+   "${FILESDIR}"/${PN}-1.8.0-openssl11-memleak.patch
 )
 
 multilib_src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/, net-libs/libssh2/files/

2018-06-20 Thread Pacho Ramos
commit: c76da85a21aa8f1546e5977dff8dae8843220805
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 17:35:56 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 17:39:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c76da85a

net-libs/libssh2: Fix openssl-1.1 compat (#614784)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../libssh2/files/libssh2-1.8.0-openssl11.patch| 70 ++
 net-libs/libssh2/libssh2-1.8.0-r1.ebuild   | 21 +++
 2 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch 
b/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch
new file mode 100644
index 000..0824dd06176
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.8.0-openssl11.patch
@@ -0,0 +1,70 @@
+From c423b543ca45d6caca7b94763bf65ff79d07e811 Mon Sep 17 00:00:00 2001
+From: Marcel Raad 
+Date: Wed, 24 May 2017 19:21:22 +0200
+Subject: [PATCH] openssl: fix build with OpenSSL 1.1 API (#176)
+
+When building with OPENSSL_API_COMPAT=0x1010L, OpenSSL_add_all_algorithms
+and OpenSSL_add_all_ciphers don't exist. The corresponding functionality is
+handled automatically with OpenSSL 1.1.
+---
+ src/openssl.c | 4 
+ src/openssl.h | 6 ++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/openssl.c b/src/openssl.c
+index f10f2921..25cef082 100644
+--- a/src/openssl.c
 b/src/openssl.c
+@@ -1056,6 +1056,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
+   "Unable to extract public key from private key "
+   "file: Unable to open private key file");
+ }
++#if OPENSSL_VERSION_NUMBER < 0x1010L
+ if (!EVP_get_cipherbyname("des")) {
+ /* If this cipher isn't loaded it's a pretty good indication that none
+  * are.  I have *NO DOUBT* that there's a better way to deal with this
+@@ -1064,6 +1065,7 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
+  */
+ OpenSSL_add_all_ciphers();
+ }
++#endif
+ BIO_reset(bp);
+ pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase);
+ BIO_free(bp);
+@@ -1132,6 +1134,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
+ if (!bp) {
+ return -1;
+ }
++#if OPENSSL_VERSION_NUMBER < 0x1010L
+ if (!EVP_get_cipherbyname("des")) {
+ /* If this cipher isn't loaded it's a pretty good indication that none
+  * are.  I have *NO DOUBT* that there's a better way to deal with this
+@@ -1140,6 +1143,7 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
+  */
+ OpenSSL_add_all_ciphers();
+ }
++#endif
+ BIO_reset(bp);
+ pk = PEM_read_bio_PrivateKey(bp, NULL, NULL, (void*)passphrase);
+ BIO_free(bp);
+diff --git a/src/openssl.h b/src/openssl.h
+index 2bd80b96..d8874286 100644
+--- a/src/openssl.h
 b/src/openssl.h
+@@ -226,10 +226,16 @@ int _libssh2_md5_init(libssh2_md5_ctx *ctx);
+ #define libssh2_hmac_cleanup(ctx) HMAC_cleanup(ctx)
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x1010L
++#define libssh2_crypto_init() \
++  ENGINE_load_builtin_engines(); \
++  ENGINE_register_all_complete()
++#else
+ #define libssh2_crypto_init() \
+   OpenSSL_add_all_algorithms(); \
+   ENGINE_load_builtin_engines(); \
+   ENGINE_register_all_complete()
++#endif
+ 
+ #define libssh2_crypto_exit()
+ 

diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild 
b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index 8abb95e667b..1105b230b82 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Library implementing the SSH2 protocol"
 HOMEPAGE="https://www.libssh2.org;
@@ -10,27 +10,23 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-solaris"
 IUSE="gcrypt libressl static-libs test zlib"
 
-DEPEND="
+RDEPEND="
!gcrypt? (
-   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] 
)
-   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
-RDEPEND="
-   ${DEPEND}
-"
+DEPEND="${RDEPEND}"
 
-DOCS=(
-   NEWS README
-)
 PATCHES=(

[gentoo-commits] proj/openrc:master commit in: src/libeinfo/

2018-06-20 Thread William Hubbs
commit: 19bf49a710f27d4774ed4c6372d87d6ba15f189e
Author: William Hubbs  gmail  com>
AuthorDate: Wed Jun 20 17:36:51 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jun 20 17:36:51 2018 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=19bf49a7

libeinfo: convert remaining snprintf calls to xasprintf

 src/libeinfo/libeinfo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
index 5a637ffc..b8064540 100644
--- a/src/libeinfo/libeinfo.c
+++ b/src/libeinfo/libeinfo.c
@@ -904,7 +904,7 @@ void eoutdent(void)
 {
char *env = getenv("EINFO_INDENT");
int amount = 0;
-   char num[10];
+   char *num = NULL;
int serrno = errno;
 
if (!env)
@@ -918,8 +918,9 @@ void eoutdent(void)
if (amount <= 0)
unsetenv("EINFO_INDENT");
else {
-   snprintf(num, 10, "%08d", amount);
+   xasprintf(, "%08d", amount);
setenv("EINFO_INDENT", num, 1);
+   free(num);
}
errno = serrno;
 }



[gentoo-commits] proj/java:master commit in: dev-java/gradle-bin/

2018-06-20 Thread Florian Schmaus
commit: 7482a093c6cfc28e2fbb49376ca58fa2af949e2d
Author: Florian Schmaus  geekplace  eu>
AuthorDate: Wed Jun 20 17:22:38 2018 +
Commit: Florian Schmaus  geekplace  eu>
CommitDate: Wed Jun 20 17:22:38 2018 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=7482a093

dev-java/gradle-bin: add gradle-bin-4.8

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-java/gradle-bin/Manifest  |  1 +
 dev-java/gradle-bin/gradle-bin-4.8.ebuild | 60 +++
 2 files changed, 61 insertions(+)

diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index bfefcec5..8962ac60 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -2,3 +2,4 @@ DIST gradle-3.5-all.zip 95084513 BLAKE2B 
17ee9fb3569842f21f26c00f711ab38a8b295b3
 DIST gradle-4.4.1-all.zip 99180462 BLAKE2B 
8b961f3ef296191dbd3415d7428ba943fbcadca0d69d6b77ba60d91a50b69f55be86cb564672e5390caf8e753234aac572d8fce69c2a79321cacf3d3ea035e5b
 SHA512 
f281be409fee7c0b554c0920dd01a09eee0449cc8894e364a0174181836cf4ab986d078ea9fa48acfd16c8900d44cafedf3daeb804f0996f67af2438f5857233
 DIST gradle-4.6-all.zip 106724289 BLAKE2B 
15475ccd6ea2305e30d0c2e59659eb742d984b0a6b643d4c5ecbd0ccd7244713eb7431e30588aedbedb5268e616aeebf7abb389551acd4b6b1cd4079f37c85be
 SHA512 
36249d86e5e35d793448960251c9db1be36643ea4846be35e7b9af5c0bed245dac20c4682580c53ff80f6745369cb5dad8dd840a9b00f7b67d1ec563a9e6e106
 DIST gradle-4.7-all.zip 109748755 BLAKE2B 
e655c5478492736ff2fed7e2014bccdb3ebdb63b4c3217070fefd5f9987935f4fd822c561e21ac9e2e03e670cc0f47a98f036d1fb6a6211006407721260e2adf
 SHA512 
23d5129306c724a8e8815a4b3aa57e5451893aaf5c5a1179f360ee402ec07e07804b00b594ffbfceb3f708a00e23600dfcaea6549e351f013a6c21e843e32146
+DIST gradle-4.8-all.zip 110829164 BLAKE2B 
c2d2f97401ee7c23609e337cac7f535c26b857382a6acf13c3ce6ea26d796201c4a6ac7f3eab7dee4b38f5d69142f952204f4a7c5a109ba43fd723675a2314eb
 SHA512 
500ea47ed97b611e5ff7b9016050b4d35becd8250a60c6421a07fe5118ceb7c203bc0c44074f974d98d8659cef81a97d8fab1afd1f231ed02772f90515f3284f

diff --git a/dev-java/gradle-bin/gradle-bin-4.8.ebuild 
b/dev-java/gradle-bin/gradle-bin-4.8.ebuild
new file mode 100644
index ..acc8a5e6
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-4.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip;
+HOMEPAGE="http://www.gradle.org/;
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="app-arch/zip
+   app-eselect/eselect-gradle"
+RDEPEND=">=virtual/jdk-1.6"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+   local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+   dodoc docs/release-notes.html getting-started.html
+
+   insinto "${gradle_dir}"
+
+   # source
+   if use source ; then
+   java-pkg_dosrc src/*
+   fi
+
+   # docs
+   if use doc ; then
+   java-pkg_dojavadoc docs/javadoc
+   fi
+
+   # examples
+   if use examples ; then
+   java-pkg_doexamples samples
+   fi
+
+   insinto "${gradle_dir}"
+   doins -r bin/ lib/
+   fperms 755 "${gradle_dir}/bin/gradle"
+   dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+   eselect gradle update ifunset
+}
+
+pkg_postrm() {
+   eselect gradle update ifunset
+}



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

2018-06-20 Thread Andreas Sturmlechner
commit: 689b528c37560822e3d17901ab2af163855c1fea
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 17:14:03 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 17:15:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689b528c

profiles: powerpc: Stable-mask media-sound/pulseaudio[qt5]

 profiles/arch/powerpc/package.use.stable.mask   | 3 ++-
 profiles/arch/powerpc/ppc32/package.use.stable.mask | 4 
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/profiles/arch/powerpc/package.use.stable.mask 
b/profiles/arch/powerpc/package.use.stable.mask
index 3b9295ec515..c9e0a7b9710 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,8 +17,9 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner  (03 Jun 2018)
+# Andreas Sturmlechner  (20 Jun 2018)
 # dev-python/PyQt5 is not stable.
+media-sound/pulseaudio qt5
 net-print/hplip qt5
 
 # Andreas Sturmlechner  (15 Mar 2018)

diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask 
b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 8f597f7a6cd..08880aaf349 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,10 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner  (20 Jun 2018)
-# dev-python/PyQt5 is not stable.
-media-sound/pulseaudio qt5
-
 # Andreas Sturmlechner  (12 Jun 2018)
 # Requires not yet stable dev-qt/qtpositioning:5
 sci-astronomy/stellarium gps



[gentoo-commits] proj/kde-sunset:master commit in: app-text/poppler/, app-text/poppler/files/

2018-06-20 Thread Andreas Sturmlechner
commit: c955bde238137a9decfbb8d65203eab39711b6ab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 17:08:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 17:10:07 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c955bde2

app-text/poppler: Import 0.61.1 from Gentoo ebuild repository

Last version with Qt4 support.

 ...poppler-0.28.1-fix-multilib-configuration.patch |  23 
 .../poppler/files/poppler-0.33.0-openjpeg2.patch   |  15 +++
 app-text/poppler/files/poppler-0.40-FindQt4.patch  |  31 +
 .../poppler-0.57.0-disable-internal-jpx.patch  |  25 
 .../files/poppler-0.60.1-qt5-dependencies.patch|  29 +
 .../files/poppler-0.61.0-respect-cflags.patch  |  55 
 app-text/poppler/metadata.xml  |   3 +-
 app-text/poppler/poppler-0.61.1.ebuild | 145 +
 8 files changed, 325 insertions(+), 1 deletion(-)

diff --git 
a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch 
b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
new file mode 100644
index 000..f0a8d3c
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7178d25..934f38f 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -119,6 +119,18 @@ 
else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO
+   message("-- CMake >= 2.8.8 is needed to enable Qt5")
+ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} 
VERSION_GREATER 2.8.7)
+ 
++#
++# Ugly workaround: Manually patch library paths for Qt4 and Qt5:
++#
++IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
++  GET_CMAKE_PROPERTY(_res VARIABLES)
++  FOREACH(_var ${_res})
++IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64")
++  STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}")
++ENDIF()
++  ENDFOREACH()
++ENDIF()
++
+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
+ if(CAIRO_FOUND)
+   set(HAVE_CAIRO ${CAIRO_FOUND})

diff --git a/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch 
b/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch
new file mode 100644
index 000..af1a72f
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch
@@ -0,0 +1,15 @@
+Sadly the CMake side of openjpeg slotting in Gentoo is broken.
+To reliably find openjpeg:2 we need to use pkg-config.
+
+diff -ruN poppler-0.33.0.orig/CMakeLists.txt poppler-0.33.0/CMakeLists.txt
+--- poppler-0.33.0.orig/CMakeLists.txt 2015-05-14 20:22:31.0 +0200
 poppler-0.33.0/CMakeLists.txt  2015-05-24 20:39:30.163709257 +0200
+@@ -172,7 +172,7 @@
+   set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+   set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
+ elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+-  find_package(LIBOPENJPEG2)
++  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
+   set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+ endif()

diff --git a/app-text/poppler/files/poppler-0.40-FindQt4.patch 
b/app-text/poppler/files/poppler-0.40-FindQt4.patch
new file mode 100644
index 000..84c58d5
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.40-FindQt4.patch
@@ -0,0 +1,31 @@
+
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to 
qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 572382
+
+--- a/cmake/modules/FindQt4.cmake
 b/cmake/modules/FindQt4.cmake
+@@ -313,11 +313,10 @@
+ 
+ GET_FILENAME_COMPONENT(qt_install_version 
"[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+ # check for qmake
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+-  
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+-  
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+-  $ENV{QTDIR}/bin
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
++  /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++  /usr/bin
++  NO_DEFAULT_PATH
+ )
+ 
+ IF (QT_QMAKE_EXECUTABLE)

diff --git a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch 
b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch
new file mode 100644
index 000..faf6321
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch
@@ -0,0 +1,25 @@
+Fix security issue [internal unmaintained JPX decoder] that is caused
+by building without system-jpeg libs. Fedora does not care because they
+always build with 

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

2018-06-20 Thread Pacho Ramos
commit: d52220571c9e2280f6eabfcb3dc6aa82c9908969
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 16:55:32 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 16:59:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5222057

net-libs/ortp: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/ortp/Manifest   |  1 -
 net-libs/ortp/ortp-0.20.0.ebuild | 76 
 2 files changed, 77 deletions(-)

diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index 039f3ed17eb..896deddf9d4 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,2 +1 @@
-DIST ortp-0.20.0.tar.gz 515505 BLAKE2B 
94e0127d5e6a13e520a74f193cf8e99325b2605405aea3772ed6bf94dc1b1c4b967b6e608e3a96bda56a022d253e2623e8177c6dec4c4cfc95eb99d192a86013
 SHA512 
a4d666be6b6825eeb28204001d5d1263c80ef3c07931586e753d3efa8c72d76e993335c4eeaa558209b5d10d5e991ba0c88e2f5c9a35aff46b36d6e76f92b706
 DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 
46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793
 SHA512 
70560168f1b138ad825e4e836e7ee218bd24b92a2d7ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4

diff --git a/net-libs/ortp/ortp-0.20.0.ebuild b/net-libs/ortp/ortp-0.20.0.ebuild
deleted file mode 100644
index 9b860bad5ad..000
--- a/net-libs/ortp/ortp-0.20.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
-HOMEPAGE="http://www.linphone.org/;
-SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos 
~x86-macos"
-IUSE="debug doc examples ipv6 minimal srtp ssl" # zrtp"
-
-# Note:
-# This package supposedly requires libzrtpcpp-2.0.0
-# but it is incompatible with its API...
-
-RDEPEND="srtp? ( net-libs/libsrtp )
-   ssl? ( dev-libs/openssl )"
-#  zrtp? ( >=net-libs/libzrtpcpp-2.0.0 )"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )
-   virtual/pkgconfig"
-
-#REQUIRED_USE="zrtp? ( srtp )"
-
-src_prepare() {
-   # ${P} is added after ${docdir}
-   if use doc; then
-   sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' 
Makefile.in \
-   || die "patching Makefile.in failed"
-   fi
-}
-
-src_configure() {
-   local myeconfargs=(
-   # memcheck is for HP-UX only
-   --disable-memcheck
-   # mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
-   --disable-mode64bit
-   # strict adds -Werror, don't want it
-   --disable-strict
-   # they seriously failed to understand AC_ARG_ENABLE...
-   --disable-tests_enabled
-   --enable-fast-install
-   --enable-libtool-lock
-
-   $(use_enable debug)
-   $(use_enable ipv6)
-   $(use_enable minimal perf)
-   $(use_enable ssl ssl-hmac)
-#  $(use_enable zrtp)
-   --disable-zrtp
-
-   "--with-srtp=$(usex srtp "${EPREFIX}"/usr none)"
-   $(use doc || echo ac_cv_path_DOXYGEN=false)
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
-   install
-   dodoc AUTHORS ChangeLog NEWS README TODO
-
-   prune_libtool_files
-
-   if use examples; then
-   insinto /usr/share/doc/${PF}/examples
-   doins src/tests/*.c
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/mediastreamer/, media-libs/mediastreamer/files/

2018-06-20 Thread Pacho Ramos
commit: c0d6785d689df90ab3b5a13c32abf5fdf6076080
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 16:56:36 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 16:59:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d6785d

media-libs/mediastreamer: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/mediastreamer/Manifest  |   1 -
 .../files/mediastreamer-2.8.2-autopoint.patch  |  17 ---
 .../files/mediastreamer-2.8.2-ffmpeg-1.0.patch |  59 -
 .../files/mediastreamer-2.8.2-libav9.patch | 115 -
 .../files/mediastreamer-2.8.2-v4l-automagic.patch  |  54 
 .../mediastreamer/mediastreamer-2.8.2.ebuild   | 137 -
 6 files changed, 383 deletions(-)

diff --git a/media-libs/mediastreamer/Manifest 
b/media-libs/mediastreamer/Manifest
index 384d563a8cb..4c93a71d607 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1,2 +1 @@
-DIST mediastreamer-2.8.2.tar.gz 882966 BLAKE2B 
f025bbfdf8e5940fd7e185df687f4d53c4416afea0e0c237ed63bd289cea0a34643945f625881d90564f025e311ecae317114e44ffe81484ecbb2edc653cf8f4
 SHA512 
2041d9fbba0f831aea6bdd3259b21742a37cfdbdf473b0bc4f20bd730371395ddf2866804ae496e9864adf5fcd0d24e03193d5d8feadd54e6ff0b3adda01ff60
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 
14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7
 SHA512 
8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.8.2-autopoint.patch 
b/media-libs/mediastreamer/files/mediastreamer-2.8.2-autopoint.patch
deleted file mode 100644
index 5704234af06..000
--- a/media-libs/mediastreamer/files/mediastreamer-2.8.2-autopoint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 mediastreamer-2.8.2/configure.ac.orig  2012-06-01 16:31:34.0 
+0400
-+++ mediastreamer-2.8.2/configure.ac   2012-06-01 16:36:08.586809086 +0400
-@@ -191,13 +191,13 @@
- if test "$mingw_found" != "yes" ; then
-   dnl gettext macro does not work properly under mingw. And we want to 
use the one provided by GTK.
-   AM_GNU_GETTEXT([external])
--  AM_GNU_GETTEXT_VERSION([0.18])
-   LIBS="$LIBS $LIBINTL"
- else
-   AC_DEFINE(ENABLE_NLS,1,[Tells whether localisation is possible])
-   AC_DEFINE(HAVE_GETTEXT,1,[Tells wheter localisation is possible])
-   LIBS="$LIBS -lintl"
- fi
-+AM_GNU_GETTEXT_VERSION([0.18])
- 
- AM_CONDITIONAL(BUILD_MACOSX, test x$macosx_found = xyes)
- AM_CONDITIONAL(BUILD_IOS, test x$ios_found = xyes)

diff --git 
a/media-libs/mediastreamer/files/mediastreamer-2.8.2-ffmpeg-1.0.patch 
b/media-libs/mediastreamer/files/mediastreamer-2.8.2-ffmpeg-1.0.patch
deleted file mode 100644
index 293e6e78dca..000
--- a/media-libs/mediastreamer/files/mediastreamer-2.8.2-ffmpeg-1.0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=445168
-
-commit f586917ea4d66f9ba8910f0967a8830e54d50784
-Author: Yann Diorcet 
-Date:   Tue Jun 5 11:07:48 2012 +0200
-
-Fixes for new versions of ffmpeg
-
-diff --git a/src/h264dec.c b/src/h264dec.c
-index c4a84ee..5229b5e 100644
 a/src/h264dec.c
-+++ b/src/h264dec.c
-@@ -45,7 +45,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
-   static bool_t done=FALSE;
-   if (!done){
-+#ifdef FF_API_AVCODEC_INIT
-   avcodec_init();
-+#endif
-   avcodec_register_all();
-   done=TRUE;
-   }
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..fb35760 100644
 a/src/videoenc.c
-+++ b/src/videoenc.c
-@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
02111-1307, USA.
- 
- static bool_t avcodec_initialized=FALSE;
- 
-+#ifndef FF_I_TYPE
-+#define FF_I_TYPE AV_PICTURE_TYPE_I
-+#endif
-+
- #ifdef ENABLE_LOG_FFMPEG
- 
- void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const 
char* fmt, va_list vl)
- 
- void ms_ffmpeg_check_init(){
-   if(!avcodec_initialized){
-+#ifdef FF_API_AVCODEC_INIT
-   avcodec_init();
-+#endif
-   avcodec_register_all();
-   avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
-   if (s->profile==0){
-   s->codec=CODEC_ID_H263;
-   }else{
-+  /*
-   c->flags|=CODEC_FLAG_H263P_UMV;
-   c->flags|=CODEC_FLAG_AC_PRED;
-   c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
--  /*
-   c->flags|=CODEC_FLAG_OBMC;
-   c->flags|=CODEC_FLAG_AC_PRED;
-   */

diff --git a/media-libs/mediastreamer/files/mediastreamer-2.8.2-libav9.patch 

[gentoo-commits] repo/gentoo:master commit in: net-voip/linphone/, net-voip/linphone/files/

2018-06-20 Thread Pacho Ramos
commit: ccbaa195b72353cb538639681ca20f45c61995c2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 16:47:45 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 16:59:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbaa195

net-voip/linphone: Drop old/broken version

Lots of bugs and not really stable at present time (#626420)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-voip/linphone/Manifest |   1 -
 .../files/linphone-3.5.2-automake-1.13.patch   |  19 
 net-voip/linphone/files/linphone-3.5.2-nls.patch   |  15 ---
 net-voip/linphone/linphone-3.5.2.ebuild| 109 -
 4 files changed, 144 deletions(-)

diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 37228468bfd..904b91cb096 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,3 +1,2 @@
-DIST linphone-3.5.2.tar.gz 8338517 BLAKE2B 
df44f2885a7ef1c2ccdfcb5755b947ff27ef85fd467b8a98fcce859fdc16c82679e0f6f8de811760345cfd9150ca1f3e93121ff2f45240eb78e4b3856cc1137d
 SHA512 
a45be141af3ee5fc37d314889b92246000810b2b5e129088a30e3ba9335f6cecd226b488a568953463d38806491471e3798be99eda7ceba9d421ff0fa7a995c9
 DIST linphone-3.6.1-exosip-4.patch 89376 BLAKE2B 
128b0406fb382dcc0e683777322d6ae2230de8fb09e8d0e1b35ecd6bd0d8518b6e9759c703545fc0bc2e1b1ee754eaf7d5bd6396a58b9d638de6de4fcf3a09f3
 SHA512 
bdab74336cb8235b3396230278fd8eb465defac1175b00ff9cf273ef2dbc4e05f63d2574de599618e4d963b42ad17ac4f0c8c9013e40a497c99211041317313d
 DIST linphone-3.6.1.tar.gz 11458586 BLAKE2B 
e89576eb313e5707c83e8df66a20e630f4244cadfec580f58fd0a9f2f3fe9600b85b17049af0a89ddc2059b932f9d3af9abecda45500b6689f1a09ca1b3f6c28
 SHA512 
688ccfb333b2302ca20c2c77e38b20deee8b1c5f3c31f7a4b666d81114ea3e5cbe38bac6d88116d635ac3fcb7f38d013e35c7c076549cc3d7ae900456d51b5e4

diff --git a/net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch 
b/net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch
deleted file mode 100644
index 44d679c473a..000
--- a/net-voip/linphone/files/linphone-3.5.2-automake-1.13.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: hasufell 
-Date:   Sun Sep 29 17:41:02 2013 +0200
-
-remove obsolete macro
-
-AC_PROG_CC is already called anyway
-
-diff --git a/configure.ac b/configure.ac
-index 22bc235..81f6277 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -39,7 +39,6 @@ AC_ISC_POSIX
- AC_PROG_CC
- AC_PROG_CXX
- AC_C_INLINE
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- AM_PROG_CC_C_O
- AC_CHECK_PROGS(MD5SUM,[md5sum md5])

diff --git a/net-voip/linphone/files/linphone-3.5.2-nls.patch 
b/net-voip/linphone/files/linphone-3.5.2-nls.patch
deleted file mode 100644
index b9624048edf..000
--- a/net-voip/linphone/files/linphone-3.5.2-nls.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 5c0dde6115a0 -r 082bb23f04a9 configure.ac
 a/configure.ac Thu Mar 29 12:44:23 2012 +0400
-+++ b/configure.ac Thu Mar 29 12:48:40 2012 +0400
-@@ -80,7 +80,10 @@
- AC_SUBST(GUI_FLAGS)
- 
- dnl localization tools
--IT_PROG_INTLTOOL([0.40], [no-xml])
-+AM_NLS
-+if test "$USE_NLS" != "no"; then
-+IT_PROG_INTLTOOL([0.40], [no-xml])
-+fi
- 
- AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
- dnl Initialize libtool

diff --git a/net-voip/linphone/linphone-3.5.2.ebuild 
b/net-voip/linphone/linphone-3.5.2.ebuild
deleted file mode 100644
index f9e943659d1..000
--- a/net-voip/linphone/linphone-3.5.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib pax-utils versionator
-
-DESCRIPTION="Video softphone based on the SIP protocol"
-HOMEPAGE="http://www.linphone.org/;
-SRC_URI="mirror://nongnu/${PN}/$(get_version_component_range 
1-2).x/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# TODO: run-time test for ipv6: does it need mediastreamer[ipv6]?
-IUSE="doc gsm-nonstandard gtk ipv6 ncurses nls ssl video"
-
-RDEPEND="
-   =media-libs/mediastreamer-2.8*[video?,ipv6?]
-   >=net-libs/libeXosip-3.0.2
-   >=net-libs/libosip-3.0.0
-   =net-libs/libsoup-2.26
-   >=net-libs/ortp-0.20.0
-   =gnome-base/libglade-2.4.0:2.0
-   >=x11-libs/gtk+-2.4.0:2
-   x11-libs/libnotify
-   )
-   gsm-nonstandard? ( =media-libs/mediastreamer-2.8*[gsm] )
-   ncurses? (
-   sys-libs/readline:=
-   sys-libs/ncurses
-   )
-   ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   doc? ( app-text/sgmltools-lite )
-   nls? (
-   dev-util/intltool
-   sys-devel/gettext
-   )
-"
-
-pkg_setup() {
-   if ! use gtk && ! use ncurses ; then
-   ewarn "gtk and ncurses are disabled."
-   ewarn "At least one of these use flags are needed to get a 
front-end."
-   ewarn "Only liblinphone is 

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

2018-06-20 Thread Pacho Ramos
commit: cd6c72933271b9158179bb858ca47012a169fc0f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Jun 20 16:49:44 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Jun 20 16:59:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6c7293

net-libs/libeXosip: Drop old/broken version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/libeXosip/Manifest   |  1 -
 net-libs/libeXosip/libeXosip-3.5.0.ebuild | 35 ---
 2 files changed, 36 deletions(-)

diff --git a/net-libs/libeXosip/Manifest b/net-libs/libeXosip/Manifest
index 4aa6ae16bf3..8124c27f3be 100644
--- a/net-libs/libeXosip/Manifest
+++ b/net-libs/libeXosip/Manifest
@@ -1,2 +1 @@
-DIST libeXosip2-3.5.0.tar.gz 472081 BLAKE2B 
8c50896ef448730538eddd1473d07562503620ee0ad71a4ad6d67ad6395d40f270fcb7b9e4535941ae4f4638209584ff865356b1ecddd7825c4dadde683e3681
 SHA512 
67e04cd53aedaa25f7fd9b79923e075ecc4773dff0b5fd0ce0db01ebf22c09da62c6a686bf9afd6c90e6f086ee24301736c1e0d95c8b98e062ff414ad8a20016
 DIST libeXosip2-4.0.0.tar.gz 526339 BLAKE2B 
d6edea14fc93ff7565eee33f50f56a4d0ff02d2a625828ec61f6187c1913bec48a1667df6e01e7abd0e28764e9b442b13ee34595d3ac89c50a1e44696beaaa26
 SHA512 
8e286e1e533c12bce26a164e42286c3239556860863a877438f63a694e47055f17fb98eb0f2ed91cac72f0645e8bf4dd9b922b5065357f16c0bacafc99406f51

diff --git a/net-libs/libeXosip/libeXosip-3.5.0.ebuild 
b/net-libs/libeXosip/libeXosip-3.5.0.ebuild
deleted file mode 100644
index 3f2fed0aaf0..000
--- a/net-libs/libeXosip/libeXosip-3.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV%.?}-${PV##*.}
-MY_PV=${PV}
-MY_P=${PN}2-${MY_PV}
-
-DESCRIPTION="library to use the SIP protocol for multimedia session 
establishement"
-HOMEPAGE="https://savannah.nongnu.org/projects/exosip/;
-SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="libressl +srv ssl"
-
-DEPEND=">=net-libs/libosip-3.2.0
-   

[gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/

2018-06-20 Thread Eray Aslan
commit: 5608e1eaa17788c083022c4b1a241dbed76d4dc3
Author: Eray Aslan  gentoo  org>
AuthorDate: Wed Jun 20 16:49:11 2018 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Wed Jun 20 16:49:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5608e1ea

mail-mta/postfix: bump to 3.4_pre20180620

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-mta/postfix/Manifest   | 2 +-
 .../{postfix-3.4_pre20180618.ebuild => postfix-3.4_pre20180620.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 886662aa9bc..9964b1d8383 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,5 +3,5 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 
6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 
132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7
 SHA512 
6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 
2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af
 SHA512 
081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 
065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11
 SHA512 
2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.4-20180618.tar.gz 4451945 BLAKE2B 
f0775e2eada3b7baebba77d494c450854d78f7c5aa039873feed57cc1222ef2a1e2b1535ae7b6dea945e70de2b97b3b078dda25ea5775c62bd37ca9f5eb3e155
 SHA512 
1e49821ddd7992db3e1f24563457bbd3428e9e20fcbddf29137527d37b4fcf5a3beccdfd3b1246b9df3636808d0a8ea1796546cab2e680c59f196bf6698a8987
+DIST postfix-3.4-20180620.tar.gz 4452362 BLAKE2B 
fbde05701d7e7d6803db89278961cb85db8eb3c64757d6d3fda3355477089d23bd3b7185cdb0006ccf12778613768125207284691ba654b648b1ae8b5a3a
 SHA512 
35e6c03f45fd94b031b20c5d23df1dc92c1eedd4ea3a03938629ca8ace83eadb6a666e2f2571ba384550ad7b3c3260c565c6d1bb04b1da187ee6469d88ecb8c1
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B 
d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536
 SHA512 
0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62

diff --git a/mail-mta/postfix/postfix-3.4_pre20180618.ebuild 
b/mail-mta/postfix/postfix-3.4_pre20180620.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.4_pre20180618.ebuild
rename to mail-mta/postfix/postfix-3.4_pre20180620.ebuild



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/ppc32/

2018-06-20 Thread Andreas Sturmlechner
commit: f65f2d8609843d69e69d8805af708fa3c88efd9d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 16:48:34 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 16:48:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65f2d86

profiles: ppc32: Stable-mask media-sound/pulseaudio[qt5]

Bug: https://bugs.gentoo.org/656704

 profiles/arch/powerpc/ppc32/package.use.stable.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask 
b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 08880aaf349..8f597f7a6cd 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner  (20 Jun 2018)
+# dev-python/PyQt5 is not stable.
+media-sound/pulseaudio qt5
+
 # Andreas Sturmlechner  (12 Jun 2018)
 # Requires not yet stable dev-qt/qtpositioning:5
 sci-astronomy/stellarium gps



[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/

2018-06-20 Thread Andreas Sturmlechner
commit: a10f0ceb43cd137a0783e5d702ed351a2281b318
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 16:29:55 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 16:30:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10f0ceb

app-office/scribus: Move 1.5.3 specific patches into tarball

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/scribus/Manifest|   1 +
 .../files/scribus-1.5.3-cmake-openssl.patch|  15 -
 .../scribus/files/scribus-1.5.3-poppler-0.58.patch | 534 -
 .../scribus/files/scribus-1.5.3-qt-5.11.patch  |  59 ---
 .../scribus/files/scribus-1.5.3-x86-fpic.patch |  16 -
 app-office/scribus/scribus-1.5.3-r1.ebuild |  11 +-
 6 files changed, 7 insertions(+), 629 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 5fa3548de6d..cbfcaf580cf 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
+DIST scribus-1.5.3.patches.tar.xz 5332 BLAKE2B 
3e7702da61a069887317505d86bc473a4d2d59be4bca894bbde41844029707dda7307f1d07033fde501da03097aed21dcf12991bb978df1156cb6654077a
 SHA512 
aeb8142eca826a3f9cbd25e8e2276a352f24fe65241a2fe737fd26597419ad9a7180b337f77fb6ba6ac83f378b235d38b1eb6fd85d10985d3a1dbd21bbe4773f
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B 
ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48
 SHA512 
487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 
3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669
 SHA512 
4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 
64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637
 SHA512 
7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403

diff --git a/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch 
b/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
deleted file mode 100644
index c2cb5e9dd58..000
--- a/app-office/scribus/files/scribus-1.5.3-cmake-openssl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix case of "OpenSSL" to match the case of the file shipped by 
cmake
-Author: Mattia Rizzolo 
-Last-Update: 2017-06-05
-
 a/cmake/modules/FindLIBPODOFO.cmake
-+++ b/cmake/modules/FindLIBPODOFO.cmake
-@@ -45,7 +45,7 @@
-   #message(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}")
-   set(LIBPODOFO_VERSION 
"${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING 
"PoDoFo version string")
-   if(LIBPODOFO_VERSION VERSION_GREATER "0.9.4")
--  find_package(OPENSSL)
-+  find_package(OpenSSL)
-   if (OPENSSL_FOUND)
-   message("OpenSSL found OK for installed version of 
PoDoFo (>= 0.9.5) - Enabling support for PDF embedded in AI")
-   set(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo 
found")

diff --git a/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch 
b/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
deleted file mode 100644
index 61f5552f959..000
--- a/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-From 61186c7ef083046b7e0c908952e8a773e2787d82 Mon Sep 17 00:00:00 2001
-From: Jean Ghali 
-Date: Fri, 8 Sep 2017 16:52:10 +
-Subject: [PATCH] #14979: poppler-0.58 breaks build
-
-git-svn-id: svn://scribus.net/trunk/Scribus@22154 
11d20701-8431-0410-a711-e3c959e3b870

- scribus/plugins/import/pdf/importpdf.cpp |  95 +++--
- scribus/plugins/import/pdf/slaoutput.cpp | 174 ++-
- 2 files changed, 258 insertions(+), 11 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp 
b/scribus/plugins/import/pdf/importpdf.cpp
-index 4c462beadd..1c0bd8a888 100644
 a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -22,6 +22,7 @@ for which a new license (GPL+exception) is in place.
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 
-@@ -59,6 +60,12 @@ for which a new license (GPL+exception) is in place.
- #include "ui/multiprogressdialog.h"
- #include "ui/propertiespalette.h"
- 
-+#define POPPLER_VERSION_ENCODE(major, minor, micro) ( \
-+((major) * 1) \
-+  + ((minor) *   100) \
-+  + ((micro) * 1))
-+#define POPPLER_ENCODED_VERSION 

[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/

2018-06-20 Thread Andreas Sturmlechner
commit: 402f130003a7d3ca58863ba2b8a9430f569f0d5e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 14:41:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 16:30:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402f1300

app-office/scribus: 1.5.4 version bump, fix build with poppler-0.64.0

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

 app-office/scribus/Manifest|  2 ++
 .../{scribus-.ebuild => scribus-1.5.4.ebuild}  | 36 ++
 app-office/scribus/scribus-.ebuild | 26 +---
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index deea45c88c3..5fa3548de6d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,3 @@
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B 
ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48
 SHA512 
487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
+DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 
3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669
 SHA512 
4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
+DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 
64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637
 SHA512 
7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403

diff --git a/app-office/scribus/scribus-.ebuild 
b/app-office/scribus/scribus-1.5.4.ebuild
similarity index 91%
copy from app-office/scribus/scribus-.ebuild
copy to app-office/scribus/scribus-1.5.4.ebuild
index 742448b2738..4a0a3138ca5 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -7,17 +7,16 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion 
xdg-utils
+inherit cmake-utils desktop eutils flag-o-matic gnome2-utils python-single-r1 
xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/;
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts 
templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print 
$2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| 
awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: 
:g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 
's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
@@ -49,8 +48,7 @@ REQUIRED_USE="
 
 # osg
 # couple of third_party libs bundled
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
app-text/libmspub
app-text/poppler:=
dev-libs/hyphen
@@ -88,14 +86,17 @@ COMMON_DEPEND="
tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
-   app-text/ghostscript-gpl"
+   app-text/ghostscript-gpl
+"
 DEPEND="${COMMON_DEPEND}
dev-qt/linguist-tools:5
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+   "${WORKDIR}"/${P}-poppler-0.64.0.patch # bug 656036
 )
 
 src_prepare() {
@@ -118,7 +119,10 @@ src_prepare() {
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-i resources/templates/CMakeLists.txt || die
 
-   edos2unix scribus/ui/propertiespalette_utils.cpp
+   # required for ${P}-poppler-0.64.0.patch
+   edos2unix \
+   scribus/plugins/import/pdf/slaoutput.{cpp,h} \
+   scribus/plugins/import/pdf/importpdf.{cpp,h}
 
cmake-utils_src_prepare
 }
@@ -164,18 +168,14 @@ src_configure() {
-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-DWANT_NOOSG="$(usex !osg)"
-DWANT_DEBUG="$(usex debug)"
-   -DWANT_NOHEADERINSTALL="$(usex minimal)"
+   -DWANT_HEADERINSTALL="$(usex !minimal)"
-DWANT_HUNSPELL="$(usex hunspell)"

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

2018-06-20 Thread Aric Belsito
commit: 814c0b26e277e387f48fbb957e9942a59fbc1c99
Author: Aric Belsito  gmail  com>
AuthorDate: Wed Jun 20 16:25:39 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Wed Jun 20 16:25:39 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=814c0b26

dev-libs/elfutils: version bump to 0.172

 dev-libs/elfutils/Manifest | 2 +-
 dev-libs/elfutils/{elfutils-0.171.ebuild => elfutils-0.172.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 625bc52..03b2e42 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,2 +1,2 @@
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 
03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06
 SHA512 
aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
-DIST elfutils-0.171.tar.bz2 8654558 BLAKE2B 
709b5a4090867ec536563ed31178f7fb820f6b0ca8fb7c379b9081fa0d0027c8c2904cf17e9ee36245dd1fea8d2853ee3e7af457167e007fb7b08eec2e921a30
 SHA512 
777be2d63ca9b11440bf358a33428d9ca974e2612a880934156c9f7194af596ed627c1ed2d48dbd47a3761c94913b8f39565f9dcb6b62c92bf229f04c96d5ee3
+DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 
7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce
 SHA512 
b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2

diff --git a/dev-libs/elfutils/elfutils-0.171.ebuild 
b/dev-libs/elfutils/elfutils-0.172.ebuild
similarity index 95%
rename from dev-libs/elfutils/elfutils-0.171.ebuild
rename to dev-libs/elfutils/elfutils-0.172.ebuild
index b42dcab..7561edd 100644
--- a/dev-libs/elfutils/elfutils-0.171.ebuild
+++ b/dev-libs/elfutils/elfutils-0.172.ebuild
@@ -34,8 +34,8 @@ src_prepare() {
default
# Add MUSL patches
epatch "${FILESDIR}"/${PN}-0.170-musl-obstack-fts.patch
-   epatch "${FILESDIR}"/${P}-musl-libs.patch
-   epatch "${FILESDIR}"/${P}-musl-utils.patch
+   epatch "${FILESDIR}"/${PN}-0.171-musl-libs.patch
+   epatch "${FILESDIR}"/${PN}-0.171-musl-utils.patch
 
eautoreconf
 



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

2018-06-20 Thread Lars Wendler
commit: 3cd2a2b440c58d5392a833dad8a718d2de292476
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 20 15:37:46 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 20 15:38:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd2a2b4

dev-libs/openssl: Bump to version 1.1.1_pre8. Removed old.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/openssl/Manifest  |  2 +-
 .../files/openssl-1.1.1_pre7-CVE-2018-0732.patch   | 39 --
 1_pre7-r1.ebuild => openssl-1.1.1_pre8.ebuild} |  5 +--
 3 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 0abab2d57a3..c8f76950a4e 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -10,4 +10,4 @@ DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 
11de1468855c0bb1836fb346c8efdfedd0613
 DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 
49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2ba15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad
 SHA512 
ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 
73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda
 SHA512 
90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
 DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B 
c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04
 SHA512 
fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-DIST openssl-1.1.1-pre7.tar.gz 8308876 BLAKE2B 
621cc6c541d81c2fa62e12eb75b62f1444af2bc1fcf001620515810700eacc3b36975a5b0c4764fed78c37ad1c9ad78b94f5115794b929626b085ccab15d9ab0
 SHA512 
38efa67b26e83a4dcb6da2d61d92b6be890535c61cec23d781d49efe66173fd9b9185b89ba50d591fed65f440417e16ba0738ffba58a684e48e8b82032ea36ff
+DIST openssl-1.1.1-pre8.tar.gz 8334954 BLAKE2B 
97cd018908925abd5a4eb660b3488b23efb582dd49dd87504e5522b2e9c5c6500417ef4893590a60ce35cfa316de51bfbf3e448e9cb2a5858ecd8ae72722922d
 SHA512 
33b20f8589e0ba67500993635e1ba7f7f7ce2b6fa1eb8d4d7c44711ff047045dde57ad7e0605377c2b030fc954a3fb9b1f1d68feac2080991ef2b1b72a761041

diff --git a/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch 
b/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch
deleted file mode 100644
index 6c336f2507a..000
--- a/dev-libs/openssl/files/openssl-1.1.1_pre7-CVE-2018-0732.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe Mon Sep 17 00:00:00 2001
-From: Guido Vranken 
-Date: Mon, 11 Jun 2018 19:38:54 +0200
-Subject: [PATCH] Reject excessively large primes in DH key generation.
-
-CVE-2018-0732
-
-Signed-off-by: Guido Vranken 
-
-Reviewed-by: Matthias St. Pierre 
-Reviewed-by: Viktor Dukhovni 
-Reviewed-by: Rich Salz 
-Reviewed-by: Matt Caswell 
-(Merged from https://github.com/openssl/openssl/pull/6457)

- crypto/dh/dh_key.c | 7 ++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
-index 6901548ed69..752542b5563 100644
 a/crypto/dh/dh_key.c
-+++ b/crypto/dh/dh_key.c
-@@ -78,10 +78,15 @@ static int generate_key(DH *dh)
- int ok = 0;
- int generate_new_key = 0;
- unsigned l;
--BN_CTX *ctx;
-+BN_CTX *ctx = NULL;
- BN_MONT_CTX *mont = NULL;
- BIGNUM *pub_key = NULL, *priv_key = NULL;
- 
-+if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
-+DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
-+return 0;
-+}
-+
- ctx = BN_CTX_new();
- if (ctx == NULL)
- goto err;

diff --git a/dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild 
b/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
similarity index 97%
rename from dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild
rename to dev-libs/openssl/openssl-1.1.1_pre8.ebuild
index d7246b0d043..3acbe2ea21f 100644
--- a/dev-libs/openssl/openssl-1.1.1_pre7-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
@@ -14,7 +14,7 @@ LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test 
tls-heartbeat vanilla zlib"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 
static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
@@ -36,7 +36,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-   

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/vmd/

2018-06-20 Thread Alexey Shvetsov
commit: a8911a91543c296a03ce97876bb058494bf71754
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Wed Jun 20 15:30:49 2018 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Wed Jun 20 15:30:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8911a91

sci-chemistry/vmd: Update metadata

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

 sci-chemistry/vmd/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/vmd/metadata.xml b/sci-chemistry/vmd/metadata.xml
index 1b24082830f..6bcabe5b79d 100644
--- a/sci-chemistry/vmd/metadata.xml
+++ b/sci-chemistry/vmd/metadata.xml
@@ -12,7 +12,7 @@
   
 Use nvidia cuda toolkit for speeding up 
computations
 Add support for TNG file format
-Add support for MSMS SAS calcualtion tool
+Add support for MSMS SES calcualtion tool
 Add support for povray raytracer for HQ
images
 Add support for tachyon raytracer for HQ images
   



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2018-06-20 Thread Andreas Sturmlechner
commit: 92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 18 20:44:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 14:30:49 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=92acfdf5

dev-qt/qtwebengine: Try to fix libxml2 disable-xml-catalogs

Thanks-to: Arfrever Frehtes Taifersar Arahesis  gmail.com>
Bug: https://bugs.gentoo.org/653078
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...webengine-5.11.1-libxml2-disable-catalogs.patch | 46 ++
 dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild   |  4 ++
 2 files changed, 50 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
new file mode 100644
index ..8ac5b90b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
@@ -0,0 +1,46 @@
+--- a/config.tests/xml2/xml2.cpp
 b/config.tests/xml2/xml2.cpp
+@@ -27,9 +27,6 @@
+ /
+ 
+ #include 
+-#if defined(LIBXML_CATALOG_ENABLED)
+-#error "libxml catalog enabled"
+-#endif
+ #if !defined(LIBXML_ICU_ENABLED)
+ #error "libxml icu not enabled"
+ #endif
+--- 
a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
 
b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
+@@ -28,6 +28,10 @@
+ 
+ #include 
+ #include 
++#include 
++#if defined(LIBXML_CATALOG_ENABLED)
++#include 
++#endif
+ #include 
+ #include 
+ #include "core/css/StyleEngine.h"
+@@ -538,10 +542,6 @@
+ static bool ShouldAllowExternalLoad(const KURL& url) {
+   String url_string = url.GetString();
+ 
+-  // libxml should not be configured with catalogs enabled, so it
+-  // should not be asking to load default catalogs.
+-  CHECK(!IsLibxmlDefaultCatalogFile(url));
+-
+   // The most common DTD. There isn't much point in hammering www.w3c.org by
+   // requesting this URL for every XHTML document.
+   if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml;))
+@@ -646,6 +646,9 @@
+   if (did_init)
+ return;
+ 
++#if defined(LIBXML_CATALOG_ENABLED)
++  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
++#endif
+   xmlInitParser();
+   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
+   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index b98972ea..150c23c4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -79,6 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES+=(
+   "${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
+)
+
 src_prepare() {
use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2018-06-20 Thread Andreas Sturmlechner
commit: 938edc9a6b2179e4aabcf5ab340ebd64d90a77d1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 18 21:05:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 14:30:49 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=938edc9a

dev-qt/qtwebengine: Disable GPU when using nouveau

One upstream backport, the other one kindly borrowed from opensuse
(disable-gpu-when-using-nouveau-boo-1005323.diff).

Bug: https://bugs.gentoo.org/609752
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...-5.11.1-eglGetProcAddress-fallback-lookup.patch | 68 +++
 .../qtwebengine-5.11.1-nouveau-disable-gpu.patch   | 98 ++
 dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild   |  2 +
 3 files changed, 168 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
new file mode 100644
index ..4b2676fa
--- /dev/null
+++ 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
@@ -0,0 +1,68 @@
+From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo 
+Date: Mon, 11 Jun 2018 16:16:55 +0300
+Subject: Add fallback lookup for eglGetProcAddress
+
+Use the GLContext to find address for eglGetProcAddress symbol, if it's
+not found with dlopen.
+
+Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85
+Reviewed-by: Michal Klocek 
+---
+ src/core/gl_context_qt.cpp | 11 +++
+ src/core/gl_context_qt.h   |  1 +
+ src/core/gl_surface_qt.cpp |  4 
+ 3 files changed, 16 insertions(+)
+
+diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
+index 9ed1db8b..95491709 100644
+--- a/src/core/gl_context_qt.cpp
 b/src/core/gl_context_qt.cpp
+@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress()
+ return get_proc_address;
+ }
+ 
++QFunctionPointer GLContextHelper::getEglGetProcAddress()
++{
++ QFunctionPointer get_proc_address = nullptr;
++#ifndef QT_NO_OPENGL
++if (QOpenGLContext *context = qt_gl_global_share_context()) {
++get_proc_address = context->getProcAddress("eglGetProcAddress");
++}
++#endif
++return get_proc_address;
++}
++
+ QT_END_NAMESPACE
+ 
+ #if defined(USE_OZONE) || defined(OS_WIN)
+diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
+index 8ffdad58..cecceabc 100644
+--- a/src/core/gl_context_qt.h
 b/src/core/gl_context_qt.h
+@@ -63,6 +63,7 @@ public:
+ static void* getXDisplay();
+ static void* getNativeDisplay();
+ static QFunctionPointer getGlXGetProcAddress();
++static QFunctionPointer getEglGetProcAddress();
+ private:
+ Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, 
gl::GLSurface* surface, gl::GLContextAttribs attribs);
+ 
+diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
+index 7e579246..4d38d7c2 100644
+--- a/src/core/gl_surface_qt.cpp
 b/src/core/gl_surface_qt.cpp
+@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation 
implementation) {
+   base::GetFunctionPointerFromNativeLibrary(library,
+ "eglGetProcAddress"));
+   if (!get_proc_address) {
++  QFunctionPointer address = GLContextHelper::getEglGetProcAddress();
++  get_proc_address = 
reinterpret_cast(address);
++  }
++  if (!get_proc_address) {
+ LOG(ERROR) << "eglGetProcAddress not found.";
+ base::UnloadNativeLibrary(library);
+ return false;
+-- 
+cgit v1.1-6-g87c4
+

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
new file mode 100644
index ..aaf3aae4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
@@ -0,0 +1,98 @@
+From: Antonio Larrosa 
+Subject: Disable GPU when using nouveau or running on wayland
+References: boo#1005323, boo#1060990
+
+Qt WebEngine uses multi-threaded OpenGL, which nouveau does not support.
+It also crashes when running on wayland, the cause is not yet known.
+Work around these issues by not doing GPU-accelerated rendering in such
+cases.
+
+Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+===
+--- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp
 qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+@@ -100,6 +100,7 @@
+ #include 
+ #ifndef QT_NO_OPENGL
+ # include 
++# include 
+ #endif
+ #include 
+ #include 
+@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v
+ }
+ #endif
+ 
++#ifndef QT_NO_OPENGL
++QString openGLVendor()
++{
++QString vendor;
++
++QOpenGLContext *oldContext = QOpenGLContext::currentContext();
++QSurface 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtpositioning/, dev-qt/qtwidgets/, dev-qt/qtwebsockets/, ...

2018-06-20 Thread Andreas Sturmlechner
commit: bc84cfd11c78aac61e2bee2a67e9dbdc957a0fbe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 18 20:30:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 14:30:49 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc84cfd1

dev-qt: Drop Qt 5.11.0

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

 dev-qt/assistant/Manifest  |   1 -
 dev-qt/assistant/assistant-5.11.0.ebuild   |  55 -
 dev-qt/designer/Manifest   |   1 -
 dev-qt/designer/designer-5.11.0.ebuild |  57 --
 dev-qt/linguist-tools/Manifest |   1 -
 dev-qt/linguist-tools/linguist-tools-5.11.0.ebuild |  35 
 dev-qt/linguist/Manifest   |   1 -
 dev-qt/linguist/linguist-5.11.0.ebuild |  48 -
 dev-qt/pixeltool/Manifest  |   1 -
 dev-qt/pixeltool/pixeltool-5.11.0.ebuild   |  25 ---
 dev-qt/qdbus/Manifest  |   1 -
 dev-qt/qdbus/qdbus-5.11.0.ebuild   |  25 ---
 dev-qt/qdbusviewer/Manifest|   1 -
 dev-qt/qdbusviewer/qdbusviewer-5.11.0.ebuild   |  45 -
 dev-qt/qdoc/Manifest   |   1 -
 dev-qt/qdoc/qdoc-5.11.0.ebuild |  37 
 dev-qt/qt3d/Manifest   |   1 -
 dev-qt/qt3d/qt3d-5.11.0.ebuild |  32 ---
 dev-qt/qtbluetooth/Manifest|   1 -
 dev-qt/qtbluetooth/qtbluetooth-5.11.0.ebuild   |  33 ---
 dev-qt/qtcharts/Manifest   |   1 -
 dev-qt/qtcharts/qtcharts-5.11.0.ebuild |  29 ---
 dev-qt/qtconcurrent/Manifest   |   1 -
 dev-qt/qtconcurrent/qtconcurrent-5.11.0.ebuild |  23 ---
 dev-qt/qtcore/Manifest |   1 -
 .../qtcore-5.11.0-restore-qt5_use_modules.patch| 224 -
 dev-qt/qtcore/qtcore-5.11.0.ebuild |  77 ---
 dev-qt/qtdatavis3d/Manifest|   1 -
 dev-qt/qtdatavis3d/qtdatavis3d-5.11.0.ebuild   |  31 ---
 dev-qt/qtdbus/Manifest |   1 -
 dev-qt/qtdbus/qtdbus-5.11.0.ebuild |  43 
 dev-qt/qtdeclarative/Manifest  |   1 -
 dev-qt/qtdeclarative/qtdeclarative-5.11.0.ebuild   |  64 --
 dev-qt/qtdiag/Manifest |   1 -
 dev-qt/qtdiag/qtdiag-5.11.0.ebuild |  36 
 dev-qt/qtgraphicaleffects/Manifest |   1 -
 .../qtgraphicaleffects-5.11.0.ebuild   |  21 --
 dev-qt/qtgui/Manifest  |   1 -
 dev-qt/qtgui/qtgui-5.11.0.ebuild   | 170 
 dev-qt/qthelp/Manifest |   1 -
 dev-qt/qthelp/qthelp-5.11.0.ebuild |  30 ---
 dev-qt/qtimageformats/Manifest |   1 -
 dev-qt/qtimageformats/qtimageformats-5.11.0.ebuild |  29 ---
 dev-qt/qtlocation/Manifest |   1 -
 dev-qt/qtlocation/qtlocation-5.11.0.ebuild |  44 
 dev-qt/qtmultimedia/Manifest   |   1 -
 dev-qt/qtmultimedia/qtmultimedia-5.11.0.ebuild |  68 ---
 dev-qt/qtnetwork/Manifest  |   1 -
 dev-qt/qtnetwork/qtnetwork-5.11.0.ebuild   |  57 --
 dev-qt/qtnetworkauth/Manifest  |   1 -
 dev-qt/qtnetworkauth/qtnetworkauth-5.11.0.ebuild   |  20 --
 dev-qt/qtopengl/Manifest   |   1 -
 dev-qt/qtopengl/qtopengl-5.11.0.ebuild |  34 
 dev-qt/qtpaths/Manifest|   1 -
 dev-qt/qtpaths/qtpaths-5.11.0.ebuild   |  23 ---
 dev-qt/qtplugininfo/Manifest   |   1 -
 dev-qt/qtplugininfo/qtplugininfo-5.11.0.ebuild |  23 ---
 dev-qt/qtpositioning/Manifest  |   1 -
 dev-qt/qtpositioning/qtpositioning-5.11.0.ebuild   |  40 
 dev-qt/qtprintsupport/Manifest |   1 -
 dev-qt/qtprintsupport/qtprintsupport-5.11.0.ebuild |  42 
 dev-qt/qtquickcontrols/Manifest|   1 -
 .../qtquickcontrols/qtquickcontrols-5.11.0.ebuild  |  32 ---
 dev-qt/qtquickcontrols2/Manifest   |   1 -
 .../qtquickcontrols2-5.11.0.ebuild |  30 ---
 dev-qt/qtscript/Manifest   |   1 -
 dev-qt/qtscript/qtscript-5.11.0.ebuild |  36 
 dev-qt/qtscxml/Manifest|   1 -
 dev-qt/qtscxml/qtscxml-5.11.0.ebuild   |  19 --
 dev-qt/qtsensors/Manifest  |   1 -
 dev-qt/qtsensors/qtsensors-5.11.0.ebuild   |  28 ---
 dev-qt/qtserialbus/Manifest|   1 -
 dev-qt/qtserialbus/qtserialbus-5.11.0.ebuild   |  20 --
 dev-qt/qtserialport/Manifest   |   1 -
 

[gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qtdiag/, dev-qt/qtwebsockets/, ...

2018-06-20 Thread Andreas Sturmlechner
commit: dfe7d7d9c4991078746d7804ae290bcd505934e6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 18 20:26:40 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 14:30:49 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dfe7d7d9

dev-qt: Qt 5.11.1 version bump

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

 dev-qt/assistant/Manifest  |   1 +
 dev-qt/assistant/assistant-5.11.1.ebuild   |  55 +++
 dev-qt/designer/Manifest   |   1 +
 dev-qt/designer/designer-5.11.1.ebuild |  57 +++
 dev-qt/linguist-tools/Manifest |   1 +
 dev-qt/linguist-tools/linguist-tools-5.11.1.ebuild |  35 +
 dev-qt/linguist/Manifest   |   1 +
 dev-qt/linguist/linguist-5.11.1.ebuild |  48 ++
 dev-qt/pixeltool/Manifest  |   1 +
 dev-qt/pixeltool/pixeltool-5.11.1.ebuild   |  25 +++
 dev-qt/qdbus/Manifest  |   1 +
 dev-qt/qdbus/qdbus-5.11.1.ebuild   |  25 +++
 dev-qt/qdbusviewer/Manifest|   1 +
 dev-qt/qdbusviewer/qdbusviewer-5.11.1.ebuild   |  45 ++
 dev-qt/qdoc/Manifest   |   1 +
 dev-qt/qdoc/qdoc-5.11.1.ebuild |  37 +
 dev-qt/qt3d/Manifest   |   1 +
 dev-qt/qt3d/qt3d-5.11.1.ebuild |  32 
 dev-qt/qtbluetooth/Manifest|   1 +
 dev-qt/qtbluetooth/qtbluetooth-5.11.1.ebuild   |  33 
 dev-qt/qtcharts/Manifest   |   1 +
 dev-qt/qtcharts/qtcharts-5.11.1.ebuild |  29 
 dev-qt/qtconcurrent/Manifest   |   1 +
 dev-qt/qtconcurrent/qtconcurrent-5.11.1.ebuild |  23 +++
 dev-qt/qtcore/Manifest |   1 +
 dev-qt/qtcore/qtcore-5.11.1.ebuild |  75 +
 dev-qt/qtdatavis3d/Manifest|   1 +
 dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild   |  31 
 dev-qt/qtdbus/Manifest |   1 +
 dev-qt/qtdbus/qtdbus-5.11.1.ebuild |  43 ++
 dev-qt/qtdeclarative/Manifest  |   1 +
 dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild   |  64 
 dev-qt/qtdiag/Manifest |   1 +
 dev-qt/qtdiag/qtdiag-5.11.1.ebuild |  36 +
 dev-qt/qtgraphicaleffects/Manifest |   1 +
 .../qtgraphicaleffects-5.11.1.ebuild   |  21 +++
 dev-qt/qtgui/Manifest  |   1 +
 dev-qt/qtgui/qtgui-5.11.1.ebuild   | 170 +
 dev-qt/qthelp/Manifest |   1 +
 dev-qt/qthelp/qthelp-5.11.1.ebuild |  30 
 dev-qt/qtimageformats/Manifest |   1 +
 dev-qt/qtimageformats/qtimageformats-5.11.1.ebuild |  29 
 dev-qt/qtlocation/Manifest |   1 +
 dev-qt/qtlocation/qtlocation-5.11.1.ebuild |  44 ++
 dev-qt/qtmultimedia/Manifest   |   1 +
 dev-qt/qtmultimedia/qtmultimedia-5.11.1.ebuild |  68 +
 dev-qt/qtnetwork/Manifest  |   1 +
 dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild   |  57 +++
 dev-qt/qtnetworkauth/Manifest  |   1 +
 dev-qt/qtnetworkauth/qtnetworkauth-5.11.1.ebuild   |  20 +++
 dev-qt/qtopengl/Manifest   |   1 +
 dev-qt/qtopengl/qtopengl-5.11.1.ebuild |  34 +
 dev-qt/qtpaths/Manifest|   1 +
 dev-qt/qtpaths/qtpaths-5.11.1.ebuild   |  23 +++
 dev-qt/qtplugininfo/Manifest   |   1 +
 dev-qt/qtplugininfo/qtplugininfo-5.11.1.ebuild |  23 +++
 dev-qt/qtpositioning/Manifest  |   1 +
 dev-qt/qtpositioning/qtpositioning-5.11.1.ebuild   |  40 +
 dev-qt/qtprintsupport/Manifest |   1 +
 dev-qt/qtprintsupport/qtprintsupport-5.11.1.ebuild |  42 +
 dev-qt/qtquickcontrols/Manifest|   1 +
 .../qtquickcontrols/qtquickcontrols-5.11.1.ebuild  |  32 
 dev-qt/qtquickcontrols2/Manifest   |   1 +
 .../qtquickcontrols2-5.11.1.ebuild |  30 
 dev-qt/qtscript/Manifest   |   1 +
 dev-qt/qtscript/qtscript-5.11.1.ebuild |  36 +
 dev-qt/qtscxml/Manifest|   1 +
 dev-qt/qtscxml/qtscxml-5.11.1.ebuild   |  19 +++
 dev-qt/qtsensors/Manifest  |   1 +
 dev-qt/qtsensors/qtsensors-5.11.1.ebuild   |  28 
 dev-qt/qtserialbus/Manifest|   1 +
 dev-qt/qtserialbus/qtserialbus-5.11.1.ebuild   |  20 +++
 dev-qt/qtserialport/Manifest   |   1 +
 dev-qt/qtserialport/qtserialport-5.11.1.ebuild |  

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2018-06-20 Thread Andreas Sturmlechner
commit: 32b1948b8e17cba3c717c8a5692c24c887894003
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 18 20:53:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 14:30:49 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=32b1948b

dev-qt/qtwebengine: Fix build with ffmpeg-4

Patch kindly borrowed from opensuse.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/qtwebengine-5.11.1-ffmpeg4.patch | 32 ++
 dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
new file mode 100644
index ..e9ef452a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
@@ -0,0 +1,32 @@
+From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
+From: Xiaohan Wang 
+Date: Mon, 29 Jan 2018 21:28:28 +
+Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64
+
+AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg:
+https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5
+
+BUG=777484
+
+Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db
+Reviewed-on: https://chromium-review.googlesource.com/889686
+Reviewed-by: Dale Curtis 
+Commit-Queue: Xiaohan Wang 
+Cr-Commit-Position: refs/heads/master@{#532593}
+---
+ src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h 
b/src/3rdparty/chromium/media/base/decoder_buffer.h
+index 0341e5784f725..60ffba708b0e5 100644
+--- a/src/3rdparty/chromium/media/base/decoder_buffer.h
 b/src/3rdparty/chromium/media/base/decoder_buffer.h
+@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
+ : public base::RefCountedThreadSafe {
+  public:
+   enum {
+-kPaddingSize = 32,
++kPaddingSize = 64,
+ #if defined(ARCH_CPU_ARM_FAMILY)
+ kAlignmentSize = 16
+ #else

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index 150c23c4..9c54aa9e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
 
 PATCHES+=(
"${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
+   "${FILESDIR}/${P}-ffmpeg4.patch"
 )
 
 src_prepare() {



[gentoo-commits] proj/openrc:master commit in: src/rc/

2018-06-20 Thread William Hubbs
commit: 64354831da2adeba5cb2f91a81fa0f56e1ce4ed9
Author: William Hubbs  gmail  com>
AuthorDate: Wed Jun 20 14:37:20 2018 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jun 20 14:37:20 2018 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=64354831

openrc: convert snprintf calls to xasprintf

 src/rc/rc.c | 40 
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/rc/rc.c b/src/rc/rc.c
index f613b5b6..c6e453b3 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -101,7 +101,6 @@ clean_failed(void)
 {
DIR *dp;
struct dirent *d;
-   size_t l;
char *path;
 
/* Clean the failed services state dir now */
@@ -112,16 +111,11 @@ clean_failed(void)
(d->d_name[1] == '.' && d->d_name[2] == '\0')))
continue;
 
-   l = strlen(RC_SVCDIR "/failed/") +
-   strlen(d->d_name) + 1;
-   path = xmalloc(sizeof(char) * l);
-   snprintf(path, l, RC_SVCDIR "/failed/%s", d->d_name);
-   if (path) {
-   if (unlink(path))
-   eerror("%s: unlink `%s': %s",
-   applet, path, strerror(errno));
-   free(path);
-   }
+   xasprintf(, RC_SVCDIR "/failed/%s", d->d_name);
+   if (unlink(path))
+   eerror("%s: unlink `%s': %s",
+   applet, path, strerror(errno));
+   free(path);
}
closedir(dp);
}
@@ -391,7 +385,7 @@ static void
 handle_signal(int sig)
 {
int serrno = errno;
-   char signame[10] = { '\0' };
+   char *signame = NULL;
pid_t pid;
RC_PID *pi;
int status = 0;
@@ -422,16 +416,16 @@ handle_signal(int sig)
break;
 
case SIGINT:
-   if (!signame[0])
-   snprintf(signame, sizeof(signame), "SIGINT");
+   if (!signame)
+   xasprintf(, "SIGINT");
/* FALLTHROUGH */
case SIGTERM:
-   if (!signame[0])
-   snprintf(signame, sizeof(signame), "SIGTERM");
+   if (!signame)
+   xasprintf(, "SIGTERM");
/* FALLTHROUGH */
case SIGQUIT:
-   if (!signame[0])
-   snprintf(signame, sizeof(signame), "SIGQUIT");
+   if (!signame)
+   xasprintf(, "SIGQUIT");
eerrorx("%s: caught %s, aborting", applet, signame);
/* NOTREACHED */
case SIGUSR1:
@@ -512,14 +506,11 @@ runlevel_config(const char *service, const char *level)
 {
char *init = rc_service_resolve(service);
char *conf, *dir;
-   size_t l;
bool retval;
 
dir = dirname(init);
dir = dirname(init);
-   l = strlen(dir) + strlen(level) + strlen(service) + 10;
-   conf = xmalloc(sizeof(char) * l);
-   snprintf(conf, l, "%s/conf.d/%s.%s", dir, service, level);
+   xasprintf(, "%s/conf.d/%s.%s", dir, service, level);
retval = exists(conf);
free(conf);
free(init);
@@ -744,7 +735,7 @@ int main(int argc, char **argv)
bool going_down = false;
int depoptions = RC_DEP_STRICT | RC_DEP_TRACE;
char *krunlevel = NULL;
-   char pidstr[10];
+   char *pidstr = NULL;
int opt;
bool parallel;
int regen = 0;
@@ -844,8 +835,9 @@ int main(int argc, char **argv)
setenv("EINFO_LOG", "openrc", 1);
 
/* Export our PID */
-   snprintf(pidstr, sizeof(pidstr), "%d", getpid());
+   xasprintf(, "%d", getpid());
setenv("RC_PID", pidstr, 1);
+   free(pidstr);
 
/* Create a list of all services which should be started for the new or
* current runlevel including those in boot, sysinit and hotplugged



[gentoo-commits] repo/gentoo:master commit in: media-libs/gst-plugins-bad/

2018-06-20 Thread Mart Raudsepp
commit: 4f610617e9cdb7cb1ca0fbfaa90770efad198a79
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Jun 20 14:37:19 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Jun 20 14:37:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f610617

media-libs/gst-plugins-bad: fix openglmixers plugin enabling

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...gins-bad-1.14.1.ebuild => gst-plugins-bad-1.14.1-r1.ebuild} | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1.ebuild 
b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
similarity index 93%
rename from media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1.ebuild
rename to media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
index 06fc61a66a5..715840165ea 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
@@ -47,6 +47,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+   local myconf=()
+   if use opengl || use gles2; then
+   myconf+=( --enable-gl )
+   else
+   myconf+=( --disable-gl )
+   fi
+
# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra 
deps
gstreamer_multilib_src_configure \
$(multilib_native_use_enable introspection) \
@@ -59,7 +66,8 @@ multilib_src_configure() {
--disable-debug \
--without-player-tests \
--enable-shm \
-   --enable-ipcpipeline
+   --enable-ipcpipeline \
+   "${myconf[@]}"
 
if multilib_is_native_abi; then
local x



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

2018-06-20 Thread Mike Gilbert
commit: 726cef6410601724a8397816ff98944429e6d56e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jun 20 13:58:48 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jun 20 13:58:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726cef64

chromium-2.eclass: remove .pak.info files

 eclass/chromium-2.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index 64f5ee9bc83..712e44afc31 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -77,6 +77,7 @@ chromium_remove_language_paks() {
 
# Bug 588198
rm -f fake-bidi.pak || die
+   rm -f fake-bidi.pak.info || die
 
# Look for extra pak files.
# Remove pak files that the user does not want.
@@ -94,6 +95,7 @@ chromium_remove_language_paks() {
 
if ! use l10n_${lang}; then
rm "${pak}" || die
+   rm -f "${pak}.info" || die
fi
done
 }



[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/

2018-06-20 Thread Mike Gilbert
commit: e6f520f2cdff24e23a3f34c99db6ef73f6bffe43
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jun 20 14:00:14 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jun 20 14:00:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f520f2

www-client/chromium: dev channel bump (69.0.3464.0)

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

 www-client/chromium/Manifest   |   1 +
 www-client/chromium/chromium-69.0.3464.0.ebuild| 689 +
 .../chromium/files/chromium-compiler-r3.patch  | 182 ++
 3 files changed, 872 insertions(+)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4291e80c9bb..53086e16a0c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,3 +2,4 @@ DIST chromium-67.0.3396.87.tar.xz 591491608 BLAKE2B 
9069c4b2e000e180a9b21bbdbb67
 DIST chromium-68.0.3440.17.tar.xz 624240248 BLAKE2B 
9322f731efbc218dbefec351984f93bac5deedee3cc5ce426a619262d885097f28d8532a3d5b55e8daacd2c28dee2dd85dd4063687cbc7ed7d125d2a2a48f885
 SHA512 
1a6af7c5f3bfe87b37844c9d863f512aa464de75252487877d7796fa0dc246a533357086c64701f624809493eef97fced23d3eaa449819b38ce6038227015d35
 DIST chromium-68.0.3440.25.tar.xz 624353904 BLAKE2B 
8ed052e5ad831499367ef1e6d40d08bb585e49855f4c6b820d5532c96f240ad312e66484b75b5b8398e737e2400b7ff1f9edd944b5f6a16d81ace019f6dd0952
 SHA512 
c82436dc42dd9ee1b87881d617f6c791a9dc04d85bb1d4588a3cf31009edd8aeb9d89c357581f705e3602580be1d70ab5fd85f629abf7c7f647fa8a5f06f3add
 DIST chromium-69.0.3452.0.tar.xz 627961940 BLAKE2B 
d7e910c746f485595e180b2733ac6bd012ef2a58b72107ce7e8f0a2d30a3b1fa1274b93a607cd05e9a86d4f68520af1cbe5b97b828a9d9d5dd6fde0837995880
 SHA512 
3dc005c8c93eced4275e5baf01e17582c95e4278a4497d2e1f0c95ab0dc426753bb6a6440d1cc654847d58524f01e4edd2a24f90c54e4202e96bb68b2b127df8
+DIST chromium-69.0.3464.0.tar.xz 634891812 BLAKE2B 
2cff114b4c6af03d3a6bc79df68876d38d9d8cc972faed2d3d0a3c565911fb2d32e467a4cff1ca8d5c234fece983ab1bb1b5be12bfdc1041d823fde645050f7e
 SHA512 
d14414be553faa9d327dbb9348edcbc755f7f8346825c5144e65a25acb21eec07c34713180ed5701830ccadda99c171e279ae40a620c9babd187d0d093c8a87b

diff --git a/www-client/chromium/chromium-69.0.3464.0.ebuild 
b/www-client/chromium/chromium-69.0.3464.0.ebuild
new file mode 100644
index 000..51df6a8dbe6
--- /dev/null
+++ b/www-client/chromium/chromium-69.0.3464.0.ebuild
@@ -0,0 +1,689 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB 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 check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib 
ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 
toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/;
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon 
pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu 
+system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+   app-accessibility/at-spi2-atk:2
+   app-arch/bzip2:=
+   cups? ( >=net-print/cups-1.3.11:= )
+   dev-libs/atk
+   dev-libs/expat:=
+   dev-libs/glib:2
+   system-icu? ( >=dev-libs/icu-59:= )
+   >=dev-libs/libxml2-2.9.4-r3:=[icu]
+   dev-libs/libxslt:=
+   dev-libs/nspr:=
+   >=dev-libs/nss-3.26:=
+   >=dev-libs/re2-0.2016.05.01:=
+   gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+   >=media-libs/alsa-lib-1.0.19:=
+   media-libs/fontconfig:=
+   media-libs/freetype:=
+   >=media-libs/harfbuzz-1.6.0:=[icu(-)]
+   media-libs/libjpeg-turbo:=
+   media-libs/libpng:=
+   system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+   >=media-libs/openh264-1.6.0:=
+   pulseaudio? ( media-sound/pulseaudio:= )
+   system-ffmpeg? (
+   >=media-video/ffmpeg-4:=
+   || (
+   media-video/ffmpeg[-samba]
+   >=net-fs/samba-4.5.10-r1[-debug(-)]
+   )
+   !=net-fs/samba-4.5.12
+   media-libs/opus:=
+   )
+   sys-apps/dbus:=
+   sys-apps/pciutils:=
+   virtual/udev
+   x11-libs/cairo:=
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3[X]
+   x11-libs/libX11:=
+   x11-libs/libXcomposite:=
+   x11-libs/libXcursor:=
+   x11-libs/libXdamage:=
+   x11-libs/libXext:=
+   x11-libs/libXfixes:=
+   >=x11-libs/libXi-1.6.0:=
+   

[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-vfs-sftp/

2018-06-20 Thread Craig Andrews
commit: 8c00ffc3d65086931ee4823fddbe90942765b671
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jun 20 13:50:41 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Jun 20 13:50:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c00ffc3

media-plugins/kodi-vfs-sftp: SFTP VFS addon for Kodi

Adds support for SFTP to Kodi.
This functionality was originally part of Kodi itself, but was removed in Kodi 
18.

See https://github.com/xbmc/xbmc/pull/12005

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../kodi-vfs-sftp/kodi-vfs-sftp-.ebuild| 34 ++
 media-plugins/kodi-vfs-sftp/metadata.xml   | 12 
 2 files changed, 46 insertions(+)

diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-.ebuild 
b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-.ebuild
new file mode 100644
index 000..b84c71c0291
--- /dev/null
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="SFTP VFS addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/vfs.sftp;
+SRC_URI=""
+
+case ${PV} in
+)
+   SRC_URI=""
+   EGIT_REPO_URI="git://github.com/notspiff/vfs.sftp.git"
+   inherit git-r3
+   ;;
+*)
+   KEYWORDS="~amd64 ~x86"
+   SRC_URI="https://github.com/notspiff/vfs.sftp/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/vfs.sftp-${PV}"
+   ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+   =dev-libs/libplatform-2*
+   net-libs/libssh[sftp]
+   =media-libs/kodi-platform-
+   =media-tv/kodi-
+   "

diff --git a/media-plugins/kodi-vfs-sftp/metadata.xml 
b/media-plugins/kodi-vfs-sftp/metadata.xml
new file mode 100644
index 000..43113e6d73d
--- /dev/null
+++ b/media-plugins/kodi-vfs-sftp/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+candr...@gentoo.org
+Craig Andrews
+
+SFTP VFS addon for Kodi
+
+notspiff/vfs.sftp
+
+



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

2018-06-20 Thread Craig Andrews
commit: 847dd82a0e2310970884013db3aa83c34a1380ed
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Jun 20 13:50:32 2018 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Jun 20 13:50:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847dd82a

media-tv/kodi: remove sftp use flag on - ebuild

See https://github.com/xbmc/xbmc/pull/12005

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-tv/kodi/kodi-.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-tv/kodi/kodi-.ebuild b/media-tv/kodi/kodi-.ebuild
index 75650d947f2..b7c96d71f19 100644
--- a/media-tv/kodi/kodi-.ebuild
+++ b/media-tv/kodi/kodi-.ebuild
@@ -28,7 +28,7 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms 
libressl libusb lirc mysql nfs +opengl pulseaudio samba sftp systemd 
+system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X 
+xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms 
libressl libusb lirc mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg 
test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
 REQUIRED_USE="
${PYTHON_REQUIRED_USE}
gbm? ( gles )
@@ -84,7 +84,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
libressl? ( dev-libs/libressl:0= )
pulseaudio? ( media-sound/pulseaudio )
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-   sftp? ( net-libs/libssh[sftp] )
>=sys-libs/zlib-1.2.11
udev? ( virtual/udev )
vaapi? (
@@ -245,7 +244,6 @@ src_configure() {
-DENABLE_PLIST=$(usex airplay)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_SMBCLIENT=$(usex samba)
-   -DENABLE_SSH=$(usex sftp)
-DENABLE_UDEV=$(usex udev)
-DENABLE_UPNP=$(usex upnp)
-DENABLE_VAAPI=$(usex vaapi)



[gentoo-commits] proj/kde:master commit in: kde-frameworks/kcodecs/

2018-06-20 Thread Andreas Sturmlechner
commit: 1ab30bdbd1b46262d545a40b4cdc4e7a910bd9a8
Author: Matija Skala  gmx  com>
AuthorDate: Mon Jun 18 19:49:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:20:43 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ab30bdb

kde-frameworks/kcodecs: Add missing DEPEND

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

 kde-frameworks/kcodecs/kcodecs-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kcodecs/kcodecs-.ebuild 
b/kde-frameworks/kcodecs/kcodecs-.ebuild
index fe83462291..13d1f32606 100644
--- a/kde-frameworks/kcodecs/kcodecs-.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-.ebuild
@@ -10,4 +10,7 @@ LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS=""
 IUSE="nls"
 
-DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
+DEPEND="
+   dev-util/gperf
+   nls? ( $(add_qt_dep linguist-tools) )
+"



[gentoo-commits] proj/kde:master commit in: kde-apps/korganizer/

2018-06-20 Thread Andreas Sturmlechner
commit: f96db914722e5fa6a5771f54a8e9f6781f5e019c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 13:02:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:14:04 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f96db914

kde-apps/korganizer: Drop obsolete cmake option

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

 kde-apps/korganizer/korganizer-18.04.49..ebuild | 1 -
 kde-apps/korganizer/korganizer-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/korganizer/korganizer-18.04.49..ebuild 
b/kde-apps/korganizer/korganizer-18.04.49..ebuild
index cb315ee142..50ed5b49c7 100644
--- a/kde-apps/korganizer/korganizer-18.04.49..ebuild
+++ b/kde-apps/korganizer/korganizer-18.04.49..ebuild
@@ -80,7 +80,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package X Qt5X11Extras)
$(cmake-utils_use_find_package X X11)
)
 

diff --git a/kde-apps/korganizer/korganizer-.ebuild 
b/kde-apps/korganizer/korganizer-.ebuild
index cb315ee142..50ed5b49c7 100644
--- a/kde-apps/korganizer/korganizer-.ebuild
+++ b/kde-apps/korganizer/korganizer-.ebuild
@@ -80,7 +80,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package X Qt5X11Extras)
$(cmake-utils_use_find_package X X11)
)
 



[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kcodecs/

2018-06-20 Thread Andreas Sturmlechner
commit: ab45c24989c237ce7e2f31192ef92bb19860fe89
Author: Matija Skala  gmx  com>
AuthorDate: Mon Jun 18 19:49:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:10:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab45c249

kde-frameworks/kcodecs: Add missing DEPEND

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

 kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild | 5 -
 kde-frameworks/kcodecs/kcodecs-5.47.0.ebuild | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild 
b/kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild
index e6408b0c110..092e59a458f 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.46.0.ebuild
@@ -10,4 +10,7 @@ LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
-DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
+DEPEND="
+   dev-util/gperf
+   nls? ( $(add_qt_dep linguist-tools) )
+"

diff --git a/kde-frameworks/kcodecs/kcodecs-5.47.0.ebuild 
b/kde-frameworks/kcodecs/kcodecs-5.47.0.ebuild
index 007c0d0de0b..729b4e2aa9a 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.47.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.47.0.ebuild
@@ -10,4 +10,7 @@ LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="nls"
 
-DEPEND="nls? ( $(add_qt_dep linguist-tools) )"
+DEPEND="
+   dev-util/gperf
+   nls? ( $(add_qt_dep linguist-tools) )
+"



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

2018-06-20 Thread Andreas Sturmlechner
commit: ced31d5f1a315a9281b2c811ea9dd7cdeca4b3b2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 18 19:36:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:03:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced31d5f

media-sound/fluidsynth: 1.1.11 version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 1c6265ecf9e..e71f30c37a4 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,2 +1,3 @@
+DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B 
ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79
 SHA512 
ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-1.1.6.tar.gz 958735 BLAKE2B 
9be1e72238545d78f2aded9e98336639ba83d2272b3247ac86609e84331fb8517eb29b505d269719196468bdbf645496c9f4f4426ac232b16f19b3b8b1c3450f
 SHA512 
2dcb8a8a1634273cc93c45b6e21b87ac45a023c768cffdadda0a4e611eab8d5bbea0e1ba59e5f147488054cfa6fcaf561399ae275a665c76082b8738a80778bb
 DIST fluidsynth-1.1.9.tar.gz 630651 BLAKE2B 
2e6faa1126778a98b1960146046490331f943dfe78dcbf66aeaac16deda3ea0bca2eca747e7041ba752d136360b2003ae89b0d936df78a6cd9d5024bd3cd834e
 SHA512 
9bbe9143dc55a0e10e33efd62698e28b598a7ede95d44f193a93c5e29920c7b6d08f7f5ba96bd2c1c42a4b184134d4e811f643fdc0077be714c0cf72635de235

diff --git a/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild 
b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
new file mode 100644
index 000..8cabd6cdfd4
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1.11.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 
specifications"
+HOMEPAGE="http://www.fluidsynth.org/;
+SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash portaudio pulseaudio 
readline sndfile"
+
+RDEPEND="
+   >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+   alsa? (
+   >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
+   lash? ( >=media-sound/lash-0.5.4-r2[${MULTILIB_USEDEP}] )
+   )
+   dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+   jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+   ladspa? (
+   >=media-libs/ladspa-cmt-1.16-r3[${MULTILIB_USEDEP}]
+   >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
+   )
+   portaudio? ( 
>=media-libs/portaudio-19_pre2021-r1[${MULTILIB_USEDEP}] )
+   pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+   readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+   sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md THANKS TODO 
doc/{fluidsynth-v11-devdoc,xtrafluid}.txt )
+
+src_configure() {
+   # autotools based build system has AC_CHECK_LIB(pthread, 
pthread_create) wrt
+   # bug #436762
+   append-flags -pthread
+
+   local mycmakeargs=(
+   -Denable-alsa=$(usex alsa)
+   -Denable-dbus=$(usex dbus)
+   -Denable-debug=$(usex debug)
+   -Denable-ipv6=$(usex ipv6)
+   -Denable-jack=$(usex jack)
+   -Denable-ladcca=OFF
+   -Denable-ladspa=$(usex ladspa)
+   -Denable-libsndfile=$(usex sndfile)
+   -Denable-portaudio=$(usex portaudio)
+   -Denable-pulseaudio=$(usex pulseaudio)
+   -Denable-readline=$(usex readline)
+   )
+
+   if use alsa; then
+   mycmakeargs+=( -Denable-lash=$(usex lash) )
+   else
+   mycmakeargs+=( -Denable-lash=OFF )
+   fi
+
+   cmake-multilib_src_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   docinto pdf
+   dodoc doc/*.pdf
+
+   if use examples; then
+   docinto examples
+   dodoc doc/*.c
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/

2018-06-20 Thread Andreas Sturmlechner
commit: df0a53ca3def442021e4b5ddf01cdc00d4d343e3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 19 20:25:30 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:03:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0a53ca

kde-plasma/plasma-nm: Fix cmake options

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

 kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild
index 72bb68a3501..2cc09fe4549 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild
@@ -56,7 +56,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package modemmanager ModemManager)
+   -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
$(cmake-utils_use_find_package openconnect OpenConnect)
)



[gentoo-commits] repo/gentoo:master commit in: kde-apps/korganizer/

2018-06-20 Thread Andreas Sturmlechner
commit: fad95f6707dcb9f11620683f25d5154e8e3acb66
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 13:02:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:03:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad95f67

kde-apps/korganizer: Drop obsolete cmake option

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

 kde-apps/korganizer/korganizer-17.12.3.ebuild | 1 -
 kde-apps/korganizer/korganizer-18.04.2.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/korganizer/korganizer-17.12.3.ebuild 
b/kde-apps/korganizer/korganizer-17.12.3.ebuild
index 31a3d94e1e8..79b37be4a7d 100644
--- a/kde-apps/korganizer/korganizer-17.12.3.ebuild
+++ b/kde-apps/korganizer/korganizer-17.12.3.ebuild
@@ -80,7 +80,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package X Qt5X11Extras)
$(cmake-utils_use_find_package X X11)
)
 

diff --git a/kde-apps/korganizer/korganizer-18.04.2.ebuild 
b/kde-apps/korganizer/korganizer-18.04.2.ebuild
index 23f6fc99a12..d531c4bb3c6 100644
--- a/kde-apps/korganizer/korganizer-18.04.2.ebuild
+++ b/kde-apps/korganizer/korganizer-18.04.2.ebuild
@@ -80,7 +80,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package X Qt5X11Extras)
$(cmake-utils_use_find_package X X11)
)
 



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

2018-06-20 Thread Andreas Sturmlechner
commit: 8d40e5767c67082e1f69117553766ad1a3614354
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 12:22:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 13:03:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d40e576

dev-libs/quazip: 0.7.6 version bump, moved to GitHub

Bug: https://bugs.gentoo.org/658548
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/quazip/Manifest|  1 +
 dev-libs/quazip/quazip-0.7.6.ebuild | 48 +
 2 files changed, 49 insertions(+)

diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index d767f3003b2..15bd2a69167 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1 +1,2 @@
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 
7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6
 SHA512 
d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
+DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 
7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762
 SHA512 
4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1

diff --git a/dev-libs/quazip/quazip-0.7.6.ebuild 
b/dev-libs/quazip/quazip-0.7.6.ebuild
new file mode 100644
index 000..e9f4d698d20
--- /dev/null
+++ b/dev-libs/quazip/quazip-0.7.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic qmake-utils
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/;
+SRC_URI="https://github.com/stachenov/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5
+   sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   if ! use static-libs ; then
+   sed -e "/^install/ s/quazip_static//" -i CMakeLists.txt || die
+   fi
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local libdir=$(get_libdir)
+   local -x CXXFLAGS="${CXXFLAGS}"
+   append-cxxflags -std=c++11 -fPIC
+
+   local mycmakeargs=(
+   -DBUILD_WITH_QT4=OFF
+   -DLIB_SUFFIX=${libdir/lib/}
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   # compatibility with not yet fixed rdeps (Gentoo bug #598136)
+   dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
+}



[gentoo-commits] proj/kde-sunset:master commit in: media-sound/drumstick/files/, media-sound/drumstick/

2018-06-20 Thread Andreas Sturmlechner
commit: 17d2be0932e7dbb98223948f668281711ba017a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 12:04:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 12:04:44 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=17d2be09

media-sound/drumstick: Import from Gentoo ebuild repository

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/drumstick/drumstick-0.5.0.ebuild   | 66 ++
 .../drumstick/files/0.5.0-doc_automagicness.patch  | 20 +++
 .../drumstick/files/0.5.0-gcc6-narrowing.patch | 26 +
 .../drumstick/files/0.5.0-underlinking.patch   | 17 ++
 .../drumstick/files/drumstick-1.0.2-gcc6.patch | 35 
 media-sound/drumstick/metadata.xml |  8 +++
 6 files changed, 172 insertions(+)

diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild 
b/media-sound/drumstick/drumstick-0.5.0.ebuild
new file mode 100644
index 000..7693a5b
--- /dev/null
+++ b/media-sound/drumstick/drumstick-0.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fdo-mime gnome2-utils cmake-utils
+
+DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus doc"
+
+RDEPEND="
+   media-libs/alsa-lib
+   dev-qt/qtgui:4
+   dev-qt/qtsvg:4
+   x11-misc/shared-mime-info
+   dbus? ( dev-qt/qtdbus:4 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/${PV}-doc_automagicness.patch
+   "${FILESDIR}"/${PV}-underlinking.patch
+   "${FILESDIR}"/${PV}-gcc6-narrowing.patch
+)
+
+src_prepare() {
+   sed -i \
+   -e '/CMAKE_EXE_LINKER_FLAGS/d' \
+   CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_DBUS=$(usex dbus)
+   -DWITH_DOC=$(usex doc)
+   )
+   cmake-utils_src_configure
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   fdo-mime_mime_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+   fdo-mime_mime_database_update
+   gnome2_icon_cache_update
+}

diff --git a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch 
b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
new file mode 100644
index 000..c2474ae
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
@@ -0,0 +1,20 @@
+diff -urN drumstick-0.5.0.old/CMakeLists.txt drumstick-0.5.0/CMakeLists.txt
+--- drumstick-0.5.0.old/CMakeLists.txt 2010-09-09 12:38:56.0 +0200
 drumstick-0.5.0/CMakeLists.txt 2011-05-13 11:03:30.156962982 +0200
+@@ -143,6 +143,8 @@
+ ADD_SUBDIRECTORY(library)
+ ADD_SUBDIRECTORY(utils)
+ ADD_SUBDIRECTORY(icons)
++OPTION(WITH_DOC "Build documentation" ON)
++IF( WITH_DOC )
+ IF(${CMAKE_SYSTEM} MATCHES "Linux")
+ FIND_PACKAGE(Doxygen)
+ IF(DOXYGEN_FOUND)
+@@ -157,6 +159,7 @@
+ ENDIF(DOXYGEN_FOUND)
+ ADD_SUBDIRECTORY(doc)
+ ENDIF(${CMAKE_SYSTEM} MATCHES "Linux")
++ENDIF( WITH_DOC )
+ 
+ CONFIGURE_FILE(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
+ CONFIGURE_FILE(drumstick-file.pc.in drumstick-file.pc IMMEDIATE @ONLY)

diff --git a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch 
b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
new file mode 100644
index 000..165db47
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
@@ -0,0 +1,26 @@
+Fix GCC 6 failures caused by -Wnarrowing
+
+--- a/utils/buildsmf/buildsmf.cpp
 b/utils/buildsmf/buildsmf.cpp
+@@ -53,8 +53,8 @@
+ m_engine->writeKeySignature(0, 2, major_mode); // D major (2 sharps)
+ 
+ // system exclusive event
+-static char gsreset[] = { 0xf0, 0x41, 0x10, 0x42, 0x12, 
+-  0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7 };
++static char gsreset[] = { (char)0xf0, 0x41, 0x10, 0x42, 0x12, 
++  0x40, 0x00, 0x7f, 0x00, 0x41, (char)0xf7 };
+ m_engine->writeMidiEvent(0, system_exclusive, sizeof(gsreset), gsreset);
+ 
+ // some note events
+--- a/utils/testevents/testevents.cpp
 b/utils/testevents/testevents.cpp
+@@ -262,7 +262,7 @@
+ dumpEvent(new KeyPressEvent(5, 60, 124));
+ dumpEvent(new ChanPressEvent(6, 111));
+ dumpEvent(new PitchBendEvent(7, 1234));
+-char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 
0xf7};
++char sysex[] = {(char)0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 
0x41, (char)0xf7};
+ 

  1   2   >