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

[Hans de Graaff]

commit: ff3d7cfeb72b07400dfbded018fe6d0266919c95
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 22 04:59:04 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 22 05:07:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3d7cfe

dev-ruby/rcairo: add 1.15.2

Package-Manager: portage-2.2.26

 dev-ruby/rcairo/Manifest |  1 +
 dev-ruby/rcairo/rcairo-1.15.2.ebuild | 76 
 2 files changed, 77 insertions(+)

diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 83b95f0..81225a0 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,2 +1,3 @@
 DIST cairo-1.14.1.gem 96768 SHA256 
e93a7bc97687d2725b77f4651656f77a42a134e39129e05c853c6eac1929ae4d SHA512 
08d045f5763ed61ff10fe7d5388532e4fd6be24411a9e5e1ea3cc17de48092cab0723cbf17208eb488fa3322114f4112182983a487516db291173644a0dee355
 WHIRLPOOL 
cc0056366208c6b3f722042758a6a469b0ffe4dcb8a71fc17970773e4fad05208efd46d7b354feb71230ecedd839d719cbde1685f5c113288fbda58ff52c
 DIST cairo-1.14.3.gem 97792 SHA256 
e3a31ef8097c0b16f2ad71561dca37b4564ae3003838a82805aadeceb69d03b6 SHA512 
aba56403ca813bdcc56c01fed76642e4115a683ed3e3d056675195d2d86fc7dfa44f0077ca47407eeea27789824171251222e6300f3f3c395bc186afb616c772
 WHIRLPOOL 
724d072ad881f54cdcdc631399f99e6bdc563bc78f70c611bdeb3ddc659de78e4ce75c1ec51ac6659542e9ab8ae9c138caa610f97e37a6a1d69440313b69e6a9
+DIST cairo-1.15.2.gem 98304 SHA256 
954cb9bf7ac7cc79a5cc805be61ca81378454f20f621939fa6afb4513cab50d9 SHA512 
61ebc30c096de50e4a1d5115c3af45913870aa357a788aa3d440f3945b0292ff410022296879f5a5d03229114261227db1fb15ceaee1cf91c586bb1f00544fc6
 WHIRLPOOL 
6be8cf957f08c3e871bbd73e33a41d117e92e123569756332552e47b6287c68682f91c3b23e85156d84348de17f3f901ffd7bce9cbaf6289558d27ffa522a2c5

diff --git a/dev-ruby/rcairo/rcairo-1.15.2.ebuild 
b/dev-ruby/rcairo/rcairo-1.15.2.ebuild
new file mode 100644
index 000..c328abf
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.15.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+# Documentation depends on files that are not distributed.
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="http://cairographics.org/rcairo/;
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="${RDEPEND}
+   >=x11-libs/cairo-1.2.0[svg]"
+DEPEND="${DEPEND}
+   >=x11-libs/cairo-1.2.0[svg]"
+
+ruby_add_bdepend "
+   dev-ruby/pkg-config
+   dev-ruby/ruby-glib2
+   test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
+
+all_ruby_prepare() {
+   # Avoid development dependency.
+   sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die
+}
+
+each_ruby_configure() {
+   ${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
+}
+
+each_ruby_compile() {
+   emake V=1 -Cext/cairo
+
+   # again, try to make it more standard, to install it more easily.
+   cp ext/cairo/cairo$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+   # don't rely on the Rakefile because it's a mess to load with
+   # their hierarchy, do it manually.
+   ${RUBY} -Ilib -r ./test/cairo-test-utils.rb \
+   -e 'gem "test-unit"; require "test/unit"; 
Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+   each_fakegem_install
+
+   insinto $(ruby_get_hdrdir)
+   doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   insinto /usr/share/doc/${PF}/samples
+   doins -r samples/*
+}

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

[Hans de Graaff]

commit: 554cb4ea888f2159e214a902cd8dd143b0f5e9e0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 22 05:03:22 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 22 05:07:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554cb4ea

dev-ruby/ruby-tcpwrap: cleanup

Package-Manager: portage-2.2.26

 dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r2.ebuild | 55 
 1 file changed, 55 deletions(-)

diff --git a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r2.ebuild 
b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r2.ebuild
deleted file mode 100644
index f88fc6f..000
--- a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ruby22 -> Does not compile
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-ng
-
-DESCRIPTION="A TCP wrappers library for Ruby"
-HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=ruby-tcpwrap;
-SRC_URI="http://shugo.net/archive/ruby-tcpwrap/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
-IUSE=""
-
-DEPEND+=" net-libs/libident
-   sys-apps/tcp-wrappers"
-
-RDEPEND+=" net-libs/libident
-   sys-apps/tcp-wrappers"
-
-RUBY_S="${PN}"
-RUBY_PATCHES=( "${P}-ruby19.patch" )
-
-each_ruby_configure() {
-   ${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-   # We have injected --no-undefined in Ruby as a safety precaution
-   # against broken ebuilds, but the Ruby-Gnome bindings
-   # unfortunately rely on the lazy load of other extensions; see bug
-   # #320545.
-   find . -name Makefile -print0 | xargs -0 \
-   sed -i -e 's:-Wl,--no-undefined ::' || die "--no-undefined 
removal failed"
-
-   emake V=1
-}
-
-each_ruby_install() {
-   emake DESTDIR="${D}" install V=1
-}
-
-all_ruby_install() {
-   dodoc README*
-   dohtml doc/*
-
-   docinto sample
-   dodoc sample/*
-}

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

[Hans de Graaff]

commit: eda7be2465ffa16fa1a2c8d0f84f9c832cf48070
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 22 05:02:56 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 22 05:07:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda7be24

dev-ruby/ruby-tcpwrap: mark ruby21 revision stable

Package-Manager: portage-2.2.26

 dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild 
b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
index 94dc131..0689287 100644
--- a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
+++ b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://shugo.net/archive/ruby-tcpwrap/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
 IUSE=""
 
 DEPEND+=" net-libs/libident

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

[Hans de Graaff]

commit: 8bc0a85daa58cb6de519953ee292bc5c7150d496
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 22 05:04:34 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 22 05:07:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc0a85d

dev-ruby/ruby-tcpwrap: drop ruby19

Package-Manager: portage-2.2.26

 dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild 
b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
index 0689287..7964c69 100644
--- a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
+++ b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 # ruby22 -> Does not compile
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 inherit ruby-ng
 

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

[Hans de Graaff]

commit: 28fa069d11315c5c9139ea4edb9c4611aff1f2e6
Author: Hans de Graaff  gentoo  org>
AuthorDate: Fri Apr 22 04:52:41 2016 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Fri Apr 22 05:07:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28fa069d

dev-ruby/barby: actually add 0.6.3 and fix metadata

0.6.3 was actually a version of 0.6.2 due to a stuck commit.
0.6.3-r1 now uses the release tag again so it downloads the
proper version.

Also drop unused datamatrix and pdf-writer USE flags which
referenced obsolete and removed packages.

Package-Manager: portage-2.2.26

 dev-ruby/barby/Manifest|   3 +-
 dev-ruby/barby/barby-0.6.2-r1.ebuild   | 124 -
 .../{barby-0.6.3.ebuild => barby-0.6.3-r1.ebuild}  |  54 +++--
 dev-ruby/barby/metadata.xml|   6 -
 4 files changed, 16 insertions(+), 171 deletions(-)

diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index 6369681..89eaa3c 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1,2 +1 @@
-DIST barby-0.6.2.tgz 92842 SHA256 
fd8be7db0d3214fc2e2f330cc62de7c8d1884311b0230501b9cc9a23ec7f5deb SHA512 
bb1a0387cfcabe8e282b1624c09574778cf438a5aa9fddaafd413ffe06726e95a766bc3f8bbb51b39894c267b167ce8b3cfe3cbaf83896a90c3509b81478e3a6
 WHIRLPOOL 
55a9f2171373735fc6fa7bfff60c4faaa0e1a1ab97facfa9a0025a63f9575858177d2df3c5b39dc140a8d163e46c368e1ec2798351fb8208d58fb5c64e4b0c2b
-DIST barby-0.6.3.tgz 92842 SHA256 
fd8be7db0d3214fc2e2f330cc62de7c8d1884311b0230501b9cc9a23ec7f5deb SHA512 
bb1a0387cfcabe8e282b1624c09574778cf438a5aa9fddaafd413ffe06726e95a766bc3f8bbb51b39894c267b167ce8b3cfe3cbaf83896a90c3509b81478e3a6
 WHIRLPOOL 
55a9f2171373735fc6fa7bfff60c4faaa0e1a1ab97facfa9a0025a63f9575858177d2df3c5b39dc140a8d163e46c368e1ec2798351fb8208d58fb5c64e4b0c2b
+DIST barby-0.6.3.tar.gz 92841 SHA256 
51546e7f58fc4587ec7977ac924874ac89ee1397ddd11d3fdeaa3a567dcebb92 SHA512 
b7415298ee2d8bb17a88b5c647d707a15151d2110834e87c2d598def88290ad90947bc49ded175b44050d8d95510602d374699fd91f2fb873728e8536dc70ef6
 WHIRLPOOL 
e0272be0adeb828d7745ddbb9ffe61674314943bfd3ad5aaca29a998b38bdd9dbe25d1e4333b182c63edd0240c509a32037c4e9277cdbf0b01723aa261e19a6a

diff --git a/dev-ruby/barby/barby-0.6.2-r1.ebuild 
b/dev-ruby/barby/barby-0.6.2-r1.ebuild
deleted file mode 100644
index 0f9792a..000
--- a/dev-ruby/barby/barby-0.6.2-r1.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=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-COMMIT="891b15594b34229b8bdb267c10ab5b5309c03320"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
-HOMEPAGE="http://toretore.eu/barby/;
-
-GITHUB_USER="toretore"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tgz"
-
-RUBY_S="${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="datamatrix test qrcode rmagick pdf-writer prawn png cairo"
-
-ruby_add_rdepend "
-   rmagick? ( dev-ruby/rmagick )
-   cairo? ( dev-ruby/rcairo )"
-
-ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
-   png? ( dev-ruby/chunky_png )
-   prawn? ( dev-ruby/prawn )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-# testing requires imagemagick capable of png output
-DEPEND+=" test? ( media-gfx/imagemagick[png] )"
-
-# prawn breaks tests for some reasons, needs to be investigated; code
-# still works though.
-RESTRICT="prawn? ( test )"
-
-all_ruby_prepare() {
-   sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb
-}
-
-each_ruby_prepare() {
-   if use datamatrix; then
-   sed -i -e '/^end/i s.add_dependency "semacode"' 
${RUBY_FAKEGEM_GEMSPEC}
-   else
-   rm \
-   lib/barby/barcode/data_matrix.rb \
-   test/data_matrix_test.rb
-   fi
-
-   if use pdf-writer; then
-   sed -i -e '/^end/i s.add_dependency "pdf-writer"' 
${RUBY_FAKEGEM_GEMSPEC}
-   else
-   rm \
-   lib/barby/outputter/pdfwriter_outputter.rb \
-   test/outputter/pdfwriter_outputter_test.rb
-   fi
-
-   if use qrcode; then
-   sed -i -e '/^end/i s.add_dependency "rqrcode"' 
${RUBY_FAKEGEM_GEMSPEC}
-   else
-   rm \
-   lib/barby/barcode/qr_code.rb \
-   test/qr_code_test.rb
-   fi
-
-   if use rmagick; then
-   sed -i -e '/^end/i s.add_dependency "rmagick"' 
${RUBY_FAKEGEM_GEMSPEC}
-   else
-   rm \
-   lib/barby/outputter/rmagick_outputter.rb \
-   test/outputter/rmagick_outputter_test.rb
-   fi
-
-   if use prawn; then
-   sed -i -e 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/files/, app-emulation/wine/

[NP Hardass]

commit: 5bb6349e0a63266292dc361f7e4e956428442504
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr 22 03:02:02 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Apr 22 04:48:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb6349e

app-emulation/wine:  Version bump to 1.9.8

Package-Manager: portage-2.2.26

 app-emulation/wine/Manifest   |   2 +
 app-emulation/wine/files/wine-sysmacros.patch | 177 ++
 app-emulation/wine/wine-1.9.8.ebuild  | 446 ++
 3 files changed, 625 insertions(+)

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 23cbc68..b2902c9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -49,6 +49,7 @@ DIST wine-1.9.4.tar.bz2 22974777 SHA256 
75c1eab6b980870b367a73db6e57eb0dc9242c2b
 DIST wine-1.9.5.tar.bz2 23034629 SHA256 
fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512 
cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07
 WHIRLPOOL 
7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
 DIST wine-1.9.6.tar.bz2 23071838 SHA256 
3d2b862feefd89eca954c1cbc16a28e0ce851aeea1555bc1842ffc9aab2c1557 SHA512 
d56d5b18a26b4902ac0138a4358f91a027f929a3ae70346e48b529eb7f09f7f1971bdae52d6a37dabbb598771ee5754b320e39c6ef26700202bf6be90b8b101b
 WHIRLPOOL 
544ad527ceeb9339fd7fb35d847451dbdac79da6226cf15fb2c4be01eed3babe4c5e343236c5005553084ff83ce4e274305b5f91b2bf03a6a27d695c4ece280c
 DIST wine-1.9.7.tar.bz2 23101883 SHA256 
49705fe02505e26ef8022c662dda702cfcd5c4fd73886e00b43d32dc2f8887ec SHA512 
9946d3c69941f26e56ab78cde3c91d91debb7fc5d63f8758aa5a4e0bcdfb78c86d43f3b736b81b761bb5924479491ed00727a739e0117d3e9d5e3b8c3a90004a
 WHIRLPOOL 
4f4f509b894c6907a8b10b08b6851406c2172d969b1133aab64afdf53de2ca21b19cdbdea555b514fb9a8df4da44356419fc2a6bef12584b271c359978070b1e
+DIST wine-1.9.8.tar.bz2 23183703 SHA256 
8bf34e8dd68e7187ed11fb06a55a76789073dda6ab2db6b84e194acf4f561a1d SHA512 
3f90238b78836836b4cd74975da07b0ce39f3da0e68fc8529554e1770ecd52c315519985bd15dc82756491ca3d145b27249a0e937221badb01ed3a1f8a69fbd4
 WHIRLPOOL 
22f633ac0f9d1f7bf874dc756432534c0deca765e49013576ea69ade86c98e8759fb14813d8d68451250911902541a3027a729328bff1aedd74ecafc9c85acf0
 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 
bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 
b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb979b4c10699430129ea4a71da418c1fe175f0
 WHIRLPOOL 
227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
 DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 
f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 
bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd
 WHIRLPOOL 
0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
 DIST wine-mono-0.0.8.msi 46967296 SHA256 
3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 
d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd
 WHIRLPOOL 
1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
@@ -90,6 +91,7 @@ DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 
1b3c6bb3e21e549fb8657cd9a2117946b7
 DIST wine-staging-1.9.5.tar.gz 9889302 SHA256 
e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512 
aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10
 WHIRLPOOL 
692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
 DIST wine-staging-1.9.6.tar.gz 9959130 SHA256 
e9eb9990aa7f3f07931bfe158c883ebad595e58239855c7f6c01758b4d195db9 SHA512 
508b5cd553a8b4a293e9250af670de693992c6f6e71e9e3759408b1e8745985030fbcb78c83ae6669e73e48caf95c3a6f0c92da0a96791912d7e6c4d29a26bd2
 WHIRLPOOL 
2ebc3ca7ea38d2fda310567083f28b76c4f0120dce659152ccacf95eb07de3dfe8950eb9b306b1a91b30ded8e3914f5852f7928e735659c2b02eb50d82fe0fca
 DIST wine-staging-1.9.7.tar.gz 10006278 SHA256 
f1f0f76815c4d6f0011a6036400f2130809eb5b9b953cc505e187029a71ff69c SHA512 
e90db22c03b1d8e334204b473e8bde377ba7fdb84d884a9ae12b2d70e70e150d735579dcb3df4b6b0a94269e54297b0881489ad6eebe421006dd29f0ec5f
 WHIRLPOOL 
13b3bed7e2f8fe8f0c44d4f3d7fdaa8517ad88e03f1fd077b9fe7bb8b6ec68e247af99dbcda08f65233cb90d1c90497ef87ecb4a46cc7841e45088abb97df0fd
+DIST wine-staging-1.9.8.tar.gz 10010607 SHA256 
49201e31105208ae106f9426c2ca150e5d289b94c9b938a8669fbd32f58cec3d SHA512 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/

[NP Hardass]

commit: d1e9f93d59950038f467bdd1b999724e90071558
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr 22 02:42:16 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Apr 22 04:47:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e9f93d

app-emulation/wine: Add d3d9 support to 

Package-Manager: portage-2.2.26

 app-emulation/wine/metadata.xml |  7 +++
 app-emulation/wine/wine-.ebuild | 27 +++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 16fa7a6..aa61670 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -5,6 +5,11 @@
w...@gentoo.org
Wine

+   
+   commendsar...@gmail.com
+   Nick Sarnie
+   Only CC on bugs that involve 
USE="d3d9"
+   

 Wine is an Open Source implementation of the Windows API on top of X and Unix.
 
@@ -13,6 +18,8 @@ Think of Wine as a compatibility layer for running Windows 
programs. Wine does n

Enable ISDN support via CAPI
Bypass strip-flags; use at your own 
peril
+   Apply highly experimental patches for Gallium 
Nine support.
+   This patch may break some applications.
Pull in games-emulation/dosbox to 
run DOS applications
Add support for the Gecko engine when using 
iexplore
Use media-libs/gstreamer to 
provide DirectShow functionality;

diff --git a/app-emulation/wine/wine-.ebuild 
b/app-emulation/wine/wine-.ebuild
index d0ad464..c495091 100644
--- a/app-emulation/wine/wine-.ebuild
+++ b/app-emulation/wine/wine-.ebuild
@@ -26,6 +26,8 @@ MV="4.6.2"
 [[ ${MAJOR_V} == "1.8" ]] && SUFFIX="-unofficial"
 STAGING_P="wine-staging-${PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}${SUFFIX}"
+D3D9_P="${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
 WINE_GENTOO="wine-gentoo-2015.03.07"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/;
@@ -39,14 +41,16 @@ SRC_URI="${SRC_URI}
 
 if [[ ${PV} == "" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+   D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
 else
SRC_URI="${SRC_URI}
-   staging? ( 
https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz 
-> ${STAGING_P}.tar.gz )"
+   staging? ( 
https://github.com/wine-compholio/wine-staging/archive/v${PV}${SUFFIX}.tar.gz 
-> ${STAGING_P}.tar.gz )
+   d3d9? ( 
https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-${PV}.tar.gz -> 
${D3D9_P}.tar.gz )"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc 
+fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses 
netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png 
prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging 
test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos 
elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 
ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight 
+png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl 
staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
@@ -62,6 +66,7 @@ RESTRICT="test"
 COMMON_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
capi? ( net-dialup/capi4k-utils )
+   d3d9? ( media-libs/mesa[d3d9,${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
@@ -216,8 +221,7 @@ src_unpack() {
local WINE_COMMIT=${EGIT_VERSION}
 
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
-   unset ${PN}_LIVE_REPO;
-   unset EGIT_COMMIT;
+   unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
 
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 
@@ -229,9 +233,15 @@ src_unpack() {
einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} 
emerge -1 wine"
fi
fi
+   if use d3d9; then
+   EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
+   unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
+   EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+   fi
else

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/

[NP Hardass]

commit: 1eea3aa95b374cefa58d52928764e25517805ce2
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr 22 04:47:05 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Apr 22 04:48:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eea3aa9

app-emulation/wine: Version bump to 1.8.2

Package-Manager: portage-2.2.26

 app-emulation/wine/Manifest  |   2 +
 app-emulation/wine/wine-1.8.2.ebuild | 456 +++
 2 files changed, 458 insertions(+)

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 13e9093..c3a99a0 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -43,6 +43,7 @@ DIST wine-1.7.8.tar.bz2 21463503 SHA256 
30e17f5f863a09416f3d229666566b318dbb40f6
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 
79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 
29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9baadd2d85b904b55d99687a1c83d0
 WHIRLPOOL 
333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
 DIST wine-1.8-gstreamer-1.0.patch.bz2 30908 SHA256 
00cc1e943e2dffb7d588bb5befd444655a661bc0a0e51e49651af47e9421c501 SHA512 
46901b549b1c84f7d8f8ff4485d1faf60a108cdf84feddc754739aff918e1e979b0b8a1a2604e5df6693bdfb02a3324516a187187f019bea13bc5485fc51aec9
 WHIRLPOOL 
afe4caaf7b3d7ab07a9d8f6ea32125c1838745d399eb9ef2211c669bcd445ae5020991bd729b0460a6804fe5d44a2f42c32d94b2de32cc4b338f9391dcc6f78c
 DIST wine-1.8.1.tar.bz2 22839063 SHA256 
149ad3daaf8593b36c5c061285df0ec2a25e20ea48c61323be91088c4d22ca97 SHA512 
e4cc3d00f28a616326f3069c7eeb94dc07759018b719bc37fe733b0f5e5d17f54ed2e877a964e9ea235362c49bf45bb3ec7072fba3d66648e6c7d55568e863cb
 WHIRLPOOL 
8970d900c769add34a079f84c0562fca2d7e303ee9aa15de0fe2fde059de01256951c5ffeddb7b0a126599636e83d0d4ebdb8c0df5cde218fe8858e8b2451a0a
+DIST wine-1.8.2.tar.bz2 23635449 SHA256 
031b465cb5252f9b3cc62b2b7c16545e1138aea4896170eab19b6674f4311e94 SHA512 
7861fce21aa9891d7086343591e4ea241e476e0d4c54485f7ce687bfc2b5e0fc7bc025e4b83a9f6ca3a99d50597bcb1ab5fc4983f4c59eb699cc584385c6cadf
 WHIRLPOOL 
bf2b42e8ce973af760b080998aef22881cc20a6865cdfe81d941212ea164dd1b0e91f1115ad516055b8b498bc224d767716d47e3fdaa7a0cbf52427e5e5f1c88
 DIST wine-1.8.tar.bz2 22843418 SHA256 
f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 SHA512 
34308e82e04dee714fdbd10f29cd6cf6326e5e6e9134f7076e58b09988211065b8c6584881b7e5dcbc9b3906a819ab8a72b612b060cb9aa50b5b67f03bdab089
 WHIRLPOOL 
335a48f1b34cd1038d62290e52c3189b842d4077b7cf0bcb9d003595992360dc36eac1c592d31db44598de68010f3934daa1f4bcd0a2ca74aa130a39a74f7ce3
 DIST wine-1.9.4.tar.bz2 22974777 SHA256 
75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed08 SHA512 
e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c
 WHIRLPOOL 
875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
 DIST wine-1.9.5.tar.bz2 23034629 SHA256 
fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512 
cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07
 WHIRLPOOL 
7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
@@ -85,6 +86,7 @@ DIST wine-staging-1.7.53.tar.gz 9638222 SHA256 
438f41165987a57635694dba2f67cc435
 DIST wine-staging-1.7.54.tar.gz 9647030 SHA256 
b244ab05326e0a4c149beba0684afc100d44dca8e6ff606bcfee883b21b27303 SHA512 
f6e58be01ba10121d6904cb238b2d91dd79cb7d14d623c00a897e655adb88332bea125cedf3fad85e680c76aacfbab16dd5035c322278155defd3b493054aa23
 WHIRLPOOL 
4c053ad96e67f4e82c93d3cfa9b6f885c4c3fe693946dd0e2a30cef556aac55f9dcafb5c56ced0f714f8ea9448cb4e22f144ea7f3561cfdb5bbff1b049d34f07
 DIST wine-staging-1.7.55.tar.gz 9604441 SHA256 
856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512 
a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d
 WHIRLPOOL 
ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
 DIST wine-staging-1.8.1.tar.gz 9598557 SHA256 
12a4e54376515e2ab8ad79855ba724ba065c8de619c5da192ec528cc365f9c97 SHA512 
d24bb78aed1e50ad73e742608048a68097d40e3c6563c1bd5adc2fab6abe0838dbce2d9f700ef71d876c6dfee232e97bef91bbc8f6b6c9092ff8db5a2d0f05ac
 WHIRLPOOL 
cb1400586860d4e6dad3f3bad78bdde27f8ea9fb703180533f5852368041879efe93e716df8f54bbeabba38b7d921ec0e2737bc6121c8cb5fd5af8d117d7e538
+DIST wine-staging-1.8.2.tar.gz 9618287 SHA256 
5edc355bac1e65d721cedd325ee3ccf16bf2775993ceaed607c5398d54626d9c SHA512 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/

[NP Hardass]

commit: cf6a04d2d7e917b4706d609df527361897c88bcf
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr 22 03:06:48 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Apr 22 04:48:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6a04d2

app-emulation/wine: Rename sysmacros patch for 1.9.7

Package-Manager: portage-2.2.26

 .../wine/files/wine-1.9.7-sysmacros.patch  | 177 -
 app-emulation/wine/wine-1.9.7.ebuild   |   2 +-
 2 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/app-emulation/wine/files/wine-1.9.7-sysmacros.patch 
b/app-emulation/wine/files/wine-1.9.7-sysmacros.patch
deleted file mode 100644
index 4ea515d..000
--- a/app-emulation/wine/files/wine-1.9.7-sysmacros.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From ca8a08606d3f0900b3f4aa8f2e6547882a22dba8 Mon Sep 17 00:00:00 2001
-From: Seong-ho Cho 
-Date: Mon, 18 Apr 2016 04:25:38 +0900
-Subject: [PATCH] configure: Add AC_HEADER_MAJOR to find where major() is
- defined.
-
-Signed-off-by: Seong-ho Cho 
-Signed-off-by: Alexandre Julliard 

- configure  | 50 ++
- configure.ac   |  1 +
- dlls/ntdll/cdrom.c |  5 +
- dlls/ntdll/directory.c |  5 +
- dlls/ntdll/file.c  |  5 +
- include/config.h.in|  8 
- server/fd.c|  5 +
- 7 files changed, 79 insertions(+)
-
-diff --git a/configure b/configure
-index 1cb0e59..ffb1825 100755
 a/configure
-+++ b/configure
-@@ -6836,6 +6836,56 @@ fi
- 
- done
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines 
makedev" >&5
-+$as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
-+if ${ac_cv_header_sys_types_h_makedev+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include 
-+int
-+main ()
-+{
-+return makedev(0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_header_sys_types_h_makedev=yes
-+else
-+  ac_cv_header_sys_types_h_makedev=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+conftest$ac_exeext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ac_cv_header_sys_types_h_makedev" >&5
-+$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; }
-+
-+if test $ac_cv_header_sys_types_h_makedev = no; then
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" 
"ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-+
-+$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+  if test $ac_cv_header_sys_mkdev_h = no; then
-+ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" 
"ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-+
-+$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
-+
-+fi
-+
-+
-+  fi
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode 
macros are broken" >&5
- $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
- if ${ac_cv_header_stat_broken+:} false; then :
-diff --git a/configure.ac b/configure.ac
-index 6189aa9..201bc77 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\
-   valgrind/valgrind.h \
-   zlib.h
- )
-+AC_HEADER_MAJOR()
- AC_HEADER_STAT()
- 
- dnl  Checks for headers that depend on other ones 
-diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
-index ee36045..2c64106 100644
 a/dlls/ntdll/cdrom.c
-+++ b/dlls/ntdll/cdrom.c
-@@ -38,6 +38,11 @@
- #ifdef HAVE_SYS_STAT_H
- # include 
- #endif
-+#ifdef MAJOR_IN_MKDEV
-+# include 
-+#elif defined(MAJOR_IN_SYSMACROS)
-+# include 
-+#endif
- #include 
- 
- #ifdef HAVE_SYS_IOCTL_H
-diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
-index 93fe594..4d431c0 100644
 a/dlls/ntdll/directory.c
-+++ b/dlls/ntdll/directory.c
-@@ -47,6 +47,11 @@
- #ifdef HAVE_SYS_ATTR_H
- #include 
- #endif
-+#ifdef MAJOR_IN_MKDEV
-+# include 
-+#elif defined(MAJOR_IN_SYSMACROS)
-+# include 
-+#endif
- #ifdef HAVE_SYS_VNODE_H
- /* Work around a conflict with Solaris' system list defined in sys/list.h. */
- #define list SYSLIST
-diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 7e5da59..b3bd9d6 100644
 a/dlls/ntdll/file.c
-+++ b/dlls/ntdll/file.c
-@@ -57,6 +57,11 @@
- #ifdef HAVE_SYS_SOCKET_H
- #include 
- #endif
-+#ifdef MAJOR_IN_MKDEV
-+# include 
-+#elif defined(MAJOR_IN_SYSMACROS)
-+# include 
-+#endif
- #ifdef HAVE_UTIME_H
- # include 
- #endif
-diff --git a/include/config.h.in b/include/config.h.in
-index 0650f31..06b192f 100644
 a/include/config.h.in
-+++ b/include/config.h.in
-@@ -1335,6 +1335,14 @@
- /* Define to 1 if you have the `__res_get_state' function. */
- #undef HAVE___RES_GET_STATE
- 
-+/* Define to 1 if 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/

[NP Hardass]

commit: 490176277bf1d3e2b18d206b5e4f9d3fcd7996c9
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr 22 04:27:37 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Apr 22 04:48:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49017627

app-emulation/wine: EAPI 6 bumps, winbind fix, sysmacros fix, sync ebuilds

Package-Manager: portage-2.2.26

 app-emulation/wine/Manifest|   1 -
 .../wine/{wine-1.9.4.ebuild => wine-1.8-r1.ebuild} |  27 +-
 .../{wine-1.8.1.ebuild => wine-1.8.1-r1.ebuild}|   6 +-
 app-emulation/wine/wine-1.8.ebuild | 451 -
 .../{wine-1.9.8.ebuild => wine-1.9.4-r1.ebuild}|   8 +-
 .../{wine-1.9.8.ebuild => wine-1.9.5-r1.ebuild}|   8 +-
 app-emulation/wine/wine-1.9.5.ebuild   | 441 
 .../{wine-1.9.7.ebuild => wine-1.9.6-r1.ebuild}|  13 +-
 .../{wine-1.9.6.ebuild => wine-1.9.7-r1.ebuild}|  14 +-
 app-emulation/wine/wine-1.9.8.ebuild   |   3 +-
 10 files changed, 45 insertions(+), 927 deletions(-)

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index b2902c9..13e9093 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -38,7 +38,6 @@ DIST wine-1.7.51.tar.bz2 22639053 SHA256 
397fc95b463d6ae1b65ab0477d9fe5d0871e8e2
 DIST wine-1.7.52.tar.bz2 22707539 SHA256 
0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b SHA512 
834a77553d1352840c747ab5dc3e582b15da4ea65f16f9d58d0cc8afb460b4a0fded859929331dd32d9f4f66ab14bb890cf239d0a283bf9ffd92b48f9d1687de
 WHIRLPOOL 
7e6cc679d994449e7f822c2593d1e8cc87d439df6084ad7d48897f3829b866219a0674e81e1fecdc5629225cd3c6ca2735212e1a0cb9d41a236af4674b62d077
 DIST wine-1.7.53.tar.bz2 22763993 SHA256 
efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 SHA512 
82c53c5a7913f5c3ab38239f6cd4dc5ec16db878b8ff9ff46162f11f72c13a3da9c1dc80e7eddef5eb2b909e7b8cd771294cfdc79d734d643aecfeefb0059401
 WHIRLPOOL 
054640d64794e0eac3b41c359353a8d322f9ae9a9a01969616fe6f9207d4276909d4fa17c7a2b167d705166490df523b3dcaf738efab0a71bfab26ea59eeafe1
 DIST wine-1.7.54.tar.bz2 22800326 SHA256 
e0f311f392815468df774b33312cde80bf1ff3a894c9c2b462825fd49619bb27 SHA512 
15c9c80518d41486da416d531f7be101353d379bcd8fd309395d2932eceabb3fa5cd8180066f73d13c6a211495146bb544a8878657cf9ca8e5e14987a038a6c7
 WHIRLPOOL 
b1f6f3e4149307f8c0b3feb443dd7b36e8a5c81b8b7b41f6c39167590fb13057174c95723f262082465fe1696c17d9216ea93ad2f8ce1e8f5c8d7aadc12d5425
-DIST wine-1.7.55-gstreamer-v5.patch.bz2 5800 SHA256 
9ce03b6bc404dec4ed82208dcaa5cbe282c6df7da51392369fcb933de9273c2c SHA512 
2f73c44ca66462cc64570645771fd4b3289525393098ef499ba7199745f836c313572145e3f3d259f9f1c6b7c876e15b2f909a914dd1e21eaa79d9671b40f105
 WHIRLPOOL 
444e456fb82de3b59342eb6d3a28805a3f068e70e6417a16489c784932c486e812807698f29dee5d9715d22bd1e31c733ed649d7396746008a552bc78ee27e55
 DIST wine-1.7.55.tar.bz2 22814631 SHA256 
a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512 
f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7
 WHIRLPOOL 
c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 
30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 
1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea
 WHIRLPOOL 
3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 
79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 
29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9baadd2d85b904b55d99687a1c83d0
 WHIRLPOOL 
333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a

diff --git a/app-emulation/wine/wine-1.9.4.ebuild 
b/app-emulation/wine/wine-1.8-r1.ebuild
similarity index 95%
rename from app-emulation/wine/wine-1.9.4.ebuild
rename to app-emulation/wine/wine-1.8-r1.ebuild
index 70ad728..71ab536 100644
--- a/app-emulation/wine/wine-1.9.4.ebuild
+++ b/app-emulation/wine/wine-1.8-r1.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib 
multilib-minimal 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/

[NP Hardass]

commit: a4628781809dd5d35dd70e2b41b62ab291743c45
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Apr 22 02:44:49 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Apr 22 04:48:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4628781

app-emulation/wine: Fix samba USE flag for 

Package-Manager: portage-2.2.26

 app-emulation/wine/wine-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine/wine-.ebuild 
b/app-emulation/wine/wine-.ebuild
index c495091..fd9b548 100644
--- a/app-emulation/wine/wine-.ebuild
+++ b/app-emulation/wine/wine-.ebuild
@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )
perl? ( dev-lang/perl dev-perl/XML-Simple )
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
-   samba? ( >=net-fs/samba-3.0.25 )
+   samba? ( >=net-fs/samba-3.0.25[winbind] )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )
pulseaudio? ( realtime? ( sys-auth/rtkit ) )"

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

[Mike Gilbert]

commit: 60c223a99b278e189e56bec91bc4acdd248006eb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Apr 21 23:39:13 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Apr 21 23:39:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c223a9

www-client/chromium: stable channel bump (50.0.2661.86)

Package-Manager: portage-2.2.28_p3

 www-client/chromium/Manifest |   1 +
 www-client/chromium/chromium-50.0.2661.86.ebuild | 695 +++
 2 files changed, 696 insertions(+)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4455712..ea27b3b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,4 @@
 DIST chromium-50.0.2661.75.tar.xz 531558012 SHA256 
c12d644e711ec85c800ab61a749d1f03ba7999e0c3cd20f8495a674d39a643da SHA512 
cc44a052a858d9f43052d825bac891bb44bb5ec4261f4c7a560d9f0798edd9c0ec2c174dd3a61f6adcf01976838e97c49d93973b8c926c6ef5cd8c92ee1672f3
 WHIRLPOOL 
8ec8164fd305f0a67bf433f46294d06e16ac3d0c2b2e5d5531c213f1c471aedc51f2b61215f507677ad3cd40c529cb72547facdeba3ce3c4cc081c3727ef97aa
+DIST chromium-50.0.2661.86.tar.xz 531539124 SHA256 
6cc22761c4a774408cb34e77e056691526f469eca0899f578d5372cf0f756786 SHA512 
64549732146ab2aa3c7582b4596f2a4fde7769c76facf380a6f2e3504c32be42560d1b230a943edb79dd0f019eca7ad133a32765b17143fc9d3eada1d3744ddd
 WHIRLPOOL 
837a977c7ec66e3d2f1b58a54875e3b5b1c130117a1add077b6f38c196c432f175d55a0663f5ac576dd44c9ee77199689125b8b57794e4422fed7b5fe9961fa0
 DIST chromium-51.0.2704.19.tar.xz 459662212 SHA256 
515846fadd3fb4a539c5b368854ba918aeeff910f83e346e2f2515e9251f2ef3 SHA512 
86aca654f4ba1c6704748cb41c53273513f6de80a0482e1ae95d02306cc967b7d9d87cba8e9b4984287a4f38b821611fe42c3870c2c9f79997d6a5f8a4ca
 WHIRLPOOL 
5bf091f52335f7ba29f1acf78e073c5c4304e83d7537781691fdd483c45b6466333d64f756ce99ef47578b31fd2828f4124fda492cb62bc6974e71de67d9
 DIST chromium-51.0.2704.7.tar.xz 459684340 SHA256 
1597514c47ff7c09c2a6002adb60b9a4aba6b1eab3dd53fea7438a0cdbe3d8e1 SHA512 
dd2a177e8309a6ddee92edecac866d6a1bcecb476df42d4b8823921b8457563238bae76ddfb360a536787b81547f063f054d0582ddc2ac5545b0d4d3b62bc10e
 WHIRLPOOL 
39b703f60dea0a2c33ad4c1da68b5340782a845f2f25496d5829f2a2ba9733cf3b689907de33024d3f8dc3582153e7f9f969bfd2591ae845948c012ac207f1f4

diff --git a/www-client/chromium/chromium-50.0.2661.86.ebuild 
b/www-client/chromium/chromium-50.0.2661.86.ebuild
new file mode 100644
index 000..030e6f9
--- /dev/null
+++ b/www-client/chromium/chromium-50.0.2661.86.ebuild
@@ -0,0 +1,695 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+   hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl 
sr
+   sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing 
pax-utils \
+   portability python-any-r1 readme.gentoo toolchain-funcs versionator 
virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/;
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz;
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos 
neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc 
widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+REQUIRED_USE="gn? ( kerberos !system-ffmpeg )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND="
+   app-arch/bzip2:=
+   cups? ( >=net-print/cups-1.3.11:= )
+   >=dev-libs/elfutils-0.149
+   dev-libs/expat:=
+   dev-libs/glib:=
+   >=dev-libs/jsoncpp-0.5.0-r1:=
+   dev-libs/nspr:=
+   >=dev-libs/nss-3.14.3:=
+   gnome? ( >=gnome-base/gconf-2.24.0:= )
+   gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+   >=media-libs/alsa-lib-1.0.19:=
+   media-libs/fontconfig:=
+   media-libs/freetype:=
+   media-libs/libexif:=
+   media-libs/speex:=
+   pulseaudio? ( media-sound/pulseaudio:= )
+   system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
+   sys-apps/dbus:=
+   sys-apps/pciutils:=
+   >=sys-libs/libcap-2.22:=
+   virtual/udev
+   x11-libs/cairo:=
+   x11-libs/gdk-pixbuf:=
+   gtk3? ( x11-libs/gtk+:3= )
+   !gtk3? ( x11-libs/gtk+:2= )
+   x11-libs/libdrm
+   x11-libs/libX11:=
+   x11-libs/libXcomposite:=
+   x11-libs/libXcursor:=
+   x11-libs/libXdamage:=
+   x11-libs/libXext:=
+   

[gentoo-commits] repo/gentoo:master commit in: sci-misc/fitsverify/

[Sebastien Fabbro]

commit: 3b9c3631e5d828f18ba466878a6f9027c286a09a
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Thu Apr 21 22:48:50 2016 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Thu Apr 21 22:49:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c3631

sci-misc/fitsverify: Version bump

Package-Manager: portage-2.2.28

 sci-misc/fitsverify/Manifest   |  1 +
 sci-misc/fitsverify/fitsverify-4.18.ebuild | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/sci-misc/fitsverify/Manifest b/sci-misc/fitsverify/Manifest
index 7d301ae..074759a 100644
--- a/sci-misc/fitsverify/Manifest
+++ b/sci-misc/fitsverify/Manifest
@@ -1 +1,2 @@
 DIST fitsverify-4.17.tar.gz 42634 SHA256 
1ffb76e285715477ac3d7de3cc5ce96e74c3cd81f9b3d840327dda39d0598c3b SHA512 
0d15b8e4ae5098126bed2bb2dfaa47ac20d977ed707352dc7930ebaf23a7a20cc69458fd77f9e76888e2ec4ef8a2a2f180c2fe03b9b7a4c9299aeea6df831879
 WHIRLPOOL 
f666800c32603027ea07dff975d104b525643e13bc7920bf6056d8ff2f5c0dc1701a4a7d870e5c0a64ca1399f199b3d542ffcbed6a6a280202d193c615305b0f
+DIST fitsverify-4.18.tar.gz 42840 SHA256 
e6fd00c2aa3749ab991167c7129ad27c79d9ee841ec8df1c11b307e875b8faba SHA512 
4be82078bf328538e1b98b386aedd6b2501a25e3d17f19e0db5b82ed8f62493e51f01228653ecf769ff3c706a16c8d65fe64ebc8693e8dd406e88d0a9ffc5010
 WHIRLPOOL 
8256483b864301ac1f73c117b0487456891520401fb93640a627ea7c82bb4c69cda0bdd1fafd4a22b48c3aa0b6b551d22fa75ea64b4eccae67b4785bf383b055

diff --git a/sci-misc/fitsverify/fitsverify-4.18.ebuild 
b/sci-misc/fitsverify/fitsverify-4.18.ebuild
new file mode 100644
index 000..ccd8120
--- /dev/null
+++ b/sci-misc/fitsverify/fitsverify-4.18.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="FITS file format checker"
+HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/;
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+   $(tc-getCC) ${CPPFLAGS} -DSTANDALONE ${CFLAGS} ${LDFLAGS} \
+   $($(tc-getPKG_CONFIG) --cflags cfitsio) \
+   ftverify.c fvrf*.c \
+   $($(tc-getPKG_CONFIG) --libs cfitsio) -o ${PN} \
+   || die "compiled failed"
+}
+
+src_install() {
+   dobin fitsverify
+   dodoc README
+}

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

[Mike Gilbert]

commit: e247c00b95b77912a1ee63193f6e6ee41e78a862
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Apr 21 22:40:05 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Apr 21 22:40:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e247c00b

sys-apps/hwids: bump

Package-Manager: portage-2.2.28_p3

 sys-apps/hwids/Manifest  |  1 +
 sys-apps/hwids/hwids-20160421.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index d85e94f..80ddef8 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -7,3 +7,4 @@ DIST hwids-20150417.tar.gz 1724883 SHA256 
ef4d3e3f722ef7a2294af3e1c048c735cb0aa6
 DIST hwids-20150421.tar.gz 1726968 SHA256 
2c3ced90c069392f1f6ccdf7a8541ea2c3d871c575b8b6b02129e62bcec6f6a4 SHA512 
3418d48b4f9b2dcb6e221a07ab74c81004866b40aa9d7b5ab0b73d2ed1febbd9e4d3d2d76e0a0e3c9d71c4dd79767c1cffa346d68c91e8fb19bcef3baccb101c
 WHIRLPOOL 
5427dcd0725a5dfc16af441b52ad0bad1bf770a2287f814c6f032b5696062b76b934ca6cf968f45addd5b197c66011da6ddfd3a4b9539103672e1b66d68fb262
 DIST hwids-20150717.tar.gz 1745565 SHA256 
5a4769cd0e57a96c2693e7ec3d48f53e493afae58376a1f7124a08844632d917 SHA512 
431a3a024512719ed5d53f21291de28bb5f904987fbeb8a90583517e24abcf5e19d9312819f02bcffbb42c0b16e761e4517575a600d1d8102f8373d1a21806d0
 WHIRLPOOL 
2ef9b880801d1ca94311104193e96f64eef58b7db86ee486614e80e63a1e9c42d9f940aadebd19c708ad0caab9a0be43ffcd44d9288bbce41238a64815d82076
 DIST hwids-20160306.tar.gz 1900745 SHA256 
d5ae6937e87c4ae0a4dad84b8a917434831eda15b0bfcc5a8444bfca84279645 SHA512 
766736ed2586ea163b0ea97654d6b73314bacc822d26f9d823dcd9de8661747a0372b0cd754b3c2605c6b1795440f87df126beafc391cf64577f461bd27b5e6c
 WHIRLPOOL 
9a5d38fb4afa232917f69aa8d1fde3e55e20674d740941a392ee7cfa3f7d64d679a6e0a96553fb6c327bf5c98a1c3e8f6eff902dda99751dd5a15c6c20585022
+DIST hwids-20160421.tar.gz 1916501 SHA256 
dcdfbb732e08ca3822c98599dc0a04c6dad092ee46441f9afec9e42d9a978d5f SHA512 
7097dc74cd1db3e9695502d4ca49ff0c3a59d169cd15dd6d03841900a9c5e13f89becc12bbc1a673386c6f7620a916e0edb7c5704990991beb21fc21d5deb673
 WHIRLPOOL 
42641b19601ba62d2f136d263342a39e56147cb89f557408677868215b83cf8466a8d5bb9127f28113c6097d08e05a194b4e78c8e6dd371f180d1b3cff24

diff --git a/sys-apps/hwids/hwids-20160421.ebuild 
b/sys-apps/hwids/hwids-20160421.ebuild
new file mode 100644
index 000..6f18cd5
--- /dev/null
+++ b/sys-apps/hwids/hwids-20160421.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit udev eutils
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids;
+if [[ ${PV} == "" ]]; then
+   EGIT_REPO_URI="${HOMEPAGE}.git"
+   inherit git-2
+else
+   SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux 
~arm-linux ~x86-linux"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND="udev? (
+   dev-lang/perl
+   >=virtual/udev-206
+)"
+[[ ${PV} == "" ]] && DEPEND+=" udev? ( net-misc/curl )"
+RDEPEND="! udev/61-oldkeyboard.hwdb || die
+}
+
+_emake() {
+   emake \
+   NET=$(usex net) \
+   PCI=$(usex pci) \
+   UDEV=$(usex udev) \
+   USB=$(usex usb) \
+   "$@"
+}
+
+src_compile() {
+   _emake
+}
+
+src_install() {
+   _emake install \
+   DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+   MISCDIR="${EPREFIX}/usr/share/misc" \
+   HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+   DESTDIR="${D}"
+}
+
+pkg_postinst() {
+   if use udev; then
+   udevadm hwdb --update --root="${ROOT%/}"
+   # 
https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+   [ "${ROOT:-/}" = "/" ] && udevadm control --reload
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/

[Patrice Clement]

commit: 280f0e723e28049eb48d691f968ea9e869ed5c75
Author: Aric Belsito  gmail  com>
AuthorDate: Thu Apr 21 01:29:16 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 21 22:22:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280f0e72

dev-lua/lpeg: Set self as proxy-maint

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

Signed-off-by: Patrice Clement  gentoo.org>

 dev-lua/lpeg/metadata.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
index 84f8f1c..94eea51 100644
--- a/dev-lua/lpeg/metadata.xml
+++ b/dev-lua/lpeg/metadata.xml
@@ -1,8 +1,16 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
 
   
 v...@gentoo.org
 Gentoo Vim Project
   
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+  
+llui...@gmail.com
+Aric Belsito
+  
 

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/

[Patrice Clement]

commit: 03538dca961bb5d299562e1ec08cb27cd5a5dadc
Author: Aric Belsito  gmail  com>
AuthorDate: Thu Apr 21 01:30:33 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 21 22:22:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03538dca

dev-lua/lpeg: revbump to 1.0.0-r1

Bring up to EAPI 6
Add LuaJIT Support
Install re.lua

Gentoo-Bug: https://bugs.gentoo.org/577250
Closes: https://github.com/gentoo/gentoo/pull/1317

Signed-off-by: Patrice Clement  gentoo.org>

 dev-lua/lpeg/lpeg-1.0.0-r1.ebuild | 48 +++
 dev-lua/lpeg/metadata.xml |  4 
 2 files changed, 52 insertions(+)

diff --git a/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild 
b/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
new file mode 100644
index 000..059315a
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/;
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="debug doc luajit"
+
+RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+   luajit? ( dev-lang/luajit:2= )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+DOCS=( "HISTORY" )
+HTML_DOCS=( "lpeg.html"  "re.html"  )
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-makefile.patch )
+
+src_prepare() {
+   default
+   use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)" \
+   LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex 
luajit 'luajit' 'lua'))"
+}
+
+src_test() {
+   $(usex luajit 'luajit' 'lua') test.lua || die
+}
+
+src_install() {
+   exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 
'luajit' 'lua'))"
+   doexe lpeg.so
+   insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 
'luajit' 'lua'))"
+   doins re.lua
+
+   use doc && einstalldocs
+}

diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
index 94eea51..e35e783 100644
--- a/dev-lua/lpeg/metadata.xml
+++ b/dev-lua/lpeg/metadata.xml
@@ -13,4 +13,8 @@
 llui...@gmail.com
 Aric Belsito
   
+  
+Use dev-lang/luajit instead of
+  dev-lang/lua
+  
 

[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird/

[Ian Stakenvicius]

commit: b89a08cb4427120b34026f3931ffef40a62ded17
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Thu Apr 21 21:23:29 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Thu Apr 21 21:25:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89a08cb

mail-client/thunderbird: re-pack lightning and gdata-provider langpacks

Package-Manager: portage-2.2.26

 mail-client/thunderbird/Manifest| 4 ++--
 mail-client/thunderbird/thunderbird-45.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b65bde9..df735fc 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -8,12 +8,12 @@ DIST firefox-38.0-patches-05.tar.xz 18412 SHA256 
d2a2be8359c15d42fd2355bb54048db
 DIST firefox-45.0-patches-03.tar.xz 15980 SHA256 
5bc13bb36d3e907dcffe4d57c7ace78478859bfdbe84a6b99fa76502592e0291 SHA512 
6384773ea4944db15dc131a05cf61bb96505899fb5077d54c5e7227f07423656627c81321a3c207d7a3b4ad0830dd9a53d66aca832dc1ee177964516489aab30
 WHIRLPOOL 
c3626f501434c3dc9ec4a7ba3d02e50ff8b9d011005fb334d5dedf5177d6af778e541cb7cb4ebe7d281563434bace214008c54299809e823dd83c5a5de535247
 DIST gdata-provider-1.0.3.tar.xz 55860 SHA256 
2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 
d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb
 WHIRLPOOL 
2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f
 DIST gdata-provider-1.9.tar.xz 80812 SHA256 
8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 
b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d54c9f6b469c95ddb190fa04fe14a54a
 WHIRLPOOL 
df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
+DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 
e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 
e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b
 WHIRLPOOL 
0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
 DIST gdata-provider-2.6.3.xpi 115020 SHA256 
008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 
38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e
 WHIRLPOOL 
70d87e73d39879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
-DIST gdata-provider-2.6.tar.xz 83884 SHA256 
b872dde3eafccec88c5548833530b88c85eb044e3a222f6f198d924829512f0d SHA512 
b1b954babd775e183a36e913013b1d056778b12d50dd089c329aa322cc9820ad563e7e02e5eca7b1ae52c5ebed2cfdc52d11bdb973dc3ebe41cffd0c585d5c7b
 WHIRLPOOL 
eb6197ab474e8852eefabf608b0b66d12e6dea3bfe5c94f18225211d286293dc2e52ad85c7e94a8688946de33c174c72d001b5f591b47a616b07d6c475a8457a
 DIST lightning-2.6.5.xpi 3645840 SHA256 
c4bc84f7e21148d6d06f4f61de70c7b4e331b53dce12979309e91294d4289b31 SHA512 
880002e1c01a06b22ca20a120a5e4d893c364b058d7d52d12dddcdd3f4215652ae2c20332c3ca29fa6c5012df71330abda05bf3b862485043ddd481628ef801b
 WHIRLPOOL 
5003a341a174cbe7da8b069d9f5d6ade0a7c0e8d842a0c25f74702e997942b3ea43be1e0eb6913d75bc78ef23fb2ee57551860d02b331db039cd6adbfcfa1f5c
 DIST lightning-3.3.xpi 4226096 SHA256 
eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 
c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34
 WHIRLPOOL 
abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
 DIST lightning-4.0.7.tar.xz 2314196 SHA256 
929e2c92c219a8938cae87a00153eab72762d31e16c9143f80b784e4d60a SHA512 
5b386f0eca9d18b6eaab2bf25ff269480784db3b5288c8f0653fd5ccbbb0a87ee6332e5f392d28a4143efc2de9115546b7d1e759fad849db2ead590347286d4f
 WHIRLPOOL 
e9a006edf054f3ba4f3a2230e0ee6f14c8dffb86f0d137e9f646aa8b4520b27cc97d62f98d86e88f5ae799bdb8caf30d0caf4734f7948fb676dd908482bc2b16
-DIST lightning-4.7.tar.xz 1929596 SHA256 
6368d6438131c1b64a4089b073bd46aa45c1baa1dc9d1e65fb2146b2491ae75e SHA512 
537f586da73bc0bac2851fe2930f84fe7406170711290a37cd4076197a3580cd95619e82be3428e7330dde5cb93c89fcd7ed03367b9921a4c6c678c8b6745113
 WHIRLPOOL 
68b39e241bcc820a3c5febf15f15ab2ac680004154b18df786a77f61611573b71b8726f3054f97ad95aff20969e1d59830c4c13966ed6d88aa6b1d8dc9de7a7b
+DIST lightning-4.7-r1.tar.xz 1926956 SHA256 
b0aaa666d60d6b85be540e6988233987523b70ecb5af6bcd3d5f5d26d19b0008 SHA512 
46db4733067b869cde618810083b3f6e5a49169fa868b561c67e8b17111a8ccb2dfd3ff0fcc33979b81925e381ef2d3a6675ed899119cb300883b16ac3c47344
 

[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/

[Ian Stakenvicius]

commit: f503e999099fe2bf89007b7ca2c67702f2108fa6
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Thu Apr 21 21:24:36 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Thu Apr 21 21:24:36 2016 +
URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f503e999

re-pack lightning and gdata-provider langpacks for thunderbird-45

 mail-client/thunderbird/Manifest| 4 ++--
 mail-client/thunderbird/thunderbird-45.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index cfe2d99..81a3875 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,7 +1,7 @@
 DIST enigmail-1.9.1.tar.gz 1736876 SHA256 
0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512 
5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c
 WHIRLPOOL 
80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a
 DIST firefox-45.0-patches-03.tar.xz 15980 SHA256 
5bc13bb36d3e907dcffe4d57c7ace78478859bfdbe84a6b99fa76502592e0291 SHA512 
6384773ea4944db15dc131a05cf61bb96505899fb5077d54c5e7227f07423656627c81321a3c207d7a3b4ad0830dd9a53d66aca832dc1ee177964516489aab30
 WHIRLPOOL 
c3626f501434c3dc9ec4a7ba3d02e50ff8b9d011005fb334d5dedf5177d6af778e541cb7cb4ebe7d281563434bace214008c54299809e823dd83c5a5de535247
-DIST gdata-provider-2.6.tar.xz 83884 SHA256 
b872dde3eafccec88c5548833530b88c85eb044e3a222f6f198d924829512f0d SHA512 
b1b954babd775e183a36e913013b1d056778b12d50dd089c329aa322cc9820ad563e7e02e5eca7b1ae52c5ebed2cfdc52d11bdb973dc3ebe41cffd0c585d5c7b
 WHIRLPOOL 
eb6197ab474e8852eefabf608b0b66d12e6dea3bfe5c94f18225211d286293dc2e52ad85c7e94a8688946de33c174c72d001b5f591b47a616b07d6c475a8457a
-DIST lightning-4.7.tar.xz 1929596 SHA256 
6368d6438131c1b64a4089b073bd46aa45c1baa1dc9d1e65fb2146b2491ae75e SHA512 
537f586da73bc0bac2851fe2930f84fe7406170711290a37cd4076197a3580cd95619e82be3428e7330dde5cb93c89fcd7ed03367b9921a4c6c678c8b6745113
 WHIRLPOOL 
68b39e241bcc820a3c5febf15f15ab2ac680004154b18df786a77f61611573b71b8726f3054f97ad95aff20969e1d59830c4c13966ed6d88aa6b1d8dc9de7a7b
+DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 
e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 
e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b
 WHIRLPOOL 
0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
+DIST lightning-4.7-r1.tar.xz 1926956 SHA256 
b0aaa666d60d6b85be540e6988233987523b70ecb5af6bcd3d5f5d26d19b0008 SHA512 
46db4733067b869cde618810083b3f6e5a49169fa868b561c67e8b17111a8ccb2dfd3ff0fcc33979b81925e381ef2d3a6675ed899119cb300883b16ac3c47344
 WHIRLPOOL 
2cbb98b3e7623aaa33a04056b8ef1c6a697e16449eec72d05ffdac20692ac3013cead77838a5eb064a0f55a17550f4ffd6e7ded28728e5b85c39937afe96d73d
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 
cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 
52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de
 WHIRLPOOL 
a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
 DIST thunderbird-45.0-ar.xpi 490773 SHA256 
fb2149bf73d5ac70ed902634eb30171835dabaa1a320aa0761057d5a1833bef9 SHA512 
80659c914873717c6538e2933a2983190476cf42498a01337ce0cd6468401aa66002061fe54175c47280fa482c43372a1951d78db5b331826fa2b086047c1014
 WHIRLPOOL 
25b43ba0cd0ce5d4464158f4a8069346c35ee184412240c97a0514e730f3895772562bf5323c1103cb1152738d9207b6e10c981e2d62c0a4320c2192c7b1aaa6
 DIST thunderbird-45.0-ast.xpi 428057 SHA256 
aa00a32977f5f6181f7a5e7d97c5e7518e69ab7d4babd93c2e60e3d34a5b849f SHA512 
56c7e5761f2192a1963acdecae1ce1fdfc8f194470c7c1827d4a0cb8c676c9d24fbf07e7a9fb098b36ab5ca29bf33869e61fa9c02b11c65f4a133351fe1e3c33
 WHIRLPOOL 
71a400ebb82c835b818f959200c36994ed3d40b1c27bdb0852447c7bd55a61072a8dd6b1711698ebf18ebbfe4e25e40c8ae3c823ffbb0f4095e6ea1d90550f50

diff --git a/mail-client/thunderbird/thunderbird-45.0.ebuild 
b/mail-client/thunderbird/thunderbird-45.0.ebuild
index dc5cdc1..f035e4c 100644
--- a/mail-client/thunderbird/thunderbird-45.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.0.ebuild
@@ -47,8 +47,8 @@ RESTRICT="!bindist? ( bindist )"
 PATCH_URIS=( 
https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz
 )
 SRC_URI="${SRC_URI}
${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-   
https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-   lightning? ( 
https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz
 )
+   

[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/files/, www-servers/nginx/

[Zac Medico]

commit: 85509ccf9222c448b6c6986b6b3efe18e3cba6cc
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Apr 21 20:49:11 2016 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Apr 21 20:49:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85509ccf

www-servers/nginx: fix nginx_modules_upstream_check for 1.8.1 (bug 580764)

Package-Manager: portage-2.2.28

 www-servers/nginx/files/check_1.7.2+.patch | 201 -
 www-servers/nginx/nginx-1.8.1.ebuild   |   2 +-
 2 files changed, 1 insertion(+), 202 deletions(-)

diff --git a/www-servers/nginx/files/check_1.7.2+.patch 
b/www-servers/nginx/files/check_1.7.2+.patch
deleted file mode 100644
index 50405a5..000
--- a/www-servers/nginx/files/check_1.7.2+.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-commit 21116e1c0bba730ca59327ffba9320bc63f11462
-Author: Johan Bergström 
-Date:   Thu Jun 19 10:17:22 2014 +1000
-
-Add support for upstream_check to nginx 1.7.2
-
-diff --git src/http/modules/ngx_http_upstream_ip_hash_module.c 
src/http/modules/ngx_http_upstream_ip_hash_module.c
-index 148d73a..be9e03d 100644
 src/http/modules/ngx_http_upstream_ip_hash_module.c
-+++ src/http/modules/ngx_http_upstream_ip_hash_module.c
-@@ -9,6 +9,9 @@
- #include 
- #include 
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- typedef struct {
- /* the round robin data must be first */
-@@ -212,6 +215,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t 
*pc, void *data)
- goto next_try;
- }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+"get ip_hash peer, check_index: %ui",
-+ peer->check_index);
-+if (ngx_http_check_peer_down(peer->check_index)) {
-+goto next_try;
-+}
-+#endif
-+
- if (peer->max_fails
- && peer->fails >= peer->max_fails
- && now - peer->checked <= peer->fail_timeout)
-diff --git src/http/modules/ngx_http_upstream_least_conn_module.c 
src/http/modules/ngx_http_upstream_least_conn_module.c
-index dbef95d..14e9e40 100644
 src/http/modules/ngx_http_upstream_least_conn_module.c
-+++ src/http/modules/ngx_http_upstream_least_conn_module.c
-@@ -9,6 +9,9 @@
- #include 
- #include 
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- typedef struct {
- ngx_uint_t*conns;
-@@ -203,6 +206,16 @@ 
ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
- continue;
- }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+"get least_conn peer, check_index: %ui",
-+peer->check_index);
-+
-+if (ngx_http_check_peer_down(peer->check_index)) {
-+continue;
-+}
-+#endif
-+
- if (peer->max_fails
- && peer->fails >= peer->max_fails
- && now - peer->checked <= peer->fail_timeout)
-@@ -256,6 +269,16 @@ 
ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
- continue;
- }
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-+"get least_conn peer, check_index: %ui",
-+peer->check_index);
-+
-+if (ngx_http_check_peer_down(peer->check_index)) {
-+continue;
-+}
-+#endif
-+
- if (lcp->conns[i] * best->weight != lcp->conns[p] * peer->weight) 
{
- continue;
- }
-diff --git src/http/ngx_http_upstream_round_robin.c 
src/http/ngx_http_upstream_round_robin.c
-index 37c835c..43ccdcf 100644
 src/http/ngx_http_upstream_round_robin.c
-+++ src/http/ngx_http_upstream_round_robin.c
-@@ -9,6 +9,9 @@
- #include 
- #include 
- 
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+#include "ngx_http_upstream_check_handler.h"
-+#endif
- 
- static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer(
- ngx_http_upstream_rr_peer_data_t *rrp);
-@@ -88,6 +91,14 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peer[n].fail_timeout = server[i].fail_timeout;
- peer[n].down = server[i].down;
- peer[n].server = server[i].name;
-+#if (NGX_UPSTREAM_CHECK_MODULE)
-+if (!server[i].down) {
-+peers->peer[n].check_index =
-+ngx_http_check_add_peer(cf, us, [i].addrs[j]);
-+} else {
-+peers->peer[n].check_index = (ngx_uint_t) NGX_ERROR;
-+}
-+#endif
- n++;
- }
- }
-@@ -144,6 +155,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
- peer[n].fail_timeout = server[i].fail_timeout;
- peer[n].down = server[i].down;
- peer[n].server = 

[gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jre-bin/

[James Le Cuirot]

commit: 58479e4472428eb84038f809de731b4bf82b7c97
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr 21 20:32:49 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 21 20:33:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58479e44

dev-java/oracle-jre-bin: Remove vulnerable 1.8.0.77 wrt bug #580608

Package-Manager: portage-2.2.28

 dev-java/oracle-jre-bin/Manifest   |   2 -
 .../oracle-jre-bin/oracle-jre-bin-1.8.0.77.ebuild  | 249 -
 2 files changed, 251 deletions(-)

diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 81e80bd..3893f52 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -2,7 +2,5 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 
7a8d790e7bd9c2f82a83baddfae765797a4a
 DIST jce_policy-8.zip 8409 SHA256 
f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 
abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5
 WHIRLPOOL 
8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 
b773aef1458a4adde03af62f8163c7e4614b485e1f01699ff8f5f60919251575 SHA512 
d85b8700248a4ad0a0873d0c84b2175fb0a66773c43899ab47ac531be089794c17eb0e8b7503d46efd78833da17c9fa8a83ad1cb9c062e191acfb77155639474
 WHIRLPOOL 
766c88748bc758a1b35bd6008750cc8f2678801b1cc5629bcb7a756e4a32973a5f5ad927348b3ce3ad9ecb3e7aca5d1af2b613fba35d4f53f9601b1ff42312b2
 DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 
4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 
e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d
 WHIRLPOOL 
1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe
-DIST jre-8u77-linux-i586.tar.gz 73962085 SHA256 
c38fddad261e58fed2d3c49df420a679c3948d7b14474095c98706e67a26b69b SHA512 
94d2c2eb43bb71938d17ff28d09c65f10899a998fa78e0e3f61def522589ff713116cc1c3f189924f989bfaff5d68fbdf7a63080cb3060c6a13db34ce287aaa9
 WHIRLPOOL 
5c10515ee14ef717bbf829c426fc61d0bb79e9c0f33b372dbc4384c10a769a9fa73e446770269ffd24c8bd826633f2ace65f3a20bc0fa7f2e2c4673b53160843
-DIST jre-8u77-linux-x64.tar.gz 71796315 SHA256 
edd9db13e81913d8758263eb5e923cbe854d24c1d47a61a7d62064a7dba5255f SHA512 
6deb45779d6b0c0f85637dfff16ee4eb60614dd1d6c6a5a8ad923cadf08025c037aa764e1ebe91b165ac77bcf2992c1ecd54af92fc37a6274e4b6d5e06b3d6c6
 WHIRLPOOL 
12c2e63d6b368da09d8531dcc16cef4fdcf709c25d617a7c52d90c489c54ac861cdc6e9f039c1b653305132e62b611a5642084d72365c7a518d64eaabc1aa371
 DIST jre-8u92-linux-i586.tar.gz 73984536 SHA256 
c64e5778e61912118e1b566228e2c532b21d915c2fd98e9b6042b26602deeec6 SHA512 
0eb1f03e7b84537501c13e185e2f1dc7f12c162209c98ce51042618cf02bd1691f3eb09c75a6d8db6dc6cfdd3369315cede49c194eae204b07d461a8eae47ff5
 WHIRLPOOL 
a5e82f71ededce477bcb5fb49ad546c9d6a232156884f569b7d763efb44b3901ae0e211df35ae3ccc4295f6045479d36ad005e2e7acc673c7c3310069167ca99
 DIST jre-8u92-linux-x64.tar.gz 71818563 SHA256 
e8469bcf55e388770cd6b6a51b082ce7a5a3149b4039a71b1edeed2796dcefe4 SHA512 
2d538c05110de21fc4dfb47e225012fc696e4a644c4d3191da48ccfcb239a6ac5618b75fc3c0eeb47f98e82254c548a0083bfab7ad831adffdcd6706433cf38f
 WHIRLPOOL 
1a5ddd7f410c51452c774350b0a3f64d4c2cdc4b930c9278087b5de02bb95caf3d328509dad8903930744adb0367bcea26b4ed3f429bf9ee6ca219ba1c41b070

diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.77.ebuild 
b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.77.ebuild
deleted file mode 100644
index 760f886..000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.77.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html;
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-   S_PV="$(get_version_component_range 1-3)"
-else
-   MY_PV_EXT="u$(get_version_component_range 4)"
-   S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/;
-SRC_URI="
-   amd64? ( ${AT_amd64} )
-   x86? ( ${AT_x86} )
-   jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="amd64 x86"
-IUSE="alsa cups 

[gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/

[James Le Cuirot]

commit: 1e457916da17117abe448fef219da7021cf1c4ba
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr 21 20:32:02 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr 21 20:33:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e457916

dev-java/oracle-jdk-bin: Remove vulnerable 1.8.0.77 wrt bug #580608

Package-Manager: portage-2.2.28

 dev-java/oracle-jdk-bin/Manifest   |  14 -
 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.77.ebuild  | 366 -
 2 files changed, 380 deletions(-)

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index dbb8179..71ce273 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -15,20 +15,6 @@ DIST jdk-7u80-solaris-sparcv9-demos.tar.gz 904770 SHA256 
fa3a92e70e52b0bffdee8d2
 DIST jdk-7u80-solaris-sparcv9.tar.gz 19301205 SHA256 
1a2bce541efe7b81cafe683626b3edea56918a8ca897ff36a2deaed00a7fce05 SHA512 
93ea0e8f5ae611dd1a620dffd72e315ecb6ce8375bd902a793fab128ac7e95d2cb338df1c273a2c29af6194e7cbdb810d79193b413b4b101538c08ebeef1eb41
 WHIRLPOOL 
c9ae1f1b561c4ec1d3c1a7f5008e80642b49a9fd1c6459f8ada65c01accc338280bdd683712d54a9b7741eeccf856b4f2ee82e898fbe1f39260d58efab217185
 DIST jdk-7u80-solaris-x64-demos.tar.gz 865205 SHA256 
a08dd0665d35986675beeba0f80d5db54a91fb276d8641ce1ba16ba873a18682 SHA512 
c53f026bfdfed8d83d42e3fce497baffeb370adf0423be2f891f6d200510088ac8227ae4f261ece059dbf29eb33cacafb20a0c328e7d8723387eba38def389d0
 WHIRLPOOL 
0539e964e194527055186b120df11e74ab3d9568fc2a5ff002ef405396f521a7c35013420067d37874b9602fe29d104dce63f22bfd687c45722689d62a8c552d
 DIST jdk-7u80-solaris-x64.tar.gz 17176587 SHA256 
ccc156363e3080e92382cd675d96889460a4421464b456794c8405eeb709 SHA512 
83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89
 WHIRLPOOL 
07412c6de5886c729b43726fb228783606b2a53c2a286b1af2dd5359975d1c75964a895d7da543f98c461adf0ab4b82fc32ebeb49e1835448effd93886f1b206
-DIST jdk-8u77-linux-arm32-vfp-hflt-demos.tar.gz 10430328 SHA256 
4c0b15e54eebd2a969391fe00824021204352fc7a947d916e5e49e40a0b47dd7 SHA512 
83f72301477825f8edab92eb3ab235b11ea516321f21b28cff8d2877c7a4409493811bc942a134e9aa8762106d1c5c2f8f9a9967a9194195ee2a6a290eaf9e11
 WHIRLPOOL 
af62a3fd120de9ac8fec8977fc346f1c4f64d488495bd6ce8a373d62e1ff46ee50372105d5a24ac50331acd515f52dab4af90a9a00fe321b71f36199aa769873
-DIST jdk-8u77-linux-arm32-vfp-hflt.tar.gz 81472238 SHA256 
c3af7a080cd74f7350680a020749b8161f78f66d1f16cda91bf758c3e58b524b SHA512 
85482f839c8321b5094b404ccfc6ff1bde355842a33bbef6719e3f387688bc5d6393397cb15bc843aefa604a5dae67f2c5a2b95aa06b3f4c832d054805a9
 WHIRLPOOL 
d57249869f3bb6b298e9e2c625e70b89ead02f944c22e080eb355c2da6f00ecafb09482c8b30ed713af51f4be121dacb18c48d7ef42a1dfc445cefa50a3412f5
-DIST jdk-8u77-linux-arm64-vfp-hflt-demos.tar.gz 10416390 SHA256 
17ba8e737b511640c3f8729daa3558c0e43b2efaaf20ae95d3ebc40632d5ce31 SHA512 
5a0f054c534a8eefd8f63c68d0e796cfbeedfb25fbe17bad1c0ebd6b1bede88a136e0a5dcba3dc0685b2cb2ffd82dc451db1c8d97c4024d6e3a5fbdb557f4215
 WHIRLPOOL 
c6dbb762ec47e8b5ce969bcf552b466c3640157fdd00539b6848048ee5472a33bcac876a30c99f5191638de973549ea630f0cb119de4ed26d482bdb8ffea77b4
-DIST jdk-8u77-linux-arm64-vfp-hflt.tar.gz 78304471 SHA256 
d194595d0c6d2f0b6fad36da489e26a65e3825af85c051ce3c84d5a1f5a96b31 SHA512 
48fceb586f82e4b30f02dc5878bf3108803e568abc5510513ae88afc5389136766cb8de749f5bb7cfb188394f9c3af4338fdbd96709cc8e967705a52f57962ea
 WHIRLPOOL 
e036911d1a2398c803b526c57ffa1ecd971f398e738fe5a8c60cd8155e4b648c271055fe6fc768c3a49fdc95f04d1b0491f13c70d377f2a7e7c558667bd0bff7
-DIST jdk-8u77-linux-i586-demos.tar.gz 55074148 SHA256 
59e6177d33c2ff7a4836e8a8461e8435aaee59fede5dfcabd4b47b92e9fe49b6 SHA512 
534812935f7f5b887be17ea778d9890b8de521a09ec61fe39bc9943412d1937a76238ea779434f9f34c3b0386e4f1721a1c9192c6d5375ae65a8817f1c62bb34
 WHIRLPOOL 
43dcb150d6a182453d639c52b36c968de45cbe1177c286c39b16cb8f650a6090bff9ea0d9e759df048971c90bbf53fb2b2da999d23b42a12ec3bdf9e6e913215
-DIST jdk-8u77-linux-i586.tar.gz 183417093 SHA256 
f2889b778538fe3d20b2d37d0de3c3204de86126aadb75c1bb38d11255b41e92 SHA512 
9f1a08e2062c15f2946e70dfe3c4d41db68ace95058257f9799d45336d5aec435869b5880639a4eb146c475fcb980471598d54f7b62759e68918ce0b37b7106f
 WHIRLPOOL 
3068d1b2360a0cd96963d5a5ed0bc77e036f7b70a8d5b412056b8d7a104517584029f78f40eb8840e0d5bca68c91f86134dd2e61b37093f10a7f9bc526e62471
-DIST jdk-8u77-linux-x64-demos.tar.gz 55134532 SHA256 
e816859e6b168ee63a85d8b0ffbd6d78ca47de7be216fa1afef94f3ef989536a SHA512 
ab0ceb9c866bed3a4943e78ab66077a1cbd952be005484ed4390dfc5150b8bcaf0afa1286ab52e34f0ada97926887eceb2c4923ae29289cca63fe17f095fdf7a
 WHIRLPOOL 
60c901ba4510cf1226a9d5b73ac0ecb5e4a0225dd313e3cd1f4c786216c5a45f5b3182e117ceeace5aa3b10fefd82c138b90079fbddee228305536b8bc791f81
-DIST jdk-8u77-linux-x64.tar.gz 181365687 SHA256 
a47dc0962a57b27a0cc00b9f11a53dc3add40c98633ba49a2419b845e4dedf43 SHA512 

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

[Mike Frysinger]

commit: c540f9ea27b6c6e14481b3364d6193862a3377b1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Apr 21 20:29:20 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Apr 21 20:29:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c540f9ea

sys-apps/file: add a bunch of upstream fixes

 .../file/{file-5.26.ebuild => file-5.26-r1.ebuild} |  11 +-
 sys-apps/file/file-.ebuild |  10 +-
 sys-apps/file/files/file-5.26-compress-1.patch |  53 +
 sys-apps/file/files/file-5.26-compress-2.patch |  73 
 sys-apps/file/files/file-5.26-header-define.patch  |  26 
 sys-apps/file/files/file-5.26-msoffice-magic.patch |  45 +++
 sys-apps/file/files/file-5.26-nes-magic.patch  |  27 +
 sys-apps/file/files/file-5.26-php-magic.patch  |  28 +
 sys-apps/file/files/file-5.26-stdin-rpm.patch  |  27 +
 sys-apps/file/files/file-5.26-stdin-test.patch | 132 +
 sys-apps/file/files/file-5.26-tests-fatal.patch|  27 +
 11 files changed, 452 insertions(+), 7 deletions(-)

diff --git a/sys-apps/file/file-5.26.ebuild b/sys-apps/file/file-5.26-r1.ebuild
similarity index 86%
rename from sys-apps/file/file-5.26.ebuild
rename to sys-apps/file/file-5.26-r1.ebuild
index 594df4a..ff3216a 100644
--- a/sys-apps/file/file-5.26.ebuild
+++ b/sys-apps/file/file-5.26-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 DISTUTILS_OPTIONAL=1
 
@@ -30,6 +30,15 @@ RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )"
 
 src_prepare() {
+   epatch "${FILESDIR}"/${P}-header-define.patch
+   epatch "${FILESDIR}"/${P}-nes-magic.patch
+   epatch "${FILESDIR}"/${P}-php-magic.patch
+   epatch "${FILESDIR}"/${P}-msoffice-magic.patch
+   epatch "${FILESDIR}"/${P}-stdin-rpm.patch
+   epatch "${FILESDIR}"/${P}-tests-fatal.patch
+   epatch "${FILESDIR}"/${P}-stdin-test.patch
+   epatch "${FILESDIR}"/${P}-compress-1.patch
+   epatch "${FILESDIR}"/${P}-compress-2.patch
[[ ${PV} == "" ]] && eautoreconf
elibtoolize
 

diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 88b9d2e..5aa9298 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 DISTUTILS_OPTIONAL=1
 
@@ -25,9 +25,7 @@ SLOT="0"
 IUSE="python static-libs zlib"
 
 DEPEND="python? ( ${PYTHON_DEPS} )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-   abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )"
 
@@ -80,7 +78,7 @@ multilib_src_compile() {
 }
 
 src_compile() {
-   if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+   if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; 
then
emake -C "${WORKDIR}"/build/src file
PATH="${WORKDIR}/build/src:${PATH}"
fi

diff --git a/sys-apps/file/files/file-5.26-compress-1.patch 
b/sys-apps/file/files/file-5.26-compress-1.patch
new file mode 100644
index 000..b10bfd2
--- /dev/null
+++ b/sys-apps/file/files/file-5.26-compress-1.patch
@@ -0,0 +1,53 @@
+From 52ae939467583ec499f6c62cdb406e8f982c0310 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas 
+Date: Tue, 19 Apr 2016 13:39:19 +
+Subject: [PATCH] Fix compression code (Werner Fink)
+
+---
+ src/compress.c | 19 +++
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/compress.c b/src/compress.c
+index f322445..0ebc837 100644
+--- a/src/compress.c
 b/src/compress.c
+@@ -231,9 +231,9 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
+   goto error;
+   DPRINTF("rv = %d\n", rv);
+   if ((ms->flags & MAGIC_COMPRESS_TRANSP) != 0)
+-  goto out;
++  break;
+   if (mime != MAGIC_MIME && mime != 0)
+-  goto out;
++  break;
+   if ((file_printf(ms,
+   mime ? " compressed-encoding=" : " (")) == -1)
+   goto error;
+@@ -250,16 +250,19 @@ file_zmagic(struct magic_set *ms, int fd, const char 
*name,
+   }
+   if (!mime && file_printf(ms, ")") == -1)
+

[gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/files/, dev-games/aseprite/

[Patrice Clement]

commit: f8be78804df4efe111af69f0d65e2914855cfc2f
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Tue Apr 19 17:10:26 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 21 19:51:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8be7880

dev-games/aseprite: Bump to 1.4.1.1. Drop old.

New version 1.4.1.1, dropping failed 1.0.6 and .
Added SLOT for virtual/jpeg:0 for 0.9.5-r1.

Gentoo-Bug: https://bugs.gentoo.org/571776
Package-Manager: portage-2.2.26
Closes: https://github.com/gentoo/gentoo/pull/1309

Signed-off-by: Patrice Clement  gentoo.org>

 dev-games/aseprite/Manifest|  2 +-
 dev-games/aseprite/aseprite-0.9.5-r1.ebuild|  4 +-
 ...eprite-1.0.6.ebuild => aseprite-1.1.4.1.ebuild} | 44 +-
 dev-games/aseprite/aseprite-.ebuild| 95 --
 .../aseprite/files/aseprite-1.0.6-obinary.patch| 27 --
 .../aseprite/files/aseprite-1.0.6-png_sizeof.patch | 11 ---
 .../files/aseprite-1.1.4.1_underlinking.patch  | 12 +++
 dev-games/aseprite/metadata.xml|  1 +
 8 files changed, 39 insertions(+), 157 deletions(-)

diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 00fdc16..b04c4f0 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,2 +1,2 @@
+DIST Aseprite-v1.1.4.1-Source.zip 11723085 SHA256 
731ac44259217626dde91cdcae9a24cdd4337540fc91bbe5c05cebcb12869879 SHA512 
deeb42c123517e17378498584bb788f375e8aaaf046d5f9732848a5bd794a1af1d8381ff51271f9e30c198478e0f716ae23495972b693db9049ff4c2b8968672
 WHIRLPOOL 
5c2bd1bf8f5d187c385086a431ab070f55308b01089ce703e54093963402a9300295ea1cbf3602021fea1211ae68c6a2a07391e8e054827ce82ee60462001c4a
 DIST aseprite-0.9.5.tar.xz 507744 SHA256 
81e0360d9d8a32d6c548775dbacdb1520aac94b54c2d9f1327d52f219737f154 SHA512 
fc6df942aefea67fd05e1b688209b70a2d5879a1441f61a6e3ee4d72fcdab4e580e1d4d7392fd493e0a46c45401a3eef759aa3efee17450e4c98df7f310b2d00
 WHIRLPOOL 
060dcf2754827ab3b30dde55cfcecd25e2d88f6e296b45529737e2194f4a9891d171776d10f9c571890efb9766b64080b85dc3d737102d2ac7be9843d27fdaef
-DIST aseprite-1.0.6.tar.gz 3685678 SHA256 
449619ee49eaf18c483706c6d2364868085b0f311548bd69e5664fdc0c06e21e SHA512 
0189cb6d845ea799f84c17b6456a10341a5ba2a2712bed2c202a711ffe60bb3f2e2eb47bb5702c6326f16a842cd8780c4c1f44ba6a535b172c34e6f2d327
 WHIRLPOOL 
4bbf000bf30beafef0003f047f625d4af7e61d51336562ba9192eceb4c72cafbd361bf68ba5fef20b260e74997b679d440d2f9e6386c1ab48c0a6e103577caf2

diff --git a/dev-games/aseprite/aseprite-0.9.5-r1.ebuild 
b/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
index 1904a98..9965cf3 100644
--- a/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
+++ b/dev-games/aseprite/aseprite-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ RDEPEND="dev-libs/tinyxml
media-libs/libpng:0
net-misc/curl
sys-libs/zlib
-   virtual/jpeg
+   virtual/jpeg:0
x11-libs/libX11"
 DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"

diff --git a/dev-games/aseprite/aseprite-1.0.6.ebuild 
b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
similarity index 57%
rename from dev-games/aseprite/aseprite-1.0.6.ebuild
rename to dev-games/aseprite/aseprite-1.1.4.1.ebuild
index a701677..f89be11 100644
--- a/dev-games/aseprite/aseprite-1.0.6.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
@@ -1,36 +1,39 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-inherit cmake-utils multilib toolchain-funcs flag-o-matic
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Animated sprite editor & pixel art tool"
 HOMEPAGE="http://www.aseprite.org;
-SRC_URI="https://github.com/aseprite/aseprite/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip;
 
-LICENSE="GPL-2 FTL"
+# See https://github.com/aseprite/aseprite#credits
+# Some bundled third-party packages built-in:
+# gtest duktape modp_b64 simpleini
+LICENSE="BSD GPL-2 MIT"
 SLOT="0"
-# giflib still unkeyworded
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
-IUSE="debug memleak"
+IUSE="debug test webp"
 
 RDEPEND="dev-libs/tinyxml
media-libs/allegro:0[X,png]
-   >=media-libs/giflib-5.0
+   media-libs/freetype
+   media-libs/giflib
+   webp? ( media-libs/libwebp )
media-libs/libpng:0
+   net-misc/curl
sys-libs/zlib
-   virtual/jpeg
+   virtual/jpeg:0
x11-libs/libX11
x11-libs/pixman"
 DEPEND="${RDEPEND}
-   dev-cpp/gtest"
+   app-arch/unzip"
 
-PATCHES=( "${FILESDIR}"/aseprite-0.9.5-underlinking.patch
-   "${FILESDIR}"/${P}-obinary.patch
-   "${FILESDIR}"/${P}-png_sizeof.patch )
+PATCHES=( 

[gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/

[Patrice Clement]

commit: faaef28d7fcc3a819fb971a6f3829151caa2e826
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Apr 21 19:56:23 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 21 19:56:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faaef28d

dev-games/aseprite: Grant maintainership to proxy maintainer.

Gentoo-Bug: https://bugs.gentoo.org/580556

Package-Manager: portage-2.2.26

 dev-games/aseprite/metadata.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 21336c4..8220b8a 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -1,7 +1,15 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+   azamat.hacki...@gmail.com
+   Azamat H. Hackimov
+Proxy maintainer for this package
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
   
 Animated sprite editor and pixel art tool
   

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

[Patrice Clement]

commit: ffa8bb31531324b7898cd417eb868931cfa84b50
Author: PPed72  iol  it>
AuthorDate: Fri Apr 15 13:35:19 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 21 19:46:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa8bb31

net-libs/rb_libtorrent: fix linking of python bindings

Thanks to Jan Chren (rindeal) 
for the ebuild, I've simply ported the good bits to the current one.

Gentoo-Bug: https://bugs.gentoo.org/576910
Closes: https://github.com/gentoo/gentoo/pull/1262

Signed-off-by: Patrice Clement  gentoo.org>

 net-libs/rb_libtorrent/metadata.xml|  4 +
 .../rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild| 99 ++
 2 files changed, 103 insertions(+)

diff --git a/net-libs/rb_libtorrent/metadata.xml 
b/net-libs/rb_libtorrent/metadata.xml
index c0cbcd2..36ca5cc 100644
--- a/net-libs/rb_libtorrent/metadata.xml
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -10,4 +10,8 @@
 libtorrent
 arvidn/libtorrent
   
+  
+Enable DHT (distributed hash table) support for
+  libtorrent
+  
 

diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild 
b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
new file mode 100644
index 000..9476aa4
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1 versionator
+
+MY_PV=$(replace_all_version_separators '_' )
+S=${WORKDIR}/libtorrent-libtorrent-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and 
scalability"
+HOMEPAGE="http://libtorrent.org;
+SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${MY_PV}.tar.gz
 -> rb_libtorrent-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +dht doc examples python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   >=dev-libs/boost-1.53:=[threads]
+   sys-libs/zlib
+   virtual/libiconv
+   examples? ( !net-p2p/mldonkey )
+   ssl? ( dev-libs/openssl:0= )
+   python? (
+   ${PYTHON_DEPS}
+   dev-libs/boost:=[python,${PYTHON_USEDEP}]
+   )"
+DEPEND="${RDEPEND}
+   >=sys-devel/libtool-2.2"
+
+RESTRICT="test"
+
+src_prepare() {
+   default
+
+   # needed or else eautoreconf fails
+   mkdir build-aux && cp {m4,build-aux}/config.rpath || die
+
+   eautoreconf
+
+   use python && python_copy_sources
+}
+
+src_configure() {
+   local myeconfargs=(
+   --disable-silent-rules # bug 441842
+   --with-boost-system=mt
+   --with-libiconv
+   $(use_enable debug)
+   $(usex debug "--enable-logging=verbose" "")
+   $(use_enable dht)
+   $(use_enable examples)
+   $(use_enable ssl encryption)
+   $(use_enable static-libs static)
+   $(use_enable test tests)
+   )
+   econf "${myeconfargs[@]}"
+
+   python_configure() {
+   local myeconfargs+=(
+   --enable-python-binding
+   --with-boost-python=yes
+   )
+   econf "${myeconfargs[@]}"
+   }
+   use python && distutils-r1_src_configure
+}
+
+src_compile() {
+   default
+
+   python_compile() {
+   cd "${BUILD_DIR}/../bindings/python" || return 1
+   distutils-r1_python_compile
+   }
+   use python && distutils-r1_src_compile
+}
+
+src_install() {
+   use doc && HTML_DOCS+=( "${S}"/docs )
+
+   default
+
+   python_install() {
+   cd "${BUILD_DIR}/../bindings/python" || return 1
+   distutils-r1_python_install
+   }
+   use python && distutils-r1_src_install
+}

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

[Michael Palimaka]

commit: 17d287ed152b602cc160c9c8614207481460d952
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 19:43:07 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 19:46:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d287ed

profiles: mask app-misc/tablix for removal

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 3052562..d9740b6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Palimaka  (21 Apr 2016)
+# Requires package no longer in the tree to be useful. Unmaintained.
+# Dead upstream. Masked for removal in 30 days.
+app-misc/tablix
+
 # Michael Sterrett  (19 Apr 2016)
 # No release in 6 years and segfaults on modern systems. (bug #311809)
 # Masked for removal on 20160519

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/, profiles/prefix/mint/, profiles/base/, ...

[Michael Palimaka]

commit: 9ed18ddfea034f921536846d697562e5e3259e38
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 19:46:08 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 19:46:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed18ddf

profiles: remove references to dead pvm USE flag

 profiles/arch/amd64/use.mask | 4 
 profiles/base/use.mask   | 5 -
 profiles/prefix/aix/use.mask | 1 -
 profiles/prefix/bsd/use.mask | 1 -
 profiles/prefix/darwin/use.mask  | 1 -
 profiles/prefix/hpux/use.mask| 1 -
 profiles/prefix/mint/use.mask| 1 -
 profiles/prefix/sunos/use.mask   | 1 -
 profiles/prefix/windows/interix/use.mask | 1 -
 profiles/prefix/windows/winnt/use.mask   | 1 -
 10 files changed, 17 deletions(-)

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 136749a..614d355 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -212,10 +212,6 @@ video_cards_i740
 video_cards_newport
 video_cards_nsc
 
-# 2004/10/06 - Jeremy Huddleston 
-# sys-cluster/pvm won't build
-pvm
-
 # 2004/06/22 - Taken from 2004.0 profile
 # masked
 3dfx

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 3127dad..7468ac9 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -306,11 +306,6 @@ pam_console
 prefix
 prefix-guest
 
-# Diego E. Pettenò  (6 Dec 2009)
-#  on behalf of QA Team
-# Removal of pvm is scheduled for Februrary 4.
-pvm
-
 # Alex Legler  (7 Dec 2009)
 # Rubinius is whitelisted on supported arches
 ruby_targets_rbx

diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
index ca40a6d..3ae983d 100644
--- a/profiles/prefix/aix/use.mask
+++ b/profiles/prefix/aix/use.mask
@@ -42,5 +42,4 @@ sybase-ct
 rtc
 uclibc
 voodoo3
-pvm
 v4l

diff --git a/profiles/prefix/bsd/use.mask b/profiles/prefix/bsd/use.mask
index feb5817..7a4ccd0 100644
--- a/profiles/prefix/bsd/use.mask
+++ b/profiles/prefix/bsd/use.mask
@@ -37,5 +37,4 @@ sybase-ct
 rtc
 uclibc
 voodoo3
-pvm
 v4l

diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 3b7c8f9..ddefd78 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -38,7 +38,6 @@ sybase
 sybase-ct
 rtc
 voodoo3
-pvm
 v4l
 
 # introspection is far from working on OSX

diff --git a/profiles/prefix/hpux/use.mask b/profiles/prefix/hpux/use.mask
index 66d38ac..b170e71 100644
--- a/profiles/prefix/hpux/use.mask
+++ b/profiles/prefix/hpux/use.mask
@@ -42,5 +42,4 @@ sybase-ct
 rtc
 uclibc
 voodoo3
-pvm
 v4l

diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
index 6c56e30..eb0bf24 100644
--- a/profiles/prefix/mint/use.mask
+++ b/profiles/prefix/mint/use.mask
@@ -43,7 +43,6 @@ sybase-ct
 rtc
 uclibc
 voodoo3
-pvm
 v4l
 
 # git doesn't work at this time, bug #339031\

diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 028e757..85737c6 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -42,5 +42,4 @@ sybase-ct
 rtc
 uclibc
 voodoo3
-pvm
 v4l

diff --git a/profiles/prefix/windows/interix/use.mask 
b/profiles/prefix/windows/interix/use.mask
index 08c2c73..8348e71 100644
--- a/profiles/prefix/windows/interix/use.mask
+++ b/profiles/prefix/windows/interix/use.mask
@@ -63,7 +63,6 @@ uclibc
 unicode
 usb
 voodoo3
-pvm
 v4l
 wifi
 

diff --git a/profiles/prefix/windows/winnt/use.mask 
b/profiles/prefix/windows/winnt/use.mask
index c40ffd5..18ab7e1 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -65,7 +65,6 @@ uclibc
 unicode
 usb
 voodoo3
-pvm
 v4l
 wifi
 

[gentoo-commits] repo/gentoo:master commit in: dev-lua/mpack/

[Patrice Clement]

commit: 564c80c0619dcd4a207ac4e9f91606fa15139aa9
Author: Aric Belsito  gmail  com>
AuthorDate: Thu Apr 21 03:39:15 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Apr 21 19:30:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564c80c0

dev-lua/mpack: Add new ebuild.

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

Signed-off-by: Patrice Clement  gentoo.org>

 dev-lua/mpack/Manifest   |  1 +
 dev-lua/mpack/metadata.xml   | 16 
 dev-lua/mpack/mpack-1.0.2.ebuild | 36 
 3 files changed, 53 insertions(+)

diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
new file mode 100644
index 000..c63f696
--- /dev/null
+++ b/dev-lua/mpack/Manifest
@@ -0,0 +1 @@
+DIST mpack-1.0.2.tar.gz 44671 SHA256 
9c570b2aab81b0c56d97cbd8fc483dc431b69510fd9becb4a1845291563e8bc9 SHA512 
307ae26799e59224dd624d1f5473c86d5cf975155c58b7ccfd17be98321afb0f7235d06a7a2c50112d4630b3cc7c185c9b307007be5cdbd792819ec2991fa3d2
 WHIRLPOOL 
b5461701898d3e8ab72c92f8d75c4b098986821a3cba281e82a15e495ee4ac2a9efddbd61c542dc3f3cb0cb45f18362652b102dfa8bae690d6c8f4b1b3261911

diff --git a/dev-lua/mpack/metadata.xml b/dev-lua/mpack/metadata.xml
new file mode 100644
index 000..fcf43dd
--- /dev/null
+++ b/dev-lua/mpack/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   llui...@gmail.com
+   Aric Belsito
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   Use dev-lang/luajit instead of
+   dev-lang/lua
+   
+

diff --git a/dev-lua/mpack/mpack-1.0.2.ebuild b/dev-lua/mpack/mpack-1.0.2.ebuild
new file mode 100644
index 000..7d6dea0
--- /dev/null
+++ b/dev-lua/mpack/mpack-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lua bindings for libmpack"
+HOMEPAGE="https://github.com/tarruda/libmpack/;
+SRC_URI="https://github.com/tarruda/libmpack/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/libmpack-${PV}/binding/lua"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="luajit test"
+
+RDEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+   luajit? ( dev-lang/luajit:2= )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-lua/busted )"
+
+src_compile() {
+   $(tc-getCC) ${CFLAGS} ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags $(usex 
luajit 'luajit' 'lua')) -fPIC -DPIC -shared lmpack.c -o mpack.so || die
+}
+
+src_test() {
+   busted -o gtest test.lua || die
+}
+
+src_install() {
+   exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 
'luajit' 'lua'))"
+   doexe mpack.so
+}

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

[Tim Harder]

commit: f0b9b087d41de658a78b860946830df406eaedf8
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Apr 21 18:09:10 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Apr 21 18:11:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b9b087

dev-libs/msgpack: drop myself as maintainer, add vim

 dev-libs/msgpack/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/msgpack/metadata.xml b/dev-libs/msgpack/metadata.xml
index b1b1ca7..a58d5af 100644
--- a/dev-libs/msgpack/metadata.xml
+++ b/dev-libs/msgpack/metadata.xml
@@ -1,9 +1,9 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-radher...@gentoo.org
-Tim Harder
+  
+v...@gentoo.org
+Gentoo Vim Project
   
   
 msgpack/msgpack-c

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mtkbabel/

[Amy Winston]

commit: f96d6a1f302012eb2b777c4cba93fb4e73ab8210
Author: Amy Winston  gentoo  org>
AuthorDate: Thu Apr 21 18:05:48 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Apr 21 18:07:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96d6a1f

sci-geosciences/mtkbabel: eapi bump

Package-Manager: portage-2.2.26

 .../mtkbabel/{mtkbabel-0.8.2.ebuild => mtkbabel-0.8.2-r1.ebuild}  | 4 ++--
 .../mtkbabel/{mtkbabel-0.8.3.1.ebuild => mtkbabel-0.8.3.1-r1.ebuild}  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild 
b/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild
similarity index 91%
rename from sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild
rename to sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild
index e68a43c..1a2e3ca 100644
--- a/sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild
+++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data 
logger"
 HOMEPAGE="http://sourceforge.net/projects/mtkbabel/;

diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild 
b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild
similarity index 91%
rename from sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild
rename to sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild
index a8b77fa..b0a2367 100644
--- a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild
+++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data 
logger"
 HOMEPAGE="http://sourceforge.net/projects/mtkbabel/;

[gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/

[Tim Harder]

commit: e46a31d363cd82818ae7234166ed0d5e6638885f
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Apr 21 18:03:21 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Apr 21 18:03:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46a31d3

dev-lua/lpeg: add vim as a maintainer

 dev-lua/lpeg/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
index 6f49eba..84f8f1c 100644
--- a/dev-lua/lpeg/metadata.xml
+++ b/dev-lua/lpeg/metadata.xml
@@ -1,5 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+  
+v...@gentoo.org
+Gentoo Vim Project
+  
 

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

[Amy Winston]

commit: 2024f373dc9a66ad595f53868f45b5f9dbc55d6c
Author: Amy Winston  gentoo  org>
AuthorDate: Thu Apr 21 17:35:56 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Apr 21 17:35:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2024f373

dev-python/vdirsyncer: version bump 0.9.3 bug #580666

Package-Manager: portage-2.2.26

 dev-python/vdirsyncer/Manifest|  1 +
 dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild | 31 +++
 2 files changed, 32 insertions(+)

diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 82ab560..126608a 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,2 +1,3 @@
 DIST vdirsyncer-0.7.5.tar.gz 86669 SHA256 
3f51c1fabac7f231327deb098998185cbd77564dc1bfc29f4bc8d89226c96a37 SHA512 
4df4469c8bd6f29e7250ee10407e34e2badd1b6c6260f4f71dbc090ca55837207d22edbbc83b6d7a5e332fc64dba49a9b94002bb607e39ba8cb7dbba8a5b0a28
 WHIRLPOOL 
9d95dd2e18c347ec02cc8019226e0fb6c3726b04845bf2da3aafbb738b72628c8359f51d5095312b8bfd990a6e208260eef90ac55decac2798eca0ddae6fb91f
 DIST vdirsyncer-0.9.0.tar.gz 87186 SHA256 
c5101d8b29c4c0da37ef5542d5bcc53e6ce2266c955fd601ca19989db2e42a69 SHA512 
34446b588eae14f07055eab486db2386d04a12f71b35c41c27529cbd4dbd518067175236d961d97625c4b0b46f0cd24ed367b84aa33b2c42371c999aaba3cde6
 WHIRLPOOL 
2d735e1b32d1d42e5e32ce58e962a4c27665e32fb7181e4258716eeac594f74b23297e1af3833c8741552b5181a676d6f084f70f81b5071a6dd0336309d32f4e
+DIST vdirsyncer-0.9.3.tar.gz 92463 SHA256 
8ca2941bb99c5b67f0f9e7cae3dd65fcbd64b8969515c68d44e6f3cd9cfc50f2 SHA512 
ca1ccae7c90d1ce15581e047e776433835e5575b977ffdfc665f386d701ffb5a18928e753459cb0f8c8644a67165db370d1e24378ff67fc7a3c4f954ef71d550
 WHIRLPOOL 
34f291dd99b149ce9a0814d0bb51d31e3438ed98712fcd4042ad9dfef292ef6bba2d68aa49763445534455ab6458d01cce6356cdd2706f9b9b2b38c177b688da

diff --git a/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild 
b/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild
new file mode 100644
index 000..e93e382
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/untitaker/vdirsyncer;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]
+   dev-python/click-log[${PYTHON_USEDEP}]
+   dev-python/click-threading[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   !=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+   =dev-python/lxml-3.4.4[${PYTHON_USEDEP}]
+   >=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
+   dev-python/atomicwrites[${PYTHON_USEDEP}]
+   dev-python/keyring[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )

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

[Ian Stakenvicius]

commit: 18d7d0aecb036a21a0a2f5d03c696d2299d49d24
Author: Ian Stakenvicius  gentoo  org>
AuthorDate: Thu Apr 21 17:28:08 2016 +
Commit: Ian Stakenvicius  gentoo  org>
CommitDate: Thu Apr 21 17:28:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d7d0ae

media-video/ffmpeg: fix mingw32 CHOST match in src_configure

The CHOST-matct was mingw32* but in a crossdev mingw32 is usually the CHOST's
suffix. Adusted the case statement match to be "*mingw32*" , following the
same pattern as the others.  Aballier gave the nod for the commit.

Package-Manager: portage-2.2.26

 media-video/ffmpeg/ffmpeg-2.8.6.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-3.0.1.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-2.8.6.ebuild 
b/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
index aa6bcd4..7029e07 100644
--- a/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
@@ -393,7 +393,7 @@ multilib_src_configure() {
*freebsd*)
myconf+=( --target-os=freebsd )
;;
-   mingw32*)
+   *mingw32*)
myconf+=( --target-os=mingw32 )
;;
*linux*)

diff --git a/media-video/ffmpeg/ffmpeg-3.0.1.ebuild 
b/media-video/ffmpeg/ffmpeg-3.0.1.ebuild
index fd5dd6f..6abf75c 100644
--- a/media-video/ffmpeg/ffmpeg-3.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.0.1.ebuild
@@ -394,7 +394,7 @@ multilib_src_configure() {
*freebsd*)
myconf+=( --target-os=freebsd )
;;
-   mingw32*)
+   *mingw32*)
myconf+=( --target-os=mingw32 )
;;
*linux*)

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index de85203..5a5c2e0 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -393,7 +393,7 @@ multilib_src_configure() {
*freebsd*)
myconf+=( --target-os=freebsd )
;;
-   mingw32*)
+   *mingw32*)
myconf+=( --target-os=mingw32 )
;;
*linux*)

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

[Michael Palimaka]

commit: 0c074072d5efe2193b9ebe7f807928f2cd588580
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:00:16 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c074072

media-libs/phonon-vlc: whitespace

Package-Manager: portage-2.2.28

 media-libs/phonon-vlc/phonon-vlc-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index 6268ab3..7546f13 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -23,6 +23,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 
 SLOT="0"
 IUSE="debug +qt4 qt5"
+
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
@@ -52,10 +53,10 @@ src_configure() {
myconfigure() {
local mycmakeargs=()
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
fi
if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
fi
cmake-utils_src_configure
}

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

[Michael Palimaka]

commit: 5fa8d57999a981e763d694f4fc2ac052e7867d3c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:10:17 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa8d579

media-libs/phonon-gstreamer: update LICENSE to be more accurate

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 87ff369..81d18fa 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://phonon.kde.org/;
 [[ ${PV} == * ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 if [[ ${PV} == * ]]; then
KEYWORDS=""
 else

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

[Michael Palimaka]

commit: c5c785ef0305c9a3f4e92de357ba7c0a1ac56940
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:11:54 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c785ef

media-libs/phonon-gstreamer: reorganise variables that are set conditionally to 
appear in one block

Package-Manager: portage-2.2.28

 .../phonon-gstreamer/phonon-gstreamer-.ebuild | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 4be6dad..15057eb 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -4,24 +4,23 @@
 
 EAPI=6
 
-[[ ${PV} == * ]] && git_eclass="git-r3"
-EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-
 MY_PN="phonon-backend-gstreamer"
 MY_P=${MY_PN}-${PV}
 
-inherit cmake-utils multibuild ${git_eclass}
+if [[ ${PV} != ** ]]; then
+   SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+   KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd 
~x64-macos"
+else
+   EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+   inherit git-r3
+fi
+
+inherit cmake-utils multibuild
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://phonon.kde.org/;
-[[ ${PV} == * ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-if [[ ${PV} == * ]]; then
-   KEYWORDS=""
-else
-   KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd 
~x64-macos"
-fi
 SLOT="0"
 IUSE="alsa debug +network +qt4 qt5"
 

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

[Michael Palimaka]

commit: 1c628ce9dfacb788a4a22a601dc611d42f724b76
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:07:04 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c628ce9

media-libs/phonon-gstreamer: update HOMEPAGE

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 6f045f8..0981ff1 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
 inherit cmake-utils multibuild ${git_eclass}
 
 DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer;
+HOMEPAGE="https://phonon.kde.org/;
 [[ ${PV} == * ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"

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

[Michael Palimaka]

commit: 36a281e647b58db5644cdcd92da5fa86dd1acd74
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:02:14 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a281e6

media-libs/phonon-vlc: reorganise variables that are set conditionally to 
appear in one block

Package-Manager: portage-2.2.28

 media-libs/phonon-vlc/phonon-vlc-.ebuild | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index e74160f..7936e75 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -6,21 +6,21 @@ EAPI=6
 
 MY_PN="phonon-backend-vlc"
 MY_P="${MY_PN}-${PV}"
-EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-[[ ${PV} ==  ]] && git_eclass=git-r3
-inherit cmake-utils multibuild ${git_eclass}
-unset git_eclass
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+   KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+else
+   EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+   inherit git-r3
+fi
+
+inherit cmake-utils multibuild
 
 DESCRIPTION="Phonon VLC backend"
 HOMEPAGE="https://phonon.kde.org/;
-[[ ${PV} ==  ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} ==  ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-
 SLOT="0"
 IUSE="debug +qt4 qt5"
 

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

[Michael Palimaka]

commit: 47cf18e14ccf0724be05152a6a656f14f916c08e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:06:00 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47cf18e1

media-libs/phonon-gstreamer: remove unused dependency

CMake can now handle automoc directly.

Package-Manager: portage-2.2.28

 media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index bb784b7..71e4769 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -49,7 +49,6 @@ RDEPEND="
network? ( media-plugins/gst-plugins-soup:1.0 )
 "
 DEPEND="${RDEPEND}
-   qt4? ( >=dev-util/automoc-0.9.87 )
virtual/pkgconfig
 "
 

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

[Michael Palimaka]

commit: 296575124d4ec251adf1f765abe2e46c37e9e5ab
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:03:06 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29657512

media-libs/phonon-vlc: version bump

Package-Manager: portage-2.2.28

 media-libs/phonon-vlc/Manifest|  1 +
 media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild | 77 +++
 2 files changed, 78 insertions(+)

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 56770f8..7bf9754 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,2 +1,3 @@
 DIST phonon-backend-vlc-0.7.2.tar.xz 58988 SHA256 
0a788360df2e3439efefacae70b73252c1e1d4a7ad08f4d93301d77a915d95a9 SHA512 
9a2b45d02ed958f82ff4fb8d3e9233eeb35047670061b59266fa7504855a149de1a401cad34871083e42c8d05620ff0e3df9f1a7a3e1f9b82ddac886c50adfce
 WHIRLPOOL 
e8130f8280fb31ccc8ec686eba8af744300100686c179e3abfd124f8892d55038a2a77887cbc3673e36c03b31829a1ec4ae686bee0a1f48048d9631b228aeb73
 DIST phonon-backend-vlc-0.8.2.tar.xz 59832 SHA256 
dab7f8edf53ee90998e5e3fcf2f6bd0a13750511b0ecde6939be0664d46bdaa3 SHA512 
35f0255899e89d4b9e42a440885455367a56559090b490f1397984520c2e63c2044c8b74290d8b438fcfa388a8b06f1647e60cb6d72d4dd907fc3df9ea4c63e3
 WHIRLPOOL 
31804069c38cc377fbb8acf10690a6699550c1812e7d0ee64c2a03fd7efa73b7b9c24f63b56b7e6fe96f5f261e0adab897e7f4e26e6ea00163c5dd47e9d4c376
+DIST phonon-backend-vlc-0.9.0.tar.xz 60044 SHA256 
c0ced7ca571acc22211eecf5158241714fa9ccdb82d4fe0a970ad702860ccdbe SHA512 
e3482717ee84b5d80f81300ce01410c982b0083cd53db312a622a287f9b3f66fc967bd0832f18e3382c5dd073055394eec42918e68ec456232aa7750b0f50611
 WHIRLPOOL 
b0e9928e9d1d49c33fcad8645d2c38b2cd43561c80832bb373e0766697bc7a8e72231e149cd4408a34dfc2a68ff6f2e0d604c3318700220f5662cde5ef93dcf4

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild
new file mode 100644
index 000..3344bda
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="phonon-backend-vlc"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+   KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+else
+   EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+   inherit git-r3
+fi
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Phonon VLC backend"
+HOMEPAGE="https://phonon.kde.org/;
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug +qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+   >=media-libs/phonon-4.9.0[qt4=,qt5=]
+   >=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+   MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+   myconfigure() {
+   local mycmakeargs=()
+   if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+   fi
+   if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+   fi
+   cmake-utils_src_configure
+   }
+
+   multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+   multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+   multibuild_foreach_variant cmake-utils_src_test
+}
+
+src_install() {
+   multibuild_foreach_variant cmake-utils_src_install
+}

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

[Michael Palimaka]

commit: 45d94f0d5ddecf393356efdedf4705b6d4eb5923
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:06:35 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d94f0d

media-libs/phonon-gstreamer: add new dependency

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 71e4769..6f045f8 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qtopengl:5
dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
)
virtual/opengl
network? ( media-plugins/gst-plugins-soup:1.0 )

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

[Michael Palimaka]

commit: bf373bec36c8f9c09a5d516ca0966c8df7377d7c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:12:31 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf373bec

media-libs/phonon-gstreamer: raise media-libs/phonon dependency

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 15057eb..6d575e7 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
-   >=media-libs/phonon-4.7.80[qt4?,qt5?]
+   >=media-libs/phonon-4.9.0[qt4?,qt5?]
qt4? (
dev-qt/qtcore:4[glib]
dev-qt/qtgui:4[glib]

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

[Michael Palimaka]

commit: 6ff39f40cd188b09d3b18951a3f0849cb2d66478
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:05:11 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff39f40

media-libs/phonon-gstreamer: whitespace

Package-Manager: portage-2.2.28

 media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 9159564..7e56d58 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ else
 fi
 SLOT="0"
 IUSE="alsa debug +network +qt4 qt5"
+
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
@@ -62,10 +63,10 @@ src_configure() {
myconfigure() {
local mycmakeargs=()
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
fi
if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
fi
cmake-utils_src_configure
}

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

[Michael Palimaka]

commit: b1d87dcb8f7fdcc37e3284b5a460f5eaff72e38f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:07:31 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d87dcb

media-libs/phonon-gstreamer: update SRC_URI

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 0981ff1..87ff369 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -14,7 +14,7 @@ inherit cmake-utils multibuild ${git_eclass}
 
 DESCRIPTION="Phonon GStreamer backend"
 HOMEPAGE="https://phonon.kde.org/;
-[[ ${PV} == * ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
+[[ ${PV} == * ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 if [[ ${PV} == * ]]; then

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

[Michael Palimaka]

commit: 7a0ed4a4c776ecc3ce216e3d7e39b359eb636747
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:10:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0ed4a4

media-libs/phonon-gstreamer: port to EAPI 6

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 81d18fa..4be6dad 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 [[ ${PV} == * ]] && git_eclass="git-r3"
 EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )

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

[Michael Palimaka]

commit: 12f36bd065e9ac281c8a5ebffb719241c264408d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:13:04 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f36bd0

media-libs/phonon-gstreamer: version bump

Package-Manager: portage-2.2.28

 media-libs/phonon-gstreamer/Manifest   |  1 +
 .../phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild | 84 ++
 2 files changed, 85 insertions(+)

diff --git a/media-libs/phonon-gstreamer/Manifest 
b/media-libs/phonon-gstreamer/Manifest
index 94557bb..0811d1d 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,2 +1,3 @@
 DIST phonon-backend-gstreamer-4.7.2.tar.xz 75552 SHA256 
80b72a9092f540dd0a2abd2898328f3d5f9febfa073b0b1d44592a050a99d2b1 SHA512 
d8cf408261f80de7ac29101c3613002a0e838f07e6c8dad2d3922a522a27be167ef8f17a8ab0c99c06c1b75cb4d9d68acee03cb60cf4a44dc2248b7b0dafae08
 WHIRLPOOL 
368f9784d2ea6fbb3d105fe4645af308bca975bac4cf21908a344d04ab76dd56d5a83ce9a4347a3d664f1830b65de4d40e12b663bcdf91170a4df38bdeb479af
 DIST phonon-backend-gstreamer-4.8.2.tar.xz 76044 SHA256 
20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0 SHA512 
a18534b89d424bb2cc9f8a7f63a794d9711d895ad1db6cd5f4bd8748ea38310ffeacd916d16443986f89d3097e108aaf5631eaba6dd37e76a7360d5f1d02ecea
 WHIRLPOOL 
19e68e818acda9602bdc9f557c866943e8f74d83b5a3d3532a32daf10d6c4f70c3961ceaa2e3b373ed1810c438d595864a01e31514da7c7f569d3a630a625654
+DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 SHA256 
cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1 SHA512 
9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
 WHIRLPOOL 
caaa0e3392e82e120b288d3714ec4987ba70f7b11b920049da9c26fea1b940c15e5e569c855c8b37a26cff8a04959ec5b2c238e6460b324a85c22e444265f136

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
new file mode 100644
index 000..6d575e7
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="phonon-backend-gstreamer"
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+   KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd 
~x64-macos"
+else
+   EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+   inherit git-r3
+fi
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Phonon GStreamer backend"
+HOMEPAGE="https://phonon.kde.org/;
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="alsa debug +network +qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+   dev-libs/glib:2
+   dev-libs/libxml2:2
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+   >=media-libs/phonon-4.9.0[qt4?,qt5?]
+   qt4? (
+   dev-qt/qtcore:4[glib]
+   dev-qt/qtgui:4[glib]
+   dev-qt/qtopengl:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   )
+   virtual/opengl
+   network? ( media-plugins/gst-plugins-soup:1.0 )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+pkg_setup() {
+   MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+   myconfigure() {
+   local mycmakeargs=()
+   if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+   fi
+   if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+   fi
+   cmake-utils_src_configure
+   }
+
+   multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+   multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+   multibuild_foreach_variant cmake-utils_src_test
+}
+
+src_install() {
+   multibuild_foreach_variant cmake-utils_src_install
+}

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

[Michael Palimaka]

commit: e5b94220683e7b8046f3ae63b48881612a7aca91
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:49:00 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b94220

media-libs/phonon: stop passing QT_QMAKE_EXECUTABLE

This is no longer necessary now that FindQt4.cmake has been fixed to always
find the correct binary.

Package-Manager: portage-2.2.28

 media-libs/phonon/phonon-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/phonon/phonon-.ebuild 
b/media-libs/phonon/phonon-.ebuild
index bd5fc5c..650a95d 100644
--- a/media-libs/phonon/phonon-.ebuild
+++ b/media-libs/phonon/phonon-.ebuild
@@ -69,7 +69,6 @@ multilib_src_configure() {
$(cmake-utils_use_with pulseaudio GLIB2)
$(cmake-utils_use_with pulseaudio PulseAudio)
$(multilib_is_native_abi && cmake-utils_use_with zeitgeist 
QZeitgeist)
-   
-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
)
 
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then

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

[Michael Palimaka]

commit: ad6299ba58c46be9a3bda4d8f1724bb4414c3fef
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:02:37 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6299ba

media-libs/phonon-vlc: raise media-libs/phonon dependency

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index 7936e75..3344bda 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -27,7 +27,7 @@ IUSE="debug +qt4 qt5"
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
-   >=media-libs/phonon-4.8.0[qt4=,qt5=]
+   >=media-libs/phonon-4.9.0[qt4=,qt5=]
>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
qt4? (
dev-qt/qtcore:4

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

[Michael Palimaka]

commit: 0e63fb36e0b2cbbf44b948aff1587143839bb468
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:58:35 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e63fb36

media-libs/phonon-vlc: update HOMEPAGE

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index e381819..0fad3b4 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -12,7 +12,7 @@ inherit cmake-utils multibuild ${git_eclass}
 unset git_eclass
 
 DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc;
+HOMEPAGE="https://phonon.kde.org/;
 [[ ${PV} ==  ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"

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

[Michael Palimaka]

commit: cfb9bed18f640276ddfe2870d34d91b09d2c242c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:57:42 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb9bed1

media-libs/phonon-vlc: update LICENSE to be more accurate

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index 56f6703..e381819 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Phonon VLC backend"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc;
 [[ ${PV} ==  ]] || 
SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} ==  ]] || \

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

[Michael Palimaka]

commit: acf48bc46990c3a86a0e2a677f175ac0fa5ba1ef
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:53:13 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf48bc4

media-libs/phonon-vlc: remove old elog messages

Package-Manager: portage-2.2.28

 media-libs/phonon-vlc/phonon-vlc-.ebuild | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index aec48c8..2e715f0 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -78,11 +78,3 @@ src_test() {
 src_install() {
multibuild_foreach_variant cmake-utils_src_install
 }
-
-pkg_postinst() {
-   elog "For more verbose debug information, export the following 
variables:"
-   elog "PHONON_DEBUG=1"
-   elog ""
-   elog "To make KDE detect the new backend without reboot, run:"
-   elog "kbuildsycoca4 --noincremental"
-}

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

[Michael Palimaka]

commit: ec362897dc30cb11ebbb38ffdf3edeccf062f611
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:50:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec362897

media-libs/phonon: version bump

Package-Manager: portage-2.2.28

 media-libs/phonon/Manifest|   1 +
 media-libs/phonon/phonon-4.9.0.ebuild | 131 ++
 2 files changed, 132 insertions(+)

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index eba6ab7..f45ec5a 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,2 +1,3 @@
 DIST phonon-4.7.2.tar.xz 330244 SHA256 
819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 
b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5
 WHIRLPOOL 
2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
 DIST phonon-4.8.3.tar.xz 322012 SHA256 
a1149c961ca1570968d070bbd23671e614aa506f847ca93748960e309f85da16 SHA512 
368014e808fe9ac84cdb4caf99dec93470907ca959e9a900fd6a8d86b3a44603b91be06b64b0f484d199663647bf82e84f643900edcf6a0c90ea55c53f767701
 WHIRLPOOL 
12de8d3de919575f23b9acd8bddb8e594f755062e560617371f8614cb51fba7fb08c62549c28670cbde60b5f962a1953e5ae1bb9b64b166aa58c9b820c241868
+DIST phonon-4.9.0.tar.xz 321860 SHA256 
bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0 SHA512 
6201b0fa8620cf2640f1488d2ea9605ddd9894af077be247bdcc1ee20f4f7352f6b42fa834bcc074ec3ede1281fdbc3bf137961591f8d954d02a29186ff17a5c
 WHIRLPOOL 
ac89bc5a01222662b28d48a8a8ce6db86dae76d200981761ec3de004c96c853944c40409716e4e9bcefb389e60c32981d6b5e2e7dee8fafd0662c1ae91e56ac3

diff --git a/media-libs/phonon/phonon-4.9.0.ebuild 
b/media-libs/phonon/phonon-4.9.0.ebuild
new file mode 100644
index 000..89d287e
--- /dev/null
+++ b/media-libs/phonon/phonon-4.9.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+else
+   EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+   inherit git-r3
+fi
+
+inherit cmake-multilib multibuild qmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://phonon.kde.org/;
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
+
+REQUIRED_USE="
+   || ( qt4 qt5 )
+   zeitgeist? ( qt4 )
+"
+
+RDEPEND="
+   !!dev-qt/qtphonon:4
+   qt4? (
+   dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+   dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+   dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+   designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   designer? ( dev-qt/designer:5 )
+   )
+   pulseaudio? (
+   dev-libs/glib:2[${MULTILIB_USEDEP}]
+   >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
+   )
+   zeitgeist? ( dev-libs/libqzeitgeist )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+PDEPEND="
+   aqua? ( media-libs/phonon-qt7 )
+   gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] )
+   vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
+
+pkg_setup() {
+   MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+   -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+   -DWITH_GLIB2=$(usex pulseaudio)
+   -DWITH_PulseAudio=$(usex pulseaudio)
+   $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist))
+   )
+
+   if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
+   fi
+   if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
+   fi
+
+   cmake-utils_src_configure
+}
+
+src_configure() {
+   myconfigure() {
+   local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+   if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+   cmake-multilib_src_configure
+   elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+   multilib_src_configure
+   fi
+   }
+
+  

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

[Michael Palimaka]

commit: bdc83ac944c3f0db6def059663337191793fa1e9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:56:07 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc83ac9

media-libs/phonon-vlc: remove unused dependencies

CMake can now handle automoc directly. xz-utils for unpacking can be assumed
from the base profile now.

Package-Manager: portage-2.2.28

 media-libs/phonon-vlc/phonon-vlc-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index 2e715f0..56f6703 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -39,9 +39,7 @@ RDEPEND="
)
 "
 DEPEND="${RDEPEND}
-   app-arch/xz-utils
virtual/pkgconfig
-   qt4? ( >=dev-util/automoc-0.9.87 )
 "
 
 [[ ${PV} ==  ]] || S=${WORKDIR}/${MY_P}

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

[Michael Palimaka]

commit: 1f9e444f7273c0af6d677b2dd3bb7a762dde1529
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:49:28 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9e444f

media-libs/phonon: port to EAPI 6

Package-Manager: portage-2.2.28

 media-libs/phonon/phonon-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-libs/phonon/phonon-.ebuild 
b/media-libs/phonon/phonon-.ebuild
index 650a95d..c2c0214 100644
--- a/media-libs/phonon/phonon-.ebuild
+++ b/media-libs/phonon/phonon-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} != ** ]]; then
SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
@@ -64,11 +64,11 @@ pkg_setup() {
 
 multilib_src_configure() {
local mycmakeargs=(
+   -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-   $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
-   $(cmake-utils_use_with pulseaudio GLIB2)
-   $(cmake-utils_use_with pulseaudio PulseAudio)
-   $(multilib_is_native_abi && cmake-utils_use_with zeitgeist 
QZeitgeist)
+   -DWITH_GLIB2=$(usex pulseaudio)
+   -DWITH_PulseAudio=$(usex pulseaudio)
+   $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex 
zeitgeist))
)
 
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then

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

[Michael Palimaka]

commit: 642bea5143dc81bee328a4df7f03f9b7181f77fa
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:59:38 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=642bea51

media-libs/phonon-vlc: remove S override that is no longer required

Package-Manager: portage-2.2.28

 media-libs/phonon-vlc/phonon-vlc-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index 0fad3b4..6268ab3 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -42,8 +42,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-[[ ${PV} ==  ]] || S=${WORKDIR}/${MY_P}
-
 DOCS=( AUTHORS )
 
 pkg_setup() {

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

[Michael Palimaka]

commit: c9fcab794f7cdd42ce2e54b8d74883a6ea878b1c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:05:34 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fcab79

media-libs/phonon-gstreamer: remove S override that is no longer required

Package-Manager: portage-2.2.28

 media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild 
b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
index 7e56d58..bb784b7 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-.ebuild
@@ -53,8 +53,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-[[ ${PV} ==  ]] || S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }

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

[Michael Palimaka]

commit: 56c64ec5325cc6882a14452bd2147e21a34d1b7c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 17:00:33 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c64ec5

media-libs/phonon-vlc: port to EAPI 6

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon-vlc/phonon-vlc-.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-.ebuild
index 7546f13..e74160f 100644
--- a/media-libs/phonon-vlc/phonon-vlc-.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 MY_PN="phonon-backend-vlc"
 MY_P="${MY_PN}-${PV}"

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

[Michael Palimaka]

commit: bb0e74eeae5b14fd956f9a2be95601034dfebf53
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 21 16:49:57 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 21 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0e74ee

media-libs/phonon: raise backend dependencies

Package-Manager: portage-2.2.28

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

diff --git a/media-libs/phonon/phonon-.ebuild 
b/media-libs/phonon/phonon-.ebuild
index c2c0214..89d287e 100644
--- a/media-libs/phonon/phonon-.ebuild
+++ b/media-libs/phonon/phonon-.ebuild
@@ -52,8 +52,8 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="
aqua? ( media-libs/phonon-qt7 )
-   gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] )
-   vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
+   gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] )
+   vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Mike Frysinger]

commit: 5076a9ea355663c20016164e10948b7e5cc22ccb
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Apr 21 17:04:50 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Apr 21 17:04:50 2016 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5076a9ea

chroot-functions: genkernel: robustify version parsing

 targets/support/chroot-functions.sh | 34 ++
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 456ae4c..fe39251 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -17,23 +17,25 @@ trap "echo SIGKILL signal recieved killing $0 with pid 
$$;kill -9 $$" SIGKILL
 #  * kernel recognizes this and generates SIGINT signal
 trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
 
-check_genkernel_version(){
-   if [ -x /usr/bin/genkernel ]
-   then
-   genkernel_version=$(genkernel --version)
-   genkernel_version_major=${genkernel_version%%.*}
-   
genkernel_version_minor_sub=${genkernel_version#${genkernel_version_major}.}
-   genkernel_version_minor=${genkernel_version_minor_sub%%.*}
-   genkernel_version_sub=${genkernel_version##*.}
-   if [ -n "${genkernel_version}" -a "${genkernel_version_major}" 
-eq '3' -a "${genkernel_version_minor}" -ge '3' ]
-   then
-   echo "Genkernel version ${genkernel_version} found ... 
continuing"
-   else
-   echo "ERROR: Your genkernel version is too low in your 
seed stage.  genkernel version 3.3.0"
-   echo "or greater is required."
-   exit 1
-   fi
+check_genkernel_version() {
+   local version parts=() major minor
+
+   version=$(genkernel --version)
+   if [[ -z ${version} ]] ; then
+   echo "ERROR: Could not detect genkernel version!"
+   exit 1
+   fi
+   printf 'Genkernel version '%s' found ... ' "${version}"
+
+   IFS='.' read -a parts <<<"${version}"
+   major=${parts[0]}
+   minor=${parts[1]}
+   if [[ ${major} -gt 3 || ( ${major} -eq 3 && ${minor} -ge 3 ) ]] ; then
+   echo "OK"
else
+   echo "FAIL"
+   echo "ERROR: Your genkernel version is too low in your seed 
stage."
+   echo "   genkernel version 3.3.0 or greater is required."
exit 1
fi
 }

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

[Brian Dolbec]

commit: 96dc91e77da08c7ba30974ee65c9f3ae876e5b39
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Apr 16 23:29:20 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=96dc91e7

repoman: Limit the kwargs passed to the module's __init__()

This has the benefit of forcing the module to declare what data it requires.
Rather than possibly silently fail.

 pym/repoman/scanner.py | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index e9a8e20..5ac519e 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -202,7 +202,18 @@ class Scanner(object):
'fetches', 'pkgmetadata']:
mod_class = MODULE_CONTROLLER.get_class(mod)
logging.debug("Initializing class name: %s", 
mod_class.__name__)
-   self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
+   self.modules[mod_class.__name__] = 
mod_class(**self.set_kwargs(mod))
+
+   def set_kwargs(self, mod):
+   '''Creates a limited set of kwargs to pass to the module's 
__init__()
+
+   @param mod: module name string
+   @returns: dictionary
+   '''
+   kwargs = {}
+   for key in MODULE_CONTROLLER.modules[mod]['mod_kwargs']:
+   kwargs[key] = self.kwargs[key]
+   return kwargs
 
def scan_pkgs(self, can_force):
for xpkg in self.effective_scanlist:
@@ -295,7 +306,7 @@ class Scanner(object):
if mod[0]:
mod_class = 
MODULE_CONTROLLER.get_class(mod[0])
logging.debug("Initializing class name: 
%s", mod_class.__name__)
-   self.modules[mod[1]] = 
mod_class(**self.kwargs)
+   self.modules[mod[1]] = 
mod_class(**self.set_kwargs(mod))
logging.debug("scan_ebuilds: module: %s", 
mod[1])
do_it, functions = 
self.modules[mod[1]].runInEbuilds
logging.debug("do_it: %s, functions: %s", 
do_it, [x.__name__ for x in functions])
@@ -329,7 +340,7 @@ class Scanner(object):
if mod[0]:
mod_class = MODULE_CONTROLLER.get_class(mod[0])
logging.debug("Initializing class name: %s", 
mod_class.__name__)
-   self.modules[mod[1]] = mod_class(**self.kwargs)
+   self.modules[mod[1]] = 
mod_class(**self.set_kwargs(mod))
logging.debug("scan_ebuilds final checks: module: %s", 
mod[1])
do_it, functions = self.modules[mod[1]].runInFinal
logging.debug("do_it: %s, functions: %s", do_it, 
[x.__name__ for x in functions])

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/arches/, pym/repoman/modules/scan/ebuild/, ...

[Brian Dolbec]

commit: 8ecc34680ea95b2f69242427c040986f76be3a27
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Apr 17 15:39:40 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:35 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ecc3468

repoman: Populate module_spec's func_kwargs for all scan modules

First step towards a propoerly controlled module data exchange interface.

 pym/repoman/modules/scan/arches/__init__.py  |  2 +-
 pym/repoman/modules/scan/depend/__init__.py  | 10 +++---
 pym/repoman/modules/scan/directories/__init__.py |  5 +++--
 pym/repoman/modules/scan/eapi/__init__.py|  2 +-
 pym/repoman/modules/scan/ebuild/__init__.py  | 10 +++---
 pym/repoman/modules/scan/eclasses/__init__.py|  5 +++--
 pym/repoman/modules/scan/fetch/__init__.py   |  4 +++-
 pym/repoman/modules/scan/keywords/__init__.py|  3 ++-
 pym/repoman/modules/scan/manifest/__init__.py|  2 +-
 pym/repoman/modules/scan/metadata/__init__.py| 16 ++--
 pym/repoman/modules/scan/mirrors/__init__.py |  2 +-
 pym/repoman/modules/scan/status/__init__.py  |  3 ++-
 pym/repoman/modules/scan/use/__init__.py |  4 +++-
 13 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/pym/repoman/modules/scan/arches/__init__.py 
b/pym/repoman/modules/scan/arches/__init__.py
index b87e07c..e4a4806 100644
--- a/pym/repoman/modules/scan/arches/__init__.py
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -20,7 +20,7 @@ module_spec = {
},
'mod_kwargs': ['options', 'repo_settings', 'profiles'
],
-   'func_kwargs': {'ebuild': None,
+   'func_kwargs': {'ebuild': None, 'arches': 'set',
},
},
}

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
index a0f2f9a..a2b8534 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -20,7 +20,9 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'portdb'
],
-   'func_kwargs': {
+   'func_kwargs': {'ebuild': None, 'pkg': None, 
'unknown_pkgs': 'set',
+   'type_list': [], 'badlicsyntax': 'Future',
+   'baddepsyntax': 'Future',
},
},
'profile-module': {
@@ -35,7 +37,8 @@ module_spec = {
'repo_settings', 'include_arches', 'caches',
'repoman_incrementals', 'env', 'have', 
'dev_keywords'
],
-   'func_kwargs': {
+   'func_kwargs': {'arches': 'set', 'ebuild': None, 'pkg': 
None,
+   'unknown_pkgs': 'set', 'baddepsyntax': 'Future',
},
},
'unknown-module': {
@@ -48,7 +51,8 @@ module_spec = {
},
'mod_kwargs': ['qatracker',
],
-   'func_kwargs': {
+   'func_kwargs': {'ebuild': None, 'unknown_pkgs': 'set',
+   'baddepsyntax': 'Future',
},
},
}

diff --git a/pym/repoman/modules/scan/directories/__init__.py 
b/pym/repoman/modules/scan/directories/__init__.py
index d50ace5..0193843 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -20,7 +20,8 @@ module_spec = {
},
'mod_kwargs': ['portdb', 'qatracker', 'repo_settings', 
'vcs_settings',
],
-   'func_kwargs': {
+   'func_kwargs': {'checkdir': None, 'checkdirlist': None,
+   'checkdir_relative': None, 'changed': None,
},
},
'mtime-module': {
@@ -33,7 +34,7 @@ module_spec = {
},
'mod_kwargs': ['vcs_settings',
],
-   'func_kwargs': {
+   'func_kwargs': {'ebuild': None, 'changed': None, 'pkg': 
None,
},
},
}

diff --git a/pym/repoman/modules/scan/eapi/__init__.py 
b/pym/repoman/modules/scan/eapi/__init__.py
index 63618ab..376e79a 100644
--- a/pym/repoman/modules/scan/eapi/__init__.py
+++ b/pym/repoman/modules/scan/eapi/__init__.py
@@ -20,7 +20,7 @@ module_spec = {
},
'mod_kwargs': ['qatracker', 'repo_settings'
],
-   'func_kwargs': {
+   'func_kwargs': 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/status/, pym/repoman/modules/scan/, ...

[Brian Dolbec]

commit: aa5607f80125f8096a9283b4323e460b40fa250e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Apr 18 07:25:17 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:35 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=aa5607f8

WIP: repoman: convert all modules to the new data transfer system

Use Future instances for all non-pointer type variables modified by the modules.
Create set_result_pass() and set_result_raise() in ScanBase to reduce code 
duplication.
Create a get_result() in ScanBase which returns either a result or an 
unset_value rather
than raise an InvalidStateError.

 pym/repoman/modules/scan/arches/arches.py  |  7 +++-
 pym/repoman/modules/scan/depend/__init__.py|  8 ++--
 pym/repoman/modules/scan/depend/depend.py  | 19 ++---
 pym/repoman/modules/scan/depend/unknown.py | 10 ++---
 pym/repoman/modules/scan/directories/files.py  |  2 +-
 pym/repoman/modules/scan/directories/mtime.py  |  6 +--
 pym/repoman/modules/scan/eapi/eapi.py  |  4 +-
 pym/repoman/modules/scan/ebuild/__init__.py|  2 +-
 pym/repoman/modules/scan/ebuild/ebuild.py  | 31 +--
 pym/repoman/modules/scan/ebuild/isebuild.py| 28 +
 pym/repoman/modules/scan/ebuild/multicheck.py  |  4 +-
 pym/repoman/modules/scan/eclasses/live.py  | 16 
 pym/repoman/modules/scan/eclasses/ruby.py  |  6 +--
 pym/repoman/modules/scan/fetch/fetches.py  |  4 +-
 pym/repoman/modules/scan/keywords/keywords.py  |  8 ++--
 pym/repoman/modules/scan/manifest/manifests.py |  6 +--
 pym/repoman/modules/scan/metadata/__init__.py  |  2 +-
 pym/repoman/modules/scan/metadata/description.py   |  6 +--
 .../modules/scan/metadata/ebuild_metadata.py   | 16 
 pym/repoman/modules/scan/metadata/license.py   |  6 +--
 pym/repoman/modules/scan/metadata/pkgmetadata.py   | 12 +-
 pym/repoman/modules/scan/metadata/restrict.py  |  4 +-
 pym/repoman/modules/scan/metadata/unused.py|  9 ++---
 .../modules/scan/mirrors/thirdpartymirrors.py  |  8 ++--
 pym/repoman/modules/scan/options/options.py|  4 +-
 pym/repoman/modules/scan/scanbase.py   | 38 +-
 pym/repoman/modules/scan/status/vcsstatus.py   |  6 ++-
 pym/repoman/modules/scan/use/use_flags.py  | 15 ---
 pym/repoman/scanner.py | 46 --
 29 files changed, 207 insertions(+), 126 deletions(-)

diff --git a/pym/repoman/modules/scan/arches/arches.py 
b/pym/repoman/modules/scan/arches/arches.py
index 90ec04d..8bc7a24 100644
--- a/pym/repoman/modules/scan/arches/arches.py
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -23,7 +23,7 @@ class ArchChecks(ScanBase):
@param ebuild: Ebuild which we check (object).
@returns: dictionary, including arches set
'''
-   ebuild = kwargs.get('ebuild')
+   ebuild = kwargs.get('ebuild').result()
if self.options.ignore_arches:
arches = [[
self.repo_settings.repoman_settings["ARCH"], 
self.repo_settings.repoman_settings["ARCH"],
@@ -67,7 +67,10 @@ class ArchChecks(ScanBase):
# Use an empty profile for checking 
dependencies of
# packages that have empty KEYWORDS.
arches.add(('**', '**', ('**',)))
-   return {'continue': False, 'arches': arches}
+   # update the dynamic data
+   dyn_arches = kwargs.get('arches')
+   dyn_arches.update(arches)
+   return False
 
@property
def runInEbuilds(self):

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
index a2b8534..735604d 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -21,7 +21,7 @@ module_spec = {
'mod_kwargs': ['qatracker', 'portdb'
],
'func_kwargs': {'ebuild': None, 'pkg': None, 
'unknown_pkgs': 'set',
-   'type_list': [], 'badlicsyntax': 'Future',
+   'type_list': 'list', 'badlicsyntax': 'Future',
'baddepsyntax': 'Future',
},
},
@@ -37,8 +37,8 @@ module_spec = {
'repo_settings', 'include_arches', 'caches',
'repoman_incrementals', 'env', 'have', 
'dev_keywords'
],
-   'func_kwargs': {'arches': 'set', 'ebuild': None, 'pkg': 
None,
-   'unknown_pkgs': 'set', 'baddepsyntax': 'Future',
+   'func_kwargs': {'arches': None, 'ebuild': None, 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/vcs/, pym/repoman/modules/vcs/git/

[Brian Dolbec]

commit: 9a3a6a7b129cd54230207a784cc0927a68f1b3ae
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Feb 10 18:05:46 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9a3a6a7b

repoman: Migrate vcs index update code to the vcs modules

 pym/repoman/actions.py | 22 +-
 pym/repoman/modules/vcs/changes.py |  4 
 pym/repoman/modules/vcs/git/changes.py | 27 +++
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 4d06555..6c9de57 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -164,27 +164,7 @@ class Actions(object):
if self.repo_settings.sign_manifests:
self.sign_manifest(myupdates, myremoved, mymanifests)
 
-   if self.vcs_settings.vcs == 'git':
-   # It's not safe to use the git commit -a option since 
there might
-   # be some modified files elsewhere in the working tree 
that the
-   # user doesn't want to commit. Therefore, call git 
update-index
-   # in order to ensure that the index is updated with the 
latest
-   # versions of all new and modified files in the 
relevant portion
-   # of the working tree.
-   myfiles = mymanifests + myupdates
-   myfiles.sort()
-   update_index_cmd = ["git", "update-index"]
-   update_index_cmd.extend(f.lstrip("./") for f in myfiles)
-   if self.options.pretend:
-   print("(%s)" % (" ".join(update_index_cmd),))
-   else:
-   retval = spawn(update_index_cmd, env=os.environ)
-   if retval != os.EX_OK:
-   writemsg_level(
-   "!!! Exiting on %s (shell) "
-   "error code: %s\n" % 
(self.vcs_settings.vcs, retval),
-   level=logging.ERROR, 
noiselevel=-1)
-   sys.exit(retval)
+   self.vcs_settings.changes.update_index(mymanifests, myupdates)
 
self.add_manifest(mymanifests, myheaders, myupdates, myremoved, 
commitmessage)
 

diff --git a/pym/repoman/modules/vcs/changes.py 
b/pym/repoman/modules/vcs/changes.py
index 27b627f..948407c 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -85,3 +85,7 @@ class ChangesBase(object):
def clear_attic(myheaders):
'''Old CVS leftover'''
pass
+
+   def update_index(self, mymanifests, myupdates):
+   '''Update the vcs's modified index if it is needed'''
+   pass

diff --git a/pym/repoman/modules/vcs/git/changes.py 
b/pym/repoman/modules/vcs/git/changes.py
index 1970b3a..018458c 100644
--- a/pym/repoman/modules/vcs/git/changes.py
+++ b/pym/repoman/modules/vcs/git/changes.py
@@ -2,11 +2,16 @@
 Git module Changes class submodule
 '''
 
+import logging
+import sys
+
 from repoman.modules.vcs.changes import ChangesBase
 from repoman._subprocess import repoman_popen
 from repoman._portage import portage
 from portage import os
 from portage.package.ebuild.digestgen import digestgen
+from portage.process import spawn
+from portage.util import writemsg_level
 
 
 class Changes(ChangesBase):
@@ -63,3 +68,25 @@ class Changes(ChangesBase):
for x in broken_changelog_manifests:
self.repoman_settings["O"] = 
os.path.join(self.repo_settings.repodir, x)
digestgen(mysettings=self.repoman_settings, 
myportdb=self.repo_settings.portdb)
+
+   def update_index(self, mymanifests, myupdates):
+   # It's not safe to use the git commit -a option since there 
might
+   # be some modified files elsewhere in the working tree that the
+   # user doesn't want to commit. Therefore, call git update-index
+   # in order to ensure that the index is updated with the latest
+   # versions of all new and modified files in the relevant portion
+   # of the working tree.
+   myfiles = mymanifests + myupdates
+   myfiles.sort()
+   update_index_cmd = ["git", "update-index"]
+   update_index_cmd.extend(f.lstrip("./") for f in myfiles)
+   if self.options.pretend:
+   print("(%s)" % (" ".join(update_index_cmd),))
+   else:
+   retval = spawn(update_index_cmd, env=os.environ)
+   if retval != os.EX_OK:
+

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/

[Brian Dolbec]

commit: 7e3abb544d68e92dd25bd8564a99928298f1e985
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Mar 30 14:50:57 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7e3abb54

repoman/modules/scan.py: Add docstrings

 pym/repoman/modules/scan/scan.py | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/pym/repoman/modules/scan/scan.py b/pym/repoman/modules/scan/scan.py
index 4901500..d2a5f51 100644
--- a/pym/repoman/modules/scan/scan.py
+++ b/pym/repoman/modules/scan/scan.py
@@ -1,5 +1,10 @@
 # -*- coding:utf-8 -*-
 
+'''
+moudules/scan.py
+Module specific package scan list generator
+'''
+
 import logging
 import os
 import sys
@@ -8,6 +13,15 @@ from repoman.errors import caterror
 
 
 def scan(repolevel, reposplit, startdir, categories, repo_settings):
+   '''Generate a list of pkgs to scan
+
+   @param repolevel: integer, number of subdirectories deep from the tree 
root
+   @param reposplit: list of the path subdirs
+   @param startdir: the top level directory to begin scanning from
+   @param categories: list of known categories
+   @param repo_settings: repository settings instance
+   @returns: scanlist, sorted list of pkgs to scan
+   '''
scanlist = []
if repolevel == 2:
# we are inside a category directory

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/

[Brian Dolbec]

commit: 206210006fde7b4e238b84eaa516844ba1c9052b
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Apr 18 07:32:54 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:35 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=20621000

repoman: Remove 'type_list' from dynamic_data

IT was not used outside of the DependChecks.check()

 pym/repoman/modules/scan/depend/__init__.py | 3 +--
 pym/repoman/modules/scan/depend/depend.py   | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
index 735604d..cf5b415 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -21,8 +21,7 @@ module_spec = {
'mod_kwargs': ['qatracker', 'portdb'
],
'func_kwargs': {'ebuild': None, 'pkg': None, 
'unknown_pkgs': 'set',
-   'type_list': 'list', 'badlicsyntax': 'Future',
-   'baddepsyntax': 'Future',
+   'badlicsyntax': 'Future', 'baddepsyntax': 
'Future',
},
},
'profile-module': {

diff --git a/pym/repoman/modules/scan/depend/depend.py 
b/pym/repoman/modules/scan/depend/depend.py
index 0efe5de..a5f91d3 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -146,8 +146,6 @@ class DependChecks(ScanBase):
# update the dynamic data
dyn_unknown = kwargs.get('unknown_pkgs')
dyn_unknown.update(unknown_pkgs)
-   dyn_type_list = kwargs.get('type_list')
-   dyn_type_list.extend(type_list)
self.set_result_pass([
(kwargs.get('badlicsyntax'), badlicsyntax),
(kwargs.get('baddepsyntax'), baddepsyntax),

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/

[Brian Dolbec]

commit: 1f9d957d838ea7ade379686caedf050d71b1325d
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Mar 16 02:00:20 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:30 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1f9d957d

repoman: Migrate 'can_force' to the new Fuse class

 pym/repoman/main.py | 5 +++--
 pym/repoman/modules/scan/ebuild/isebuild.py | 5 +++--
 pym/repoman/scanner.py  | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 337e638..2ccda99 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -25,6 +25,7 @@ from portage.util import formatter
 
 from repoman.actions import Actions
 from repoman.argparser import parse_args
+from repoman.fuse import Fuse
 from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats)
@@ -75,7 +76,7 @@ def repoman_main(argv):
# Set this to False when an extraordinary issue (generally
# something other than a QA issue) makes it impossible to
# commit (like if Manifest generation fails).
-   can_force = True
+   can_force = Fuse()
 
portdir, portdir_overlay, mydir = 
utilities.FindPortdir(repoman_settings)
if portdir is None:
@@ -110,7 +111,7 @@ def repoman_main(argv):
# Perform the main checks
scanner = Scanner(repo_settings, myreporoot, config_root, options,
vcs_settings, mydir, env)
-   can_force = scanner.scan_pkgs(can_force)
+   scanner.scan_pkgs(can_force)
 
commitmessage = None
 

diff --git a/pym/repoman/modules/scan/ebuild/isebuild.py 
b/pym/repoman/modules/scan/ebuild/isebuild.py
index 474a874..514d23e 100644
--- a/pym/repoman/modules/scan/ebuild/isebuild.py
+++ b/pym/repoman/modules/scan/ebuild/isebuild.py
@@ -42,6 +42,7 @@ class IsEbuild(ScanBase):
checkdir = kwargs.get('checkdir')
xpkg = kwargs.get('xpkg')
fuse = kwargs.get('validity_fuse')
+   can_force = kwargs.get('can_force')
self.continue_ = False
ebuildlist = []
pkgs = {}
@@ -85,9 +86,9 @@ class IsEbuild(ScanBase):
# metadata leads to false positives for several checks, 
and false
# positives confuse users.
self.continue_ = True
+   can_force.pop()
 
-   return {'continue': self.continue_, 'pkgs': pkgs,
-   'can_force': not self.continue_}
+   return {'continue': self.continue_, 'pkgs': pkgs}
 
@property
def runInPkgs(self):

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 9c6f5ac..a9f56e9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -205,7 +205,6 @@ class Scanner(object):
self.modules[mod_class.__name__] = 
mod_class(**self.kwargs)
 
def scan_pkgs(self, can_force):
-   dynamic_data = {'can_force': can_force}
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
@@ -268,7 +267,7 @@ class Scanner(object):
dynamic_data["changelog_modified"] = changelog_path in 
self.changed.changelogs
 
self._scan_ebuilds(ebuildlist, dynamic_data)
-   return dynamic_data['can_force']
+   return
 
 
def _scan_ebuilds(self, ebuildlist, dynamic_data):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/use/, pym/repoman/modules/scan/eclasses/, ...

[Brian Dolbec]

commit: 6b9eec58d51dc5a4122d6872b49fe9693185171f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Apr 20 16:52:21 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:35 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6b9eec58

more new data structure change fixes

 pym/repoman/modules/scan/arches/arches.py |  1 +
 pym/repoman/modules/scan/depend/depend.py |  1 +
 pym/repoman/modules/scan/ebuild/__init__.py   |  2 +-
 pym/repoman/modules/scan/ebuild/ebuild.py |  2 +-
 pym/repoman/modules/scan/ebuild/isebuild.py   | 11 +++--
 pym/repoman/modules/scan/eclasses/live.py |  5 ++-
 pym/repoman/modules/scan/keywords/__init__.py |  4 +-
 pym/repoman/modules/scan/metadata/__init__.py |  2 +-
 pym/repoman/modules/scan/metadata/unused.py   |  2 +-
 pym/repoman/modules/scan/use/use_flags.py | 13 +++---
 pym/repoman/scanner.py| 62 ++-
 11 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/pym/repoman/modules/scan/arches/arches.py 
b/pym/repoman/modules/scan/arches/arches.py
index 8bc7a24..4df25a8 100644
--- a/pym/repoman/modules/scan/arches/arches.py
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -69,6 +69,7 @@ class ArchChecks(ScanBase):
arches.add(('**', '**', ('**',)))
# update the dynamic data
dyn_arches = kwargs.get('arches')
+   #dyn_arches.clear()
dyn_arches.update(arches)
return False
 

diff --git a/pym/repoman/modules/scan/depend/depend.py 
b/pym/repoman/modules/scan/depend/depend.py
index a5f91d3..cd1fb33 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -145,6 +145,7 @@ class DependChecks(ScanBase):
 
# update the dynamic data
dyn_unknown = kwargs.get('unknown_pkgs')
+   dyn_unknown.clear()
dyn_unknown.update(unknown_pkgs)
self.set_result_pass([
(kwargs.get('badlicsyntax'), badlicsyntax),

diff --git a/pym/repoman/modules/scan/ebuild/__init__.py 
b/pym/repoman/modules/scan/ebuild/__init__.py
index ea21ece..efb2feb 100644
--- a/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/pym/repoman/modules/scan/ebuild/__init__.py
@@ -21,7 +21,7 @@ module_spec = {
'mod_kwargs': ['portdb', 'qatracker', 'repo_settings'
],
'func_kwargs': {'checkdirlist': 'list', 'checkdir': 
None, 'xpkg': None,
-   'validity_fuse': None, 'can_force': None, 
'pkgs': 'dict',
+   'validity_future': 'Future', 'can_force': None, 
'pkgs': 'dict',
},
},
'ebuild-module': {

diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py 
b/pym/repoman/modules/scan/ebuild/ebuild.py
index b015985..b02cdcd 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -86,7 +86,7 @@ class Ebuild(ScanBase):
self.qatracker.add_error(
"ebuild.notadded", self.xpkg + "/" + 
self.y_ebuild + ".ebuild")
# update the dynamic data
-   self.set_result_raise([('ebuild', self)])
+   self.set_result_raise([(kwargs.get('ebuild'), self)])
return False
 
def set_pkg_data(self, **kwargs):

diff --git a/pym/repoman/modules/scan/ebuild/isebuild.py 
b/pym/repoman/modules/scan/ebuild/isebuild.py
index 3e288a3..24680e2 100644
--- a/pym/repoman/modules/scan/ebuild/isebuild.py
+++ b/pym/repoman/modules/scan/ebuild/isebuild.py
@@ -13,6 +13,7 @@ from portage import os
 from repoman.qa_data import no_exec, allvars
 from repoman.modules.scan.scanbase import ScanBase
 
+
 class IsEbuild(ScanBase):
'''Performs basic tests to confirm it is an ebuild'''
 
@@ -88,9 +89,13 @@ class IsEbuild(ScanBase):
self.continue_ = True
self.set_result_pass([(can_force, False)])
# set our updated data
-   self.set_result_raise([
-   (kwargs.get('pkgs'), pkgs),
-   ])
+   dyn_pkgs = kwargs.get('pkgs')
+   # clear() sets it to None,
+   # we don't want to kill the pointer reference
+   # just set it back to an empty dict()
+   for key in list(dyn_pkgs):
+   dyn_pkgs.pop(key)
+   dyn_pkgs.update(pkgs)
return self.continue_
 
@property

diff --git a/pym/repoman/modules/scan/eclasses/live.py 
b/pym/repoman/modules/scan/eclasses/live.py
index e5bb7dc..85e829c 100644
--- a/pym/repoman/modules/scan/eclasses/live.py
+++ b/pym/repoman/modules/scan/eclasses/live.py
@@ -25,10 +25,11 @@ class LiveEclassChecks(ScanBase):
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

[Brian Dolbec]

commit: 9e04f437f9397309905eb88cf4e5da2052a60da3
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Feb  1 07:47:49 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9e04f437

repoman/actions.py: fix copyright update (bug 405017)

The Actions.perform method failed to update copyright for new and
changed files with --echangelog=n, so fix it to handle this case.

X-Gentoo-Bug: 405017
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=405017

 pym/repoman/actions.py   | 9 +
 pym/repoman/utilities.py | 7 ---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index c0cd5cc..643e24c 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -9,6 +9,7 @@ import platform
 import signal
 import sys
 import tempfile
+import time
 from itertools import chain
 
 from _emerge.UserQuery import UserQuery
@@ -22,6 +23,7 @@ from portage.output import (
 from portage.package.ebuild.digestgen import digestgen
 from portage.util import writemsg_level
 
+from repoman.copyrights import update_copyright
 from repoman.gpg import gpgsign, need_signature
 from repoman import utilities
 from repoman.modules.vcs.vcs import vcs_files_to_cps
@@ -111,6 +113,13 @@ class Actions(object):
 
commitmessage = commitmessage.rstrip()
 
+   # Update copyright for new and changed files
+   year = time.strftime('%Y', time.gmtime())
+   for fn in chain(mynew, mychanged):
+   if fn.endswith('.diff') or fn.endswith('.patch'):
+   continue
+   update_copyright(fn, year, pretend=self.options.pretend)
+
myupdates, broken_changelog_manifests = self.changelogs(
myupdates, mymanifests, myremoved, 
mychanged, myautoadd,
mynew, commitmessage)

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 47b5aab..8a757dc 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -395,13 +395,6 @@ def UpdateChangeLog(
year = time.strftime('%Y', gmtime)
date = time.strftime('%d %b %Y', gmtime)
 
-   # check modified files and the ChangeLog for copyright updates
-   # patches and diffs (identified by .patch and .diff) are excluded
-   for fn in chain(new, changed):
-   if fn.endswith('.diff') or fn.endswith('.patch'):
-   continue
-   update_copyright(os.path.join(pkgdir, fn), year, 
pretend=pretend)
-
cl_path = os.path.join(pkgdir, 'ChangeLog')
clold_lines = []
clnew_lines = []

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/

[Brian Dolbec]

commit: 01e09705312a9c94058a4ae12a6d01345dbc81d3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Mar 15 18:45:45 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=01e09705

repoman/modules.scan/metadata/unused.py: Add docstrings

Remove un-needed override functions

 pym/repoman/modules/scan/metadata/unused.py | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pym/repoman/modules/scan/metadata/unused.py 
b/pym/repoman/modules/scan/metadata/unused.py
index 9ff7e56..a58a614 100644
--- a/pym/repoman/modules/scan/metadata/unused.py
+++ b/pym/repoman/modules/scan/metadata/unused.py
@@ -3,11 +3,23 @@ from repoman.modules.scan.scanbase import ScanBase
 
 
 class UnusedCheck(ScanBase):
+   '''Checks and reports any un-used metadata.xml use flag descriptions'''
 
def __init__(self, **kwargs):
+   '''UnusedCheck init function
+
+   @param qatracker: QATracker instance
+   '''
self.qatracker = kwargs.get('qatracker')
 
def check(self, **kwargs):
+   '''Reports on any unused metadata.xml use descriptions
+
+   @param xpkg: the pacakge being checked
+   @param muselist: use flag list
+   @param used_useflags: use flag list
+   @param validity_fuse: Fuse instance
+   '''
xpkg = kwargs.get('xpkg')
muselist = kwargs.get('muselist')
used_useflags = kwargs.get('used_useflags')
@@ -22,13 +34,6 @@ class UnusedCheck(ScanBase):
return {'continue': False}
 
@property
-   def runInPkgs(self):
-   return (False, [])
-
-   @property
-   def runInEbuilds(self):
-   return (False, [])
-
-   @property
def runInFinal(self):
+   '''Final scans at the package level'''
return (True, [self.check])

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/, ...

[Brian Dolbec]

commit: d7bacba37b93eaf77a0669cda344a41c99a64658
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Apr 16 20:24:06 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d7bacba3

repoman: replace Fuse with Future

Replace Fuse with Future, which is similar more generic. The
code ends up being slightly more verbose, but more flexible.
The Future class will be useful elsewhere, including the
EventLoop class.

 pym/portage/util/futures.py | 118 
 pym/repoman/fuse.py |  68 
 pym/repoman/main.py |  12 ++-
 pym/repoman/modules/scan/ebuild/ebuild.py   |  10 ++-
 pym/repoman/modules/scan/ebuild/isebuild.py |  25 --
 pym/repoman/modules/scan/metadata/unused.py |  10 ++-
 pym/repoman/scanner.py  |   4 +-
 7 files changed, 164 insertions(+), 83 deletions(-)

diff --git a/pym/portage/util/futures.py b/pym/portage/util/futures.py
new file mode 100644
index 000..c648f10
--- /dev/null
+++ b/pym/portage/util/futures.py
@@ -0,0 +1,118 @@
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+#
+# For compatibility with python versions which do not have the
+# asyncio module (Python 3.3 and earlier), this module provides a
+# subset of the asyncio.futures.Futures interface.
+
+from __future__ import unicode_literals
+
+__all__ = (
+   'CancelledError',
+   'Future',
+   'InvalidStateError',
+)
+
+try:
+   from asyncio import (
+   CancelledError,
+   Future,
+   InvalidStateError,
+   )
+except ImportError:
+
+   from portage.exception import PortageException
+
+   _PENDING = 'PENDING'
+   _CANCELLED = 'CANCELLED'
+   _FINISHED = 'FINISHED'
+
+   class Error(PortageException):
+   pass
+
+   class CancelledError(Error):
+   def __init__(self):
+   Error.__init__(self, "cancelled")
+
+   class InvalidStateError(Error):
+   pass
+
+   class Future(object):
+
+   # Class variables serving as defaults for instance variables.
+   _state = _PENDING
+   _result = None
+   _exception = None
+
+   def cancel(self):
+   """Cancel the future and schedule callbacks.
+
+   If the future is already done or cancelled, return 
False.  Otherwise,
+   change the future's state to cancelled, schedule the 
callbacks and
+   return True.
+   """
+   if self._state != _PENDING:
+   return False
+   self._state = _CANCELLED
+   return True
+
+   def done(self):
+   """Return True if the future is done.
+
+   Done means either that a result / exception are 
available, or that the
+   future was cancelled.
+   """
+   return self._state != _PENDING
+
+   def result(self):
+   """Return the result this future represents.
+
+   If the future has been cancelled, raises 
CancelledError.  If the
+   future's result isn't yet available, raises 
InvalidStateError.  If
+   the future is done and has an exception set, this 
exception is raised.
+   """
+   if self._state == _CANCELLED:
+   raise CancelledError()
+   if self._state != _FINISHED:
+   raise InvalidStateError('Result is not ready.')
+   if self._exception is not None:
+   raise self._exception
+   return self._result
+
+   def exception(self):
+   """Return the exception that was set on this future.
+
+   The exception (or None if no exception was set) is 
returned only if
+   the future is done.  If the future has been cancelled, 
raises
+   CancelledError.  If the future isn't done yet, raises
+   InvalidStateError.
+   """
+   if self._state == _CANCELLED:
+   raise CancelledError
+   if self._state != _FINISHED:
+   raise InvalidStateError('Exception is not set.')
+   return self._exception
+
+   def set_result(self, result):
+   """Mark the future done and set its result.
+
+   If the future is already done when this method is 
called, 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/None/, pym/repoman/modules/vcs/cvs/, ...

[Brian Dolbec]

commit: 0ccfddfe99c5d1a83e7cfd81f92967b1ae2476b5
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Feb 16 20:06:30 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ccfddfe

repoman: Migrate the commit code to the vcs modules

 pym/repoman/actions.py  | 84 +
 pym/repoman/modules/vcs/None/changes.py | 13 +
 pym/repoman/modules/vcs/bzr/changes.py  |  1 -
 pym/repoman/modules/vcs/changes.py  | 20 
 pym/repoman/modules/vcs/cvs/changes.py  |  1 -
 pym/repoman/modules/vcs/git/changes.py  | 10 
 pym/repoman/modules/vcs/hg/changes.py   | 17 +++
 7 files changed, 83 insertions(+), 63 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 4032e04..c0cd5cc 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -7,21 +7,19 @@ import io
 import logging
 import platform
 import signal
-import subprocess
 import sys
 import tempfile
 from itertools import chain
 
 from _emerge.UserQuery import UserQuery
 
-import portage
+from repoman._portage import portage
 from portage import os
 from portage import _encodings
 from portage import _unicode_encode
 from portage.output import (
bold, create_color_func, green, red)
 from portage.package.ebuild.digestgen import digestgen
-from portage.process import find_binary, spawn
 from portage.util import writemsg_level
 
 from repoman.gpg import gpgsign, need_signature
@@ -443,43 +441,18 @@ class Actions(object):
mymsg.write(_unicode_encode(commitmessage))
mymsg.close()
 
-   commit_cmd = []
-   if self.options.pretend and self.vcs_settings.vcs is None:
-   # substitute a bogus value for pretend output
-   commit_cmd.append("cvs")
-   else:
-   commit_cmd.append(self.vcs_settings.vcs)
-   commit_cmd.extend(self.vcs_settings.vcs_global_opts)
-   commit_cmd.append("commit")
-   commit_cmd.extend(self.vcs_settings.vcs_local_opts)
-   if self.vcs_settings.vcs == "hg":
-   commit_cmd.extend(["--logfile", commitmessagefile])
-   commit_cmd.extend(myfiles)
-   else:
-   commit_cmd.extend(["-F", commitmessagefile])
-   commit_cmd.extend(f.lstrip("./") for f in myfiles)
-
+   retval = self.vcs_settings.changes.commit(myfiles, 
commitmessagefile)
+   # cleanup the commit message before possibly exiting
try:
-   if self.options.pretend:
-   print("(%s)" % (" ".join(commit_cmd),))
-   else:
-   retval = spawn(commit_cmd, 
env=self.repo_settings.commit_env)
-   if retval != os.EX_OK:
-   if 
self.repo_settings.repo_config.sign_commit and not 
self.vcs_settings.status.supports_gpg_sign():
-   # Inform user that newer git is 
needed (bug #403323).
-   logging.error(
-   "Git >=1.7.9 is 
required for signed commits!")
-
-   writemsg_level(
-   "!!! Exiting on %s (shell) "
-   "error code: %s\n" % 
(self.vcs_settings.vcs, retval),
-   level=logging.ERROR, 
noiselevel=-1)
-   sys.exit(retval)
-   finally:
-   try:
-   os.unlink(commitmessagefile)
-   except OSError:
-   pass
+   os.unlink(commitmessagefile)
+   except OSError:
+   pass
+   if retval != os.EX_OK:
+   writemsg_level(
+   "!!! Exiting on %s (shell) "
+   "error code: %s\n" % (self.vcs_settings.vcs, 
retval),
+   level=logging.ERROR, noiselevel=-1)
+   sys.exit(retval)
 
 
def priming_commit(self, myupdates, myremoved, commitmessage):
@@ -503,29 +476,18 @@ class Actions(object):
# so strip the prefix.
myfiles = [f.lstrip("./") for f in myfiles]
 
-   commit_cmd = [self.vcs_settings.vcs]
-   commit_cmd.extend(self.vcs_settings.vcs_global_opts)
-   commit_cmd.append("commit")
-   commit_cmd.extend(self.vcs_settings.vcs_local_opts)
-   commit_cmd.extend(["-F", commitmessagefile])
-   commit_cmd.extend(myfiles)

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/svn/, pym/repoman/, pym/repoman/modules/vcs/, ...

[Brian Dolbec]

commit: 4f79b514fc5fdc5dd2230d8fa219d972c8c9b92a
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb  7 18:53:58 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4f79b514

repoman: Migrate digest regeneration to the vcs modules

 pym/repoman/actions.py | 15 ++-
 pym/repoman/modules/vcs/bzr/changes.py | 14 --
 pym/repoman/modules/vcs/changes.py |  5 +
 pym/repoman/modules/vcs/cvs/changes.py | 13 +++--
 pym/repoman/modules/vcs/git/changes.py |  9 +
 pym/repoman/modules/vcs/hg/changes.py  |  9 +
 pym/repoman/modules/vcs/settings.py|  6 --
 pym/repoman/modules/vcs/svn/changes.py | 17 +
 8 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 8ff658c..4d06555 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -6,7 +6,6 @@ import errno
 import io
 import logging
 import platform
-import re
 import signal
 import subprocess
 import sys
@@ -25,7 +24,6 @@ from portage.package.ebuild.digestgen import digestgen
 from portage.process import find_binary, spawn
 from portage.util import writemsg_level
 
-from repoman._subprocess import repoman_getstatusoutput
 from repoman.gpg import gpgsign, need_signature
 from repoman import utilities
 from repoman.modules.vcs.vcs import vcs_files_to_cps
@@ -160,17 +158,8 @@ class Actions(object):
"\"You're rather crazy... "
"doing the entire repository.\"\n")
 
-   if self.vcs_settings.vcs in ('cvs', 'svn') and (myupdates or 
myremoved):
-   for x in sorted(vcs_files_to_cps(
-   chain(myupdates, myremoved, mymanifests),
-   self.scanner.repolevel, self.scanner.reposplit, 
self.scanner.categories)):
-   self.repoman_settings["O"] = 
os.path.join(self.repo_settings.repodir, x)
-   digestgen(mysettings=self.repoman_settings, 
myportdb=self.repo_settings.portdb)
-
-   elif broken_changelog_manifests:
-   for x in broken_changelog_manifests:
-   self.repoman_settings["O"] = 
os.path.join(self.repo_settings.repodir, x)
-   digestgen(mysettings=self.repoman_settings, 
myportdb=self.repo_settings.portdb)
+   self.vcs_settings.changes.digest_regen(myupdates, myremoved, 
mymanifests,
+   self.scanner, broken_changelog_manifests)
 
if self.repo_settings.sign_manifests:
self.sign_manifest(myupdates, myremoved, mymanifests)

diff --git a/pym/repoman/modules/vcs/bzr/changes.py 
b/pym/repoman/modules/vcs/bzr/changes.py
index 9bd0646..81e7cf5 100644
--- a/pym/repoman/modules/vcs/bzr/changes.py
+++ b/pym/repoman/modules/vcs/bzr/changes.py
@@ -4,7 +4,9 @@ Bazaar module Changes class submodule
 
 from repoman.modules.vcs.changes import ChangesBase
 from repoman._subprocess import repoman_popen
-
+from repoman._portage import portage
+from portage import os
+from portage.package.ebuild.digestgen import digestgen
 
 class Changes(ChangesBase):
'''Class object to scan and hold the resultant data
@@ -36,6 +38,7 @@ class Changes(ChangesBase):
"./" + elem.split()[-3:-2][0].split('/')[-1:][0]
for elem in bzrstatus
if elem and (elem[1:2] == "K" or elem[0:1] == "R")]
+   self.bzrstatus = bzrstatus
# Bazaar expands nothing.
 
@property
@@ -45,6 +48,13 @@ class Changes(ChangesBase):
return self._unadded
self._unadded = [
"./" + elem.rstrip().split()[1].split('/')[-1:][0]
-   for elem in bzrstatus
+   for elem in self.bzrstatus
if elem.startswith("?") or elem[0:2] == " D"]
return self._unadded
+
+   def digest_regen(self, myupdates, myremoved, mymanifests, scanner, 
broken_changelog_manifests):
+   if broken_changelog_manifests:
+   for x in broken_changelog_manifests:
+   self.repoman_settings["O"] = 
os.path.join(self.repo_settings.repodir, x)
+   digestgen(mysettings=self.repoman_settings, 
myportdb=self.repo_settings.portdb)
+

diff --git a/pym/repoman/modules/vcs/changes.py 
b/pym/repoman/modules/vcs/changes.py
index 921e9b5..27b627f 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -76,6 +76,11 @@ class ChangesBase(object):
'''Create a thick manifest'''
pass
 
+   def digest_regen(self, myupdates, myremoved, mymanifests, scanner,
+  

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/, pym/repoman/, pym/repoman/modules/vcs/None/

[Brian Dolbec]

commit: c6249bb756c8f3eb4a7bff9b11fa1d767bf6cc37
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Feb 10 18:08:55 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c6249bb7

repoman: Migrate add items to the vcs modules

 pym/repoman/actions.py  | 25 +
 pym/repoman/modules/vcs/None/changes.py |  4 
 pym/repoman/modules/vcs/changes.py  | 20 
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 6c9de57..4032e04 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -422,30 +422,7 @@ class Actions(object):
 
if myautoadd:
print(">>> Auto-Adding missing Manifest/ChangeLog 
file(s)...")
-   add_cmd = [self.vcs_settings.vcs, "add"]
-   add_cmd += myautoadd
-   if self.options.pretend:
-   portage.writemsg_stdout(
-   "(%s)\n" % " ".join(add_cmd),
-   noiselevel=-1)
-   else:
-
-   if sys.hexversion < 0x302 and 
sys.hexversion >= 0x300 and \
-   not os.path.isabs(add_cmd[0]):
-   # Python 3.1 _execvp throws TypeError 
for non-absolute executable
-   # path passed as bytes (see 
http://bugs.python.org/issue8513).
-   fullname = find_binary(add_cmd[0])
-   if fullname is None:
-   raise 
portage.exception.CommandNotFound(add_cmd[0])
-   add_cmd[0] = fullname
-
-   add_cmd = [_unicode_encode(arg) for arg in 
add_cmd]
-   retcode = subprocess.call(add_cmd)
-   if retcode != os.EX_OK:
-   logging.error(
-   "Exiting on %s error code: 
%s\n" % (self.vcs_settings.vcs, retcode))
-   sys.exit(retcode)
-
+   self.vcs_settings.changes.add_items(myautoadd)
myupdates += myautoadd
return myupdates, broken_changelog_manifests
 

diff --git a/pym/repoman/modules/vcs/None/changes.py 
b/pym/repoman/modules/vcs/None/changes.py
index 37693ad..98beedb 100644
--- a/pym/repoman/modules/vcs/None/changes.py
+++ b/pym/repoman/modules/vcs/None/changes.py
@@ -22,3 +22,7 @@ class Changes(ChangesBase):
def scan(self):
'''VCS type scan function, looks for all detectable changes'''
pass
+
+   def add_items(self, myautoadd):
+   '''Nothing to add them to'''
+   pass

diff --git a/pym/repoman/modules/vcs/changes.py 
b/pym/repoman/modules/vcs/changes.py
index 948407c..ee94217 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -2,9 +2,14 @@
 Base Changes class
 '''
 
+import logging
 import os
+import subprocess
+import sys
 from itertools import chain
 
+from repoman._portage import portage
+from portage import _unicode_encode
 
 class ChangesBase(object):
'''Base Class object to scan and hold the resultant data
@@ -89,3 +94,18 @@ class ChangesBase(object):
def update_index(self, mymanifests, myupdates):
'''Update the vcs's modified index if it is needed'''
pass
+
+   def add_items(self, myautoadd):
+   add_cmd = [self.vcs, "add"]
+   add_cmd += myautoadd
+   if self.options.pretend:
+   portage.writemsg_stdout(
+   "(%s)\n" % " ".join(add_cmd),
+   noiselevel=-1)
+   else:
+   add_cmd = [_unicode_encode(arg) for arg in 
add_cmd]
+   retcode = subprocess.call(add_cmd)
+   if retcode != os.EX_OK:
+   logging.error(
+   "Exiting on %s error code: 
%s\n" % (self.vcs_settings.vcs, retcode))
+   sys.exit(retcode)

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/svn/, pym/repoman/modules/vcs/None/, ...

[Brian Dolbec]

commit: fb501443770bd025994a5211bc782bc21979a22e
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb  7 18:50:21 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fb501443

repoman: Add repo_settings to VCSSettings class and the Changes classes

Needed for more code migration from atcions.py to the vcs modules.

 pym/repoman/main.py | 4 
 pym/repoman/modules/vcs/None/changes.py | 4 ++--
 pym/repoman/modules/vcs/bzr/changes.py  | 4 ++--
 pym/repoman/modules/vcs/changes.py  | 4 +++-
 pym/repoman/modules/vcs/cvs/changes.py  | 4 ++--
 pym/repoman/modules/vcs/git/changes.py  | 4 ++--
 pym/repoman/modules/vcs/hg/changes.py   | 4 ++--
 pym/repoman/modules/vcs/svn/changes.py  | 4 ++--
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 6921005..337e638 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -84,6 +84,7 @@ def repoman_main(argv):
myreporoot = os.path.basename(portdir_overlay)
myreporoot += mydir[len(portdir_overlay):]
 
+   # avoid a circular parameter repo_settings
vcs_settings = VCSSettings(options, repoman_settings)
 
repo_settings = RepoSettings(
@@ -91,6 +92,9 @@ def repoman_main(argv):
repoman_settings, vcs_settings, options, qawarnings)
repoman_settings = repo_settings.repoman_settings
 
+   # Now set repo_settings
+   vcs_settings.repo_settings = repo_settings
+
if 'digest' in repoman_settings.features and options.digest != 'n':
options.digest = 'y'
 

diff --git a/pym/repoman/modules/vcs/None/changes.py 
b/pym/repoman/modules/vcs/None/changes.py
index 759b554..37693ad 100644
--- a/pym/repoman/modules/vcs/None/changes.py
+++ b/pym/repoman/modules/vcs/None/changes.py
@@ -12,12 +12,12 @@ class Changes(ChangesBase):
 
vcs = 'None'
 
-   def __init__(self, options):
+   def __init__(self, options, repo_settings):
'''Class init
 
@param options: commandline options
'''
-   super(Changes, self).__init__(options)
+   super(Changes, self).__init__(options, repo_settings)
 
def scan(self):
'''VCS type scan function, looks for all detectable changes'''

diff --git a/pym/repoman/modules/vcs/bzr/changes.py 
b/pym/repoman/modules/vcs/bzr/changes.py
index 519d311..9bd0646 100644
--- a/pym/repoman/modules/vcs/bzr/changes.py
+++ b/pym/repoman/modules/vcs/bzr/changes.py
@@ -13,12 +13,12 @@ class Changes(ChangesBase):
 
vcs = 'bzr'
 
-   def __init__(self, options):
+   def __init__(self, options, repo_settings):
'''Class init
 
@param options: commandline options
'''
-   super(Changes, self).__init__(options)
+   super(Changes, self).__init__(options, repo_settings)
 
def _scan(self):
'''VCS type scan function, looks for all detectable changes'''

diff --git a/pym/repoman/modules/vcs/changes.py 
b/pym/repoman/modules/vcs/changes.py
index 1745a65..921e9b5 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -13,8 +13,10 @@ class ChangesBase(object):
 
vcs = 'None'
 
-   def __init__(self, options):
+   def __init__(self, options, repo_settings):
self.options = options
+   self.repo_settings = repo_settings
+   self.repoman_settings = repo_settings.repoman_settings
self._reset()
 
def _reset(self):

diff --git a/pym/repoman/modules/vcs/cvs/changes.py 
b/pym/repoman/modules/vcs/cvs/changes.py
index 061486f..5fc9642 100644
--- a/pym/repoman/modules/vcs/cvs/changes.py
+++ b/pym/repoman/modules/vcs/cvs/changes.py
@@ -16,12 +16,12 @@ class Changes(ChangesBase):
 
vcs = 'cvs'
 
-   def __init__(self, options):
+   def __init__(self, options, repo_settings):
'''Class init
 
@param options: commandline options
'''
-   super(Changes, self).__init__(options)
+   super(Changes, self).__init__(options, repo_settings)
self._tree = None
 
def _scan(self):

diff --git a/pym/repoman/modules/vcs/git/changes.py 
b/pym/repoman/modules/vcs/git/changes.py
index d0b6acd..f159298 100644
--- a/pym/repoman/modules/vcs/git/changes.py
+++ b/pym/repoman/modules/vcs/git/changes.py
@@ -13,12 +13,12 @@ class Changes(ChangesBase):
 
vcs = 'git'
 
-   def __init__(self, options):
+   def __init__(self, options, repo_settings):
'''Class init
 
@param options: commandline options
'''
-   super(Changes, self).__init__(options)
+   super(Changes, self).__init__(options, repo_settings)
 
def 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/vcs/, pym/repoman/modules/vcs/cvs/

[Brian Dolbec]

commit: f0a93aa3bd64e86854e26a3826410ed1b3ed61b1
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb  7 18:46:27 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0a93aa3

repoman:  Move clear_attic() code to the modules

 pym/repoman/actions.py | 24 +---
 pym/repoman/modules/vcs/changes.py |  4 
 pym/repoman/modules/vcs/cvs/changes.py | 21 +
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index f477aec..8ff658c 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -153,7 +153,7 @@ class Actions(object):
# inside the $Header path. This code detects the problem and 
corrects it
# so that the Manifest will generate correctly. See bug #169500.
# Use binary mode in order to avoid potential character 
encoding issues.
-   self.clear_attic(myheaders)
+   self.vcs_settings.changes.clear_attic(myheaders)
 
if self.scanner.repolevel == 1:
utilities.repoman_sez(
@@ -582,28 +582,6 @@ class Actions(object):
pass
 
 
-
-
-   def clear_attic(self, myheaders):
-   cvs_header_re = re.compile(br'^#\s*\$Header.*\$$')
-   attic_str = b'/Attic/'
-   attic_replace = b'/'
-   for x in myheaders:
-   f = open(
-   _unicode_encode(x, encoding=_encodings['fs'], 
errors='strict'),
-   mode='rb')
-   mylines = f.readlines()
-   f.close()
-   modified = False
-   for i, line in enumerate(mylines):
-   if cvs_header_re.match(line) is not None and \
-   attic_str in line:
-   mylines[i] = line.replace(attic_str, 
attic_replace)
-   modified = True
-   if modified:
-   portage.util.write_atomic(x, b''.join(mylines), 
mode='wb')
-
-
def sign_manifest(self, myupdates, myremoved, mymanifests):
try:
for x in sorted(vcs_files_to_cps(

diff --git a/pym/repoman/modules/vcs/changes.py 
b/pym/repoman/modules/vcs/changes.py
index 77d7dc1..1745a65 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -74,3 +74,7 @@ class ChangesBase(object):
'''Create a thick manifest'''
pass
 
+   @staticmethod
+   def clear_attic(myheaders):
+   '''Old CVS leftover'''
+   pass

diff --git a/pym/repoman/modules/vcs/cvs/changes.py 
b/pym/repoman/modules/vcs/cvs/changes.py
index 6accd4a..061486f 100644
--- a/pym/repoman/modules/vcs/cvs/changes.py
+++ b/pym/repoman/modules/vcs/cvs/changes.py
@@ -41,6 +41,27 @@ class Changes(ChangesBase):
return self._unadded
self._unadded = portage.cvstree.findunadded(self._tree, 
recursive=1, basedir="./")
return self._unadded
+
+   @staticmethod
+   def clear_attic(myheaders):
+   cvs_header_re = re.compile(br'^#\s*\$Header.*\$$')
+   attic_str = b'/Attic/'
+   attic_replace = b'/'
+   for x in myheaders:
+   f = open(
+   _unicode_encode(x, encoding=_encodings['fs'], 
errors='strict'),
+   mode='rb')
+   mylines = f.readlines()
+   f.close()
+   modified = False
+   for i, line in enumerate(mylines):
+   if cvs_header_re.match(line) is not None and \
+   attic_str in line:
+   mylines[i] = line.replace(attic_str, 
attic_replace)
+   modified = True
+   if modified:
+   portage.util.write_atomic(x, b''.join(mylines), 
mode='wb')
+
def thick_manifest(self, myupdates, myheaders, no_expansion, expansion):
headerstring = "'\$(Header|Id).*\$'"
 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

[Brian Dolbec]

commit: cce21fdf368e1c605f8ad4a2291df3f6fceb44a3
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Apr 16 19:57:08 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cce21fdf

XmlLint: remove incorred self._is_capable setting

This setting interferred with the fix for bug 567746.

 pym/repoman/_xml.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index f7ff9fb..d55dda5 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -60,7 +60,6 @@ class XmlLint(object):
self.repoman_settings = repoman_settings
self._is_capable = metadata_dtd is not None
self.binary = None
-   self._is_capable = False
self._check_capable()
 
def _check_capable(self):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...

[Brian Dolbec]

commit: d97a0ffb07536f475cec4b33151446a5da9a83c1
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Mar 15 18:40:06 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d97a0ffb

repoman: Create a new boolean Fuse type

Create a Fuse type which implememts a boolean as a one time fuse.
The Fuse is initialized True, then is pop()'d to become False.
Once the Fuse is blown, it can not be reset to True.
Convert the use of the dynamic_data variable 'allvalid' to a Fuse instance.

 pym/repoman/fuse.py | 68 +
 pym/repoman/modules/scan/ebuild/ebuild.py   |  7 ++-
 pym/repoman/modules/scan/ebuild/isebuild.py | 13 +++---
 pym/repoman/modules/scan/metadata/unused.py |  2 +-
 pym/repoman/scanner.py  |  2 +
 5 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/pym/repoman/fuse.py b/pym/repoman/fuse.py
new file mode 100644
index 000..ac864fd
--- /dev/null
+++ b/pym/repoman/fuse.py
@@ -0,0 +1,68 @@
+
+'''
+fuse.py
+
+A tiny one-time-fuse class that uses a boolean to mimic the property of
+an electrical fuse.  IT's good (True) until it is popped (bad, False).
+It is not resetable.
+'''
+
+
+class Fuse(object):
+   '''A One time fuse style boolean instance'''
+
+   __slots__ = ('_state')
+
+   def __init__(self):
+   self._state = True
+
+   def pop(self):
+   '''Blow's the fuse state (makes it False)'''
+   self._state = False
+
+   def __repr__(self):
+   '''x.__repr__() <==> repr(x)'''
+   return repr(self._state>0)
+
+   def __str__(self):
+   '''x.__str__() <==> str(x)'''
+   return ['False', 'True'][self._state]
+
+   def __bool__(self):
+   '''self != 0'''
+   return self._state != 0
+
+   def __nonzero__(self):
+   '''self != 0'''
+   return self._state != 0
+
+   def __abs__(self):
+   '''x.__abs__() <==> abs(x)'''
+   return [0, 1] [self._state]
+
+   def __int__(self):
+   '''int(self)'''
+   return [0, 1][self._state]
+
+   def __eq__(self, value):
+   '''Return self==value.'''
+   return self._state == value
+
+   def __ne__(self, value):
+   '''Return self!=value.'''
+   return self._state != value
+
+   def __ge__(self, value):
+   '''Return self>=value.'''
+   return self._state >= value
+
+   def __gt__(self, value):
+   return self._state > value
+
+   def __le__(self, value):
+   '''Return self<=value.'''
+   return self._state <= value
+
+   def __lt__(self, value):
+   '''Return self

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/fetch/, pym/repoman/modules/scan/mirrors/, ...

[Brian Dolbec]

commit: a5063eb77c55b5dc33248814b3599e356feaa1a3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Wed Mar 16 17:10:40 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:51:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a5063eb7

repoman: Rough out an initial new data requirements listing in module_spec

 pym/repoman/modules/scan/arches/__init__.py  |  4 
 pym/repoman/modules/scan/depend/__init__.py  | 14 ++
 pym/repoman/modules/scan/directories/__init__.py |  8 
 pym/repoman/modules/scan/eapi/__init__.py|  4 
 pym/repoman/modules/scan/ebuild/__init__.py  | 12 
 pym/repoman/modules/scan/eclasses/__init__.py|  8 
 pym/repoman/modules/scan/fetch/__init__.py   |  4 
 pym/repoman/modules/scan/keywords/__init__.py|  4 
 pym/repoman/modules/scan/manifest/__init__.py|  4 
 pym/repoman/modules/scan/metadata/__init__.py| 24 
 pym/repoman/modules/scan/mirrors/__init__.py |  4 
 pym/repoman/modules/scan/options/__init__.py |  4 
 pym/repoman/modules/scan/status/__init__.py  |  4 
 pym/repoman/modules/scan/use/__init__.py |  4 
 14 files changed, 102 insertions(+)

diff --git a/pym/repoman/modules/scan/arches/__init__.py 
b/pym/repoman/modules/scan/arches/__init__.py
index d080c30..b87e07c 100644
--- a/pym/repoman/modules/scan/arches/__init__.py
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -18,6 +18,10 @@ module_spec = {
'functions': ['check'],
'func_desc': {
},
+   'mod_kwargs': ['options', 'repo_settings', 'profiles'
+   ],
+   'func_kwargs': {'ebuild': None,
+   },
},
}
 }

diff --git a/pym/repoman/modules/scan/depend/__init__.py 
b/pym/repoman/modules/scan/depend/__init__.py
index 9fd7970..a0f2f9a 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -18,6 +18,10 @@ module_spec = {
'functions': ['check'],
'func_desc': {
},
+   'mod_kwargs': ['qatracker', 'portdb'
+   ],
+   'func_kwargs': {
+   },
},
'profile-module': {
'name': "profile",
@@ -27,6 +31,12 @@ module_spec = {
'functions': ['check'],
'func_desc': {
},
+   'mod_kwargs': ['qatracker', 'portdb', 'profiles', 
'options',
+   'repo_settings', 'include_arches', 'caches',
+   'repoman_incrementals', 'env', 'have', 
'dev_keywords'
+   ],
+   'func_kwargs': {
+   },
},
'unknown-module': {
'name': "unknown",
@@ -36,6 +46,10 @@ module_spec = {
'functions': ['check'],
'func_desc': {
},
+   'mod_kwargs': ['qatracker',
+   ],
+   'func_kwargs': {
+   },
},
}
 }

diff --git a/pym/repoman/modules/scan/directories/__init__.py 
b/pym/repoman/modules/scan/directories/__init__.py
index ec18d30..d50ace5 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -18,6 +18,10 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
+   'mod_kwargs': ['portdb', 'qatracker', 'repo_settings', 
'vcs_settings',
+   ],
+   'func_kwargs': {
+   },
},
'mtime-module': {
'name': "mtime",
@@ -27,6 +31,10 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
+   'mod_kwargs': ['vcs_settings',
+   ],
+   'func_kwargs': {
+   },
},
}
 }

diff --git a/pym/repoman/modules/scan/eapi/__init__.py 
b/pym/repoman/modules/scan/eapi/__init__.py
index 39bab4d..63618ab 100644
--- a/pym/repoman/modules/scan/eapi/__init__.py
+++ b/pym/repoman/modules/scan/eapi/__init__.py
@@ -18,6 +18,10 @@ module_spec = {
'functions': ['check'],
'func_kwargs': {
},
+   'mod_kwargs': ['qatracker', 'repo_settings'
+   ],
+   'func_kwargs': {
+  

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/ebuild/

[Brian Dolbec]

commit: 38d18a1156787011bf25e5942aabbc262912a32b
Author: Brian Dolbec  gentoo  org>
AuthorDate: Fri Mar 11 00:11:13 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=38d18a11

repoman: Move changelog_modified to dynamic_data for use in the scan/ebuild 
module

 pym/repoman/modules/scan/ebuild/ebuild.py | 3 ++-
 pym/repoman/scanner.py| 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py 
b/pym/repoman/modules/scan/ebuild/ebuild.py
index 0ae416b..e9a2cdd 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -74,9 +74,10 @@ class Ebuild(ScanBase):
self.xpkg = kwargs.get('xpkg')
self.y_ebuild = kwargs.get('y_ebuild')
self.changed = kwargs.get('changed')
+   changelog_modified = kwargs.get('changelog_modified')
self._set_paths(**kwargs)
 
-   if self.checks['changelog'] and not self.changelog_modified \
+   if self.checks['changelog'] and not changelog_modified \
and self.ebuild_path in self.changed.new_ebuilds:
self.qatracker.add_error('changelog.ebuildadded', 
self.relative_path)
 

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 3d23725..86e389a 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -263,7 +263,7 @@ class Scanner(object):
self.qatracker.add_error("changelog.missing", 
xpkg + "/ChangeLog")
 
changelog_path = os.path.join(checkdir_relative, 
"ChangeLog")
-   self.changelog_modified = changelog_path in 
self.changed.changelogs
+   dynamic_data["changelog_modified"] = changelog_path in 
self.changed.changelogs
 
self._scan_ebuilds(ebuildlist, dynamic_data)
return dynamic_data['can_force']

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/, pym/repoman/modules/vcs/hg/, ...

[Brian Dolbec]

commit: fa6fa3342cddb6303df3f4a47d869e30731432b3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jan 30 07:58:04 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fa6fa334

repoman: Create docstrings for all new vcs module files

 pym/repoman/modules/vcs/None/changes.py |  9 -
 pym/repoman/modules/vcs/None/status.py  | 35 ++---
 pym/repoman/modules/vcs/bzr/__init__.py |  2 +-
 pym/repoman/modules/vcs/bzr/changes.py  |  9 -
 pym/repoman/modules/vcs/bzr/status.py   | 30 
 pym/repoman/modules/vcs/changes.py  |  3 +++
 pym/repoman/modules/vcs/cvs/__init__.py |  2 +-
 pym/repoman/modules/vcs/cvs/changes.py  |  8 +++-
 pym/repoman/modules/vcs/cvs/status.py   | 18 +
 pym/repoman/modules/vcs/git/__init__.py |  2 +-
 pym/repoman/modules/vcs/git/changes.py  |  9 -
 pym/repoman/modules/vcs/git/status.py   | 33 +++
 pym/repoman/modules/vcs/hg/__init__.py  |  2 +-
 pym/repoman/modules/vcs/hg/changes.py   |  9 -
 pym/repoman/modules/vcs/hg/status.py| 31 +
 pym/repoman/modules/vcs/settings.py |  2 +-
 pym/repoman/modules/vcs/svn/__init__.py |  2 +-
 pym/repoman/modules/vcs/svn/changes.py  |  9 -
 pym/repoman/modules/vcs/svn/status.py   | 27 ++---
 19 files changed, 220 insertions(+), 22 deletions(-)

diff --git a/pym/repoman/modules/vcs/None/changes.py 
b/pym/repoman/modules/vcs/None/changes.py
index f95af69..759b554 100644
--- a/pym/repoman/modules/vcs/None/changes.py
+++ b/pym/repoman/modules/vcs/None/changes.py
@@ -1,4 +1,6 @@
-
+'''
+None module Changes class submodule
+'''
 
 from repoman.modules.vcs.changes import ChangesBase
 
@@ -11,7 +13,12 @@ class Changes(ChangesBase):
vcs = 'None'
 
def __init__(self, options):
+   '''Class init
+
+   @param options: commandline options
+   '''
super(Changes, self).__init__(options)
 
def scan(self):
+   '''VCS type scan function, looks for all detectable changes'''
pass

diff --git a/pym/repoman/modules/vcs/None/status.py 
b/pym/repoman/modules/vcs/None/status.py
index b23fa10..d6e5ca0 100644
--- a/pym/repoman/modules/vcs/None/status.py
+++ b/pym/repoman/modules/vcs/None/status.py
@@ -1,24 +1,53 @@
-
+'''
+None (non-VCS) module Status class submodule
+'''
 
 
 class Status(object):
+   '''Performs status checks on the svn repository'''
 
def __init__(self, qatracker, eadded):
+   '''Class init
+
+   @param qatracker: QATracker class instance
+   @param eadded: list
+   '''
self.qatracker = qatracker
self.eadded = eadded
 
def check(self, checkdir, checkdir_relative, xpkg):
+   '''Perform the svn status check
+
+   @param checkdir: string of the directory being checked
+   @param checkdir_relative: string of the relative directory 
being checked
+   @param xpkg: string of the package being checked
+   @returns: boolean
+   '''
return True
 
@staticmethod
-   def supports_gpg_sign():
+   def detect_conflicts(options):
+   '''Are there any merge conflicts present in the VCS tracking 
system
+
+   @param options: command line options
+   @returns: Boolean
+   '''
return False
 
@staticmethod
-   def detect_conflicts(options):
+   def supports_gpg_sign():
+   '''Does this vcs system support gpg commit signatures
+
+   @returns: Boolean
+   '''
return False
 
@staticmethod
def isVcsDir(dirname):
+   '''Is the directory belong to the vcs system
+
+   @param dirname: string, directory name
+   @returns: Boolean
+   '''
return False
 

diff --git a/pym/repoman/modules/vcs/bzr/__init__.py 
b/pym/repoman/modules/vcs/bzr/__init__.py
index 1192782..4490ed8 100644
--- a/pym/repoman/modules/vcs/bzr/__init__.py
+++ b/pym/repoman/modules/vcs/bzr/__init__.py
@@ -1,7 +1,7 @@
 # Copyright 2014-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-doc = """BZR plug-in module for portage.
+doc = """Bazaar (bzr) plug-in module for portage.
 Performs variaous Bazaar actions and checks on repositories."""
 __doc__ = doc[:]
 

diff --git a/pym/repoman/modules/vcs/bzr/changes.py 
b/pym/repoman/modules/vcs/bzr/changes.py
index 41ce347..519d311 100644
--- a/pym/repoman/modules/vcs/bzr/changes.py
+++ b/pym/repoman/modules/vcs/bzr/changes.py
@@ -1,4 +1,6 @@
-
+'''
+Bazaar module Changes class submodule
+'''
 
 from 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/vcs/hg/, pym/repoman/modules/vcs/, pym/repoman/, ...

[Brian Dolbec]

commit: 27acea5f1b6005da62f4f9e84ef4f2124c5716a3
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sat Jan 30 01:58:36 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=27acea5f

repoman: Migrate actions.py vcs code to the vcs modules

Add missing changes code to the existing Changes classes.
This removes the duplicated code in the Actions class.
Optimize the code for the vcs modules.

 pym/repoman/actions.py   | 213 +--
 pym/repoman/modules/vcs/None/__init__.py |   1 +
 pym/repoman/modules/vcs/bzr/__init__.py  |   1 +
 pym/repoman/modules/vcs/bzr/changes.py   |  21 ++-
 pym/repoman/modules/vcs/changes.py   |  29 +
 pym/repoman/modules/vcs/cvs/__init__.py  |   1 +
 pym/repoman/modules/vcs/cvs/changes.py   |  29 -
 pym/repoman/modules/vcs/git/__init__.py  |   1 +
 pym/repoman/modules/vcs/git/changes.py   |  26 +++-
 pym/repoman/modules/vcs/hg/__init__.py   |   1 +
 pym/repoman/modules/vcs/hg/changes.py|  40 +-
 pym/repoman/modules/vcs/settings.py  |   5 +-
 pym/repoman/modules/vcs/svn/__init__.py  |   1 +
 pym/repoman/modules/vcs/svn/changes.py   |  38 +-
 14 files changed, 190 insertions(+), 217 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 55aff3f..7a29635 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -16,7 +16,6 @@ from itertools import chain
 from _emerge.UserQuery import UserQuery
 
 import portage
-from portage import cvstree
 from portage import os
 from portage import _encodings
 from portage import _unicode_encode
@@ -26,8 +25,7 @@ from portage.package.ebuild.digestgen import digestgen
 from portage.process import find_binary, spawn
 from portage.util import writemsg_level
 
-from repoman._subprocess import repoman_popen, repoman_getstatusoutput
-from repoman.errors import err
+from repoman._subprocess import repoman_getstatusoutput
 from repoman.gpg import gpgsign, need_signature
 from repoman import utilities
 from repoman.modules.vcs.vcs import vcs_files_to_cps
@@ -72,13 +70,11 @@ class Actions(object):
 
 
def perform(self, qa_output):
-   myunadded, mydeleted = self._vcs_unadded()
+   myautoadd = self._vcs_autoadd()
 
-   myautoadd = self._vcs_autoadd(myunadded)
+   self._vcs_deleted()
 
-   self._vcs_deleted(mydeleted)
-
-   changes = self.get_vcs_changed(mydeleted)
+   changes = self.get_vcs_changed()
 
mynew, mychanged, myremoved, no_expansion, expansion = changes
 
@@ -128,12 +124,14 @@ class Actions(object):
 
print("* %s files being committed..." % 
green(str(len(myupdates))), end=' ')
 
-   if self.vcs_settings.vcs not in ('cvs', 'svn'):
-   # With git, bzr and hg, there's never any keyword 
expansion, so
+   if not self.vcs_settings.needs_keyword_expansion:
+   # With some VCS types there's never any keyword 
expansion, so
# there's no need to regenerate manifests and all files 
will be
# committed in one big commit at the end.
+   logging.debug("VCS type doesn't need keyword expansion")
print()
elif not self.repo_settings.repo_config.thin_manifest:
+   logging.debug("perform: Calling thick_manifest()")
self.thick_manifest(myupdates, myheaders, no_expansion, 
expansion)
 
logging.info("myupdates: %s", myupdates)
@@ -272,62 +270,8 @@ class Actions(object):
sys.exit(1)
 
 
-   def _vcs_unadded(self):
-   myunadded = []
-   mydeleted = []
-   if self.vcs_settings.vcs == "cvs":
-   try:
-   myvcstree = portage.cvstree.getentries("./", 
recursive=1)
-   myunadded = portage.cvstree.findunadded(
-   myvcstree, recursive=1, basedir="./")
-   except SystemExit:
-   raise  # TODO propagate this
-   except:
-   err("Error retrieving CVS tree; exiting.")
-   if self.vcs_settings.vcs == "svn":
-   try:
-   with repoman_popen("svn status --no-ignore") as 
f:
-   svnstatus = f.readlines()
-   myunadded = [
-   "./" + elem.rstrip().split()[1]
-   for elem in svnstatus
-   if elem.startswith("?") or 
elem.startswith("I")]
-   except SystemExit:
-   raise  # TODO propagate 

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/, pym/repoman/modules/scan/options/, ...

[Brian Dolbec]

commit: 8bb2ef2e77ab6f19fe5de000135a315d004eb8ff
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Mar  7 21:04:01 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8bb2ef2e

repoman: Add docstrings to the final vcs and scan modules

 pym/repoman/modules/scan/arches/arches.py  | 13 
 pym/repoman/modules/scan/depend/depend.py  | 13 
 pym/repoman/modules/scan/depend/profile.py |  5 +-
 pym/repoman/modules/scan/depend/unknown.py | 13 
 pym/repoman/modules/scan/directories/files.py  |  1 +
 pym/repoman/modules/scan/directories/mtime.py  |  8 ++
 pym/repoman/modules/scan/eapi/eapi.py  |  2 +
 pym/repoman/modules/scan/ebuild/ebuild.py  | 22 +-
 pym/repoman/modules/scan/ebuild/isebuild.py|  3 +-
 pym/repoman/modules/scan/ebuild/multicheck.py  |  4 +-
 pym/repoman/modules/scan/eclasses/live.py  |  6 ++
 pym/repoman/modules/scan/eclasses/ruby.py  |  8 +-
 pym/repoman/modules/scan/fetch/fetches.py  |  1 +
 pym/repoman/modules/scan/keywords/keywords.py  |  1 +
 pym/repoman/modules/scan/manifest/manifests.py | 25 ++
 pym/repoman/modules/scan/metadata/pkgmetadata.py   |  1 +
 .../modules/scan/mirrors/thirdpartymirrors.py  |  1 +
 pym/repoman/modules/scan/options/options.py|  9 +++
 pym/repoman/modules/scan/status/vcsstatus.py   |  1 +
 pym/repoman/modules/scan/use/use_flags.py  |  1 +
 pym/repoman/modules/vcs/None/changes.py| 15 +++-
 pym/repoman/modules/vcs/bzr/changes.py | 13 +++-
 pym/repoman/modules/vcs/bzr/status.py  |  2 +-
 pym/repoman/modules/vcs/changes.py | 90 +++---
 pym/repoman/modules/vcs/cvs/changes.py | 54 +
 pym/repoman/modules/vcs/cvs/status.py  |  2 +-
 pym/repoman/modules/vcs/git/changes.py | 24 +-
 pym/repoman/modules/vcs/git/status.py  |  5 ++
 pym/repoman/modules/vcs/hg/changes.py  | 21 -
 pym/repoman/modules/vcs/hg/status.py   |  2 +-
 pym/repoman/modules/vcs/settings.py| 13 
 pym/repoman/modules/vcs/svn/changes.py | 42 ++
 pym/repoman/modules/vcs/svn/status.py  |  2 +-
 pym/repoman/modules/vcs/vcs.py | 13 +++-
 34 files changed, 358 insertions(+), 78 deletions(-)

diff --git a/pym/repoman/modules/scan/arches/arches.py 
b/pym/repoman/modules/scan/arches/arches.py
index 641a790..90ec04d 100644
--- a/pym/repoman/modules/scan/arches/arches.py
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -4,13 +4,25 @@ from repoman.modules.scan.scanbase import ScanBase
 
 
 class ArchChecks(ScanBase):
+   '''Perform arch keyword checks'''
 
def __init__(self, **kwargs):
+   '''Class init
+
+   @param options: the run time cli options
+   @param repo_settings: repository settings instance
+   @param profiles: dictionary
+   '''
self.options = kwargs.get('options')
self.repo_settings = kwargs.get('repo_settings')
self.profiles = kwargs.get('profiles')
 
def check(self, **kwargs):
+   '''Determines the arches for the ebuild following the profile 
rules
+
+   @param ebuild: Ebuild which we check (object).
+   @returns: dictionary, including arches set
+   '''
ebuild = kwargs.get('ebuild')
if self.options.ignore_arches:
arches = [[
@@ -59,4 +71,5 @@ class ArchChecks(ScanBase):
 
@property
def runInEbuilds(self):
+   '''Ebuild level scans'''
return (True, [self.check])

diff --git a/pym/repoman/modules/scan/depend/depend.py 
b/pym/repoman/modules/scan/depend/depend.py
index 810a94a..eaafc95 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -11,12 +11,24 @@ from repoman.qa_data import suspect_virtual, suspect_rdepend
 
 
 class DependChecks(ScanBase):
+   '''Perform dependency checks'''
 
def __init__(self, **kwargs):
+   '''
+   @param portdb: portdb instance
+   @param qatracker: QATracker instance
+   '''
self.qatracker = kwargs.get('qatracker')
self.portdb = kwargs.get('portdb')
 
def check(self, **kwargs):
+   '''Checks the ebuild dependencies for errors
+
+   @param pkg: Package in which we check (object).
+   @param ebuild: Ebuild which we check (object).
+   @returns: dictionary including {unknown_pkgs, type_list,
+   
badlicsyntax, baddepsyntax}
+   '''
  

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/vcs/, pym/repoman/modules/vcs/cvs/, ...

[Brian Dolbec]

commit: 542473fa98fd7ec29cec93a82a6da94cfb885d5a
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb  7 18:32:59 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=542473fa

repoman: Migrate thick_manifest to the vcs Changes classes

 pym/repoman/actions.py | 53 ++
 pym/repoman/modules/vcs/changes.py |  5 
 pym/repoman/modules/vcs/cvs/changes.py | 19 
 pym/repoman/modules/vcs/svn/changes.py | 42 +++
 4 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 7a29635..f477aec 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -132,7 +132,8 @@ class Actions(object):
print()
elif not self.repo_settings.repo_config.thin_manifest:
logging.debug("perform: Calling thick_manifest()")
-   self.thick_manifest(myupdates, myheaders, no_expansion, 
expansion)
+   self.vcs_settings.changes.thick_manifest(myupdates, 
myheaders,
+   no_expansion, expansion)
 
logging.info("myupdates: %s", myupdates)
logging.info("myheaders: %s", myheaders)
@@ -581,56 +582,6 @@ class Actions(object):
pass
 
 
-   def thick_manifest(self, myupdates, myheaders, no_expansion, expansion):
-   if self.vcs_settings.vcs == 'cvs':
-   headerstring = "'\$(Header|Id).*\$'"
-   elif self.vcs_settings.vcs == "svn":
-   svn_keywords = dict((k.lower(), k) for k in [
-   "Rev",
-   "Revision",
-   "LastChangedRevision",
-   "Date",
-   "LastChangedDate",
-   "Author",
-   "LastChangedBy",
-   "URL",
-   "HeadURL",
-   "Id",
-   "Header",
-   ])
-
-   for myfile in myupdates:
-
-   # for CVS, no_expansion contains files that are 
excluded from expansion
-   if self.vcs_settings.vcs == "cvs":
-   if myfile in no_expansion:
-   continue
-
-   # for SVN, expansion contains files that are included 
in expansion
-   elif self.vcs_settings.vcs == "svn":
-   if myfile not in expansion:
-   continue
-
-   # Subversion keywords are case-insensitive
-   # in svn:keywords properties,
-   # but case-sensitive in contents of files.
-   enabled_keywords = []
-   for k in expansion[myfile]:
-   keyword = svn_keywords.get(k.lower())
-   if keyword is not None:
-   enabled_keywords.append(keyword)
-
-   headerstring = "'\$(%s).*\$'" % 
"|".join(enabled_keywords)
-
-   myout = repoman_getstatusoutput(
-   "egrep -q %s %s" % (headerstring, 
portage._shell_quote(myfile)))
-   if myout[0] == 0:
-   myheaders.append(myfile)
-
-   print("%s have headers that will change." % 
green(str(len(myheaders
-   print(
-   "* Files with headers will"
-   " cause the manifests to be changed and committed 
separately.")
 
 
def clear_attic(self, myheaders):

diff --git a/pym/repoman/modules/vcs/changes.py 
b/pym/repoman/modules/vcs/changes.py
index 76ad591..77d7dc1 100644
--- a/pym/repoman/modules/vcs/changes.py
+++ b/pym/repoman/modules/vcs/changes.py
@@ -69,3 +69,8 @@ class ChangesBase(object):
def expansion(self):
'''Override this function as needed'''
return {}
+
+   def thick_manifest(self, myupdates, myheaders, no_expansion, expansion):
+   '''Create a thick manifest'''
+   pass
+

diff --git a/pym/repoman/modules/vcs/cvs/changes.py 
b/pym/repoman/modules/vcs/cvs/changes.py
index 3ef91cc..6accd4a 100644
--- a/pym/repoman/modules/vcs/cvs/changes.py
+++ b/pym/repoman/modules/vcs/cvs/changes.py
@@ -41,3 +41,22 @@ class Changes(ChangesBase):
return self._unadded
self._unadded = portage.cvstree.findunadded(self._tree, 
recursive=1, basedir="./")
   

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

[Brian Dolbec]

commit: dd1070496dde6e68b9fe47bd23a3a6bfd076dc90
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jan 21 18:51:16 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Apr 21 16:49:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=dd107049

metadata.py: Resolve error when moving metadata.dtd

If DISTDIR and PORTDIR/metadata/dtd live on different filesystems,
os.rename() will fail. Use shutil.move() instead.

 pym/repoman/metadata.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py
index f1fa53a..e95ad41 100644
--- a/pym/repoman/metadata.py
+++ b/pym/repoman/metadata.py
@@ -19,6 +19,7 @@ from repoman._portage import portage
 
 from portage import exception
 from portage import os
+from portage import shutil
 from portage.output import green
 
 if sys.hexversion >= 0x300:
@@ -143,7 +144,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings):
except portage.exception.PortageException:
pass
 
-   os.rename(metadata_dtd_tmp, metadata_dtd)
+   shutil.move(metadata_dtd_tmp, metadata_dtd)
finally:
try:
os.unlink(metadata_dtd_tmp)

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

[Mike Frysinger]

commit: 187ec2310c21c0c96812dec5e2d2a13172492ca9
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Apr 21 16:49:18 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Apr 21 16:50:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187ec231

sys-kernel/genkernel: clean up automatic git version

Drop the leading "v" to match the version style we use in releases.

Always add a "-git" suffix so we know it's the  ebuild even if the
git repo happens to be the same as the latest release.

 sys-kernel/genkernel/genkernel-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-.ebuild 
b/sys-kernel/genkernel/genkernel-.ebuild
index f6cd4fc..2a5ada3 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-.ebuild
@@ -40,7 +40,7 @@ then
SRC_URI="${COMMON_URI}"
 else
inherit bash-completion-r1 eutils
-   SRC_URI="mirror://gentoo/${P}.tar.bz2
+   SRC_URI="mirror://gentoo/${P}.tar.xz
${COMMON_URI}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 fi
@@ -87,7 +87,7 @@ src_unpack() {
 src_prepare() {
if [[ ${PV} == * ]] ; then
einfo "Updating version tag"
-   GK_V=$(git describe --tags)
+   GK_V="$(git describe --tags | sed 's:^v::')-git"
sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
einfo "Producing ChangeLog from Git history..."
pushd "${S}/.git" >/dev/null || die

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

[Amy Winston]

commit: 5018752105478d96e699b7f78c9d0902de49fc5a
Author: Amy Winston  gentoo  org>
AuthorDate: Thu Apr 21 16:45:33 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Apr 21 16:45:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50187521

net-firewall/pglinux: version bump 2.3.1 bug #580588

Package-Manager: portage-2.2.26

 net-firewall/pglinux/Manifest |  1 +
 net-firewall/pglinux/pglinux-2.3.1.ebuild | 98 +++
 2 files changed, 99 insertions(+)

diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index d57ec92..8209230 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,2 +1,3 @@
 DIST pgl-2.2.4.tar.gz 608622 SHA256 
26e91cb085a9da7faa643f9364192c0e3eeec64ccae56d0bb62de5174e185866 SHA512 
d6daad259a904647917388e586d4bd7d6a73b078bf61974a5682b6eec2d8d2abb02760483838f23fefa13ae761b4bd40765ddb13e6d820d0b6e3ee65b0815f58
 WHIRLPOOL 
59de9ad6a3c95e2f9f553e7c311be948b488825bfe8db7e2fc78610d46d98c0cbef4ce4846a659b01b2a0b6548dfed13dde27c55ffc22cb37418b97cde0c0ca8
 DIST pgl-2.3.0.tar.gz 604284 SHA256 
4183386a674e4778225f13165b0e9390eded89d9bc9445d4207a9c50078d0752 SHA512 
535f13d6b17bbea099e415e9dd463ebf4e2ffa9af4d8ae96c7ace2667c84380f506018aca2b6b6a6d4ca1e2afd24fc6eaf9544eb00710645d562f2aa1fa5a1a7
 WHIRLPOOL 
959ed95aa89271c2632997d050031d97354fdc59ed33de527fffbcfb6a05d89dea1b2d03d35394af48b2342cc46c4dfe3180c65d727291c4df66b37d0f1519b9
+DIST pgl-2.3.1.tar.gz 605656 SHA256 
1b5c6d233baa943b42254c95ed2853d036f3f246feaebc073e3c91c05a4c98b4 SHA512 
f23d44ad6448814ba0a2c90292ff4a933d31fed942886d63c50bb62fb56e1af70df72e09070ad3cd27c878f322576326040c330fbdbda63128ad304375b02a1e
 WHIRLPOOL 
f36f2d740f2b760d70e90de2e8004932289130b76119af80e478b0e8136d0dffb167c941b54b602a6f1857c9a3f8df1e7b4c6ed5c02099c008bec601ab967e2b

diff --git a/net-firewall/pglinux/pglinux-2.3.1.ebuild 
b/net-firewall/pglinux/pglinux-2.3.1.ebuild
new file mode 100644
index 000..a9d5e40
--- /dev/null
+++ b/net-firewall/pglinux/pglinux-2.3.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gnome2-utils linux-info systemd
+
+MY_P="pgl-${PV}"
+
+DESCRIPTION="Privacy oriented firewall application"
+HOMEPAGE="https://sourceforge.net/projects/peerguardian/;
+SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="cron dbus logrotate networkmanager qt4 zlib"
+
+COMMON_DEPEND="
+   net-libs/libnetfilter_queue
+   net-libs/libnfnetlink
+   dbus? ( sys-apps/dbus )
+   zlib? ( sys-libs/zlib )
+   qt4? ( sys-auth/polkit-qt[qt4(+)]
+   dev-qt/qtcore:4
+   dev-qt/qtdbus:4
+   dev-qt/qtgui:4
+   || ( kde-apps/kdesu x11-libs/gksu x11-misc/ktsuss )
+   )"
+DEPEND="${COMMON_DEPEND}
+   virtual/pkgconfig
+   sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+   net-firewall/iptables
+   sys-apps/sysvinit
+   cron? ( virtual/cron )
+   logrotate? ( app-admin/logrotate )
+   networkmanager? ( net-misc/networkmanager )"
+
+REQUIRED_USE="qt4? ( dbus )"
+
+CONFIG_CHECK="~NETFILTER_NETLINK
+   ~NETFILTER_NETLINK_QUEUE
+   ~NETFILTER_XTABLES
+   ~NETFILTER_XT_TARGET_NFQUEUE
+   ~NETFILTER_XT_MATCH_IPRANGE
+   ~NETFILTER_XT_MARK
+   ~NETFILTER_XT_MATCH_MULTIPORT
+   ~NETFILTER_XT_MATCH_STATE
+   ~NF_CONNTRACK
+   ~NF_CONNTRACK_IPV4
+   ~NF_DEFRAG_IPV4
+   ~IP_NF_FILTER
+   ~IP_NF_IPTABLES
+   ~IP_NF_TARGET_REJECT"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+   econf \
+   --localstatedir=/var \
+   --docdir=/usr/share/doc/${PF} \
+   $(use_enable logrotate) \
+   $(use_enable cron) \
+   $(use_enable networkmanager) \
+   $(use_enable zlib) \
+   $(use_enable dbus) \
+   --disable-lowmem \
+   --with-iconsdir=/usr/share/icons/hicolor/128x128/apps \
+   --with-gentoo-init \
+   $(use_with qt4) \
+   --with-systemd="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+   default
+   keepdir /var/{lib,log,spool}/pgl
+   rm -rf "${ED%/}"/tmp || die
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   elog "optional dependencies:"
+   elog "  app-arch/p7zip (needed for blocklists packed as .7z)"
+   elog "  app-arch/unzip (needed for blocklists packed as .zip)"
+   elog "  virtual/mta (needed to send informational (blocklist updates) 
and"
+   elog "warning mails (if pglcmd.wd detects a problem.))"
+
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

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

[Eray Aslan]

commit: 74ebaeed509febece37089ac12fe7127971b0b99
Author: Eray Aslan  gentoo  org>
AuthorDate: Thu Apr 21 16:07:08 2016 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Thu Apr 21 16:07:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ebaeed

app-crypt/mit-krb5: Remove vulnerable versions

Package-Manager: portage-2.2.28

 app-crypt/mit-krb5/Manifest   |   2 -
 app-crypt/mit-krb5/files/CVE-2015-2695.patch  | 564 -
 app-crypt/mit-krb5/files/CVE-2015-2696.patch  | 731 --
 app-crypt/mit-krb5/files/CVE-2015-2697.patch  |  50 --
 app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r1 |  25 -
 app-crypt/mit-krb5/files/mit-krb5kdc.initd-r1 |  24 -
 app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r1  |  24 -
 app-crypt/mit-krb5/mit-krb5-1.13.2-r2.ebuild  | 160 -
 app-crypt/mit-krb5/mit-krb5-1.13.2-r3.ebuild  | 160 -
 app-crypt/mit-krb5/mit-krb5-1.14.ebuild   | 151 -
 10 files changed, 1891 deletions(-)

diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index e3d2128..89c6183 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,4 +1,2 @@
-DIST krb5-1.13.2-signed.tar 12113920 SHA256 
e528c30b0209c741f6f320cb83122ded92f291802b6a1a1dc1a01dcdb3ff6de1 SHA512 
d3f8dde220876bd24703c488122ba8e54ffaa7f8f2c7d325e5d198a4e171248673fc1d5d3c997c6d2e66c314e2b7f4609eb980a789c3556a79458ab4411e61b5
 WHIRLPOOL 
9f29f4d76b7b2225f18707a95b217ce0eab7ae963ba547460fa6e7ffdc43e3c350ae070265c52b9751a70f80a95086e39c29dc2c44e0a22d17f9b48f7bf838f7
 DIST krb5-1.14.1.tar.gz 12259025 SHA256 
c8faa44574246f5bd0ce5a3dedc48c32db48a74cc4323949bf70f0ac2d6f1a99 SHA512 
5d64bb30ecb9e267e2494cea4995d8cc314916d8f6a9318fb80067ae6389ad7468656400d996698b6dc0bdb4c1355c13701b570521a7c40008cf1f83df24847d
 WHIRLPOOL 
2d4ab7e8e65d27ce207bd1d254586f95c8b219c01d2deb2fe60f8d5f84e13cd52881bbc2b51c1ee2d40a81570afa15d46c8446e5c6ec052e7621b76d34b72a7d
 DIST krb5-1.14.2.tar.gz 12264762 SHA256 
6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27 SHA512 
8e0d8203740aac78b65a62c0f79998b56dae23725763f645ae13a92dc4263d193e7334f84e278ca873d2b72d425f47cd4b68b58690d029dccce41e8a157b16f0
 WHIRLPOOL 
18a3729f5bfb928318f5cc28c919cbc49ee9179199ee82445922a5f2e8afbf4ed5a31f7e710877f8c12ef75f326723e7410608ce538983ce1b811e16091d72a1
-DIST krb5-1.14.tar.gz 12255176 SHA256 
cedb07fad8331e3ff2983d26e977a2ddba622f379c2b19bfea85bd695930f9e9 SHA512 
b33a85b37f6038e34ba4038c9d1cc6a0df027652cbeccd24e39b323a1ed1bc16305099df04654c80ba7e6b56bd3d3c2df95758add888f9ef8535cb78443684ff
 WHIRLPOOL 
e049aea7bcc99fa61af353bb0e831f63512c0c1f9df06332f2aae9add356f0fb27ee46e2a2fab23b7875bb827b2aa2ff78314ffe50d07fc95f089fff5fde5113

diff --git a/app-crypt/mit-krb5/files/CVE-2015-2695.patch 
b/app-crypt/mit-krb5/files/CVE-2015-2695.patch
deleted file mode 100644
index 08bc8ab..000
--- a/app-crypt/mit-krb5/files/CVE-2015-2695.patch
+++ /dev/null
@@ -1,564 +0,0 @@
-From b51b33f2bc5d1497ddf5bd107f791c101695000d Mon Sep 17 00:00:00 2001
-From: Nicolas Williams 
-Date: Mon, 14 Sep 2015 12:27:52 -0400
-Subject: [PATCH] Fix SPNEGO context aliasing bugs [CVE-2015-2695]
-
-The SPNEGO mechanism currently replaces its context handle with the
-mechanism context handle upon establishment, under the assumption that
-most GSS functions are only called after context establishment.  This
-assumption is incorrect, and can lead to aliasing violations for some
-programs.  Maintain the SPNEGO context structure after context
-establishment and refer to it in all GSS methods.  Add initiate and
-opened flags to the SPNEGO context structure for use in
-gss_inquire_context() prior to context establishment.
-
-CVE-2015-2695:
-
-In MIT krb5 1.5 and later, applications which call
-gss_inquire_context() on a partially-established SPNEGO context can
-cause the GSS-API library to read from a pointer using the wrong type,
-generally causing a process crash.  This bug may go unnoticed, because
-the most common SPNEGO authentication scenario establishes the context
-after just one call to gss_accept_sec_context().  Java server
-applications using the native JGSS provider are vulnerable to this
-bug.  A carefully crafted SPNEGO packet might allow the
-gss_inquire_context() call to succeed with attacker-determined
-results, but applications should not make access control decisions
-based on gss_inquire_context() results prior to context establishment.
-
-CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C
-
-[ghud...@mit.edu: several bugfixes, style changes, and edge-case
-behavior changes; commit message and CVE description]
-
-ticket: 8244
-target_version: 1.14
-tags: pullup

- src/lib/gssapi/spnego/gssapiP_spnego.h |   2 +
- src/lib/gssapi/spnego/spnego_mech.c| 254 -
- 2 files changed, 192 insertions(+), 64 deletions(-)
-
-diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h 

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

[Eray Aslan]

commit: 6ee4afd0171fb0d7b081292a5ac55c48701806ce
Author: Eray Aslan  gentoo  org>
AuthorDate: Thu Apr 21 16:00:43 2016 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Thu Apr 21 16:00:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee4afd0

app-crypt/mit-krb5: Security bump - bug 577930

Package-Manager: portage-2.2.28

 app-crypt/mit-krb5/Manifest   |   1 +
 app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild | 151 ++
 2 files changed, 152 insertions(+)

diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index f184fd7..e3d2128 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,3 +1,4 @@
 DIST krb5-1.13.2-signed.tar 12113920 SHA256 
e528c30b0209c741f6f320cb83122ded92f291802b6a1a1dc1a01dcdb3ff6de1 SHA512 
d3f8dde220876bd24703c488122ba8e54ffaa7f8f2c7d325e5d198a4e171248673fc1d5d3c997c6d2e66c314e2b7f4609eb980a789c3556a79458ab4411e61b5
 WHIRLPOOL 
9f29f4d76b7b2225f18707a95b217ce0eab7ae963ba547460fa6e7ffdc43e3c350ae070265c52b9751a70f80a95086e39c29dc2c44e0a22d17f9b48f7bf838f7
 DIST krb5-1.14.1.tar.gz 12259025 SHA256 
c8faa44574246f5bd0ce5a3dedc48c32db48a74cc4323949bf70f0ac2d6f1a99 SHA512 
5d64bb30ecb9e267e2494cea4995d8cc314916d8f6a9318fb80067ae6389ad7468656400d996698b6dc0bdb4c1355c13701b570521a7c40008cf1f83df24847d
 WHIRLPOOL 
2d4ab7e8e65d27ce207bd1d254586f95c8b219c01d2deb2fe60f8d5f84e13cd52881bbc2b51c1ee2d40a81570afa15d46c8446e5c6ec052e7621b76d34b72a7d
+DIST krb5-1.14.2.tar.gz 12264762 SHA256 
6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27 SHA512 
8e0d8203740aac78b65a62c0f79998b56dae23725763f645ae13a92dc4263d193e7334f84e278ca873d2b72d425f47cd4b68b58690d029dccce41e8a157b16f0
 WHIRLPOOL 
18a3729f5bfb928318f5cc28c919cbc49ee9179199ee82445922a5f2e8afbf4ed5a31f7e710877f8c12ef75f326723e7410608ce538983ce1b811e16091d72a1
 DIST krb5-1.14.tar.gz 12255176 SHA256 
cedb07fad8331e3ff2983d26e977a2ddba622f379c2b19bfea85bd695930f9e9 SHA512 
b33a85b37f6038e34ba4038c9d1cc6a0df027652cbeccd24e39b323a1ed1bc16305099df04654c80ba7e6b56bd3d3c2df95758add888f9ef8535cb78443684ff
 WHIRLPOOL 
e049aea7bcc99fa61af353bb0e831f63512c0c1f9df06332f2aae9add356f0fb27ee46e2a2fab23b7875bb827b2aa2ff78314ffe50d07fc95f089fff5fde5113

diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild 
b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
new file mode 100644
index 000..c073adb
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 
versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/;
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz;
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 
|| ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
+
+CDEPEND="
+   !!app-crypt/heimdal
+   >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+   || (
+   >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+   >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+   >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+   )
+   keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
+   openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+   pkinit? (
+   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] 
)
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
+   xinetd? ( sys-apps/xinetd )
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
+   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+   )"
+DEPEND="${CDEPEND}
+   ${PYTHON_DEPS}
+   virtual/yacc
+   doc? ( virtual/latex-base )
+   test? (
+   ${PYTHON_DEPS}
+   dev-lang/tcl:0
+   dev-util/dejagnu
+   )"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/krb5-config
+)
+
+src_prepare() {
+   epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+   epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+
+   eautoreconf
+}
+
+src_configure() {
+   append-cppflags "-I${EPREFIX}/usr/include/et"
+   # QA
+   append-flags -fno-strict-aliasing
+   append-flags -fno-strict-overflow
+
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   use keyutils || export ac_cv_header_keyutils_h=no
+   ECONF_SOURCE=${S} \
+   WARN_CFLAGS="set" \
+   econf \
+   

[gentoo-commits] repo/gentoo:master commit in: app-misc/linux-logo/

[Markus Meier]

commit: 9382d998e1d87cc97acfe390e04408ed70846dc2
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:49:22 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:49:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9382d998

app-misc/linux-logo: add ~arm, bug #577590

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 app-misc/linux-logo/linux-logo-5.11-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild 
b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
index 99586b3..866255a 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"

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

[Markus Meier]

commit: 84c6a8e7c4ef5c5c5548a57acde393ab97185479
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:50:00 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:50:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c6a8e7

dev-libs/libwacom: arm stable, bug #579230

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

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

diff --git a/dev-libs/libwacom/libwacom-0.18.ebuild 
b/dev-libs/libwacom/libwacom-0.18.ebuild
index 07f2cba..b08d321 100644
--- a/dev-libs/libwacom/libwacom-0.18.ebuild
+++ b/dev-libs/libwacom/libwacom-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND="

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

[Markus Meier]

commit: 3ccff30945137f97b3517217b7bd3d9d5c7b
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:48:42 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:48:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ccff309

dev-libs/librdkafka: add ~arm, bug #577510

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

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

diff --git a/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild 
b/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild
index 46e5e47..1204ecc 100644
--- a/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.9.0.99.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/edenhill/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="BSD-2"

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

[Markus Meier]

commit: 6afcc38ba78293a6ee1e8c8ac3f749b8dcb60b8d
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:47:56 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:47:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6afcc38b

sys-apps/dbus: arm stable, bug #578946

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 sys-apps/dbus/dbus-1.10.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/dbus/dbus-1.10.8-r1.ebuild 
b/sys-apps/dbus/dbus-1.10.8-r1.ebuild
index 2990626..b999ce2 100644
--- a/sys-apps/dbus/dbus-1.10.8-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.10.8-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz;
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="debug doc selinux static-libs systemd test user-session X"
 
 RESTRICT="test"

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

[Markus Meier]

commit: ff7229ef6e7684cd4b93f32b3388de61d3e0d28c
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:41:03 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:41:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7229ef

net-libs/liboping: add ~arm, bug #577424

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 net-libs/liboping/liboping-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/liboping/liboping-1.8.0.ebuild 
b/net-libs/liboping/liboping-1.8.0.ebuild
index 0756a41..6a36e2e 100644
--- a/net-libs/liboping/liboping-1.8.0.ebuild
+++ b/net-libs/liboping/liboping-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://noping.cc/files/${P}.tar.bz2;
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="perl"
 
 DEPEND="

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

[Markus Meier]

commit: 8d250a2856c0d8707043cdbe1c3fb44d51132770
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:42:43 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:42:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d250a28

dev-libs/libfastjson: add ~arm, bug #577508

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

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

diff --git a/dev-libs/libfastjson/libfastjson-0.99.2.ebuild 
b/dev-libs/libfastjson/libfastjson-0.99.2.ebuild
index 1c5e9e0..35f1c5d 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.2.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="MIT"
 # subslot = soname version
 SLOT="0/3.0.0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
 DEPEND=""

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

[Markus Meier]

commit: 9ed1a89cab0b0c192763589920e8da73de06cd51
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:46:53 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:46:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed1a89c

dev-ruby/text: arm stable, bug #579138

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

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

diff --git a/dev-ruby/text/text-1.3.1.ebuild b/dev-ruby/text/text-1.3.1.ebuild
index 244e9aa..5ff67bc 100644
--- a/dev-ruby/text/text-1.3.1.ebuild
+++ b/dev-ruby/text/text-1.3.1.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/threedaymonk/text;
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""

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

[Markus Meier]

commit: cd82bbddec3fde5821bd4ab4653535a30c14431b
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:45:56 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:45:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd82bbdd

net-misc/stunnel: arm stable, bug #578938

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

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

diff --git a/net-misc/stunnel/stunnel-5.30.ebuild 
b/net-misc/stunnel/stunnel-5.30.ebuild
index 18690f3..a0c117c 100644
--- a/net-misc/stunnel/stunnel-5.30.ebuild
+++ b/net-misc/stunnel/stunnel-5.30.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )

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

[Markus Meier]

commit: f3a8a687808b97ae3b36108ced3f2582dd3c936d
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:45:03 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:45:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a8a687

net-dns/avahi: arm stable, bug #578838

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 net-dns/avahi/avahi-0.6.32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/avahi/avahi-0.6.32.ebuild 
b/net-dns/avahi/avahi-0.6.32.ebuild
index 58d3640..f77eb08 100644
--- a/net-dns/avahi/avahi-0.6.32.ebuild
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 
kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
 
 REQUIRED_USE="

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

[Markus Meier]

commit: 9140575c18626d8fd56c8e3f5903103dd132808d
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:36:50 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:37:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9140575c

net-libs/mbedtls: arm stable, bug #578058

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 net-libs/mbedtls/mbedtls-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/mbedtls/mbedtls-2.2.0.ebuild 
b/net-libs/mbedtls/mbedtls-2.2.0.ebuild
index 073f48f..0b22ba3 100644
--- a/net-libs/mbedtls/mbedtls-2.2.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.2.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz;
 
 LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-doc/xmltoman/

[Markus Meier]

commit: 3416ce6b1d10e661453531eb2cdba7aea8bb0daa
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:43:32 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:43:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3416ce6b

app-doc/xmltoman: arm stable, bug #578838

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 app-doc/xmltoman/xmltoman-0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-doc/xmltoman/xmltoman-0.4.ebuild 
b/app-doc/xmltoman/xmltoman-0.4.ebuild
index c9f1a1b..8cafa61 100644
--- a/app-doc/xmltoman/xmltoman-0.4.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl

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

[Markus Meier]

commit: 8ba3459d1c5daa40ec1bba30cbbee5f6762dba6a
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Apr 21 15:39:54 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Apr 21 15:39:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba3459d

media-sound/ncmpcpp: arm stable, bug #578904

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild 
b/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
index f179770..2356397 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="