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

2017-02-11 Thread Fabian Groffen 
commit: 5b6822290f241561cd9ad73503a64dca8c3dd1af
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 12 07:45:36 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Feb 12 07:45:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b682229

profiles/package.mask: update Exim 4.89 RC mask

 profiles/package.mask | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 6bc6b8422c..7b3adf5f11 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -85,7 +85,7 @@ dev-python/mwlib-rl
 
 # Fabian Groffen  (31 Jan 2017)
 # Mask upcoming Exim release candidates
-=mail-mta/exim-4.89_rc3
+=mail-mta/exim-4.89_rc4
 
 # David Seifert  (30 Jan 2017)
 # No maintainer activity since git migration, dated eclass

[gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/files/, mail-mta/exim/

2017-02-11 Thread Fabian Groffen 
commit: 8278ef6c1514eb7558e1ad23dced277a09c7fc51
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 12 07:51:10 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Feb 12 07:51:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8278ef6c

mail-mta/exim: version bump to Exim 4.89 RC4

Package-Manager: portage-2.3.3

 mail-mta/exim/Manifest |   4 +-
 .../{exim-4.89_rc3.ebuild => exim-4.89_rc4.ebuild} |   2 +-
 .../exim/files/exim-4.89-as-needed-ldflags.patch   | 145 +
 3 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 9f87ece7ac..d778435d68 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,5 @@
 DIST exim-4.88.tar.bz2 1824610 SHA256 
119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d SHA512 
ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf
 WHIRLPOOL 
d2d8c404217fcc5bbc7bc18500456f2709a099b0a31d4930343b836c35c62e3914fa1c686ea7d9ba5eea95f0caab13c3b76c1508eda74cb75dabb0d61472428e
-DIST exim-4.89_RC3.tar.bz2 1840554 SHA256 
f9db70feb2dfd074c407cc2960b21e63d57575fdc262f618322e247803f260fc SHA512 
442baad509c72a51c06573516de490a425a1edfd69906ee3c33b07511f5a0d70314cd6d7cf2041f5578e71258689ac97d695b9040203c3a7a562b636d399b5b7
 WHIRLPOOL 
34302284f9fd0d48457719c4e75f608c95fb7daf679cbe15fd02c543effc0f577b991774cd59b9e0e8b7b25d9f4b91befbea099bf16ae9865d95363dfefdaa28
+DIST exim-4.89_RC4.tar.bz2 1840364 SHA256 
e9de49cd7b874f944f827adbe2981fd3ea8eb000461856e94f5b7c859dde3df1 SHA512 
efe8bc08713c1b47e6aa8b0964aa7d48a3a7ddf0332afa2c44b4ee2863511340176d074808cce0e06d45266eb07f52ab7ad980ff57b455d53b0b7bd25259e326
 WHIRLPOOL 
806b540a30dce26e1bc8b5baf4ed6b0e0ccbc5aa9922339d2e5895a2641cce1e28345c1d9ed4250efd296a8f987164ba0957cef595b7c93c5a6714c2fbb6fd3d
 DIST exim-pdf-4.88.tar.bz2 1922494 SHA256 
33736fafb45c5922fcbc0def7626f46cb74927987b78943aa26949ef30789574 SHA512 
8c4f580fa319c0285bcb49056ecd72b056cbbfa287a15a4d856965b4218469c85607ec7321ae0f2ba3be868f05a70a7fb8a77d5836a574417e6bffc64720bee5
 WHIRLPOOL 
7e3e65c58cc9a313d3440de6b79ed4f113ea265e39201aa2d36c091037c2b20718bd49f04e99f2aa029a20d238cd21178762e2ba6b470596309e83fb3ffc542b
-DIST exim-pdf-4.89_RC3.tar.bz2 1924260 SHA256 
93a34399096e1272ee8e4dcb6e3ec5bd09a7b084b14876e97e7685d97fa2c4bf SHA512 
2504d7b482348ab67f6d9572ed4118c88e90ed44729267c05b769e6ae65ae42f28cb8095822a1e0588d1bcaf8b070e3e641b8fd8098c37656aa01ea2637ed343
 WHIRLPOOL 
cb87c9d56a9b2a9a869484fe537daf9ee3dadc3469e22da1bc8523f838a22e263187d9b3493485301f13f44fca046fd3dd71079726077767802bc7eabcf4b821
+DIST exim-pdf-4.89_RC4.tar.bz2 1924453 SHA256 
4b98d52873541e6675b3e7f6e433080033b0b2e0dece41ad273afedb6a6e17c0 SHA512 
4438f8aae4dbee8c3422bfae0798536f73bae90377d9d1113b2ff2e005671767e78a9a5b3ffa64b0f0c2fe176ad55e3d2ff6c682b543f1d1a3f6460b4759adf4
 WHIRLPOOL 
d5522cb831a037b2f668a522142384ad2efd414d235aba57a8c868b2578cc53e47215445828bb07a3a2e7c3841034824f3a388fe65d1dfcdcb3bb795e8d462e8
 DIST system_filter.exim.gz 3075 SHA256 
3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 WHIRLPOOL 
ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4

diff --git a/mail-mta/exim/exim-4.89_rc3.ebuild 
b/mail-mta/exim/exim-4.89_rc4.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.89_rc3.ebuild
rename to mail-mta/exim/exim-4.89_rc4.ebuild
index 5deb3a88e3..e9c27b4082 100644
--- a/mail-mta/exim/exim-4.89_rc3.ebuild
+++ b/mail-mta/exim/exim-4.89_rc4.ebuild
@@ -93,7 +93,7 @@ src_prepare() {
epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
-   epatch "${FILESDIR}"/exim-4.88-as-needed-ldflags.patch # 352265, 391279
+   epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
 
if use maildir ; then

diff --git a/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch 
b/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch
new file mode 100644
index 00..49e430939f
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.89-as-needed-ldflags.patch
@@ -0,0 +1,145 @@
+https://bugs.gentoo.org/show_bug.cgi?id=352265
+
+Make sure LDFLAGS comes first, such that all libraries are considered,
+and not discarded when --as-needed is in effect.
+
+https://bugs.gentoo.org/show_bug.cgi?id=391279
+
+Use LDFLAGS for all targets, not just the exim binary, such that
+--as-needed works as well.
+
+
+--- OS/Makefile-Base
 OS/Makefile-Base
+@@ -346,12 +346,12 @@
+ buildrouters

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

2017-02-11 Thread Zac Medico 
commit: c57d596d98f726eda16be4e93ebb1ffb121fd06d
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Feb 12 07:05:12 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Feb 12 07:05:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57d596d

dev-python/hyperframe: PYTHON_COMPAT: add python3_6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild 
b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index dc7db4de89..b7f9a9190d 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
 
 inherit distutils-r1

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

2017-02-11 Thread Zac Medico 
commit: 7e671d00eeb7dba7195193bace7efea1e7515a06
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Feb 12 06:16:03 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Feb 12 06:17:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e671d00

dev-python/backports: PYTHON_COMPAT: add python3_6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/dev-python/backports/backports-1.0.ebuild 
b/dev-python/backports/backports-1.0.ebuild
index 3fa60ea9dc..d1a114a0f3 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1

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

2017-02-11 Thread Hans de Graaff 
commit: 29be8f67815e6dfb9ae5ef409d00dee4660197cd
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 12 06:11:26 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 12 06:11:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29be8f67

dev-ruby/activemodel: restore ~x86 keyword

Package-Manager: portage-2.3.3

 dev-ruby/activemodel/activemodel-4.2.7.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/activemodel/activemodel-4.2.7.1.ebuild 
b/dev-ruby/activemodel/activemodel-4.2.7.1.ebuild
index 638cb5efeb..cf7c47a540 100644
--- a/dev-ruby/activemodel/activemodel-4.2.7.1.ebuild
+++ b/dev-ruby/activemodel/activemodel-4.2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz 
-> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"

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

2017-02-11 Thread Hans de Graaff 
commit: e97086ecd855d44eed351959815ffb6b920b867a
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 12 06:15:28 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 12 06:15:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97086ec

dev-ruby/pg: restore ~x86 keyword

Package-Manager: portage-2.3.3

 dev-ruby/pg/pg-0.18.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/pg/pg-0.18.4-r1.ebuild b/dev-ruby/pg/pg-0.18.4-r1.ebuild
index d5c133c2ca..5e66b55746 100644
--- a/dev-ruby/pg/pg-0.18.4-r1.ebuild
+++ b/dev-ruby/pg/pg-0.18.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/;
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"

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

2017-02-11 Thread Hans de Graaff 
commit: 81582d54d4aee74e78a9fab6e434404886123685
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 12 05:48:54 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 12 05:48:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81582d54

dev-ruby/sshkit: add 1.12.0

Package-Manager: portage-2.3.3

 dev-ruby/sshkit/Manifest |  1 +
 dev-ruby/sshkit/sshkit-1.12.0.ebuild | 43 
 2 files changed, 44 insertions(+)

diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index c48a4de2f3..27cd3a0583 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,2 +1,3 @@
 DIST sshkit-1.11.4.gem 145408 SHA256 
15fb0b96854d3c85b2a81fababfc369505519a144d5c396bf60a41961f5cbbeb SHA512 
51b02bffc2232a33678ead346172701229cfefce86ea22bb68bba10d03971e2021e2eb6babb9646159d7b98b01431e69dd37250ea3ec660820ef65b55b8ad634
 WHIRLPOOL 
57aa83aaf0eac8de448b3e48c208a0e618482320ef384e18448255ebc4988a5d8d7ceea457cbe51bef266247d272690286c7cf38a50573e374019b1e907a8ad9
 DIST sshkit-1.11.5.gem 146432 SHA256 
546948e1c33c1fb748455d25967d7dc06d592e59d3408ce04ebbe1950e5430b1 SHA512 
a99f2be197038145079b6faeb5eb51f98cfebd43b07e47d6b3a771e4fd34f8f7fcbc0183e19b3ada55ecbd25a1498d63a6e7966c47c8af548a850cd3e9d70d9d
 WHIRLPOOL 
9b91099a40f8c532a1ff1b39c151ef70184c4e2527c1b4fe454800b582ea5599fc2238d87962955b0058f2fd0144b26fb64caf4b84a4f52e6d98ebc1de45b70b
+DIST sshkit-1.12.0.gem 146944 SHA256 
93ae375f5c2e4d8914e6b3d773e19b82c63e5a5682358fb78231e1e3e0308b98 SHA512 
62cacc33d80b3727a73cf0756e620dc85e3ec9829762f415089b17759220031be573d12c1fc55a6e585202526b2bdef5e10298d17f5e62f25ab0087697edbaa5
 WHIRLPOOL 
cfb65bebc73bb75ad9b1df3955272640b5412c81dfa2c87a3e75f223c5e64b872cc4ffc5b273ff050024ccaa4ed4ebd5debe22fff2aa45b82f6033606a18b413

diff --git a/dev-ruby/sshkit/sshkit-1.12.0.ebuild 
b/dev-ruby/sshkit/sshkit-1.12.0.ebuild
new file mode 100644
index 00..67859660c1
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands 
in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+   >=dev-ruby/net-ssh-2.8.0:*
+   >=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+   sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+   sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+   -e '1irequire "set"; require "pathname"' test/helper.rb || die
+
+   # Fix assumption about parent directory name
+   sed -i -e '/assert_match/ s/sshkit/sshkit.*/' 
test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+   # Run tests directly to avoid dependencies in the Rakefile
+   ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require 
f}" || die
+}

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

2017-02-11 Thread Hans de Graaff 
commit: 85f8669fb0866f6cb999328b2379bebb9b5fcb35
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 12 05:50:13 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 12 05:50:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f8669f

dev-ruby/introspection: add missing test dependency on blankslate

Package-Manager: portage-2.3.3

 dev-ruby/introspection/introspection-0.0.4.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild 
b/dev-ruby/introspection/introspection-0.0.4.ebuild
index 33dbf229f0..be5dad8290 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,6 +22,8 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
 
+ruby_add_bdepend "test? ( dev-ruby/blankslate )"
+
 all_ruby_prepare() {
sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
 }

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

2017-02-11 Thread Hans de Graaff 
commit: ad7384cbf65bacb9931d02da5608cf93d2dd010d
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 12 05:52:23 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 12 05:52:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7384cb

dev-ruby/tins: add 1.13.2

Package-Manager: portage-2.3.3

 dev-ruby/tins/Manifest   |  1 +
 dev-ruby/tins/tins-1.13.2.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 95d2882774..cb703f9a40 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -2,4 +2,5 @@ DIST tins-1.10.2.gem 301056 SHA256 
aa7c664c38c0fba74d3ecc86c7f115625d883075c8b06
 DIST tins-1.11.0.gem 302592 SHA256 
b8b9e817007ca0866e1e0e94042beea177c60309ab34a16cce2c76c9c91720d2 SHA512 
c81df06c1995c2597bf403205716ad0c688e67a82bc5a843a566b5c93ef85c35034ae8badee768769d034f80bcffe62fcd2f106e4bddb457ff15d3601dc2dae3
 WHIRLPOOL 
8ee3c32879423877bd74b52b27c4547b7c22335371ef2f091f528432b01949548712ddc820fbf64210a2aea3af934f06e3d31b800fa092a2b86e6ad0a3078796
 DIST tins-1.12.0.gem 302592 SHA256 
f1d874386ab15d32cd9ade46f6dac5a1e7964025d639c908f9a4af15a32dca79 SHA512 
f5b4f6060f3e80cc5332fb47ce8fcad5bfea627a3ca0b849b55a3919ab6fdd94189e8306fc5a593be7852e06cc5ac46dce9d8dd3b1fb022e252a2a0a783b36ed
 WHIRLPOOL 
075f651a0211a8053bcdce74c7cc6080b65f624c147f6b17f7bcbd8f99d30a7b78a70078679cf861553200e711bf162604cafd988ccf2c96676fca5bda31cfe2
 DIST tins-1.13.0.gem 303616 SHA256 
26dc5c81fa03c9f263f3dd1b8129d8587df9b1654bb8f65a7fc32846eeb37a5d SHA512 
1925453899da7b0658d49ba97b682b6d8fb5f5d2db6c8e8a44e4da2a6cf229ed5bb77b350ce824e90bd19f8b5c40cbe28a481bc9e79ad1e8f11bade8cb1423cb
 WHIRLPOOL 
44e5e82c4dcc54426454157fec2bec7bd3cec1034a8c1408abcab1d4c78024a60a4d5ccc94491987eb4039695a8979fe9faf7718672b654509182c44fc37a87c
+DIST tins-1.13.2.gem 303616 SHA256 
21628e665f75f16c049931122309130d63d15f7dc32149d9068cd4687db8e483 SHA512 
a57156709ecfe603defb870a66204825bf3dfb24cff5be56c6afedc05c801b277da0d18665d13e700fa24ed4bdb3e65261064b03a9231ed976e600a50d2c63c0
 WHIRLPOOL 
1561757433db2d223e90d368e79bb6c31574fa1644cbf054df6f639f3c865ae028627d903b7e6761c957b851fd1241837f6f7abcdef20c0466844a90e0eae8a2
 DIST tins-1.6.0.gem 299008 SHA256 
1f82e41851f343147e8acda8b02a67e990e38d4755e1e7a8de7cd913fcce0a0b SHA512 
33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01
 WHIRLPOOL 
257e019636565081197c3d353396db2937043886696bb6be294b0930a6e1f7ada1a21fd863d1ac29b649bba3875d7d4b868ded70480a0dec0ba27a6764debac1

diff --git a/dev-ruby/tins/tins-1.13.2.ebuild b/dev-ruby/tins/tins-1.13.2.ebuild
new file mode 100644
index 00..73886f562f
--- /dev/null
+++ b/dev-ruby/tins/tins-1.13.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+   ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}

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

2017-02-11 Thread Hans de Graaff 
commit: 9323acad769c4176573bc62e290cad67fdc268bc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Feb 12 05:49:32 2017 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Feb 12 05:49:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9323acad

dev-ruby/blankslate: add ruby24

Package-Manager: portage-2.3.3

 dev-ruby/blankslate/blankslate-3.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/blankslate/blankslate-3.1.3.ebuild 
b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
index 871c8ee7d1..5e28c0da70 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"

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

2017-02-11 Thread Michael Palimaka 
commit: d5b6c0b2f6dd7574b4cf46d2907953ad59ce743e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Feb 12 04:00:42 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 04:00:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b6c0b2

media-sound/toolame: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/toolame/toolame-02l-r3.ebuild | 33 ---
 1 file changed, 33 deletions(-)

diff --git a/media-sound/toolame/toolame-02l-r3.ebuild 
b/media-sound/toolame/toolame-02l-r3.ebuild
deleted file mode 100644
index 4949772842..00
--- a/media-sound/toolame/toolame-02l-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
-HOMEPAGE="http://www.planckenergy.com;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-gentoo.diff \
-   "${FILESDIR}"/${P}-uint.patch \
-   "${FILESDIR}"/${P}-uint32_t.patch
-}
-
-src_compile() {
-   append-lfs-flags
-   tc-export CC
-   emake
-}
-
-src_install() {
-   dobin ${PN}
-   dodoc README HISTORY FUTURE html/* text/*
-}

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

2017-02-11 Thread Michael Palimaka 
commit: eddba44d228d65a166ff102018a63d10507082a2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Feb 12 03:47:46 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 03:47:52 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eddba44d

kde-apps/incidenceeditor: add blocker due to file collisions

* Detected file collision(s):
*
*   /usr/bin/kincidenceeditor

Gentoo-bug: 609028

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/incidenceeditor/incidenceeditor-16.12.49..ebuild | 4 +++-
 kde-apps/incidenceeditor/incidenceeditor-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.12.49..ebuild 
b/kde-apps/incidenceeditor/incidenceeditor-16.12.49..ebuild
index 311cae1b11..7e8a77f21f 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.12.49..ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.12.49..ebuild
@@ -49,4 +49,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/kdiagram:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !kde-apps/kdepim-common-libs:4
+"

diff --git a/kde-apps/incidenceeditor/incidenceeditor-.ebuild 
b/kde-apps/incidenceeditor/incidenceeditor-.ebuild
index 311cae1b11..7e8a77f21f 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-.ebuild
@@ -49,4 +49,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/kdiagram:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !kde-apps/kdepim-common-libs:4
+"

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

2017-02-11 Thread Michael Palimaka 
commit: 6f148fc211709dd7c084114ba2aceda3a57b1437
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Feb 12 03:47:21 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 03:47:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f148fc2

kde-apps/incidenceeditor: add blocker due to file collisions

Gentoo-bug: 609028

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/incidenceeditor/incidenceeditor-16.12.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.12.2.ebuild 
b/kde-apps/incidenceeditor/incidenceeditor-16.12.2.ebuild
index e9e5fa4e76..4c16dac1e6 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.12.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.12.2.ebuild
@@ -49,4 +49,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
dev-libs/kdiagram:5
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !kde-apps/kdepim-common-libs:4
+"

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

2017-02-11 Thread Michael Palimaka 
commit: 8ebc236f751d86082df22c42616ec2d78b4888ca
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Feb 12 03:03:01 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 03:03:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebc236f

app-crypt/kencfs: version bump 1.6.4

Gentoo-bug: 607870

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-crypt/kencfs/Manifest|  1 +
 app-crypt/kencfs/kencfs-1.6.4.ebuild | 46 
 2 files changed, 47 insertions(+)

diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
index f5d8f0da7f..023f0260f1 100644
--- a/app-crypt/kencfs/Manifest
+++ b/app-crypt/kencfs/Manifest
@@ -1 +1,2 @@
 DIST 134003-kencfs-1.6.2.tar.gz 229438 SHA256 
0bb719a55d8c19ccd03b3a945c5aa747072309673e3c7570c2f453926e05fd8b SHA512 
7a7c66e9e492e10239663b41a55161fcce32b25bbb2d4abe9bc5d853c71df41dd28af4ba695274ff0138708a5c50faeb45bccbe103ec571fbea8808b20807802
 WHIRLPOOL 
b58a82cd26beebf089bb6bdfa895be769489f3b7086dc02780b738b0a46ae2e3914655711c046e7106f043501da2304b47a2f08fb430dea76920087c38553e6e
+DIST kencfs-1.6.4.tar.gz 221386 SHA256 
3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 
44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d
 WHIRLPOOL 
8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b

diff --git a/app-crypt/kencfs/kencfs-1.6.4.ebuild 
b/app-crypt/kencfs/kencfs-1.6.4.ebuild
new file mode 100644
index 00..bc2df02992
--- /dev/null
+++ b/app-crypt/kencfs/kencfs-1.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003;
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${P}.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   kde-frameworks/kdelibs:4
+"
+RDEPEND="${DEPEND}
+   kde-apps/kwalletd:4
+   sys-fs/encfs
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.4.0-encfs5.patch"
+   "${FILESDIR}/${PN}-1.6.2-desktop.patch"
+)
+
+src_prepare() {
+   default
+
+   sed -i ${PN}.pro -e "/^doc.path =/s/${PN}/${PF}/" \
+   || die "sed docdir failed"
+}
+
+src_configure() {
+   eqmake4
+}
+
+src_install() {
+   emake INSTALL_ROOT="${D}" install
+}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/, kde-apps/kalzium/files/

2017-02-11 Thread Andreas Sturmlechner 
commit: 59928015ddc7ccbed718344e823fb342a62893bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 12 02:28:32 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 12 02:28:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59928015

kde-apps/kalzium: Fix build with KF-5.31

Package-Manager: portage-2.3.3

 .../kalzium/files/kalzium-16.12.2-kf-5.31.patch| 152 +
 kde-apps/kalzium/kalzium-16.12.2.ebuild|   2 +
 2 files changed, 154 insertions(+)

diff --git a/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch 
b/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch
new file mode 100644
index 00..05c912c946
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch
@@ -0,0 +1,152 @@
+From f233d458959548ab371e3faeca7313f746625afc Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Sun, 22 Jan 2017 14:46:24 +0100
+Subject: Fix build with extra-cmake-modules > 5.30
+
+Since a5f3a76e14799c68b5e8f74e375baa5f6f6ab4dc in
+extra-cmake-modules.git -fno-operator-names is passed to the build
+(when supported), causing a build error for kalzium.
+
+REVIEW: 129873
+---
+ src/calculator/titrationCalculator.cpp | 39 +++---
+ 1 file changed, 17 insertions(+), 22 deletions(-)
+
+diff --git a/src/calculator/titrationCalculator.cpp 
b/src/calculator/titrationCalculator.cpp
+index 44ea152..6ea9ac9 100644
+--- a/src/calculator/titrationCalculator.cpp
 b/src/calculator/titrationCalculator.cpp
+@@ -41,11 +41,6 @@
+ 
+ using namespace std;
+ 
+-#ifdef _MSC_VER
+-#define and &&
+-#define or ||
+-#endif
+-
+ titrationCalculator::titrationCalculator(QWidget * parent) : QWidget(parent)
+ {
+ xmin = 0;
+@@ -112,7 +107,7 @@ void titrationCalculator::plot()
+ }
+ QString mreporto;
+ int iter = 0;
+-if (uid.xaxis->text() == "" or uid.xaxis->text() == " ") {
++if (uid.xaxis->text() == "" || uid.xaxis->text() == " ") {
+ uid.xaxis->setText(i18n("nothing"));
+ }
+ if (tmpy == 0) {
+@@ -121,11 +116,11 @@ void titrationCalculator::plot()
+ //now we have to solve the system of equations NOTE:yvalue 
contains the equation of Y-axis variable
+ //we iterates the process until you have an equation in one only 
unknown variable or a numeric expression
+ mreporto = solve(yvalue);
+-while (end == 0 or lettere == 1) {
++while (end == 0 || lettere == 1) {
+ QByteArray ba = mreporto.toLatin1();
+ char *tmreport = ba.data();
+ ++iter;
+-if (end == 1 or lettere == 0) {
++if (end == 1 || lettere == 0) {
+ break;
+ }
+ if (iter > 100) {
+@@ -273,13 +268,13 @@ QString titrationCalculator::solve(char *yvalue)
+ QString tempyval;
+ QString ptem;
+ for (int i = 0; strlen(yvalue) + 1; ++i) {
+-if (!(yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or 
yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or 
yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or 
yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or 
yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or 
yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or 
yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='+' or 
yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or 
yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='Q' or yvalue[i]=='W' or 
yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or 
yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or 
yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or 
yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or 
yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=
 ='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M' 
or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or 
yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or 
yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',')) {
++if (!(yvalue[i]=='q' || yvalue[i]=='w' || yvalue[i]=='e' || 
yvalue[i]=='r' || yvalue[i]=='t' || yvalue[i]=='y' || yvalue[i]=='u' || 
yvalue[i]=='i' || yvalue[i]=='o' || yvalue[i]=='p' || yvalue[i]=='a' || 
yvalue[i]=='s' || yvalue[i]=='d' || yvalue[i]=='f' || yvalue[i]=='g' || 
yvalue[i]=='h' || yvalue[i]=='j' || yvalue[i]=='k' || yvalue[i]=='l' || 
yvalue[i]=='z' || yvalue[i]=='x' || yvalue[i]=='c' || yvalue[i]=='v' || 
yvalue[i]=='b' || yvalue[i]=='n' || yvalue[i]=='m' || yvalue[i]=='+' || 
yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || 
yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='Q' ||

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

2017-02-11 Thread Michael Palimaka 
commit: 9cf27cba467a81feba4ecaa99b638ffa91400e2e
Author: Craig Andrews  integralblue  com>
AuthorDate: Sun Feb 12 02:18:56 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 02:28:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf27cba

media-tv/kodi: depend on media-video/ffmpeg[postproc]

Gentoo-bugs: 600918, 608790

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-tv/kodi/{kodi-16.1-r3.ebuild => kodi-16.1-r4.ebuild} | 2 +-
 media-tv/kodi/{kodi-17.0.ebuild => kodi-17.0-r1.ebuild}| 2 +-
 media-tv/kodi/kodi-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-tv/kodi/kodi-16.1-r3.ebuild 
b/media-tv/kodi/kodi-16.1-r4.ebuild
similarity index 99%
rename from media-tv/kodi/kodi-16.1-r3.ebuild
rename to media-tv/kodi/kodi-16.1-r4.ebuild
index 45cb47118f..50fdefb57b 100644
--- a/media-tv/kodi/kodi-16.1-r3.ebuild
+++ b/media-tv/kodi/kodi-16.1-r4.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-sound/dcadec
pulseaudio? ( media-sound/pulseaudio )
media-sound/wavpack
-   >=media-video/ffmpeg-2.6:=[encode]
+   >=media-video/ffmpeg-2.6:=[encode,postproc]
rtmp? ( media-video/rtmpdump )
nfs? ( net-fs/libnfs:= )
webserver? ( net-libs/libmicrohttpd[messages] )

diff --git a/media-tv/kodi/kodi-17.0.ebuild b/media-tv/kodi/kodi-17.0-r1.ebuild
similarity index 99%
rename from media-tv/kodi/kodi-17.0.ebuild
rename to media-tv/kodi/kodi-17.0-r1.ebuild
index 4715ca1baf..b1927ff4b9 100644
--- a/media-tv/kodi/kodi-17.0.ebuild
+++ b/media-tv/kodi/kodi-17.0-r1.ebuild
@@ -66,7 +66,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
>=media-libs/taglib-1.11.1
-   >=media-video/ffmpeg-3.1.6:=[encode]
+   >=media-video/ffmpeg-3.1.6:=[encode,postproc]
mysql? ( virtual/mysql )
>=net-misc/curl-7.51.0
nfs? ( net-fs/libnfs:= )

diff --git a/media-tv/kodi/kodi-.ebuild b/media-tv/kodi/kodi-.ebuild
index c0eacd8f90..5d5db378c0 100644
--- a/media-tv/kodi/kodi-.ebuild
+++ b/media-tv/kodi/kodi-.ebuild
@@ -66,7 +66,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
>=media-libs/taglib-1.11.1
-   >=media-video/ffmpeg-3.1.6:=[encode]
+   >=media-video/ffmpeg-3.1.6:=[encode,postproc]
mysql? ( virtual/mysql )
>=net-misc/curl-7.51.0
nfs? ( net-fs/libnfs:= )

[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/

2017-02-11 Thread Andreas Sturmlechner 
commit: 5a7da644264009b841349d917f243d4949dd35ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 12 02:13:25 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 12 02:14:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7da644

kde-misc/basket: 2.49a version bump

First KF5-based release.

Reported-by: Ines Willenbrock  icys-scholle.de>
Thanks-to: Panard  inzenet.org>
Gentoo-bug: 588722

Package-Manager: portage-2.3.3

 kde-misc/basket/Manifest|  1 +
 kde-misc/basket/basket-2.49a.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 328b5c5a39..668477bcd4 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1 +1,2 @@
 DIST basket-1.81.tar.bz2 4108025 SHA256 
60a3b49af34f1df2b983b1acd321ded256f92f10ce700dc6c7954793fea3fd83 SHA512 
8f26379c6aa3423af8bfa77a211845b9998cb186c8906d16f1cbdc65b70e134f861192eecce4caa8c3d429f89f0c98f301dd58451e5bbfacc15292c779195f09
 WHIRLPOOL 
140f8676e841be9bf4968b9efb1c36a268098200e2d604367d63bf4ddf143da5831f9f8404074f988ed76d93fe190bbda38247c51f71867ed5264c9ed07af11f
+DIST basket-2.49a.tar.gz 4692638 SHA256 
36679d98a3e4488d903cbd7f30e73715b7491d60f259be53e45e700bca7b900c SHA512 
fe53fd8fe6e6f2531197a1f73b6528bc31e3b52c8c68c67526ab155c2a95fac47adb445e9a73d7656fe092a416b16fe0ea310a611a6f3cbb55dc916d0aa58c99
 WHIRLPOOL 
dcd06f09d4bfbea0f03246648bab049346e39082c6db436d56e086945c515a1cb9c21baf3fb3d7cc5d32acc3748e0260a7b887c8d6912cbff3736b6419e21429

diff --git a/kde-misc/basket/basket-2.49a.ebuild 
b/kde-misc/basket/basket-2.49a.ebuild
new file mode 100644
index 00..1d9710dc00
--- /dev/null
+++ b/kde-misc/basket/basket-2.49a.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="A DropDrawers clone. Multiple information organizer"
+HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket;
+SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt git"
+
+RDEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kfilemetadata)
+   $(add_frameworks_dep kglobalaccel)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-libs/phonon[qt5]
+   x11-libs/libX11
+   crypt? ( app-crypt/gpgme )
+   git? ( dev-libs/libgit2 )
+"
+DEPEND="${RDEPEND}
+   $(add_qt_dep qtconcurrent)
+"
+
+src_prepare() {
+   kde5_src_prepare
+   if ! use test; then
+   sed -e "/add_subdirectory(tests/s/^/#DONT/" -i 
src/CMakeLists.txt || die
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package crypt Gpgme)
+   $(cmake-utils_use_find_package git Libgit2)
+   )
+   kde5_src_configure
+}

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

2017-02-11 Thread Michael Palimaka 
commit: 56425f5536f8d5165bb4123f07cb525de769c8fd
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Feb 12 02:00:47 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 02:01:02 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=56425f55

kde-frameworks/syntax-highlighting: add nls USE flag to enable linguas magic

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-frameworks/syntax-highlighting/syntax-highlighting-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-.ebuild 
b/kde-frameworks/syntax-highlighting/syntax-highlighting-.ebuild
index 7a122fa708..5e7eb50924 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="LGPL-2+ LGPL-2.1+"
 KEYWORDS=""
-IUSE=""
+IUSE="nls"
 
 RDEPEND="
$(add_qt_dep qtgui)
@@ -18,8 +18,8 @@ RDEPEND="
$(add_qt_dep qtxmlpatterns)
 "
 DEPEND="${RDEPEND}
-   $(add_qt_dep linguist-tools)
dev-lang/perl
+   nls? ( $(add_qt_dep linguist-tools) )
 "
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-mongodb/

2017-02-11 Thread Brian Evans 
commit: 8acac1023a44085ad5883ac7b20c47bc5ccbd098
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Feb 12 01:27:14 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Feb 12 01:27:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8acac102

dev-php/pecl-mongodb: Version bump and include PHP 7.1 wrt bug 609018

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-php/pecl-mongodb/Manifest   |  1 +
 dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild | 43 +
 2 files changed, 44 insertions(+)

diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 58aa602943..49826a8127 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1 +1,2 @@
+DIST mongodb-1.1.10.tgz 661847 SHA256 
1c779c50b5ebe25acf399d899d8df727d794588ee1ef3d2039ee0bbd7f287f18 SHA512 
36096ceaec04aa4670b7d7d8e0b23edf786bab7184718642869455f5ddc6562eeb1a56f524550bea7f0dfe3aa44b12a25c32b20744ee8c843aacb1f03458ebd0
 WHIRLPOOL 
83670e7ec2928964deb4889f0edbb344e6594fb29133b4e56375fa26933d00227ee5a7a53ebda779e3dca9cc4ae6bc25bd6cc47cc192eeca473c4a87a32618cd
 DIST mongodb-1.1.8.tgz 806900 SHA256 
b93ae7dc9bd270823965f8903c9acf47fe3a0ba7a630d08e8173ff091d593ae0 SHA512 
1026b4081cd1c35f1f6fee6332c21dbe739320236377c0ed21b8d64447a9ba26464a919ceb9c16b332a64f12b834700472d6cbfb336d09d841c97ca0b402bf17
 WHIRLPOOL 
9cd2ce71f06684a3717e1cc016684d54b877f31166cbd194dc595dc878ebdda0320210ed090ac85d2aef40c94299499feedcf52faa712cec1c14aef1ae1f25d5

diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild 
b/dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild
new file mode 100644
index 00..46582ddff8
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl pcre sasl"
+
+RDEPEND="
+   php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+   php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+   php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+   >=dev-libs/libbson-1.3.3
+   >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl]
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   pcre? ( dev-libs/libpcre )
+   sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+   local PHP_EXT_ECONF_ARGS=(
+   --enable-mongodb
+   --with-libbson
+   --with-libmongoc
+   --with-pcre-dir=$(usex pcre)
+   --with-mongodb-sasl=$(usex sasl)
+   )
+   php-ext-source-r3_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/albert/

2017-02-11 Thread Michael Palimaka 
commit: 553c199019a30f4520a7d76768d8ddf6f11b2411
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Feb 12 01:24:05 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Feb 12 01:24:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553c1990

x11-misc/albert: version bump 0.9.3

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-misc/albert/Manifest|  1 +
 x11-misc/albert/albert-0.9.3.ebuild | 50 +
 2 files changed, 51 insertions(+)

diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 62990a78c9..b99c33f14e 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1 +1,2 @@
 DIST albert-0.8.11.tar.gz 10509450 SHA256 
7a829add4308a59204071a509487571ada1d2f42af34d799d0984e48bab2e5d3 SHA512 
939b9fe4b5aaf0f3eaf280fbaebcecb12560e55e17a41b8917145c32e8e5bbfa45cbd85f249f22c0dcc8a7a1b32ec31f07bfb10c0f41080245c03555f93d7af3
 WHIRLPOOL 
114bed1a4f0b9c3157582f3a6e972d2b9991e90760311bb3a493c71ccdc3e05ec2f1790b4d47ad740af99d466d2c865777ba39cceb71cffaf176e621755d1538
+DIST albert-0.9.3.tar.gz 10176040 SHA256 
5e16e369e38267e861407e5315c841e07ee04cf14caf0294e8c33d837c1931f4 SHA512 
d62fc7884d09e499a5f9a5818edefd8382810063611f572e6fc65e3054e3f76a158dac56dc22314a5d33bd06856e66d73ff2348a10e6e1fdbbea02a8f19ed925
 WHIRLPOOL 
920e162f3380e70d73acc6f1a2e55629e12f8fa11282e8a1d325349ad4b3cabbc2433715e25d982b337ff57151fed655cf81c9fd0d16d6387bf07630313d08c1

diff --git a/x11-misc/albert/albert-0.9.3.ebuild 
b/x11-misc/albert/albert-0.9.3.ebuild
new file mode 100644
index 00..81da0b41d6
--- /dev/null
+++ b/x11-misc/albert/albert-0.9.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://github.com/manuelschneid3r/albert;
+SRC_URI="https://github.com/manuelschneid3r/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+   dev-cpp/muParser
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   dev-qt/qtxml:5
+   x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   sed -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+   -i src/plugins/*/CMakeLists.txt \
+   -i src/lib/*/CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

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

2017-02-11 Thread Zac Medico 
commit: 941cd9f6a2916296ead4004db3babaa16ce47ef0
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Feb 12 00:38:46 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Feb 12 01:21:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941cd9f6

dev-python/strict-rfc3339: PYTHON_COMPAT: add python3_6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild | 2 +-
 dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild 
b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 3a82510647..2628eedbf1 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 
 inherit distutils-r1
 

diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild 
b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
index 6744529269..10ad3b357f 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 
 inherit distutils-r1

[gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/

2017-02-11 Thread Andreas Sturmlechner 
commit: 6d17312be5a0a5279fcbb7d4e3deea80d4a9235d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 12 00:57:09 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 12 00:57:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d17312b

sys-auth/elogind: Fix systemd blocker

Gentoo-bug: 608980

Package-Manager: portage-2.3.3

 sys-auth/elogind/elogind-219.12-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-auth/elogind/elogind-219.12-r5.ebuild 
b/sys-auth/elogind/elogind-219.12-r5.ebuild
index e3e26fc040..0ca605fd35 100644
--- a/sys-auth/elogind/elogind-219.12-r5.ebuild
+++ b/sys-auth/elogind/elogind-219.12-r5.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
sys-apps/dbus
-   !sys-auth/systemd
+   !sys-apps/systemd
 "
 DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.2

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

2017-02-11 Thread Andreas Sturmlechner 
commit: 40e6223ba49d58c47a58e708b3419795f95ac95c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 02:16:00 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 12 00:12:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e6223b

app-office/libreoffice: Fix build with glibc-2.24

Gentoo-bug: 604176

Package-Manager: portage-2.3.3

 .../libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 ++
 app-office/libreoffice/libreoffice-5.2.5.1.ebuild  |  3 +++
 app-office/libreoffice/libreoffice-5.2..ebuild |  3 +++
 app-office/libreoffice/libreoffice-5.3.0.3.ebuild  |  3 +++
 app-office/libreoffice/libreoffice-5.3..ebuild |  3 +++
 app-office/libreoffice/libreoffice-.ebuild |  3 +++
 6 files changed, 25 insertions(+)

diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch 
b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
new file mode 100644
index 00..d714ff2074
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
@@ -0,0 +1,10 @@
+--- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c   2017-01-11 
16:54:33.0 -0800
 libreoffice-5.2.5.1/desktop/unx/source/pagein.c2017-02-03 
10:22:51.697673613 -0800
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ /* do_pagein */
+ static void do_pagein (const char * filename)

diff --git a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild 
b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
index d104014a02..4da4a96eb6 100644
--- a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
@@ -245,6 +245,9 @@ PATCHES=(
 
# not upstreamable stuff
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+
+   # TODO: upstream
+   "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 )
 
 pkg_pretend() {

diff --git a/app-office/libreoffice/libreoffice-5.2..ebuild 
b/app-office/libreoffice/libreoffice-5.2..ebuild
index d104014a02..4da4a96eb6 100644
--- a/app-office/libreoffice/libreoffice-5.2..ebuild
+++ b/app-office/libreoffice/libreoffice-5.2..ebuild
@@ -245,6 +245,9 @@ PATCHES=(
 
# not upstreamable stuff
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+
+   # TODO: upstream
+   "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 )
 
 pkg_pretend() {

diff --git a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild 
b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
index 66fe06013a..9dc3f33d8a 100644
--- a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
@@ -245,6 +245,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+   # TODO: upstream
+   "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 )
 
 pkg_pretend() {

diff --git a/app-office/libreoffice/libreoffice-5.3..ebuild 
b/app-office/libreoffice/libreoffice-5.3..ebuild
index b8cd07d14d..187b52ebe9 100644
--- a/app-office/libreoffice/libreoffice-5.3..ebuild
+++ b/app-office/libreoffice/libreoffice-5.3..ebuild
@@ -244,6 +244,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+   # TODO: upstream
+   "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 )
 
 pkg_pretend() {

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index e0e9d615e0..edc20fcdbb 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -245,6 +245,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+   # TODO: upstream
+   "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/, sys-fs/e4rat/files/

2017-02-11 Thread Andrew Savchenko 
commit: 01bb8c32471a29081be7d77f52e0f95da371b1cf
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Feb 12 00:05:33 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Feb 12 00:05:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bb8c32

sys-fs/e4rat: fix memory corruption

It is unsafe to use Config::get(arg)c_str() pointer
directly, since it may be overwritten by later get calls.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild | 64 ++
 sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch| 41 +
 2 files changed, 105 insertions(+)

diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild 
b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
new file mode 100644
index 00..6792b38e4e
--- /dev/null
+++ b/sys-fs/e4rat/e4rat-0.2.4_pre20141201-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="Toolset to accelerate the boot process and application startup"
+HOMEPAGE="http://e4rat.sourceforge.net/;
+#SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-0.2.4_pre20141201.tar.xz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-lang/perl:=
+   >=dev-libs/boost-1.42:=
+   sys-fs/e2fsprogs
+   sys-process/audit[static-libs(+)]
+   sys-process/lsof
+"
+DEPEND="${DEPEND}"
+
+CONFIG_CHECK="~AUDITSYSCALL"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.2.2-shared-build.patch
+   "${FILESDIR}"/${PN}-0.2.2-libdir.patch
+   "${FILESDIR}"/${PN}-0.2.4-sysmacros.patch #580534
+   "${FILESDIR}"/${PN}-0.2.4-gcc6.patch #594046
+   "${FILESDIR}"/${PN}-0.2.4-strdup.patch
+)
+
+pkg_setup() {
+   check_extra_config
+   DOC_CONTENTS="
+   To launch systemd from e4rat you simply need to edit 
/etc/e4rat.conf
+   and set:\n
+   ; path to init process binary (DEFAULT: /sbin/init)\n
+   init /usr/lib/systemd/systemd"
+}
+
+src_install() {
+   cmake-utils_src_install
+   # relocate binaries to /sbin. If someone knows of a better way to do it
+   # please do tell me
+   dodir sbin
+   find "${D}"/usr/sbin -type f -exec mv {} "${D}"/sbin/. \; \
+   || die
+
+   readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+   readme.gentoo_print_elog
+   if has_version sys-apps/preload; then
+   elog "It appears you have sys-apps/preload installed. This may"
+   elog "has negative effects on ${PN}. You may want to disable 
preload"
+   elog "when using ${PN}."
+   fi
+}

diff --git a/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch 
b/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch
new file mode 100644
index 00..c3a9cd0e8c
--- /dev/null
+++ b/sys-fs/e4rat/files/e4rat-0.2.4-strdup.patch
@@ -0,0 +1,41 @@
+--- e4rat-0.2.4_pre20141201/src/e4rat-collect.cc.orig  2014-11-24 
12:12:12.0 +0300
 e4rat-0.2.4_pre20141201/src/e4rat-collect.cc   2017-02-12 
02:16:25.151757182 +0300
+@@ -32,6 +32,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ /* EXT2_SUPER_MAGIC */
+ #include 
+@@ -361,7 +362,9 @@
+ {
+ create_pid_late = true;
+ 
+-outPath = Config::get("startup_log_file").c_str();
++// It is unsafe to use Config::get(arg)c_str() pointer
++// directly, since it may be overwritten by later get calls.
++outPath = 
strdup(Config::get("startup_log_file").c_str());
+ verbose = 0;
+ }
+ else
+--- e4rat-0.2.4_pre20141201/src/e4rat-preload.cc.orig  2014-11-24 
12:12:12.0 +0300
 e4rat-0.2.4_pre20141201/src/e4rat-preload.cc   2017-02-12 
02:16:38.425552630 +0300
+@@ -25,6 +25,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+@@ -227,7 +228,8 @@
+ try {
+ if(getpid() == 1)
+ {
+-const char* logfile = 
Config::get("startup_log_file").c_str();
++// pointer may change, string must be copied
++const char* logfile = 
strdup(Config::get("startup_log_file").c_str());
+ notice("Open %s ... ", logfile);
+ FILE* infile = fopen(logfile, "r");
+ if(!infile)

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

2017-02-11 Thread Andreas Sturmlechner 
commit: 91df9cfebbc0ac58b663856f13a087305738c4a7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:01:11 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 23:34:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91df9cfe

kde-apps/cantor: Fix sandbox violation

Gentoo-bug: 602894
Thanks-to: Vadim A. Misbakh-Soloviov

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild 
b/kde-apps/cantor/cantor-16.12.2.ebuild
index ffa0d358d8..96540cab7f 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -84,6 +84,8 @@ src_prepare() {
 }
 
 src_configure() {
+   use julia && addpredict /proc/self/mem # bug 602894
+
local mycmakeargs=(
$(cmake-utils_use_find_package analitza Analitza5)
$(cmake-utils_use_find_package julia Julia)

[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/

2017-02-11 Thread Andreas Sturmlechner 
commit: adb1ff04a2bddaf9a934bc7698aa10301dc1e2e2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:49:09 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 23:34:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb1ff04

kde-apps/cantor: Fix build w/ USE=julia and KF-5.31

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.2.ebuild  |   1 +
 .../{cantor-16.12.2.ebuild => cantor-.ebuild}  |   7 +-
 .../files/cantor-16.12.2-julia-kf-5.31.patch   | 190 +
 3 files changed, 193 insertions(+), 5 deletions(-)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild 
b/kde-apps/cantor/cantor-16.12.2.ebuild
index 669532f809..2e6883b3b3 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -59,6 +59,7 @@ RESTRICT+=" test"
 PATCHES=(
"${FILESDIR}"/${P}-bashism.patch
"${FILESDIR}"/${P}-python-kf-5.31.patch
+   "${FILESDIR}"/${P}-julia-kf-5.31.patch
 )
 
 pkg_pretend() {

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild 
b/kde-apps/cantor/cantor-.ebuild
similarity index 96%
copy from kde-apps/cantor/cantor-16.12.2.ebuild
copy to kde-apps/cantor/cantor-.ebuild
index 669532f809..fb71acbf56 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-.ebuild
@@ -12,7 +12,7 @@ inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://www.kde.org/applications/education/cantor 
https://edu.kde.org/cantor;
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="analitza julia lua postscript python qalculate +R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -56,10 +56,7 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
-PATCHES=(
-   "${FILESDIR}"/${P}-bashism.patch
-   "${FILESDIR}"/${P}-python-kf-5.31.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
 
 pkg_pretend() {
kde5_pkg_pretend

diff --git a/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch 
b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch
new file mode 100644
index 00..425c61eb48
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch
@@ -0,0 +1,190 @@
+From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 11 Feb 2017 22:46:35 +0100
+Subject: [PATCH] [julia] Fix build with -fno-operator-names
+
+REVIEW: 129942
+---
+ src/backends/julia/juliaexpression.cpp |  6 +++---
+ src/backends/julia/juliaextensions.cpp |  4 ++--
+ src/backends/julia/juliahighlighter.cpp|  4 ++--
+ src/backends/julia/juliakeywords.cpp   | 10 +-
+ src/backends/julia/juliaserver/juliaserver.cpp |  4 ++--
+ src/backends/julia/juliaserver/main.cpp|  4 ++--
+ src/backends/julia/juliasession.cpp|  4 ++--
+ 7 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/backends/julia/juliaexpression.cpp 
b/src/backends/julia/juliaexpression.cpp
+index 27cdd85..618200d 100644
+--- a/src/backends/julia/juliaexpression.cpp
 b/src/backends/julia/juliaexpression.cpp
+@@ -40,7 +40,7 @@ void JuliaExpression::evaluate()
+ 
+ // Plots integration
+ m_plot_filename.clear();
+-if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
++if (juliaSession->integratePlots() && checkPlotShowingCommands()) {
+ // Simply add plot saving command to the end of execution
+ QStringList inlinePlotFormats;
+ inlinePlotFormats << QLatin1String("svg");
+@@ -73,8 +73,8 @@ void JuliaExpression::finalize()
+ setResult(new Cantor::TextResult(juliaSession->getOutput()));
+ setStatus(Cantor::Expression::Error);
+ } else {
+-if (not m_plot_filename.isEmpty()
+-and QFileInfo(m_plot_filename).exists()) {
++if (!m_plot_filename.isEmpty()
++&& QFileInfo(m_plot_filename).exists()) {
+ // If we have plot in result, show it
+ setResult(
+ new 
Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
+diff --git a/src/backends/julia/juliaextensions.cpp 
b/src/backends/julia/juliaextensions.cpp
+index 4585c6f..ad5e3a9 100644
+--- a/src/backends/julia/juliaextensions.cpp
 b/src/backends/julia/juliaextensions.cpp
+@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d(
+ {
+ auto new_left = left;
+ auto new_right = right;
+-if (new_left.isEmpty() and new_right.isEmpty()) {
++if (new_left.isEmpty() && new_right.isEmpty()) {
+ new_left = QLatin1String("-1");
+ new_right = QLatin1String("1");
+ } else if (new_left.isEmpty()) {
+@@ -165,7 +165,7 @@ QString JuliaPlotExtension::plotFunction3d(
+ {
+ 
+ auto update_interval = [](Interval ) {
+-if (interval.first.isEmpty() and interval.second.isEmpty()) {
++if

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

2017-02-11 Thread Andreas Sturmlechner 
commit: 40dd87b57b14c0f695529c786e59404e648f83a1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:15:03 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 23:34:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dd87b5

kde-apps/cantor: Add einfo about LaTeX support

Gentoo-bug: 603608
Reported-by: Emmanuel Lepage Vallee  gmail.com>

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.2.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild 
b/kde-apps/cantor/cantor-16.12.2.ebuild
index a1f359a35e..19314488a8 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -69,6 +69,12 @@ pkg_pretend() {
einfo "Alternatively, install one of these:"
einfo "# emerge sci-mathematics/maxima"
einfo "# emerge sci-mathematics/octave"
+   einfo
+   fi
+
+   if ! has_version virtual/latex-base; then
+   einfo "For LaTeX support:"
+   einfo "# emerge virtual/latex-base"
fi
 }

[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/

2017-02-11 Thread Andreas Sturmlechner 
commit: 9be309db2b2c026522ff84601e8cef1c8a1eb9d3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:03:50 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 23:34:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be309db

kde-apps/cantor: Fix bashism

Gentoo-bug: 596940
Thanks-to: Michael Palimaka (kensington)

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.2.ebuild  |  2 ++
 kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +
 2 files changed, 15 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild 
b/kde-apps/cantor/cantor-16.12.2.ebuild
index 96540cab7f..a1f359a35e 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}"/${P}-bashism.patch )
+
 pkg_pretend() {
kde5_pkg_pretend
 

diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch 
b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
new file mode 100644
index 00..424ca4d15a
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
+index 6303417..6494884 100644
+--- a/cmake/FindR.cmake
 b/cmake/FindR.cmake
+@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ELSE(WIN32)
+   EXECUTE_PROCESS(
+-COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
++COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ENDIF(WIN32)
+   ENDIF(NOT R_INCLUDE_DIR)

[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/files/, kde-apps/cantor/

2017-02-11 Thread Andreas Sturmlechner 
commit: ac7535cce2ad786c5ec95d8c68902afd64a3cbca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 23:23:57 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 23:34:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7535cc

kde-apps/cantor: Fix build w/ USE=python and KF-5.31

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.2.ebuild  |  5 +++-
 .../files/cantor-16.12.2-python-kf-5.31.patch  | 28 ++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild 
b/kde-apps/cantor/cantor-16.12.2.ebuild
index 19314488a8..669532f809 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -56,7 +56,10 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${P}-bashism.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-bashism.patch
+   "${FILESDIR}"/${P}-python-kf-5.31.patch
+)
 
 pkg_pretend() {
kde5_pkg_pretend

diff --git a/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch 
b/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch
new file mode 100644
index 00..b8c5161b49
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch
@@ -0,0 +1,28 @@
+commit 4b8ef6bed62daced90c7826985650c2a813d2996
+Author: Jonathan Riddell 
+Date:   Wed Feb 8 14:56:48 2017 +
+
+remove modern C++ use to fix compile with current KDE policy
+
+diff --git a/src/backends/python/pythonhighlighter.cpp 
b/src/backends/python/pythonhighlighter.cpp
+index 4064524..87b10dd 100644
+--- a/src/backends/python/pythonhighlighter.cpp
 b/src/backends/python/pythonhighlighter.cpp
+@@ -87,7 +87,7 @@ void PythonHighlighter::highlightBlock(const QString )
+ while (pos < text.length()) {
+ // Trying to close current environments
+ bool triggered = false;
+-for (int i = 0; i < flags.size() and not triggered; i++) {
++for (int i = 0; i < flags.size() && !triggered; i++) {
+ int flag = flags[i];
+ QRegExp  = regexps[i];
+ QTextCharFormat  = formats[i];
+@@ -126,7 +126,7 @@ void PythonHighlighter::highlightBlock(const QString )
+ singleLineCommentStart.indexIn(text, pos);
+ 
+ if (singleLineCommentStartPos != -1
+-and singleLineCommentStartPos < minPos) {
++&& singleLineCommentStartPos < minPos) {
+ setFormat(pos, text.length() - pos, commentFormat());
+ break;
+ } else if (minRegexp) {

[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/files/, kde-apps/cantor/

2017-02-11 Thread Andreas Sturmlechner 
commit: 20cd86b3fed9b5f581f98be73397f3e63f44c8ed
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:49:09 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 22:50:52 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=20cd86b3

kde-apps/cantor: Fix build with -fno-operator-names

Simplify check for LaTeX support.

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.49..ebuild|   9 +-
 kde-apps/cantor/cantor-.ebuild |   4 +-
 .../files/cantor-16.12.2-julia-kf-5.31.patch   | 190 +
 3 files changed, 198 insertions(+), 5 deletions(-)

diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild 
b/kde-apps/cantor/cantor-16.12.49..ebuild
index d78de977bd..d5da0c7aa1 100644
--- a/kde-apps/cantor/cantor-16.12.49..ebuild
+++ b/kde-apps/cantor/cantor-16.12.49..ebuild
@@ -56,7 +56,10 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-16.12.2-bashism.patch
+   "${FILESDIR}"/${PN}-16.12.2-julia-kf-5.31.patch
+)
 
 pkg_pretend() {
kde5_pkg_pretend
@@ -72,9 +75,9 @@ pkg_pretend() {
einfo
fi
 
-   if ! has_version virtual/latex-base || ! has_version 
dev-texlive/texlive-genericrecommended; then
+   if ! has_version virtual/latex-base; then
einfo "For LaTeX support:"
-   einfo "# emerge virtual/latex-base 
dev-texlive/texlive-genericrecommended"
+   einfo "# emerge virtual/latex-base"
fi
 }
 

diff --git a/kde-apps/cantor/cantor-.ebuild 
b/kde-apps/cantor/cantor-.ebuild
index d78de977bd..fb71acbf56 100644
--- a/kde-apps/cantor/cantor-.ebuild
+++ b/kde-apps/cantor/cantor-.ebuild
@@ -72,9 +72,9 @@ pkg_pretend() {
einfo
fi
 
-   if ! has_version virtual/latex-base || ! has_version 
dev-texlive/texlive-genericrecommended; then
+   if ! has_version virtual/latex-base; then
einfo "For LaTeX support:"
-   einfo "# emerge virtual/latex-base 
dev-texlive/texlive-genericrecommended"
+   einfo "# emerge virtual/latex-base"
fi
 }
 

diff --git a/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch 
b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch
new file mode 100644
index 00..425c61eb48
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch
@@ -0,0 +1,190 @@
+From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 11 Feb 2017 22:46:35 +0100
+Subject: [PATCH] [julia] Fix build with -fno-operator-names
+
+REVIEW: 129942
+---
+ src/backends/julia/juliaexpression.cpp |  6 +++---
+ src/backends/julia/juliaextensions.cpp |  4 ++--
+ src/backends/julia/juliahighlighter.cpp|  4 ++--
+ src/backends/julia/juliakeywords.cpp   | 10 +-
+ src/backends/julia/juliaserver/juliaserver.cpp |  4 ++--
+ src/backends/julia/juliaserver/main.cpp|  4 ++--
+ src/backends/julia/juliasession.cpp|  4 ++--
+ 7 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/backends/julia/juliaexpression.cpp 
b/src/backends/julia/juliaexpression.cpp
+index 27cdd85..618200d 100644
+--- a/src/backends/julia/juliaexpression.cpp
 b/src/backends/julia/juliaexpression.cpp
+@@ -40,7 +40,7 @@ void JuliaExpression::evaluate()
+ 
+ // Plots integration
+ m_plot_filename.clear();
+-if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
++if (juliaSession->integratePlots() && checkPlotShowingCommands()) {
+ // Simply add plot saving command to the end of execution
+ QStringList inlinePlotFormats;
+ inlinePlotFormats << QLatin1String("svg");
+@@ -73,8 +73,8 @@ void JuliaExpression::finalize()
+ setResult(new Cantor::TextResult(juliaSession->getOutput()));
+ setStatus(Cantor::Expression::Error);
+ } else {
+-if (not m_plot_filename.isEmpty()
+-and QFileInfo(m_plot_filename).exists()) {
++if (!m_plot_filename.isEmpty()
++&& QFileInfo(m_plot_filename).exists()) {
+ // If we have plot in result, show it
+ setResult(
+ new 
Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
+diff --git a/src/backends/julia/juliaextensions.cpp 
b/src/backends/julia/juliaextensions.cpp
+index 4585c6f..ad5e3a9 100644
+--- a/src/backends/julia/juliaextensions.cpp
 b/src/backends/julia/juliaextensions.cpp
+@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d(
+ {
+ auto new_left = left;
+ auto new_right = right;
+-if (new_left.isEmpty() and new_right.isEmpty()) {
++if (new_left.isEmpty() && new_right.isEmpty()) {
+ new_left = QLatin1String("-1");
+

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

2017-02-11 Thread Patrice Clement 
commit: 85217c09b4da95ebac15b53efde2e3151217b1fc
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Feb 11 22:01:13 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Feb 11 23:25:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85217c09

dev-python/brython: version bump.

Package-Manager: portage-2.3.3
Signed-off-by: Patrice Clement  gentoo.org>

 dev-python/brython/Manifest |  1 +
 dev-python/brython/brython-3.3.0.ebuild | 33 +
 2 files changed, 34 insertions(+)

diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 0c202eb231..a3fdb137fc 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,2 +1,3 @@
 DIST brython-3.2.8.zip 9165384 SHA256 
6ae0ddb8b8b9529ceba4b9dbbcc2276eef787e4933bf4f94275cf0cf192eb96a SHA512 
409d1338120479bfb0558e7f875f36d022e1a86ce2bbe8cb30ab10a4e2059f2e0ffa6fb7681ecddcf373bbc483a6c25ff44c647c1f38acc7afc14907506b793d
 WHIRLPOOL 
8c411f0e22563799ccfffde707d70b2272aac0d6d40ef5f1d00889968caf8990b9ae6105db1d0c25226024a45027e24c4fd41081fe4ae1fad06d4683fea809e3
 DIST brython-3.2.9.zip 9430857 SHA256 
a4eb0fd99312cb3d11f4d98f8dea0f633fc96ee99bf3e46c9ba02acd9f095072 SHA512 
a68c4b88f4c3c2bdd8e713721eb87fe1af053097bf3f8fe0999a0088cb414831c797231eb335fcac3a3d6110059f7e1974a1642cd41fca48bf543fa7989cf850
 WHIRLPOOL 
bca1ac9122a1a111ee5bf7c8f950a7f1c2a418b31c0eb487f3ed587f7278033ef58c9736b1cf208aa374e62a36fbbb9e7f4872eeb07030feb76a7249d2886513
+DIST brython-3.3.0.zip 9405649 SHA256 
4b63b4758bbf08e865fcda647e064265ddc12a6d0cdb76489a614c73c28a8d02 SHA512 
03b0dfcdd1be4a415423317d74fc0c941cdac5682a17a19ccf81d9b19058fda342d21397870a1a8e74a445155f7f736977278d21c38fb22251c8ed4a4489b194
 WHIRLPOOL 
5356a58b155b1783c9bc30c2e9d015660824002101fe6ab9fb183833b370a3aea71cc40ae4c67908f828e202a81968dfb9c4a77e825638f3f02439d56ed1a329

diff --git a/dev-python/brython/brython-3.3.0.ebuild 
b/dev-python/brython/brython-3.3.0.ebuild
new file mode 100644
index 00..f37a32e475
--- /dev/null
+++ b/dev-python/brython/brython-3.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info;
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/python:*"
+
+DEPEND="${RDEPEND}"
+
+need_httpd_cgi
+
+src_install() {
+   dodoc LICENCE.txt README.md
+   rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+   webapp_src_preinst
+
+   insinto "${MY_HTDOCSDIR}"
+   doins -r .
+
+   webapp_src_install
+}

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

2017-02-11 Thread Andreas Hüttel 
commit: f8907190203bb1f071e75a51d4a5de167149be7b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 23:08:18 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 23:10:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8907190

media-libs/libxmi: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/libxmi/Manifest  |  1 -
 media-libs/libxmi/libxmi-1.2.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index 18d11fdbbe..3de97eacee 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,2 +1 @@
-DIST libxmi-1.2.tar.gz 302662 SHA256 
9d56af6d6c41468ca658eb6c4ba33ff7967a388b606dc503cd68d024e08ca40d SHA512 
55cf86064496cb1f551fb1a208f9fe1ee8d826e0e1d7ddc2898bef7316c0ac51b34f5f28840626b901b0720264e08fa95f7ab18b57b12c3f64d8a8d48d83e93a
 WHIRLPOOL 
3d5810219678270ad87479f143f2137fd4dd54fc371a856be38713e0a41c5b4d39e6d75e6c858cd3b23b31c0f59845d25c3cbdce991ea48ab3e6531605c11256
 DIST libxmi-1.3.tar.xz 258672 SHA256 
86f2aed4a89ab1378d4dd32fb8f0e158e4a21e647847471dbff546311194d712 SHA512 
f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
 WHIRLPOOL 
cf102a8a2f97571f1c5a05467dcc8feeb4c156eadab034769078d83f8f66c9af164f59b9de625c107bb7e75d3ce764b3796c9055f7e000578b1c6f1108f36db4

diff --git a/media-libs/libxmi/libxmi-1.2.ebuild 
b/media-libs/libxmi/libxmi-1.2.ebuild
deleted file mode 100644
index 791567ba6c..00
--- a/media-libs/libxmi/libxmi-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C/C++ function library for rasterizing 2-D vector graphics"
-HOMEPAGE="https://www.gnu.org/software/libxmi/;
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="!<=media-libs/plotutils-2.6"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   sed \
-   -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
-   -i configure.in || die
-   autotools-utils_src_prepare
-}

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

2017-02-11 Thread Andreas Hüttel 
commit: 875758d28b1c937923099d255642fc5603bc9434
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 23:07:45 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 23:10:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875758d2

media-libs/plotutils: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/plotutils/plotutils-2.6.ebuild | 71 ---
 1 file changed, 71 deletions(-)

diff --git a/media-libs/plotutils/plotutils-2.6.ebuild 
b/media-libs/plotutils/plotutils-2.6.ebuild
deleted file mode 100644
index ec3ac3d528..00
--- a/media-libs/plotutils/plotutils-2.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-inherit libtool eutils autotools
-
-DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector 
graphics"
-HOMEPAGE="https://www.gnu.org/software/plotutils/;
-SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="+png static-libs X"
-
-DEPEND="
-   !media-libs/libxmi
-   png? ( media-libs/libpng
-   sys-libs/zlib )
-   X? ( x11-libs/libXaw
-   x11-proto/xextproto )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   epatch "${FILESDIR}/${PN}-2.5.1-rangecheck.patch"
-   epatch "${FILESDIR}/${P}-makefile.patch"
-   epatch "${FILESDIR}/${P}-libpng-1.5.patch"
-   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
-   eautoreconf
-   elibtoolize
-}
-
-src_configure() {
-   local myconf
-   if use X ; then
-   myconf="--with-x --enable-libxmi"
-   else
-   myconf="--without-x"
-   fi
-
-   econf \
-   --disable-dependency-tracking \
-   --enable-shared \
-   --enable-libplotter \
-   $(use_enable static-libs static) \
-   $(use_with png libpng) \
-   ${myconf}
-}
-
-src_install() {
-   emake DESTDIR="${D}" install || die "emake install failed"
-   dodoc AUTHORS COMPAT ChangeLog INSTALL.* \
-   KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
-}
-
-pkg_postinst() {
-   if use X ; then
-   elog "There are extra fonts available in the plotutils package."
-   elog "The current ebuild does not install them for you since 
most"
-   elog "of them can be installed via the media-fonts/urw-fonts"
-   elog "package. See /usr/share/doc/${P}/INSTALL.fonts for"
-   elog "information on installing the remaining Tektronix fonts."
-   elog ""
-   elog "If you manually install the extra fonts and use the"
-   elog "program xfig, you might want to recompile to take"
-   elog "advantage of the additional ps fonts."
-   elog "Also, it is possible to enable ghostscript and possibly"
-   elog "your printer to use the HP fonts."
-   fi
-}

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

2017-02-11 Thread Johannes Huber 
commit: c7bda40ac0e3e747285f349115edc40b19754723
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 11 23:06:35 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 11 23:06:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bda40a

net-dns/cagibi: EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/net-dns/cagibi/cagibi-0.2.0.ebuild 
b/net-dns/cagibi/cagibi-0.2.0.ebuild
index d39bd7b8b2..6771b15bb9 100644
--- a/net-dns/cagibi/cagibi-0.2.0.ebuild
+++ b/net-dns/cagibi/cagibi-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 inherit cmake-utils

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

2017-02-11 Thread Andreas Hüttel 
commit: e4c1a3223291e023727ee5e516b370b37ae5806f
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 22:49:12 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 23:03:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c1a322

net-print/cups: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-print/cups/Manifest |   2 -
 net-print/cups/cups-2.1.3-r1.ebuild | 354 
 net-print/cups/cups-2.2.1.ebuild| 351 ---
 3 files changed, 707 deletions(-)

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8c7df15a08..b72b6c00d7 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,4 +1,2 @@
-DIST cups-2.1.3-source.tar.bz2 8832400 SHA256 
36a70d43584aea2617da914b9331e23341c3501a8254c4d2eae9c11ec01fd4d3 SHA512 
5cc715b8521b4d6af29a97a8abf7a1b0973840c00727ee8e7926e89a4a9da8e67565d14cc4b57ab7cfb40b238d4faaed7608b9ab95947cc3671ed87b710f8f36
 WHIRLPOOL 
161c65b8adc3ab1c65208fe23bf14aefe5dfd84e9b162c69b1a8f977c3a4fc7c31ea92d0c2eaca3c276fa192596a31701052f0c2a1ffd213a09d48c11d446f6f
 DIST cups-2.1.4.tar.gz 9572653 SHA256 
1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301 SHA512 
5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae
 WHIRLPOOL 
217b9024c34369c8839b0a1b2b3924eb00e9b8d87cfd8d50a59ad0c33c1044f53d479246d67dff4598049efd15259def90e4bcddc6c3c20dff38811e159d2c4b
-DIST cups-2.2.1.tar.gz 9485107 SHA256 
e5864ac2f984a0f8dcb8c1e3a71740f8e4727da73944f93c7ef84adeccc1d971 SHA512 
b7f10fcb0bbf1eb977d1568032f660ad4aedb25c0195fa133e1c5b365df8fc38170d9c3fcfeeac3e1a2541cba5ac7218ea17736c601802cffcfb446a4a578ce8
 WHIRLPOOL 
14080b7cf9791db12b462eb5a7d05cc4218560b0a95d2caedd1ca71996a524f3ad7ea0d65b14a14414a7359f15b112f8ba2d6f5fa489d6d3f5873a902c0cef4c
 DIST cups-2.2.2.tar.gz 9489493 SHA256 
5e7b396b41f55231dde8dd0465cdd81583cd47ecffe4960c777162fbe3cce03c SHA512 
98640b62f706609bbe703318999efb8f78c747e751aafaa1a6f38f4f0dca6fad84ec7e1dfbe9ce17b02ba2ac3fd6e8e480582be5c2cee8eaa707c0ca7eb1978f
 WHIRLPOOL 
745c80114dcac1ed61eec8a8d903ced0d005ec0ad2c05883dcb0aaf9afaf1c410801245ef6bdcb5b77f09a9d96f90e2f94d553b4a19d9425d4005738c8508feb

diff --git a/net-print/cups/cups-2.1.3-r1.ebuild 
b/net-print/cups/cups-2.1.3-r1.ebuild
deleted file mode 100644
index cf16942e95..00
--- a/net-print/cups/cups-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
-   multilib multilib-minimal pam python-single-r1 user versionator \
-   java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="http://www.cups.org/cups.git;
-   if [[ ${PV} !=  ]]; then
-   EGIT_BRANCH=branch-${PV/.}
-   fi
-else
-   SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2;
-   KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
-   python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca cs de es fr it ja ru"
-for X in ${LANGS} ; do
-   IUSE="${IUSE} +linguas_${X}"
-done
-
-CDEPEND="
-   app-text/libpaper
-   acl? (
-   kernel_linux? (
-   sys-apps/acl
-   sys-apps/attr
-   )
-   )
-   dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.6:* )
-   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   !lprng-compat? ( !net-print/lprng )
-   pam? ( virtual/pam )
-   python? ( ${PYTHON_DEPS} )
-   ssl? (
-   >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
-   >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-   )
-   systemd? ( sys-apps/systemd )
-   usb? ( virtual/libusb:1 )
-   X? ( x11-misc/xdg-utils )
-   xinetd? ( sys-apps/xinetd )
-   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-   abi_x86_32? (
-   !<=app-emulation/emul-linux-x86-baselibs-20140508
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   )
-"
-
-DEPEND="${CDEPEND}
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
-   selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
-   python? ( ${PYTHON_REQUIRED_USE} )
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/

2017-02-11 Thread Johannes Huber 
commit: 70aefb82c56c571ab7d365227906100dd1499e2d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 11 23:01:48 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 11 23:02:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70aefb82

sci-libs/nemesis: Remove 5.22b

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/nemesis/Manifest |  1 -
 sci-libs/nemesis/nemesis-5.22b.ebuild | 47 ---
 2 files changed, 48 deletions(-)

diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index 8ac35752c0..4016581c4f 100644
--- a/sci-libs/nemesis/Manifest
+++ b/sci-libs/nemesis/Manifest
@@ -1,3 +1,2 @@
-DIST exodus-5.22b.tar.gz 4693236 SHA256 
6781b96039af030a98ddb893c40db06959b4843b6e2961c770b5d64d90241265 SHA512 
04364b473d074c8bff194c63ed5ef78cb163ccc72a8dd196803646e8a8fe0faf25f9fd9a68d6df0ee821b9a84341b6aeabcc816b476fb3f7befe1e482a9455b7
 WHIRLPOOL 
a95c98db2c6d825602618acaeced503bc1b9e312b6a4968011bd663d4c036976b4f5bf3fd45ceec0f31d3bca8e9a8cb6d53fd2d1b33ab25ec9e0993436abc7c6
 DIST exodus-5.24.tar.bz2 4252980 SHA256 
c16a70c0572341c7e680f8d6420c79e1fd744ba717dc4f7e023f7421c636515d SHA512 
d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e
 WHIRLPOOL 
5a622fce123d55187c0895934db76c2cfb3ab2e83e13d6f5b6655c388e7cac1107acaa786b75be5275de7398035a5604d0be2975c78da05edbdaa4f8efbf9513
 DIST exodus-6.09.tar.gz 4757028 SHA256 
e14db4c1e2ca893c4602055036b827b8332746439f0869489fdc677058faebe8 SHA512 
a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
 WHIRLPOOL 
97426e487c8f6ae31da4be36f3712ade99eb7e31feb67d3989153dadc394b427b8e38976f06e99c153fae3d04b05357b48b0b537ff0c04fb8199b9aaeb27bcc4

diff --git a/sci-libs/nemesis/nemesis-5.22b.ebuild 
b/sci-libs/nemesis/nemesis-5.22b.ebuild
deleted file mode 100644
index a0e6c6f3b2..00
--- a/sci-libs/nemesis/nemesis-5.22b.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils multilib
-
-MY_PN="exodus"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="
-   sci-libs/exodusii
-   sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
-
-src_prepare() {
-   find ../exodus -delete || die
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   mycmakeargs="${mycmakeargs}
-   -DLIB_INSTALL_DIR=$(get_libdir)
-   -DNETCDF_DIR="${EPREFIX}/usr/"
-   -DEXODUS_DIR="${EPREFIX}/usr/"
-   $(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-   $(cmake-utils_use test BUILD_TESTING)"
-   cmake-utils_src_configure
-}
-
-src_test() {
-   "${BUILD_DIR}"/ne_test || die
-}

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

2017-02-11 Thread James Le Cuirot 
commit: f3da5541730168382be2c4f99ec11058ffa4a463
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 11 22:58:08 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 11 22:58:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3da5541

Revert "profiles: Remove dead 3dgamers mirror"

This reverts commit fe17e0b949add54ac21175dd50202bb3a510d84f. Sorry,
my grep-fu failed and I thought this was unused. It really is dead
though and there is no like-for-like replacement so ebuilds need to be
fixed.

 profiles/thirdpartymirrors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 01af48f30b..8dacd38ff4 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -1,3 +1,4 @@
+3dgamers   ftp://ftp.planetmirror.com/pub/3dgamers/games/
 alsaprojectftp://ftp.alsa-project.org/pub ftp://mirrors.go-parts.com/alsa/ 
ftp://ftp.task.gda.pl/pub/linux/misc/alsa/ 
ftp://gd.tuwien.ac.at/opsys/linux/alsa/ http://mirrors.zerg.biz/alsa/ 
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/ http://alsa.cybermirror.org/ 
http://alsa.mirror.fr/ http://gd.tuwien.ac.at/opsys/linux/alsa/
 apache http://www.eu.apache.org/dist/ http://www.us.apache.org/dist/ 
http://mirrors.dcarsat.com.ar/apache/ http://apache.xfree.com.ar/ 
http://apache.dattatec.com/ http://mirror.overthewire.com.au/pub/apache/ 
http://apache.mirror.uber.com.au/ http://mirror.mel.bkb.net.au/pub/apache/ 
http://mirror.ventraip.net.au/apache/ 
ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/ 
http://tweedo.com/mirror/apache/ http://mirrors.ispros.com.bd/apache/ 
http://ftp.byfly.by/pub/apache.org/ 
ftp://apache.belnet.be/mirrors/ftp.apache.org/ http://apache.belnet.be/ 
http://apache.cu.be/ http://ftp.unicamp.br/pub/apache/ 
http://apache.igor.onlinedirect.bg/ http://apache.cbox.biz/ 
ftp://apache.mirror.iweb.ca/ http://apache.mirror.iweb.ca/ 
ftp://apache.mirror.rafal.ca/pub/apache/ http://apache.mirror.rafal.ca/ 
ftp://apache.sunsite.ualberta.ca/pub/apache/ http://apache.sunsite.ualberta.ca/ 
ftp://mirror.csclub.uwaterloo.ca/apache/ 
http://mirror.csclub.uwaterloo.ca/apache/ http://apache.parentingameri
 ca.com/ http://apache.mirror.vexxhost.com/ http://apache.mirror.nexicom.net/ 
http://mirrors.cnnic.cn/apache/ http://apache.dataguru.cn/ 
http://mirror.bit.edu.cn/apache/ http://mirror.bjtu.edu.cn/apache/ 
http://mirrors.tuna.tsinghua.edu.cn/apache/ http://mirror.esocc.com/apache/ 
http://apache.etoak.com/ http://apache.fayea.com/apache-mirror/ 
ftp://mirrors.ucr.ac.cr/apache/ http://mirrors.ucr.ac.cr/apache/ 
http://ftp.carnet.hr/misc/apache/ ftp://mirror.hosting90.cz/apache/ 
http://mirror.hosting90.cz/apache/ http://apache.miloslavbrada.cz/ 
http://mirrors.rackhosting.com/apache/ http://ftp.download-by.net/apache/ 
http://mirrors.dotsrc.org/apache/ http://servingzone.com/mirrors/apache/ 
ftp://ftp.funet.fi/pub/mirrors/apache.org/ 
http://www.nic.funet.fi/pub/mirrors/apache.org/ 
http://apache.opensourcemirror.com/ http://apache.mirrors.multidist.eu/ 
http://wwwftp.ciril.fr/pub/apache/ http://apache.crihan.fr/dist/ 
ftp://mirrors.ircam.fr/pub/apache/ http://mirrors.ircam.fr/pub/apache/ http://m
 irrors.linsrv.net/apache/ ftp://mir1.ovh.net/ftp.apache.org/dist/ 
http://mir2.ovh.net/ftp.apache.org/dist/ http://apache.websitebeheerjd.nl/ 
http://apache.lauf-forum.at/ http://apache.mirror.clusters.cc/ 
http://mirror3.layerjet.com/apache/ http://mirror.softaculous.com/apache/ 
http://apache.mirror.digionline.de/ ftp://ftp.fu-berlin.de/unix/www/apache/ 
ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ 
http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ 
ftp://mirror.netcologne.de/apache.org/ http://mirror.netcologne.de/apache.org/ 
http://apache.openmirror.de/ ftp://ftp.halifax.rwth-aachen.de/apache/ 
http://ftp.halifax.rwth-aachen.de/apache/ 
http://mirror.serversupportforum.de/apache/ http://mirror.synyx.de/apache/ 
ftp://ftp.uni-erlangen.de/pub/mirrors/apache/ http://apache.imsam.info/ 
ftp://ftp.heikorichter.name/pub/apache/ 
http://ftp.heikorichter.name/pub/apache/ 
http://mirror.arcor-online.net/www.apache.org/ 
http://mirror.derwebwolf.net/apache/ http://apac
 he.mirror.iphh.net/ http://apache.lehtivihrea.org/ 
http://mirror.lwnetwork.org.uk/APACHE/ http://apache.forthnet.gr/ 
ftp://ftp.forthnet.gr/pub/www/apache/ http://apache.otenet.gr/dist/ 
http://apache.tsl.gr/ http://apache.cc.uoc.gr/ 
ftp://ftp.cc.uoc.gr/mirrors/apache/ http://apache.01link.hk/ 
http://ftp.cuhk.edu.hk/pub/packages/apache.org/ http://apache.communilink.net/ 
http://mirrors.devlib.org/apache/ ftp://crysys.hit.bme.hu/pub/apache/ 
ftp://xenia.sote.hu/pub/mirrors/www.apache.org/ 
http://xenia.sote.hu/ftp/mirrors/www.apache.org/ 
http://ftp.heanet.ie/mirrors/www.apache.org/dist/ http://apache.spd.co.il/ 
http://apache.mivzakim.net/ http://it.apache.contactlab.it/ 
ftp://mirror.nohup.it/apache/

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

2017-02-11 Thread Andreas Hüttel 
commit: 2143eec4103aafa440e4fe8d5e9c646b3990db6b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 22:38:12 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 22:39:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2143eec4

net-print/cups-filters: Update live ebuild, add foomatic-rip compatibility 
symlink, bug 501466

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...ers-.ebuild => cups-filters-1.13.3-r1.ebuild} | 20 +---
 net-print/cups-filters/cups-filters-.ebuild  | 20 +---
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/net-print/cups-filters/cups-filters-.ebuild 
b/net-print/cups-filters/cups-filters-1.13.3-r1.ebuild
similarity index 85%
copy from net-print/cups-filters/cups-filters-.ebuild
copy to net-print/cups-filters/cups-filters-1.13.3-r1.ebuild
index 36d27dbf55..b60a155e41 100644
--- a/net-print/cups-filters/cups-filters-.ebuild
+++ b/net-print/cups-filters/cups-filters-1.13.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,10 +6,10 @@ EAPI=6
 
 GENTOO_DEPEND_ON_PERL=no
 
-inherit eutils perl-module autotools systemd
+inherit eutils perl-module systemd
 
 if [[ "${PV}" == "" ]] ; then
-   inherit bzr
+   inherit bzr autotools
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters;
 else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz;
@@ -20,10 +20,9 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_jo
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff 
zeroconf"
 
 RDEPEND="
-   app-text/mupdf
postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
>=app-text/qpdf-3.0.2:=
@@ -39,6 +38,7 @@ RDEPEND="
foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
ldap? ( net-nds/openldap )
+   pdf? ( app-text/mupdf )
perl? ( dev-lang/perl:= )
png? ( media-libs/libpng:0= )
tiff? ( media-libs/tiff:0 )
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
default
-   eautoreconf
+   [[ "${PV}" == "" ]] && eautoreconf
 }
 
 src_configure() {
@@ -63,6 +63,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable foomatic) \
$(use_enable ldap) \
+   $(use_enable pdf mutool) \
$(use_enable postscript ghostscript) \
$(use_enable postscript ijs) \
--with-fontdir="fonts/conf.avail" \
@@ -90,6 +91,11 @@ src_compile() {
 src_install() {
default
 
+   if use foomatic; then
+   # workaround: some printer drivers still require this, bug 
501466
+   dosym /usr/bin/foomatic-rip 
/usr/libexec/cups/filter/foomatic-rip
+   fi
+
if use perl; then
pushd "${S}/scripting/perl" > /dev/null
perl-module_src_install
@@ -105,7 +111,7 @@ src_install() {
 
prune_libtool_files --all
 
-   cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
+   cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
 
if ! use zeroconf ; then
sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' 
"${T}"/cups-browsed || die

diff --git a/net-print/cups-filters/cups-filters-.ebuild 
b/net-print/cups-filters/cups-filters-.ebuild
index 36d27dbf55..b60a155e41 100644
--- a/net-print/cups-filters/cups-filters-.ebuild
+++ b/net-print/cups-filters/cups-filters-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,10 +6,10 @@ EAPI=6
 
 GENTOO_DEPEND_ON_PERL=no
 
-inherit eutils perl-module autotools systemd
+inherit eutils perl-module systemd
 
 if [[ "${PV}" == "" ]] ; then
-   inherit bzr
+   inherit bzr autotools
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters;
 else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz;
@@ -20,10 +20,9 @@ 
HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_jo
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff 
zeroconf"
 
 RDEPEND="
-   app-text/mupdf
postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]

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

2017-02-11 Thread Andreas Hüttel 
commit: d5b8a77d5d5811aff9b7395261beab8c59bf8f0d
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 22:39:11 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 22:39:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b8a77d

net-print/cups-filters: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-print/cups-filters/Manifest   |   4 -
 net-print/cups-filters/cups-filters-1.11.6.ebuild | 124 --
 net-print/cups-filters/cups-filters-1.12.0.ebuild | 124 --
 net-print/cups-filters/cups-filters-1.13.2.ebuild | 124 --
 net-print/cups-filters/cups-filters-1.8.3.ebuild  | 118 
 5 files changed, 494 deletions(-)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 67e8a01211..879c3e070e 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,6 +1,2 @@
-DIST cups-filters-1.11.6.tar.xz 1410116 SHA256 
ed33a824cfdc4eba6633a7d491468da8eecdf120cb05557980c47b4cdfad9c7f SHA512 
425eab182101d7bdd02844febebc7d57ed00d822e12ebb08e57a1244dc9d085f2a3c0eeb8ce4fe7586b32ca1a7cca2019ae62114d86692f0d6a6e60510d2711a
 WHIRLPOOL 
f91ea62ad0dcd85a34193f879bf5290a4d7cfa84ae5060bfbd064ee48290fa5eacf367a04264408ba82d549276a6a63215affd08a90f7a0e5515c1028e768228
-DIST cups-filters-1.12.0.tar.xz 1417696 SHA256 
dc5ba61ca3f30d29a4acc0e4a1b331f2e2d996d1f22a138619e80e7a507b7d01 SHA512 
3f430c8c7aa54d6d4623814ee0102427587a0c5638bd5bb8de7fb63201a7953de2eaf413b458a80f98795b007705c89443ab0587cd555e3faf22b9d95a1196c8
 WHIRLPOOL 
7257c0d42ed334d74d16ef240f5975256f20cd2bcb5f8dc31f353b5766c300c23747b5d1e9ecce718438445b8d41234663386eac78cd1a677c8837251c6c1d7f
-DIST cups-filters-1.13.2.tar.xz 1420012 SHA256 
a407e4196bc7e0f92146f58b7acf7cf72d206bcd4df1b7b8fa909e8093b75953 SHA512 
50b2e5d65f28bd15bd5e60bf11fc5e182c97a00155fb46ad36d058caa63ee60c504ec59cec05407068234cb1232e77c0ffb0bedd6a4c53bdc34055b60e7ed8b0
 WHIRLPOOL 
7fd79d7e5fe20196d2b8510c8b9faa784d4fe0260c50a949aadd43b6697ad0a535b241ca5f01817ed76df646257a9a15988eb0f84cf389e3b49936690f4a
 DIST cups-filters-1.13.3.tar.xz 1421092 SHA256 
e9419d51de9698aeab0e08be2b8b5916770f707b2de721d41794bf2ae1123846 SHA512 
52692473e069017ca9fd2274357514bc99bdc2ed576be329aaa4b2978dcac98124716a77f6ff80f76e2a5b513b4c2cb3cb7d2e3a4d32d9bb90725d053d88c280
 WHIRLPOOL 
b4d17af4e732d848ac40e9d3e0b3f9ec5b6eeb204ef7c694f61a5957b15f397bec131a563c742f30c7e5e88a68b1412d42600372d469324dbff46c285440758e
 DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 
f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 
81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7
 WHIRLPOOL 
4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
-DIST cups-filters-1.8.3.tar.xz 1373028 SHA256 
e1e786f1fbcd3a203d87ebb4106a0ba8d579953cbe22056d12d4ee8143f5341a SHA512 
5c3648670ae141038a373c4e800e81a7584759e3caf8c4e4468cb0da11c0ff521ac80678e603856c7209da6638673400305c38903cb27e3b4d792d17947e2af4
 WHIRLPOOL 
0c0ff9b767f35a61f4b9b2f57392d1a6afce35decf9216e77f7503b62bd67da0fa05f9ed507518599e03d27de50458823499989bf6bfd8d3a3da162292819157

diff --git a/net-print/cups-filters/cups-filters-1.11.6.ebuild 
b/net-print/cups-filters/cups-filters-1.11.6.ebuild
deleted file mode 100644
index 79da710e48..00
--- a/net-print/cups-filters/cups-filters-1.11.6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "" ]] ; then
-   inherit bzr
-   EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters;
-else
-   SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format;
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff 
zeroconf"
-
-RDEPEND="
-   postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-   >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
-   >=app-text/qpdf-3.0.2:=
-   dev-libs/glib:2
-   media-libs/fontconfig
-   media-libs/freetype:2
-   media-libs/lcms:2
-   >=net-print/cups-1.7.3
-   !<=net-print/cups-1.5.
-   sys-devel/bc
-   sys-libs/zlib
-   dbus? ( sys-apps/dbus )
-   foomatic? ( !net-print/foomatic-filters )
-   jpeg? ( virtual/jpeg:0 )
-   ldap? ( net-nds/openldap )
-   pdf? ( app-text/mupdf )
-   perl? (

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/diagrtb/

2017-02-11 Thread Johannes Huber 
commit: cc8deae86628989356bdaa48405abe7a867cb49c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 11 22:35:58 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 11 22:35:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8deae8

sci-mathematics/diagrtb: EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-mathematics/diagrtb/diagrtb-2.64.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/diagrtb/diagrtb-2.64.ebuild 
b/sci-mathematics/diagrtb/diagrtb-2.64.ebuild
index 1283039df7..27c9262aa6 100644
--- a/sci-mathematics/diagrtb/diagrtb-2.64.ebuild
+++ b/sci-mathematics/diagrtb/diagrtb-2.64.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 inherit cmake-utils fortran-2
 
@@ -20,11 +20,14 @@ S="${WORKDIR}"/Source_RTB2011
 
 src_prepare() {
cp "${FILESDIR}"/CMakeLists.txt . || die
+
+   cmake-utils_src_prepare
 }
 
 src_configure() {
-   mycmakeargs=(
-   $(cmake-utils_use examples EXAMPLES)
+   local mycmakeargs=(
+   -DEXAMPLES=$(usex examples)
)
+
cmake-utils_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: net-fs/smbtad/

2017-02-11 Thread Johannes Huber 
commit: e120f7ba188750bef64363d813e426c0e92d0a4c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 11 22:27:50 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 11 22:29:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e120f7ba

net-fs/smbtad: EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-fs/smbtad/smbtad-1.2.6.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net-fs/smbtad/smbtad-1.2.6.ebuild 
b/net-fs/smbtad/smbtad-1.2.6.ebuild
index b664b8b502..f013ad8113 100644
--- a/net-fs/smbtad/smbtad-1.2.6.ebuild
+++ b/net-fs/smbtad/smbtad-1.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 inherit cmake-utils
 
@@ -27,9 +27,11 @@ RDEPEND="${DEPEND}
)
 "
 
-DOCS="README AUTHORS"
+DOCS=( README AUTHORS )
 
 src_prepare() {
+   cmake-utils_src_prepare
+
sed -i \
-e '/CMAKE_C_FLAGS/d' \
CMakeLists.txt || die
@@ -37,7 +39,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use debug)
+   -DDebug=$(usex debug)
)
 
cmake-utils_src_configure

[gentoo-commits] repo/gentoo:master commit in: net-fs/smbtad/

2017-02-11 Thread Johannes Huber 
commit: a87c70239033f42bc72bd394baa246172702ae7d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 11 22:28:57 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 11 22:29:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87c7023

net-fs/smbtad: Drop debug use flag

Option is not provided by upstream build sys.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-fs/smbtad/smbtad-1.2.6.ebuild | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/net-fs/smbtad/smbtad-1.2.6.ebuild 
b/net-fs/smbtad/smbtad-1.2.6.ebuild
index f013ad8113..f614cc6da7 100644
--- a/net-fs/smbtad/smbtad-1.2.6.ebuild
+++ b/net-fs/smbtad/smbtad-1.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://morelias.org/smbta/${P}.tar.bz2;
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE=""
 
 DEPEND="
dev-db/libdbi
@@ -37,14 +37,6 @@ src_prepare() {
CMakeLists.txt || die
 }
 
-src_configure() {
-   local mycmakeargs=(
-   -DDebug=$(usex debug)
-   )
-
-   cmake-utils_src_configure
-}
-
 src_install() {
cmake-utils_src_install

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

2017-02-11 Thread Andreas Hüttel 
commit: 24636b0d040ab64a4e7b1eefb761bc52d62c32b8
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 22:02:43 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 22:03:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24636b0d

media-libs/vigra: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/vigra/Manifest  |   1 -
 .../vigra/files/vigra-1.10.0-automagicness.patch   |  64 --
 .../vigra/files/vigra-1.10.0-cmake-scripts.patch   |  53 -
 .../vigra/files/vigra-1.10.0-mpi-fixes.patch   | 230 -
 media-libs/vigra/vigra-1.10.0.ebuild   | 141 -
 5 files changed, 489 deletions(-)

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 76b42e3384..e4a5835ce7 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,3 +1,2 @@
-DIST vigra-1.10.0-src-with-docu.tar.gz 36122311 SHA256 
42d4a361b0bb52fbfdae7e76000698be04dabba77be3f4248d369139fe96a099 SHA512 
4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d
 WHIRLPOOL 
92cf1517acc6ff11eb255cb6bee523ebcaab118b9f73602baf07be8070c537c5bb7e94a9ccbd97bd7e20e20efeb8ac485a184f1c3609fe7747051ed6ec4ca65f
 DIST vigra-1.11.0-src.tar.gz 51854568 SHA256 
68617de347eae7d4700a8f66cd59ce31d6cd92ffb4a235b4df34c688673af5cb SHA512 
3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
 WHIRLPOOL 
1dc73a42b5033c88427850d72078475211a206d9af69209a5d3d05d1b117baef651ccb8232b0c0428b775160feda28b08aae3f14ab07c353de1b076664a0e105
 DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 
8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 
8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
 WHIRLPOOL 
12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9

diff --git a/media-libs/vigra/files/vigra-1.10.0-automagicness.patch 
b/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
deleted file mode 100644
index 182f40e2c8..00
--- a/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Optional jpeg/tiff/fftw/png dependencies
-Forwarded: not-needed
-Last-Update: 2013-12-11
-
-Index: vigra-1.10.0/CMakeLists.txt
-===
 vigra-1.10.0.orig/CMakeLists.txt
-+++ vigra-1.10.0/CMakeLists.txt
-@@ -59,11 +59,24 @@ ENDIF ()
- ##
- 
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
--VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+OPTION(WITH_TIFF "Enable tiff support" ON)
-+OPTION(WITH_JPEG "Enable jpeg support" ON)
-+OPTION(WITH_PNG "Enable png support" ON)
-+OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(ENABLE_DOC "Build documentation" ON)
-+IF(WITH_TIFF)
-+  VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+ENDIF()
-+IF(WITH_JPEG)
-+  VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+ENDIF()
-+IF(WITH_PNG)
-+  VIGRA_FIND_PACKAGE(PNG)
-+ENDIF()
-+IF(WITH_FFTW3)
-+  VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
-+  VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+ENDIF()
- 
- IF(WITH_OPENEXR)
- VIGRA_FIND_PACKAGE(OpenEXR)
-@@ -85,9 +98,11 @@ IF(WITH_LEMON)
- VIGRA_FIND_PACKAGE(LEMON)
- ENDIF()
- 
--SET(DOXYGEN_SKIP_DOT TRUE)
--FIND_PACKAGE(Doxygen)
--FIND_PACKAGE(PythonInterp)
-+IF(ENABLE_DOC)
-+  SET(DOXYGEN_SKIP_DOT TRUE)
-+  FIND_PACKAGE(Doxygen)
-+  FIND_PACKAGE(PythonInterp)
-+ENDIF()
- 
- IF(WITH_VIGRANUMPY)
- FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-@@ -388,10 +403,4 @@ ELSE()
-   MESSAGE( STATUS "  vigranumpy will NOT be installed" )
- ENDIF()
- 
--IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR
--   NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND)
--  MESSAGE( STATUS "" )
--  MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing 
libraries" )
--ENDIF()
--
- MESSAGE( STATUS "-" )

diff --git a/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch 
b/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
deleted file mode 100644
index dc3a72e43e..00
--- a/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Fix location of installed cmake scripts
-Author: Jens-Malte Gottfried 
-Forwarded: not-needed
-Last-Update: 2013-12-11
-
-Index: vigra-1.10.0/CMakeLists.txt
-===

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

2017-02-11 Thread Andreas Hüttel 
commit: c8c031633ee92bbdfe5df150a7b2122ae73736ef
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 22:00:37 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 22:03:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c03163

media-libs/vigra: Silence repoman

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/vigra/vigra-1.11.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/vigra/vigra-1.11.0.ebuild 
b/media-libs/vigra/vigra-1.11.0.ebuild
index 897275f7ff..2f2c42e3e8 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads,xml"
 inherit cmake-utils python-r1
 
-DESCRIPTION="C++ computer vision library with emphasis on customizable 
algorithms and data structures"
+DESCRIPTION="C++ computer vision library emphasizing customizable algorithms 
and structures"
 HOMEPAGE="https://ukoethe.github.io/vigra/;
 
SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz;
 
@@ -24,7 +24,7 @@ RDEPEND="
>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
fftw? ( sci-libs/fftw:3.0 )
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
-   jpeg? ( virtual/jpeg )
+   jpeg? ( virtual/jpeg:0 )
openexr? ( media-libs/openexr:= )
png? ( media-libs/libpng:0= )
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )

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

2017-02-11 Thread Andreas Hüttel 
commit: c4b2dd5f9ffdbdcd53aaf0ace19dd809e23b55af
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 21:58:50 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 22:03:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b2dd5f

media-libs/vigra: Update HOMEPAGE

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/vigra/vigra-1.11.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/vigra/vigra-1.11.0.ebuild 
b/media-libs/vigra/vigra-1.11.0.ebuild
index b456607684..897275f7ff 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="threads,xml"
 inherit cmake-utils python-r1
 
 DESCRIPTION="C++ computer vision library with emphasis on customizable 
algorithms and data structures"
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/;
+HOMEPAGE="https://ukoethe.github.io/vigra/;
 
SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz;
 
 LICENSE="MIT"

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

2017-02-11 Thread James Le Cuirot 
commit: fe17e0b949add54ac21175dd50202bb3a510d84f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 11 22:00:22 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 11 22:01:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe17e0b9

profiles: Remove dead 3dgamers mirror

 profiles/thirdpartymirrors | 1 -
 1 file changed, 1 deletion(-)

diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 8dacd38ff4..01af48f30b 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -1,4 +1,3 @@
-3dgamers   ftp://ftp.planetmirror.com/pub/3dgamers/games/
 alsaprojectftp://ftp.alsa-project.org/pub ftp://mirrors.go-parts.com/alsa/ 
ftp://ftp.task.gda.pl/pub/linux/misc/alsa/ 
ftp://gd.tuwien.ac.at/opsys/linux/alsa/ http://mirrors.zerg.biz/alsa/ 
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/ http://alsa.cybermirror.org/ 
http://alsa.mirror.fr/ http://gd.tuwien.ac.at/opsys/linux/alsa/
 apache http://www.eu.apache.org/dist/ http://www.us.apache.org/dist/ 
http://mirrors.dcarsat.com.ar/apache/ http://apache.xfree.com.ar/ 
http://apache.dattatec.com/ http://mirror.overthewire.com.au/pub/apache/ 
http://apache.mirror.uber.com.au/ http://mirror.mel.bkb.net.au/pub/apache/ 
http://mirror.ventraip.net.au/apache/ 
ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/ 
http://tweedo.com/mirror/apache/ http://mirrors.ispros.com.bd/apache/ 
http://ftp.byfly.by/pub/apache.org/ 
ftp://apache.belnet.be/mirrors/ftp.apache.org/ http://apache.belnet.be/ 
http://apache.cu.be/ http://ftp.unicamp.br/pub/apache/ 
http://apache.igor.onlinedirect.bg/ http://apache.cbox.biz/ 
ftp://apache.mirror.iweb.ca/ http://apache.mirror.iweb.ca/ 
ftp://apache.mirror.rafal.ca/pub/apache/ http://apache.mirror.rafal.ca/ 
ftp://apache.sunsite.ualberta.ca/pub/apache/ http://apache.sunsite.ualberta.ca/ 
ftp://mirror.csclub.uwaterloo.ca/apache/ 
http://mirror.csclub.uwaterloo.ca/apache/ http://apache.parentingameri
 ca.com/ http://apache.mirror.vexxhost.com/ http://apache.mirror.nexicom.net/ 
http://mirrors.cnnic.cn/apache/ http://apache.dataguru.cn/ 
http://mirror.bit.edu.cn/apache/ http://mirror.bjtu.edu.cn/apache/ 
http://mirrors.tuna.tsinghua.edu.cn/apache/ http://mirror.esocc.com/apache/ 
http://apache.etoak.com/ http://apache.fayea.com/apache-mirror/ 
ftp://mirrors.ucr.ac.cr/apache/ http://mirrors.ucr.ac.cr/apache/ 
http://ftp.carnet.hr/misc/apache/ ftp://mirror.hosting90.cz/apache/ 
http://mirror.hosting90.cz/apache/ http://apache.miloslavbrada.cz/ 
http://mirrors.rackhosting.com/apache/ http://ftp.download-by.net/apache/ 
http://mirrors.dotsrc.org/apache/ http://servingzone.com/mirrors/apache/ 
ftp://ftp.funet.fi/pub/mirrors/apache.org/ 
http://www.nic.funet.fi/pub/mirrors/apache.org/ 
http://apache.opensourcemirror.com/ http://apache.mirrors.multidist.eu/ 
http://wwwftp.ciril.fr/pub/apache/ http://apache.crihan.fr/dist/ 
ftp://mirrors.ircam.fr/pub/apache/ http://mirrors.ircam.fr/pub/apache/ http://m
 irrors.linsrv.net/apache/ ftp://mir1.ovh.net/ftp.apache.org/dist/ 
http://mir2.ovh.net/ftp.apache.org/dist/ http://apache.websitebeheerjd.nl/ 
http://apache.lauf-forum.at/ http://apache.mirror.clusters.cc/ 
http://mirror3.layerjet.com/apache/ http://mirror.softaculous.com/apache/ 
http://apache.mirror.digionline.de/ ftp://ftp.fu-berlin.de/unix/www/apache/ 
ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ 
http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ 
ftp://mirror.netcologne.de/apache.org/ http://mirror.netcologne.de/apache.org/ 
http://apache.openmirror.de/ ftp://ftp.halifax.rwth-aachen.de/apache/ 
http://ftp.halifax.rwth-aachen.de/apache/ 
http://mirror.serversupportforum.de/apache/ http://mirror.synyx.de/apache/ 
ftp://ftp.uni-erlangen.de/pub/mirrors/apache/ http://apache.imsam.info/ 
ftp://ftp.heikorichter.name/pub/apache/ 
http://ftp.heikorichter.name/pub/apache/ 
http://mirror.arcor-online.net/www.apache.org/ 
http://mirror.derwebwolf.net/apache/ http://apac
 he.mirror.iphh.net/ http://apache.lehtivihrea.org/ 
http://mirror.lwnetwork.org.uk/APACHE/ http://apache.forthnet.gr/ 
ftp://ftp.forthnet.gr/pub/www/apache/ http://apache.otenet.gr/dist/ 
http://apache.tsl.gr/ http://apache.cc.uoc.gr/ 
ftp://ftp.cc.uoc.gr/mirrors/apache/ http://apache.01link.hk/ 
http://ftp.cuhk.edu.hk/pub/packages/apache.org/ http://apache.communilink.net/ 
http://mirrors.devlib.org/apache/ ftp://crysys.hit.bme.hu/pub/apache/ 
ftp://xenia.sote.hu/pub/mirrors/www.apache.org/ 
http://xenia.sote.hu/ftp/mirrors/www.apache.org/ 
http://ftp.heanet.ie/mirrors/www.apache.org/dist/ http://apache.spd.co.il/ 
http://apache.mivzakim.net/ http://it.apache.contactlab.it/ 
ftp://mirror.nohup.it/apache/ http://mirror.nohup.it/apache/ 
http://apache.panu.it/ ftp://ftp.panu.it/pub/mirrors/apache/ 
ftp://cis.uniroma2.it/unix/packages/APACHE/ http://apache.fis.uniroma2.it/ 
http://apache.fastbull.org/ http://ftp.jaist.ac.jp/pub/apache/

[gentoo-commits] repo/gentoo:master commit in: games-fps/ut2004-bonuspack-mega/

2017-02-11 Thread James Le Cuirot 
commit: a99b9cb458030efd230fe3264f0c6118cfd05228
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 11 21:58:15 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 11 22:01:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99b9cb4

games-fps/ut2004-bonuspack-mega: Fix broken SRC_URI, bug #609004

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild 
b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
index 3b42037042..66cd2ea757 100644
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,8 +11,7 @@ inherit games games-mods
 
 MY_P="ut2004megapack-linux.tar.bz2"
 HOMEPAGE="http://www.unrealtournament2004.com/;
-SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
-   http://0day.icculus.org/ut2004/${MY_P};
+SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P};
 
 LICENSE="ut2003"
 KEYWORDS="amd64 x86"

[gentoo-commits] repo/gentoo:master commit in: games-fps/ut2004-bonuspack-ece/

2017-02-11 Thread James Le Cuirot 
commit: 13824f134f76eece357293d1150884a737c5ecda
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 11 21:57:16 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 11 22:01:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13824f13

games-fps/ut2004-bonuspack-ece: Fix broken SRC_URI, bug #609004

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild 
b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
index 6e555ab07f..feff52f45b 100644
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,10 +11,7 @@ inherit games games-mods
 
 MY_P="ut2004megapack-linux.tar.bz2"
 HOMEPAGE="http://www.unrealtournament2004.com/;
-SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
-   http://0day.icculus.org/ut2004/${MY_P}
-   ftp://ftp.games.skynet.be/pub/misc/${MY_P}
-   http://sonic-lux.net/data/mirror/ut2004/${MY_P}
+SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}

http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip;
 
 LICENSE="ut2003"

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

2017-02-11 Thread Ulrich Müller 
commit: a2b35658a720d0143d9b7f3a6c70cb45049b1890
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb 11 21:44:04 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 11 21:45:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b35658

media-libs/gstreamer: Add multilib use dependency on sys-libs/libcap.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/media-libs/gstreamer/gstreamer-1.10.3.ebuild 
b/media-libs/gstreamer/gstreamer-1.10.3.ebuild
index fe31fbc683..97bd76760c 100644
--- a/media-libs/gstreamer/gstreamer-1.10.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.10.3.ebuild
@@ -17,7 +17,7 @@ IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-   caps? ( sys-libs/libcap )
+   caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
unwind? ( >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}] )
 "

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

2017-02-11 Thread David Seifert 
commit: 15b82804fc49896e5d3a671684dcc85e34e8db19
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 21:32:05 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 21:35:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b82804

x11-wm/awesome: Make pax-mark failing non-fatal

Bug: https://bugs.gentoo.org/show_bug.cgi?id=603734

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-wm/awesome/awesome-4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/awesome/awesome-4.0.ebuild 
b/x11-wm/awesome/awesome-4.0.ebuild
index adf44d3afc..ab249768bf 100644
--- a/x11-wm/awesome/awesome-4.0.ebuild
+++ b/x11-wm/awesome/awesome-4.0.ebuild
@@ -68,7 +68,7 @@ src_install() {
cmake-utils_src_install
docompress -x /usr/share/doc/awesome/doc
 
-   pax-mark m "${ED%/}"/usr/bin/awesome || die
+   pax-mark m "${ED%/}"/usr/bin/awesome
 
exeinto /etc/X11/Sessions
newexe "${FILESDIR}"/${PN}-session ${PN}

[gentoo-commits] repo/gentoo:master commit in: net-im/skypeforlinux/

2017-02-11 Thread David Seifert 
commit: d5dcfe0c4d82a885353797f90751099b938e9491
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 21:25:24 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 21:34:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dcfe0c

net-im/skypeforlinux: Make pax-mark failing non-fatal

Bug: https://bugs.gentoo.org/show_bug.cgi?id=608918

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-im/skypeforlinux/skypeforlinux-1.17.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-im/skypeforlinux/skypeforlinux-1.17.0.1.ebuild 
b/net-im/skypeforlinux/skypeforlinux-1.17.0.1.ebuild
index 1063c37616..e0b189 100644
--- a/net-im/skypeforlinux/skypeforlinux-1.17.0.1.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-1.17.0.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit eutils rpm
+inherit eutils pax-utils rpm
 
 DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
 HOMEPAGE="https://www.skype.com/;
@@ -97,7 +97,7 @@ src_install() {
domenu usr/share/applications/skypeforlinux.desktop
 
if use pax_kernel; then
-   paxctl -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux || die
+   pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
eqawarn "You have set USE=pax_kernel meaning that you intend to 
run"
eqawarn "${PN} under a PaX enabled kernel. To do so, we must 
modify"
eqawarn "the ${PN} binary itself and this *may* lead to 
breakage! If"

[gentoo-commits] proj/kde:master commit in: kde-apps/cantor/, kde-apps/cantor/files/

2017-02-11 Thread Andreas Sturmlechner 
commit: 17df09aa6b27fc8df525472ce8d227ae7f4834f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:03:50 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 21:03:50 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=17df09aa

kde-apps/cantor: Fix bashism

Gentoo-bug: 596940
Thanks-to: Michael Palimaka (kensington)

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.49..ebuild|  2 ++
 kde-apps/cantor/cantor-.ebuild |  2 ++
 kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +
 3 files changed, 17 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild 
b/kde-apps/cantor/cantor-16.12.49..ebuild
index 8952906c50..0db7d4c646 100644
--- a/kde-apps/cantor/cantor-16.12.49..ebuild
+++ b/kde-apps/cantor/cantor-16.12.49..ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
+
 pkg_pretend() {
kde5_pkg_pretend
 

diff --git a/kde-apps/cantor/cantor-.ebuild 
b/kde-apps/cantor/cantor-.ebuild
index 8952906c50..0db7d4c646 100644
--- a/kde-apps/cantor/cantor-.ebuild
+++ b/kde-apps/cantor/cantor-.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
+
 pkg_pretend() {
kde5_pkg_pretend
 

diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch 
b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
new file mode 100644
index 00..424ca4d15a
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
+index 6303417..6494884 100644
+--- a/cmake/FindR.cmake
 b/cmake/FindR.cmake
+@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ELSE(WIN32)
+   EXECUTE_PROCESS(
+-COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
++COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ENDIF(WIN32)
+   ENDIF(NOT R_INCLUDE_DIR)

[gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/files/, kde-apps/akonadi/

2017-02-11 Thread Andreas Sturmlechner 
commit: 5997acdb424e5071c46b4b9fd42cb583b28fba45
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 20:48:47 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 20:48:55 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5997acdb

kde-apps/akonadi: Build akonadixml unconditionally

kde-apps/akonadiconsole depends on it.

Package-Manager: portage-2.3.3

 kde-apps/akonadi/akonadi-16.12.49..ebuild  |  4 +++-
 kde-apps/akonadi/akonadi-.ebuild   |  3 ++-
 .../akonadi/files/akonadi-16.12.3-akonadixml.patch | 22 ++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-16.12.49..ebuild 
b/kde-apps/akonadi/akonadi-16.12.49..ebuild
index 74c041d5d5..c0f6dc55b7 100644
--- a/kde-apps/akonadi/akonadi-16.12.49..ebuild
+++ b/kde-apps/akonadi/akonadi-16.12.49..ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
-   tools? ( xml? ( dev-libs/libxml2 ) )
+   xml? ( dev-libs/libxml2 )
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${PN}-16.12.0-mysql56-crash.patch"
"${FILESDIR}/${PN}-16.12.1-revert-abs-path.patch"
"${FILESDIR}/${PN}-16.12.1-rename-header.patch"
+   "${FILESDIR}/${PN}-16.12.3-akonadixml.patch"
 )
 
 pkg_setup() {
@@ -99,6 +100,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+   $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
 

diff --git a/kde-apps/akonadi/akonadi-.ebuild 
b/kde-apps/akonadi/akonadi-.ebuild
index 91792b8665..744cc3ac40 100644
--- a/kde-apps/akonadi/akonadi-.ebuild
+++ b/kde-apps/akonadi/akonadi-.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
x11-misc/shared-mime-info
sqlite? ( dev-db/sqlite:3 )
-   tools? ( xml? ( dev-libs/libxml2 ) )
+   xml? ( dev-libs/libxml2 )
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -95,6 +95,7 @@ src_configure() {
local mycmakeargs=(
-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-DBUILD_TOOLS=$(usex tools)
+   $(cmake-utils_use_find_package xml LibXml2)
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
)
 

diff --git a/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch 
b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
new file mode 100644
index 00..6acd5b86dc
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-16.12.3-akonadixml.patch
@@ -0,0 +1,22 @@
+commit 2fe8bf8b73b9f5f5d19c87099b71a71f2595e70f
+Author: Andreas Sturmlechner 
+Date:   Sat Feb 11 21:29:05 2017 +0100
+
+Build akonadixml unconditionally
+
+It makes more sense now that akonadiconsole depends on it.
+
+REVIEW: 129941
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4141947..4e79dc0 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -16,6 +16,4 @@ add_subdirectory(core)
+ add_subdirectory(agentbase)
+ add_subdirectory(widgets)
+ add_subdirectory(selftest)
+-if(BUILD_TOOLS)
+-add_subdirectory(xml)
+-endif()
++add_subdirectory(xml)

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

2017-02-11 Thread Andreas Sturmlechner 
commit: 8ae6af274e5eb70804f256982393741db5f6e711
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 20:52:20 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 20:52:20 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ae6af27

kde-apps/akonadiconsole: Drop USE=tools dep on kde-apps/akonadi

No longer required since 5997acdb424e5071c46b4b9fd42cb583b28fba45

Package-Manager: portage-2.3.3

 kde-apps/akonadiconsole/akonadiconsole-16.12.49..ebuild | 2 +-
 kde-apps/akonadiconsole/akonadiconsole-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/akonadiconsole/akonadiconsole-16.12.49..ebuild 
b/kde-apps/akonadiconsole/akonadiconsole-16.12.49..ebuild
index a29b33fe0d..1678a61a7a 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-16.12.49..ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-16.12.49..ebuild
@@ -28,7 +28,7 @@ DEPEND="
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
-   $(add_kdeapps_dep akonadi 'tools')
+   $(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep calendarsupport)
$(add_kdeapps_dep kcalcore)

diff --git a/kde-apps/akonadiconsole/akonadiconsole-.ebuild 
b/kde-apps/akonadiconsole/akonadiconsole-.ebuild
index a29b33fe0d..1678a61a7a 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-.ebuild
@@ -28,7 +28,7 @@ DEPEND="
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
-   $(add_kdeapps_dep akonadi 'tools')
+   $(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep calendarsupport)
$(add_kdeapps_dep kcalcore)

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

2017-02-11 Thread Andreas Sturmlechner 
commit: 0620af39e75e562bddfc750b7a5c18e5a05d8b14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:15:03 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 21:15:03 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0620af39

kde-apps/cantor: Add einfo about LaTeX support

Gentoo-bug: 603608
Reported-by: Emmanuel Lepage Vallee  gmail.com>

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.49..ebuild | 6 ++
 kde-apps/cantor/cantor-.ebuild  | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild 
b/kde-apps/cantor/cantor-16.12.49..ebuild
index 0db7d4c646..d78de977bd 100644
--- a/kde-apps/cantor/cantor-16.12.49..ebuild
+++ b/kde-apps/cantor/cantor-16.12.49..ebuild
@@ -69,6 +69,12 @@ pkg_pretend() {
einfo "Alternatively, install one of these:"
einfo "# emerge sci-mathematics/maxima"
einfo "# emerge sci-mathematics/octave"
+   einfo
+   fi
+
+   if ! has_version virtual/latex-base || ! has_version 
dev-texlive/texlive-genericrecommended; then
+   einfo "For LaTeX support:"
+   einfo "# emerge virtual/latex-base 
dev-texlive/texlive-genericrecommended"
fi
 }
 

diff --git a/kde-apps/cantor/cantor-.ebuild 
b/kde-apps/cantor/cantor-.ebuild
index 0db7d4c646..d78de977bd 100644
--- a/kde-apps/cantor/cantor-.ebuild
+++ b/kde-apps/cantor/cantor-.ebuild
@@ -69,6 +69,12 @@ pkg_pretend() {
einfo "Alternatively, install one of these:"
einfo "# emerge sci-mathematics/maxima"
einfo "# emerge sci-mathematics/octave"
+   einfo
+   fi
+
+   if ! has_version virtual/latex-base || ! has_version 
dev-texlive/texlive-genericrecommended; then
+   einfo "For LaTeX support:"
+   einfo "# emerge virtual/latex-base 
dev-texlive/texlive-genericrecommended"
fi
 }

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

2017-02-11 Thread Andreas Sturmlechner 
commit: c6ae7f86ed58c4da14b3e3569b224d29ceed8c7f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 11 21:01:11 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 21:01:11 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c6ae7f86

kde-apps/cantor: Fix sandbox violation

Gentoo-bug: 602894
Thanks-to: Vadim A. Misbakh-Soloviov

Package-Manager: portage-2.3.3

 kde-apps/cantor/cantor-16.12.49..ebuild | 2 ++
 kde-apps/cantor/cantor-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/kde-apps/cantor/cantor-16.12.49..ebuild 
b/kde-apps/cantor/cantor-16.12.49..ebuild
index 1d2916dc6a..8952906c50 100644
--- a/kde-apps/cantor/cantor-16.12.49..ebuild
+++ b/kde-apps/cantor/cantor-16.12.49..ebuild
@@ -84,6 +84,8 @@ src_prepare() {
 }
 
 src_configure() {
+   use julia && addpredict /proc/self/mem # bug 602894
+
local mycmakeargs=(
$(cmake-utils_use_find_package analitza Analitza5)
$(cmake-utils_use_find_package julia Julia)

diff --git a/kde-apps/cantor/cantor-.ebuild 
b/kde-apps/cantor/cantor-.ebuild
index 1d2916dc6a..8952906c50 100644
--- a/kde-apps/cantor/cantor-.ebuild
+++ b/kde-apps/cantor/cantor-.ebuild
@@ -84,6 +84,8 @@ src_prepare() {
 }
 
 src_configure() {
+   use julia && addpredict /proc/self/mem # bug 602894
+
local mycmakeargs=(
$(cmake-utils_use_find_package analitza Analitza5)
$(cmake-utils_use_find_package julia Julia)

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/

2017-02-11 Thread Andrew Savchenko 
commit: e0eddef44aaad2d7a39f6e472f268cbf0faeab04
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Feb 11 20:26:09 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Feb 11 20:33:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0eddef4

sys-fs/e4rat: add myself to maintainers

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sys-fs/e4rat/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-fs/e4rat/metadata.xml b/sys-fs/e4rat/metadata.xml
index 7a1f4c71a5..141e2b6b51 100644
--- a/sys-fs/e4rat/metadata.xml
+++ b/sys-fs/e4rat/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   birc...@gentoo.org
+   Andrew Savchenko
+   

e4rat

[gentoo-commits] repo/gentoo:master commit in: sys-fs/e4rat/

2017-02-11 Thread Andrew Savchenko 
commit: 36281c462d6839d7049cd16fb52a184a94080cb8
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Feb 11 20:31:00 2017 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Feb 11 20:33:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36281c46

sys-fs/e4rat: fix bug 608978

Add dep on audit[static-libs] as proposed by Piotr Karbowski
 at bug 608910.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sys-fs/e4rat/e4rat-0.2.4_pre20141201.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fs/e4rat/e4rat-0.2.4_pre20141201.ebuild 
b/sys-fs/e4rat/e4rat-0.2.4_pre20141201.ebuild
index e10b6efa0b..92aed0e971 100644
--- a/sys-fs/e4rat/e4rat-0.2.4_pre20141201.ebuild
+++ b/sys-fs/e4rat/e4rat-0.2.4_pre20141201.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
dev-lang/perl:=
>=dev-libs/boost-1.42:=
sys-fs/e2fsprogs
-   sys-process/audit
+   sys-process/audit[static-libs(+)]
sys-process/lsof
 "
 DEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: net-print/gutenprint/files/, net-print/gutenprint/

2017-02-11 Thread Andreas Hüttel 
commit: 212cc58cd2da78cadcd8a5365daaa0055fb06a2e
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 20:29:44 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 20:29:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212cc58c

net-print/gutenprint: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-print/gutenprint/Manifest  |  1 -
 .../gutenprint/files/gutenprint-5.2.8-genppd.patch | 23 -
 ...rint-switch-from-ijs-config-to-pkg-config.patch | 60 -
 net-print/gutenprint/gutenprint-5.2.11.ebuild  | 97 --
 4 files changed, 181 deletions(-)

diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 0e4da5be11..573e02a219 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,3 +1,2 @@
 DIST gutenprint-5.2.10.tar.bz2 6241585 SHA256 
431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59 SHA512 
bb71fd5c127748730dde01471b09907d500b72c35401abaf92c631d04156bacafd4b1a9baef61f48db6c4a622fd612a1e2834ed30207b5b178767ea9d9d5e1ac
 WHIRLPOOL 
4d809f99df3515fc878d3be5df4f48b66fc764eea1f62db15e75d6ca7326c24c6c228bd975575c20f3e7bc8398c1e492e1025784e64a4534f82ad89c7ba92990
-DIST gutenprint-5.2.11.tar.bz2 6570118 SHA256 
c1a34cd2e02527de4d2a9bf6c14732cb9aa11b333f771eb6043fdc974de24df9 SHA512 
f4010e489dd6763b19113abf1d55e84cea8d36b920d03dbe204dba30ab0d3fb3e3391e739cd1a56e2f63581c8ce4a856a7f747deb6e7b18d7e1f7a3d87901c60
 WHIRLPOOL 
0c6a0495d59ef720da74b610f6c26515ea5d0748e78f1b8eb4bb12277dca874b428ef17f9cf668f0449362900580ecefe35c2d1ebf6f6025519c886fc8a83b9e
 DIST gutenprint-5.2.12.tar.bz2 6898738 SHA256 
a42489fd7d6f2e4320811754bb80b0cd845db6632b52f819fbc2b4b75057341b SHA512 
38dd34ca1946a37d0bdaa7d69f65b11651097b6d7f2b451387afd72b32fc92c3670bf54b46df226ca7a64d78f50117a648e2d6194ebaf2e86627cb29fb0e958e
 WHIRLPOOL 
f69696ae56a27e87006f471a2e9404dad53bf800743f51ce0524735f61f92e4955eb81cf8d9cc8c7e398316d55f7bc6346e2e4a0330689fad790c9ffbd9f7050

diff --git a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch 
b/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
deleted file mode 100644
index f61fb69ccf..00
--- a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am 
gutenprint-5.2.8/src/cups/Makefile.am
 gutenprint-5.2.8.old/src/cups/Makefile.am  2012-06-14 14:03:53.011828220 
+0200
-+++ gutenprint-5.2.8/src/cups/Makefile.am  2012-06-14 14:04:57.672829331 
+0200
-@@ -98,16 +98,16 @@
- 
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = 
genppd.c i18n.c i18n.h
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = 
-DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = 
$(STATIC_LDOPTS)
- 
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = 
genppd.c i18n.c i18n.h
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = 
-DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) 
$(TRANSLATE_PPDS)
--gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = 
$(STATIC_LDOPTS)
- 
- 
rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES
 = rastertoprinter.c i18n.c i18n.h
--rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD
 = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD
 = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- 
rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS
 = $(STATIC_LDOPTS)
- 
- ## Data

diff --git 
a/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
 
b/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
deleted file mode 100644
index 99ef9b74c6..00
--- 
a/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 233a909a77dd4c18d359bf32cd8ef99ed1b7b459 Mon Sep 17 00:00:00 2001
-From: speachy <>
-Date: Fri, 29 Jan 2016 12:41:21 +
-Subject: [PATCH] Apply patch from Brian Norris to switch from 'ijs-config' to
- 'pkg-config' for IJS support, as the former does not work for
- cross-compilation.
-

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

2017-02-11 Thread David Seifert 
commit: f524fc9b507bf571b26d986e5f2468313c99540b
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 11 16:28:28 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:15:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f524fc9b

sys-kernel/aufs-sources: remove unused patches

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

 .../files/aufs-sources-3.10.26-mmap-aufs3.patch| 38 --
 .../files/aufs-sources-3.12.7-mmap-aufs3.patch | 38 --
 2 files changed, 76 deletions(-)

diff --git 
a/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch 
b/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch
deleted file mode 100644
index 48f4da5ac7..00
--- a/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- aufs3-mmap.patch | 17 ++---
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch
-index 398253b..d9b413c 100644
 a/aufs3-mmap.patch
-+++ b/aufs3-mmap.patch
-@@ -215,24 +215,19 @@ index 7905fe7..94cc777 100644
-   if (page->mapping != inode->i_mapping) {
-   unlock_page(page);
- diff --git a/mm/fremap.c b/mm/fremap.c
--index 87da359..92bb6f2 100644
-+index bbc4d66..7deee2c 100644
- --- a/mm/fremap.c
- +++ b/mm/fremap.c
--@@ -202,11 +202,12 @@ get_write_lock:
--   */
--  if (mapping_cap_account_dirty(mapping)) {
--  unsigned long addr;
--- struct file *file = get_file(vma->vm_file);
--+ struct file *file = vma->vm_file;
-+@@ -211,7 +211,9 @@ get_write_lock:
-+  /* mmap_region may free vma; grab the info now */
-+  vm_flags = vma->vm_flags;
-  
- + vma_get_file(vma);
--  addr = mmap_region(file, start, size,
--  vma->vm_flags, pgoff);
--- fput(file);
-+  addr = mmap_region(file, start, size, vm_flags, pgoff);
- + vma_fput(vma);
-+  fput(file);
-   if (IS_ERR_VALUE(addr)) {
-   err = addr;
--  } else {
- diff --git a/mm/madvise.c b/mm/madvise.c
- index 7055883..e6b768d 100644
- --- a/mm/madvise.c

diff --git a/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch 
b/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch
deleted file mode 100644
index b4f7335a91..00
--- a/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- aufs3-mmap.patch | 17 ++---
- 1 file changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch
-index acebfa8..8682a6d 100644
 a/aufs3-mmap.patch
-+++ b/aufs3-mmap.patch
-@@ -215,24 +215,19 @@ index ae4846f..3f890ee 100644
-   if (page->mapping != inode->i_mapping) {
-   unlock_page(page);
- diff --git a/mm/fremap.c b/mm/fremap.c
--index 5bff081..246a9c7 100644
-+index bbc4d66..7deee2c 100644
- --- a/mm/fremap.c
- +++ b/mm/fremap.c
--@@ -207,11 +207,12 @@ get_write_lock:
--   */
--  if (mapping_cap_account_dirty(mapping)) {
--  unsigned long addr;
--- struct file *file = get_file(vma->vm_file);
--+ struct file *file = vma->vm_file;
-+@@ -211,7 +211,9 @@ get_write_lock:
-+  /* mmap_region may free vma; grab the info now */
-+  vm_flags = vma->vm_flags;
-  
- + vma_get_file(vma);
--  addr = mmap_region(file, start, size,
--  vma->vm_flags, pgoff);
--- fput(file);
-+  addr = mmap_region(file, start, size, vm_flags, pgoff);
- + vma_fput(vma);
-+  fput(file);
-   if (IS_ERR_VALUE(addr)) {
-   err = addr;
--  } else {
- diff --git a/mm/madvise.c b/mm/madvise.c
- index 539eeb9..5e700b1 100644
- --- a/mm/madvise.c

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

2017-02-11 Thread David Seifert 
commit: 43fcb0b5540fcd7818b0f8410fb658ac8ce0da45
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 11 16:31:24 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:15:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fcb0b5

sys-libs/efivar: remove unused patch

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

 sys-libs/efivar/files/0.22-flags.patch | 41 --
 1 file changed, 41 deletions(-)

diff --git a/sys-libs/efivar/files/0.22-flags.patch 
b/sys-libs/efivar/files/0.22-flags.patch
deleted file mode 100644
index df49f43af7..00
--- a/sys-libs/efivar/files/0.22-flags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5bc17590cb096340fc695da3020883130437d745 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert 
-Date: Fri, 12 Feb 2016 13:22:13 -0500
-Subject: [PATCH] Make.defaults: Improve gcc/clang detection
-
-The old filter only matched "gcc" or "clang".
-
-The new findstring call matches any occurance of gcc or clang. This is
-useful when CC includes the full host tuple, like x86_64-pc-linux-gnu-gcc.
-
-Signed-off-by: Mike Gilbert 

- Make.defaults | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Make.defaults b/Make.defaults
-index bf814b8..5aed21e 100644
 a/Make.defaults
-+++ b/Make.defaults
-@@ -25,14 +25,14 @@ PKGS   =
- clang_cflags =
- gcc_cflags = -specs=$(TOPDIR)/gcc.specs
- cflags= $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \
--  $(if $(filter $(CC),clang),$(clang_cflags),) \
--  $(if $(filter $(CC),gcc),$(gcc_cflags),) \
-+  $(if $(findstring clang,$(CC)),$(clang_cflags),) \
-+  $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
-   $(call pkg-config-cflags)
- clang_ccldflags =
- gcc_ccldflags =
- ccldflags = $(cflags) $(CCLDFLAGS) $(LDFLAGS) \
--  $(if $(filter $(CCLD),clang),$(clang_ccldflags),) \
--  $(if $(filter $(CCLD),gcc),$(gcc_ccldflags),) \
-+  $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \
-+  $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
-   $(call pkg-config-ccldflags)
- SOFLAGS=-shared
- LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
--- 
-2.7.1
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/dmraid/files/

2017-02-11 Thread David Seifert 
commit: 2877cacb6798eee20ec15bb19bb66738f11875a3
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 11 16:33:17 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2877cacb

sys-fs/dmraid: remove unused patches

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

 .../dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch | 24 ---
 .../files/dmraid-1.0.0_rc15-undo-p-rename.patch| 13 -
 .../files/dmraid-1.0.0_rc16-as-needed2.patch   | 11 ---
 sys-fs/dmraid/files/dmraid-destdir-fix.patch   | 34 --
 4 files changed, 82 deletions(-)

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch 
b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch
deleted file mode 100644
index 1ce8834eba..00
--- a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-devsk-isw.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 ./lib/device/scsi.c.org2009-06-25 15:22:26.605895909 -0700
-+++ ./lib/device/scsi.c2009-06-25 15:56:39.784749181 -0700
-@@ -110,7 +110,9 @@
-   }
- 
-   ret = ret &&
--   (di->serial = dbg_strdup((char *) [p->start + 
1]));
-+   (di->serial = dbg_strdup(remove_white_space
-+(lc, (char *)[p->start + 1],
-+ MAX_RESPONSE_LEN)));
-   }
- 
-   dbg_free(response);
 ./lib/metadata/metadata.c.org  2009-06-25 17:32:19.856309659 -0700
-+++ ./lib/metadata/metadata.c  2009-06-25 17:32:35.502920755 -0700
-@@ -839,7 +839,7 @@
-*/
-   if (T_GROUP(rs)) {
-   _discover_partitions(lc, >sets);
--  return;
-+  continue;
-   }
- 
-   /*

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch 
b/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch
deleted file mode 100644
index 6636b05630..00
--- a/sys-fs/dmraid/files/dmraid-1.0.0_rc15-undo-p-rename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Giuseppe Iuculano 
-Description: Removed "p" from device name. A proper upgrade script is needed 
before using it.
 a/1.0.0.rc15/lib/format/partition/dos.c
-+++ b/1.0.0.rc15/lib/format/partition/dos.c
-@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai
- {
-   const char *base = get_basename(lc, rd->di->path);
- 
--  return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc),
-+  return type ? snprintf(str, len, "%s%u", base,
-  partition) : snprintf(str, len, "%s", base);
- }
- 

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch 
b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch
deleted file mode 100644
index cf3018863f..00
--- a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-as-needed2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 1.0.0.rc16/make.tmpl.in2010-08-16 10:22:32.0 -0400
-+++ 1.0.0.rc16/make.tmpl.in2010-08-16 10:42:49.0 -0400
-@@ -136,7 +136,7 @@
- 
- %.so: $(OBJECTS)
-   $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
--  -Wl,--version-script,.export.sym $(OBJECTS) -o $@ -ldevmapper-event
-+  $(LDFLAGS) -Wl,--version-script,.export.sym $(OBJECTS) -o $@ 
-ldevmapper-event -ldl
- 
- $(LIB_STATIC): $(OBJECTS)
-   $(RM) $@

diff --git a/sys-fs/dmraid/files/dmraid-destdir-fix.patch 
b/sys-fs/dmraid/files/dmraid-destdir-fix.patch
deleted file mode 100644
index 07c6b442f9..00
--- a/sys-fs/dmraid/files/dmraid-destdir-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
 make.tmpl.in.old   2006-09-03 14:38:36.0 -0400
-+++ make.tmpl.in   2006-09-03 14:37:43.0 -0400
-@@ -21,21 +21,21 @@
- SOFLAG += @SOFLAG@
- 
- # Setup directory variables
--prefix = $(DESTDIR)@prefix@
--exec_prefix = $(DESTDIR)@exec_prefix@
--bindir = @bindir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+bindir = $(DESTDIR)@bindir@
- ifeq ("@KLIBC@", "no")
--  libdir = @libdir@
--  sbindir = @sbindir@
--  includedir = @includedir@
--  infodir = @infodir@
--  mandir = @mandir@
-+  libdir = $(DESTDIR)@libdir@
-+  sbindir = $(DESTDIR)@sbindir@
-+  includedir = $(DESTDIR)@includedir@
-+  infodir = $(DESTDIR)@infodir@
-+  mandir = $(DESTDIR)@mandir@
- else
-   libdir = $(DESTDIR)@KLIBC_LIB_DIR@
-   sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@
-   includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@
--  infodir = @infodir@
--  mandir = @mandir@
-+  infodir = $(DESTDIR)@infodir@
-+  mandir = $(DESTDIR)@mandir@
- endif
- 
-

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-ubin/files/

2017-02-11 Thread David Seifert 
commit: e29c096ffb3f060a93ed28ae025e689b325bcbde
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:57:49 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29c096f

sys-freebsd/freebsd-ubin: remove unused patch

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

 .../files/freebsd-ubin-10.1-kdump-workaround.patch  | 13 -
 1 file changed, 13 deletions(-)

diff --git 
a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch 
b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch
deleted file mode 100644
index 064647cfa5..00
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
-index cbf31d0..fa0d04d 100644
 a/usr.bin/kdump/Makefile
-+++ b/usr.bin/kdump/Makefile
-@@ -8,7 +8,7 @@ SFX=   32
- .PATH: ${.CURDIR}/../ktrace
- 
- PROG= kdump
--SRCS= kdump_subr.c kdump.c ioctl.c subr.c
-+SRCS= kdump_subr.h kdump_subr.c kdump.c ioctl.c subr.c
- DPSRCS=   kdump_subr.h 
- CFLAGS+=  -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
-

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-usbin/files/

2017-02-11 Thread David Seifert 
commit: c1f9b251bc260e8c7c794fb1ac34aa29285b46d6
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 17:02:18 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f9b251

sys-freebsd/freebsd-usbin: remove unused patch/files

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

 .../files/freebsd-usbin-9.0-libarchive.patch   | 12 
 sys-freebsd/freebsd-usbin/files/moused.confd   | 20 --
 sys-freebsd/freebsd-usbin/files/moused.initd   | 66 --
 sys-freebsd/freebsd-usbin/files/nfsmount.initd | 63 -
 sys-freebsd/freebsd-usbin/files/powerd.confd   | 14 
 sys-freebsd/freebsd-usbin/files/powerd.initd   | 27 
 sys-freebsd/freebsd-usbin/files/rarpd.confd|  7 --
 sys-freebsd/freebsd-usbin/files/rarpd.initd| 35 --
 sys-freebsd/freebsd-usbin/files/rpcbind.initd  | 30 -
 sys-freebsd/freebsd-usbin/files/syscons.confd  | 14 
 sys-freebsd/freebsd-usbin/files/syscons.initd  | 78 --
 sys-freebsd/freebsd-usbin/files/syslogd.initd  | 25 ---
 12 files changed, 391 deletions(-)

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch 
b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch
deleted file mode 100644
index bfe4794470..00
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 usr.sbin/bsdinstall/distextract/distextract.c.old  2011-11-02 
20:28:08.0 +
-+++ usr.sbin/bsdinstall/distextract/distextract.c  2011-11-02 
20:28:57.0 +
-@@ -32,6 +32,9 @@
- #include 
- #include 
- #include 
-+#ifndef archive_read_free
-+#define archive_read_free(x) archive_read_finish(x)
-+#endif
- 
- static int extract_files(int nfiles, const char **files);
- 

diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd 
b/sys-freebsd/freebsd-usbin/files/moused.confd
deleted file mode 100644
index 4d64933683..00
--- a/sys-freebsd/freebsd-usbin/files/moused.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-
-# See the moused man page for available settings.
-
-# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports
-# Leave blank to try to autodetect it
-MOUSED_DEVICE=""
-
-# Any additional flags requires
-MOUSED_FLAGS=""
-
-# If 0xd0-0xd3 default range is occupied in your language code table, specify
-# alternative range start like MOUSECHAR_START="3", see vidcontrol(1)
-MOUSECHAR_START=""
-
-# You can also multiplex the init script for each device like so
-#   ln -s moused /etc/init.d/moused.ums0
-# This enables you to have a config file per mouse (forces MOUSED_DEVICE
-# to ums0 in this case) and control each mouse.
-# devd can also start and stop these mice, which laptop users will find handy.

diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd 
b/sys-freebsd/freebsd-usbin/files/moused.initd
deleted file mode 100644
index d7ca8e0fcf..00
--- a/sys-freebsd/freebsd-usbin/files/moused.initd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MOUSED_NAME=${SVCNAME##*.}
-if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then
-   MOUSED_DEVICE=/dev/"${MOUSED_NAME}"
-   MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid
-else
-   MOUSED_NAME=
-   MOUSED_PIDFILE=/var/run/moused.pid
-fi
-
-depend() {
-   need localmount 
-}
-
-start() {
-   ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}"
-
-   if [ -z ${MOUSED_DEVICE} ] ; then
-   for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do
-   if [ -e "${x}" ] && \
-   [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then
-   MOUSED_DEVICE=${x}
-   eindent
-   einfo "Using mouse on ${MOUSED_DEVICE}"
-   eoutdent
-   break
-   fi
-   done
-   fi
-
-   if [ -z "${MOUSED_DEVICE}" ] ; then
-   eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \
-   "and no mouse detected"
-   return 1
-   fi
-
-   local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}"
-   start-stop-daemon --start --quiet --exec /usr/sbin/moused \
-   --pidfile "${MOUSED_PIDFILE}" \
-   -- ${opts} -I "${MOUSED_PIDFILE}"
-   local retval=$?
-   
-   [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M 
${MOUSE_CHAR_START}"
-   local ttyv=
-   for ttyv in /dev/ttyv* ; do
-   vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1
-   done
-   
-   eend ${retval} "Failed to start

[gentoo-commits] repo/gentoo:master commit in: sys-fs/aufs3/files/

2017-02-11 Thread David Seifert 
commit: 8b40b7b16cbab433099c2dc3b7b8b27b56ee1659
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 11 16:27:48 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:15:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b40b7b1

sys-fs/aufs3: remove unused patch

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

 sys-fs/aufs3/files/pax-3.patch | 90 --
 1 file changed, 90 deletions(-)

diff --git a/sys-fs/aufs3/files/pax-3.patch b/sys-fs/aufs3/files/pax-3.patch
deleted file mode 100644
index 584fa6ace5..00
--- a/sys-fs/aufs3/files/pax-3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
 a/fs/aufs/dynop.c  2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/dynop.c  2012-10-09 15:41:58.562989820 -0400
-@@ -149,9 +149,11 @@
- #define DySet(func, dst, src, h_op, h_sb) do {
\
-   DyDbgInc(cnt);  \
-   if (h_op->func) {   \
--  if (src.func)   \
--  dst.func = src.func;\
--  else\
-+  if (src.func) { \
-+  pax_open_kernel();  \
-+  *(void **) = src.func; \
-+  pax_close_kernel(); \
-+  } else  \
-   AuDbg("%s %s\n", au_sbtype(h_sb), #func);   \
-   }   \
- } while (0)
-@@ -159,7 +161,9 @@
- #define DySetForce(func, dst, src) do {   \
-   AuDebugOn(!src.func);   \
-   DyDbgInc(cnt);  \
--  dst.func = src.func;\
-+  pax_open_kernel();  \
-+  *(void **) = src.func; \
-+  pax_close_kernel(); \
- } while (0)
- 
- #define DySetAop(func) \
-@@ -266,15 +270,17 @@
-  */
- static void dy_adx(struct au_dyaop *dyaop, int do_dx)
- {
-+  pax_open_kernel();
-   if (!do_dx) {
--  dyaop->da_op.direct_IO = NULL;
--  dyaop->da_op.get_xip_mem = NULL;
-+  *(void **)>da_op.direct_IO = NULL;
-+  *(void **)>da_op.get_xip_mem = NULL;
-   } else {
--  dyaop->da_op.direct_IO = aufs_aop.direct_IO;
--  dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
-+  *(void **)>da_op.direct_IO = aufs_aop.direct_IO;
-+  *(void **)>da_op.get_xip_mem = aufs_aop.get_xip_mem;
-   if (!dyaop->da_get_xip_mem)
--  dyaop->da_op.get_xip_mem = NULL;
-+  *(void **)>da_op.get_xip_mem = NULL;
-   }
-+  pax_close_kernel();
- }
- 
- static struct au_dyaop *dy_aget(struct au_branch *br,
 a/fs/aufs/f_op_sp.c2012-10-09 15:41:32.652989534 -0400
-+++ b/fs/aufs/f_op_sp.c2012-10-09 15:41:58.562989820 -0400
-@@ -104,7 +104,7 @@
- static int aufs_open_sp(struct inode *inode, struct file *file);
- static struct au_sp_fop {
-   int done;
--  struct file_operations  fop;/* not 'const' */
-+  file_operations_no_constfop;/* not 'const' */
-   spinlock_t  spin;
- } au_sp_fop[AuSp_Last] = {
-   [AuSp_FIFO] = {
-@@ -157,8 +157,10 @@
-   h_file = au_hf_top(file);
-   spin_lock(>spin);
-   if (!p->done) {
--  p->fop = *h_file->f_op;
-+  pax_open_kernel();
-+  memcpy((void *)>fop, h_file->f_op, sizeof(p->fop));
-   p->fop.owner = THIS_MODULE;
-+  pax_close_kernel();
-   if (p->fop.aio_read)
-   p->fop.aio_read = aufs_aio_read_sp;
-   if (p->fop.aio_write)
-diff -Naur linux-3.8.3-pentoo/fs/aufs/sysfs.c 
linux-3.8.3-pentoo-aufsfix/fs/aufs/sysfs.c
 linux-3.8.3-pentoo/fs/aufs/sysfs.c 2013-04-29 00:07:50.478827567 -0400
-+++ linux-3.8.3-pentoo-aufsfix/fs/aufs/sysfs.c 2013-04-28 23:46:23.724793109 
-0400
-@@ -208,8 +208,10 @@
-   struct attribute *attr = >br_attr;
- 
-   sysfs_attr_init(attr);
--  attr->name = br->br_name;
--  attr->mode = S_IRUGO;
-+  pax_open_kernel();
-+  *(void **)>name = br->br_name;
-+  *(void **)>mode = S_IRUGO;
-+  pax_close_kernel();
- }
- 
- void sysaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex)

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/files/

2017-02-11 Thread David Seifert 
commit: 978bfa02cc3c1d14d32cbebd9a1b300b334ffca3
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:53:21 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978bfa02

sys-freebsd/freebsd-lib: remove unused patches/file

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

 .../files/freebsd-lib-10.0-libusb.patch| 19 --
 .../files/freebsd-lib-11.0-liblink.patch   | 62 
 .../freebsd-lib/files/freebsd-lib-bsdxml.patch | 13 -
 .../freebsd-lib/files/freebsd-lib-new_as.patch | 68 --
 sys-freebsd/freebsd-lib/files/libmap.conf  |  8 ---
 5 files changed, 170 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch 
b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
deleted file mode 100644
index 296825259f..00
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
-index 21016a9..26010e8 100644
 a/lib/libusb/Makefile
-+++ b/lib/libusb/Makefile
-@@ -40,11 +40,11 @@ CFLAGS+=   -DCOMPAT_32BIT
- 
- beforeinstall:
-   ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--  ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-+  ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig
-   ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--  ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-+  ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
-   ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--  ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-+  ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
- 
- #
- # Cross platform support

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch 
b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch
deleted file mode 100644
index da495e48eb..00
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index 2dedf11..275f4c3 100644
 a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -15,6 +15,7 @@ SRCS=proc_bkpt.c \
- INCS= libproc.h
- 
- CFLAGS+=  -I${.CURDIR}
-+CFLAGS+=  -I${.CURDIR}/../libelf
- 
- .if ${MK_CXX} == "no"
- CFLAGS+=  -DNO_CXA_DEMANGLE
-@@ -28,6 +29,9 @@ LIBADD+= elf rtld_db util
- 
- .if ${MK_CDDL} != "no"
- LIBADD+=  ctf
-+LDADD+=   -lelf
-+LDFLAGS+= -L${.OBJDIR}/../libelf
-+
- IGNORE_PRAGMA=YES
- CFLAGS+=  -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
-   -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
-index 1829883..d0065a3 100644
 a/lib/libprocstat/Makefile
-+++ b/lib/libprocstat/Makefile
-@@ -17,6 +17,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def
- SYMBOL_MAPS=  ${.CURDIR}/Symbol.map
- 
- INCS= libprocstat.h
-+CFLAGS+=  -I${.CURDIR}/../libelf
-+LDFLAGS+=   -L${.OBJDIR}/../libelf
- CFLAGS+=  -I. -I${.CURDIR} -D_KVM_VNODE
- SHLIB_MAJOR=  1
- 
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
-index 0a8ed95..11baf5b 100644
 a/lib/librtld_db/Makefile
-+++ b/lib/librtld_db/Makefile
-@@ -11,6 +11,9 @@ SRCS=rtld_db.c
- INCS= rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-+LDADD+= -lutil -lproc
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
- # Avoid circular dependency, we only need the libproc.h header here.
- CFLAGS+= -I${.CURDIR:H}/libproc
- 
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
-index f84aee3..c36ade9 100644
 a/lib/libtelnet/Makefile
-+++ b/lib/libtelnet/Makefile
-@@ -14,6 +14,8 @@ INTERNALLIB=
- SRCS= genget.c getent.c misc.c
- CFLAGS+=  -I${TELNETDIR}
- 
-+CFLAGS+=  -I${.CURDIR}/../libmp
-+
- WARNS?=   2
- 
- .if ${MK_OPENSSL} != "no"

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch 
b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
deleted file mode 100644
index ec90defc03..00
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
 lib/libgeom/Makefile   2004-03-07 16:07:57 +
-+++ lib.xml/libgeom/Makefile   2005-05-06 10:38:41 +
-@@ -8,7 +8,8 @@
- SRCS+=geom_ctl.c
- INCS= libgeom.h
- 
--CFLAGS += -I${.CURDIR}
-+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
-+LDFLAGS += -L${.CURDIR}/../libexpat
- 
- WARNS?=   3
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-sbin/files/

2017-02-11 Thread David Seifert 
commit: e3a3bc829b7c4024b522fa15f4427b5ad1ca87d3
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:55:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a3bc82

sys-freebsd/freebsd-sbin: remove unused files

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

 sys-freebsd/freebsd-sbin/files/devd.conf| 153 
 sys-freebsd/freebsd-sbin/files/devd.initd   |  47 -
 sys-freebsd/freebsd-sbin/files/devd_queue   |  50 -
 sys-freebsd/freebsd-sbin/files/ipfw.confd   |  10 --
 sys-freebsd/freebsd-sbin/files/ipfw.initd   | 110 
 sys-freebsd/freebsd-sbin/files/sysctl.initd |  28 -
 6 files changed, 398 deletions(-)

diff --git a/sys-freebsd/freebsd-sbin/files/devd.conf 
b/sys-freebsd/freebsd-sbin/files/devd.conf
deleted file mode 100644
index fd1e0352e5..00
--- a/sys-freebsd/freebsd-sbin/files/devd.conf
+++ /dev/null
@@ -1,153 +0,0 @@
-# Refer to devd.conf(5) and devd(8) man pages for the details on how to
-# run and configure devd.
-#
-
-# NB: All regular expressions have an implicit ^$ around them.
-# NB: device-name is shorthand for 'match device-name'
-
-options {
-   # Each directory directive adds a directory the list of directories
-   # that we scan for files.  Files are read-in in the order that they
-   # are returned from readdir(3).  The rule-sets are combined to
-   # create a DFA that's used to match events to actions.
-   directory "/etc/devd";
-   directory "/usr/local/etc/devd";
-   pid-file "/var/run/devd.pid";
-
-   # Setup some shorthand for regex that we use later in the file.
-   #XXX Yes, these are gross -- imp
-   set scsi-controller-regex
-   "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
-   esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
-   [0-9]+";
-};
-
-# Note that the attach/detach with the highest value wins, so that one can
-# override these general rules.
-
-#
-# For ethernet like devices start configuring the interface.  Due to
-# a historical accident, this script is called pccard_ether.
-#
-attach 0 {
-   media-type "ethernet";
-   action "/etc/devd_queue add env IN_HOTPLUG=1 
/etc/init.d/net.$device-name start";
-};
-
-detach 0 {
-   media-type "ethernet";
-   action "/etc/devd_queue add env IN_HOTPLUG=1 
/etc/init.d/net.$device-name stop";
-};
-
-#
-# Try to start dhclient on Ethernet like interfaces when the link comes
-# up.  Only devices that are configured to support DHCP will actually
-# run it.  No link down rule exists because dhclient automaticly exits
-# when the link goes down.
-#
-notify 0 {
-   match "system"  "IFNET";
-   match "type""LINK_UP";
-   media-type  "ethernet";
-   action "/etc/devd_queue add /etc/init.d/net.$subsystem start";
-};
-notify 0 {
-   match "system"  "IFNET";
-   match "type""LINK_DOWN";
-   media-type  "ethernet";
-   action "/etc/devd_queue add /etc/init.d/net.$subsystem stop";
-};
-
-#
-# Like Ethernet devices, but separate because
-# they have a different media type.  We may want
-# to exploit this later.
-#
-#detach 0 {
-#  media-type "802.11";
-#  action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop";
-#};
-#attach 0 {
-#  media-type "802.11";
-#  action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name start";
-#};
-
-# Not sure how to handle this in Gentoo yet
-# When a USB Bluetooth dongle appears activate it
-#attach 100 {
-#  device-name "ubt[0-9]+";
-#  action "/etc/rc.d/bluetooth start $device-name";
-#};
-#detach 100 {
-#  device-name "ubt[0-9]+";
-#  action "/etc/rc.d/bluetooth stop $device-name";
-#};
-
-# When a USB keyboard arrives, attach it as the console keyboard.
-attach 100 {
-   device-name "ukbd0";
-   action "kbdcontrol -k /dev/ukbd0 < /dev/console";
-};
-detach 100 {
-   device-name "ukbd0";
-   action "kbdcontrol -k /dev/kbd0 < /dev/console";
-};
-
-# The entry below starts and stops moused when a mouse is plugged in.
-attach 100 {
-   device-name "psm[0-9]+";
-   action "/etc/devd_queue add env IN_HOTPLUG=1 
/etc/init.d/moused.$device-name start";
-};
-detach 100 {
-   device-name "psm[0-9]+";
-   action "/etc/devd_queue add env IN_HOTPLUG=1 
/etc/init.d/moused.$device-name stop";
-};
-attach 100 {
-   device-name "ums[0-9]+";
-   action "/etc/devd_queue add env IN_HOTPLUG=1 
/etc/init.d/moused.$device-name start";
-};
-detach 100 {
-   device-name "ums[0-9]+";
-   action "/etc/devd_queue add env IN_HOTPLUG=1 
/etc/init.d/moused.$device-name stop";
-};
-
-# Notify all users before beginning emergency shutdown when we get
-# a _CRT or _HOT thermal event and we're going to power down the system

[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/

2017-02-11 Thread David Seifert 
commit: 6a4f743f7a934e4cb5d11842d890bd5f813c4daf
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 11 16:30:51 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:15:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4f743f

sys-fs/btrfs-progs: remove unused patches

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

 ...ogs-0.19-convert-remove-used-space-update.patch |  30 -
 .../files/btrfs-progs-0.19-fix-underlinking.patch  |  11 --
 .../files/btrfs-progs-0.19-glibc212.patch  |  17 ---
 .../files/btrfs-progs-3.12-defrag-sockets.patch|  78 ---
 .../btrfs-progs-3.12-fix-send-subvol-492776.patch  | 111 
 .../files/btrfs-progs-3.14.1-arg_strtou64.patch| 146 -
 6 files changed, 393 deletions(-)

diff --git 
a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch
 
b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch
deleted file mode 100644
index e326f34af7..00
--- 
a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch
+++ /dev/null
@@ -1,30 +0,0 @@
 /var/tmp/portage/sys-fs/btrfs-progs-0.19/work/btrfs-progs-0.19/convert.c   
2009-06-11 10:56:15.0 -0600
-+++ btrfs-progs-unstable/convert.c 2009-09-21 08:51:43.773575874 -0600
-@@ -370,7 +370,6 @@
-   struct btrfs_extent_item *ei;
-   u32 blocksize = root->sectorsize;
-   u64 nbytes;
--  u64 bytes_used;
- 
-   if (disk_bytenr == 0) {
-   ret = btrfs_insert_file_extent(trans, root, objectid,
-@@ -432,9 +431,6 @@
-   nbytes = btrfs_stack_inode_nbytes(inode) + num_bytes;
-   btrfs_set_stack_inode_nbytes(inode, nbytes);
- 
--  bytes_used = btrfs_root_used(>root_item);
--  btrfs_set_root_used(>root_item, bytes_used + num_bytes);
--
-   btrfs_release_path(root, );
- 
-   ins_key.objectid = disk_bytenr;
-@@ -454,9 +450,6 @@
- 
-   btrfs_mark_buffer_dirty(leaf);
- 
--  bytes_used = btrfs_super_bytes_used(>super_copy);
--  btrfs_set_super_bytes_used(>super_copy, bytes_used +
-- num_bytes);
-   ret = btrfs_update_block_group(trans, root, disk_bytenr,
-  num_bytes, 1, 0);
-   if (ret)

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-fix-underlinking.patch 
b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-fix-underlinking.patch
deleted file mode 100644
index 38a0a18dbc..00
--- a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-fix-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 btrfs-progs-0.19/Makefile~ 2011-06-05 10:21:04.0 -0600
-+++ btrfs-progs-0.19/Makefile  2011-06-05 10:21:46.0 -0600
-@@ -75,7 +75,7 @@ quick-test: $(objects) quick-test.o
-   gcc $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
- 
- convert: $(objects) convert.o
--  gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) 
$(LIBS)
-+  gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err 
$(LDFLAGS) $(LIBS)
- 
- ioctl-test: $(objects) ioctl-test.o
-   gcc $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS)

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch 
b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch
deleted file mode 100644
index 183fe2af3e..00
--- a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-glibc212.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-btrfsck.o: In function `maybe_free_inode_rec':
-btrfsck.c:(.text+0xce6): undefined reference to `S_ISDIR'
-btrfsck.c:(.text+0xd13): undefined reference to `S_ISREG'
-btrfsck.c:(.text+0xdc7): undefined reference to `S_ISREG'
-btrfsck.c:(.text+0xe2e): undefined reference to `S_ISLNK'
-btrfsck.c:(.text+0xe5b): undefined reference to `S_ISLNK'
-
 btrfsck.c
-+++ btrfsck.c
-@@ -21,6 +21,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"

diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-3.12-defrag-sockets.patch 
b/sys-fs/btrfs-progs/files/btrfs-progs-3.12-defrag-sockets.patch
deleted file mode 100644
index e2feb0bdbe..00
--- a/sys-fs/btrfs-progs/files/btrfs-progs-3.12-defrag-sockets.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From:  Pascal VITOUX 
-To:linux-bt...@vger.kernel.org
-Cc:Pascal VITOUX 
-Subject: [PATCH] btrfs-progs: skip non-regular files while defragmenting
-Date:  Thu,  9 Jan 2014 23:47:14 +0100
-Message-Id: <1389307634-8226-1-git-send-email-vitoux.pas...@gmail.com>
-X-Mailer: git-send-email 1.8.5.2
-Sender:linux-btrfs-ow...@vger.kernel.org
-Precedence: bulk
-List-ID: 
-X-Mailing-List:linux-bt...@vger.kernel.org
-
-Skip non-regular files to avoid ioctl errors while defragmenting.
-
-They are silently

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-cddl/files/

2017-02-11 Thread David Seifert 
commit: a324b4b3049c54afc17e53b1db5780a879c505b0
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:50:16 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:13:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a324b4b3

sys-freebsd/freebsd-cddl: remove unused patch

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

 .../files/freebsd-cddl-9.2-libpaths.patch  | 220 -
 1 file changed, 220 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch 
b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
deleted file mode 100644
index 36eb570af7..00
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff --git a/lib/libzfs/Makefile b/lib/libzfs/Makefile
-index 5b6b47d..c8549b4 100644
 a/lib/libzfs/Makefile
-+++ b/lib/libzfs/Makefile
-@@ -55,6 +55,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
- 
-diff --git a/lib/libzfs_core/Makefile b/lib/libzfs_core/Makefile
-index a470fbc..ae8c649 100644
 a/lib/libzfs_core/Makefile
-+++ b/lib/libzfs_core/Makefile
-@@ -34,4 +34,6 @@ CFLAGS+= 
-I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+
- .include 
-diff --git a/lib/libzpool/Makefile b/lib/libzpool/Makefile
-index 417c1cc..838cdb5 100644
 a/lib/libzpool/Makefile
-+++ b/lib/libzpool/Makefile
-@@ -56,6 +56,10 @@ CFLAGS+=-I${.CURDIR}/../../../lib/libpthread/thread
- CFLAGS+=  -I${.CURDIR}/../../../lib/libpthread/sys
- CFLAGS+=  -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+
- DPADD=${LIBMD} ${LIBPTHREAD} ${LIBZ}
- LDADD=-lmd -lpthread -lz
- 
-diff --git a/sbin/zfs/Makefile b/sbin/zfs/Makefile
-index a49d278..b22442e 100644
 a/sbin/zfs/Makefile
-+++ b/sbin/zfs/Makefile
-@@ -22,6 +22,12 @@ CFLAGS+= 
-I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
-   ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
- LDADD=-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-diff --git a/sbin/zpool/Makefile b/sbin/zpool/Makefile
-index 1884d24..5f06d5f 100644
 a/sbin/zpool/Makefile
-+++ b/sbin/zpool/Makefile
-@@ -26,6 +26,13 @@ CFLAGS+= 
-I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
-   ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
- LDADD=-lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-diff --git a/usr.bin/ctfconvert/Makefile b/usr.bin/ctfconvert/Makefile
-index 7e4a05a..72327ad 100644
 a/usr.bin/ctfconvert/Makefile
-+++ b/usr.bin/ctfconvert/Makefile
-@@ -36,6 +36,8 @@ CFLAGS+= 
-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-   -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-   -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
-+
- DPADD=${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=-lctf -ldwarf -lelf -lz -lpthread
- 
-diff --git a/usr.bin/ctfmerge/Makefile b/usr.bin/ctfmerge/Makefile

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-share/files/

2017-02-11 Thread David Seifert 
commit: 89a6d0ef41360f6664adbe780ff93612ec482897
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:56:27 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a6d0ef

sys-freebsd/freebsd-share: remove unused patch

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

 .../files/freebsd-share-9.2-gnu-miscfiles.patch| 28 --
 1 file changed, 28 deletions(-)

diff --git 
a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch 
b/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch
deleted file mode 100644
index af84dc35a9..00
--- a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur share.orig/dict/Makefile share/dict/Makefile
 share.orig/dict/Makefile   2012-12-31 18:00:00.0 +0900
-+++ share/dict/Makefile2012-12-31 18:03:15.0 +0900
-@@ -4,8 +4,7 @@
- NO_OBJ=
- 
- # XXX MISSING:connectives words
--FILES=README propernames web2 web2a freebsd
-+FILES=README freebsd
- FILESDIR= ${BINDIR}/dict
--SYMLINKS= web2 ${FILESDIR}/words
- 
- .include 
-diff -Nur share.orig/misc/Makefile share/misc/Makefile
 share.orig/misc/Makefile   2012-12-31 18:00:00.0 +0900
-+++ share/misc/Makefile2012-12-31 18:04:22.0 +0900
-@@ -3,9 +3,9 @@
- 
- .PATH:${.CURDIR}/../../sys/dev/usb
- 
--FILES=ascii birthtoken bsd-family-tree committers-doc.dot 
committers-ports.dot \
-+FILES=bsd-family-tree committers-doc.dot committers-ports.dot \
-   committers-src.dot eqnchar flowers init.ee \
--  iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
-+  iso3166 iso639 man.template mdoc.template pci_vendors \
-   scsi_modes usb_hid_usages usbdevs \
-   organization.dot
-

[gentoo-commits] repo/gentoo:master commit in: sys-fs/rar2fs/files/

2017-02-11 Thread David Seifert 
commit: 3e1aa094917580cb61c5d15ce8b1ef5500b4a661
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Feb 11 16:34:18 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:14:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1aa094

sys-fs/rar2fs: remove unused patch

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

 sys-fs/rar2fs/files/rar2fs-1.22.0-sysmacros.patch | 31 ---
 1 file changed, 31 deletions(-)

diff --git a/sys-fs/rar2fs/files/rar2fs-1.22.0-sysmacros.patch 
b/sys-fs/rar2fs/files/rar2fs-1.22.0-sysmacros.patch
deleted file mode 100644
index 0593409100..00
--- a/sys-fs/rar2fs/files/rar2fs-1.22.0-sysmacros.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/hasse69/rar2fs/pull/51
-
-From e8c477f726eb7bfd65ef33e2b080063e6f8013c0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Tue, 21 Jun 2016 14:54:06 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs are defined in sys/sysmacros.h, so include the header to
-fix building with C libs that don't implicitly include via sys/types.h.
-
-Signed-off-by: Mike Frysinger 

- configure.ac | 2 +-
- rar2fs.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
 a/rar2fs.c
-+++ b/rar2fs.c
-@@ -56,6 +56,9 @@
- #ifdef HAVE_SYS_XATTR_H
- # include 
- #endif
-+#ifdef __linux__
-+# include 
-+#endif
- #ifdef HAVE_ICONV
- #include 
- #endif
--- 
-2.8.2
-

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/boot0/files/

2017-02-11 Thread David Seifert 
commit: 9961bbe1c9bb5fb559b3e4971caf66e06a77a0b4
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb 10 16:49:11 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 20:13:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9961bbe1

sys-freebsd/boot0: remove unused patch

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

 .../files/boot0-10.1-drop-unsupport-cflags.patch   | 26 --
 1 file changed, 26 deletions(-)

diff --git a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch 
b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch
deleted file mode 100644
index 4ab415b115..00
--- a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
-index 76ed0ca..2d1d39d 100644
 a/sys/boot/efi/libefi/Makefile
-+++ b/sys/boot/efi/libefi/Makefile
-@@ -17,7 +17,4 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
- CFLAGS+= -I${.CURDIR}/../../common
- 
-  
--# Suppress warning from clang for FreeBSD %b and %D formats
--CFLAGS+= -fformat-extensions
--
- .include 
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
-index d714c74..a5cfa3c 100644
 a/sys/boot/i386/libi386/Makefile
-+++ b/sys/boot/i386/libi386/Makefile
-@@ -52,9 +52,6 @@ CFLAGS+= -I${.CURDIR}/../../common 
-I${.CURDIR}/../common \
- # the location of libstand
- CFLAGS+=  -I${.CURDIR}/../../../../lib/libstand/
- 
--# Suppress warning from clang for FreeBSD %b and %D formats
--CFLAGS+= -fformat-extensions
--
- .if ${MACHINE_CPUARCH} == "amd64"
- CLEANFILES+=  machine
- machine:

[gentoo-commits] repo/gentoo:master commit in: net-print/poster/, net-print/poster/files/

2017-02-11 Thread Andreas Hüttel 
commit: 937c6df1eab95be77c21ac44aeeb399525944751
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 20:11:59 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 20:11:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=937c6df1

net-print/poster: Add patch for bug 471270, thanks to quazgar  posteo.de

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 ...ster-20060221-fix_duplicate_DocumentMedia.patch | 19 
 net-print/poster/poster-20060221-r1.ebuild | 26 ++
 2 files changed, 45 insertions(+)

diff --git 
a/net-print/poster/files/poster-20060221-fix_duplicate_DocumentMedia.patch 
b/net-print/poster/files/poster-20060221-fix_duplicate_DocumentMedia.patch
new file mode 100644
index 00..52584a9507
--- /dev/null
+++ b/net-print/poster/files/poster-20060221-fix_duplicate_DocumentMedia.patch
@@ -0,0 +1,19 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=471270
+
+--- a/poster.c 2013-05-25 21:41:53.0 +0200
 b/poster.c 2013-05-25 21:43:41.0 +0200
+@@ -812,8 +812,12 @@
+   if (!strncmp( c, "(atend)", 7)) atend = 1;
+   else
+   {   /* pass this DSC to output */
+-  puts( buf);
+-  dsc_cont = 1;
++  /* if it is not another DocumentMedia comment */
++  if (strncmp( buf, "%%DocumentMedia", 15))
++  {
++  puts( buf);
++  dsc_cont = 1;
++  }
+   }
+   }
+   else if ( !strncmp( buf, "%%Pages:", 8 ) )

diff --git a/net-print/poster/poster-20060221-r1.ebuild 
b/net-print/poster/poster-20060221-r1.ebuild
new file mode 100644
index 00..0c75144668
--- /dev/null
+++ b/net-print/poster/poster-20060221-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="small utility for making a poster from an EPS file or a one-page 
PS document"
+SRC_URI="mirror://kde/printing/${P}.tar.bz2"
+HOMEPAGE="https://printing.kde.org/downloads;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_compile(){
+   $(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
+}
+
+src_install() {
+   dobin ${PN}
+   doman ${PN}.1
+   dodoc README ChangeLog
+}

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

2017-02-11 Thread Andreas Hüttel 
commit: a9d34704b8f19365fb585cec6b71dd2b344e8316
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 19:51:48 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 19:52:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d34704

app-text/enscript: Honor AR setting, bug 447620

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/enscript/enscript-1.6.6.ebuild | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app-text/enscript/enscript-1.6.6.ebuild 
b/app-text/enscript/enscript-1.6.6.ebuild
index 25066b19d1..4246f7c531 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI=6
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-DESCRIPTION="powerful text-to-postscript converter"
+DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html;
 
@@ -27,26 +27,27 @@ src_prepare() {
epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
+   default
 }
 
 src_configure() {
econf $(use_enable nls)
 }
 
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
 src_install() {
-   emake DESTDIR="${D}" install || die "install failed"
+   emake DESTDIR="${D}" install
 
-   dodoc AUTHORS ChangeLog NEWS README* THANKS TODO || die "dodoc failed"
+   dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
 
insinto /usr/share/enscript/hl
-   doins "${FILESDIR}"/ebuild.st || die "doins ebuild.st failed"
+   doins "${FILESDIR}"/ebuild.st
 
if use ruby ; then
insinto /usr/share/enscript/hl
-   doins "${FILESDIR}"/ruby.st || die "doins ruby.st failed"
+   doins "${FILESDIR}"/ruby.st
fi
 }
-
-pkg_postinst() {
-   elog "Now, customize /etc/enscript.cfg."
-}

[gentoo-commits] proj/kde:master commit in: net-misc/smb4k/

2017-02-11 Thread Andreas Sturmlechner 
commit: 1cb31b399ee0c378d4639a44e079d4367c6731cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 01:49:54 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 11 19:50:30 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1cb31b39

net-misc/smb4k: Sync with tree

Package-Manager: portage-2.3.3

 net-misc/smb4k/smb4k-.ebuild | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/net-misc/smb4k/smb4k-.ebuild b/net-misc/smb4k/smb4k-.ebuild
index 0a6a09af15..33e8ceef02 100644
--- a/net-misc/smb4k/smb4k-.ebuild
+++ b/net-misc/smb4k/smb4k-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/;
 LICENSE="GPL-2"
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
$(add_frameworks_dep kauth)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -37,14 +37,11 @@ COMMON_DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtprintsupport)
+   $(add_qt_dep qttest)
$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+   $(add_frameworks_dep plasma)
>=net-fs/samba-3.4.2[cups]
!net-misc/smb4k:4
 "
-
-DOCS=( AUTHORS BUGS ChangeLog README )

[gentoo-commits] repo/gentoo:master commit in: x11-themes/fvwm-crystal/

2017-02-11 Thread David Seifert 
commit: 4612d7e503fea05c8418a32857e9b76e675fe532
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4612d7e5

x11-themes/fvwm-crystal: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{fvwm-crystal-3.2.3.ebuild => fvwm-crystal-3.2.3-r1.ebuild}   | 2 +-
 .../{fvwm-crystal-3.2.5.ebuild => fvwm-crystal-3.2.5-r1.ebuild}   | 2 +-
 .../{fvwm-crystal-3.4.1.ebuild => fvwm-crystal-3.4.1-r1.ebuild}   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild 
b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild
similarity index 96%
rename from x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild
rename to x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild
index 6509cb73fd..4fde719566 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="${PYTHON_DEPS}
>=x11-wm/fvwm-2.6.5[png]
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+   virtual/imagemagick-tools
|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
|| ( x11-misc/hsetroot media-gfx/feh )
sys-apps/sed

diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild 
b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild
similarity index 96%
rename from x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild
rename to x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild
index d49e925c6a..5cc7693f4a 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="${PYTHON_DEPS}
>=x11-wm/fvwm-2.6.5[png]
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+   virtual/imagemagick-tools
|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
|| ( x11-misc/hsetroot media-gfx/feh )
sys-apps/sed

diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild 
b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
similarity index 95%
rename from x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
rename to x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
index 2bc7e1e3fc..c3109cadb7 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ esac
 
 RDEPEND="${PYTHON_DEPS}
>=x11-wm/fvwm-2.5.26[png]
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+   virtual/imagemagick-tools
|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
|| ( x11-misc/hsetroot media-gfx/feh )
sys-apps/sed

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

2017-02-11 Thread David Seifert 
commit: 376733c6e79af63bc5d5a436cf8ef0d80d4a05f4
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376733c6

app-text/cuneiform: Use sub-slot operators for imagemagick

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 app-text/cuneiform/cuneiform-1.1.0-r1.ebuild | 53 ---
 app-text/cuneiform/cuneiform-1.1.0-r2.ebuild | 54 
 2 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild 
b/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild
deleted file mode 100644
index 42e1207449..00
--- a/app-text/cuneiform/cuneiform-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit cmake-utils versionator
-
-PV_MAJ=$(get_version_component_range 1-2)
-MY_P=${PN}-linux-${PV}
-
-DESCRIPTION="An enterprise quality optical character recognition (OCR) engine 
by Cognitive Technologies"
-HOMEPAGE="https://launchpad.net/cuneiform-linux;
-SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug +imagemagick graphicsmagick"
-
-REQUIRED_USE="^^ ( imagemagick graphicsmagick )"
-
-RDEPEND="imagemagick? ( media-gfx/imagemagick )
-   graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND=">=dev-util/cmake-2.6.2
-   ${RDEPEND}"
-
-DOCS="readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare(){
-   epatch "${FILESDIR}/c-assert.diff"
-   epatch "${FILESDIR}/libm.diff"
-   if use graphicsmagick; then
-   epatch "${FILESDIR}/graphicsmagick.diff"
-   fi
-   # respect LDFLAGS
-   sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' 
\
-   "${S}/cuneiform_src/CMakeLists.txt" || die "failed to sed for 
LDFLAGS"
-   # Fix automagic dependencies / linking
-   if ! use imagemagick; then
-   sed -i "s:find_package(ImageMagick COMPONENTS 
Magick++):#DONOTFIND:" \
-   "${S}/cuneiform_src/CMakeLists.txt" \
-   || die "Sed for ImageMagick automagic dependency failed."
-   fi
-}
-
-src_install() {
-   #default
-   cmake-utils_src_install
-   doman "${FILESDIR}/${PN}.1"
-}

diff --git a/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild 
b/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild
new file mode 100644
index 00..564bbd04d8
--- /dev/null
+++ b/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+PV_MAJ=$(get_version_component_range 1-2)
+MY_P=${PN}-linux-${PV}
+
+DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies"
+HOMEPAGE="https://launchpad.net/cuneiform-linux;
+SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug graphicsmagick"
+
+RDEPEND="
+   !graphicsmagick? ( media-gfx/imagemagick:= )
+   graphicsmagick? ( media-gfx/graphicsmagick:= )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( readme.txt )
+PATCHES=(
+   "${FILESDIR}/c-assert.diff"
+   "${FILESDIR}/libm.diff"
+)
+
+src_prepare(){
+   use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" )
+   cmake-utils_src_prepare
+
+   # respect LDFLAGS
+   sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' 
\
+   cuneiform_src/CMakeLists.txt || die "failed to sed for LDFLAGS"
+
+   # Fix automagic dependencies / linking
+   if use graphicsmagick; then
+   sed -i "s:find_package(ImageMagick COMPONENTS 
Magick++):#DONOTFIND:" \
+   cuneiform_src/CMakeLists.txt \
+   || die "Sed for ImageMagick automagic dependency 
failed."
+   fi
+}
+
+src_install() {
+   cmake-utils_src_install
+   doman "${FILESDIR}/${PN}.1"
+}

[gentoo-commits] repo/gentoo:master commit in: x11-themes/tango-icon-theme-extras/

2017-02-11 Thread David Seifert 
commit: 487ba6b7e02c75746c270c5d49f62fd67c1507ed
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487ba6b7

x11-themes/tango-icon-theme-extras: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 ...e-extras-0.1.0-r1.ebuild => tango-icon-theme-extras-0.1.0-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild 
b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
similarity index 93%
rename from 
x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild
rename to 
x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
index 381d621d2e..3106a3d38f 100644
--- a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild
+++ b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=x11-themes/tango-icon-theme-0.8.90"
 DEPEND="${RDEPEND}
virtual/pkgconfig
>=gnome-base/librsvg-2.34
-   || ( media-gfx/imagemagick[png?] 
media-gfx/graphicsmagick[imagemagick,png?] )
+   virtual/imagemagick-tools[png?]
>=x11-misc/icon-naming-utils-0.8.90"
 
 RESTRICT="binchecks strip"

[gentoo-commits] repo/gentoo:master commit in: www-apps/phpBB/

2017-02-11 Thread David Seifert 
commit: 9b2ce54ab070833e3668c3271cad85bec300014a
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2ce54a

www-apps/phpBB: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 www-apps/phpBB/{phpBB-3.1.10.ebuild => phpBB-3.1.10-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/phpBB/phpBB-3.1.10.ebuild 
b/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
similarity index 93%
rename from www-apps/phpBB/phpBB-3.1.10.ebuild
rename to www-apps/phpBB/phpBB-3.1.10-r1.ebuild
index c5880ae562..55ceabc6bc 100644
--- a/www-apps/phpBB/phpBB-3.1.10.ebuild
+++ b/www-apps/phpBB/phpBB-3.1.10-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="ftp gd imagemagick mssql mysqli postgres sqlite xml 
zlib"
 PHPV="5*:*"
 RDEPEND="=virtual/httpd-php-${PHPV}

=dev-lang/php-${PHPV}[ftp?,gd?,json,mssql?,mysqli?,postgres?,sqlite?,xml?,zlib?]
-   imagemagick? ( || ( media-gfx/imagemagick 
media-gfx/graphicsmagick[imagemagick] ) )"
+   imagemagick? ( virtual/imagemagick-tools )"
 
 need_httpd_cgi

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellshoot/

2017-02-11 Thread David Seifert 
commit: 54ed500a3e3feae15a7a4401c31075ac433b5da0
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54ed500a

x11-plugins/gkrellshoot: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{gkrellshoot-0.4.4.ebuild => gkrellshoot-0.4.4-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4.ebuild 
b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r1.ebuild
similarity index 75%
rename from x11-plugins/gkrellshoot/gkrellshoot-0.4.4.ebuild
rename to x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r1.ebuild
index 8c13b711b4..932e5a693f 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,4 +15,4 @@ SLOT="2"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+RDEPEND="virtual/imagemagick-tools"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xrmap/

2017-02-11 Thread David Seifert 
commit: 263c1782e9dc22b82560ef2ba577c936ca5e7978
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=263c1782

x11-misc/xrmap: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 x11-misc/xrmap/{xrmap-2.33-r1.ebuild => xrmap-2.33-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xrmap/xrmap-2.33-r1.ebuild 
b/x11-misc/xrmap/xrmap-2.33-r2.ebuild
similarity index 98%
rename from x11-misc/xrmap/xrmap-2.33-r1.ebuild
rename to x11-misc/xrmap/xrmap-2.33-r2.ebuild
index 3401b95c6f..c389d4113c 100644
--- a/x11-misc/xrmap/xrmap-2.33-r1.ebuild
+++ b/x11-misc/xrmap/xrmap-2.33-r2.ebuild
@@ -32,7 +32,7 @@ CDEPEND="x11-libs/libX11
 RDEPEND="${CDEPEND}
x11-misc/xdg-utils
app-text/gv
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+   virtual/imagemagick-tools
sys-apps/less
media-sound/timidity++"
 DEPEND="${CDEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/

2017-02-11 Thread David Seifert 
commit: da21de7ace1cbb7795b0b5d5f8d515cafd40003f
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:47:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da21de7a

media-gfx/converseen: Use sub-slot operators for imagemagick

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{converseen-0.6.4.ebuild => converseen-0.6.4-r1.ebuild}   | 4 ++--
 .../{converseen-0.6.8.ebuild => converseen-0.6.8-r1.ebuild}   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/converseen/converseen-0.6.4.ebuild 
b/media-gfx/converseen/converseen-0.6.4-r1.ebuild
similarity index 94%
rename from media-gfx/converseen/converseen-0.6.4.ebuild
rename to media-gfx/converseen/converseen-0.6.4-r1.ebuild
index 8f56c316c0..6911d827f6 100644
--- a/media-gfx/converseen/converseen-0.6.4.ebuild
+++ b/media-gfx/converseen/converseen-0.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,7 +27,7 @@ done
 #  || ( media-gfx/imagemagick[cxx] 
media-gfx/graphicsmagick[cxx,imagemagick] )
 RDEPEND="
dev-qt/qtgui:4
-   media-gfx/imagemagick[cxx]
+   media-gfx/imagemagick:=[cxx]
 "
 DEPEND="${RDEPEND}"
 

diff --git a/media-gfx/converseen/converseen-0.6.8.ebuild 
b/media-gfx/converseen/converseen-0.6.8-r1.ebuild
similarity index 94%
rename from media-gfx/converseen/converseen-0.6.8.ebuild
rename to media-gfx/converseen/converseen-0.6.8-r1.ebuild
index 629f2c9966..37f084ac23 100644
--- a/media-gfx/converseen/converseen-0.6.8.ebuild
+++ b/media-gfx/converseen/converseen-0.6.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,7 @@ done
 RDEPEND="
dev-qt/qtcore:4
dev-qt/qtgui:4
-   media-gfx/imagemagick[cxx]
+   media-gfx/imagemagick:=[cxx]
 "
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/

2017-02-11 Thread David Seifert 
commit: 0a79bbd34b91162383bb9062957e456289a031ba
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:47:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a79bbd3

media-radio/xastir: Use sub-slot operators for imagemagick

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 media-radio/xastir/{xastir-2.0.6.ebuild => xastir-2.0.6-r1.ebuild} | 6 +++---
 media-radio/xastir/{xastir-2.0.8.ebuild => xastir-2.0.8-r1.ebuild} | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-radio/xastir/xastir-2.0.6.ebuild 
b/media-radio/xastir/xastir-2.0.6-r1.ebuild
similarity index 93%
rename from media-radio/xastir/xastir-2.0.6.ebuild
rename to media-radio/xastir/xastir-2.0.6-r1.ebuild
index 85fc86e658..0fa7d4e46f 100644
--- a/media-radio/xastir/xastir-2.0.6.ebuild
+++ b/media-radio/xastir/xastir-2.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,8 +23,8 @@ DEPEND=">=x11-libs/motif-2.3:0
net-misc/curl
sys-libs/db:4.8
sci-libs/shapelib
-   !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] )
-   graphicsmagick? ( media-gfx/graphicsmagick[-q32] )
+   !graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] )
+   graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
geotiff? ( sci-libs/proj
sci-libs/libgeotiff
media-libs/tiff:0 )

diff --git a/media-radio/xastir/xastir-2.0.8.ebuild 
b/media-radio/xastir/xastir-2.0.8-r1.ebuild
similarity index 93%
rename from media-radio/xastir/xastir-2.0.8.ebuild
rename to media-radio/xastir/xastir-2.0.8-r1.ebuild
index 38b4af021b..f37c567781 100644
--- a/media-radio/xastir/xastir-2.0.8.ebuild
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,8 +23,8 @@ DEPEND=">=x11-libs/motif-2.3:0
net-misc/curl
sys-libs/db:4.8
sci-libs/shapelib
-   !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] )
-   graphicsmagick? ( media-gfx/graphicsmagick[-q32] )
+   !graphicsmagick? ( media-gfx/imagemagick:=[-hdri,-q32] )
+   graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
geotiff? ( sci-libs/proj
sci-libs/libgeotiff
media-libs/tiff:0 )

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

2017-02-11 Thread David Seifert 
commit: ef664cf5291561a96a3da9b42e3cd41940ff2f4f
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:47:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef664cf5

dev-lang/gdl: Use sub-slot operators for imagemagick

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{gdl-0.9.6-r1.ebuild => gdl-0.9.6-r2.ebuild}   | 33 --
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r1.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
similarity index 86%
rename from dev-lang/gdl/gdl-0.9.6-r1.ebuild
rename to dev-lang/gdl/gdl-0.9.6-r2.ebuild
index fc6add89ad..1dd13833fa 100644
--- a/dev-lang/gdl/gdl-0.9.6-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
+IUSE="+eigen fftw graphicsmagick grib gshhs hdf hdf5 +imagemagick netcdf openmp
  png proj postscript python static-libs udunits wxwidgets"
 
 RDEPEND="
@@ -33,10 +33,8 @@ RDEPEND="
hdf? ( sci-libs/hdf:0= )
hdf5? ( sci-libs/hdf5:0= )
imagemagick? (
-   || (
-   media-gfx/graphicsmagick[cxx]
-   media-gfx/imagemagick[cxx]
-   )
+   !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+   graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
netcdf? ( sci-libs/netcdf )
proj? ( sci-libs/proj )
@@ -47,7 +45,6 @@ RDEPEND="
)
udunits? ( sci-libs/udunits )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-
 DEPEND="${RDEPEND}
dev-java/antlr:0[java(+),script(+)]
virtual/pkgconfig
@@ -69,9 +66,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-   use openmp && [[ $(tc-getCXX)$ == *g++* ]] && \
-   [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp && \
-   die "You are using gcc but without OpenMP capabilities that you 
requested"
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -82,10 +81,12 @@ src_prepare() {
# 
https://sourceforge.net/tracker/?func=detail=618685=3465878_id=97659
rm -r src/antlr || die
einfo "Regenerating grammar"
-   pushd src > /dev/null
+   pushd src >/dev/null || die
local i
-   for i in *.g; do antlr ${i} || die ; done
-   popd > /dev/null
+   for i in *.g; do
+   antlr ${i} || die
+   done
+   popd >/dev/null || die
 
# gentoo: avoid install files in datadir directory
# and manually install them in src_install
@@ -114,8 +115,9 @@ src_configure() {
-DUDUNITS="$(usex udunits)"
-DWXWIDGETS="$(usex wxwidgets)"
)
+
if use imagemagick; then
-   if has_version media-gfx/graphicsmagick[cxx]; then
+   if use graphicsmagick; then
mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
else
mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
@@ -123,6 +125,7 @@ src_configure() {
else
mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
fi
+
configuration() {
mycmakeargs+=( $@ )
cmake-utils_src_configure
@@ -152,6 +155,6 @@ src_install() {
dodoc PYTHON.txt
fi
#dodoc AUTHORS README
-   echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+   echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die
doenvd 50gdl
 }

[gentoo-commits] repo/gentoo:master commit in: www-apps/piwigo/

2017-02-11 Thread David Seifert 
commit: 3e4a1eaf5706f5be6e74159f0e0873540cb103db
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4a1eaf

www-apps/piwigo: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 www-apps/piwigo/{piwigo-2.8.6.ebuild => piwigo-2.8.6-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/piwigo/piwigo-2.8.6.ebuild 
b/www-apps/piwigo/piwigo-2.8.6-r1.ebuild
similarity index 91%
rename from www-apps/piwigo/piwigo-2.8.6.ebuild
rename to www-apps/piwigo/piwigo-2.8.6-r1.ebuild
index d52712d8e2..2a5e236ade 100644
--- a/www-apps/piwigo/piwigo-2.8.6.ebuild
+++ b/www-apps/piwigo/piwigo-2.8.6-r1.ebuild
@@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+exif +gd imagemagick"
 
 DEPEND=""
-RDEPEND="imagemagick? ( || ( media-gfx/imagemagick
-   media-gfx/graphicsmagick[imagemagick] ) )
+RDEPEND="
+   imagemagick? ( virtual/imagemagick-tools )
dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
>=virtual/mysql-5.0
virtual/httpd-php"

[gentoo-commits] repo/gentoo:master commit in: x11-themes/tango-icon-theme/

2017-02-11 Thread David Seifert 
commit: eb82bb17444698ea58fb679c619596074ac244c7
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb82bb17

x11-themes/tango-icon-theme: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 ...tango-icon-theme-0.8.90.ebuild => tango-icon-theme-0.8.90-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild 
b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
similarity index 94%
rename from x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
rename to x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
index 847d2550c1..3b244b172d 100644
--- a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
+++ b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig
>=gnome-base/librsvg-2.34
-   || ( media-gfx/imagemagick[png?] 
media-gfx/graphicsmagick[imagemagick,png?] )
+   virtual/imagemagick-tools[png?]
sys-devel/gettext
>=x11-misc/icon-naming-utils-0.8.90"

[gentoo-commits] repo/gentoo:master commit in: www-apps/curator/

2017-02-11 Thread David Seifert 
commit: f2d2db4f95553d458d208d1667d563ec8c106ba6
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d2db4f

www-apps/curator: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{curator-3.0_p20110120.ebuild => curator-3.0_p20110120-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/curator/curator-3.0_p20110120.ebuild 
b/www-apps/curator/curator-3.0_p20110120-r1.ebuild
similarity index 83%
rename from www-apps/curator/curator-3.0_p20110120.ebuild
rename to www-apps/curator/curator-3.0_p20110120-r1.ebuild
index daf35b6494..2b19f82a3b 100644
--- a/www-apps/curator/curator-3.0_p20110120.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}
dev-python/pillow
-   || ( >=media-gfx/imagemagick-5.4.9 
media-gfx/graphicsmagick[imagemagick] )"
+   virtual/imagemagick-tools"
 
 S="${WORKDIR}/curator-3.0_pf078f1686a78"

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-text2skin/

2017-02-11 Thread David Seifert 
commit: 528b542ebf8264a5d067f2ad39686995d2ba872e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:47:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528b542e

media-plugins/vdr-text2skin: Use sub-slot operators for imagemagick

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 ...-1.3.2.ebuild => vdr-text2skin-1.3.2-r1.ebuild} | 45 +-
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild 
b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
similarity index 68%
rename from media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
rename to media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
index b072c9c495..b75013bc81 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,18 +15,23 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-IUSE="contrib doc +imagemagick imlib"
-
-REQUIRED_USE="imagemagick? ( !imlib )
-   imlib? ( !imagemagick )"
-
-RDEPEND=">=media-video/vdr-1.6.0
-   imagemagick? ( || ( media-gfx/imagemagick[cxx] 
media-gfx/graphicsmagick[cxx] ) )
-   imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] )"
+IUSE="contrib doc graphicsmagick +imagemagick imlib"
+
+RDEPEND="
+   >=media-video/vdr-1.6.0
+   imagemagick? (
+   graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+   !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+   )
+   !imagemagick? (
+   imlib? (
+   media-libs/imlib2
+   >=media-video/vdr-1.6.0[-graphtft]
+   )
+   )"
 DEPEND="${RDEPEND}
-   imagemagick? ( virtual/pkgconfig )
-   imlib? ( virtual/pkgconfig )
-   sys-devel/gettext"
+   sys-devel/gettext
+   virtual/pkgconfig"
 
 KEEP_I18NOBJECT="yes"
 
@@ -42,17 +47,19 @@ src_prepare() {
fi
 
if use imagemagick; then
-   # Prefer imagemagick over graphicsmagick
-   if has_version "media-gfx/imagemagick"; then
-   imagelib="imagemagick"
-   elif has_version "media-gfx/graphicsmagick"; then
+   if use graphicsmagick; then
imagelib="graphicsmagick"
+   else
+   imagelib="imagemagick"
fi
-   elif use imlib; then
-   imagelib="imlib2"
else
-   imagelib="none"
+   if use imlib; then
+   imagelib="imlib2"
+   else
+   imagelib="none"
+   fi
fi
+
sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || 
die
 
vdr-plugin-2_src_prepare

[gentoo-commits] repo/gentoo:master commit in: www-apps/mediawiki/

2017-02-11 Thread David Seifert 
commit: e7d82bfbd8b50f8c0975e0d2718f140853521cd2
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d82bfb

www-apps/mediawiki: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../mediawiki/{mediawiki-1.27.1.ebuild => mediawiki-1.27.1-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/mediawiki/mediawiki-1.27.1.ebuild 
b/www-apps/mediawiki/mediawiki-1.27.1-r1.ebuild
similarity index 96%
rename from www-apps/mediawiki/mediawiki-1.27.1.ebuild
rename to www-apps/mediawiki/mediawiki-1.27.1-r1.ebuild
index 64b2344df5..adcafa361e 100644
--- a/www-apps/mediawiki/mediawiki-1.27.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.27.1-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres sqlite"
 
 RDEPEND=">=dev-lang/php-5.5.9[json,mysql?,postgres?,session,xml,xmlreader]
-   imagemagick? ( || ( media-gfx/imagemagick 
media-gfx/graphicsmagick[imagemagick] ) )
+   imagemagick? ( virtual/imagemagick-tools )
!imagemagick? ( dev-lang/php[gd] )
sqlite? (
dev-db/sqlite:3[fts3(+)]

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

2017-02-11 Thread David Seifert 
commit: a2418bd144ff851458089977b76951398d277fa9
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2418bd1

x11-themes/fvwm-themes: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{fvwm-themes-0.7.0.ebuild => fvwm-themes-0.7.0-r1.ebuild}   | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild 
b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
similarity index 87%
rename from x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
rename to x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
index 12b056dcf7..04fa53ddc8 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,9 +16,7 @@ IUSE="gnome"
 
 RDEPEND=">=x11-wm/fvwm-2.6.2"
 DEPEND="${RDEPEND}
-   gnome? ( || (
-   media-gfx/imagemagick
-   media-gfx/graphicsmagick[imagemagick] ) )"
+   gnome? ( virtual/imagemagick-tools )"
 
 src_prepare() {
epatch \

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

2017-02-11 Thread David Seifert 
commit: b8863eb8d396571ba2e62b748b3e820d753d
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8863eb8

x11-themes/nuvox: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 x11-themes/nuvox/{nuvox-07.1.ebuild => nuvox-07.1-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-themes/nuvox/nuvox-07.1.ebuild 
b/x11-themes/nuvox/nuvox-07.1-r1.ebuild
similarity index 82%
rename from x11-themes/nuvox/nuvox-07.1.ebuild
rename to x11-themes/nuvox/nuvox-07.1-r1.ebuild
index e95217aa17..0c5df3fb92 100644
--- a/x11-themes/nuvox/nuvox-07.1.ebuild
+++ b/x11-themes/nuvox/nuvox-07.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="|| ( media-gfx/imagemagick[png] 
media-gfx/graphicsmagick[imagemagick,png] )"
+DEPEND="virtual/imagemagick-tools[png]"
 
 RESTRICT="strip binchecks"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xnee/

2017-02-11 Thread David Seifert 
commit: 81b7b1415464cca81cbd68c17d4383fa4f01fa29
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b7b141

x11-misc/xnee: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 x11-misc/xnee/{xnee-3.19.ebuild => xnee-3.19-r1.ebuild} | 9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/x11-misc/xnee/xnee-3.19.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild
similarity index 90%
rename from x11-misc/xnee/xnee-3.19.ebuild
rename to x11-misc/xnee/xnee-3.19-r1.ebuild
index eadc4fcaaa..8b161e3b27 100644
--- a/x11-misc/xnee/xnee-3.19.ebuild
+++ b/x11-misc/xnee/xnee-3.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,12 +32,7 @@ DEPEND="${RDEPEND}
x11-proto/inputproto
virtual/pkgconfig
sys-devel/gettext
-   gnome? (
-   || (
-   media-gfx/imagemagick[jpeg,png]
-   media-gfx/graphicsmagick[imagemagick,jpeg,png]
-   )
-   )
+   gnome? ( virtual/imagemagick-tools[jpeg,png] )
 "
 
 # This needs RECORD extension from X.org server which isn't necessarily

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmudmount/

2017-02-11 Thread David Seifert 
commit: 66db7e0ca3dd9acdcf2682794939e26780cbc95d
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66db7e0c

x11-plugins/wmudmount: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild  | 10 +-
 .../{wmudmount-2.2.ebuild => wmudmount-2.2-r2.ebuild}  | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild 
b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
index 4a317efe82..ee477870d1 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
-inherit eutils gnome2-utils xdg
+EAPI=5
+inherit eutils gnome2-utils
 
 DESCRIPTION="A filesystem mounter that uses udisks to handle notification and 
mounting"
 HOMEPAGE="https://sourceforge.net/projects/wmudmount/;
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2
@@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2
libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
virtual/pkgconfig
-   || ( media-gfx/imagemagick[png] 
media-gfx/graphicsmagick[imagemagick,png] )"
+   virtual/imagemagick-tools[png]"
 
 DOCS="ChangeLog"
 

diff --git a/x11-plugins/wmudmount/wmudmount-2.2.ebuild 
b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
similarity index 80%
rename from x11-plugins/wmudmount/wmudmount-2.2.ebuild
rename to x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
index bfdfa9dc1e..32e4f34064 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils gnome2-utils
+EAPI=6
+inherit eutils gnome2-utils xdg
 
 DESCRIPTION="A filesystem mounter that uses udisks to handle notification and 
mounting"
 HOMEPAGE="https://sourceforge.net/projects/wmudmount/;
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2
@@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2
libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
virtual/pkgconfig
-   || ( media-gfx/imagemagick[png] 
media-gfx/graphicsmagick[imagemagick,png] )"
+   virtual/imagemagick-tools[png]"
 
 DOCS="ChangeLog"

[gentoo-commits] repo/gentoo:master commit in: www-apps/bugzilla/

2017-02-11 Thread David Seifert 
commit: 2d0c3de050aa5086592ef8363d27e196f6bbd102
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0c3de0

www-apps/bugzilla: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../bugzilla/{bugzilla-4.4.12.ebuild => bugzilla-4.4.12-r1.ebuild}| 4 ++--
 www-apps/bugzilla/{bugzilla-5.0.3.ebuild => bugzilla-5.0.3-r1.ebuild} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-apps/bugzilla/bugzilla-4.4.12.ebuild 
b/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild
similarity index 95%
rename from www-apps/bugzilla/bugzilla-4.4.12.ebuild
rename to www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild
index b2c21225fc..b5dc6bb8f9 100644
--- a/www-apps/bugzilla/bugzilla-4.4.12.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -64,7 +64,7 @@ RDEPEND="
dev-perl/TheSchwartz
dev-perl/Daemon-Generic
dev-perl/File-MimeInfo
-   || ( media-gfx/imagemagick[perl] 
media-gfx/graphicsmagick[imagemagick,perl] )
+   virtual/imagemagick-tools[perl]
dev-perl/MIME-tools
)
modperl? (

diff --git a/www-apps/bugzilla/bugzilla-5.0.3.ebuild 
b/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild
similarity index 96%
rename from www-apps/bugzilla/bugzilla-5.0.3.ebuild
rename to www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild
index 1efd40a5f2..ecc1dcad7f 100644
--- a/www-apps/bugzilla/bugzilla-5.0.3.ebuild
+++ b/www-apps/bugzilla/bugzilla-5.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -68,7 +68,7 @@ RDEPEND="
dev-perl/TheSchwartz
dev-perl/Daemon-Generic
dev-perl/File-MimeInfo
-   || ( media-gfx/imagemagick[perl] 
media-gfx/graphicsmagick[imagemagick,perl] )
+   virtual/imagemagick-tools[perl]
dev-perl/MIME-tools
)
modperl? (

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

2017-02-11 Thread David Seifert 
commit: fed8c6e66200ecf9b5f3242024777294aca4bf26
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:56 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed8c6e6

x11-terms/roxterm: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 ...erm-2.9.3-r1.ebuild => roxterm-2.9.3-r2.ebuild} |  2 +-
 ...oxterm-3.1.5.ebuild => roxterm-3.1.5-r1.ebuild} | 24 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild 
b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
similarity index 94%
rename from x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
rename to x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
index dbd684bcd3..8c382d7d21 100644
--- a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
+++ b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
dev-python/lockfile
virtual/pkgconfig
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+   virtual/imagemagick-tools
nls? ( app-text/po4a sys-devel/gettext )"
 
 src_configure() {

diff --git a/x11-terms/roxterm/roxterm-3.1.5.ebuild 
b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
similarity index 78%
rename from x11-terms/roxterm/roxterm-3.1.5.ebuild
rename to x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
index 2f524d73f9..45c68df4c5 100644
--- a/x11-terms/roxterm/roxterm-3.1.5.ebuild
+++ b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
@@ -17,20 +17,20 @@ KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
-   dev-libs/glib:2
-   x11-libs/gtk+:3
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/vte:2.91
-   !x11-terms/roxterm:0"
+   dev-libs/glib:2
+   x11-libs/gtk+:3
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/vte:2.91
+   !x11-terms/roxterm:0"
 # slotted versions of roxterm need block one another due to file collisions. 
#565288
 DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   dev-libs/libxslt
-   dev-python/lockfile
-   virtual/pkgconfig
-   || ( media-gfx/imagemagick 
media-gfx/graphicsmagick[imagemagick] )
-   nls? ( app-text/po4a sys-devel/gettext )"
+   ${PYTHON_DEPS}
+   dev-libs/libxslt
+   dev-python/lockfile
+   virtual/pkgconfig
+   virtual/imagemagick-tools
+   nls? ( app-text/po4a sys-devel/gettext )"
 
 src_configure() {
local myconf=(

[gentoo-commits] repo/gentoo:master commit in: x11-misc/shutter/

2017-02-11 Thread David Seifert 
commit: f61dd266c1c40a68f3ef3b65377f3b074f51ca4e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61dd266

x11-misc/shutter: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{shutter-0.93.1-r2.ebuild => shutter-0.93.1-r3.ebuild}| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-misc/shutter/shutter-0.93.1-r2.ebuild 
b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
similarity index 93%
rename from x11-misc/shutter/shutter-0.93.1-r2.ebuild
rename to x11-misc/shutter/shutter-0.93.1-r3.ebuild
index c43a3fd22f..bb5435a669 100644
--- a/x11-misc/shutter/shutter-0.93.1-r2.ebuild
+++ b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="drawing"
 
 RDEPEND="dev-lang/perl
-   drawing? ( dev-perl/Goo-Canvas  )
-   || ( media-gfx/imagemagick[perl] 
media-gfx/graphicsmagick[imagemagick,perl] )
+   drawing? ( dev-perl/Goo-Canvas )
dev-perl/libxml-perl
dev-perl/gnome2-canvas
dev-perl/gnome2-perl
@@ -37,7 +36,8 @@ RDEPEND="dev-lang/perl
dev-perl/WWW-Mechanize
dev-perl/X11-Protocol
dev-perl/XML-Simple
-   dev-perl/libwww-perl"
+   dev-perl/libwww-perl
+   virtual/imagemagick-tools[perl]"
 
 src_prepare() {
default

[gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/

2017-02-11 Thread David Seifert 
commit: 6e3b5b3bfa610ce2d63a94b98cb385d3bf37218b
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3b5b3b

sys-auth/libfprint: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../libfprint/{libfprint-0.4.0.ebuild => libfprint-0.4.0-r1.ebuild}   | 4 ++--
 .../{libfprint-0.5.0-r1.ebuild => libfprint-0.5.0-r2.ebuild}  | 4 ++--
 .../{libfprint-0.5.1-r1.ebuild => libfprint-0.5.1-r2.ebuild}  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-auth/libfprint/libfprint-0.4.0.ebuild 
b/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
similarity index 88%
rename from sys-auth/libfprint/libfprint-0.4.0.ebuild
rename to sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
index 00693a679c..f6322e847a 100644
--- a/sys-auth/libfprint/libfprint-0.4.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE="debug static-libs"
 
 RDEPEND="virtual/libusb:1
dev-libs/nss
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] 
x11-libs/gdk-pixbuf )"
+   || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 

diff --git a/sys-auth/libfprint/libfprint-0.5.0-r1.ebuild 
b/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
similarity index 89%
rename from sys-auth/libfprint/libfprint-0.5.0-r1.ebuild
rename to sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
index 1ec4b00593..477009b3ee 100644
--- a/sys-auth/libfprint/libfprint-0.5.0-r1.ebuild
+++ b/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE="debug static-libs"
 
 RDEPEND="virtual/libusb:1
dev-libs/nss
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] 
x11-libs/gdk-pixbuf )"
+   || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 

diff --git a/sys-auth/libfprint/libfprint-0.5.1-r1.ebuild 
b/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
similarity index 90%
rename from sys-auth/libfprint/libfprint-0.5.1-r1.ebuild
rename to sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
index 801d8644df..e4017a937b 100644
--- a/sys-auth/libfprint/libfprint-0.5.1-r1.ebuild
+++ b/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ IUSE="debug static-libs"
 RDEPEND="virtual/libusb:1
dev-libs/glib:2
dev-libs/nss
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] 
x11-libs/gdk-pixbuf )"
+   || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
 DEPEND="${RDEPEND}
virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/opendx/

2017-02-11 Thread David Seifert 
commit: 2fa7b1781ad366af2e74d2fae9a4510d21471ce1
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:45:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa7b178

sci-visualization/opendx: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 sci-visualization/opendx/opendx-4.4.4-r5.ebuild| 42 ++
 ...endx-4.4.4-r4.ebuild => opendx-4.4.4-r6.ebuild} | 42 --
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild 
b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
index 5c02453d73..6cff41fe1a 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI=4
 
 MYP=dx-${PV}
-
-inherit autotools eutils flag-o-matic
+inherit eutils flag-o-matic autotools multilib
 
 DESCRIPTION="3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/;
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
-   
https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2;
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz;
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="hdf cdf netcdf tiff imagemagick szip smp"
 
 RDEPEND="x11-libs/libXmu
@@ -29,29 +27,26 @@ RDEPEND="x11-libs/libXmu
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
netcdf? ( sci-libs/netcdf )
-   tiff? ( media-libs/tiff:0 )
-   imagemagick? ( media-gfx/imagemagick )"
+   tiff? ( media-libs/tiff )
+   imagemagick? ( virtual/imagemagick-tools )"
 
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 S="${WORKDIR}/${MYP}"
-PATCHES=(
-   "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
-   "${FILESDIR}/${P}-installpaths.patch"
-   "${FILESDIR}/${P}-xdg.patch"
-   "${FILESDIR}/${P}-gcc43.patch"
-   "${FILESDIR}/${P}-dx-errno.patch"
-   "${FILESDIR}/${P}-libtool.patch"
-   "${FILESDIR}/${P}-concurrent-make-fix.patch"
-   "${FILESDIR}/${P}-open.patch"
-   "${FILESDIR}/${P}-szip.patch"
-   "${FILESDIR}/${P}-null.patch"
-   "${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch"
-)
 
 src_prepare() {
-   default
+   epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+   epatch "${FILESDIR}/${P}-installpaths.patch"
+   epatch "${FILESDIR}/${P}-xdg.patch"
+   epatch "${FILESDIR}/${P}-gcc43.patch"
+   epatch "${FILESDIR}/${P}-dx-errno.patch"
+   epatch "${FILESDIR}/${P}-libtool.patch"
+   epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
+   epatch "${FILESDIR}/${P}-open.patch"
+   epatch "${FILESDIR}/${P}-szip.patch"
+   epatch "${FILESDIR}/${P}-null.patch"
+   epatch "${FILESDIR}/${P}-magick.patch"
eautoreconf
 }
 
@@ -69,6 +64,7 @@ src_configure() {
 
# javadx is currently broken. we may try to fix it someday.
econf \
+   --libdir="${EPREFIX}"/usr/$(get_libdir) \
--with-x \
--without-javadx \
$(use_with szip szlib) \

diff --git a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild 
b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
similarity index 60%
rename from sci-visualization/opendx/opendx-4.4.4-r4.ebuild
rename to sci-visualization/opendx/opendx-4.4.4-r6.ebuild
index 67d504fe1d..a1bfc06af9 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 MYP=dx-${PV}
-inherit eutils flag-o-matic autotools multilib
+
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/;
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz;
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz
+   
https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2;
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="hdf cdf netcdf tiff imagemagick szip smp"
 
 RDEPEND="x11-libs/libXmu
@@ -27,26 +29,29 @@ RDEPEND="x11-libs/libXmu
hdf? ( sci-libs/hdf )
cdf? ( sci-libs/cdf )
netcdf? ( sci-libs/netcdf )
-   tiff? ( media-libs/tiff )
-   imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )"
+   tiff? ( media-libs/tiff:0 )
+   imagemagick? ( virtual/imagemagick-tools )"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/pyxplot/

2017-02-11 Thread David Seifert 
commit: d6ce208fe4df470a8e1bc3161a7bb1660722b230
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:46:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ce208f

sci-visualization/pyxplot: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../pyxplot/{pyxplot-0.9.2.ebuild => pyxplot-0.9.2-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild 
b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
similarity index 88%
rename from sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
rename to sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
index b4cc6cfe54..2360e44164 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,7 @@ RDEPEND="
sci-libs/gsl
sci-libs/scipy[${PYTHON_USEDEP}]
virtual/latex-base
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+   virtual/imagemagick-tools"
 DEPEND="${RDEPEND}
virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gri/

2017-02-11 Thread David Seifert 
commit: f06d552dd35b72f809a2a7932d374948a0357ec3
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:45:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f06d552d

sci-visualization/gri: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 sci-visualization/gri/{gri-2.12.23.ebuild => gri-2.12.23-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-visualization/gri/gri-2.12.23.ebuild 
b/sci-visualization/gri/gri-2.12.23-r1.ebuild
similarity index 94%
rename from sci-visualization/gri/gri-2.12.23.ebuild
rename to sci-visualization/gri/gri-2.12.23-r1.ebuild
index a1462cf5ca..c5f382aedd 100644
--- a/sci-visualization/gri/gri-2.12.23.ebuild
+++ b/sci-visualization/gri/gri-2.12.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,10 +16,10 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples hdf5"
 
 DEPEND="
+   app-text/ghostscript-gpl
>=sci-libs/netcdf-4
virtual/latex-base
-   || ( media-gfx/imagemagick[png] 
media-gfx/graphicsmagick[png,imagemagick] )
-   app-text/ghostscript-gpl
+   virtual/imagemagick-tools[png]
emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"

  1   2   3   >