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

2015-10-06 Thread Jeroen Roovers
commit: 25fa211cc3ee1666af6d6807c845ae6e1ec4a5f8
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 05:17:31 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 05:17:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25fa211c

sys-apps/progress: Fix building against sys-libs/ncurses[tinfo].

Package-Manager: portage-2.2.22

 sys-apps/progress/progress-0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/progress/progress-0.9.ebuild 
b/sys-apps/progress/progress-0.9.ebuild
index 2b3bafe..2ad11d2 100644
--- a/sys-apps/progress/progress-0.9.ebuild
+++ b/sys-apps/progress/progress-0.9.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 
 src_prepare() {
sed -i \
-   -e '/LFLAGS/s:-lncurses:$(LDFLAGS) $(shell $(PKG_CONFIG) --libs 
ncurses):' \
+   -e '/LDFLAGS/s:-lncurses:$(shell $(PKG_CONFIG) --libs 
ncurses):' \
-e 's:CFLAGS=-g:CFLAGS+=:' \
-e 's:gcc:$(CC):g' \
Makefile || die



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

2015-10-06 Thread Hans de Graaff
commit: 436576be94cf06716003090445d45909adec5cfc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Oct  7 05:50:03 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Oct  7 05:50:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436576be

dev-util/cucumber: fix gemspec

Make sure the 'files' and 'executables' fields
in the gemspec are correct.

Package-Manager: portage-2.2.20.1

 dev-util/cucumber/cucumber-1.3.20-r1.ebuild | 79 +
 1 file changed, 79 insertions(+)

diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild 
b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
new file mode 100644
index 000..97fbe19
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis;
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+   test? (
+   >=dev-ruby/rspec-2.13.0
+   >=dev-ruby/nokogiri-1.5.2
+   >=dev-ruby/syntax-1.0.0
+   >=dev-util/aruba-0.5.2
+   >=dev-ruby/json-1.7
+   dev-ruby/bundler
+   >=dev-util/cucumber-1.3
+   dev-ruby/rubyzip:0
+   )"
+
+ruby_add_rdepend "
+   >=dev-ruby/builder-2.1.2:*
+   >=dev-ruby/diff-lcs-1.1.3
+   >=dev-ruby/gherkin-2.12.0:0
+   >=dev-ruby/multi_json-1.7.5
+   >=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+   # Remove development dependencies from the gemspec that we don't
+   # need or can't satisfy.
+   sed -i -e 
'/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d'
 ${RUBY_FAKEGEM_GEMSPEC} || die
+
+   # Fix too-strict test dependencies
+   sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
+   -e '/aruba/ s/= 0.5.2/~> 0.5/' \
+   -e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+   # Make sure spork is run in the right interpreter
+   sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' 
features/support/env.rb || die
+   rm features/drb_server_integration.feature || die
+
+   # Avoid json, they most likely fail due to multi_json weirdness.
+   rm features/json_formatter.feature || die
+   # Avoid features that break with newer rspec versions.
+   sed -i -e '369,398d' features/background.feature || die
+
+   # Avoid dependency on git
+   sed -i -e 's/git ls-files/find/' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+   ruby-ng_rspec
+   RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   if use examples; then
+   cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed 
installing example files."
+   fi
+}



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

2015-10-06 Thread Jeroen Roovers
commit: ceec6363d4fa3113e49e778fabad93f68fe55b01
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 05:31:22 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 05:31:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceec6363

www-client/vivaldi: Version bump.

Package-Manager: portage-2.2.22

 www-client/vivaldi/Manifest   | 4 ++--
 .../{vivaldi-1.0.283.8_p1.ebuild => vivaldi-1.0.291.18_p1.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 7bcc0f0..bbd1f30 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-1.0.283.8_p1-amd64.deb 39888582 SHA256 
a96efd48782b70ba0888230cc05f4cae11d82f0ec6e1737a2d4a5ca15e38b5fe SHA512 
fb6126d3860d920da361c52a15e35c81b0211ec24ea139848a4b1f8299630dd79251563fcd4f0358ad1b7d2f5b2cb43354981a92f6943960ad7988e6b35d5939
 WHIRLPOOL 
b924ce90b2a73e2b85330226919d19c33282818a0f1728582a326590649b9218735f92e9213796cf36aadade9fdb8fc7248871d177baffcf32c1fd5ef132b859
-DIST vivaldi-1.0.283.8_p1-i386.deb 40037526 SHA256 
23ed900371afea966b1c7fd9b6fc4f27d72fae1a2481627105b37fada0b93171 SHA512 
c45d229c1b569a0f48704a5b7035a30cc381749680011463e623e3fc0c149bd11ac13262e91b1bc8dbe7b5b84d565721b0524f8dd5f85c59fa8e5f4dc061c881
 WHIRLPOOL 
a2da0f5c7d2cd12fbe8a509757b7d852ffc9deb16aea5df2cfb03d6f471775d775d1329c1657020bf9f50daae48f940b3e3d83ab914fc0c8e9ad190da52840d0
 DIST vivaldi-1.0.288.3_p1-amd64.deb 39924644 SHA256 
86bee895601dbee6f3808b8846e65d2f6a786d2d0ea213c6767fdbea561c3480 SHA512 
55919c588391d548f1623fdea43997da297e58f708bad742e8e3334945044dc8734729fbb3f5985c4ee5ccd8e3d8a07d8e94efffbabb16adada03beabb769465
 WHIRLPOOL 
06ff1132aeade8d1b1c2036be8d7e0a303196020bb75651a978a741cc72aa2531bb57030495f0fab06a7c7a880e26afaddcfdbc9fcb1e384518aa94cca4c4855
 DIST vivaldi-1.0.288.3_p1-i386.deb 40121952 SHA256 
27f323d6c138cba6095dfa4dc17672096f421b02161c09d16394a70440242347 SHA512 
4813f36cbe999a6d7a801667cb6093d2bb6289ba8c1221e427bd3ec459f07e44949494b3f9c1d41b013fb459dc07d5f641ad6f16423714d98d4b24de94bac013
 WHIRLPOOL 
7d01912f6f2f64285cfe6ebc330da68467996e387ed7373b814e77248ddf6d167b2b126836cf41c25f47dc0d4eb2986d4edacf994894d17c0993bf10f0978b02
+DIST vivaldi-1.0.291.18_p1-amd64.deb 40035786 SHA256 
057fd309ac396dcb1170a83dcc0ea9d1804839e6846dd607d92189d25530ed08 SHA512 
1fc5508aed4f850ecf097e0551b0342dca9f29745a2f6161301ef993f289eaa82a10538ba47c64e53bd0b85cf4c5ea3358f680811c7dfa30649f36993e4960c1
 WHIRLPOOL 
dda5ce0c847c80ccfdb4b94a6421297cecb95e6da59e24986d6162dd8c51fb52601e3f3316fb5008b1f921bc0fae8f2301ecc1ba55f7440d361978755a9b0fbe
+DIST vivaldi-1.0.291.18_p1-i386.deb 40162732 SHA256 
f66debe9282d34e56f2b9309bce0e9d5f3f002165dc16c3e1931b27edf12f261 SHA512 
e5caf75aae4dac7054e79ba36604a32363550dd94da5eeb0f9a217d512058e368d81c2fb1ef3a050ce725acaa239a323d0450ee724d6b4c5e73ad7a109fe8216
 WHIRLPOOL 
22e0d087aeb4a2c66eadbb73fb3b827c9480df46e8f132e7e2605335118a70cdb041842da5f2c8f34c60f2bfbec18be3915071a747bacbf2bfc1cf819464cb21

diff --git a/www-client/vivaldi/vivaldi-1.0.283.8_p1.ebuild 
b/www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild
similarity index 100%
rename from www-client/vivaldi/vivaldi-1.0.283.8_p1.ebuild
rename to www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild



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

2015-10-06 Thread Jeroen Roovers
commit: b2e8ff317750b60de6a812d5e1497e03b224f7a4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 05:27:04 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 05:27:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e8ff31

net-misc/youtube-dl: Version bump.

Package-Manager: portage-2.2.22

 net-misc/youtube-dl/Manifest| 2 +-
 .../{youtube-dl-2015.09.22.ebuild => youtube-dl-2015.10.06.2.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ca600bc..dab51ac 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 
0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 
6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9
 WHIRLPOOL 
391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.09.22.tar.gz 1740309 SHA256 
447cb37694a5dc3b4897ac382642305526a60b6da196c2bcfcabc0ccc83764b2 SHA512 
92f679cbcd5edda96edb3a6108f58a537e3debd0dc205526cc59d60942c5b0fb77fa6fb49e71d291451c8c9c679e7971ed842c836d9a8fd6b47ce4e7bd8ec478
 WHIRLPOOL 
97191ba8daecca6aa2d6f789de091a6cd528781596e20b0b19d276a1c549a033a09f2b82c82293761aa1dd15db4ebea2458090551eb07c02f1f35f5e7d45772a
 DIST youtube-dl-2015.09.28.tar.gz 1742315 SHA256 
6396ee3150f51bd6ca2717b7d09f9524fbab22c04c3d2b560b99061d92127a60 SHA512 
bbbaa0d27702fb0fddc17ca65dea80cd7df5bd795f8e35d4094e4f05ad1792ac26937a3e26c311a04caf49c60f67fbd0044d2969d2c330a479eb75f79e2babbb
 WHIRLPOOL 
0b8d6b5776a7f21c5e9986fb79be43102544894451da10b648da978363d1740d2accb62c0b496ed0be376496adebc528f4b870249b053f0523405b22d03009f4
+DIST youtube-dl-2015.10.06.2.tar.gz 1753731 SHA256 
5907be4d930ce68c3ed4b555e1c2f1f7a47069cfe7638300c4f124afca0fb25f SHA512 
1114e5a65f204110f71890a6fe95a29fb5561bd60a928b9c198e921b153fd4e5b5b9cfd7cf87fcb377f1cc7878c6cbd9033108b932c36512cd9051090ba4162c
 WHIRLPOOL 
6a0bb93f9ec9cc7381a5e9c0d60bfb617a29992b9f545882c827129a58d5c53bdc1da93f35af6e5a4442702364285c2c7f36f3b003e0881405e110233fe9f2db

diff --git a/net-misc/youtube-dl/youtube-dl-2015.09.22.ebuild 
b/net-misc/youtube-dl/youtube-dl-2015.10.06.2.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2015.09.22.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.10.06.2.ebuild



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

2015-10-06 Thread Jeroen Roovers
commit: 4e516d316bfa68c96cba91aa0dac30f354343a8c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 05:39:33 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 05:42:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e516d31

net-analyzer/wireshark: Install a desktop file with USE=qt5 (bug #562022 by 
Paolo Pedroni).

Package-Manager: portage-2.2.22

 net-analyzer/wireshark/wireshark-1.12.7.ebuild   | 2 +-
 net-analyzer/wireshark/wireshark-1.99.9.ebuild   | 2 +-
 net-analyzer/wireshark/wireshark-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild 
b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 47ff12c..e227f75 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -234,7 +234,7 @@ src_install() {
domenu wireshark.desktop
fi
 
-   if use qt4; then
+   if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > 
wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi

diff --git a/net-analyzer/wireshark/wireshark-1.99.9.ebuild 
b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
index 1479231..591f9fe 100644
--- a/net-analyzer/wireshark/wireshark-1.99.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.9.ebuild
@@ -240,7 +240,7 @@ src_install() {
domenu wireshark.desktop
fi
 
-   if use qt4; then
+   if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > 
wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi

diff --git a/net-analyzer/wireshark/wireshark-.ebuild 
b/net-analyzer/wireshark/wireshark-.ebuild
index 02e46af..bd4b947 100644
--- a/net-analyzer/wireshark/wireshark-.ebuild
+++ b/net-analyzer/wireshark/wireshark-.ebuild
@@ -243,7 +243,7 @@ src_install() {
domenu wireshark.desktop
fi
 
-   if use qt4; then
+   if use qt4 || use qt5; then
sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > 
wireshark-qt.desktop || die
domenu wireshark-qt.desktop
fi



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/

2015-10-06 Thread Jeroen Roovers
commit: fc318a2cb3ab4f041a3c5f0897d4c5fb343bcea0
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 05:41:51 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 05:42:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc318a2c

net-analyzer/pmacct: Do not use mirror://gentoo/.

Package-Manager: portage-2.2.22

 net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild 
b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
index 2900099..06a5c51 100644
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A network tool to gather IP traffic information"
 HOMEPAGE="http://www.pmacct.net/;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"



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

2015-10-06 Thread Jeroen Roovers
commit: 1491ec62e35fec5f91d173a69a5b2694fff6fa29
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 04:56:05 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 04:56:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1491ec62

x11-libs/fltk: Drop USE=pdf (bug #536566).

Package-Manager: portage-2.2.22

 x11-libs/fltk/fltk-1.3.3-r3.ebuild | 16 
 x11-libs/fltk/fltk-1.3..ebuild | 16 
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild 
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index b55bc94..e4d4ae6 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz;
 SLOT="1"
 LICENSE="FLTK LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft 
+xinerama"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft 
+xinerama"
 
 RDEPEND="
>=media-libs/libpng-1.2:0
@@ -29,14 +29,7 @@ RDEPEND="
xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
x11-proto/xextproto
-   doc? (
-   app-doc/doxygen
-   pdf? (
-   dev-texlive/texlive-fontutils
-   dev-texlive/texlive-latex
-   dev-texlive/texlive-latexextra
-   )
-   )
+   doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )"
 
 FLTK_INCDIR=${EPREFIX}/usr/include/fltk
@@ -99,12 +92,11 @@ src_configure() {
 
 src_compile() {
default
+
if use doc; then
emake -C documentation html
-   if use pdf; then
-   emake -C documentation pdf
-   fi
fi
+
if use games; then
emake -C test blocks checkers sudoku
fi

diff --git a/x11-libs/fltk/fltk-1.3..ebuild 
b/x11-libs/fltk/fltk-1.3..ebuild
index ba25ae8..3c620a6 100644
--- a/x11-libs/fltk/fltk-1.3..ebuild
+++ b/x11-libs/fltk/fltk-1.3..ebuild
@@ -15,7 +15,7 @@ ESVN_PASSWORD=""
 SLOT="1"
 LICENSE="FLTK LGPL-2"
 KEYWORDS=""
-IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft 
+xinerama"
+IUSE="cairo debug doc examples games +opengl static-libs +threads +xft 
+xinerama"
 
 RDEPEND="
>=media-libs/libpng-1.2:0
@@ -31,14 +31,7 @@ RDEPEND="
xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
x11-proto/xextproto
-   doc? (
-   app-doc/doxygen
-   pdf? (
-   dev-texlive/texlive-fontutils
-   dev-texlive/texlive-latex
-   dev-texlive/texlive-latexextra
-   )
-   )
+   doc? ( app-doc/doxygen )
xinerama? ( x11-proto/xineramaproto )"
 
 FLTK_INCDIR=${EPREFIX}/usr/include/fltk
@@ -102,12 +95,11 @@ src_configure() {
 
 src_compile() {
default
+
if use doc; then
emake -C documentation html
-   if use pdf; then
-   emake -C documentation pdf
-   fi
fi
+
if use games; then
emake -C test blocks checkers sudoku
fi



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

2015-10-06 Thread Jeroen Roovers
commit: a84c1238f4358ec9e6a256018b39fd5899ee4ec9
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Oct  7 05:08:58 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Oct  7 05:08:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84c1238

net-libs/libsmi: Inherit eutils by Olivier Huber (bug #562172).

Package-Manager: portage-2.2.22

 net-libs/libsmi/libsmi-0.5.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild 
b/net-libs/libsmi/libsmi-0.5.0.ebuild
index 3aa6d62..716b4ab 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+inherit eutils
 
 DESCRIPTION="A Library to Access SMI MIB Information"
 HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi;



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

2015-10-06 Thread Hans de Graaff
commit: ba2113482388a7e76fa488bcdb938b30d9f04ac9
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Oct  5 05:17:24 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Oct  7 05:38:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba211348

dev-ruby/hashr: add 1.0.0

Package-Manager: portage-2.2.20.1

 dev-ruby/hashr/Manifest   |  1 +
 dev-ruby/hashr/hashr-1.0.0.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest
index 58af1df..49779bd 100644
--- a/dev-ruby/hashr/Manifest
+++ b/dev-ruby/hashr/Manifest
@@ -1 +1,2 @@
 DIST hashr-0.0.22.gem 9216 SHA256 
476445351aed46deed60fabe2012f7cca3795864ea3e64bba0cc7d0f348faeb3 SHA512 
92ae0718261ddb9731c546d408d3013cd0920d89e8e4b3a867ef1403bce14b0f7e296723f6b1d70eabf7b7a0df3b6e5ba6722d84ed0de4d619cda60c18a84555
 WHIRLPOOL 
18e01a1d91074df921b32a73ce0f7666ad6c8baccf2613a373664b7d4d1ae2c9ed5567609beb5d2c556d11d06155021cf729f77e57b992197b7ffcc9fa758c94
+DIST hashr-1.0.0.gem 10752 SHA256 
2cc847de0d51905662f818f947a5a65f908bfff74742bfe1aff6de175ead3f88 SHA512 
3d60f35804fd10f797be694b5bf1dd64d1a6c3e0d07572873ebb86f8dcaa9d979a777d29d92531fe784cc63b0b52b39bcfe19a438b0b359080590a23e93ab31f
 WHIRLPOOL 
389e120b94d2e4571881e900490cb0eca819e96f1b35a48f9ecc621f99a547c1d1a7de38e455aecc6a0f510b2750af54269bfa3faae75711da92454f703f6e0d

diff --git a/dev-ruby/hashr/hashr-1.0.0.ebuild 
b/dev-ruby/hashr/hashr-1.0.0.ebuild
new file mode 100644
index 000..068c477
--- /dev/null
+++ b/dev-ruby/hashr/hashr-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier 
and less error-prone"
+HOMEPAGE="https://github.com/svenfuchs/hashr;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+   sed -i -e '/bundler/d' test/test_helper.rb || die
+}



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

2015-10-06 Thread Hans de Graaff
commit: e830412f7e62217d33814d2c4ebdf614cf61652e
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Oct  7 05:37:54 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Oct  7 05:38:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e830412f

dev-ruby/rspec-core: fix gemspec and missing test dependency

Include proper 'files' and 'executables' fields in the gemspec.
Some other tools depend at least on executables being correct.

Add a missing test dependency on dev-ruby/tread_order. Drop
keywords due to this: bug 562452.

Package-Manager: portage-2.2.20.1

 dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild |  95 +++
 dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild | 100 +
 2 files changed, 195 insertions(+)

diff --git a/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild 
b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild
new file mode 100644
index 000..e8884f7
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core;
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+   =dev-ruby/rspec-support-${SUBVERSION}*
+   !!=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+   >=dev-ruby/nokogiri-1.5.2
+   >=dev-ruby/coderay-1.0.9
+   dev-ruby/syntax
+   >=dev-ruby/zentest-4.6.2
+   >=dev-ruby/rspec-expectations-3.0.0:3
+   >=dev-ruby/rspec-mocks-2.99.0:3
+   )"
+
+# Skip yard for ruby21 for now since we don't support ruby21 eselected
+# yet and we can't bootstrap otherwise.
+USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+   # Don't set up bundler: it doesn't understand our setup.
+   sed -i -e '/[Bb]undler/d' Rakefile || die
+
+   # Avoid dependency on cucumber since we can't run the features anyway.
+   sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+   # Duplicate exe also in bin. We can't change it since internal stuff
+   # also depends on this and fixing that is going to be fragile. This
+   # way we can at least install proper bin scripts.
+   cp -R exe bin || die
+
+   # Avoid unneeded dependency on git.
+   sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+   # Avoid aruba dependency so that we don't end up in dependency hell.
+   sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' 
spec/spec_helper.rb || die
+   rm spec/integration/{filtering,order}_spec.rb 
spec/support/aruba_support.rb || die
+}
+
+each_ruby_prepare() {
+   sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+   case ${RUBY} in
+   *ruby22)
+   # The rubygems version bundled with ruby 2.2 causes 
warnings.
+   sed -i -e '/a library that issues no warnings when 
loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+   ;;
+   esac
+}
+
+all_ruby_compile() {
+   if use doc ; then
+   yardoc || die
+   fi
+}
+
+each_ruby_test() {
+   PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec 
|| die "Tests failed."
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}

diff --git a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild 
b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
new file mode 100644
index 000..37da4c9
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven 

[gentoo-commits] proj/kde:master commit in: profiles/package.mask/

2015-10-06 Thread Manuel Rüger
commit: a2ceaed23bd149960fa4058a6e17b0d7e80cc7f8
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Oct  6 15:11:30 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Oct  6 15:11:30 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2ceaed2

profiles: KDE Plasma 5.4.2 was released.

 profiles/package.mask/kde-plasma-5.4.2 | 40 --
 1 file changed, 40 deletions(-)

diff --git a/profiles/package.mask/kde-plasma-5.4.2 
b/profiles/package.mask/kde-plasma-5.4.2
deleted file mode 100644
index 2a26674..000
--- a/profiles/package.mask/kde-plasma-5.4.2
+++ /dev/null
@@ -1,40 +0,0 @@
-# Manuel Rüger  (01 Oct 2015)
-# Not released yet
-
-~kde-plasma/bluedevil-5.4.2
-~kde-plasma/breeze-5.4.2
-~kde-plasma/kde-cli-tools-5.4.2
-~kde-plasma/kde-gtk-config-5.4.2
-~kde-plasma/kdecoration-5.4.2
-~kde-plasma/kdeplasma-addons-5.4.2
-~kde-plasma/kgamma-5.4.2
-~kde-plasma/khelpcenter-5.4.2
-~kde-plasma/khotkeys-5.4.2
-~kde-plasma/kinfocenter-5.4.2
-~kde-plasma/kmenuedit-5.4.2
-~kde-plasma/kscreen-5.4.2
-~kde-plasma/ksshaskpass-5.4.2
-~kde-plasma/ksysguard-5.4.2
-~kde-plasma/kwallet-pam-5.4.2
-~kde-plasma/kwayland-integration-5.4.2
-~kde-plasma/kwayland-5.4.2
-~kde-plasma/kwin-5.4.2
-~kde-plasma/kwrited-5.4.2
-~kde-plasma/libkscreen-5.4.2
-~kde-plasma/libksysguard-5.4.2
-~kde-plasma/milou-5.4.2
-~kde-plasma/oxygen-fonts-5.4.2
-~kde-plasma/oxygen-5.4.2
-~kde-plasma/plasma-desktop-5.4.2
-~kde-plasma/plasma-mediacenter-5.4.2
-~kde-plasma/plasma-meta-5.4.2
-~kde-plasma/plasma-nm-5.4.2
-~kde-plasma/plasma-pa-5.4.2
-~kde-plasma/plasma-sdk-5.4.2
-~kde-plasma/plasma-workspace-wallpapers-5.4.2
-~kde-plasma/plasma-workspace-5.4.2
-~kde-plasma/polkit-kde-agent-5.4.2
-~kde-plasma/powerdevil-5.4.2
-~kde-plasma/sddm-kcm-5.4.2
-~kde-plasma/systemsettings-5.4.2
-~kde-plasma/user-manager-5.4.2



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

2015-10-06 Thread Manuel Rüger
commit: acb3b00c2854ba29777fc770c19d7338f6cd9292
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Oct  6 15:11:12 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Oct  6 15:11:12 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=acb3b00c

eclass: KDE Plasma 5.4.2 was released.

 eclass/kde5.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index d98130d..4ba5a77 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -112,7 +112,7 @@ fi
 # An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
 # Any package matching this will have fetch restriction enabled, and receive
 # a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( kde-plasma-5.4.2 kde-frameworks-5.15.0 )
+KDE_UNRELEASED=( kde-frameworks-5.15.0 )
 
 if [[ ${KDEBASE} = kdevelop ]]; then
HOMEPAGE="https://www.kdevelop.org/;



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

2015-10-06 Thread Patrice Clement
commit: b204f85a140500d64ccc4c3f4ce328cffb840ff8
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 12:24:26 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:35:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b204f85a

dev-java/constantine: Keyword for ppc64.

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

 dev-java/constantine/constantine-0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/constantine/constantine-0.7-r1.ebuild 
b/dev-java/constantine/constantine-0.7-r1.ebuild
index a7165cf..b1e08eb 100644
--- a/dev-java/constantine/constantine-0.7-r1.ebuild
+++ b/dev-java/constantine/constantine-0.7-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/wmeissner/jnr-constants;
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"



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

2015-10-06 Thread Patrice Clement
commit: fa10f23a60a56417cc03ace0e1e26acbf8bd3711
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 11:15:46 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:34:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa10f23a

dev-java/commons-jelly: Version bump.

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

 dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild | 64 ++
 1 file changed, 64 insertions(+)

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild 
b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
new file mode 100644
index 000..1442a62
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://commons.apache.org/jelly/;
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+   dev-java/dom4j:1
+   dev-java/junit:0
+   dev-java/jaxen:1.1
+   dev-java/commons-cli:1
+   dev-java/commons-lang:0
+   dev-java/commons-jexl:1.0
+   dev-java/commons-logging:0
+   dev-java/commons-discovery:0
+   dev-java/commons-collections:0
+   dev-java/commons-beanutils:1.7
+   dev-java/tomcat-jstl-spec:1.2.5
+   java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+   >=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+   >=virtual/jdk-1.6
+   test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+   # disables dependency fetching, and remove tests as a dependency of jar
+   epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dlibdir=."
+EANT_GENTOO_CLASSPATH="
+   
commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
+   
commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
+   jaxen-1.1,junit,servlet-api-3.0"
+
+src_test() {
+   java-pkg-2_src_test
+}
+
+src_install() {
+   java-pkg_newjar target/${P}.jar ${PN}.jar
+   dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+   use doc && java-pkg_dojavadoc dist/docs/api
+   use source && java-pkg_dosrc src/java/*
+}



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

2015-10-06 Thread Patrice Clement
commit: c7c8405caf1de8055016649610235e80567a646e
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 12:23:19 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:35:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c8405c

dev-java/constantine: EAPI 5 bump.

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

 dev-java/constantine/constantine-0.7-r1.ebuild | 39 ++
 1 file changed, 39 insertions(+)

diff --git a/dev-java/constantine/constantine-0.7-r1.ebuild 
b/dev-java/constantine/constantine-0.7-r1.ebuild
new file mode 100644
index 000..a7165cf
--- /dev/null
+++ b/dev-java/constantine/constantine-0.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides Java values for common platform C constants"
+HOMEPAGE="https://github.com/wmeissner/jnr-constants;
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+   test? (
+   dev-java/ant-junit:0
+   )"
+
+src_compile() {
+   # ecj doesn't like some cast for some reason
+   java-pkg_force-compiler javac
+   java-pkg-2_src_compile
+}
+
+src_test() {
+   ANT_TASKS="ant-junit4" eant test 
-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
+}
+
+src_install() {
+   java-pkg_dojar dist/${PN}.jar
+   use source && java-pkg_dosrc src/*
+}



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

2015-10-06 Thread Patrice Clement
commit: d2cecfdd549fcdc6422678001a478da0cf03e5f4
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 11:32:26 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:34:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cecfdd

dev-java/commons-jexl: EAPI 5 bump.

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

 dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild | 49 
 1 file changed, 49 insertions(+)

diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild 
b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
new file mode 100644
index 000..5e0eafc
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Expression language engine, can be embedded in applications and 
frameworks"
+HOMEPAGE="http://commons.apache.org/jexl/;
+SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz"
+
+CDEPEND="dev-java/commons-logging
+   dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+   ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+   test? ( dev-java/ant-junit )
+   ${CDEPEND}"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+   # https://issues.apache.org/jira/browse/JEXL-31
+   epatch "${FILESDIR}/${PV}-test-target.patch"
+
+   mkdir -p target/lib && cd target/lib
+   java-pkg_jar-from junit junit.jar
+   java-pkg_jar-from commons-logging
+}
+
+src_test() {
+   ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+   java-pkg_newjar target/${P}*.jar
+   dodoc RELEASE-NOTES.txt || die
+   use doc && java-pkg_dojavadoc dist/docs/api
+   use source && java-pkg_dosrc "${S}"/src/java/*
+}



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

2015-10-06 Thread Patrice Clement
commit: e2b8e3f15633a51d21978934babbd407b8f94f56
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 12:23:52 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:35:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b8e3f1

dev-java/constantine: Clean up old.

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

 dev-java/constantine/Manifest   |  1 -
 dev-java/constantine/constantine-0.6.ebuild | 34 -
 dev-java/constantine/constantine-0.7.ebuild | 34 -
 3 files changed, 69 deletions(-)

diff --git a/dev-java/constantine/Manifest b/dev-java/constantine/Manifest
index a49d39b..38ecc18 100644
--- a/dev-java/constantine/Manifest
+++ b/dev-java/constantine/Manifest
@@ -1,2 +1 @@
-DIST constantine-0.6.tar.bz2 35684 SHA256 
1d4cf61f15d508de1f5f4058a12529cfbe60f4056f167056f24e515695d39733 SHA512 
16063f59a868ca6f629dcf9e42957edaebc9c5db21a6d856040420b943a127c89e7b1979e5ba051b26eabfb67fb70abd0ab6d2f5f6109d0fefbffbe716c0c980
 WHIRLPOOL 
42a4ac393889eab46ba133e86afd19ad90d3921abbe4c2c6871480d1747429f5bde46ec3d0a08ee3e1ffa885e3c4e40cf06b787b47976b56c7fc46124d62dcf2
 DIST constantine-0.7.tar.gz 65563 SHA256 
5600c264d3f32a48342e4b00643a8a8a543f15c6107a1c1be024e328a74e59b1 SHA512 
2694caae29bae1a3e1d765ac02c4014bc6fd3dac8370feb5d12f43119c057fc2a2e75b0aa37eec0164bf8a82a1bafb0f41565f397b956ae53a52f7cb803508c7
 WHIRLPOOL 
6a7c3ae5b0423690005656c69897d82244d05ea27056c4dbe4229390b648bce23775b699e8d719f347ea602e76313af5e19d47e932637fd919fb2fa2b64142d6

diff --git a/dev-java/constantine/constantine-0.6.ebuild 
b/dev-java/constantine/constantine-0.6.ebuild
deleted file mode 100644
index b22a2a7..000
--- a/dev-java/constantine/constantine-0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source test"
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides Java values for common platform C constants"
-HOMEPAGE="http://kenai.com/projects/constantine;
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
-   test? ( dev-java/ant-junit4 )"
-
-src_compile() {
-   # ecj doesn't like some cast for some reason
-   java-pkg_force-compiler javac
-   java-pkg-2_src_compile
-}
-
-src_install() {
-   java-pkg_dojar dist/${PN}.jar
-   use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-   ANT_TASKS="ant-junit4" eant test 
-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}

diff --git a/dev-java/constantine/constantine-0.7.ebuild 
b/dev-java/constantine/constantine-0.7.ebuild
deleted file mode 100644
index 9bd..000
--- a/dev-java/constantine/constantine-0.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source test"
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides Java values for common platform C constants"
-HOMEPAGE="https://github.com/wmeissner/jnr-constants;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
-   test? ( dev-java/ant-junit4 )"
-
-src_compile() {
-   # ecj doesn't like some cast for some reason
-   java-pkg_force-compiler javac
-   java-pkg-2_src_compile
-}
-
-src_install() {
-   java-pkg_dojar dist/${PN}.jar
-   use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-   ANT_TASKS="ant-junit4" eant test 
-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)"
-}



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

2015-10-06 Thread Patrice Clement
commit: 873fbd939daaa5ed5338d95f3be4fe3db315cf5b
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 14:25:10 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:35:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873fbd93

profiles: Masked dev-java/cos for removal. See bug 562370.

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index fe790d3..2c870bd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -31,6 +31,11 @@
 #--- END OF EXAMPLES ---
 
 # Patrice Clement  (6 Oct 2015)
+# No update since 2008. Masked for removal in 30 days.
+# See bug #562370.
+dev-java/cos
+
+# Patrice Clement  (6 Oct 2015)
 # Dead upstream. Masked for removal in 30 days.
 # See bug #562370.
 dev-java/commons-grant



[gentoo-commits] proj/kde:master commit in: kde-plasma/kwayland/

2015-10-06 Thread Michael Palimaka
commit: 43e3110d92e9d6add0fed7fafc5182f1585c7e10
Author: Jan Kundrát  kde  org>
AuthorDate: Mon Oct  5 20:10:24 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Oct  6 14:29:52 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=43e3110d

kde-plasma/kwayland: Bump the required Wayland version

The minimal version got increased to 1.6 in upstream commit
48326670528c7068648744c524c78dada40f1ce6 (early September), and then to
1.7 in upstream commit aef4708353fa2b6b22f08358cb72def947da9863 (mid
September).

These changes are not present on the 5.4 branch, so I'm only modifying
the - ebuild (thanks to kensington).

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

diff --git a/kde-plasma/kwayland/kwayland-.ebuild 
b/kde-plasma/kwayland/kwayland-.ebuild
index 043cb68..81d6104 100644
--- a/kde-plasma/kwayland/kwayland-.ebuild
+++ b/kde-plasma/kwayland/kwayland-.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-   >=dev-libs/wayland-1.3.0
+   >=dev-libs/wayland-1.7.0
dev-qt/qtgui:5
media-libs/mesa[egl]
 "



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

2015-10-06 Thread Mike Frysinger
commit: d5fc0982052ada0eaab209b8c56574220f63a698
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 13:57:12 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 13:57:12 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d5fc0982

lint: convert funcs to @staticmethod where it makes sense

These functions don't actually utilize |self|, so make them into
@staticmethod's to quiet down the linter.

 catalyst/base/stagebase.py   | 3 ++-
 catalyst/lock.py | 9 ++---
 catalyst/targets/snapshot.py | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b9dd1d5..409fcab 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1695,7 +1695,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.unbind()
raise CatalystError("build aborting due to 
livecd_update error.")
 
-   def _debug_pause_(self):
+   @staticmethod
+   def _debug_pause_():
py_input("press any key to continue: ")
 
 # vim: ts=4 sw=4 sta et sts=4 ai

diff --git a/catalyst/lock.py b/catalyst/lock.py
index 71918d6..01b1aa8 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -320,7 +320,8 @@ class LockDir(object):
del self.hardlock_paths[self.lockdir]
print self.hardlock_paths
 
-   def hardlock_name(self, path):
+   @staticmethod
+   def hardlock_name(path):
mypath=path+"/.hardlock-"+os.uname()[1]+"-"+str(os.getpid())
newpath = os.path.normpath(mypath)
if len(newpath) > 1:
@@ -328,7 +329,8 @@ class LockDir(object):
newpath = "/"+newpath.lstrip("/")
return newpath
 
-   def hardlink_is_mine(self,link,lock):
+   @staticmethod
+   def hardlink_is_mine(link, lock):
import stat
try:
myhls = os.stat(link)
@@ -347,7 +349,8 @@ class LockDir(object):
return True
return False
 
-   def hardlink_active(self, lock):
+   @staticmethod
+   def hardlink_active(lock):
if not os.path.exists(lock):
return False
 

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index 87340b7..a117a21 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -90,7 +90,8 @@ class snapshot(TargetBase, GenBase):
def kill_chroot_pids(self):
pass
 
-   def cleanup(self):
+   @staticmethod
+   def cleanup():
print "Cleaning up..."
 
def purge(self):



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

2015-10-06 Thread Mike Frysinger
commit: b71beb16153c2fddb4972fb4f727e8b6e9fbcf8c
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 13:46:32 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 13:46:32 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b71beb16

lint: fix duplicate fcntl import

This module is already imported at the top, so no point in doing it again.

 catalyst/lock.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/catalyst/lock.py b/catalyst/lock.py
index 25d2aa2..71918d6 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -176,7 +176,6 @@ class LockDir(object):
#writemsg("Lockfile obtained\n")
 
def fcntl_unlock(self):
-   import fcntl
unlinkfile = 1
if not os.path.exists(self.lockfile):
print "lockfile does not exist '%s'" % self.lockfile



[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/arch/, catalyst/targets/

2015-10-06 Thread Mike Frysinger
commit: 68c5ace05cfddab5185c78e79d5c48cb30677fca
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 13:54:45 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 13:54:45 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=68c5ace0

lint: fix bad indentation

Fix code that has excessive indentation relative to previous levels.

 catalyst/arch/x86.py  |  4 ++--
 catalyst/base/stagebase.py|  6 +++---
 catalyst/targets/livecd_stage1.py |  2 +-
 catalyst/targets/livecd_stage2.py |  2 +-
 catalyst/targets/netboot2.py  |  4 ++--
 catalyst/targets/stage2.py| 12 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 49500b9..33b29c0 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -10,8 +10,8 @@ class generic_x86(builder.generic):
builder.generic.__init__(self,myspec)
if self.settings["buildarch"]=="amd64":
if not os.path.exists("/bin/linux32") and not 
os.path.exists("/usr/bin/linux32"):
-   raise CatalystError("required 
executable linux32 not found "
-   "(\"emerge setarch\" to fix.)", 
print_traceback=True)
+   raise CatalystError("required executable 
linux32 not found "
+   "(\"emerge setarch\" to fix.)", 
print_traceback=True)
self.settings["CHROOT"]="linux32 chroot"
self.settings["crosscompile"] = False
else:

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a9e7848..b9dd1d5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -853,9 +853,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
and os.path.exists(target_portdir) \
and self.resume.is_enabled("unpack_portage") \
and self.settings["snapshot_path_hash"] == 
snapshot_hash:
-   print \
-   "Valid Resume point detected, 
skipping unpack of portage tree..."
-   unpack=False
+   print \
+   "Valid Resume point detected, skipping 
unpack of portage tree..."
+   unpack = False
 
if unpack:
if "snapcache" in self.settings["options"]:

diff --git a/catalyst/targets/livecd_stage1.py 
b/catalyst/targets/livecd_stage1.py
index ff320c0..262db70 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -34,7 +34,7 @@ class livecd_stage1(StageBase):

self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
-   print "Resume point detected, skipping target 
path setup operation..."
+   print "Resume point detected, skipping target path 
setup operation..."
else:
# first clean up any existing target stuff
if os.path.exists(self.settings["target_path"]):

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index 870dcf9..b54f2f0 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -55,7 +55,7 @@ class livecd_stage2(StageBase):

self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
-   print "Resume point detected, skipping target 
path setup operation..."
+   print "Resume point detected, skipping target path 
setup operation..."
else:
# first clean up any existing target stuff
if os.path.isdir(self.settings["target_path"]):

diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index e509cf9..f2d039c 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -54,7 +54,7 @@ class netboot2(StageBase):
self.settings["target_subpath"])
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("setup_target_path"):
-   print "Resume point detected, skipping target 
path setup operation..."
+   print "Resume point detected, skipping target path 
setup 

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

2015-10-06 Thread Mike Frysinger
commit: d0a0de7291f68220daded2dee8cb6e8fbbc2fee0
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:37:09 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:37:09 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0a0de72

version: use the passed in value

The get_git_version function takes a |version| argument, but doesn't
actually use it, which makes calls to the function with a version do
nothing.  Tweak the function to use the arg in the way it looks like
it intended.

 catalyst/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/version.py b/catalyst/version.py
index 5deb4d7..3b82988 100644
--- a/catalyst/version.py
+++ b/catalyst/version.py
@@ -31,7 +31,7 @@ def get_git_version(version=__version__):
s = ('vcs version %s, date %s' %
 (version_info['rev'], version_info['date']))
 
-   _ver = 'Catalyst %s\n%s' % (__version__, s)
+   _ver = 'Catalyst %s\n%s' % (version, s)
 
return _ver
 



[gentoo-commits] proj/catalyst:master commit in: catalyst/, catalyst/base/

2015-10-06 Thread Mike Frysinger
commit: e0c76c5cca51ad07c40ab9800ffe6fcfdec24aee
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:33:06 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:33:06 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e0c76c5c

lint: init all members in __init__

A few class members were being set outside of __init__.  Usually this is
an oversight, so having the linter complain is helpful.  Set up the few
places in the code that don't do this.

 catalyst/base/stagebase.py | 2 ++
 catalyst/lock.py   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index e393c5b..7bc7522 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -73,6 +73,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
previously. -agaffney
"""
 
+   self.makeconf = {}
self.archmap = {}
self.subarchmap = {}
machinemap = {}
@@ -156,6 +157,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.set_source_subpath()
 
""" Set paths """
+   self.snapshot_lock_object = None
self.set_snapshot_path()
self.set_root_path()
self.set_source_path()

diff --git a/catalyst/lock.py b/catalyst/lock.py
index d6653f7..d079b2d 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -54,6 +54,7 @@ class LockDir(object):
else:
LockDir.lock_dirs_in_use.append(lockdir)
 
+   self.myhardlock = None
self.hardlock_paths={}
 
def delete_lock_from_path_list(self):



[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/, targets/stage1/

2015-10-06 Thread Mike Frysinger
commit: dd3d5a4138662836243e1686167708f98fe2bf0b
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:02:42 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:02:42 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dd3d5a41

lint: clean up bare exception handling

It's a bad idea to use a bare except clause as you end up including
things like SystemExit, KeyboardInterrupt, and GeneratorExit, none
of which we actually want to catch.  Some of the cases in the code
were explicitly catching & passing SystemExit back up which proves
this point.

 catalyst/base/stagebase.py |  2 +-
 catalyst/lock.py   | 26 --
 catalyst/main.py   |  2 +-
 catalyst/support.py| 15 +--
 targets/stage1/build.py|  2 +-
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 409fcab..e393c5b 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1015,7 +1015,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
target is fully initialized
"""
self.snapshot_lock_object.unlock()
-   except:
+   except Exception:
pass
if ouch:
"""

diff --git a/catalyst/lock.py b/catalyst/lock.py
index 01b1aa8..d6653f7 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -130,8 +130,6 @@ class LockDir(object):
try:
if os.stat(self.lockfile).st_gid != 
self.gid:

os.chown(self.lockfile,os.getuid(),self.gid)
-   except SystemExit, e:
-   raise
except OSError, e:
if e[0] == 2: #XXX: No such file or 
directory
return 
self.fcntl_locking(locktype)
@@ -185,7 +183,7 @@ class LockDir(object):
try:
os.close(self.myfd)
self.myfd=None
-   except:
+   except Exception:
pass
return False
 
@@ -194,8 +192,6 @@ class LockDir(object):
self.myfd = os.open(self.lockfile, 
os.O_WRONLY,0660)
unlinkfile = 1

self.locking_method(self.myfd,fcntl.LOCK_UN)
-   except SystemExit, e:
-   raise e
except Exception, e:
#if self.myfd is not None:
#print "fcntl_unlock() trying to 
close", self.myfd
@@ -213,7 +209,7 @@ class LockDir(object):
InUse=False
try:

self.locking_method(self.myfd,fcntl.LOCK_EX|fcntl.LOCK_NB)
-   except:
+   except Exception:
print "Read lock may be 
in effect. skipping lockfile delete..."
InUse=True
# We won the lock, so 
there isn't competition for it.
@@ -227,8 +223,6 @@ class LockDir(object):
self.myfd=None
 #  if "DEBUG" in self.settings:
 #  print "Unlinked 
lockfile..."
-   except SystemExit, e:
-   raise e
except Exception, e:
# We really don't care... Someone else 
has the lock.
# So it is their problem now.
@@ -273,8 +267,6 @@ class LockDir(object):
print_traceback=True)
try:
os.link(self.myhardlock, self.lockfile)
-   except SystemExit:
-   raise
except Exception:
 #  if "DEBUG" in self.settings:
 #  print "lockfile(): Hardlink: Link 
failed."
@@ -305,9 +297,7 @@ class LockDir(object):

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

2015-10-06 Thread Mike Frysinger
commit: 49437c0c128d8632aa15d1d7bbfbb0e0a1f81905
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:07:44 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:07:44 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=49437c0c

lint: avoid relative imports

We import from catalyst.xxx elsewhere, so be consistent.

 catalyst/contents.py   | 2 +-
 catalyst/hash_utils.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst/contents.py b/catalyst/contents.py
index a06b2db..73eda61 100644
--- a/catalyst/contents.py
+++ b/catalyst/contents.py
@@ -2,7 +2,7 @@
 from collections import namedtuple
 from subprocess import Popen, PIPE
 
-from support import CatalystError, warn
+from catalyst.support import CatalystError, warn
 
 
 # use ContentsMap.fields for the value legend

diff --git a/catalyst/hash_utils.py b/catalyst/hash_utils.py
index 39f489b..0262422 100644
--- a/catalyst/hash_utils.py
+++ b/catalyst/hash_utils.py
@@ -3,7 +3,7 @@ import os
 from collections import namedtuple
 from subprocess import Popen, PIPE
 
-from support import CatalystError
+from catalyst.support import CatalystError
 
 
 # Use HashMap.fields for the value legend



[gentoo-commits] proj/catalyst:master commit in: bin/, doc/

2015-10-06 Thread Mike Frysinger
commit: 41b0bf3647474dcaf15bbf2138446fb50b665371
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:18:47 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:18:47 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=41b0bf36

lint: mark unused func args

Since these aren't used, the linter will warn, but these are callbacks
that expect a certain API, so add a _ prefix to quiet it down.

 bin/catalyst | 2 +-
 doc/make_target_table.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/catalyst b/bin/catalyst
index 19f5289..d0bc153 100755
--- a/bin/catalyst
+++ b/bin/catalyst
@@ -16,7 +16,7 @@ import sys
 try:
import signal
 
-   def exithandler(signum,frame):
+   def exithandler(_signum, _frame):
signal.signal(signal.SIGINT, signal.SIG_IGN)
signal.signal(signal.SIGTERM, signal.SIG_IGN)
print()

diff --git a/doc/make_target_table.py b/doc/make_target_table.py
index 9e7ebe8..f127c37 100755
--- a/doc/make_target_table.py
+++ b/doc/make_target_table.py
@@ -16,7 +16,7 @@ import glob
 import re
 
 
-def key_netboot_before_netboot2((target_name, module)):
+def key_netboot_before_netboot2((target_name, _module)):
return target_name + '1'
 
 



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

2015-10-06 Thread Mike Frysinger
commit: 4bc5a844fd340a3bd9b842678702fa6abf1b6b18
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:12:05 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:12:05 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4bc5a844

fileops: fix passing of gid/uid/minimal args

This func accepted these kwargs but forgot to pass them along to the
snakeoil layer.

 catalyst/fileops.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/fileops.py b/catalyst/fileops.py
index 8a05985..5a1d0f3 100644
--- a/catalyst/fileops.py
+++ b/catalyst/fileops.py
@@ -42,7 +42,7 @@ def ensure_dirs(path, gid=-1, uid=-1, mode=0o755, 
minimal=True,
:return: True if the directory could be created/ensured to have those
permissions, False if not.
'''
-   succeeded = snakeoil_ensure_dirs(path, gid=-1, uid=-1, mode=mode, 
minimal=True)
+   succeeded = snakeoil_ensure_dirs(path, gid=gid, uid=uid, mode=mode, 
minimal=minimal)
if not succeeded:
if failback:
failback()



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

2015-10-06 Thread Mike Frysinger
commit: 7445a15662512bf034a7e3f8144c9d07d1e9d8c6
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 13:51:29 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 13:51:29 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7445a156

lint: unwrap multiple statements

It's hard to read code that packs multiple statements in one line, so
unwrap the few places in the codebase where we do that.

 catalyst/config.py  | 3 ++-
 targets/stage1/build.py | 6 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/catalyst/config.py b/catalyst/config.py
index 48d9c12..ffad9b3 100644
--- a/catalyst/config.py
+++ b/catalyst/config.py
@@ -53,7 +53,8 @@ class ParserBase(object):
myline = trailing_comment.sub("", myline)
 
# Skip any blank lines
-   if not myline: continue
+   if not myline:
+   continue
 
if self.key_value_separator in myline:
# Split on the first occurence of the separator 
creating two strings in the array mobjs

diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index 6495ee3..be1bc4d 100755
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
@@ -33,6 +33,8 @@ for idx in range(0, len(pkgs)):
buildpkgs[bidx] = pkgs[idx]
if buildpkgs[bidx][0:1] == "*":
buildpkgs[bidx] = buildpkgs[bidx][1:]
-   except: pass
+   except:
+   pass
 
-for b in buildpkgs: sys.stdout.write(b+" ")
+for b in buildpkgs:
+   sys.stdout.write(b + " ")



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

2015-10-06 Thread Mike Frysinger
commit: 41658d890d2aeffdd0c7c399883ae212a1ea3ae0
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:47:42 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:47:42 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=41658d89

targets: fix bad set_build_kernel_vars call

These modules were calling set_build_kernel_vars with an argument that
the func didn't accept.  Plus, it's redundant as the super class init
(which these guys call) already handles the call.  So delete it.

 catalyst/targets/embedded.py | 1 -
 catalyst/targets/netboot.py  | 1 -
 catalyst/targets/netboot2.py | 1 -
 3 files changed, 3 deletions(-)

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 3309278..6044e17 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -28,7 +28,6 @@ class embedded(StageBase):
self.valid_values.append("embedded/fs-ops")
 
StageBase.__init__(self,spec,addlargs)
-   self.set_build_kernel_vars(addlargs)
 
def set_action_sequence(self):

self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\

diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index b0e322c..46ec4eb 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -44,7 +44,6 @@ class netboot(StageBase):
raise CatalystError("configuration error in 
netboot/packages.")
 
StageBase.__init__(self,spec,addlargs)
-   self.set_build_kernel_vars(addlargs)
if "netboot/busybox_config" in addlargs:
file_locate(self.settings, ["netboot/busybox_config"])
 

diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index f2d039c..5508367 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -46,7 +46,6 @@ class netboot2(StageBase):
raise CatalystError("configuration error in 
netboot2/packages.")
 
StageBase.__init__(self,spec,addlargs)
-   self.set_build_kernel_vars()
self.settings["merge_path"]=normpath("/tmp/image/")
 
def set_target_path(self):



[gentoo-commits] proj/catalyst:master commit in: /, doc/, catalyst/

2015-10-06 Thread Mike Frysinger
commit: b48733ee81b9d68ef1629f772071924142979e31
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 15:02:47 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 15:02:47 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b48733ee

lint: clean up superfluous parens

These don't need the parens, so omit them.

In the case of setup.py, we were expecting a print function, not a
keyword, so make sure to import that module.

 catalyst/lock.py   | 6 +++---
 doc/make_subarch_table_guidexml.py | 6 +++---
 setup.py   | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/catalyst/lock.py b/catalyst/lock.py
index d079b2d..3d50c06 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -179,7 +179,7 @@ class LockDir(object):
if not os.path.exists(self.lockfile):
print "lockfile does not exist '%s'" % self.lockfile
#print "fcntl_unlock() , self.myfd:", self.myfd, 
type(self.myfd)
-   if (self.myfd != None):
+   if self.myfd != None:
#print "fcntl_unlock() trying to close it "
try:
os.close(self.myfd)
@@ -236,7 +236,7 @@ class LockDir(object):
#if type(lockfilename) == 
types.StringType:
#os.close(myfd)
#print "fcntl_unlock() trying a last ditch close", self.myfd
-   if (self.myfd != None):
+   if self.myfd != None:
os.close(self.myfd)
self.myfd=None
self.locked=False
@@ -256,7 +256,7 @@ class LockDir(object):
start_time = time.time()
reported_waiting = False
 
-   while(time.time() < (start_time + max_wait)):
+   while time.time() < (start_time + max_wait):
# We only need it to exist.
self.myfd = os.open(self.myhardlock, 
os.O_CREAT|os.O_RDWR,0660)
os.close(self.myfd)

diff --git a/doc/make_subarch_table_guidexml.py 
b/doc/make_subarch_table_guidexml.py
index 54e0a4a..a6a9022 100755
--- a/doc/make_subarch_table_guidexml.py
+++ b/doc/make_subarch_table_guidexml.py
@@ -30,7 +30,7 @@ def handle_line(line, subarch_title_to_subarch_id, 
subarch_id_to_pattern_arch_ge
# Apply alias grouping
arch = _pattern_arch_genericliases.get(arch, arch)
 
-   assert(subarch not in subarch_id_to_pattern_arch_genericrch_id)
+   assert subarch not in subarch_id_to_pattern_arch_genericrch_id
subarch_id_to_pattern_arch_genericrch_id[subarch] = arch
 
return
@@ -40,7 +40,7 @@ def handle_line(line, subarch_title_to_subarch_id, 
subarch_id_to_pattern_arch_ge
child_subarch = x.group(1)
parent_subarch = x.group(2)
 
-   assert(child_subarch not in 
subarch_id_to_pattern_arch_genericrch_id)
+   assert child_subarch not in 
subarch_id_to_pattern_arch_genericrch_id
subarch_id_to_pattern_arch_genericrch_id[child_subarch] = 
subarch_id_to_pattern_arch_genericrch_id[parent_subarch]
 
return
@@ -49,7 +49,7 @@ def handle_line(line, subarch_title_to_subarch_id, 
subarch_id_to_pattern_arch_ge
subarch_title = x.group(1)
subarch_id = x.group(2)
 
-   assert(subarch_title not in subarch_title_to_subarch_id)
+   assert subarch_title not in subarch_title_to_subarch_id
subarch_title_to_subarch_id[subarch_title] = subarch_id
 
 

diff --git a/setup.py b/setup.py
index e4569ee..a875db1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 """Catalyst is a release building tool used by Gentoo Linux"""
 
+from __future__ import print_function
 
 import codecs as _codecs
 from distutils.core import setup as _setup, Command as _Command



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

2015-10-06 Thread Patrice Clement
commit: b23c2c64469f84586a9a9dce844e2295549c3238
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 11:33:07 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:34:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23c2c64

dev-java/commons-jexl: Stable for amd64. Stable for ppc+x86 using the ALLARCHES 
policy.

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

 dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild 
b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
index 5e0eafc..424d1f5 100644
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND=">=virtual/jdk-1.6
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"



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

2015-10-06 Thread Patrice Clement
commit: b571b9c899ea072cd1740fe7df6fc83fe97e1cae
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 11:33:49 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:34:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b571b9c8

dev-java/commons-jexl: Clean up old.

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

 dev-java/commons-jexl/commons-jexl-1.1.ebuild | 52 ---
 1 file changed, 52 deletions(-)

diff --git a/dev-java/commons-jexl/commons-jexl-1.1.ebuild 
b/dev-java/commons-jexl/commons-jexl-1.1.ebuild
deleted file mode 100644
index 8f01544..000
--- a/dev-java/commons-jexl/commons-jexl-1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Expression language engine, can be embedded in applications and 
frameworks"
-HOMEPAGE="http://commons.apache.org/jexl/;
-SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz"
-
-CDEPEND="dev-java/commons-logging
-   =dev-java/junit-3*"
-
-RDEPEND=">=virtual/jre-1.4
-   ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-   test? ( dev-java/ant-junit )
-   ${CDEPEND}"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-
-   # https://issues.apache.org/jira/browse/JEXL-31
-   epatch "${FILESDIR}/1.1-test-target.patch"
-
-   mkdir -p target/lib && cd target/lib
-   java-pkg_jar-from junit junit.jar
-   java-pkg_jar-from commons-logging
-}
-
-src_test() {
-   ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-   java-pkg_newjar target/${P}*.jar
-
-   dodoc RELEASE-NOTES.txt || die
-
-   use doc && java-pkg_dojavadoc dist/docs/api
-   use source && java-pkg_dosrc "${S}"/src/java/*
-}



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

2015-10-06 Thread Patrice Clement
commit: 4ae81d96daef359a9617c78967de8bd148cfe763
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 11:16:22 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:34:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae81d96

dev-java/commons-jelly: Clean up old.

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

 dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild | 66 --
 dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild | 66 --
 2 files changed, 132 deletions(-)

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild 
b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
deleted file mode 100644
index cefc420..000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/;
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="
-   dev-java/commons-beanutils:1.7
-   dev-java/commons-cli:1
-   dev-java/commons-collections:0
-   dev-java/commons-discovery:0
-   dev-java/commons-jexl:1.0
-   dev-java/commons-lang:0
-   dev-java/commons-logging:0
-   dev-java/dom4j:1
-   dev-java/jakarta-jstl:0
-   dev-java/jaxen:1.1
-   dev-java/junit:0
-   java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.4
-   test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-   # disables dependency fetching, and remove tests as a dependency of jar
-   epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
-   
commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
-   commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,jakarta-jstl
-   jaxen-1.1,junit,servlet-api-2.5"
-
-src_test() {
-   java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_newjar target/${P}.jar ${PN}.jar
-
-   dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
-   use doc && java-pkg_dojavadoc dist/docs/api
-   use source && java-pkg_dosrc src/java/*
-}

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild 
b/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
deleted file mode 100644
index 0aca101..000
--- a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="A Java and XML based scripting and processing engine"
-HOMEPAGE="http://commons.apache.org/jelly/;
-SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-   dev-java/commons-beanutils:1.7
-   dev-java/commons-cli:1
-   dev-java/commons-collections:0
-   dev-java/commons-discovery:0
-   dev-java/commons-jexl:1.0
-   dev-java/commons-lang:0
-   dev-java/commons-logging:0
-   dev-java/dom4j:1
-   dev-java/tomcat-jstl-spec:1.2.5
-   dev-java/jaxen:1.1
-   dev-java/junit:0
-   java-virtuals/servlet-api:2.5"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.4
-   test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-   # disables dependency fetching, and remove tests as a dependency of jar
-   epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dlibdir=."
-EANT_GENTOO_CLASSPATH="
-   
commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
-   
commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
-   jaxen-1.1,junit,servlet-api-2.5"
-
-src_test() {
-   java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_newjar target/${P}.jar ${PN}.jar
-
-   dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
-
-   use doc && java-pkg_dojavadoc dist/docs/api
-   use source && java-pkg_dosrc src/java/*
-}



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

2015-10-06 Thread Patrice Clement
commit: caa358952ba33e7a570736d976661e39105f4715
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 11:24:56 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 15:34:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa35895

dev-java/commons-jexl: Stable for amd64. Stable for x86 using the ALLARCHES 
policy. Disable dubious tests.

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

 dev-java/commons-jexl/commons-jexl-2.1.1.ebuild | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild 
b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
index b38d155..22b774f 100644
--- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,23 +14,28 @@ 
SRC_URI="mirror://apache/commons/jexl/source/${P}-src.tar.gz"
 
 CDEPEND="dev-java/commons-logging:0"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
>=dev-java/javacc-5
test? ( dev-java/ant-junit:0 )
${CDEPEND}"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${P}-src"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="commons-logging"
 
+# Dubious tests.
+JAVA_RM_FILES=(
+   src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
+)
+
 java_prepare() {
cp "${FILESDIR}"/${PV}-build.xml build.xml || die
 
@@ -43,15 +48,13 @@ java_prepare() {
|| die "Parser.java code generation via javacc failed"
 }
 
+src_test() {
+   java-pkg-2_src_test
+}
+
 src_install() {
java-pkg_dojar target/${PN}.jar
-
dodoc RELEASE-NOTES.txt NOTICE.txt
-
use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
use source && java-pkg_dosrc "${S}"/src/main/java/*
 }
-
-src_test() {
-   java-pkg-2_src_test
-}



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

2015-10-06 Thread Mike Frysinger
commit: 92c6ce5ebfc159a717588e0770b8aa629e2c5b0e
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 14:15:49 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 14:15:49 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=92c6ce5e

lint: revise wildcard import

We only need one function, so import it directly.

 catalyst/base/targetbase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/targetbase.py b/catalyst/base/targetbase.py
index e0c03df..4dcd88b 100644
--- a/catalyst/base/targetbase.py
+++ b/catalyst/base/targetbase.py
@@ -1,6 +1,6 @@
 import os
 
-from catalyst.support import *
+from catalyst.support import addl_arg_parse
 
 class TargetBase(object):
"""



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

2015-10-06 Thread Matt Thode
commit: cac8ab6ddc6c7fc107d183a595ae8b2df88e07a8
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Oct  7 04:16:20 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Oct  7 04:16:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac8ab6d

dev-python/keystonemiddleware: bup for liberty

Package-Manager: portage-2.2.20.1

 dev-python/keystonemiddleware/Manifest |  1 +
 .../keystonemiddleware-2.3.1.ebuild| 82 ++
 2 files changed, 83 insertions(+)

diff --git a/dev-python/keystonemiddleware/Manifest 
b/dev-python/keystonemiddleware/Manifest
index 9b65ac9..16fa764 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,3 +1,4 @@
 DIST keystonemiddleware-1.5.0.tar.gz 176315 SHA256 
73e98aab8bceb7843b6cc8aba2cbff824a379428519e2f9ffbb8e32578b38fe8 SHA512 
365643f7eba633587d8055204df04cfb40bdcc28c57d7ecf8c4ed67803b9b027b6334f868a1bc634d9beefd7410d74da08a7ed599637ec1656e6ef6196043dab
 WHIRLPOOL 
da7014869d3fc1ac5339671344542e33c22ac07adfb76ad00144cdcf4e1e26c60eea7ca7867cea6c6e105af1d05be64eff7d55ae1b3cf5114597da966b756b55
 DIST keystonemiddleware-1.5.2.tar.gz 176172 SHA256 
5f443162157946d2f33c4729d0bde55291f12963b0f1ee553984aedd8a509d51 SHA512 
172143f2e80860de3d89f53667bf670c1986cfc63a21392bf977b3beaa5669db76f46997d6939952856cb4abc970b57920810980d00db7e7cd711bdbede5908e
 WHIRLPOOL 
99a4553778b5dae07a710e78f816c8b30def42bfc7024cac7d6be8d8b6f76326383ed72935c6526758ac65fb26945937869985cba167d8804fe3a7cf2e3c4208
 DIST keystonemiddleware-2.2.0.tar.gz 179743 SHA256 
e3fca3fdc093d7fd3817bbd767faca7f0aa221b54155808694eb1286fae469f9 SHA512 
9aa498aa0bceec1774c70dc7fc4ce8c398e72721d33e715594b3396e160f9b60dfc3533687f0706eb272abd812b44d31b2a76fece739a2ccad33039b37f3fca5
 WHIRLPOOL 
a1b348e3e2f004038afa6b2b06d018d2e1130af1b2eb0e5740ea6a716dabaa98fe7a58cfd6e5100e5cdd6c7297fb150f4d9cc45dd8c831b7ca54a265b0d56662
+DIST keystonemiddleware-2.3.1.tar.gz 181764 SHA256 
9970f8187cb0a91cb2d78ef9a088147b2c9457653e95caa7b8bcd11bd450bec1 SHA512 
976aece1d308607eec6f406bb94f1e6dddc27edebc8d99bd7bc00dfbc1f21479da2c76404a99eb677e6647afd42f68b82d6f519659d7483db6fa9d68f839cf5f
 WHIRLPOOL 
e6a568e7c96886907eaeba9bc843833ffece8f441bfbe760b77c597c38a5a2720b702a527830d61f07bf0e3adbe4a90d6198b97b487ca08c3e4829058f7e0ef4

diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild 
b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
new file mode 100644
index 000..18bd9b7
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   ${CDEPEND}
+   test? (
+   >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+   >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+   >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+   >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+   >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+   >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+   !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+   !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+   >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+   >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+   !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+   =dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+   >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+   >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+   >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+   >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+   )"
+
+RDEPEND="
+   ${CDEPEND}
+   >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+   >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+   >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+   >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+   

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

2015-10-06 Thread Matt Thode
commit: dbc8760506b432521dcd1ba8bb2b25a2ee580869
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Oct  7 04:15:02 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Oct  7 04:15:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc87605

dev-python/pycadf: bup

Package-Manager: portage-2.2.20.1

 dev-python/pycadf/Manifest|  1 +
 dev-python/pycadf/pycadf-1.1.0.ebuild | 61 +++
 2 files changed, 62 insertions(+)

diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index d2b6570..4c6cecf 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,3 +1,4 @@
 DIST pycadf-0.6.0.tar.gz 277434 SHA256 
9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f SHA512 
97e223296e5cf77bbc2f7f8b2caba70f76d418ccd476bbc07462dac2c01399f920ae7801f1e30ef91ac6dbfe340b8b45dff2426bf457c1239f54293dbadeef61
 WHIRLPOOL 
96644ae4b82352cd0a296f3a9adf161b8500d043d8d2bce239c23473a53e1a2feb43f60d92c67bf1543b3b101bbf722bf9104b2c6b16fa7240b94e86cc6a2aa1
 DIST pycadf-0.8.0.tar.gz 255774 SHA256 
240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 
3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7
 WHIRLPOOL 
bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
 DIST pycadf-1.0.0.tar.gz 247178 SHA256 
8278865dba0c6d7d2c83f51629c0f215393e8cbc36719c845b591f40dd80609f SHA512 
7f7a4bb1d89ee3a63c9c74980995864b6e80a4e7df2111b4bafb42ba977ab2b86aac5e288d930068789cae9cabee13300ede7ae3c520440cc5fdfdac057085c0
 WHIRLPOOL 
68eab74a8e7a727d178dfdaa7cef27d0a41538540c450446a768775de61854eb82ca070792e694bad422ccacfae894b73226ab9224d82f742fdcd037ebd2c725
+DIST pycadf-1.1.0.tar.gz 248161 SHA256 
af114ba08d535ad9600e961c1048e1c7214c669a7ee3611f46ea06b917b46953 SHA512 
f3215fda9c76422ffdaa65d11c65c3835562539f61f02c91e167433c8e65a55b81290792ae827a8b4e7c497878322b802e42c58a3cf11682e2a72002c8cf
 WHIRLPOOL 
d75adc656d344a667ff1b5d3063f300be8fe57d9e5fd32b86bfa242d132e3ee587f72aa4d1eb104c468c71005e3b9825581c145dc7c8b64b7c701274016004da

diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild 
b/dev-python/pycadf/pycadf-1.1.0.ebuild
new file mode 100644
index 000..bee046c
--- /dev/null
+++ b/dev-python/pycadf/pycadf-1.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/pbr[${PYTHON_USEDEP}]
+   test? (
+   >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+   >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+   >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+   >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+   >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+   >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+   >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+   =dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+   >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+   

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

2015-10-06 Thread Matt Thode
commit: e0703645c0310f192066a9a58c5e2ccb3188d595
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Oct  7 04:21:57 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Oct  7 04:21:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0703645

dev-python/python-keystoneclient: bup for liberty

Package-Manager: portage-2.2.20.1

 dev-python/python-keystoneclient/Manifest   | 2 +-
 ...ystoneclient-1.7.1.ebuild => python-keystoneclient-1.7.2.ebuild} | 6 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-python/python-keystoneclient/Manifest 
b/dev-python/python-keystoneclient/Manifest
index c6dd85e..de943c7 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-keystoneclient-1.3.1.tar.gz 338187 SHA256 
8a421dbdf01251119164bf6baa0ef78b261e5dd4d3508748e47b77d7652e7e92 SHA512 
d11825b717d0aeec67d4dfb0382173ee834fe3dea2097b8ff9505b86bb08a5579d6fe87509d65022d4436a3a1b4d20f2a877ece3160b5397495b77df0f08
 WHIRLPOOL 
9aa0af722f56eb4d98d7efb8a35b1db95207970fba0b32496a9ae4593a16471f976efe1e9bb3690106ec0f5a76b5a744e9177cc7c03d9ffe9ed54111e3bb138c
 DIST python-keystoneclient-1.3.2.tar.gz 342434 SHA256 
1b2fd5ceeefd8d75ee749acd2c3dd8805c833c89828075b814392069cd5ae1eb SHA512 
4cd986c42256fbc366b81c07ab637fe81358dde530a8e9a5b3f59f4deef5d56fb1799fc82d35a3f04d3e3b810c94bfc21235e93a77c925d235322aeaa20e420c
 WHIRLPOOL 
65b776c928126f92108c1585658a10b89e6563ff8e71f8f249fdb86e11b29811de12b17b39845d66ff9533ae44d93148bd811d1e31577092c3b598348c03
-DIST python-keystoneclient-1.7.1.tar.gz 354799 SHA256 
8457fb65cc88ce009bf757643a27ac00fd5805c7f42d56743d1b6dfc26861e79 SHA512 
f70d2055ff0b2d30ffe8d45bcc3218170c38b681993c984d3165427acadbe1101288e4fe863fb29e4541c33c00784bed880ed739049de0412725ccdd9afa657b
 WHIRLPOOL 
20135eb7bd7bc6346fb7635c47080f06c00afd781c8cfa8710f7ff163f622edee1c1506f6a06ed3628446748f4fd6f67e74b7dd4b52381cc8a6aa03ba1811fcd
+DIST python-keystoneclient-1.7.2.tar.gz 356107 SHA256 
d862183e0e53e7d0696a71ad9b6a9ff9f96b7f445564357de722604ca14fd6d2 SHA512 
9a3f3205549f54dea73dc499d65613816f10fc2b5773734b6762db95965ef7192e3ca052748a3258925a5e120ccc6ed8d55b8860dfae94c6503d38b871039942
 WHIRLPOOL 
cf0e0a9e1344cdbafea479be99aa25c40c0a32ccbfa05533aa957fe5003316d940c859caa74c4b9fa0495661d472913af48c666489ae392ad547e5ceb4cc5501

diff --git 
a/dev-python/python-keystoneclient/python-keystoneclient-1.7.1.ebuild 
b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2.ebuild
similarity index 94%
rename from dev-python/python-keystoneclient/python-keystoneclient-1.7.1.ebuild
rename to dev-python/python-keystoneclient/python-keystoneclient-1.7.2.ebuild
index d695353..29dfb25 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.7.2.ebuild
@@ -20,8 +20,7 @@ IUSE="doc examples test"
 #doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
 
 CDEPEND="
-   >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-   =dev-python/pbr-1.6[${PYTHON_USEDEP}]"
 TCDEPEND="
>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
>=dev-python/mock-1.2[${PYTHON_USEDEP}]
@@ -41,7 +40,6 @@ DEPEND="
>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-   >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
)
@@ -58,7 +56,7 @@ RDEPEND="
${CDEPEND}
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-   >=dev-python/debtcollector-0.3.0
+   >=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]



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

2015-10-06 Thread Michael Sterrett
commit: fab1531be3c5fb51d0058c3b382000d13c3fc985
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Oct  6 18:47:54 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Oct  6 18:48:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab1531b

fix tests with patch from Dustin Polke (bug #527270)

Package-Manager: portage-2.2.20.1

 media-libs/devil/devil-1.7.8-r2.ebuild|  2 +-
 media-libs/devil/files/devil-1.7.8-fix-test.patch | 10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild 
b/media-libs/devil/devil-1.7.8-r2.ebuild
index c20974c..43a592e 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
X? ( x11-proto/xextproto )"
 
 src_prepare() {
-   epatch 
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch
+   epatch 
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch
eautoreconf
 }
 

diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch 
b/media-libs/devil/files/devil-1.7.8-fix-test.patch
new file mode 100644
index 000..44af2fc
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch
@@ -0,0 +1,10 @@
+--- a/devil-1.7.8/test/Makefile.am
 b/devil-1.7.8/test/Makefile.am
+@@ -12,5 +12,6 @@ else
+ testil_LDADD += ../lib/libIL.la
+ endif
+ 
+-TESTS_ENVIRONMENT = /bin/bash
++TESTS_ENVIRONMENT =
+ TESTS = $(check_SCRIPTS)
++LOG_COMPILER = $(SHELL)



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

2015-10-06 Thread Mike Frysinger
commit: 75d1b6b8d2c1c28fb4914d33b7643e8e86940efa
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 17:15:18 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 17:15:18 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=75d1b6b8

lint: use comments for comments, not inline docstrings

It's uncommon to dump docstrings in the middle of code in the place of
comments.  Convert them all to standard comments.

 catalyst/base/stagebase.py   | 219 ++-
 catalyst/fileops.py  |   8 +-
 catalyst/targets/snapshot.py |   8 +-
 3 files changed, 99 insertions(+), 136 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index fcdf729..813e5f1 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -49,29 +49,27 @@ class StageBase(TargetBase, ClearBase, GenBase):
GenBase.__init__(self, myspec)
ClearBase.__init__(self, myspec)
 
-   """
-   The semantics of subarchmap and machinemap changed a bit in 
2.0.3 to
-   work better with vapier's CBUILD stuff. I've removed the 
"monolithic"
-   machinemap from this file and split up its contents amongst the
-   various arch/foo.py files.
-
-   When register() is called on each module in the arch/ dir, it 
now
-   returns a tuple instead of acting on the subarchmap dict that is
-   passed to it. The tuple contains the values that were previously
-   added to subarchmap as well as a new list of CHOSTs that go 
along
-   with that arch. This allows us to build machinemap on the fly 
based
-   on the keys in subarchmap and the values of the 2nd list 
returned
-   (tmpmachinemap).
-
-   Also, after talking with vapier. I have a slightly better idea 
of what
-   certain variables are used for and what they should be set to. 
Neither
-   'buildarch' or 'hostarch' are used directly, so their value 
doesn't
-   really matter. They are just compared to determine if we are
-   cross-compiling. Because of this, they are just set to the name 
of the
-   module in arch/ that the subarch is part of to make things 
simpler.
-   The entire build process is still based off of 'subarch' like 
it was
-   previously. -agaffney
-   """
+   # The semantics of subarchmap and machinemap changed a bit in 
2.0.3 to
+   # work better with vapier's CBUILD stuff. I've removed the 
"monolithic"
+   # machinemap from this file and split up its contents amongst 
the
+   # various arch/foo.py files.
+   #
+   # When register() is called on each module in the arch/ dir, it 
now
+   # returns a tuple instead of acting on the subarchmap dict that 
is
+   # passed to it. The tuple contains the values that were 
previously
+   # added to subarchmap as well as a new list of CHOSTs that go 
along
+   # with that arch. This allows us to build machinemap on the fly 
based
+   # on the keys in subarchmap and the values of the 2nd list 
returned
+   # (tmpmachinemap).
+   #
+   # Also, after talking with vapier. I have a slightly better 
idea of what
+   # certain variables are used for and what they should be set 
to. Neither
+   # 'buildarch' or 'hostarch' are used directly, so their value 
doesn't
+   # really matter. They are just compared to determine if we are
+   # cross-compiling. Because of this, they are just set to the 
name of the
+   # module in arch/ that the subarch is part of to make things 
simpler.
+   # The entire build process is still based off of 'subarch' like 
it was
+   # previously. -agaffney
 
self.makeconf = {}
self.archmap = {}
@@ -81,16 +79,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
for x in [x[:-3] for x in os.listdir(arch_dir) if 
x.endswith(".py") and x != "__init__.py"]:
try:
fh=open(arch_dir + x + ".py")
-   """
-   This next line loads the plugin as a module and 
assigns it to
-   archmap[x]
-   """
+   # This next line loads the plugin as a module 
and assigns it to
+   # archmap[x]
self.archmap[x]=imp.load_module(x,fh, arch_dir 
+ x + ".py",
(".py", "r", imp.PY_SOURCE))
-   """
-   This next line 

[gentoo-commits] proj/catalyst:master commit in: /, bin/

2015-10-06 Thread Mike Frysinger
commit: cdfa003b267c02828291c0228d33ea845cb79946
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 03:19:43 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 18:03:15 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cdfa003b

pylint: add a helper for linting code

A bunch of warnings are left disabled because there's too many violations
in the current code base.  Hopefully we can get to a point where everyone
uses this though and we can start enabling more and more.

The code base is "clean" right now in the sense that running pylint will
not produce any output.  But we should start removing violations one by
one and re-enable the warning class as we go.

 .pylintrc  | 249 +
 bin/pylint |  31 
 2 files changed, 280 insertions(+)

diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 000..b3327cf
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,249 @@
+[MASTER]
+
+# Profiled execution.
+profile=no
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once).
+# We should clean up things so we can enable:
+# missing-docstring -- add lots of docstrings everywhere!
+# bad-whitespace -- fix spacing everywhere
+# bad-continuation -- might be hard with tab indentation policy
+# invalid-name -- need to manage constants better
+# line-too-long -- figure out a length and stick to it
+# unidiomatic-typecheck -- convert to isinstance
+# redefined-outer-name -- clean up code to not do this
+# super-init-not-called -- fix the classes __init__ structure
+# no-init -- update classes w/missing __init__ functions
+disable=missing-docstring, too-many-lines, too-many-branches, 
too-many-statements, too-few-public-methods, too-many-instance-attributes, 
too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, 
locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, 
invalid-name, line-too-long, unidiomatic-typecheck, redefined-outer-name, 
super-init-not-called, no-init
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html
+output-format=text
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / 
statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='\t'
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject,twisted.internet.reactor,hashlib,google.appengine.api.memcache
+
+# When zope mode 

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

2015-10-06 Thread Bjarke Istrup Pedersen
commit: 9005bd441b11fca521960e2a815c55f1520ec2c5
Author: Bjarke Istrup Pedersen  gentoo  org>
AuthorDate: Tue Oct  6 18:17:23 2015 +
Commit: Bjarke Istrup Pedersen  gentoo  org>
CommitDate: Tue Oct  6 18:18:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9005bd44

net-wireles/hostapd: Bumping to 2.5

Package-Manager: portage-2.2.22

 net-wireless/hostapd/Manifest   |   1 +
 net-wireless/hostapd/hostapd-2.5.ebuild | 210 
 2 files changed, 211 insertions(+)

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f9a5061..530780e 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1 +1,2 @@
 DIST hostapd-2.4.tar.gz 1658872 SHA256 
6fe0eb6bd1c9cbd24952ece8586b6f7bd14ab358edfda99794e79b9b9dbd657f SHA512 
37e648fe9cce92923ab1d1e23a4267e274c988785d7be5610f1affca425ffa86b438de81e37446926a0f9158d6b67ee83e6396c3f81d571545c973dddbf1ffe3
 WHIRLPOOL 
78484c7e09725ba967c8815c3d8b0ffcc0c56daaec4acc79bc15c7392084c8642a2b41156b2c6a6360badb7e9d23792699d452fe600b56e3d62dd569188b6c2c
+DIST hostapd-2.5.tar.gz 1720783 SHA256 
8e272d954dc0d7026c264b79b15389ec2b2c555b32970de39f506b9f463ec74a SHA512 
bbb0547c29f4925aff8639cae3291ed020c2a9d989dd267be831b2418880916d2ec69003e36ecc796c348476086397cca8f63c52633f91c11a9c2ab72e1c83c0
 WHIRLPOOL 
a2c07e8426796a82cd01dbd4fff22c065c93dff8ea25ccce9b37d78a732941750947e934acfdac8f63841d322636271e976c43aabe419c916e405264ecd4b06a

diff --git a/net-wireless/hostapd/hostapd-2.5.ebuild 
b/net-wireless/hostapd/hostapd-2.5.ebuild
new file mode 100644
index 000..8366085
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs eutils systemd
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi;
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz;
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
+
+DEPEND="ssl? ( dev-libs/openssl[-bindist] )
+   kernel_linux? (
+   dev-libs/libnl:3
+   crda? ( net-wireless/crda )
+   )
+   netlink? ( net-libs/libnfnetlink )
+   sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+src_prepare() {
+   sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+   "${S}/hostapd.conf" || die
+}
+
+src_configure() {
+   local CONFIG="${S}/.config"
+
+   # toolchain setup
+   echo "CC = $(tc-getCC)" > ${CONFIG}
+
+   # EAP authentication methods
+   echo "CONFIG_EAP=y" >> ${CONFIG}
+   echo "CONFIG_ERP=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+   if use ssl; then
+   # SSL authentication methods
+   echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+   echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+   echo "CONFIG_TLSV11=y" >> ${CONFIG}
+   echo "CONFIG_TLSV12=y" >> ${CONFIG}
+   fi
+
+   if use wps; then
+   # Enable Wi-Fi Protected Setup
+   echo "CONFIG_WPS=y" >> ${CONFIG}
+   echo "CONFIG_WPS2=y" >> ${CONFIG}
+   echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+   echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+   einfo "Enabling Wi-Fi Protected Setup support"
+   fi
+
+   echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+   echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+   echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+   echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+   echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+   echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+   echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+
+   einfo "Enabling drivers: "
+
+   # drivers
+   echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+   einfo "  HostAP driver enabled"
+   echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+   einfo "  Wired driver enabled"
+   echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+   einfo "  Prism54 driver enabled"
+   echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+   einfo "  None driver enabled"
+
+   einfo "  nl80211 driver enabled"
+   echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+   # epoll
+   echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+   # misc
+   echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+   echo "CONFIG_PKCS12=y" >> ${CONFIG}
+   

[gentoo-commits] proj/tinderbox-cluster:master commit in: pym/tbc/

2015-10-06 Thread Magnus Granberg
commit: 6698f841f9f77bad00a963ae61bf0625d5ce35c3
Author: Magnus Granberg  gentoo  org>
AuthorDate: Tue Oct  6 19:31:35 2015 +
Commit: Magnus Granberg  gentoo  org>
CommitDate: Tue Oct  6 19:31:35 2015 +
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=6698f841

add more repoman fixes

 pym/tbc/package.py  | 2 +-
 pym/tbc/qachecks.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/tbc/package.py b/pym/tbc/package.py
index ef9b453..091f75f 100644
--- a/pym/tbc/package.py
+++ b/pym/tbc/package.py
@@ -109,7 +109,7 @@ class tbc_package(object):
add_logs(self._session, log_msg, "info", 
self._config_id)
git_commit = '0'
else:
-   git_commit = self.get_git_log_ebuild(repodir, 
ebuild_file):
+   git_commit = self.get_git_log_ebuild(repodir, 
ebuild_file)
 
# Get the ebuild metadata
ebuild_version_metadata_tree = self.get_ebuild_metadata(cpv, 
repo)

diff --git a/pym/tbc/qachecks.py b/pym/tbc/qachecks.py
index 67b1448..451f315 100644
--- a/pym/tbc/qachecks.py
+++ b/pym/tbc/qachecks.py
@@ -14,7 +14,7 @@ from portage import os, _encodings, _unicode_decode, 
_unicode_encode
 from portage.exception import DigestException, FileNotFound, ParseError, 
PermissionDenied
 from _emerge.Package import Package
 from _emerge.RootConfig import RootConfig
-from tbc.repoman.checks.ebuilds.checks import run_checks
+from repoman.checks.ebuilds.checks import run_checks
 from tbc.repoman.main import repoman_main
 from tbc.sqlquerys import get_configmetadata_info, get_config_info, 
get_setup_info
 import portage



[gentoo-commits] repo/gentoo:master commit in: games-engines/love/files/

2015-10-06 Thread Michael Sterrett
commit: 606ebaaccb4571ff3822e4f919490072c2274183
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Oct  6 17:52:59 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Oct  6 17:53:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606ebaac

update freetype patch to deal with the change from 2.6 to 2.6.1 from 
Polynomial-C via bug #562398

Package-Manager: portage-2.2.20.1

 .../love/files/love-0.8.0-freetype2.patch  | 48 --
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/games-engines/love/files/love-0.8.0-freetype2.patch 
b/games-engines/love/files/love-0.8.0-freetype2.patch
index 64e42c5..07c655c 100644
--- a/games-engines/love/files/love-0.8.0-freetype2.patch
+++ b/games-engines/love/files/love-0.8.0-freetype2.patch
@@ -1,48 +1,34 @@
 src/modules/font/freetype/TrueTypeRasterizer.h.old 2015-01-07 
09:49:39.394000727 +0100
-+++ src/modules/font/freetype/TrueTypeRasterizer.h 2015-01-07 
09:50:28.846065847 +0100
-@@ -27,10 +27,10 @@
- 
- // TrueType2
+--- love-0.8.0/src/modules/font/freetype/Font.h
 love-0.8.0/src/modules/font/freetype/Font.h
+@@ -30,10 +30,10 @@
+ #else
  #include 
+ #endif
 -#include 
 -#include 
 -#include 
 -#include 
-+#include 
-+#include 
-+#include 
-+#include 
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
  
  namespace love
  {
-@@ -67,4 +67,4 @@
- } // font
- } // love
+--- love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
 love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
+@@ -27,10 +27,10 @@
  
--#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
-\ No newline at end of file
-+#endif // LOVE_FONT_FREETYPE_TRUE_TYPE_RASTERIZER_H
 src/modules/font/freetype/Font.h.old   2015-01-07 09:49:20.421359400 
+0100
-+++ src/modules/font/freetype/Font.h   2015-01-07 09:50:02.076571918 +0100
-@@ -30,10 +30,10 @@
- #else
+ // TrueType2
  #include 
- #endif
 -#include 
 -#include 
 -#include 
 -#include 
-+#include 
-+#include 
-+#include 
-+#include 
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
  
  namespace love
  {
-@@ -73,4 +73,4 @@
- } // font
- } // love
- 
--#endif // LOVE_FONT_FREETYPE_FONT_H
-\ No newline at end of file
-+#endif // LOVE_FONT_FREETYPE_FONT_H



[gentoo-commits] proj/openrc:master commit in: init.d/

2015-10-06 Thread William Hubbs
commit: 17ef205bc63a4e231dccee719394a7a8563f8c3f
Author: William Hubbs  gmail  com>
AuthorDate: Tue Oct  6 18:31:43 2015 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  6 18:31:43 2015 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=17ef205b

sysfs: use printf instead of echo to write to cgroup files

This is needed for compatibility with musl and printf is also posix.

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

 init.d/sysfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 5641abe..f0bb313 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -116,7 +116,7 @@ mount_cgroups()
mount -n -t cgroup \
-o 
none,${sysfs_opts},name=openrc,release_agent="$agent" \
openrc /sys/fs/cgroup/openrc
-   echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+   printf 1 > /sys/fs/cgroup/openrc/notify_on_release
fi
 
yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0



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

2015-10-06 Thread Lars Wendler
commit: cbba5ceebf555ead79fe3c9be71135038756d5bf
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct  6 07:29:58 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct  6 07:30:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbba5cee

dev-vcs/git: Removed old.

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/git/git-2.6.0.ebuild | 640 ---
 1 file changed, 640 deletions(-)

diff --git a/dev-vcs/git/git-2.6.0.ebuild b/dev-vcs/git/git-2.6.0.ebuild
deleted file mode 100644
index c38a8ea..000
--- a/dev-vcs/git/git-2.6.0.ebuild
+++ /dev/null
@@ -1,640 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == * ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 
python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system 
heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/;
-if [[ ${PV} != * ]]; then
-   SRC_URI_SUFFIX="xz"
-   SRC_URI_GOOG="https://git-core.googlecode.com/files;
-   SRC_URI_KORG="mirror://kernel/software/scm/git"
-   SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-   ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-   
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-   
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-   doc? (
-   
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-   
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-   )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv 
libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd 
cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   sys-libs/zlib
-   pcre? ( dev-libs/libpcre )
-   perl? ( dev-lang/perl:=[-build(-)] )
-   tk? ( dev-lang/tk:0= )
-   curl? (
-   net-misc/curl
-   webdav? ( dev-libs/expat )
-   )
-   emacs? ( virtual/emacs )
-   gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-   gpg? ( app-crypt/gnupg )
-   mediawiki? (
-   dev-perl/HTML-Tree
-   dev-perl/MediaWiki-API
-   )
-   perl? ( dev-perl/Error
-   dev-perl/Net-SMTP-SSL
-   dev-perl/Authen-SASL
-   cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-   cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI 
dev-perl/DBD-SQLite )
-   subversion? ( dev-vcs/subversion[-dso,perl] 
dev-perl/libwww-perl dev-perl/TermReadKey )
-   )
-   python? ( gtk?
-   (
-   >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-   >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-   )
-   ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)-> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi --(makeinfo)-> .info
-DEPEND="${CDEPEND}
-   doc? (
-   app-text/asciidoc
-   app-text/docbook2X
-   sys-apps/texinfo
-   app-text/xmlto
-   )
-   nls? ( sys-devel/gettext )
-   test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == * ]]; then
-   DEPEND="${DEPEND}
-   app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-   cgi? ( perl )
-   cvs? ( perl )
-   mediawiki? ( perl )
-   subversion? ( perl )
-   webdav? ( curl )
-   gtk? ( python )
-   python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-   if use subversion && has_version "dev-vcs/subversion[dso]"; then
-   ewarn "Per Gentoo bugs #223747, #238586, when subversion is 
built"
-   ewarn "with USE=dso, 

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

2015-10-06 Thread Lars Wendler
commit: 26a12c9ac600ca30fda05f4ea1f7241c634aea73
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct  6 07:27:57 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct  6 07:30:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a12c9a

dev-vcs/git: Bump to version 2.6.1

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/git/Manifest |   3 +
 dev-vcs/git/git-2.6.1.ebuild | 642 +++
 2 files changed, 645 insertions(+)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index affb401..b393aa2 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -9,6 +9,7 @@ DIST git-2.4.6.tar.xz 3690432 SHA256 
bdd944571c03474517b6c9941d6f1fd735eccbb164e
 DIST git-2.4.9.tar.xz 3692824 SHA256 
0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 
d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82
 WHIRLPOOL 
a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
 DIST git-2.5.3.tar.xz 3745096 SHA256 
124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a SHA512 
ab73d67f76ec8a6350995c692eefa7ab60ae13590d5d7c2fbd3ec1105a8d435ec1b156106fd6c3d6b51080a27f3ebd66bbf0a85042b697bc835143d9f625474e
 WHIRLPOOL 
e0c0fde0b263fd4847c21353ec81449baf6f1d5631aed4fdaa41dab2665159b528d7c477dacaef4efb2786ecaf3c0bd44ef3a589765543eee9726e70c5207d66
 DIST git-2.6.0.tar.xz 3808872 SHA256 
211beb96ff41a83727e39704431ac388ecb1cebb5219cda067999bce4e1e15a6 SHA512 
efcde5fa3ac56d577e25259e74f19026438ccfb79429eec2f141bb2a63bb83e73f65b1ea96bcc1f9f894fb90ec1b5ea81b9f0c1806d25352f6b266e7202a
 WHIRLPOOL 
de703ba5d4024a6205bb795330b1ed06c70b01fad311739c59d837e7b2c7cad27bfbcd7cae0ac18378a8baa9d0fc0a5341665c312d7749cbb488b14456745ad1
+DIST git-2.6.1.tar.xz 3811268 SHA256 
fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd SHA512 
55516aeaa73baf180135a0812bfcb35e26699db034688049a11b4ec98faa6c23582e78a1a72a87332116bb88a2d7e9565ccc7891de883b82ad7524ee2809a25e
 WHIRLPOOL 
d25217692cd428fa1d436fa16e8b7d8996377fe4af1a0b4ea29faf8ed85115c7a3fcfe359949ebfbfdac1630f5af43cb894d26d31f7e0984dfab422d6651a2ae
 DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 
7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 
c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36
 WHIRLPOOL 
7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
 DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 
4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 
2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b
 WHIRLPOOL 
edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
 DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 
90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 
e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3
 WHIRLPOOL 
35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
@@ -20,6 +21,7 @@ DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 
5213e8b882293ec3cda247dabbc75c6ee52
 DIST git-htmldocs-2.4.9.tar.xz 995724 SHA256 
6000eb00fee2adc4d5a8fd8ace857049e6fb623aa7ec9087d983c29953319cd6 SHA512 
42905ae5383e5f0444ec868a1d742bada31cf25eac582b95ab6e6334a3dfefd05d2e08a1c2f7c0354a841703cbac2c6dc25437ca9f681a5bb0a121dc94d2d938
 WHIRLPOOL 
9791ab122cf680f060d274c6a7bcdd1aaf0660f83ed4e91073fed1dd2f2b16e96e938fcbf04e03373768b8036e3f8dd0be54639f8d24bce59501c970e4225d73
 DIST git-htmldocs-2.5.3.tar.xz 1009248 SHA256 
f87465b5f6d01ceccb314b3e0a3749d642bea1007b0bc78afba868d75413d85e SHA512 
7e5bcb85c270c740aa619d3cedd81e4f9bab989a8785512faab70cbd5029c021972b0574083272bed85324bf9372bf52f7b52827030133e09618731bf927f36f
 WHIRLPOOL 
f17c063c5b6e2a3cb7d25810b26f909bd09e281963e56029290c754b8f38bf7dba446405e96e4c49244db0bb60176b34852ac3f9a5b1d61c886eb90c2391efd8
 DIST git-htmldocs-2.6.0.tar.xz 1016192 SHA256 
0ba5d5d630e3235b74bcfb4ea2e9bbda8a3e619aaaf9e1f56e12dec5d8dc1d87 SHA512 
11d17ee8fe6537efba323887ccb64fe9c905b293d3d06f4c0f0b3da4283a7ac5b5bf840055bb9f96d28121aecce074d86feebaa2a407291ec812246308aefa1e
 WHIRLPOOL 
7e08864790a3e5c584e85acd6aca15bfddea846df9ca423c2dfe1332da2283b8fb9ee462639733f35e4842d27a895b59db0e29e3e4636d525131b47c2851b139
+DIST git-htmldocs-2.6.1.tar.xz 1016516 SHA256 
791487ebd5a25456d41d8825ef450fdf3214898a328028d01acdb21a668052da SHA512 

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/

2015-10-06 Thread Jeroen Roovers
commit: 7ae80b28607aae06e5d24725d068734462f6c16f
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Oct  6 06:18:40 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Oct  6 06:18:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae80b28

dev-db/mysql-connector-c++: Stable for PPC64 (bug #561316).

Package-Manager: portage-2.2.22
RepoMan-Options: --ignore-arches

 dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
index 7d2d763..3d90b40 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86"
 IUSE="debug examples gcov static-libs"
 
 DEPEND="virtual/libmysqlclient:=



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

2015-10-06 Thread Patrice Clement
commit: 9ee5e6d08e73badc50769cd8ec3ade5066ef344f
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 19:49:00 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 19:49:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee5e6d0

x11-wm/page: Reorder RDEPEND.

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

 x11-wm/page/page-1.9.6-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x11-wm/page/page-1.9.6-r1.ebuild b/x11-wm/page/page-1.9.6-r1.ebuild
index ca5672c..a2341d8 100644
--- a/x11-wm/page/page-1.9.6-r1.ebuild
+++ b/x11-wm/page/page-1.9.6-r1.ebuild
@@ -32,5 +32,4 @@ DEPEND="x11-proto/xcb-proto
x11-libs/pango
dev-libs/glib"
 
-RDEPEND="${DEPEND}
-   !dev-tcltk/tcllib"
+RDEPEND="!dev-tcltk/tcllib"



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

2015-10-06 Thread Patrice Clement
commit: 7587849aecd2d54f926ddb17fb773afa0410cada
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 19:45:47 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 19:49:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7587849a

x11-wm/page: Add xcb USE flag to cairo dependency. Set a blocker on 
dev-tcltk/tcllib. Fixes bug 560870.

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

 x11-wm/page/page-1.9.6-r1.ebuild | 36 
 1 file changed, 36 insertions(+)

diff --git a/x11-wm/page/page-1.9.6-r1.ebuild b/x11-wm/page/page-1.9.6-r1.ebuild
new file mode 100644
index 000..ca5672c
--- /dev/null
+++ b/x11-wm/page/page-1.9.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A mouse friendly tiling window manager"
+HOMEPAGE="http://www.hzog.net/index.php/Main_Page;
+SRC_URI="http://www.hzog.net/pub/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-proto/xcb-proto
+   x11-libs/libxcb
+   x11-libs/xcb-util
+   x11-libs/libXfixes
+   x11-libs/libXdamage
+   x11-proto/damageproto
+   x11-proto/randrproto
+   x11-libs/libXrandr
+   x11-proto/xproto
+   x11-proto/fixesproto
+   x11-proto/compositeproto
+   x11-libs/libXcomposite
+   x11-proto/renderproto
+   x11-libs/libXrender
+   x11-libs/libXext
+   x11-proto/xextproto
+   x11-libs/cairo[xcb]
+   x11-libs/pango
+   dev-libs/glib"
+
+RDEPEND="${DEPEND}
+   !dev-tcltk/tcllib"



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

2015-10-06 Thread Davide Pesavento
commit: 8c3a9153efdc4fb86b0d7267665c7d64632e7220
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Oct  6 19:46:51 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Oct  6 19:46:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3a9153

profiles: unmask Qt >= 4.8.6 on amd64-fbsd

dev-qt/qtchooser has finally been keyworded.

Signed-off-by: Davide Pesavento  gentoo.org>

 profiles/arch/amd64-fbsd/package.mask | 31 ---
 1 file changed, 31 deletions(-)

diff --git a/profiles/arch/amd64-fbsd/package.mask 
b/profiles/arch/amd64-fbsd/package.mask
deleted file mode 100644
index 5264156..000
--- a/profiles/arch/amd64-fbsd/package.mask
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Davide Pesavento  (20 Nov 2014)
-# Qt4 multilib ebuilds, masked until dev-qt/qtchooser
-# gets keyworded. See bug 529196.
->=dev-qt/assistant-4.8.6:4
->=dev-qt/designer-4.8.6:4
->=dev-qt/linguist-4.8.6:4
->=dev-qt/pixeltool-4.8.6:4
->=dev-qt/qdbusviewer-4.8.6:4
->=dev-qt/qt3support-4.8.6:4
->=dev-qt/qtbearer-4.8.6:4
->=dev-qt/qtcore-4.8.6:4
->=dev-qt/qtdbus-4.8.6:4
->=dev-qt/qtdeclarative-4.8.6:4
->=dev-qt/qtdemo-4.8.6:4
->=dev-qt/qtgui-4.8.6:4
->=dev-qt/qthelp-4.8.6:4
->=dev-qt/qtmultimedia-4.8.6:4
->=dev-qt/qtopengl-4.8.6:4
->=dev-qt/qtopenvg-4.8.6:4
->=dev-qt/qtphonon-4.8.6:4
->=dev-qt/qtscript-4.8.6:4
->=dev-qt/qtsql-4.8.6:4
->=dev-qt/qtsvg-4.8.6:4
->=dev-qt/qttest-4.8.6:4
->=dev-qt/qttranslations-4.8.6:4
->=dev-qt/qtwebkit-4.8.6:4
->=dev-qt/qtxmlpatterns-4.8.6:4



[gentoo-commits] proj/catalyst:pending commit in: /

2015-10-06 Thread Brian Dolbec
commit: 1fa12cdb9660d098172b30d955f807d5047adee6
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep 23 17:54:51 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep 23 17:54:51 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1fa12cdb

Merge branch 'master' of git+ssh://git.gentoo.org/proj/catalyst

 catalyst/arch/powerpc.py | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)



[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, bin/

2015-10-06 Thread Brian Dolbec
commit: 2dac8da1679121bf992574d7fb5f8ed41c99c3c9
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue Sep  8 06:15:25 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Oct  6 19:52:39 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2dac8da1

Move the signal handler into the StageBase class so it can handle unbind() 
cleanup

Not quite complete, still errors on some unmounting

 bin/catalyst   | 19 ---
 catalyst/base/stagebase.py | 19 +++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/catalyst b/bin/catalyst
index 577e899..832399f 100755
--- a/bin/catalyst
+++ b/bin/catalyst
@@ -12,25 +12,6 @@ from __future__ import print_function
 
 import sys
 
-# This block ensures that ^C interrupts are handled quietly.
-try:
-   import signal
-
-   def exithandler(_signum, _frame):
-   signal.signal(signal.SIGINT, signal.SIG_IGN)
-   signal.signal(signal.SIGTERM, signal.SIG_IGN)
-   print()
-   sys.exit(1)
-
-   signal.signal(signal.SIGINT, exithandler)
-   signal.signal(signal.SIGTERM, exithandler)
-   signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
-except KeyboardInterrupt:
-   print()
-   sys.exit(1)
-
-
 from catalyst.main import main
 
 try:

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 813e5f1..90e8303 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -3,6 +3,7 @@ import os
 import imp
 import types
 import shutil
+import signal
 import sys
 from stat import ST_UID, ST_GID, ST_MODE
 
@@ -191,6 +192,17 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "portage_confdir" in self.settings:
file_locate(self.settings,["portage_confdir"],expand=0)
 
+
+   # This block ensures that ^C interrupts are handled quietly.
+   try:
+   signal.signal(signal.SIGINT, self.exithandler)
+   signal.signal(signal.SIGTERM, self.exithandler)
+   signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+   except KeyboardInterrupt:
+   print()
+   sys.exit(1)
+
# Setup our mount points.
# initialize our target mounts.
self.target_mounts = TARGET_MOUNT_DEFAULTS.copy()
@@ -265,6 +277,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
# save resources, it is not always needed
self.compressor = None
 
+   def exithandler(self, _signum, _frame):
+   signal.signal(signal.SIGINT, signal.SIG_IGN)
+   signal.signal(signal.SIGTERM, signal.SIG_IGN)
+   self.unbind()
+   print()
+   sys.exit(1)
+
def override_cbuild(self):
if "CBUILD" in self.makeconf:
self.settings["CBUILD"]=self.makeconf["CBUILD"]



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

2015-10-06 Thread Zac Medico
commit: 597987aac1677e132b80ed2404697acf0188af7a
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Oct  6 20:14:54 2015 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Oct  6 20:23:07 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=597987aa

apply_secpass_permissions: avoid accessing portage.data.secpass when possible

This fixes PermissionDenied errors triggered when portage config files
and repos have restricted access permissions.

Fixes: b7baeeec3ab6 ("unpack: use chmod-lite helper for bug 554084")

 pym/portage/util/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 2b7ff8d..b739257 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1241,7 +1241,9 @@ def apply_secpass_permissions(filename, uid=-1, gid=-1, 
mode=-1, mask=-1,
 
all_applied = True
 
-   if portage.data.secpass < 2:
+   # Avoid accessing portage.data.secpass when possible, since
+   # it triggers config loading (undesirable for chmod-lite).
+   if (uid != -1 or gid != -1) and portage.data.secpass < 2:
 
if uid != -1 and \
uid != stat_cached.st_uid:



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/pmacct/

2015-10-06 Thread Tony Vroon
commit: da4761e681ab258bc0b68c951785087b12141085
Author: Tony Vroon  gentoo  org>
AuthorDate: Tue Oct  6 20:55:50 2015 +
Commit: Tony Vroon  gentoo  org>
CommitDate: Tue Oct  6 20:55:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4761e6

net-analyzer/pmacct: Version bump to 20150925 snapshot which incorporates 
MongoDB client updates to address silent data loss issues on insert. Ebuild & 
patches by Russell Heilling from the LINX OTA team.

Package-Manager: portage-2.2.20.1

 net-analyzer/pmacct/Manifest   |  1 +
 .../pmacct/pmacct-1.5.3_pre20150925.ebuild | 72 ++
 2 files changed, 73 insertions(+)

diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 73544d3..7828db1 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,2 +1,3 @@
 DIST pmacct-1.5.1.tar.gz 874563 SHA256 
96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 
c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7
 WHIRLPOOL 
bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
 DIST pmacct-1.5.2.tar.gz 897530 SHA256 
c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 
3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b18590be0ead599
 WHIRLPOOL 
e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
+DIST pmacct-1.5.3_pre20150925.tar.gz 896168 SHA256 
ae63580ae879b3ce20e9725690b6337a72857376192dd2f610e0359ee9d4364c SHA512 
e6675855f403ee746b0243cce1ee0e28fd649d2b1c6c1e33f012d7858f977952ba6ed5d1ee47ce42a4f6950b139be2bc50a88740fd19c4775d61d1fb1aa6c05d
 WHIRLPOOL 
c7f5003754835f0e1883f13bfba740667ebcbef54a49cc8b8f6fcca1f2db2dea337c910417ff75d86dcfa6bc294fa9b44567bc0d5d07b79ffcfc9b11b1efad5d

diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild 
b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
new file mode 100644
index 000..2900099
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/;
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+
+RDEPEND="
+   net-libs/libpcap
+   geoip? ( dev-libs/geoip )
+   mongodb? (
+   >=dev-libs/mongo-c-driver-0.8.1-r1
+   

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

2015-10-06 Thread Mike Frysinger
commit: 4e7727f623dabdaaec4cc90ebaf767ec0050224f
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 20:59:13 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 20:59:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e7727f6

media-libs/freetype: add missing quoting to epatch call

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

diff --git a/media-libs/freetype/freetype-2.6.1.ebuild 
b/media-libs/freetype/freetype-2.6.1.ebuild
index 7635cb4..d971b51 100644
--- a/media-libs/freetype/freetype-2.6.1.ebuild
+++ b/media-libs/freetype/freetype-2.6.1.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
 
if use infinality; then
-   epatch ${WORKDIR}/${INFINALITY_PATCH}
+   epatch "${WORKDIR}/${INFINALITY_PATCH}"
 
# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in 
freetype-2.4.11
enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING



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

2015-10-06 Thread Marius Brehler
commit: 722cfa776f5ebeb3305f01ef794fcb7ce14b9293
Author: layman  localhost>
AuthorDate: Sat Sep 12 12:44:25 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sat Sep 12 12:44:25 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=722cfa77

Merge branch 'master' into symengine

 .travis.yml|   16 +-
 dev-libs/boost-compute/ChangeLog   |   17 +
 dev-libs/boost-compute/boost-compute-0.4-r1.ebuild |   28 +-
 dev-libs/boost-compute/boost-compute-.ebuild   |   17 +-
 dev-python/ipykernel/ChangeLog |   13 +
 dev-python/ipykernel/Manifest  |1 +
 dev-python/ipykernel/ipykernel-4.0.3.ebuild|1 +
 dev-python/ipykernel/ipykernel-.ebuild |   39 +
 .../{jupyter-nbgrader => ipykernel}/metadata.xml   |2 +-
 dev-python/ipyparallel/ChangeLog   |   28 +
 dev-python/ipyparallel/Manifest|2 +
 dev-python/ipyparallel/ipyparallel-4.0.0-r1.ebuild |1 +
 dev-python/ipyparallel/ipyparallel-4.0.2.ebuild|   62 +
 dev-python/ipyparallel/ipyparallel-.ebuild |   62 +
 .../{jupyter-nbgrader => ipyparallel}/metadata.xml |3 +-
 dev-python/ipython/ChangeLog   |   37 +
 dev-python/ipython/Manifest|1 +
 .../ipython/files/2.1.0-substitute-files.patch |   27 +
 dev-python/ipython/ipython-4.0.0-r1.ebuild |  132 +
 dev-python/ipython/metadata.xml|   51 +
 dev-python/ipython_genutils/ChangeLog  |   14 +
 dev-python/ipython_genutils/Manifest   |1 +
 .../ipython_genutils/ipython_genutils-0.1.0.ebuild |1 +
 .../ipython_genutils/ipython_genutils-.ebuild  |   34 +
 dev-python/ipython_genutils/metadata.xml   |   14 +
 dev-python/ipywidgets/ChangeLog|   16 +
 dev-python/ipywidgets/Manifest |1 +
 dev-python/ipywidgets/ipywidgets-4.0.2.ebuild  |1 +
 dev-python/ipywidgets/ipywidgets-.ebuild   |   40 +
 .../ipywidgets}/metadata.xml   |   12 +-
 dev-python/jupyter-nbgrader/ChangeLog  |9 -
 .../jupyter-nbgrader/jupyter-nbgrader-.ebuild  |   32 -
 dev-python/jupyter-nbviewer/ChangeLog  |9 -
 dev-python/jupyter/ChangeLog   |9 +
 dev-python/jupyter/Manifest|1 +
 dev-python/jupyter/jupyter-1.0.0.ebuild|   45 +
 dev-python/jupyter/metadata.xml|   12 +
 dev-python/jupyter_client/ChangeLog|   21 +
 dev-python/jupyter_client/Manifest |1 +
 .../jupyter_client/jupyter_client-4.0.0.ebuild |1 +
 .../jupyter_client/jupyter_client-.ebuild  |   41 +
 dev-python/jupyter_client/metadata.xml |   11 +
 dev-python/jupyter_console/ChangeLog   |   36 +
 dev-python/jupyter_console/Manifest|1 +
 .../jupyter_console/jupyter_console-4.0.2.ebuild   |1 +
 .../jupyter_console/jupyter_console-.ebuild|   60 +
 .../metadata.xml   |3 +-
 dev-python/jupyter_core/ChangeLog  |   29 +
 dev-python/jupyter_core/Manifest   |2 +
 .../files/jupyter_core-4.0.4-add-test-files.patch  |   50 +
 .../jupyter_core/jupyter_core-4.0.4-r1.ebuild  |   45 +
 dev-python/jupyter_core/jupyter_core-.ebuild   |   59 +
 .../metadata.xml   |4 +-
 dev-python/line_profiler/ChangeLog |   10 +
 dev-python/line_profiler/Manifest  |1 +
 dev-python/line_profiler/line_profiler-1.0.ebuild  |1 +
 dev-python/line_profiler/line_profiler-.ebuild |   35 +
 dev-python/line_profiler/metadata.xml  |   18 +
 dev-python/nbconvert/ChangeLog |   40 +
 dev-python/nbconvert/Manifest  |1 +
 .../files/nbconvert-4.0.0-docs-Makefile.patch  |   16 +
 .../nbconvert-4.0.0-pandoc-highlighting.patch  |   37 +
 .../{jupyter-nbgrader => nbconvert}/metadata.xml   |3 +-
 dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild |1 +
 dev-python/nbconvert/nbconvert-.ebuild |   81 +
 dev-python/nbformat/ChangeLog  |   19 +
 dev-python/nbformat/Manifest   |1 +
 dev-python/nbformat/metadata.xml   |   11 +
 dev-python/nbformat/nbformat-4.0.0.ebuild  |1 +
 dev-python/nbformat/nbformat-.ebuild   |   65 +
 dev-python/nbviewer/ChangeLog  |9 +
 .../{jupyter-nbviewer => nbviewer}/metadata.xml|0
 .../nbviewer-.ebuild}  |6 +-
 dev-python/notebook/ChangeLog  |   60 +
 dev-python/notebook/Manifest   |1 +
 .../{jupyter-nbgrader => notebook}/metadata.xml|3 +-
 

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

2015-10-06 Thread Marius Brehler
commit: b4a24dd14b20f259936f92533e26fba6efbb4fb6
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Oct  4 07:52:25 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sun Oct  4 07:52:25 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b4a24dd1

Merge pull request #466 from mschubert/symengine

sci-libs/symengine: add sympy-symengine

 sci-libs/symengine/ChangeLog   | 14 +
 sci-libs/symengine/Manifest|  1 +
 .../bx-python => sci-libs/symengine}/metadata.xml  |  8 +--
 sci-libs/symengine/symengine-0.1.0.ebuild  | 60 +
 sci-libs/symengine/symengine-.ebuild   | 61 ++
 5 files changed, 141 insertions(+), 3 deletions(-)



[gentoo-commits] proj/sci:master commit in: sci-libs/symengine/

2015-10-06 Thread Marius Brehler
commit: 02ddda07511f808136b170397def65f67e9c6cca
Author: layman  localhost>
AuthorDate: Mon Aug 24 19:57:42 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sat Aug 29 17:36:10 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=02ddda07

sci-libs/symengine: add sympy-symengine

Package-Manager: portage-2.2.20-prefix

 sci-libs/symengine/ChangeLog  | 10 +
 sci-libs/symengine/metadata.xml   | 15 
 sci-libs/symengine/symengine-0.1.0.ebuild | 61 ++
 sci-libs/symengine/symengine-.ebuild  | 63 +++
 4 files changed, 149 insertions(+)

diff --git a/sci-libs/symengine/ChangeLog b/sci-libs/symengine/ChangeLog
new file mode 100644
index 000..80d711f
--- /dev/null
+++ b/sci-libs/symengine/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-libs/symengine
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Id$
+
+*symengine-0.1.0 (24 Aug 2015)
+*symengine- (24 Aug 2015)
+
+  24 Aug 2015; Michael Schubert  +metadata.xml,
+  +symengine-0.1.0.ebuild, +symengine-.ebuild:
+  sci-libs/symengine: add sympy-symengine

diff --git a/sci-libs/symengine/metadata.xml b/sci-libs/symengine/metadata.xml
new file mode 100644
index 000..6d3c8af
--- /dev/null
+++ b/sci-libs/symengine/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  sci-mathematics
+  
+mschu@gmail.com
+Michael Schubert
+  
+  
+sympy/symengine
+  
+
+   Add support for boost 
(dev-libs/boost)
+
+

diff --git a/sci-libs/symengine/symengine-0.1.0.ebuild 
b/sci-libs/symengine/symengine-0.1.0.ebuild
new file mode 100644
index 000..cc464d1
--- /dev/null
+++ b/sci-libs/symengine/symengine-0.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Fast symbolic manipulation library, written in C++"
+HOMEPAGE="https://github.com/sympy/symengine;
+SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="boost openmp python threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   dev-libs/jemalloc
+   boost? ( dev-libs/boost )
+   python? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+   openmp? ( sys-cluster/openmpi )
+   python? (
+   dev-python/cython[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}] )"
+
+CMAKE_BUILD_TYPE=Release
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   if use openmp; then
+   if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current 
selected gcc"
+   die "need openmp capable gcc"
+   fi
+   fi
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_INSTALL_PREFIX:PATH="${EPREFIX}"/usr
+   $(cmake-utils_use_with boost)
+   $(cmake-utils_use_with openmp)
+   $(cmake-utils_use_with python)
+   )
+
+   if use threads; then
+   mycmakeargs+=(
+   -DWITH_TCMALLOC:BOOL=ON
+   -DWITH_PTHREAD:BOOL=ON
+   -DWITH_SYMENGINE_THREAD_SAFE:BOOL=ON
+   )
+   fi
+
+   cmake-utils_src_configure
+}

diff --git a/sci-libs/symengine/symengine-.ebuild 
b/sci-libs/symengine/symengine-.ebuild
new file mode 100644
index 000..2949716
--- /dev/null
+++ b/sci-libs/symengine/symengine-.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit git-r3 cmake-utils python-single-r1
+
+DESCRIPTION="Fast symbolic manipulation library, written in C++"
+HOMEPAGE="https://github.com/sympy/symengine;
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/sympy/symengine.git;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="boost openmp python threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   dev-libs/jemalloc
+   boost? ( dev-libs/boost )
+   python? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+   openmp? ( sys-cluster/openmpi )
+   python? (
+   dev-python/cython[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}] )"
+
+
+CMAKE_BUILD_TYPE=Release
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   if use openmp; then
+   if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+

[gentoo-commits] proj/sci:master commit in: sci-libs/symengine/

2015-10-06 Thread Marius Brehler
commit: 0b3f38a08d320d1d460ae9d2f93076c7ff1ec84c
Author: layman  localhost>
AuthorDate: Sat Sep 12 12:54:43 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sat Sep 12 21:34:29 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0b3f38a0

sci-libs/symengine: cleaning up syntax; remove openmpi dep

Package-Manager: portage-2.2.20-prefix

 sci-libs/symengine/symengine-0.1.0.ebuild | 11 ---
 sci-libs/symengine/symengine-.ebuild  | 12 
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/sci-libs/symengine/symengine-0.1.0.ebuild 
b/sci-libs/symengine/symengine-0.1.0.ebuild
index cc464d1..8f549ee 100644
--- a/sci-libs/symengine/symengine-0.1.0.ebuild
+++ b/sci-libs/symengine/symengine-0.1.0.ebuild
@@ -23,7 +23,6 @@ RDEPEND="
boost? ( dev-libs/boost )
python? ( dev-python/numpy[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
-   openmp? ( sys-cluster/openmpi )
python? (
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}] )"
@@ -31,12 +30,10 @@ DEPEND="${RDEPEND}
 CMAKE_BUILD_TYPE=Release
 
 pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   if use openmp; then
-   if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current 
selected gcc"
-   die "need openmp capable gcc"
-   fi
+   if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+   if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
fi
fi
 }

diff --git a/sci-libs/symengine/symengine-.ebuild 
b/sci-libs/symengine/symengine-.ebuild
index 2949716..9e6ab53 100644
--- a/sci-libs/symengine/symengine-.ebuild
+++ b/sci-libs/symengine/symengine-.ebuild
@@ -24,21 +24,17 @@ RDEPEND="
boost? ( dev-libs/boost )
python? ( dev-python/numpy[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
-   openmp? ( sys-cluster/openmpi )
python? (
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}] )"
 
-
 CMAKE_BUILD_TYPE=Release
 
 pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   if use openmp; then
-   if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current 
selected gcc"
-   die "need openmp capable gcc"
-   fi
+   if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+   if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
fi
fi
 }



[gentoo-commits] proj/sci:master commit in: dev-python/metakernel/

2015-10-06 Thread Marius Brehler
commit: 07a71d1deda8b7aafb135d7f19af97112708c237
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Oct  6 21:23:09 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Oct  6 21:23:09 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=07a71d1d

dev-python/metakernel: Version bump

Package-Manager: portage-2.2.20.1

 dev-python/metakernel/ChangeLog|  6 +
 dev-python/metakernel/metakernel-0.11.2.ebuild | 37 ++
 2 files changed, 43 insertions(+)

diff --git a/dev-python/metakernel/ChangeLog b/dev-python/metakernel/ChangeLog
index e7392d3..4d3b386 100644
--- a/dev-python/metakernel/ChangeLog
+++ b/dev-python/metakernel/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*metakernel-0.11.2 (06 Oct 2015)
+
+  06 Oct 2015; Marius Brehler 
+  +metakernel-0.11.2.ebuild:
+  dev-python/metakernel: Version bump
+
 *metakernel-0.11.0 (24 Sep 2015)
 
   24 Sep 2015; Marius Brehler  +metadata.xml,

diff --git a/dev-python/metakernel/metakernel-0.11.2.ebuild 
b/dev-python/metakernel/metakernel-0.11.2.ebuild
new file mode 100644
index 000..f02b935
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.11.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+   >=dev-python/ipython-3.0[${PYTHON_USEDEP}]
+   "
+DEPEND="${RDEPEND}
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   >=dev-python/metakernel_python-0.11.3[${PYTHON_USEDEP}]
+   )
+"
+
+# tests currently fail and the dying/stopping of ipcluster needs to be fixed
+RESTRICT="test"
+
+python_test() {
+   ipcluster start -n=3 &
+   nosetests --with-doctest --with-coverage --cover-package metakernel || 
die
+   ipcluster stop
+}



[gentoo-commits] proj/openrc:master commit in: sh/, etc/

2015-10-06 Thread William Hubbs
commit: 80d3928b0d13f09a9c1e82bd27c9fff943d84d43
Author: Austin S. Hemmelgarn  gmail  com>
AuthorDate: Tue Oct  6 20:02:28 2015 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Oct  6 20:05:35 2015 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=80d3928b

cgroups: Add the hugetlb, net_cls and pids controllers

Note from WilliamH: I slightly rearranged the code and added the
settings in rc.conf.

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

 etc/rc.conf.Linux  | 9 +
 sh/rc-cgroup.sh.in | 9 +
 2 files changed, 18 insertions(+)

diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index a8ad58b..f04f96e 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -62,12 +62,21 @@ rc_tty_number=12
 # Set the devices controller settings for this service.
 #rc_cgroup_devices=""
 
+# Set the hugetlb controller settings for this service.
+#rc_cgroup_hugetlb=""
+
 # Set the memory controller settings for this service.
 #rc_cgroup_memory=""
 
+# Set the net_cls controller settings for this service.
+#rc_cgroup_net_cls=""
+
 # Set the net_prio controller settings for this service.
 #rc_cgroup_net_prio=""
 
+# Set the pids controller settings for this service.
+#rc_cgroup_pids=""
+
 # Set this to YES if yu want all of the processes in a service's cgroup
 # killed when the service is stopped or restarted.
 # This should not be set globally because it kills all of the service's

diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in
index 3f34d17..b49c711 100644
--- a/sh/rc-cgroup.sh.in
+++ b/sh/rc-cgroup.sh.in
@@ -109,12 +109,21 @@ cgroup_set_limits()
local devices="${rc_cgroup_devices:-$RC_CGROUP_DEVICES}"
[ -n "$devices" ] && cgroup_set_values devices "$devices"
 
+   local hugetlb="${rc_cgroup_hugetlb:-$RC_CGROUP_HUGETLB}"
+   [ -n "$hugetlb" ] && cgroup_set_values hugetlb "$hugetlb"
+
local memory="${rc_cgroup_memory:-$RC_CGROUP_MEMORY}"
[ -n "$memory" ] && cgroup_set_values memory "$memory"
 
+   local net_cls="${rc_cgroup_net_cls:-$RC_CGROUP_NET_CLS}"
+   [ -n "$net_cls" ] && cgroup_set_values net_cls "$net_cls"
+
local net_prio="${rc_cgroup_net_prio:-$RC_CGROUP_NET_PRIO}"
[ -n "$net_prio" ] && cgroup_set_values net_prio "$net_prio"
 
+   local pids="${rc_cgroup_pids:-$RC_CGROUP_PIDS}"
+   [ -n "$pids" ] && cgroup_set_values pids "$pids"
+
return 0
 }
 



[gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/files/, sci-electronics/xoscope/

2015-10-06 Thread Michael Weber
commit: b1442df99b11c7e8346bcfc892a52a98289da6a9
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Oct  6 21:48:55 2015 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Oct  6 21:50:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1442df9

sci-electronics/xoscope: Version bump (bug 561926, thanks Vladimir).

Package-Manager: portage-2.2.21

 sci-electronics/xoscope/Manifest   |  1 +
 .../xoscope/files/xoscope-2.1-man_no_-Tutf8.patch  | 11 
 sci-electronics/xoscope/xoscope-2.1.ebuild | 30 ++
 3 files changed, 42 insertions(+)

diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 20e837e..185282d 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1 +1,2 @@
 DIST xoscope-2.0.tgz 334875 SHA256 
a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 SHA512 
8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
 WHIRLPOOL 
4afd660cb05a9a70ce49a5553c4f08d5877f32a85adcf86ada1014d7d90c358817cdb6da7f4b2d08edfb406375848434f679ea976c15ad16bf3ca2b8691a944c
+DIST xoscope-2.1.tar.gz 302170 SHA256 
ff14532ced6ac140064093e7aafaf6a032a50eb09f6b3608c45f81d00dc836ac SHA512 
2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d
 WHIRLPOOL 
e8dc3e9b56e776431d3d4f6dc30865666d7dc5d3bb0df12ebec62018db040fbb2518023688502dce01a98a7139a23e5222f258a8481511832e9233eadcef00c7

diff --git a/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch 
b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
new file mode 100644
index 000..f00cd8c
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.1-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- xoscope-2.1/configure.ac
 xoscope-2.1/configure.ac
+@@ -132,7 +132,7 @@
+ 
+ AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on 
libsx version])
+ 
+-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 
help])
++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
+ 
+ AC_DEFINE(FILENAME, "oscope.dat", [default file name])
+ 

diff --git a/sci-electronics/xoscope/xoscope-2.1.ebuild 
b/sci-electronics/xoscope/xoscope-2.1.ebuild
new file mode 100644
index 000..a8352fa
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net;
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtkdatabox
+   virtual/man"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input 
via /dev/dsp"
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+
+   eautoreconf
+}



[gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/

2015-10-06 Thread Chí-Thanh Christopher Nguyễn
commit: 3e2cd809c7d014aa4d8c9da258a547aec8624822
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Tue Oct  6 22:00:01 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Tue Oct  6 22:00:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2cd809

app-arch/snappy: keyword ~amd64-fbsd

Package-Manager: portage-2.2.20.1

 app-arch/snappy/snappy-1.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/snappy/snappy-1.1.3.ebuild 
b/app-arch/snappy/snappy-1.1.3.ebuild
index f1b28ce..89fab9f 100644
--- a/app-arch/snappy/snappy-1.1.3.ebuild
+++ b/app-arch/snappy/snappy-1.1.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd 
~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 src_prepare() {



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

2015-10-06 Thread Mike Frysinger
commit: 48c3ef6f6ce7846d3e95189bf7aed53d46d3d80d
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Oct  6 21:43:46 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Oct  6 21:43:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c3ef6f

dev-python/vulture: new package

 dev-python/vulture/Manifest |  1 +
 dev-python/vulture/metadata.xml |  9 +
 dev-python/vulture/vulture-0.8.1.ebuild | 20 
 3 files changed, 30 insertions(+)

diff --git a/dev-python/vulture/Manifest b/dev-python/vulture/Manifest
new file mode 100644
index 000..1aa3319
--- /dev/null
+++ b/dev-python/vulture/Manifest
@@ -0,0 +1 @@
+DIST vulture-0.8.1.tar.gz 18708 SHA256 
3d5567f7300707a7e340fffd0fd1ebfc8d717114944c03c842b8b6c26e2d365a SHA512 
b9ca6fd67dfca4ac9d98f25425401ef6edb80426fb483c2fbe7797c3991a58fe67bd8abc4c77b1e4615cfb81ddd786eab669b6d4b48f505563c29597664f1950
 WHIRLPOOL 
a1b094f2d47acf158edd3fe525fc885e3dcee11e246ddb5aa7625afb74db4093e26a40e37780513a8c2a9fe56dafad10ca2e33cd4ff0c654364448c87ebd2481

diff --git a/dev-python/vulture/metadata.xml b/dev-python/vulture/metadata.xml
new file mode 100644
index 000..905ae22
--- /dev/null
+++ b/dev-python/vulture/metadata.xml
@@ -0,0 +1,9 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+python
+
+   vulture
+   jendrikseipp/vulture
+
+

diff --git a/dev-python/vulture/vulture-0.8.1.ebuild 
b/dev-python/vulture/vulture-0.8.1.ebuild
new file mode 100644
index 000..581c939
--- /dev/null
+++ b/dev-python/vulture/vulture-0.8.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="find unused classes, functions and variables in your code"
+HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture 
https://pypi.python.org/pypi/vulture;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( README.txt NEWS.txt )



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

2015-10-06 Thread Chí-Thanh Christopher Nguyễn
commit: 7ccaaee567f3c438b1ffe8c659b031512b0aa6da
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Tue Oct  6 22:04:20 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Tue Oct  6 22:04:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccaaee5

dev-libs/leveldb: fix build on amd64-fbsd and keyword

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

Package-Manager: portage-2.2.20.1

 dev-libs/leveldb/leveldb-1.18-r1.ebuild | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-libs/leveldb/leveldb-1.18-r1.ebuild 
b/dev-libs/leveldb/leveldb-1.18-r1.ebuild
index d50d0be..e31c42c 100644
--- a/dev-libs/leveldb/leveldb-1.18-r1.ebuild
+++ b/dev-libs/leveldb/leveldb-1.18-r1.ebuild
@@ -12,8 +12,8 @@ 
SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux 
~x86-linux"
+IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
snappy? (
@@ -38,8 +38,14 @@ src_configure() {
# which the Makefile runs for us automatically.
tc-export AR CC CXX
export OPT="-DNDEBUG ${CPPFLAGS}"
+   local targetos
+   if use kernel_FreeBSD; then
+   targetos="FreeBSD"
+   else
+   targetos="Linux"
+   fi
 
-   TARGET_OS="Linux" \
+   TARGET_OS=${targetos} \
USE_SNAPPY=$(usex snappy) \
USE_TCMALLOC=no \
TMPDIR=${T} \



[gentoo-commits] proj/sci:master commit in: sci-libs/symengine/

2015-10-06 Thread Marius Brehler
commit: 444d2d35285ed54cc95778306b1deb76ea4c29fa
Author: mschubert  gmail  com>
AuthorDate: Sat Oct  3 12:50:25 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Sat Oct  3 12:50:25 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=444d2d35

sci-libs/symengine: use either openmp or threads

Package-Manager: portage-2.2.20-prefix

 sci-libs/symengine/ChangeLog  | 4 
 sci-libs/symengine/symengine-0.1.0.ebuild | 4 +++-
 sci-libs/symengine/symengine-.ebuild  | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-libs/symengine/ChangeLog b/sci-libs/symengine/ChangeLog
index 80d711f..a012019 100644
--- a/sci-libs/symengine/ChangeLog
+++ b/sci-libs/symengine/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  03 Oct 2015; Michael Schubert  symengine-0.1.0.ebuild,
+  symengine-.ebuild:
+  sci-libs/symengine: use either openmp or threads
+
 *symengine-0.1.0 (24 Aug 2015)
 *symengine- (24 Aug 2015)
 

diff --git a/sci-libs/symengine/symengine-0.1.0.ebuild 
b/sci-libs/symengine/symengine-0.1.0.ebuild
index 8f549ee..e365686 100644
--- a/sci-libs/symengine/symengine-0.1.0.ebuild
+++ b/sci-libs/symengine/symengine-0.1.0.ebuild
@@ -16,7 +16,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="boost openmp python threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   ?? ( openmp threads )"
 
 RDEPEND="
dev-libs/jemalloc

diff --git a/sci-libs/symengine/symengine-.ebuild 
b/sci-libs/symengine/symengine-.ebuild
index 9e6ab53..f7ad493 100644
--- a/sci-libs/symengine/symengine-.ebuild
+++ b/sci-libs/symengine/symengine-.ebuild
@@ -17,7 +17,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="boost openmp python threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   ?? ( openmp threads )"
 
 RDEPEND="
dev-libs/jemalloc



[gentoo-commits] proj/sci:master commit in: sci-chemistry/panav/

2015-10-06 Thread Marius Brehler
commit: 4a8ff1169b59651d2cbd21122cc03155c9d2472c
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Oct  6 21:09:16 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Oct  6 21:09:16 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a8ff116

sci-chemistry/panav: Drop keywords

Dependency dev-java/cos is masked and marked for removal.
See bug #562370.

Package-Manager: portage-2.2.20.1

 sci-chemistry/panav/ChangeLog   | 8 ++--
 sci-chemistry/panav/panav-0.20130730.ebuild | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-chemistry/panav/ChangeLog b/sci-chemistry/panav/ChangeLog
index b2bd8f8..ec45999 100644
--- a/sci-chemistry/panav/ChangeLog
+++ b/sci-chemistry/panav/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sci-chemistry/panav
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  06 Oct 2015; Marius Brehler 
+  panav-0.20130730.ebuild:
+  sci-chemistry/panav: Drop keywords  Dependency dev-java/cos is masked and
+  marked for removal. See bug #562370.
+
 *panav-0.20130730 (30 Jul 2013)
 
   30 Jul 2013; Justin Lecher  +panav-0.20130730.ebuild,
   +metadata.xml:
   New addition written by me
-

diff --git a/sci-chemistry/panav/panav-0.20130730.ebuild 
b/sci-chemistry/panav/panav-0.20130730.ebuild
index 660b935..82d8080 100644
--- a/sci-chemistry/panav/panav-0.20130730.ebuild
+++ b/sci-chemistry/panav/panav-0.20130730.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.wishartlab.com/download/${MY_PN}.zip -> 
${P}.zip"
 
 SLOT="0"
 LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="



[gentoo-commits] proj/sci:master commit in: dev-python/nbformat/

2015-10-06 Thread Marius Brehler
commit: 9a88502c1d3528899f000f1bf52691a1ad4c3d75
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Oct  6 21:16:11 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Oct  6 21:16:11 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a88502c

dev-python/nbformat: Version bump

Package-Manager: portage-2.2.20.1

 dev-python/nbformat/ChangeLog |  5 +++
 dev-python/nbformat/nbformat-4.0.1.ebuild | 59 +++
 2 files changed, 64 insertions(+)

diff --git a/dev-python/nbformat/ChangeLog b/dev-python/nbformat/ChangeLog
index 1fc6362..934c6c2 100644
--- a/dev-python/nbformat/ChangeLog
+++ b/dev-python/nbformat/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*nbformat-4.0.1 (06 Oct 2015)
+
+  06 Oct 2015; Marius Brehler  
+nbformat-4.0.1.ebuild:
+  dev-python/nbformat: Version bump
+
   21 Sep 2015; Marius Brehler  nbformat-.ebuild:
   dev-python/nbformat: Add ~x86 to KEYWORDS
 

diff --git a/dev-python/nbformat/nbformat-4.0.1.ebuild 
b/dev-python/nbformat/nbformat-4.0.1.ebuild
new file mode 100644
index 000..cc116c0
--- /dev/null
+++ b/dev-python/nbformat/nbformat-4.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="http://jupyter.org;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/ipython_genutils[${PYTHON_USEDEP}]
+   dev-python/traitlets[${PYTHON_USEDEP}]
+   dev-python/jupyter_core[${PYTHON_USEDEP}]
+   "
+DEPEND="${RDEPEND}
+   doc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/numpydoc[${PYTHON_USEDEP}]
+   )
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   )
+   "
+
+python_prepare_all() {
+   # Prevent un-needed download during build
+   if use doc; then
+   sed -e "/^'sphinx.ext.intersphinx',/d" -i docs/conf.py || 
die
+   fi
+
+   distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+   use doc && emake -C docs html
+}
+
+python_test() {
+   distutils_install_for_testing
+   cd "${TEST_DIR}"/lib || die
+   nosetests --with-coverage --cover-package=nbformat nbformat || die
+}
+
+python_install_all() {
+   use doc && HTML_DOCS=( docs/_build/html/. )
+   distutils-r1_python_install_all
+}



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

2015-10-06 Thread Michał Górny
commit: 6dc179438eec2c60cd8ba4e276741449d6e8caee
Author: Jakub Jirutka  jirutka  cz>
AuthorDate: Sat Oct  3 14:36:35 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Oct  6 21:16:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc17943

dev-lua/lua-openssl: new package

 dev-lua/lua-openssl/Manifest   |  1 +
 .../files/lua-openssl-0.4.1-Makefile.patch | 86 ++
 dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild   | 45 +++
 dev-lua/lua-openssl/metadata.xml   | 16 
 4 files changed, 148 insertions(+)

diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
new file mode 100644
index 000..1b7e99d
--- /dev/null
+++ b/dev-lua/lua-openssl/Manifest
@@ -0,0 +1 @@
+DIST lua-openssl-0.4.1.tar.gz 363525 SHA256 
cce51e33b07b6450854d2e57e129b5f369b749a780d58c44719c834f198ee340 SHA512 
c6deda86f77f9d6de1863611db9eb82506ea9789ec0425cb40cdb7d142d53aa633d53e1446b7eeb464636261385822d9cedc841bd35163931cc3758e7c3a308d
 WHIRLPOOL 
cbb5367bc7b716bcde731340339e7dafc3b4c5a542e1cf30e4fcf1d6c720e4f49676afe33f77860ab1da0a55b6dde434d0c312ae42c96765512494c6e8bbeb49

diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch 
b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
new file mode 100644
index 000..bf5374e
--- /dev/null
+++ b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
@@ -0,0 +1,86 @@
+From: Jakub Jirutka 
+
+Fix Makefile to respect system CFLAGS, LDFLAGS, and CC provided by environment.
+Allow to specify pkg-config command using variable, to be friendly with
+cross-compiling etc.
+
+diff --git a/Makefile b/Makefile
+index 195ef6b..375fb65 100644
+--- a/Makefile
 b/Makefile
+@@ -2,9 +2,10 @@ T=openssl
+ 
+ PREFIX?=/usr/local
+ LIB_OPTION?= -shared 
++PKG_CONFIG?= pkg-config
+ 
+ #Lua auto detect
+-LUA_VERSION ?= $(shell pkg-config luajit --print-provides)
++LUA_VERSION ?= $(shell $(PKG_CONFIG) luajit --print-provides)
+ ifeq ($(LUA_VERSION),)  Not use luajit
+ LUAV  ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua 
(.+)');print(v)")
+ LUA_CFLAGS?= -I$(PREFIX)/include/lua$(LUAV)
+@@ -12,8 +13,8 @@ LUA_LIBS ?= -L$(PREFIX)/lib
+ LUA_LIBDIR?= $(PREFIX)/lib/lua/$(LUAV)
+ else
+ LUAV  ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua 
(.+)');print(v)")
+-LUA_CFLAGS?= $(shell pkg-config luajit --cflags)
+-LUA_LIBS  ?= $(shell pkg-config luajit --libs)
++LUA_CFLAGS?= $(shell $(PKG_CONFIG) luajit --cflags)
++LUA_LIBS  ?= $(shell $(PKG_CONFIG) luajit --libs)
+ LUA_LIBDIR?= $(PREFIX)/lib/lua/$(LUAV)
+ endif
+ 
+@@ -22,30 +23,30 @@ SYS := $(shell gcc -dumpmachine)
+ 
+ ifneq (, $(findstring linux, $(SYS)))
+ # Do linux things
+-LDFLAGS   = -fPIC -lrt -ldl
+-OPENSSL_LIBS  ?= $(shell pkg-config openssl --libs) 
+-OPENSSL_CFLAGS?= $(shell pkg-config openssl --cflags)
+-CFLAGS= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++LDFLAGS   += -fPIC -lrt -ldl
++OPENSSL_LIBS  ?= $(shell $(PKG_CONFIG) openssl --libs) 
++OPENSSL_CFLAGS?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS+= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring apple, $(SYS)))
+ # Do darwin things
+-LDFLAGS   = -fPIC -lrt -ldl
+-OPENSSL_LIBS  ?= $(shell pkg-config openssl --libs) 
+-OPENSSL_CFLAGS?= $(shell pkg-config openssl --cflags)
+-CFLAGS= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++LDFLAGS   += -fPIC -lrt -ldl
++OPENSSL_LIBS  ?= $(shell $(PKG_CONFIG) openssl --libs) 
++OPENSSL_CFLAGS?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS+= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring mingw, $(SYS)))
+ # Do mingw things
+ V = $(shell lua -e 
"v=string.gsub('$(LUAV)','%.','');print(v)")
+-LDFLAGS   = -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 
$(PREFIX)/bin/lua$(V).dll 
++LDFLAGS   += -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 
$(PREFIX)/bin/lua$(V).dll
+ LUA_CFLAGS= -DLUA_LIB -DLUA_BUILD_AS_DLL -I$(PREFIX)/include/
+-CFLAGS= $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++CFLAGS+= $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ ifneq (, $(findstring cygwin, $(SYS)))
+ # Do cygwin things
+-OPENSSL_LIBS  ?= $(shell pkg-config openssl --libs) 
+-OPENSSL_CFLAGS  ?= $(shell pkg-config openssl --cflags)
+-CFLAGS= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
++OPENSSL_LIBS  ?= $(shell $(PKG_CONFIG) openssl --libs) 
++OPENSSL_CFLAGS  ?= $(shell $(PKG_CONFIG) openssl --cflags)
++CFLAGS+= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)
+ endif
+ #custome config
+ ifeq (.config, $(wildcard .config))
+@@ -61,7 +62,7 @@ WARN_MOST= -Wall -W -Waggregate-return -Wcast-align 

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

2015-10-06 Thread Michał Górny
commit: 4eb071c85d5cf04bdb0c1c716b3580140b1e019a
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Oct  6 21:23:08 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Oct  6 21:23:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb071c8

dev-lua/lua-openssl: Merge new proxy-maintained package

Pull-Request: https://github.com/gentoo/gentoo/pull/149

 dev-lua/lua-openssl/Manifest   |  1 +
 .../files/lua-openssl-0.4.1-Makefile.patch | 86 ++
 dev-lua/lua-openssl/lua-openssl-0.4.1.ebuild   | 45 +++
 dev-lua/lua-openssl/metadata.xml   | 16 
 4 files changed, 148 insertions(+)



[gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/

2015-10-06 Thread Marius Brehler
commit: 37ef10d8268f96d07f471d7ae477a7ad1004f296
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Oct  6 21:37:03 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Oct  6 21:37:03 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=37ef10d8

sci-libs/arrayfire: Add unified use flag

Package-Manager: portage-2.2.20.1

 sci-libs/arrayfire/ChangeLog | 4 
 sci-libs/arrayfire/arrayfire-.ebuild | 3 ++-
 sci-libs/arrayfire/metadata.xml  | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index c12d929..0f20052 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  06 Oct 2015; Marius Brehler  arrayfire-.ebuild,
+  metadata.xml:
+  sci-libs/arrayfire: Add unified use flag
+
   06 Oct 2015; Marius Brehler  arrayfire-.ebuild:
   sci-libs/arrayfire: Add nonfree use flag
 

diff --git a/sci-libs/arrayfire/arrayfire-.ebuild 
b/sci-libs/arrayfire/arrayfire-.ebuild
index fe86a2b..a970803 100644
--- a/sci-libs/arrayfire/arrayfire-.ebuild
+++ b/sci-libs/arrayfire/arrayfire-.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 LICENSE="BSD
nonfree? ( OpenSIFT )"
 SLOT="0"
-IUSE="+examples +cpu cuda nonfree opencl test graphics"
+IUSE="+examples +cpu cuda nonfree opencl test unified graphics"
 
 RDEPEND="
>=sys-devel/gcc-4.7:*
@@ -93,6 +93,7 @@ src_configure() {
   $(cmake-utils_use_build test TEST)
   $(cmake-utils_use_build graphics GRAPHICS)
   $(cmake-utils_use_build nonfree NONFREE)
+  $(cmake-utils_use_build unified UNIFIED)
   -DUSE_SYSTEM_BOOST_COMPUTE=ON
   -DUSE_SYSTEM_CLBLAS=ON
   -DUSE_SYSTEM_CLFFT=ON

diff --git a/sci-libs/arrayfire/metadata.xml b/sci-libs/arrayfire/metadata.xml
index 1ed53d4..1564d66 100644
--- a/sci-libs/arrayfire/metadata.xml
+++ b/sci-libs/arrayfire/metadata.xml
@@ -29,5 +29,8 @@
 
   Build with Forge graphics.
 
+
+  Build Backend-Independent API.
+
   
 



[gentoo-commits] proj/sci:master commit in: sci-libs/arrayfire/

2015-10-06 Thread Marius Brehler
commit: 0ffbaf3d097c2600b921cdb7ff084ecfd0f3812e
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Tue Oct  6 21:33:19 2015 +
Commit: Marius Brehler  linux  sungazer  de>
CommitDate: Tue Oct  6 21:33:19 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0ffbaf3d

sci-libs/arrayfire: Add nonfree use flag

Package-Manager: portage-2.2.20.1

 sci-libs/arrayfire/ChangeLog |  3 +++
 sci-libs/arrayfire/arrayfire-.ebuild | 13 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sci-libs/arrayfire/ChangeLog b/sci-libs/arrayfire/ChangeLog
index b369ea9..c12d929 100644
--- a/sci-libs/arrayfire/ChangeLog
+++ b/sci-libs/arrayfire/ChangeLog
@@ -1,6 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  06 Oct 2015; Marius Brehler  arrayfire-.ebuild:
+  sci-libs/arrayfire: Add nonfree use flag
+
 *arrayfire-3.1.2 (27 Sep 2015)
 
   27 Sep 2015; Marius Brehler 

diff --git a/sci-libs/arrayfire/arrayfire-.ebuild 
b/sci-libs/arrayfire/arrayfire-.ebuild
index 511aee3..fe86a2b 100644
--- a/sci-libs/arrayfire/arrayfire-.ebuild
+++ b/sci-libs/arrayfire/arrayfire-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 multilib
 
 GTEST_PV="1.7.0"
 
@@ -14,9 +14,10 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git 
git://github.com/${PN}/${PN}.g
 SRC_URI="test? ( https://googletest.googlecode.com/files/gtest-${GTEST_PV}.zip 
)"
 KEYWORDS=""
 
-LICENSE="BSD"
+LICENSE="BSD
+   nonfree? ( OpenSIFT )"
 SLOT="0"
-IUSE="+examples +cpu cuda opencl test graphics"
+IUSE="+examples +cpu cuda nonfree opencl test graphics"
 
 RDEPEND="
>=sys-devel/gcc-4.7:*
@@ -65,7 +66,9 @@ pkg_pretend() {
 src_unpack() {
git-r3_src_unpack
 
-   find "${WORKDIR}" -name "*_nonfree*" -delete || die
+   if ! use nonfree; then
+   find "${WORKDIR}" -name "*_nonfree*" -delete || die
+   fi
 
if use test; then
mkdir -p "${BUILD_DIR}"/third_party/src/ || die
@@ -89,7 +92,7 @@ src_configure() {
   $(cmake-utils_use_build examples EXAMPLES)
   $(cmake-utils_use_build test TEST)
   $(cmake-utils_use_build graphics GRAPHICS)
-  -DBUILD_NONFREE=OFF
+  $(cmake-utils_use_build nonfree NONFREE)
   -DUSE_SYSTEM_BOOST_COMPUTE=ON
   -DUSE_SYSTEM_CLBLAS=ON
   -DUSE_SYSTEM_CLFFT=ON



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

2015-10-06 Thread Alexis Ballier
commit: 7bde0f457913c0e3056775ce9935e2dbf3be4be5
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:39:29 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:39:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bde0f45

dev-util/rosdep: dev-python/nose is always needed at build time, not only for 
tests. Bug #562012 by Randolph Maaßen.

Package-Manager: portage-2.2.22

 dev-util/rosdep/rosdep-0.11.4.ebuild | 2 +-
 dev-util/rosdep/rosdep-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/rosdep/rosdep-0.11.4.ebuild 
b/dev-util/rosdep/rosdep-0.11.4.ebuild
index 7e6194f..e72467b 100644
--- a/dev-util/rosdep/rosdep-0.11.4.ebuild
+++ b/dev-util/rosdep/rosdep-0.11.4.ebuild
@@ -35,8 +35,8 @@ RDEPEND="
dev-python/rosdistro[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+   dev-python/nose[${PYTHON_USEDEP}]
test? (
-   dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)

diff --git a/dev-util/rosdep/rosdep-.ebuild 
b/dev-util/rosdep/rosdep-.ebuild
index 7e6194f..e72467b 100644
--- a/dev-util/rosdep/rosdep-.ebuild
+++ b/dev-util/rosdep/rosdep-.ebuild
@@ -35,8 +35,8 @@ RDEPEND="
dev-python/rosdistro[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+   dev-python/nose[${PYTHON_USEDEP}]
test? (
-   dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)



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

2015-10-06 Thread Alexis Ballier
commit: 05d290729a574b869fd80dbe2a1b56d56224df91
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:40:42 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:40:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d29072

dev-util/rosdep: remove old.

Package-Manager: portage-2.2.22

 dev-util/rosdep/Manifest |  1 -
 dev-util/rosdep/rosdep-0.11.2.ebuild | 61 
 2 files changed, 62 deletions(-)

diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 3b5b02d..ff2b584 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,2 +1 @@
-DIST rosdep-0.11.2.tar.gz 106456 SHA256 
89da05bdc082005815a9679dc34509a16647374d746a9e636c4238dd8f7aed9e SHA512 
55057bb478dce1a7be3025d52fa6fb616b2de95017981ead934d7965282fa6ceb81780b7825d914531f87af492f3b5ce91ecf2607e6bddb65e13744e8a8d6743
 WHIRLPOOL 
37407d99d58f62c00a54b94a5820cab599c7700be355132e5d7b9d277faa220f89d68c9950cd386e984c64a1f0c493d53db15b31082f485d4786aff232f73d34
 DIST rosdep-0.11.4.tar.gz 108842 SHA256 
ded28bbf4821564feb8b62174f4ecac0031335c8357230e618a224b9ae1e8081 SHA512 
0bffe2731e1039da63231bd57a98aa132a22fccfa6a8c3ed1553d51b0cf217d35eaaed524607f76132bd75332aae79187eb69d57ba1df8134159ede0a427953c
 WHIRLPOOL 
4293a4d50d95882dd441e9d94eefc1c42ccb4195ba7faf1acb5081d7f7cae1ffde11842919ee45d7110e04f3a63b1ad4699fc9c768788aa1fe4afe35030c7192

diff --git a/dev-util/rosdep/rosdep-0.11.2.ebuild 
b/dev-util/rosdep/rosdep-0.11.2.ebuild
deleted file mode 100644
index 7e6194f..000
--- a/dev-util/rosdep/rosdep-0.11.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 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} )
-
-SCM=""
-if [ "${PV#}" != "${PV}" ] ; then
-   SCM="git-r3"
-   EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep;
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep;
-if [ "${PV#}" != "${PV}" ] ; then
-   SRC_URI=""
-   KEYWORDS=""
-else
-   SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-   
http://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-   "
-   KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-   dev-python/catkin_pkg[${PYTHON_USEDEP}]
-   dev-python/rospkg[${PYTHON_USEDEP}]
-   dev-python/rosdistro[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-   test? (
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   )
-"
-
-python_test() {
-   nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || 
die
-}
-
-pkg_postrm() {
-   if [ "${ROOT:-/}" = "/" ] ; then
-   einfo "Removing rosdep default sources list."
-   rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-   fi
-}
-
-pkg_postinst() {
-   if [ "${ROOT:-/}" = "/" -a ! -f 
"${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-   einfo "Initializing rosdep"
-   rosdep init
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-ros/audio_common_msgs/

2015-10-06 Thread Alexis Ballier
commit: 5279cb8e4b4f75f3c8f28e7f1a3d9420674e36ed
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:48:16 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:48:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5279cb8e

dev-ros/audio_common_msgs: Bump to 0.2.8.

Package-Manager: portage-2.2.22

 dev-ros/audio_common_msgs/Manifest   |  1 +
 .../audio_common_msgs/audio_common_msgs-0.2.8.ebuild | 20 
 2 files changed, 21 insertions(+)

diff --git a/dev-ros/audio_common_msgs/Manifest 
b/dev-ros/audio_common_msgs/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1 +1,2 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 
bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 
f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3
 WHIRLPOOL 
d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 
459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 
9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706
 WHIRLPOOL 
998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d

diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.2.8.ebuild 
b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.8.ebuild
new file mode 100644
index 000..e872a7e
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common;
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: ros-meta/audio_common/

2015-10-06 Thread Alexis Ballier
commit: 17517448493615a7a18e7a1d160d7f6a05567474
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:48:28 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:48:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17517448

ros-meta/audio_common: Bump to 0.2.8.

Package-Manager: portage-2.2.22

 ros-meta/audio_common/Manifest  |  1 +
 ros-meta/audio_common/audio_common-0.2.8.ebuild | 23 +++
 2 files changed, 24 insertions(+)

diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index aec3da0..3a2fcd2 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1 +1,2 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 
bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 
f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3
 WHIRLPOOL 
d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 
459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 
9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706
 WHIRLPOOL 
998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d

diff --git a/ros-meta/audio_common/audio_common-0.2.8.ebuild 
b/ros-meta/audio_common/audio_common-0.2.8.ebuild
new file mode 100644
index 000..618c77e
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.2.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common;
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   dev-ros/audio_capture
+   dev-ros/audio_common_msgs
+   dev-ros/audio_play
+   dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-ros/sound_play/

2015-10-06 Thread Alexis Ballier
commit: 2fd0621ade6a35f269acd937dfe595369ed16a84
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:48:24 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:48:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd0621a

dev-ros/sound_play: Bump to 0.2.8.

Package-Manager: portage-2.2.22

 dev-ros/sound_play/Manifest|  1 +
 dev-ros/sound_play/sound_play-0.2.8.ebuild | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1 +1,2 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 
bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 
f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3
 WHIRLPOOL 
d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 
459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 
9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706
 WHIRLPOOL 
998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d

diff --git a/dev-ros/sound_play/sound_play-0.2.8.ebuild 
b/dev-ros/sound_play/sound_play-0.2.8.ebuild
new file mode 100644
index 000..c4b4cb1
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.2.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common;
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) 
into sounds"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   dev-ros/roscpp
+   dev-ros/rospy[${PYTHON_USEDEP}]
+   dev-ros/roslib
+   media-libs/gstreamer:0.10
+   dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+   dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+   dev-python/gst-python[${PYTHON_USEDEP}]
+   app-accessibility/festival
+   media-libs/gst-plugins-good:0.10
+   media-libs/gst-plugins-base:0.10
+"



[gentoo-commits] repo/gentoo:master commit in: dev-ros/audio_play/

2015-10-06 Thread Alexis Ballier
commit: 9f8c280db4395024a8c2ff7cbff287751d465ae0
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:48:20 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:48:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8c280d

dev-ros/audio_play: Bump to 0.2.8.

Package-Manager: portage-2.2.22

 dev-ros/audio_play/Manifest|  1 +
 dev-ros/audio_play/audio_play-0.2.8.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1 +1,2 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 
bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 
f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3
 WHIRLPOOL 
d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 
459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 
9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706
 WHIRLPOOL 
998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d

diff --git a/dev-ros/audio_play/audio_play-0.2.8.ebuild 
b/dev-ros/audio_play/audio_play-0.2.8.ebuild
new file mode 100644
index 000..d8c6704
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.2.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common;
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+   dev-ros/roscpp
+   dev-libs/boost:=[threads]
+   media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+   media-plugins/gst-plugins-alsa:0.10
+   media-libs/gst-plugins-good:0.10
+   media-libs/gst-plugins-base:0.10
+"



[gentoo-commits] repo/gentoo:master commit in: dev-ros/audio_capture/

2015-10-06 Thread Alexis Ballier
commit: 3de05e04bf793dcf85c836068475cadbee93d892
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:48:11 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:48:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de05e04

dev-ros/audio_capture: Bump to 0.2.8.

Package-Manager: portage-2.2.22

 dev-ros/audio_capture/Manifest   |  1 +
 dev-ros/audio_capture/audio_capture-0.2.8.ebuild | 29 
 2 files changed, 30 insertions(+)

diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index aec3da0..3a2fcd2 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1 +1,2 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 
bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 
f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3
 WHIRLPOOL 
d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
+DIST audio_common-0.2.8.tar.gz 175497 SHA256 
459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 
9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706
 WHIRLPOOL 
998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d

diff --git a/dev-ros/audio_capture/audio_capture-0.2.8.ebuild 
b/dev-ros/audio_capture/audio_capture-0.2.8.ebuild
new file mode 100644
index 000..dd65eac
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.2.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common;
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+   dev-ros/roscpp
+   dev-libs/boost:=[threads]
+   media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+   media-plugins/gst-plugins-lame:0.10
+   media-libs/gst-plugins-good:0.10
+   media-libs/gst-plugins-base:0.10
+"



[gentoo-commits] repo/gentoo:master commit in: dev-ml/menhir/

2015-10-06 Thread Alexis Ballier
commit: 7c5eeb68840bf38cf2de0a7f0fe736b589867ad6
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:58:40 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:58:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5eeb68

dev-ml/menhir: bump to 20151005.

Package-Manager: portage-2.2.22

 dev-ml/menhir/Manifest   |  1 +
 dev-ml/menhir/menhir-20151005.ebuild | 36 
 2 files changed, 37 insertions(+)

diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 8a45793..ce0c8df 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,3 +1,4 @@
 DIST menhir-20141215.tar.gz 556231 SHA256 
2592967c123a31e1b6566ab9f6034e7a0a709d57d547097f05693baf96a46fa4 SHA512 
1fff6b987016be37eaca0bb3fea7ec0c498c1448d076e991e1555718cf760318a8d710622af930175f234f49f8dd767ce62cc880c33458958ceeb1bda4817243
 WHIRLPOOL 
28e6018ce127b28e362aaf1fe030240253cb2ffb0a52d9b34e81c71882ae517376aa3df6c5d19c6db13819260f667f5708522486a74bc498bad3dac11378b56c
 DIST menhir-20150914.tar.gz 626388 SHA256 
a3057ec0867377ceaf9caecf69d331440d9c0fb70e39ade619a7856aa67d535d SHA512 
7717fcc63ae938eb7c8ae3a5e7d279a357735c0e3b062d9060cc70d3016640e1427d25ee8182e3e034c678d9b0e706fe219f707dd4d14689457f321b135b1fef
 WHIRLPOOL 
d66204d753d0677f9eb51d09641f9148077e62caa7ae042665697036457724040950bbb190df6bd029224a0607a67cac8f4597927b4f667ca09091e07d09f7bd
 DIST menhir-20150921.tar.gz 627213 SHA256 
4d8588dc847ef33f3af64d30e19bc791a57f61cda2b7086267bc8743ea4a2622 SHA512 
a3100819cef6577c2806ebab765c966c11acd9fc9de061e64ef1bf4ca8b0076b0b878f12abf951a3c5882216f173936f2899444ca4126c477fa9cbef231c6b4e
 WHIRLPOOL 
cec19d79e7b79ea3dc2159673082931c8c360a865078d0af0bdd152fd1e481adb7218caf7f404005e6653493d04fda7659c1aa3b7527bbf8e0b75f284ff676d0
+DIST menhir-20151005.tar.gz 627178 SHA256 
154f2537472c65e3e395de87484020cc9aedee5898b9c8756cd02245b3a568b0 SHA512 
5275732b7d8699b23a470716900a9c28f4123bd85f18d582bf69a839009009782a680bb65fd7e543515898ea5899fd2b1c8eca5c776067b70ef450093d437f82
 WHIRLPOOL 
b500268821f8b14c7cd46447c84c73d72a12365e1d991babf037746fbf76b18f41bdb0ed812d469ef7de7c2e8966f4151272773d2cd3b3fce250bc21b506dee0

diff --git a/dev-ml/menhir/menhir-20151005.ebuild 
b/dev-ml/menhir/menhir-20151005.ebuild
new file mode 100644
index 000..a8d4107
--- /dev/null
+++ b/dev-ml/menhir/menhir-20151005.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/;
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz;
+
+LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   if ! use ocamlopt ; then
+   export TARGET=byte
+   fi
+}
+
+src_compile() {
+   emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+   findlib_src_preinst
+   emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use 
examples || echo "DOCS=manual.pdf") install
+   use examples && docompress -x /usr/share/doc/${PF}/demos
+   dodoc AUTHORS CHANGES
+}



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

2015-10-06 Thread Patrice Clement
commit: f5d5570530b507bc76a9cd5fa3ad147ae4b0d152
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 09:05:58 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 09:06:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d55705

profiles: Masked dev-java/grant for removal. See bug 562370.

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

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

diff --git a/profiles/package.mask b/profiles/package.mask
index 536bed6..fe790d3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrice Clement  (6 Oct 2015)
+# Dead upstream. Masked for removal in 30 days.
+# See bug #562370.
+dev-java/commons-grant
+
 # Mike Pagano  (2 Oct 2015)
 # A regression in kernel 4.1.9 could lead to a system
 # lockup.  This has been fixed in gentoo-sources-4.1.9-r1



[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-dbutils/files/, dev-java/commons-dbutils/

2015-10-06 Thread Patrice Clement
commit: 54a008b30a04803d35ded6e415a2ec02b18a
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 07:34:18 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 09:06:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a008b3

dev-java/commons-dbutils: Clean up old.

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

 dev-java/commons-dbutils/Manifest  |  1 -
 .../commons-dbutils/commons-dbutils-1.1.ebuild | 31 --
 dev-java/commons-dbutils/files/1.1-tests.patch | 12 -
 3 files changed, 44 deletions(-)

diff --git a/dev-java/commons-dbutils/Manifest 
b/dev-java/commons-dbutils/Manifest
index 9396c80..edbf114 100644
--- a/dev-java/commons-dbutils/Manifest
+++ b/dev-java/commons-dbutils/Manifest
@@ -1,2 +1 @@
-DIST commons-dbutils-1.1-src.tar.gz 60062 SHA256 
645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59 SHA512 
03859d0ddc65b1f0254f71e9de371f131a81dc839de6bea938a0547b63759d18a9e957f44ac887b7ae9ea85ee3aeea90ffd8f03069c670ec7b700fe8b6e45fe2
 WHIRLPOOL 
b4b3e670b30101657c0d57fcf33993cdca89838135f147b54c63ac4bbced6fe1ed1218af36e95bec60e856c73a9d47fbfc1eecdbbd55dd7e476f6883fd94f3fd
 DIST commons-dbutils-1.6-src.tar.gz 90708 SHA256 
c7cb1bd7e0f9a6d509c98bb60f9941503473d6fe0fbe144736fb1819096c4524 SHA512 
05aa5fb448d949ac4d5d34f1219539e57cfb550fa423af0691cb35002984036b0de62b8f618199bd2f562a441867c5b7138e9204afc36bd6d0fa2c4c5e9cd2c6
 WHIRLPOOL 
012a8cace08c96c136b9e9a05ec34d173d544aecad465908ad823a47ec535cfa91c609e5280e9e05967b3d863b13e999ad2c9a826a100e3faa869c26dd97

diff --git a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild 
b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
deleted file mode 100644
index 3a63ce8..000
--- a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit base java-pkg-2 java-ant-2
-
-DESCRIPTION="A small set of classes designed to make working with JDBC easier"
-HOMEPAGE="http://commons.apache.org/dbutils/;
-SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-   test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=( "${FILESDIR}/1.1-tests.patch" )
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
-   java-pkg_newjar target/${P}.jar
-
-   use doc && java-pkg_dojavadoc dist/docs/api
-   use source && java-pkg_dosrc src/java/*
-}

diff --git a/dev-java/commons-dbutils/files/1.1-tests.patch 
b/dev-java/commons-dbutils/files/1.1-tests.patch
deleted file mode 100644
index a2036d4..000
--- a/dev-java/commons-dbutils/files/1.1-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur commons-dbutils-1.1-src.old/build.xml 
commons-dbutils-1.1-src/build.xml
 commons-dbutils-1.1-src.old/build.xml  2008-02-13 22:18:49.0 
+0200
-+++ commons-dbutils-1.1-src/build.xml  2008-02-13 22:18:59.0 +0200
-@@ -62,7 +62,7 @@
-   
- 
-   
--  
-+  
- 
- 
-   



[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-dbutils/, dev-java/commons-dbutils/files/

2015-10-06 Thread Patrice Clement
commit: dcb3fa63cabfdd3f4ac5079d818a91e141088717
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 07:33:20 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 09:06:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb3fa63

dev-java/commons-dbutils: Version bump.

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

 dev-java/commons-dbutils/Manifest  |   1 +
 .../commons-dbutils/commons-dbutils-1.6.ebuild |  53 +
 .../files/commons-dbutils-1.6-build.xml| 263 +
 3 files changed, 317 insertions(+)

diff --git a/dev-java/commons-dbutils/Manifest 
b/dev-java/commons-dbutils/Manifest
index 4be4cdd..9396c80 100644
--- a/dev-java/commons-dbutils/Manifest
+++ b/dev-java/commons-dbutils/Manifest
@@ -1 +1,2 @@
 DIST commons-dbutils-1.1-src.tar.gz 60062 SHA256 
645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59 SHA512 
03859d0ddc65b1f0254f71e9de371f131a81dc839de6bea938a0547b63759d18a9e957f44ac887b7ae9ea85ee3aeea90ffd8f03069c670ec7b700fe8b6e45fe2
 WHIRLPOOL 
b4b3e670b30101657c0d57fcf33993cdca89838135f147b54c63ac4bbced6fe1ed1218af36e95bec60e856c73a9d47fbfc1eecdbbd55dd7e476f6883fd94f3fd
+DIST commons-dbutils-1.6-src.tar.gz 90708 SHA256 
c7cb1bd7e0f9a6d509c98bb60f9941503473d6fe0fbe144736fb1819096c4524 SHA512 
05aa5fb448d949ac4d5d34f1219539e57cfb550fa423af0691cb35002984036b0de62b8f618199bd2f562a441867c5b7138e9204afc36bd6d0fa2c4c5e9cd2c6
 WHIRLPOOL 
012a8cace08c96c136b9e9a05ec34d173d544aecad465908ad823a47ec535cfa91c609e5280e9e05967b3d863b13e999ad2c9a826a100e3faa869c26dd97

diff --git a/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild 
b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
new file mode 100644
index 000..b76f51a
--- /dev/null
+++ b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A small set of classes designed to make working with JDBC easier"
+HOMEPAGE="http://commons.apache.org/dbutils/;
+SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+   test? (
+   dev-java/mockito:0
+   dev-java/ant-junit:0
+   dev-java/hamcrest-core:1.3
+   )"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="
+   mockito
+   hamcrest-core-1.3
+"
+
+# Uses a bunch of deprecated methods.
+JAVA_RM_FILES=(
+   src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java
+)
+
+java_prepare() {
+   cp "${FILESDIR}"/"${P}-build.xml" build.xml || die
+}
+
+src_test() {
+   java-pkg-2_src_test
+}
+
+src_install() {
+   java-pkg_newjar target/${P}.jar
+   use doc && java-pkg_dojavadoc target/site/apidocs
+   use source && java-pkg_dosrc src/main/java
+}

diff --git a/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml 
b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml
new file mode 100644
index 000..725d4ea
--- /dev/null
+++ b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml
@@ -0,0 +1,263 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+
+  
+  
+  
+
+  
+  
+
+
+
+
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+  
+  
+  
+
+
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+  
+=== WARNING 
===
+ JUnit is not present in the test classpath or your $ANT_HOME/lib 
directory. Tests not executed.
+
===
+  
+
+  
+  
+  
+
+  
+
+  http://docs.oracle.com/javase/6/docs/api/"/>
+  http://docs.oracle.com/javaee/6/api/"/>
+
+  
+
+  
+  
+  
+
+  
+
+  
+ 
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+
+  
+
+



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

2015-10-06 Thread Alexis Ballier
commit: 70e0d0bb886c8150c32da9f7e148cecc56ccd8ea
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 09:11:12 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 09:12:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e0d0bb

media-libs/libass: bump to 0.13.0

Package-Manager: portage-2.2.22

 media-libs/libass/Manifest |  1 +
 media-libs/libass/libass-0.13.0.ebuild | 45 ++
 2 files changed, 46 insertions(+)

diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 3f59e6d..1e7bf70 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -6,4 +6,5 @@ DIST libass-0.12.0.tar.xz 310412 SHA256 
0f34e9b4d1badbe85f2865e308d191b311f12266
 DIST libass-0.12.1.tar.xz 312020 SHA256 
87864517e482e94130864ad9e4217c3925119e8cc0c1509133989997a61592d7 SHA512 
ace022b214cdbd0f043037a6be25c2b58e12630717fe839f3a896462e3c7b0ccbb1e33c0128a09bbd416ec6e1e30230d514341a5c5c9190058fdedcf95082c91
 WHIRLPOOL 
b351344437c1d3c780b84dd98c02c786216226019879186c3da659e690e27e23a49be38fb8e302551978fa5e02dcfed13c3ff057ce778757ee04af5433f06f4e
 DIST libass-0.12.2.tar.xz 313208 SHA256 
673c1b15bde182168b17e17ee1c8d9e01173f20af352134216135b5bf15bf1e3 SHA512 
7cdbb6514c17eafebcc5e558d96ac06f301fa2d7658275379b8598b71b1e10c5dee4d91ebce5181ee3f16f4fe4e1afa9bb9942fa81c38babdcad7de05b59d35f
 WHIRLPOOL 
7990731baa4ee55060dc86fd8fb240ae5fe4a7305aebdab3d434846fda7ed616b7247283b3f65de6db56e102965eb7cd21c9cee59c94f6b5b6a53068d01e11f3
 DIST libass-0.12.3.tar.xz 313852 SHA256 
a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 
84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2
 WHIRLPOOL 
7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719
+DIST libass-0.13.0.tar.xz 336128 SHA256 
e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 
0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f
 WHIRLPOOL 
7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
 DIST libass-0.9.13.tar.xz 250536 SHA256 
eef55595355cd4dd14b88b61d4e34c7bcfb6060a6b28f5a9ebc7dd5a72b69cc8 SHA512 
82c1a280b5cff9dd09f015562db420295a465ce7e80ad51b2f879e347c3a675ea05ac2beaa106c178aa57a390a19eb1ffb90771689e76e2b0619e75673631e0d
 WHIRLPOOL 
b1769d3a5b9a14d43447ddaa8c459b5fda4c857abdee270d022cced3d5db93a25059ef4291c0fe27cf235c20507f6c77fdc9c3037d032bad57e1971eaa8436c9

diff --git a/media-libs/libass/libass-0.13.0.ebuild 
b/media-libs/libass/libass-0.13.0.ebuild
new file mode 100644
index 000..20df061
--- /dev/null
+++ b/media-libs/libass/libass-0.13.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass;
+SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz;
+
+LICENSE="ISC"
+SLOT="0/5" # subslot = libass soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+IUSE="+fontconfig +harfbuzz static-libs"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+   >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+   >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+   >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+   harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+X86_CPU_OPTS="abi_x86_32 abi_x86_64"
+for i in ${X86_CPU_OPTS} ; do
+   DEPEND="${DEPEND}
+   ${i}? ( dev-lang/yasm )"
+done
+
+DOCS="Changelog"
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf \
+   $(use_enable fontconfig) \
+   $(use_enable harfbuzz) \
+   $(use_enable static-libs static) \
+   --disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   prune_libtool_files
+}



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

2015-10-06 Thread Patrice Clement
commit: c49b39436712b097967a776479e91fb9e93c9c5b
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Oct  6 08:02:09 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Oct  6 09:06:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49b3943

dev-python/lxml: Stable for ppc. Fixes bug 561432.

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

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

diff --git a/dev-python/lxml/lxml-3.4.4.ebuild 
b/dev-python/lxml/lxml-3.4.4.ebuild
index 4726c4e..c36166c 100644
--- a/dev-python/lxml/lxml-3.4.4.ebuild
+++ b/dev-python/lxml/lxml-3.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.



[gentoo-commits] repo/gentoo:master commit in: dev-ros/move_base/

2015-10-06 Thread Alexis Ballier
commit: d4c32af09543c11fbb0c596e10c3e1cee3f0eecb
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 08:33:30 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 08:33:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c32af0

dev-ros/move_base: Add missing dep on dev-ros/std_srvs. Bug #562340.

Package-Manager: portage-2.2.22

 dev-ros/move_base/move_base-1.13.0.ebuild | 1 +
 dev-ros/move_base/move_base-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-ros/move_base/move_base-1.13.0.ebuild 
b/dev-ros/move_base/move_base-1.13.0.ebuild
index c8fbfbd..3a687a8 100644
--- a/dev-ros/move_base/move_base-1.13.0.ebuild
+++ b/dev-ros/move_base/move_base-1.13.0.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
dev-ros/nav_core
dev-ros/tf
dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+   dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-cpp/eigen:3
 "
 DEPEND="${RDEPEND}

diff --git a/dev-ros/move_base/move_base-.ebuild 
b/dev-ros/move_base/move_base-.ebuild
index c8fbfbd..3a687a8 100644
--- a/dev-ros/move_base/move_base-.ebuild
+++ b/dev-ros/move_base/move_base-.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
dev-ros/nav_core
dev-ros/tf
dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+   dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-cpp/eigen:3
 "
 DEPEND="${RDEPEND}



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

2015-10-06 Thread Lars Wendler
commit: c93af671949619e8737270347acd5823c2ca89cf
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct  6 08:52:18 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct  6 08:55:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93af671

dev-vcs/git: Bump to versions 2.3.10, 2.4.10 and 2.5.4

Revbumped version 2.6.1 to add a fix for bug #561796

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler  gentoo.org>

 dev-vcs/git/Manifest   |  9 
 .../git-2.6.0-am_configure_gpg_at_startup.patch| 52 ++
 .../git/{git-2.6.1.ebuild => git-2.3.10.ebuild}| 14 ++
 .../git/{git-2.6.1.ebuild => git-2.4.10.ebuild}| 10 +
 dev-vcs/git/{git-2.6.1.ebuild => git-2.5.4.ebuild} |  2 -
 .../git/{git-2.6.1.ebuild => git-2.6.1-r1.ebuild}  |  1 +
 6 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b393aa2..71dafc0 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,11 +3,14 @@ DIST git-1.9.5.tar.gz 4851532 SHA256 
44efbc76edb50103e0d1b549dac006ee6f275fbd624
 DIST git-2.0.5.tar.xz 3437996 SHA256 
f5a63f5073c7f10d0676d0dabb46df48f2af77624fe24e1c6047b0e047af8ca1 SHA512 
a2de101462cb7cf79ae596a5c7a77746fca430d6ae819731eb025a784b38b48b98964aca3db251e1a598ff17ff26b3711b044bd9c579d01346a8e1e77f7aa6de
 WHIRLPOOL 
b317f7b57a8a568b8a63ddbb44d6734dce01034c1b50491e3aedbb8a4ad2dc0f781b9edfad07e73ff050684f05734ee5f8b5483646967cbcd0a3cf7c600394eb
 DIST git-2.1.4.tar.xz 3544804 SHA256 
a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 
17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b
 WHIRLPOOL 
fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb
 DIST git-2.2.3.tar.xz 3592292 SHA256 
d56ba6a2b9ef51ec165b98b1894a36fbb635c6abb22674fd61ffc80603b967d9 SHA512 
772466ccbbe06d83a03b244dd157c30f51e0fb06995a55070b262f8dd67ced454013fdc86690210c54db914252439be0bfccabbbfffddebb6bc047db946e9b92
 WHIRLPOOL 
2b60036db65cbcb1c2c2db68ec1747f6c309f9368c4f879c8b91964e16708c641e5a8b7d7b79431193b8d78d1c73e8e694ffe5f407701d7d7719f2d568bff180
+DIST git-2.3.10.tar.xz 3625052 SHA256 
8d1eba6e4ad4ef57f87d25535956b5752c341f222407329025f8704537219ed8 SHA512 
23cd192bf19be648377767c0b45e895e5284b5fc7558be566ce5f59516d94921212f4944daad5ab650c99c10a58628626bd3d8f23d3b4c9d0d3fa4ce17a8eb9f
 WHIRLPOOL 
f6ff0675e75ac0dad5af264f9bcb18d29b6e615d73b68ad97caf1efce353ddb96c51c8e3c6bb633e00a961b757e3bbf55a7a5e130f707696f81324ee8b16ba44
 DIST git-2.3.8.tar.xz 3622512 SHA256 
cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 
bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4
 WHIRLPOOL 
93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
 DIST git-2.3.9.tar.xz 3622952 SHA256 
90c2b4bc8cb081115d34269b2d061fb8c7961cf08406c345b278c43d7dcd25f7 SHA512 
e02565b9b0176158418358a811735dde0e630adae1cc8401a3a578fdce69efb6d8893815ee749820ade8b8aa0f3b8b42ff85322bf98dad55de77298eeca50510
 WHIRLPOOL 
451717d03304ba38f964801be909f0265b03adef8cacd62dd1bb1af34e1c6cc4caef064f784e34984cdb9f1f8f7e3f9b93ab67c116f63a1c9486b96a5bde3e91
+DIST git-2.4.10.tar.xz 3695176 SHA256 
b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 
08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced
 WHIRLPOOL 
3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
 DIST git-2.4.6.tar.xz 3690432 SHA256 
bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 
2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef
 WHIRLPOOL 
1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b
 DIST git-2.4.9.tar.xz 3692824 SHA256 
0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 
d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82
 WHIRLPOOL 
a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
 DIST git-2.5.3.tar.xz 3745096 SHA256 
124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a SHA512 
ab73d67f76ec8a6350995c692eefa7ab60ae13590d5d7c2fbd3ec1105a8d435ec1b156106fd6c3d6b51080a27f3ebd66bbf0a85042b697bc835143d9f625474e
 WHIRLPOOL 
e0c0fde0b263fd4847c21353ec81449baf6f1d5631aed4fdaa41dab2665159b528d7c477dacaef4efb2786ecaf3c0bd44ef3a589765543eee9726e70c5207d66
+DIST 

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

2015-10-06 Thread Bernard Cafarelli
commit: 1a8d27a95c83fa55be1024c43fa913894e26230b
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Oct  6 08:53:44 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Oct  6 08:54:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8d27a9

x11-plugins/wmppp: missing dep on x11-libs/libdockapp, bug #562330

Package-Manager: portage-2.2.22

 .../wmppp/{wmppp-1.3.2.ebuild => wmppp-1.3.2-r1.ebuild}   | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/x11-plugins/wmppp/wmppp-1.3.2.ebuild 
b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
similarity index 81%
rename from x11-plugins/wmppp/wmppp-1.3.2.ebuild
rename to x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
index c8a4901..d615b51 100644
--- a/x11-plugins/wmppp/wmppp-1.3.2.ebuild
+++ b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+   x11-libs/libX11
x11-libs/libXext
x11-libs/libXpm"
 DEPEND="${RDEPEND}
@@ -24,19 +25,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-#src_prepare() {
-#  sed -ie 's/-o wmppp/\$(LDFLAGS) -o wmppp/' Makefile
-#}
-
 src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install () {
emake DESTDIR="${D}" PREFIX=/usr install
-#  dobin wmppp
-#  exeinto /etc/ppp
-#  doexe getmodemspeed
-#  dodoc user.wmppprc
dodoc BUGS CHANGES HINTS README TODO
 }



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

2015-10-06 Thread Alexis Ballier
commit: bae1717fe3fd51657766a0f99e468b2d219ff74b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 09:12:44 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 09:12:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae1717f

media-libs/libass: remove old

Package-Manager: portage-2.2.22

 media-libs/libass/Manifest |  7 --
 media-libs/libass/libass-0.10.1.ebuild | 40 -
 media-libs/libass/libass-0.10.2.ebuild | 40 -
 media-libs/libass/libass-0.11.1.ebuild | 46 --
 media-libs/libass/libass-0.12.0.ebuild | 46 --
 media-libs/libass/libass-0.12.1.ebuild | 46 --
 media-libs/libass/libass-0.12.2.ebuild | 46 --
 media-libs/libass/libass-0.9.13.ebuild | 37 ---
 8 files changed, 308 deletions(-)

diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 1e7bf70..1642a54 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,10 +1,3 @@
-DIST libass-0.10.1.tar.xz 257792 SHA256 
fbf287ac6d0dbdf015783b7354280ad8371c106326ad3f77a99471bc5aa18210 SHA512 
3990886b9e708bf29f48921f65f99cee85031e299065860bce4f3e626970f82e60130b7525c1aaaf40e02c7b49d7003378724dbcf72db5894ab79768776694cf
 WHIRLPOOL 
7278b893a047f8d0709e0b644495e2f42e4a10aea3174a91eea055501d66ad70f3bc7e924c49aaa9f8de3ddadc564aefbb6f35a0158ed714bf1486e275e1706b
-DIST libass-0.10.2.tar.xz 278244 SHA256 
f02afcc6410b800f0007dc7c282e897dab64f817c23b37d171fd6ff7fc4ca1d8 SHA512 
50e77a488bc47d03a8cfca49cd7d26b702f88f649640cc63b40eb288c0f2771a6db5656e77fb8ab072a2a0b10dadf4a21e375ed831605c6de37466003f36bfd7
 WHIRLPOOL 
d0884a663a86c33696f0909b1be09fad213ed972ec908d5dfc25fa13ed85fa48a6d4fabfe99efbf03939d5af7d0323969e06ee185c762914594e3b4ee78f0b03
-DIST libass-0.11.1.tar.xz 297016 SHA256 
9d773a2880114ae4edc4b7686ed67219348d932c24e322ffd7d4c1d97e8813ac SHA512 
16b047f688c9d9804d402e7a30377bc98ddadb5d464d621e6e035521532b9ff1e86d0e144e7c5089782afc6ac42ab934b03d75c1c4972fbaea7d8949f732ff62
 WHIRLPOOL 
d89e1eea227cccf09f5267dcd853d07c5981359d8714aa541c3bd03a4e1b438fec4162c0a5fd0fe14cde9d8774f12a0473e24f62e3100fd880259c9248b04055
 DIST libass-0.11.2.tar.xz 297172 SHA256 
499dbaf14d7743e5899c9ca918988e81a9894f674b22d4682922f2e5d095ff9e SHA512 
93e7b9ce328fc8ac7555c49015baf89c2f07957e501e3ea9ee5a2a7750c1454891a202a92f1348aef27c877bf01674bb7958b7e500c59538b67fe68a89315540
 WHIRLPOOL 
9c0e0b869efc815e9ecd0e0dfa0488b9643404bd8fc33fe4be2cbf7c026989b27ee7eeb6d8f11218d903881629d864b52bdb0f3a7433325f03b0a6c5a21d1d23
-DIST libass-0.12.0.tar.xz 310412 SHA256 
0f34e9b4d1badbe85f2865e308d191b311f12266f9612a0fbf995ea8436bae29 SHA512 
329727064ac1c90f1bfe449548a2b4d9e5b02346eb43c69b4e9623227efc19e91690950540fac7465aa44bd351103f17fa075f71836a1aa3400ee0647995a197
 WHIRLPOOL 
51aa187e10916c9d21902dbc1cd3418209f3df181b99392a2cd5271cc3d1eead09321240b3edd2e1a45c5658b6333afca2a8b9dba97c8bb32ea62d903920e764
-DIST libass-0.12.1.tar.xz 312020 SHA256 
87864517e482e94130864ad9e4217c3925119e8cc0c1509133989997a61592d7 SHA512 
ace022b214cdbd0f043037a6be25c2b58e12630717fe839f3a896462e3c7b0ccbb1e33c0128a09bbd416ec6e1e30230d514341a5c5c9190058fdedcf95082c91
 WHIRLPOOL 
b351344437c1d3c780b84dd98c02c786216226019879186c3da659e690e27e23a49be38fb8e302551978fa5e02dcfed13c3ff057ce778757ee04af5433f06f4e
-DIST libass-0.12.2.tar.xz 313208 SHA256 
673c1b15bde182168b17e17ee1c8d9e01173f20af352134216135b5bf15bf1e3 SHA512 
7cdbb6514c17eafebcc5e558d96ac06f301fa2d7658275379b8598b71b1e10c5dee4d91ebce5181ee3f16f4fe4e1afa9bb9942fa81c38babdcad7de05b59d35f
 WHIRLPOOL 
7990731baa4ee55060dc86fd8fb240ae5fe4a7305aebdab3d434846fda7ed616b7247283b3f65de6db56e102965eb7cd21c9cee59c94f6b5b6a53068d01e11f3
 DIST libass-0.12.3.tar.xz 313852 SHA256 
a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 
84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2
 WHIRLPOOL 
7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719
 DIST libass-0.13.0.tar.xz 336128 SHA256 
e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 
0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f
 WHIRLPOOL 
7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
-DIST libass-0.9.13.tar.xz 250536 SHA256 
eef55595355cd4dd14b88b61d4e34c7bcfb6060a6b28f5a9ebc7dd5a72b69cc8 SHA512 
82c1a280b5cff9dd09f015562db420295a465ce7e80ad51b2f879e347c3a675ea05ac2beaa106c178aa57a390a19eb1ffb90771689e76e2b0619e75673631e0d
 WHIRLPOOL 

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

2015-10-06 Thread Alexis Ballier
commit: e079c94c990491d1d9f3d0b980f634d131c34bb0
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 09:02:32 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 09:12:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e079c94c

media-video/dvdstyler: bump to 2.9.4

Package-Manager: portage-2.2.22

 media-video/dvdstyler/Manifest   |  1 +
 media-video/dvdstyler/dvdstyler-2.9.4.ebuild | 68 
 2 files changed, 69 insertions(+)

diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 9b216a9..b5eb371 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,3 +1,4 @@
 DIST DVDStyler-2.7.2.tar.bz2 5982155 SHA256 
b30df3870b9cfcac5bc4387d276aec10e0913ce66c63007f1393123afda180be SHA512 
f4913ff5ed11e7cedccb8408bea9adbfae7494afde9062c4acc7e65014af821d4b5acacbce57fd07225cf3af8c21ba552897b50be67f21e242fb6f4baeed000d
 WHIRLPOOL 
070254838db445175401c6d2fb05dc6ee5d79620a598f5a5f0c6d4d8bf9cb5b3ecfc1ad0e708b6289b37b0a5cd0a5c2b0c089c87951b60fe0d48eab85cc9410f
 DIST DVDStyler-2.9.2.tar.bz2 7861116 SHA256 
88abd17b0dcdfccbdfffe6e80bcfa59df023f1ff2eed782e58d1f793a81dbd1f SHA512 
5688f383b03cb0ec6c57659494d1f4f98f72c21e3e125e16ec3adfeac20555d6f26a12d3629417b46f833933f504e1d55a7fcdb2c0926643e0bfadcab8c998be
 WHIRLPOOL 
cd857c39a5de581b201b2d78d7a676b05f5dbdef3592fe835158cceb05d8b8e37cf5a4f88514469bbfac908f827843718b733566cac6fd86f6c7700bc49e0431
 DIST DVDStyler-2.9.3.tar.bz2 7861272 SHA256 
ffbc22454e210ba8fcad9a7954b426d9dc5ff933527a6e39391d310101128c39 SHA512 
c39a1c08ea5e86e05c25443685524c61c26a5fe11e66240884db6b54c117f1cc446634145bc99673eb7de2ed44e3d03277686470dfde3ab78a5943b2667e7b73
 WHIRLPOOL 
d08202272c5ec9fbaec7b049e854cdb413a929b59ee047a99a4d70699f80a2a0a47786335a9bc05d8d7ca905f9137d4f81bc31fd56a78943c71b16cc0cd3
+DIST DVDStyler-2.9.4.tar.bz2 7863263 SHA256 
8b15ec98e3e5ec8c5a1f23eee316f646476e76b86b80d44b7c842887946a39e0 SHA512 
8ef8e0241f31957b6c1695876a2067510750b3e997d57c688ceed640110488c2989af12d23147a5b439625cafc5bf7f2d3a8cdda8304b96555f48b6f5553cde4
 WHIRLPOOL 
07f3a96f83e0d7bbaea4cf01f9c440d63590f632de3ebbb516d7551ced21c9597790149f252f517f627c5d8800e5a1d8737ad15a015eb1f76e7fef4d7dc15dbf

diff --git a/media-video/dvdstyler/dvdstyler-2.9.4.ebuild 
b/media-video/dvdstyler/dvdstyler-2.9.4.ebuild
new file mode 100644
index 000..8587dc4
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-2.9.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=2.8
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +udev"
+
+COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
+   media-libs/libexif:=
+   >=media-libs/wxsvg-1.3:=
+   >=media-video/dvdauthor-0.7.1
+   >=media-video/xine-ui-0.99.7
+   virtual/cdrtools
+   >=virtual/ffmpeg-9-r1[encode]
+   virtual/jpeg:0
+   >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
+   sys-apps/dbus
+   udev? ( >=virtual/libudev-215:= )"
+RDEPEND="${COMMON_DEPEND}
+   >=app-cdr/dvdisaster-0.72.4
+   media-video/mjpegtools"
+DEPEND="${COMMON_DEPEND}
+   app-arch/zip
+   app-text/xmlto
+   sys-devel/gettext
+   virtual/yacc
+   virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   # disable obsolete GNOME 2.x libraries wrt #508854
+   sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure 
|| die
+   # rmdir: failed to remove `tempfoobar': Directory not empty
+   sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+   # fix underlinking wrt #367863
+   sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+   # silence desktop-file-validate QA check
+   sed -i \
+   -e '/Icon/s:.png::' -e '/^Encoding/d' -e 
'/Categories/s:Application;::' \
+   data/dvdstyler.desktop || die
+   has_version '>=media-video/ffmpeg-2.9' && epatch 
"${FILESDIR}/ffmpeg29.patch"
+}
+
+src_configure() {
+   econf \
+   --docdir=/usr/share/doc/${PF} \
+   $(use_enable debug) \
+   --with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+   default
+   rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}



[gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/

2015-10-06 Thread José María Alonso
commit: 622008afcaaa99bb87dba14a12ccd02aaa925208
Author: José María Alonso Josa  gentoo  org>
AuthorDate: Tue Oct  6 08:58:06 2015 +
Commit: José María Alonso  gentoo  org>
CommitDate: Tue Oct  6 08:58:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622008af

app-admin/logrotate: Drop old

Package-Manager: portage-2.2.20.1

 app-admin/logrotate/Manifest   |  1 -
 .../logrotate/files/logrotate-3.8.8-Werror.patch   | 11 
 .../files/logrotate-3.8.8-atomic-create.patch  | 45 -
 .../logrotate/files/logrotate-3.8.8-fbsd.patch | 57 -
 .../files/logrotate-3.8.8-ignore-hidden.patch  | 14 
 .../files/logrotate-3.8.8-noasprintf.patch | 55 
 app-admin/logrotate/logrotate-3.8.8.ebuild | 74 --
 7 files changed, 257 deletions(-)

diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index d427552..25d4efc 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,2 @@
-DIST logrotate-3.8.8.tar.gz 72014 SHA256 
46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f SHA512 
2b7b5fe587b3a5cbe98b8035a541b5e272e6e4c40669f65ff6c43d1524b686eca9abc0b93bc00c8eb6da4d189f14a9b79905fcc0fadb914276d884ad7493bb4b
 WHIRLPOOL 
b145d51cdcf0214e4f4b6a97aed7b9e1375c2848efecbc16181eaa6e1105ac8892c57248c89b92eb080d6cd6b23958085f39a894df7f5dce0bea6516e2d583c4
 DIST logrotate-3.8.9.tar.gz 77408 SHA256 
700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 
342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d
 WHIRLPOOL 
005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 
022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 
e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
 WHIRLPOOL 
9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17

diff --git a/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch 
b/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch
deleted file mode 100644
index db96529..000
--- a/app-admin/logrotate/files/logrotate-3.8.8-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- MAN = logrotate.8
- MAN5 = logrotate.conf.5
- 
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- sbin_PROGRAMS = logrotate
- logrotate_SOURCES = logrotate.c log.c config.c basenames.c
- 

diff --git a/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch 
b/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch
deleted file mode 100644
index 2816125..000
--- a/app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
 a/logrotate.c  2014-10-16 13:12:35.0 +0200
-+++ b/logrotate.c  2014-11-04 20:26:46.080067315 +0100
-@@ -359,15 +359,20 @@
- int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type 
acl, int force_mode)
- {
- int fd;
--  struct stat sb_create;
--  int acl_set = 0;
--
--  fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
--  (S_IRUSR | S_IWUSR) & sb->st_mode);
-+int acl_set = 0;
-+struct stat sb_create;
-+char template[PATH_MAX + 1];
-+char *fname;
-+mode_t umask_value;
-+snprintf(template, PATH_MAX, "%s/logrotate_temp.XX", 
ourDirName(fileName));
-+umask_value = umask();
-+fname = mktemp(template);
-+fd = open(fname, (flags | O_EXCL | O_NOFOLLOW), (S_IRUSR | S_IWUSR) & 
sb->st_mode);
-+umask(umask_value);
- 
- if (fd < 0) {
--  message(MESS_ERROR, "error creating output file %s: %s\n",
--  fileName, strerror(errno));
-+message(MESS_ERROR, "error creating unique temp file: %s\n",
-+   strerror(errno));
-   return -1;
- }
- if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
-@@ -418,6 +423,13 @@
-   }
-   }
- 
-+if (rename(template, fileName)) {
-+message(MESS_ERROR, "error renaming temp file to %s: %s\n",
-+fileName, strerror(errno));
-+close(fd);
-+return -1;
-+}
-+
- return fd;
- }
- 

diff --git a/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch 
b/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch
deleted file mode 100644
index ff10211..000
--- a/app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
 a/config.c 2014-10-16 13:12:35.0 +0200
-+++ b/config.c 2014-11-04 19:22:31.750055957 +0100
-@@ -1,6 +1,6 @@
- #include 
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef 

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

2015-10-06 Thread Alexis Ballier
commit: 92b5a88db6ea85caa349cc4141bd099a3fe0a597
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 09:14:38 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 09:14:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b5a88d

media-libs/libbluray: remove old.

Package-Manager: portage-2.2.22

 media-libs/libbluray/Manifest  |  4 --
 media-libs/libbluray/libbluray-0.5.0-r1.ebuild | 92 -
 media-libs/libbluray/libbluray-0.5.0.ebuild| 90 
 media-libs/libbluray/libbluray-0.6.1.ebuild| 92 -
 media-libs/libbluray/libbluray-0.7.0.ebuild| 95 --
 media-libs/libbluray/libbluray-0.8.0.ebuild| 94 -
 6 files changed, 467 deletions(-)

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index b9ab7ee..64ba7ec 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,6 +1,2 @@
-DIST libbluray-0.5.0.tar.bz2 559639 SHA256 
19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216 SHA512 
bd709a01689bbb03ac291a2544eee93b47d72e065c8ccf825f9fb568ddb339a75a18c721b3c59fd4a8214a0f9b652cbd845bccd9de08248dd4cf61616a77e1dd
 WHIRLPOOL 
ab6b422889e6469053f567a489afe6c4cbf79cc1e56461ccad3eec948be819748da7760377686430db212a249b450da8fe5a9c914828f13354135dcf2e314add
-DIST libbluray-0.6.1.tar.bz2 586646 SHA256 
bf51c4fb65f4d8b02e9b2708017ecd829c8d0dfa9239bca011e67a2a6e368b3f SHA512 
f32f5ce238955efd8d9f34d488d89ca1f52b4dd1f63334ade92dc8e053b15e180549fc5f83f4b7d532c145acb1b8ddfca2230df65451bfb0f77bf6aa2c3806ec
 WHIRLPOOL 
bed882bef96effc81241eab736b6be4caa098fdb1e9e2c50bdb70ebfdf0ee53490aed6697bc298c5a8271547113e9c0de151b95198ca2db90733ea70adc4ad44
 DIST libbluray-0.6.2.tar.bz2 582227 SHA256 
8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 
20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a
 WHIRLPOOL 
5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec81b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506
-DIST libbluray-0.7.0.tar.bz2 597266 SHA256 
f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d SHA512 
2bf73398003e5a6b12ffdf44ec5716c18da4a176328b4eac52adb3337d09fcb4e5b553362cb67d70506fb0b2cd60e2e59ccc398104630554f41f0b095fc4703f
 WHIRLPOOL 
28f9422704230cfe2fea3c84d0c7c3ae06495b07fdc22c33937d2cb4a0087be4af4364d219ab38e0ee94cf5c14826f7f2a1750da6d5c8f7e71178dbdfb1fc1e5
-DIST libbluray-0.8.0.tar.bz2 621606 SHA256 
7b80208b2af54313fedbb49f54b7e13ff7f86f1843a815e17aa9575bfd08 SHA512 
1928ed86a39f3846014f3c5083e78aaf87366fb4589a48a1a87ad053fc32edafe6e89d382c44cffc5f27610d4d3ccf17bf2ef79982e3e39a0ada6895defe5bfe
 WHIRLPOOL 
d72b50920e8f0b994cc543d3efbc6b7e4849a1dcda1774e1eda85e527a36a8382c3e273fb45309776c696bb7b215271cfb822f04c02a4133c5ee5687ea8805f5
 DIST libbluray-0.8.1.tar.bz2 623402 SHA256 
cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 
6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc
 WHIRLPOOL 
899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6e68718619334916fbe42cccb6c5c801

diff --git a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild 
b/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
deleted file mode 100644
index 357e82f..000
--- a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html;
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
-   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-   truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-   ${COMMON_DEPEND}
-   aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
-   java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   java? (
-   >=virtual/jdk-1.6
-   dev-java/ant-core
-   )
-   virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
-   if use java ; then
-   export JDK_HOME="$(java-config -g JAVA_HOME)"
-
-   # don't install a duplicate jar file
-   sed -i '/^jar_DATA/d' src/Makefile.am || die
-
-   eautoreconf
-
-   java-pkg-opt-2_src_prepare
-   fi
-}
-
-multilib_src_configure() {
-   

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

2015-10-06 Thread Alexis Ballier
commit: 731b168797fbf9f80905f6ba074e7822c0632832
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Oct  6 09:15:47 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Oct  6 09:15:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731b1687

media-libs/libbluray: Bump to 0.9.0.

Package-Manager: portage-2.2.22

 media-libs/libbluray/Manifest   |  1 +
 media-libs/libbluray/libbluray-0.9.0.ebuild | 94 +
 2 files changed, 95 insertions(+)

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 64ba7ec..5fad57f 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,2 +1,3 @@
 DIST libbluray-0.6.2.tar.bz2 582227 SHA256 
8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 
20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a
 WHIRLPOOL 
5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec81b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506
 DIST libbluray-0.8.1.tar.bz2 623402 SHA256 
cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 
6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc
 WHIRLPOOL 
899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6e68718619334916fbe42cccb6c5c801
+DIST libbluray-0.9.0.tar.bz2 624614 SHA256 
84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 
12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec
 WHIRLPOOL 
7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc

diff --git a/media-libs/libbluray/libbluray-0.9.0.ebuild 
b/media-libs/libbluray/libbluray-0.9.0.ebuild
new file mode 100644
index 000..805d248
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.9.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html;
+SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+
+COMMON_DEPEND="
+   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+   fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+   truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+   bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+   java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   java? (
+   >=virtual/jdk-1.6
+   dev-java/ant-core
+   )
+   virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.txt )
+
+src_prepare() {
+   if use java ; then
+   export JDK_HOME="$(java-config -g JAVA_HOME)"
+
+   # don't install a duplicate jar file
+   sed -i '/^jar_DATA/d' Makefile.am || die
+
+   java-pkg-opt-2_src_prepare
+   fi
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   local myconf
+   if multilib_is_native_abi && use java; then
+   export JAVACFLAGS="$(java-pkg_javac-args)"
+   append-cflags "$(java-pkg_get-jni-cflags)"
+   myconf="--enable-bdjava"
+   else
+   myconf="--disable-bdjava"
+   fi
+
+   ECONF_SOURCE="${S}" econf \
+   --disable-optimizations \
+   $(multilib_native_use_enable utils examples) \
+   $(use_with fontconfig) \
+   $(use_with truetype freetype) \
+   $(use_enable static-libs static) \
+   $(use_with xml libxml2) \
+   ${myconf}
+}
+
+multilib_src_install() {
+   emake DESTDIR="${D}" install
+
+   if multilib_is_native_abi && use utils; then
+   dobin index_dump mobj_dump mpls_dump
+   cd .libs/
+   dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test 
list_titles sound_dump
+   if use java; then
+   dobin bdj_test
+   fi
+   fi
+
+   if multilib_is_native_abi && use java; then
+   java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
+   doenvd "${FILESDIR}"/90${PN}
+   fi
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   prune_libtool_files
+}



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

2015-10-06 Thread Richard Farina
commit: cc6733490d4bafd5b973e38004f092f7f7f1eabd
Author: Zero_Chaos  gentoo  org>
AuthorDate: Wed Oct  7 01:51:50 2015 +
Commit: Richard Farina  gentoo  org>
CommitDate: Wed Oct  7 01:51:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc673349

profiles/base/package.use.mask: mask wpa_supplicant[wimax] for bug #562362

 profiles/base/package.use.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index cc2e933..c9c171d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,10 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Rick Farina  (06 Oct 2015)
+# forward porting this patch is non-trivial, mask for now
+=net-wireless/wpa_supplicant-2.5 wimax
+
 # Nathan Phillip Brink  (26 Sep 2015)
 # git useflag requires dev-libs/libgit2 which few arches support
 dev-util/geany-plugins git



[gentoo-commits] repo/gentoo:master commit in: games-util/pyfa/files/, games-util/pyfa/

2015-10-06 Thread Alexandre Rostovtsev
commit: 9f9517df68bb4bbfaa308342630fc67f054af7ea
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Wed Oct  7 02:38:40 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Wed Oct  7 02:42:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9517df

games-util/pyfa: update live ebuild

Update patches for upstream code changes, update dependencies, install
images in a compressed zip since upstream code now allows it, and switch
to git-r3.eclass.

Gentoo-Bug: 562080
Reported-by: Captain Crutches
Package-Manager: portage-2.2.22

 games-util/pyfa/files/configforced-1.15.1.py   |  4 ++
 .../pyfa/files/pyfa-1.15.1-import-pyfa.patch   | 27 ++
 games-util/pyfa/files/pyfa-1.15.1-staticdata.patch | 61 ++
 games-util/pyfa/pyfa-.ebuild   | 31 ++-
 4 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/games-util/pyfa/files/configforced-1.15.1.py 
b/games-util/pyfa/files/configforced-1.15.1.py
new file mode 100644
index 000..51fcb95
--- /dev/null
+++ b/games-util/pyfa/files/configforced-1.15.1.py
@@ -0,0 +1,4 @@
+# Gentoo-specific settings
+pyfaPath = u'%%SITEDIR%%/pyfa'
+gameDB = u'%%EPREFIX%%/usr/share/pyfa/eve.db'
+imgsZIP = u'%%EPREFIX%%/usr/share/pyfa/imgs.zip'

diff --git a/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch 
b/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
new file mode 100644
index 000..f29b75d
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.15.1-import-pyfa.patch
@@ -0,0 +1,27 @@
+From 6c7b6ab7d1aae47d3a3f72a7951c7de294be2917 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev 
+Date: Tue, 6 Oct 2015 22:16:38 -0400
+Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path
+
+Ensures that pyfa's import statements continue to work for systemwide
+installation.
+---
+ pyfa.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pyfa.py b/pyfa.py
+index 8189918..7b81f10 100755
+--- a/pyfa.py
 b/pyfa.py
+@@ -20,6 +20,8 @@
+ 
+ import sys
+ import re
++import os
++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
+ import config
+ 
+ 
+-- 
+2.6.0
+

diff --git a/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch 
b/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
new file mode 100644
index 000..8b8fa91
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
@@ -0,0 +1,61 @@
+From c7bb5210ce9feebb753734b5c581acca9f5c9d06 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev 
+Date: Tue, 6 Oct 2015 21:37:44 -0400
+Subject: [PATCH] make gameDB and imgs.zip paths settable from configforced
+
+---
+ config.py   | 10 +-
+ gui/bitmapLoader.py |  2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/config.py b/config.py
+index 4072236..a9e71ee 100644
+--- a/config.py
 b/config.py
+@@ -28,6 +28,7 @@ pyfaPath = None
+ savePath = None
+ saveDB = None
+ gameDB = None
++imgsZIP = None
+ 
+ 
+ class StreamToLogger(object):
+@@ -66,6 +67,7 @@ def defPaths():
+ global savePath
+ global saveDB
+ global gameDB
++global imgsZIP
+ global saveInRoot
+ 
+ if debug:
+@@ -117,7 +119,13 @@ def defPaths():
+ # The database where the static EVE data from the datadump is kept.
+ # This is not the standard sqlite datadump but a modified version created 
by eos
+ # maintenance script
+-gameDB = os.path.join(pyfaPath, "eve.db")
++gameDB = getattr(configforced, "gameDB", None)
++if gameDB is None:
++gameDB = os.path.join(pyfaPath, "eve.db")
++
++imgsZIP = getattr(configforced, "imgsZIP", None)
++if imgsZIP is None:
++imgsZIP = os.path.join(pyfaPath, "imgs.zip")
+ 
+ ## DON'T MODIFY ANYTHING BELOW ##
+ import eos.config
+diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
+index 45026be..02985c1 100644
+--- a/gui/bitmapLoader.py
 b/gui/bitmapLoader.py
+@@ -31,7 +31,7 @@ except ImportError:
+ class BitmapLoader():
+ 
+ try:
+-archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 
'r')
++archive = zipfile.ZipFile(config.imgsZIP, 'r')
+ except IOError:
+ archive = None
+ 
+-- 
+2.6.0
+

diff --git a/games-util/pyfa/pyfa-.ebuild b/games-util/pyfa/pyfa-.ebuild
index 76dac88..5e11d00 100644
--- a/games-util/pyfa/pyfa-.ebuild
+++ b/games-util/pyfa/pyfa-.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
 SLOT="0"
 if [[ ${PV} =  ]]; then
EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git;
-   inherit git-2
+   inherit git-r3
KEYWORDS=""
 else
SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> 
pyfa-${PV}.tar.gz"
@@ -25,34 +25,34 @@ IUSE="+graph"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
-   dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+   dev-python/wxpython:3.0[${PYTHON_USEDEP}]
  

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

2015-10-06 Thread Chí-Thanh Christopher Nguyễn
commit: c245b5a4e545a518abdd6328502e6c01ae7f474f
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Wed Oct  7 00:37:22 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Wed Oct  7 00:37:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c245b5a4

net-libs/libasyncns: fix configure check that failed on amd64-fbsd. add keyword.

Package-Manager: portage-2.2.20.1

 .../files/libasyncns-0.8-configure-res_query.patch | 12 +
 net-libs/libasyncns/libasyncns-0.8-r4.ebuild   | 62 ++
 2 files changed, 74 insertions(+)

diff --git a/net-libs/libasyncns/files/libasyncns-0.8-configure-res_query.patch 
b/net-libs/libasyncns/files/libasyncns-0.8-configure-res_query.patch
new file mode 100644
index 000..ebc206b
--- /dev/null
+++ b/net-libs/libasyncns/files/libasyncns-0.8-configure-res_query.patch
@@ -0,0 +1,12 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2009-10-15 03:42:51.0 +0200
 b/configure.ac 2015-10-07 02:18:06.571175156 +0200
+@@ -82,6 +82,8 @@
+ ACF_SEARCH_FUNCTION([res_query], [-lresolv, -lbind],
+   [], [AC_MSG_ERROR([res_query not found])],
+   [AC_LANG_PROGRAM([[
++  #include 
++  #include 
+   #include 
+  ]], [[res_query(0, 0, 0, 0, 0);]])
+   ])

diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild 
b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
new file mode 100644
index 000..a2c96ec
--- /dev/null
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib eutils flag-o-matic libtool multilib 
multilib-minimal
+
+DESCRIPTION="C library for executing name service queries asynchronously"
+HOMEPAGE="http://0pointer.de/lennart/projects/libasyncns/;
+SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz;
+
+SLOT="0"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="doc debug"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+   # fix libdir in pkgconfig file
+   epatch "${FILESDIR}/${P}-libdir.patch"
+   # fix configure check for res_query
+   epatch "${FILESDIR}/${P}-configure-res_query.patch"
+   eautoreconf
+}
+
+multilib_src_configure() {
+   # libasyncns uses assert()
+   use debug || append-cppflags -DNDEBUG
+
+   ECONF_SOURCE=${S} \
+   econf \
+   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+   --disable-dependency-tracking \
+   --disable-lynx \
+   --disable-static
+}
+
+multilib_src_compile() {
+   emake || die "emake failed"
+
+   if multilib_is_native_abi && use doc; then
+   doxygen doxygen/doxygen.conf || die "doxygen failed"
+   fi
+}
+
+multilib_src_install() {
+   emake DESTDIR="${D}" install || die "emake install failed"
+
+   if multilib_is_native_abi && use doc; then
+   docinto apidocs
+   dohtml html/*
+   fi
+}
+
+multilib_src_install_all() {
+   find "${D}" -name '*.la' -delete
+}



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

2015-10-06 Thread Chí-Thanh Christopher Nguyễn
commit: fb7e08f9f7116209115cd954e0bcbfa35250172c
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Wed Oct  7 00:57:02 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Wed Oct  7 00:57:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7e08f9

dev-libs/json-c: keyword ~amd64-fbsd

Package-Manager: portage-2.2.20.1

 dev-libs/json-c/json-c-0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/json-c/json-c-0.12.ebuild 
b/dev-libs/json-c/json-c-0.12.ebuild
index e01bc48..ed1c33c 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz;
 
 LICENSE="MIT"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 RDEPEND="



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

2015-10-06 Thread Chí-Thanh Christopher Nguyễn
commit: 38bb2e03859b935ab683c04bbb1d4c5da9a79525
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Wed Oct  7 01:03:37 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Wed Oct  7 01:03:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bb2e03

media-sound/pulseaudio: keyword ~amd64-fbsd

Package-Manager: portage-2.2.20.1

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

diff --git a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild 
b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
index 83140d7..284d4f0 100644
--- a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz;
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm 
+glib



  1   2   >