[gentoo-commits] repo/gentoo:master commit in: media-libs/jbigkit/
commit: 2dff535a756504743c24a0710a2260ae70f315f8 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jan 22 07:55:08 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Jan 22 07:57:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dff535a media-libs/jbigkit: marked ~x64-macos Package-Manager: portage-2.2.20-prefix media-libs/jbigkit/jbigkit-2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild index db72bc3..6a11102 100644 --- a/media-libs/jbigkit/jbigkit-2.1.ebuild +++ b/media-libs/jbigkit/jbigkit-2.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"
[gentoo-commits] repo/gentoo:master commit in: dev-util/desktop-file-utils/
commit: 6a0e436590b8874c4b5eb620bf09fdf4ba3bbeeb Author: Fabian Groffen gentoo org> AuthorDate: Fri Jan 22 07:57:06 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Jan 22 07:57:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0e4365 dev-util/desktop-file-utils: marked ~x64-macos Package-Manager: portage-2.2.20-prefix dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild index 024caf3..abf905c 100644 --- a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild +++ b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"; LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="emacs" RDEPEND=">=dev-libs/glib-2.12:2
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/gettext_i18n_rails/
commit: a9fd589a2c94c86c6394ceb48624a265f5870e0d Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:20:44 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fd589a dev-ruby/gettext_i18n_rails: add 1.4.0 Package-Manager: portage-2.2.26 dev-ruby/gettext_i18n_rails/Manifest | 1 + .../gettext_i18n_rails-1.4.0.ebuild| 36 ++ 2 files changed, 37 insertions(+) diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest index d4e4a57..0347de4 100644 --- a/dev-ruby/gettext_i18n_rails/Manifest +++ b/dev-ruby/gettext_i18n_rails/Manifest @@ -1,2 +1,3 @@ DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4 DIST gettext_i18n_rails-1.3.2.tar.gz 20260 SHA256 7c11f3a1d6d9ae394fd77070013a4fa19330bf4b203a7972d651d2ca2b9056de SHA512 04412b5e6b7389b3882d33385fbec22de7c61cd93e4cc7bc09c2bb4afb5d61d08e4c513e17aac18cf250f8efe12c6362633f9722f0e335bb9913484ce7abca15 WHIRLPOOL c96c23242a5ffc03d7e929bf1e05d12a41a8f01957efaebfbad122df842e212b2f6f306125b2047a2366328181fe40959c9fabf3b672bfc8074f8b9f1d6fb785 +DIST gettext_i18n_rails-1.4.0.tar.gz 21787 SHA256 456f80d679437347cd2a9c516b442302dc93d8776d6503512dff03bdbceda54e SHA512 c6455acafbc498ba33703b028b54c30c15ee8454274677eb5dbe402354e178a880d53840d7c7b8f0e1a5a3212184f93043f7df2ab743955c8a869c79a16d4679 WHIRLPOOL ffa186594756a51dadd834e83788e630090bd1a9563e27accf86e5c187908a999d77188963b2b5b2cf9874c2fecf8add7a21b97b453023329d99b3acc529f973 diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild new file mode 100644 index 000..994ed31 --- /dev/null +++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="Readme.md" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="FastGettext / Rails integration" +HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"; +SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_bdepend "test? ( dev-ruby/rails:4.1 dev-ruby/activerecord:4.1[sqlite] dev-ruby/temple )" +ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0" + +all_ruby_prepare() { + rm Gemfile Gemfile.lock || die + + # Remove specs for slim and hamlet, template engines we don't package. + rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die + + # Test against Rails 4.1.0 to match keywords. + sed -e '1igem "rails", "~>4.1.0"' -i spec/spec_helper.rb || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fast_gettext/
commit: de04f82c1e45c887e7a04d29f8e479d75f82a896 Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:21:46 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de04f82c dev-ruby/fast_gettext: cleanup Package-Manager: portage-2.2.26 dev-ruby/fast_gettext/Manifest | 2 - dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild | 56 - dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild | 48 - 3 files changed, 106 deletions(-) diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest index 4eed8e3..dd0c933 100644 --- a/dev-ruby/fast_gettext/Manifest +++ b/dev-ruby/fast_gettext/Manifest @@ -1,3 +1 @@ -DIST fast_gettext-0.9.0.tar.gz 86616 SHA256 773f1112524f1777f4f46ce80c5e1341dd270d232d86808d5ecc27d5b4d83e29 SHA512 901e9725ae537300be078febf4c5c94f466da48b0e4d3611037bfc98b914436a23828708177d6874c7b2ae60245631cd414ee52bd1b9de90c6ff8d1a6dbe37a4 WHIRLPOOL 06f858d501d66cfc609ff2a75010e73b33f706d388286a64ce923a6a87f96ddcc98a6623644b8bac9e57dbe86b7345ddd7aaf601d69ca600e6f8a7c9c8e95114 -DIST fast_gettext-0.9.2.tar.gz 86892 SHA256 7c7de3f9ac19d2e5a81fa15bf0dcd4d54bcb92051e881d83265c6cdadfce239b SHA512 d8bfe755ba6754ff474a6d0e42e9a725aa00f20b381fe5c0a2a2dc3efc5e0bf6096450e0665cd4369717296dc55cd316f836d9cd35b96764eb56e3ca33379c14 WHIRLPOOL 615f5357815d8321d1f099889b352826034af1defbf8a6a4383b9e71b7e37ed06c582e0e957ec4e9a2345b3b84dce9a5432e3d85946f679fa27fcafe04cbce4c DIST fast_gettext-1.0.0.tar.gz 86573 SHA256 8390793a29d291b4efbad01e4c579fcb86200b91e87a72d667fb5e1d451b53a2 SHA512 f9c1656218fbb8f514e10bac6b2656a39013dc0b745e0741cea727280aa0153f3555badc4cbd18fea6bff27e3542c62bb4a7808b0565d6282aaee154cb8e WHIRLPOOL 0d1d1bca6a87364a5a834ca88a1906ef90fbd353890191cd0865103865be396dd7c9ce5c9f8abbbfaa088178ee1a7eecfd57b8a16291214f767b775f7737c81a diff --git a/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild deleted file mode 100644 index 07231d7..000 --- a/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# jruby support requires sqlite3 support for jruby. -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - -inherit ruby-fakegem - -DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!" -HOMEPAGE="https://github.com/grosser/fast_gettext"; -SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )" - -all_ruby_prepare() { - rm Gemfile.lock || die - - # Remove jeweler and bump from Gemfile since they are not needed for tests. - sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die - - # Avoid unneeded dependency on git and development dependencies. - sed -e '/git ls-files/ s:^:#:' \ - -e '/\(wwtd\|bump\)/ s:^:#:' \ - -i fast_gettext.gemspec || die - - # Don't run a test that requires safe mode which we can't provide - # due to insecure directory settings for the portage dir. This spec - # also calls out to ruby which won't work with different ruby - # implementations. - sed -i -e '/can work in SAFE mode/,/^ end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die - - # Avoid not failing pending specs related to ree18. - sed -i -e '/with i18n loaded/,/^ end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die - - # Avoid RSpec 3 specific syntax - sed -e '/failure_message/ s:^:#:' -i spec/support/be_accessible_matcher.rb || die - -} - -each_ruby_prepare() { - # Make sure the right ruby interpreter is used - sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die -} diff --git a/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild b/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild deleted file mode 100644 index ef29405..000 --- a/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# 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="CHANGELOG Readme.md" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -inherit ruby-fakegem - -DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!" -HOMEPAGE="https://github.com/grosser/fast_gettext"; -SRC_URI="https://git
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/sexp_processor/
commit: ffb5ac1877a53445ce38459012305d84ad5acf1f Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:40:48 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb5ac18 dev-ruby/sexp_processor: cleanup Package-Manager: portage-2.2.26 dev-ruby/sexp_processor/Manifest | 2 -- .../sexp_processor/sexp_processor-4.4.5.ebuild | 28 -- .../sexp_processor/sexp_processor-4.5.1.ebuild | 28 -- 3 files changed, 58 deletions(-) diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest index 75e3807..a691c21 100644 --- a/dev-ruby/sexp_processor/Manifest +++ b/dev-ruby/sexp_processor/Manifest @@ -1,4 +1,2 @@ DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb -DIST sexp_processor-4.4.5.gem 38912 SHA256 af8713761f1b6604865830c54324e57c33e7cc05107ebdbee4e6d458f8f8fe7c SHA512 6190cc85f7c67ade97725459fd415593fd9f9b405e004b677543c5db40c364d12627587218fe500d46809ccde316dc7d59a647568dfa10bd8eb892af9c20a05e WHIRLPOOL fdea17c49a95e8241b90148710acf7c60f27fb0ddc2fe31a08d095b61fd5c5540dbb88415be47597a94754b89a0023c0273d1f5b7f4280a120cb293d38e9c53b -DIST sexp_processor-4.5.1.gem 38912 SHA256 1456a9be103bf1de0d34ff6980b77a5a72cf3d4b35bbd2182ac62506981a234c SHA512 9cf997a34c57598c7c09392827453cc7c1233fa335261e9f177f0fb70904d7f4a61d8eb819dab040eae8025c1c91fbc4e09f2aae5f02a457ad19f7732e9552c5 WHIRLPOOL cc232f198e018bbd75b8e860ed921b5326d5067dfd1aaacca3613bf787617a99b0c2221da6b072788e453ac2ae93188f8512672d46f89e159642a2bf01343491 DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d6b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18 diff --git a/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild deleted file mode 100644 index d188b3c..000 --- a/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="Processor for s-expressions created as part of the ParseTree project" -HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"; - -LICENSE="GPL-2" -SLOT="4" -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="" - -ruby_add_bdepend " - test? ( - >=dev-ruby/hoe-3.13 - dev-ruby/hoe-seattlerb - >=dev-ruby/minitest-5.5 - )" diff --git a/dev-ruby/sexp_processor/sexp_processor-4.5.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.5.1.ebuild deleted file mode 100644 index 75b07ad..000 --- a/dev-ruby/sexp_processor/sexp_processor-4.5.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# 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_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="Processor for s-expressions created as part of the ParseTree project" -HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"; - -LICENSE="GPL-2" -SLOT="4" -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="" - -ruby_add_bdepend " - test? ( - >=dev-ruby/hoe-3.13 - dev-ruby/hoe-seattlerb - >=dev-ruby/minitest-5.5 - )"
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/sexp_processor/
commit: 2965b0e23b37db72e1ca312f2825bd28cebd38ba Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:51:20 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2965b0e2 dev-ruby/sexp_processor: add 4.6.1 Package-Manager: portage-2.2.26 dev-ruby/sexp_processor/Manifest | 1 + .../sexp_processor/sexp_processor-4.6.1.ebuild | 28 ++ 2 files changed, 29 insertions(+) diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest index a691c21..fe93bfa 100644 --- a/dev-ruby/sexp_processor/Manifest +++ b/dev-ruby/sexp_processor/Manifest @@ -1,2 +1,3 @@ DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d6b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18 +DIST sexp_processor-4.6.1.gem 39424 SHA256 e2e96c2ee3ea81e1dc7b4b4abee23b6e552e669cfe456ee69126a29a03373cd7 SHA512 25513e71e30c0ded46201d81e454ab628054c2380c4b9715d6b05cf08703ce3cc31e7d127514f2abc12d875d0d53791740b728922f91b85ba579931799de09d7 WHIRLPOOL 6cd94d615eec3858e2fcb920526438a9d6a6c4509da48369812fb5235e62814be6a7fbe63b9c392287938127f00900ec89638173a5b64b85a1f8bc6ac9e80d8a diff --git a/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild new file mode 100644 index 000..11ef73a --- /dev/null +++ b/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" + +inherit ruby-fakegem + +DESCRIPTION="Processor for s-expressions created as part of the ParseTree project" +HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"; + +LICENSE="GPL-2" +SLOT="4" +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="" + +ruby_add_bdepend " + test? ( + >=dev-ruby/hoe-3.13 + dev-ruby/hoe-seattlerb + >=dev-ruby/minitest-5.5 + )"
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby_parser/
commit: e4e8187e8323941709fbe679dc37d3de84d91eff Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:35:42 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e8187e dev-ruby/ruby_parser: cleanup Package-Manager: portage-2.2.26 dev-ruby/ruby_parser/Manifest | 2 -- dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild | 37 --- dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild | 37 --- 3 files changed, 76 deletions(-) diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest index 954e56c..a8c93e5 100644 --- a/dev-ruby/ruby_parser/Manifest +++ b/dev-ruby/ruby_parser/Manifest @@ -1,4 +1,2 @@ DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64 -DIST ruby_parser-3.7.0.gem 310784 SHA256 95d2036b753f399706e3478c1033a81520b27ccf8702e8de076cdfcaff5f1de4 SHA512 bce90b9a266dea59c2c52b80d1524fa6aaf74a6259e7aefe6697081756b8fd6e084ec31042a4b8ca6cf61fbea027fe4255f18d0c3047643a18b03a74b73457d7 WHIRLPOOL 2de7e23ae380e7a2087859cce4d6b97b8399487fc5f504223975f631b8088356a0b3b628d38d6bbecde29a56063cca1c97918a0d7711ddd1482959ffaa0baa35 -DIST ruby_parser-3.7.1.gem 311296 SHA256 7cba241552f03f2db4911013fa40bcd925425f713aa712ebdf34431f1d15ab5a SHA512 34e097c97cf5bd606874a0a1aecb4a5eb4a10f97fd088c21a95b1aee52d9c758a1c7d53601bc711fb5b3d57bf1707e157411eb96d15cccd516c6f5024eca9855 WHIRLPOOL 26178317838ee2bbdd928ea5a97a3c3aaef165b49623395dcff58ac819633b9fc2529a754e821e4e2e5257b34f213f92700f691b0506371e9dc8ab3b7b187633 DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild deleted file mode 100644 index f172315..000 --- a/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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_DOC="docs" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="A ruby parser written in pure ruby" -HOMEPAGE="https://github.com/seattlerb/ruby_parser"; - -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="" - -ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4 - !=dev-ruby/hoe-2.9.1 )" -ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )" - -DEPEND+=" test? ( dev-util/unifdef )" - -all_ruby_prepare() { - # Remove reference to perforce method that is not in a released - # version of hoe-seattlerb. - #sed -i -e '/perforce/d' Rakefile || die - sed -i -e '/license/d' Rakefile || die - sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die -} diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild deleted file mode 100644 index f172315..000 --- a/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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_DOC="docs" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="A ruby parser written in pure ruby" -HOMEPAGE="https://github.com/seattlerb/ruby_parser"; - -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="" - -ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4 - !=dev-ruby/hoe-2.9.1 )" -ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )" - -DEPEND+=" test? ( dev-util/unifdef )" - -all_ruby_prepare() { - # Remove reference to perforce method that is not in a released - # version of hoe-seattlerb. - #sed -i -e '/perforce/d' Rakefile || die - sed -i -e '/license/d'
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/protected_attributes/
commit: 9f8249394049db0b44aa2389f085fd942439bc14 Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:29:47 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:22 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f824939 dev-ruby/protected_attributes: cleanup Package-Manager: portage-2.2.26 dev-ruby/protected_attributes/Manifest | 2 -- .../protected_attributes-1.0.9.ebuild | 40 -- .../protected_attributes-1.1.1.ebuild | 40 -- 3 files changed, 82 deletions(-) diff --git a/dev-ruby/protected_attributes/Manifest b/dev-ruby/protected_attributes/Manifest index 89d9a28..8bdd4c8 100644 --- a/dev-ruby/protected_attributes/Manifest +++ b/dev-ruby/protected_attributes/Manifest @@ -1,3 +1 @@ -DIST protected_attributes-1.0.9.tar.gz 22212 SHA256 e22ce3bbf9a6edea7c468518fb86aafefb4137f937f62552fe2d56c89fc2e19e SHA512 ed630460df14ea290d9146448908067e0f418568fa31f1f7dbc014954738ca8ee0ff70992c8d77eab9af446a2e1a91e24acb7585d9030a4ab6cae6ede8ee8a4a WHIRLPOOL 7af9a3c1c2c93c0b17443b7fbcbedbd1baa7c54c7541a692353195d3ea457ac530f31f2446835918c2ee0512aa585b3d574a913a9eebd1a39f24c5a988ac3d8c -DIST protected_attributes-1.1.1.tar.gz 23227 SHA256 bb946ebc575a8f9286ba689b641f6f397a79ea308c8008a1a30ee50c6c3b7bbc SHA512 94b21cfc5bbb16ad704e627a89d091d81e5a4c468052de3e6ad80292dab057408b4e6b230e68ef2382a089985faef790568851747e684710ecc5ad4ff6c3f0d3 WHIRLPOOL c5571d93a27301854bf27505ff98dc146a4f91fbb64f5d5ca36588239b535d6ca47f3971242ae2444e496151abd13239560cec2e17296c757549c826d911ba06 DIST protected_attributes-1.1.3.tar.gz 23148 SHA256 0dba89d47e96762b6e2c9cedc1d96a06a16bb307136e23cfc89830602bc97a4b SHA512 e20acd5c392eedc62af18745518249273351104dd0a05e33e459d2ac36706a7c6fdc151d4043370a4527d3e8e96417b26bad2e0f3b21cef3a512bd169d635d45 WHIRLPOOL 311cd7fd9634794d72fae25a903767cbf3894ea07814e8654739e30b3354a49cbe1417dd89462f94f7ed290e7d182132f57aa21106a1e9282be55f5c72508164 diff --git a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild deleted file mode 100644 index e217a9f..000 --- a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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_TEST="test" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models" -HOMEPAGE="https://github.com/rails/protected_attributes"; -SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="1" - -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_add_rdepend " - =dev-ruby/activemodel-4* >=dev-ruby/activemodel-4.0.1 -" - -ruby_add_bdepend "test? ( - dev-ruby/bundler - =dev-ruby/actionpack-4* - =dev-ruby/activerecord-4* - =dev-ruby/rails-4* - dev-ruby/mocha - dev-ruby/sqlite3 -)" - -all_ruby_prepare() { - sed -i -e '/github/ s:^:#:' Gemfile || die -} diff --git a/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild deleted file mode 100644 index aeb4f5d..000 --- a/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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_TEST="test" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models" -HOMEPAGE="https://github.com/rails/protected_attributes"; -SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="1" - -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_add_rdepend " - =dev-ruby/activemodel-4*:* >=dev-ruby/activemodel-4.0.1:* -" - -ruby_add_bdepend "test? ( - dev-ruby/bundler - =dev-ruby/actionpack-4* - =dev-ruby/activerecord-4* - =dev-ruby/rails-4* - dev-ruby/mocha - dev-ruby/sqlite3 -)" - -all_ruby_prepare() { - sed -i -e '/github/ s:^:#:' Gemfile || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fast_gettext/
commit: 194fbada7f5218d705e01f2bd0f17502453c930f Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 22 07:28:49 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 22 07:52:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194fbada dev-ruby/fast_gettext: update description Package-Manager: portage-2.2.26 dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild index ef29405..39f0ee6 100644 --- a/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild +++ b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md" @@ -13,7 +13,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3" inherit ruby-fakegem -DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!" +DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!" HOMEPAGE="https://github.com/grosser/fast_gettext"; SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] proj/releng:master commit in: releases/weekly/scripts/
commit: cf5d45a5f9070910d8060100403567f367c729bf Author: Matthew Thode mthode org> AuthorDate: Fri Jan 22 07:53:00 2016 + Commit: Matt Thode gentoo org> CommitDate: Fri Jan 22 07:53:00 2016 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=cf5d45a5 try to migrate to xattr pax markings for our stage4 releases/weekly/scripts/cloud-prep.sh | 4 1 file changed, 4 insertions(+) diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh index 577af84..3d60ca9 100644 --- a/releases/weekly/scripts/cloud-prep.sh +++ b/releases/weekly/scripts/cloud-prep.sh @@ -71,3 +71,7 @@ passwd -l root for i in $(find /var/log -type f); do truncate -s 0 $i; done # remove foreign manpages find /usr/share/man/ -mindepth 1 -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \; + +# fine if this fails, aka non-hardened +echo 'migraging pax' +/usr/sbin/migrate-pax -m
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 815056e5460579b8c5723257d53a1114430b9e66 Author: Michael Sterrett gentoo org> AuthorDate: Fri Jan 22 07:18:54 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Fri Jan 22 07:19:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815056e5 dev-games/ogre: fix building when OIS is not installed, with newer versions of cmake (bug #566126) Package-Manager: portage-2.2.26 dev-games/ogre/files/ogre-1.9.0-samples.patch | 13 + dev-games/ogre/ogre-1.9.0-r1.ebuild | 10 ++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch new file mode 100644 index 000..d7573d7 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig CMakeLists.txt +@@ -519,7 +519,9 @@ + endif () + + # Setup samples +-add_subdirectory(Samples) ++if (OGRE_BUILD_SAMPLES) ++add_subdirectory(Samples) ++endif () + + #Add android JNI binding + if(ANDROID) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 9b79034..7488f4b 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindFreetype" +CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" inherit eutils cmake-utils vcs-snapshot @@ -21,6 +21,7 @@ KEYWORDS="amd64 ~arm x86" IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip" REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) + examples? ( ois ) poco? ( threads ) tbb? ( threads ) ?? ( gl3plus ( || ( gles2 gles3 ) ) ) @@ -71,7 +72,8 @@ src_prepare() { epatch \ "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \ "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \ - "${FILESDIR}/${P}-gcc52.patch" + "${FILESDIR}/${P}-gcc52.patch" \ + "${FILESDIR}/${P}-samples.patch" } src_configure() { @@ -81,7 +83,6 @@ src_configure() { $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) $(cmake-utils_use doc OGRE_INSTALL_DOCS) $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) $(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS) @@ -90,9 +91,10 @@ src_configure() { $(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT) $(cmake-utils_use profile OGRE_PROFILING) $(cmake-utils_use examples OGRE_BUILD_SAMPLES) + $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) $(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE) -DOGRE_BUILD_TESTS=FALSE - $(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0") + -DOGRE_CONFIG_THREADS=$(usex threads 2 0) $(cmake-utils_use tools OGRE_BUILD_TOOLS) $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) )
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: d893c73394c9ac779ddc21b839b92869a0562e64 Author: Matthew Thode gentoo org> AuthorDate: Fri Jan 22 06:26:10 2016 + Commit: Matt Thode gentoo org> CommitDate: Fri Jan 22 06:28:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d893c733 net-nds/openldap: fixing heimdal usage for bug 528048 Package-Manager: portage-2.2.26 net-nds/openldap/metadata.xml | 1 + net-nds/openldap/openldap-2.4.43-r1.ebuild | 821 + 2 files changed, 822 insertions(+) diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml index cf1698e..3008482 100644 --- a/net-nds/openldap/metadata.xml +++ b/net-nds/openldap/metadata.xml @@ -7,6 +7,7 @@ Enable experimental backend options + Enable support for kerberos init Enable ODBC and SQL backend options Enable contributed OpenLDAP overlays Enable overlay for syncing ldap, unix and diff --git a/net-nds/openldap/openldap-2.4.43-r1.ebuild b/net-nds/openldap/openldap-2.4.43-r1.ebuild new file mode 100644 index 000..cea4ffd --- /dev/null +++ b/net-nds/openldap/openldap-2.4.43-r1.ebuild @@ -0,0 +1,821 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd + +BIS_PN=rfc2307bis.schema +BIS_PV=20140524 +BIS_P="${BIS_PN}-${BIS_PV}" + +DESCRIPTION="LDAP suite of application and development tools" +HOMEPAGE="http://www.OpenLDAP.org/"; + +# mirrors are mostly not working, using canonical URI +SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz +mirror://gentoo/${BIS_P}" + +LICENSE="OPENLDAP GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" + +IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" +IUSE_BACKEND="+berkdb" +IUSE_OVERLAY="overlays perl" +IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs" +IUSE_CONTRIB="smbkrb5passwd kerberos kinit" +IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" +IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" + +REQUIRED_USE="cxx? ( sasl ) + ?? ( gnutls libressl )" + +# always list newer first +# Do not add any AGPL-3 BDB here! +# See bug 525110, comment 15. +BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4' +BDB_PKGS='' +for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done + +# openssl is needed to generate lanman-passwords required by samba +CDEPEND="icu? ( dev-libs/icu:= ) + ssl? ( + !gnutls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + ) + gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) ) + sasl? ( dev-libs/cyrus-sasl:= ) + !minimal? ( + sys-devel/libtool + sys-libs/e2fsprogs-libs + >=dev-db/lmdb-0.9.14 + tcpd? ( sys-apps/tcp-wrappers ) + odbc? ( !iodbc? ( dev-db/unixODBC ) + iodbc? ( dev-db/libiodbc ) ) + slp? ( net-libs/openslp ) + perl? ( dev-lang/perl[-build(-)] ) + samba? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + berkdb? ( + ${l}" + eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" + eerror " 5. emerge --update \=net-nds/${PF}" + eerror " 6. etc-update, and ensure that you apply the changes" + eerror " 7. slapadd -l ${l}" + eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" + eerror " 9. /etc/init.d/slapd start" + eerror "10. check that your data is intact." + eerror "11. set up the new replication system." + eerror + if [ "${FORCE_UPGRADE}" != "1" ]; then + die "You need to upgrade your database first" + else + eerror "You have the magical FORCE_UPGRADE=1 in place." + eerror "Don't say you weren't warned about data loss." + fi +} + +pkg_setup() { + if ! use sasl && use cxx ; then + die "To build the ldapc++ library you must emerge openldap with sasl support" + fi + # Bug #322787 + if use minimal && ! has_version "net-nds/openldap" ; then + einfo "No datadir scan needed, openldap not installed" + elif use minimal && has_version "net-nds/openldap" && built_with_use n
[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/
commit: 2c8e2af9a675866b1756e67301fa708dd52c83f7 Author: Matthew Thode gentoo org> AuthorDate: Fri Jan 22 06:13:53 2016 + Commit: Matt Thode gentoo org> CommitDate: Fri Jan 22 06:13:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8e2af9 dev-python/pip: fixing the glaring bug in pip-8 Package-Manager: portage-2.2.26 dev-python/pip/pip-8.0.0-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-python/pip/pip-8.0.0-r1.ebuild b/dev-python/pip/pip-8.0.0-r1.ebuild index 842b1a9..228e34c 100644 --- a/dev-python/pip/pip-8.0.0-r1.ebuild +++ b/dev-python/pip/pip-8.0.0-r1.ebuild @@ -14,7 +14,8 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github. SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +# unkeyworded til pip fixes the glaring bug +KEYWORDS="" SLOT="0" # Check pip/_vendor/vendor.txt for this
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-headers/
commit: 9078a33f5cba62fabe88c059e3d31032d0f5416a Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:54:29 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:54:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9078a33f sys-kernel/linux-headers: Stable for HPPA PPC64 (bug #571528). Package-Manager: portage-2.2.27 RepoMan-Options: --ignore-arches sys-kernel/linux-headers/linux-headers-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild index d04e69f..57aff9d 100644 --- a/sys-kernel/linux-headers/linux-headers-4.3.ebuild +++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild @@ -13,7 +13,7 @@ PATCH_VER="1" SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" DEPEND="app-arch/xz-utils dev-lang/perl"
[gentoo-commits] repo/gentoo:master commit in: net-misc/geoipupdate/
commit: 2d56b757c655175c25ff0054fab34a7b6430dfa9 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:57:41 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:57:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d56b757 net-misc/geoipupdate: Version bump. Package-Manager: portage-2.2.27 net-misc/geoipupdate/Manifest | 1 + net-misc/geoipupdate/geoipupdate-2.2.2.ebuild | 28 +++ 2 files changed, 29 insertions(+) diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index f0e809e..7e0c6ce 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -1 +1,2 @@ DIST geoipupdate-2.2.1.tar.gz 340884 SHA256 9547c42cc8620b2c3040fd8df95e8ee45c8b6ebcca7737d641f9526104d5f446 SHA512 5d28803353badd4d00a9174202912524f31e057ef4f5381360c16909fbccce3033f5ad7ec9c55963b70c0bbdb74589932bde36ea9b34f2a0632c504c1718dd85 WHIRLPOOL d5255654481a237175948817f88a80eb71aad4e65050e84db9c4056bd0883c4fc8b0bd2ebc8343b3ab37a7b4358dd6d4f5fae57c742711eba1156e78c5c8be38 +DIST geoipupdate-2.2.2.tar.gz 341268 SHA256 156ab7604255a9c62c4a442c76d48d024ac813c6542639bffa93b28e2a781621 SHA512 598e3536ce544042e11de2a4d09b6ac57357cad5a36938401185cd181d73381a6e6c38b485684f9abe096d1b279a784b2e968ac67a8084715682871c7d575415 WHIRLPOOL 477f1117ebc2b708f2235ad057f31f9885d68d51ce39fd188a230aa258bae5fef02fe4b39e1b295bbf08a0484aaa18818e794c023fdf94e26e82bcbd32abb703 diff --git a/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild b/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild new file mode 100644 index 000..78a4fc3 --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate"; +SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND=" + net-misc/curl + sys-libs/zlib +" +RDEPEND=" + ${DEPEND} + !
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/
commit: bd173518ec4032ac85626dbe0c0880a9aa012396 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:46:11 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:46:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd173518 net-misc/chrony: Old. Package-Manager: portage-2.2.27 net-misc/chrony/chrony-2.2-r1.ebuild | 114 --- 1 file changed, 114 deletions(-) diff --git a/net-misc/chrony/chrony-2.2-r1.ebuild b/net-misc/chrony/chrony-2.2-r1.ebuild deleted file mode 100644 index 04ce021..000 --- a/net-misc/chrony/chrony-2.2-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="http://chrony.tuxfamily.org/"; -SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) -" -DEPEND=" - ${CDEPEND} - sys-apps/texinfo -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - sed -i \ - -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ - -e 's:/var/run:/run:g' \ - conf.c chrony.texi.in examples/* || die -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(usex caps '' --disable-linuxcaps) \ - $(usex cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex rtc '' --disable-rtc) \ - $(usex refclock '' --disable-refclock) \ - $(usex adns '' --disable-asyncdns) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --docdir=/usr/share/doc/${PF} \ - --chronysockdir=/run/chrony \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --disable-sechash \ - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs -} - -src_install() { - default - - doinfo chrony.info* - - newinitd "${FILESDIR}"/chronyd.init-r1 chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - dodoc examples/*.example* - - keepdir /var/{lib,log}/chrony - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.2.logrotate chrony - - systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service - systemd_enable_ntpunit 50-chrony chronyd.service -}
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/
commit: a306eddeea640e2ea230838a0248d9c8a3cd77e6 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:44:20 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:44:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a306edde net-misc/chrony: Old. Package-Manager: portage-2.2.27 net-misc/chrony/Manifest | 1 - net-misc/chrony/chrony-2.1.1.ebuild| 114 - net-misc/chrony/files/chrony.logrotate | 11 3 files changed, 126 deletions(-) diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 930d5cb..cd0cc0c 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,3 +1,2 @@ -DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce DIST chrony-2.2.tar.gz 340285 SHA256 d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 SHA512 40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 WHIRLPOOL 0f517914935b150bce9a42507f1c4b04ec50d9406d1ac504b396abbe0646a3bce21299cb6b946159e7369800bbcd106257bf2c02e544fffd19d8211f232ed469 diff --git a/net-misc/chrony/chrony-2.1.1.ebuild b/net-misc/chrony/chrony-2.1.1.ebuild deleted file mode 100644 index ac2cc6a..000 --- a/net-misc/chrony/chrony-2.1.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="http://chrony.tuxfamily.org/"; -SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86" -IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) -" -DEPEND=" - ${CDEPEND} - sys-apps/texinfo -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - sed -i \ - -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ - -e 's:/var/run:/run:g' \ - conf.c chrony.texi.in chrony.txt examples/* FAQ || die -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(usex caps '' --disable-linuxcaps) \ - $(usex cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex rtc '' --disable-rtc) \ - $(usex refclock '' --disable-refclock) \ - $(usex adns '' --disable-asyncdns) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --docdir=/usr/share/doc/${PF} \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --disable-sechash \ - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs -} - -src_install() { - default - rm "${D}"/usr/share/doc/${PF}/COPYING || di
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/
commit: f99936e2dd804556d3283a014e3cd35b3966246b Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:43:15 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:43:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99936e2 net-misc/chrony: Version bump (bug #572566). Package-Manager: portage-2.2.27 net-misc/chrony/Manifest| 1 + net-misc/chrony/chrony-2.2.1.ebuild | 114 2 files changed, 115 insertions(+) diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 541f200..930d5cb 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1,3 @@ DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e +DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce DIST chrony-2.2.tar.gz 340285 SHA256 d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 SHA512 40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 WHIRLPOOL 0f517914935b150bce9a42507f1c4b04ec50d9406d1ac504b396abbe0646a3bce21299cb6b946159e7369800bbcd106257bf2c02e544fffd19d8211f232ed469 diff --git a/net-misc/chrony/chrony-2.2.1.ebuild b/net-misc/chrony/chrony-2.2.1.ebuild new file mode 100644 index 000..04ce021 --- /dev/null +++ b/net-misc/chrony/chrony-2.2.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils systemd toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="http://chrony.tuxfamily.org/"; +SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" +REQUIRED_USE=" + ?? ( libedit readline ) +" + +CDEPEND=" + caps? ( sys-libs/libcap ) + libedit? ( dev-libs/libedit ) + readline? ( >=sys-libs/readline-4.1-r4:= ) +" +DEPEND=" + ${CDEPEND} + sys-apps/texinfo +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +RESTRICT=test + +S="${WORKDIR}/${P/_/-}" + +src_prepare() { + sed -i \ + -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ + -e 's:/var/run:/run:g' \ + conf.c chrony.texi.in examples/* || die +} + +src_configure() { + tc-export CC + + local CHRONY_EDITLINE + # ./configure legend: + # --disable-readline : disable line editing entirely + # --without-readline : do not use sys-libs/readline (enabled by default) + # --without-editline : do not use dev-libs/libedit (enabled by default) + if ! use readline && ! use libedit; then + CHRONY_EDITLINE='--disable-readline' + else + CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" + CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" + fi + + # not an autotools generated script + local CHRONY_CONFIGURE=" + ./configure \ + $(usex caps '' --disable-linuxcaps) \ + $(usex cmdmon '' --disable-cmdmon) \ + $(usex ipv6 '' --disable-ipv6) \ + $(usex ntp '' --disable-ntp) \ + $(usex phc '' --disable-phc) \ + $(usex pps '' --disable-pps) \ + $(usex rtc '' --disable-rtc) \ + $(usex refclock '' --disable-refclock) \ + $(usex adns '' --disable-asyncdns) \ + ${CHRONY_EDITLINE} \ + ${EXTRA_ECONF} \ + --docdir=/usr/share/doc/${PF} \ + --chronysockdir=/run/chrony \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --prefix=/usr \ + --sysconfdir=/etc/chrony \ + --disable-sechash \ + --without-nss \ + --without-tomcrypt + " + + # print the ./configure call to aid in future debugging + einfo ${CHRONY_CONFIGURE} + bash ${CHRONY_CONFIGURE} || die +} + +src_compile() { + emake all docs +} + +src_install() { + default + + doinfo chrony.info* + + newinitd
[gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/
commit: aa43de5147eab2b05a7c96aace1062dd5ae8dd34 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:18:11 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:18:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa43de51 net-misc/ntp: Stable for HPPA PPC64 (bug #572452). Package-Manager: portage-2.2.27 RepoMan-Options: --ignore-arches net-misc/ntp/ntp-4.2.8_p6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/ntp/ntp-4.2.8_p6.ebuild b/net-misc/ntp/ntp-4.2.8_p6.ebuild index fe48104..20ad350 100644 --- a/net-misc/ntp/ntp-4.2.8_p6.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p6.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
[gentoo-commits] repo/gentoo:master commit in: sys-apps/sandbox/
commit: 65c9fed88f8f17292b725ff4ec69f5c38c47551a Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 22 04:19:01 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 22 04:19:01 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c9fed8 sys-apps/sandbox: Stable for HPPA PPC64 (bug #571308). Package-Manager: portage-2.2.27 RepoMan-Options: --ignore-arches sys-apps/sandbox/sandbox-2.10-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/sandbox/sandbox-2.10-r1.ebuild b/sys-apps/sandbox/sandbox-2.10-r1.ebuild index d6c4990..c707305 100644 --- a/sys-apps/sandbox/sandbox-2.10-r1.ebuild +++ b/sys-apps/sandbox/sandbox-2.10-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="multilib" DEPEND="app-arch/xz-utils
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 983c6cb7293ccd7b01bf09f7813c599c5bbb88ac Author: Zero_Chaos gentoo org> AuthorDate: Fri Jan 22 03:07:51 2016 + Commit: Richard Farina gentoo org> CommitDate: Fri Jan 22 03:07:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=983c6cb7 net-libs/libbtbb: fix copyright Package-Manager: portage-2.2.27 net-libs/libbtbb/libbtbb-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index f200128..437a5c9 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 543eb42f3aafad30ceb50598f7816a8cda945a34 Author: Zero_Chaos gentoo org> AuthorDate: Fri Jan 22 03:07:17 2016 + Commit: Richard Farina gentoo org> CommitDate: Fri Jan 22 03:07:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=543eb42f net-libs/libbtbb: update to support pre and port wireshark 2 Package-Manager: portage-2.2.27 net-libs/libbtbb/libbtbb-.ebuild | 31 +-- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/net-libs/libbtbb/libbtbb-.ebuild b/net-libs/libbtbb/libbtbb-.ebuild index 3d12be1..f200128 100644 --- a/net-libs/libbtbb/libbtbb-.ebuild +++ b/net-libs/libbtbb/libbtbb-.ebuild @@ -29,7 +29,6 @@ RDEPEND=" pcap? ( net-libs/libpcap ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= - !>net-analyzer/wireshark-1.98 ) " DEPEND="${RDEPEND} @@ -56,7 +55,11 @@ src_prepare(){ for i in ${plugins} do sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_prepare done @@ -77,7 +80,11 @@ src_configure() { if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" @@ -95,7 +102,11 @@ src_compile(){ if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_compile done @@ -110,7 +121,11 @@ src_test(){ if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_test done @@ -125,7 +140,11 @@ src_install(){ if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_install done
[gentoo-commits] proj/eselect-php:master commit in: /, src/
commit: 1d1a53e19a9dab621249c1cdf698e2aec30d5d1a Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 00:30:25 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 00:45:28 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=1d1a53e1 Add 70_mod_php.conf.in to the project source. We are currently shipping 70_mod_php.conf as part of the Gentoo ebuild for eselect-php. This introduces a potential disconnect between the path in php.eselect and the path in 70_mod_php.conf. By adding the conf file to the project, we are able to ensure that they are both set to the same value. Moreover, the new autotools directory magic lets us set them both based on @localstatedir@. So, for example, in the conf file we have "@localstatedir /lib/eselect-php/mod_php.conf" and in php.eselect we have "@localstatedir@/lib/eselect-php". We have followed the PHP project's lead in assuming that $localstatedir will be set to (for example) /var and not /var/lib. See Gentoo bug 572002. For testing, you should now use something like, ./configure --bindir=/usr/bin --sysconfdir=/etc --localstatedir=/var Of course, the ebuild for eselect-php will automatically pass the correct values to ./configure. Makefile.am| 6 +- src/70_mod_php.conf.in | 24 src/php.eselect.in.in | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 073abf9..9487f1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,9 @@ eselectdir = $(datadir)/eselect/modules nodist_eselect_DATA = $(srcdir)/src/php.eselect +apacheconfdir = $(sysconfdir)/apache2/modules.d +nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf + # The next few rules allow us to replace bindir, libdir, and # localstatedir within our script and conf file. The example is taken # from the autoconf documentation and can be found in the @@ -9,7 +12,7 @@ edit = sed -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@libdir[@]|$(libdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' -$(nodist_eselect_DATA): Makefile +$(nodist_eselect_DATA) $(nodist_apacheconf_DATA): Makefile rm -f $@ $@.tmp srcdir=''; \ test -f ./$@.in || srcdir=$(srcdir)/; \ @@ -17,3 +20,4 @@ $(nodist_eselect_DATA): Makefile mv $@.tmp $@ $(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in +$(srcdir)/src/70_mod_php.conf: $(srcdir)/src/70_mod_php.conf.in diff --git a/src/70_mod_php.conf.in b/src/70_mod_php.conf.in new file mode 100644 index 000..4b97354 --- /dev/null +++ b/src/70_mod_php.conf.in @@ -0,0 +1,24 @@ + + # The mod_php.so symlink is controlled by + # eselect-php. However, the module name changed from + # php5_module to php7_module so we can't blindly load whatever + # is there. Instead we let eselect-php manage a small + # configuration file that loads the appropriate module. + Include "@localstatedir@/lib/eselect-php/mod_php.conf" + + # Tell apache that mod_php should handle PHP files. + # + # NOTE: Avoiding AddHandler/AddType for security (bug + # #538822). Please read the related news item! + + SetHandler application/x-httpd-php + + + # PHP source files which are meant to be displayed as + # syntax-highlighted source code. + + SetHandler application/x-httpd-php-source + + + DirectoryIndex index.php index.phtml + diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index e24cd39..689b1db 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -332,7 +332,7 @@ get_sapi_active_target() { # write_mod_php_conf() { local target="${1}" - local conf_dir="${EROOT}"/var/lib/eselect-php + local conf_dir="@localstatedir@/lib/eselect-php" local conf_path="${conf_dir}/mod_php.conf" @MKDIR_P@ "${conf_dir}" || die "failed to create ${conf_dir}"
[gentoo-commits] proj/eselect-php:master commit in: src/
commit: bd79e633184e446b6e0985e80539dd7ce6c81a62 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 00:00:32 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 00:00:32 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=bd79e633 Replace custom bindir handling with the new autotools magic. As a first test of the new directory substitution, replace one instance of custom bindir handling. Use @bindir@ instead of "${EROOT}/usr/bin" sapi_active_link_dir(). The results should coincide when configured with, ./configure --bindir="${EROOT}"/usr/bin src/php.eselect.in.in | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index b2a0dd5..e24cd39 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -114,14 +114,13 @@ sapi_active_link_target_dir() { # sapi_active_link_dir() { local sapi="${1}" - local bin_dir="${EROOT}/usr/bin" case "${sapi}" in apache2) echo "${EROOT}$(get_active_libdir)/apache2/modules" ;; - cli) echo "${bin_dir}" ;; - fpm) echo "${bin_dir}" ;; - cgi) echo "${bin_dir}" ;; - phpdbg) echo "${bin_dir}" ;; + cli) echo "@bindir@" ;; + fpm) echo "@bindir@" ;; + cgi) echo "@bindir@" ;; + phpdbg) echo "@bindir@" ;; *) die "invalid SAPI name: ${sapi}" ;; esac }
[gentoo-commits] proj/eselect-php:master commit in: src/, /
commit: 79787fcc061362905f0b47a67c922884a27616fc Author: Michael Orlitzky gentoo org> AuthorDate: Thu Jan 21 23:53:18 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Thu Jan 21 23:53:18 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=79787fcc Add another layer of indirection to get @bindir@ and friends in the output. When we create php.eselect from php.eselect.in using autoconf, we don't have a way to get the full, expanded value of @bindir@, @libdir@, and the other paths that we need. The autoconf documentation suggests a workaround for this: add another layer of indirection, and use the Makefile to substitute those values into the output files. This commit sets the stage by renaming php.eselect.in to php.eselect.in.in. The first round of processing by autoconf takes php.eselect.in.in to php.eselect.in. The Makefile will then generate php.eselect from php.eselect.in after substituting @bindir@, @libdir@, and @localstatedir@. Makefile.am | 19 ++- configure.ac | 2 +- src/{php.eselect.in => php.eselect.in.in} | 0 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 330f491..073abf9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,19 @@ eselectdir = $(datadir)/eselect/modules -nodist_eselect_DATA = src/php.eselect +nodist_eselect_DATA = $(srcdir)/src/php.eselect + +# The next few rules allow us to replace bindir, libdir, and +# localstatedir within our script and conf file. The example is taken +# from the autoconf documentation and can be found in the +# "Installation Directory Variables" section. +edit = sed -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@libdir[@]|$(libdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' + +$(nodist_eselect_DATA): Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$@.in > $@.tmp + mv $@.tmp $@ + +$(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in diff --git a/configure.ac b/configure.ac index 2f1f609..c118e0e 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,6 @@ AC_PATH_PROG(SORT,sort) AC_PATH_PROG(UNIQ,uniq) # List of output files. -AC_CONFIG_FILES([Makefile src/php.eselect]) +AC_CONFIG_FILES([Makefile src/php.eselect.in]) AC_OUTPUT diff --git a/src/php.eselect.in b/src/php.eselect.in.in similarity index 100% rename from src/php.eselect.in rename to src/php.eselect.in.in
[gentoo-commits] proj/eselect-php:master commit in: src/
commit: 34ff75367a2941a99339a9ea46bf6faaad270f0f Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 03:11:51 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 03:11:51 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=34ff7536 Add a TODO to find_targets() about an error condition. src/php.eselect.in.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index d3428bd..ff3914f 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -224,6 +224,9 @@ update_sapi() { # A space-separated list of target names, for example, "php5.6 php7.0". # find_targets() { + # TODO: when there aren't any phpX.Y directories, this returns + # "php*.*". This doesn't seem to bother our consumers, but it + # would probably be more polite to return nothing in that case. cd "@LIBDIR@" && echo php*.* }
[gentoo-commits] proj/eselect-php:master commit in: src/, /
commit: f4a2678217a23ce0db353173f74a556039b5b08d Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 02:12:37 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 02:12:37 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=f4a26782 Use uppercase @BINDIR@, @LIBDIR@, etc. for autotools substitution. The last few commits introduced a problem: by passing php.eselect.in.in through autoconf, we unwittingly replace things like @bindir@ with ${exec_prefix}. This is because lowercase @bindir@ gets defined for automake and is intended to be based on the other directory variables like @exec_prefix@. Since we're replacing them after the fact in the Makefile, this commit avoids the autoconf mangling by making them all uppercase. Makefile.am| 6 +++--- src/70_mod_php.conf.in | 2 +- src/php.eselect.in.in | 18 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9487f1b..1d1132e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,9 @@ nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf # localstatedir within our script and conf file. The example is taken # from the autoconf documentation and can be found in the # "Installation Directory Variables" section. -edit = sed -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' +edit = sed -e 's|@BINDIR[@]|$(bindir)|g' \ + -e 's|@LIBDIR[@]|$(libdir)|g' \ + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' $(nodist_eselect_DATA) $(nodist_apacheconf_DATA): Makefile rm -f $@ $@.tmp diff --git a/src/70_mod_php.conf.in b/src/70_mod_php.conf.in index 4b97354..a9d348d 100644 --- a/src/70_mod_php.conf.in +++ b/src/70_mod_php.conf.in @@ -4,7 +4,7 @@ # php5_module to php7_module so we can't blindly load whatever # is there. Instead we let eselect-php manage a small # configuration file that loads the appropriate module. - Include "@localstatedir@/lib/eselect-php/mod_php.conf" + Include "@LOCALSTATEDIR@/lib/eselect-php/mod_php.conf" # Tell apache that mod_php should handle PHP files. # diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index e1edb42..d3428bd 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -88,7 +88,7 @@ sapi_active_link_target_dir() { local sapi="${1}" local target="${2}" - local link_target_dir="@libdir@/${target}/bin" + local link_target_dir="@LIBDIR@/${target}/bin" if [[ "${sapi}" == "apache2" ]] ; then link_target_dir+="/../apache2" fi @@ -116,11 +116,11 @@ sapi_active_link_dir() { local sapi="${1}" case "${sapi}" in - apache2) echo "@libdir@/apache2/modules" ;; - cli) echo "@bindir@" ;; - fpm) echo "@bindir@" ;; - cgi) echo "@bindir@" ;; - phpdbg) echo "@bindir@" ;; + apache2) echo "@LIBDIR@/apache2/modules" ;; + cli) echo "@BINDIR@" ;; + fpm) echo "@BINDIR@" ;; + cgi) echo "@BINDIR@" ;; + phpdbg) echo "@BINDIR@" ;; *) die "invalid SAPI name: ${sapi}" ;; esac } @@ -198,7 +198,7 @@ cleanup_sapi() { fi if [[ "${sapi}" == "apache2" ]] ; then - rm -f "@libdir@"/apache2/modules/libphp[57].so \ + rm -f "@LIBDIR@"/apache2/modules/libphp[57].so \ || die "failed to remove old libphp.so symlink" fi @@ -258,7 +258,7 @@ find_sapi_targets() { esac for target in $(find_targets); do - local pattern="@libdir@/${target}/${pattern_suffix}" + local pattern="@LIBDIR@/${target}/${pattern_suffix}" for file in $pattern; do [[ -f "${file}" ]] && echo "${target}" @@ -313,7 +313,7 @@ get_sapi_active_target() { # write_mod_php_conf() { local target="${1}" - local conf_dir="@localstatedir@/lib/eselect-php" + local conf_dir="@LOCALSTATEDIR@/lib/eselect-php" local conf_path="${conf_dir}/mod_php.conf" @MKDIR_P@ "${conf_dir}" || die "failed to create ${conf_dir}"
[gentoo-commits] proj/eselect-php:master commit in: src/
commit: 32f6c1c424df3e8f7ed9705323e2911ee43b7696 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 02:11:54 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 02:11:54 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=32f6c1c4 Clean up and document find_targets(). src/php.eselect.in.in | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index 0c83de7..e1edb42 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -214,15 +214,17 @@ update_sapi() { set_$sapi $target } -find_targets() { - local dirs - - for dir in "@libdir@"/php*.*; do - t=$(basename $dir) - has $t $dirs || dirs="${dirs} $t" - done - echo $dirs +# +# Find all valid target names by searching libdir for directories like +# php5.6, php7.0, etc. +# +# OUTPUT: +# +# A space-separated list of target names, for example, "php5.6 php7.0". +# +find_targets() { + cd "@LIBDIR@" && echo php*.* } # List all valid targets for the given SAPI. The list is obtained by
[gentoo-commits] proj/eselect-php:master commit in: src/
commit: 71d449ab84cacc518b6a11c891feed86367c8244 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 01:47:16 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 01:47:16 2016 + URL:https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=71d449ab Replace get_libdirs() and get_active_libdir() with autotools magic. The get_libdirs() function is a heuristic to determine which libdirs are available on the system. The get_active_libdir() function then chose the first one as the "active" libdir. In a few places we either chose the "active" libdir, or looped through all of them to find some other thing of interest (like the valid targets). Now that we compute @libdir@ at build time, we can replace all of that with the one correct value of @libdir@. The functions get_libdirs() and get_active_libdir() are removed entirely. src/php.eselect.in.in | 47 +-- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index 689b1db..0c83de7 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -88,7 +88,7 @@ sapi_active_link_target_dir() { local sapi="${1}" local target="${2}" - local link_target_dir="${EROOT}$(get_active_libdir)/${target}/bin" + local link_target_dir="@libdir@/${target}/bin" if [[ "${sapi}" == "apache2" ]] ; then link_target_dir+="/../apache2" fi @@ -116,7 +116,7 @@ sapi_active_link_dir() { local sapi="${1}" case "${sapi}" in - apache2) echo "${EROOT}$(get_active_libdir)/apache2/modules" ;; + apache2) echo "@libdir@/apache2/modules" ;; cli) echo "@bindir@" ;; fpm) echo "@bindir@" ;; cgi) echo "@bindir@" ;; @@ -198,7 +198,7 @@ cleanup_sapi() { fi if [[ "${sapi}" == "apache2" ]] ; then - rm -f "${EROOT}$(get_active_libdir)"/apache2/modules/libphp[57].so \ + rm -f "@libdir@"/apache2/modules/libphp[57].so \ || die "failed to remove old libphp.so symlink" fi @@ -214,35 +214,15 @@ update_sapi() { set_$sapi $target } -get_libdirs() { - local dir libdirs - for dir in $(list_libdirs); do - [[ -L ${EROOT}/usr/${dir} ]] && continue - ls "${EROOT}"/usr/${dir}/php*.* > /dev/null 2>&1 || continue - - libdirs+=' '/usr/${dir} - done - echo ${libdirs:-/usr/lib} -} +find_targets() { + local dirs -get_active_libdir() { - local dir - for dir in $(get_libdirs); do - echo ${dir} - return + for dir in "@libdir@"/php*.*; do + t=$(basename $dir) + has $t $dirs || dirs="${dirs} $t" done - echo /usr/lib -} -find_targets() { - local dir dirs libdir - for libdir in $(get_libdirs); do - for dir in "${EROOT}"${libdir}/php*.*; do - t=$(basename $dir) - has $t $dirs || dirs="${dirs} $t" - done - done - echo $dirs + echo $dirs } # List all valid targets for the given SAPI. The list is obtained by @@ -276,11 +256,10 @@ find_sapi_targets() { esac for target in $(find_targets); do - for libdir in $(get_libdirs); do - local pattern="${EROOT}${libdir}/${target}/${pattern_suffix}" - for file in $pattern; do - [[ -f "${file}" ]] && echo "${target}" - done + local pattern="@libdir@/${target}/${pattern_suffix}" + + for file in $pattern; do + [[ -f "${file}" ]] && echo "${target}" done done | @SORT@ | @UNIQ@ }
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_perl/
commit: 18c5ce75ed3c4dda9a70277cdb9af98f93e0afae Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Jan 22 00:02:45 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Fri Jan 22 00:02:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c5ce75 www-apache/mod_perl: Restore keywords after encouraging feedback Package-Manager: portage-2.2.26 www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild index 722d40c..2de8412 100644 --- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"; LICENSE="GPL-2" SLOT="1" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug" # Make sure we always use the latest Apache-Test version or even check the
[gentoo-commits] proj/musl:master commit in: sys-apps/sandbox/files/, sys-apps/sandbox/
commit: 90225ea32c41056dc22f7a9c5d038d4f773b98ab Author: Anthony G. Basile gentoo org> AuthorDate: Thu Jan 21 23:04:39 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Jan 21 23:04:39 2016 + URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=90225ea3 sys-apps/sandbox: bumpt to 2.10 Package-Manager: portage-2.2.26 RepoMan-Options: --force sys-apps/sandbox/Manifest | 4 + .../sandbox/files/sandbox-2.10-disable-same.patch | 77 .../files/sandbox-2.10-memory-corruption.patch | 42 +++ sys-apps/sandbox/sandbox-2.10-r99.ebuild | 129 + 4 files changed, 252 insertions(+) diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index ee7e77a..4c3a3bd 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,4 +1,6 @@ AUX 09sandbox 37 SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a WHIRLPOOL 80d55a34d3faf3314f2b9de2200d4b46a800128514be9e30eb59e5f03fb7a0a5197a9e5b5ab33d6b68d35bf83c86a1bd7ba734a33ccd382fe0af3b2c2a11d0bd +AUX sandbox-2.10-disable-same.patch 2547 SHA256 09a11cf077ae69684080d1f0fd8fe83683fdf5f061e0a7a5261ca03463fd554a SHA512 bf005fbde7b6ba88df36bb75064658764e488dd2f3c96a6f92c69ad3f2e8d2db12ba2c7bafa9656326b7fde73301c330f68bd064efa0fce2a7eb28fff6ce0a1e WHIRLPOOL 27f0df961dcedc70819ecd1d0f105fb7176ecd77127ab187025d9aa52df9faa43941314c71a998dd72658105dfec4c5c6d3341dbae18e18b409af7dc6d9c31d6 +AUX sandbox-2.10-memory-corruption.patch 1515 SHA256 4876cc9962d56d3c5fc5418fe12ef1a399e34ff0272f12640c4a5c5b775e SHA512 1eb650824cc7a876fabef382cafb451a507326a8422fb7bb5014699046b64ea8f4cf2bba9efcb75d7a2eac4eff493d06153422f85c119f49635ac0840071660c WHIRLPOOL db2c834119c7887ed746154e73e88cc09bf2a31184b3cda2732b70cb43dd8bc7f59f1072a4cc56ebcf593ba67330b932dc186ee55e009428d607f62293ab AUX sandbox-2.6-check-empty-paths-at.patch 7454 SHA256 a48759a4d3e9a70713473b6fad59bdd750b5cd37e7d632c786205ff20004ae2c SHA512 5eba7915dedf57f44c37881e9c6b48db8733d1493779a33127d08bb9ea77056d788ec9ace72c13eb101f42f01c95309c7cebca6c76212a8c99a8655372c0b7d7 WHIRLPOOL 46eb3a8ef8f22030cd793f3b16adc190b5750019c0df83e161c6918f08555a8ad890c1425b03cbf7e53ebcd34a07a9dd9b594d0c0fe31834656ffce3d58fa284 AUX sandbox-2.6-desktop.patch 875 SHA256 2eecf67790aeac210f9aa899a86f7664776ed65d9b55159e1b359162dfb9ff74 SHA512 b72ec7f414d19bf513dfb1aea10523fa5dc07a1375d8f08f664d204b64b23c891a79ca14987528c595936f441e1f595b366aabbc57313667c7639d73d089ed9a WHIRLPOOL 7f787b8be9b5712eb2b2a0cd2ff825df1045ebf1cc4e73a50f610e620d30752045690a5c28835465d0ab0c3c4a9eaf8b92a5c123cd741ad69dfedb31aa457fa0 AUX sandbox-2.6-include-PROTECTED-symbols.patch 569 SHA256 6edd24b329fd9908005e8566002f213d2799375ad4fced483be4707ddf0570ed SHA512 d96644fc48ec70f992bef55ccae03c0034bfb669586b8257a2c74f1cf0b78f2fbfebc2417ac62cd15841cc5e973272962252b88ca066224cf118eecf060e0d80 WHIRLPOOL f377d71928a6fb84b1e413ae2f4335fe6753d6cc056cb21fe758c8b5559330473a88098c85863c3157b0b5bec8f5530f233f1a2a659eee553c3bb07ae3633399 @@ -8,6 +10,8 @@ AUX sandbox-2.6-no-pch.patch 702 SHA256 d95a65ffe23c6c81f6b1e695f27cffc1cb617ebf AUX sandbox-2.6-open-nofollow.patch 2027 SHA256 c8816ae4e1991f9941abd43ec4bfdbf4e99cf36ee90694f77ab88754c53785ce SHA512 dd5222f32a40def38c9719363a24c48d5b112e3560b44c5f32afc3daa0614fe9bc5cb68ca8ac69032cc8d6299f09b25d4d7c72e16892188b42768ffb28c19f07 WHIRLPOOL 03cb5fb9df04a8d7f92855c292a6c431d01d330fecae198f2c4b95d824454f10ce1ad66db1a9d54d1bef5f74989cf6debb2d98de28ee0c2c6a09c1a0752b5519 AUX sandbox-2.6-static-close-fd.patch 2945 SHA256 807eb4dc1ba6543c94a90a9a53bb89f42079ea20ed7c196f82d65f280e5de96a SHA512 e2f57c4d80816241f3ba4828c2b27c67d1d604b14b2d575888a978e5c4e8e47e60e3a609d81e59c615bc5b7cee6194cc362e255ae8508f632862a35180c30de8 WHIRLPOOL e08f60227fe954894d3a3a01297e9988f4d7722ea75ffbd2b0f3971d38c8ce00af230fcaecb1f53243a868d54f48bb680e2d547bbeb2ee3e5a11f8942d2084fd AUX sandbox-2.6-trace-hppa.patch 850 SHA256 20688b2f33162f95af4af5e3c7d3700f2e7776e454b785ac1398f0870f84efa9 SHA512 fb7bf2202f960e952edc1e52fe4b6b085042158223d96b9baa899e871abcdef711ede3122c971120f55f71cc1aad71496a6079222dbaaa6c14b0c6f7ea182454 WHIRLPOOL 80f7fb529b912d19d81b9d71ee4a648db7b217583f2e8f2054cc666839030ea7d0112d69d52a2bf35c4d3549ffbd81dbd0cd39d5993bfabbb43bcb6a4455ade4 +DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192 DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SH
[gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-vmware/
commit: 06af3c5f947b36268c5cad6487af29df7d357629 Author: Matthew Thode gentoo org> AuthorDate: Thu Jan 21 22:42:52 2016 + Commit: Matt Thode gentoo org> CommitDate: Thu Jan 21 22:42:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06af3c5f Revert "dev-python/oslo-vmware: Drop old" This reverts commit c362cc01553c7f6f196c580e81044462a405be7e. dev-python/oslo-vmware/Manifest | 1 + dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild | 74 2 files changed, 75 insertions(+) diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest index 2975624..59f05db 100644 --- a/dev-python/oslo-vmware/Manifest +++ b/dev-python/oslo-vmware/Manifest @@ -1 +1,2 @@ +DIST oslo.vmware-0.11.2.tar.gz 102933 SHA256 036cf0ad6ab0d4defd743678999851d570c2ca1ff34eba916920ce54d9a5d348 SHA512 632635adcc09749d0fe8bd204e1b06374e9790cec4d53cbaa06b2afa6745460cd417d60df26cb1e287d6e9de98eaa09788c6797993a06d8649b765a9298d0f39 WHIRLPOOL dd77312f307e5f65a969bae52e52dbab175e4a25f627d3ccf35435ac64c551093b8b67b707388d46175d93f344e2731ebdfa2ba6062ac3b562a00877cc98b880 DIST oslo.vmware-1.21.0.tar.gz 83619 SHA256 afea2361aa1447efd2bc10d34636beadb718ecb4698d06fc3776ede498bff86a SHA512 2ca607de95d33ec175e09fa07438db8844c10da5929f2fa8d35ef8d63f628508f9c2de62e11ebc496e89c76d93c533413a973ab8b29219431d72770e19dd2d04 WHIRLPOOL 14fc58a01e94468b4eacd78d2d47fff623525edf5a9035957392b4ae5b1179798b3d6c667e87c266d698c861971eee2f24b2b2530ce9b8fc0ccbf2ad59f6c6aa diff --git a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild new file mode 100644 index 000..27e1124 --- /dev/null +++ b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="Oslo VMware library for OpenStack projects" +HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"; +SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz" +S="${WORKDIR}/oslo.vmware-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/pbr-0.8[${PYTHON_USEDEP}] + =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] + =dev-python/pylint-1.3.0[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + =dev-python/mox3-0.7.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}] + !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] + =dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] +
[gentoo-commits] repo/gentoo:master commit in: dev-python/urllib3/
commit: a048d7585ca1a6bff9a7e2c1264334aee05ae7d5 Author: Matthew Thode gentoo org> AuthorDate: Thu Jan 21 22:46:26 2016 + Commit: Matt Thode gentoo org> CommitDate: Thu Jan 21 22:46:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a048d758 Revert "dev-python/urllib3: Drop old" This reverts commit 3f0191e75f48a00b0a6a483ce945c96c6c46d1a0. dev-python/urllib3/Manifest | 4 ++ dev-python/urllib3/urllib3-1.10.3.ebuild | 80 dev-python/urllib3/urllib3-1.10.4.ebuild | 71 dev-python/urllib3/urllib3-1.10.ebuild | 70 dev-python/urllib3/urllib3-1.9.1.ebuild | 70 5 files changed, 295 insertions(+) diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index 2124861..f78ef39 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,3 +1,7 @@ +DIST urllib3-1.10.3.tar.gz 136894 SHA256 ce1bb9a3f103610a062ace3ae6e56ebf2fa0fbeb5c395d601c64d8a7e6df180b SHA512 d36280a29f1580565e79c58991d4ecf2cd69d2b262950bb90c1b0f89f225b6b3cee556914b6a7b3031dd074af8ae6187e6a3641ad8591c6b870203c33d40b113 WHIRLPOOL 5042b1c7e3c156d26c83a770636d9e7a9cf45b638f1b8733603afa255fe1a3ac03abb6447ba5e3f1ad98d7a449fe164c374ab5e131566b15e7c9281ba39677bc +DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09 SHA512 83118aa5bf23add5bb5dafd98d32459315d971246ac2a49f7f0d0fcad6414099885f6d4fc7847de17e983b949c8a21fa4ed71c0216e578bdfc8eb351672f7c09 WHIRLPOOL 03431b6c575f3399bf8876d7dfad126986864e3a3f09d05e7e682b5b374ed420854c776a3d7bac91538086e43a9b832975aaf0b1b2e3fcde1ba8cfe93417bdc3 +DIST urllib3-1.10.tar.gz 128200 SHA256 25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599 SHA512 32f9162f82a676146fae6bba462d21eb81635d8660ca4676b5e8dd3d18b68525a265695c646f06c099a78c24d9b108f0610d3e17f20578d473771bebd42cc52d WHIRLPOOL a8a84b79fd0edeecdd19eaef0ee809d1c5d842ff6bcf089df9a744a2f42bec1a366b76b6e7334a51cad83d42b166f133a4156bbbfb7be24518353ee71081 DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70 DIST urllib3-1.13.1.tar.gz 156259 SHA256 6eba1d713f8552e37ac4081c6bdf7be9f5a79f58447aed762bf24cc34c5e3983 SHA512 663c0a10b0e6b8a2c337cf799e45b8d949cbf0f542e22204fe31af193c7275c499ddf0ac3470152cc51bed56a0f5b77f1897140801b732773f606e77e8cea420 WHIRLPOOL d0c3ea06f7a8180eca9b22197ddad6f04ea9b9c5fe254ade00e12fb9a5ffeaa9264a5a160cc49ebd87a1822ba13af22bef357a241b7b76b2281f400f776e309e DIST urllib3-1.14.tar.gz 161497 SHA256 dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37 SHA512 8c315b442bc7454e421f2c801cc2bbfc011fb2eb5dcbd2ff7d6078dab0bb5254e3e1489496758cec190ebd0c249962fa1fe24fe6535e844a681350e9d7353562 WHIRLPOOL 3be475d5591328d304bbf48392ab563a7d5013907c96298abaf34b06a7a16fe81d56a03f6a73d50c9679334b140f00789a71a918f2ea1e6951e5351324852f3c +DIST urllib3-1.9.1.tar.gz 171086 SHA256 d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b SHA512 c972e4dc9dabf6378da75e0abce5e53bec29624f2dc0faff3c8ce762474d490da6aec7d2e374c57d0d18e640311845750eb257fc7829ac9d25a3d9c957c59c6f WHIRLPOOL 666b82e712939b3ff5dfe109ba0498c16dbea7f2c0f0c2e1c317cf7e6f03711ce4a9468bb72327abe7821aa75c0257d30dbce5c196ba59215df3dba4084c7360 diff --git a/dev-python/urllib3/urllib3-1.10.3.ebuild b/dev-python/urllib3/urllib3-1.10.3.ebuild new file mode 100644 index 000..f8c38b6 --- /dev/null +++ b/dev-python/urllib3/urllib3-1.10.3.ebuild @@ -0,0 +1,80 @@ +# 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} pypy ) + +inherit distutils-r1 + +DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" +HOMEPAGE="https://github.com/shazow/urllib3"; +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="doc test" + +RDEPEND="dev-python/six[${PYTHON_USEDEP}] + $(python_gen_cond_dep \ + 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + ~www-servers/tornado-3.1.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) + dev-python/nose[${PYTHON_USEDEP}] ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + " + +python_prepare_all() { + # Replace bundled copy of dev-python/six + cat > urllib3/packages/s
[gentoo-commits] repo/gentoo:master commit in: dev-python/urllib3/
commit: 27635b6af25a80b4e97943751c6464a2445d3e38 Author: Matthew Thode gentoo org> AuthorDate: Thu Jan 21 22:48:45 2016 + Commit: Matt Thode gentoo org> CommitDate: Thu Jan 21 22:51:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27635b6a dev-python/urllib3: re-cleanup-old Package-Manager: portage-2.2.26 dev-python/urllib3/Manifest | 3 -- dev-python/urllib3/urllib3-1.10.3.ebuild | 80 dev-python/urllib3/urllib3-1.10.4.ebuild | 2 +- dev-python/urllib3/urllib3-1.10.ebuild | 70 dev-python/urllib3/urllib3-1.9.1.ebuild | 70 5 files changed, 1 insertion(+), 224 deletions(-) diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index f78ef39..f81a6bb 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,7 +1,4 @@ -DIST urllib3-1.10.3.tar.gz 136894 SHA256 ce1bb9a3f103610a062ace3ae6e56ebf2fa0fbeb5c395d601c64d8a7e6df180b SHA512 d36280a29f1580565e79c58991d4ecf2cd69d2b262950bb90c1b0f89f225b6b3cee556914b6a7b3031dd074af8ae6187e6a3641ad8591c6b870203c33d40b113 WHIRLPOOL 5042b1c7e3c156d26c83a770636d9e7a9cf45b638f1b8733603afa255fe1a3ac03abb6447ba5e3f1ad98d7a449fe164c374ab5e131566b15e7c9281ba39677bc DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09 SHA512 83118aa5bf23add5bb5dafd98d32459315d971246ac2a49f7f0d0fcad6414099885f6d4fc7847de17e983b949c8a21fa4ed71c0216e578bdfc8eb351672f7c09 WHIRLPOOL 03431b6c575f3399bf8876d7dfad126986864e3a3f09d05e7e682b5b374ed420854c776a3d7bac91538086e43a9b832975aaf0b1b2e3fcde1ba8cfe93417bdc3 -DIST urllib3-1.10.tar.gz 128200 SHA256 25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599 SHA512 32f9162f82a676146fae6bba462d21eb81635d8660ca4676b5e8dd3d18b68525a265695c646f06c099a78c24d9b108f0610d3e17f20578d473771bebd42cc52d WHIRLPOOL a8a84b79fd0edeecdd19eaef0ee809d1c5d842ff6bcf089df9a744a2f42bec1a366b76b6e7334a51cad83d42b166f133a4156bbbfb7be24518353ee71081 DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70 DIST urllib3-1.13.1.tar.gz 156259 SHA256 6eba1d713f8552e37ac4081c6bdf7be9f5a79f58447aed762bf24cc34c5e3983 SHA512 663c0a10b0e6b8a2c337cf799e45b8d949cbf0f542e22204fe31af193c7275c499ddf0ac3470152cc51bed56a0f5b77f1897140801b732773f606e77e8cea420 WHIRLPOOL d0c3ea06f7a8180eca9b22197ddad6f04ea9b9c5fe254ade00e12fb9a5ffeaa9264a5a160cc49ebd87a1822ba13af22bef357a241b7b76b2281f400f776e309e DIST urllib3-1.14.tar.gz 161497 SHA256 dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37 SHA512 8c315b442bc7454e421f2c801cc2bbfc011fb2eb5dcbd2ff7d6078dab0bb5254e3e1489496758cec190ebd0c249962fa1fe24fe6535e844a681350e9d7353562 WHIRLPOOL 3be475d5591328d304bbf48392ab563a7d5013907c96298abaf34b06a7a16fe81d56a03f6a73d50c9679334b140f00789a71a918f2ea1e6951e5351324852f3c -DIST urllib3-1.9.1.tar.gz 171086 SHA256 d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b SHA512 c972e4dc9dabf6378da75e0abce5e53bec29624f2dc0faff3c8ce762474d490da6aec7d2e374c57d0d18e640311845750eb257fc7829ac9d25a3d9c957c59c6f WHIRLPOOL 666b82e712939b3ff5dfe109ba0498c16dbea7f2c0f0c2e1c317cf7e6f03711ce4a9468bb72327abe7821aa75c0257d30dbce5c196ba59215df3dba4084c7360 diff --git a/dev-python/urllib3/urllib3-1.10.3.ebuild b/dev-python/urllib3/urllib3-1.10.3.ebuild deleted file mode 100644 index f8c38b6..000 --- a/dev-python/urllib3/urllib3-1.10.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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} pypy ) - -inherit distutils-r1 - -DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" -HOMEPAGE="https://github.com/shazow/urllib3"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="doc test" - -RDEPEND="dev-python/six[${PYTHON_USEDEP}] - $(python_gen_cond_dep \ - 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - ~www-servers/tornado-3.1.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) - dev-python/nose[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - " - -python_prepare_all() { - # Replace bundled copy of dev-python/six - cat > urllib3/packages/six.py <<-EOF - from __futu
[gentoo-commits] proj/openrc:0.20.x commit in: /
commit: fd699ddf2f266c98d7ada3409b94233eb4b23b9a Author: William Hubbs gmail com> AuthorDate: Wed Jan 20 16:12:34 2016 + Commit: William Hubbs gentoo org> CommitDate: Wed Jan 20 16:12:34 2016 + URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fd699ddf start 0.20.4 Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index 5890501..dff47ad 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,3 +1,3 @@ NAME= openrc -VERSION= 0.20.3 +VERSION= 0.20.4 PKG= ${NAME}-${VERSION}
[gentoo-commits] proj/openrc:0.20.x commit in: man/, src/librc/
commit: 3f8eb261ac46abdec3a42d4967e95d16efc3d65a Author: William Hubbs gmail com> AuthorDate: Thu Jan 21 21:35:55 2016 + Commit: William Hubbs gentoo org> CommitDate: Thu Jan 21 22:45:56 2016 + URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3f8eb261 librc: Complain when a real and virtual service have the same name man/openrc-run.8 | 6 +++--- src/librc/librc-depend.c | 26 ++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/man/openrc-run.8 b/man/openrc-run.8 index 08012f7..b23c5fe 100644 --- a/man/openrc-run.8 +++ b/man/openrc-run.8 @@ -172,9 +172,9 @@ The service will start after these services and stop before these services. The service will start before these services and stop after these services. .It Ic provide The service provides this virtual service. For example, named provides dns. -Virtual services take precedence over real services, so it is highly -recommended that you do not have a real service that has the same name -as a virtual service. +Note that it is not legal to have a virtual and real service with the +same name. If you do this, you will receive an error message, and you +must rename either the real or virtual service. .It Ic config We should recalculate our dependencies if the listed files have changed. .It Ic keyword diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index d64b2b2..1c99399 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -717,14 +717,16 @@ rc_deptree_update_needed(time_t *newest, char *file) } librc_hidden_def(rc_deptree_update_needed) -/* This is a 6 phase operation +/* This is a 7 phase operation Phase 1 is a shell script which loads each init script and config in turn and echos their dependency info to stdout Phase 2 takes that and populates a depinfo object with that data Phase 3 adds any provided services to the depinfo object Phase 4 scans that depinfo object and puts in backlinks Phase 5 removes broken before dependencies - Phase 6 saves the depinfo object to disk + Phase 6 looks for duplicate services indicating a real and virtual service + with the same names + Phase 7 saves the depinfo object to disk */ bool rc_deptree_update(void) @@ -733,7 +735,7 @@ rc_deptree_update(void) RC_DEPTREE *deptree, *providers; RC_DEPINFO *depinfo = NULL, *depinfo_np, *di; RC_DEPTYPE *deptype = NULL, *dt_np, *dt, *provide; - RC_STRINGLIST *config, *types, *sorted, *visited; + RC_STRINGLIST *config, *dupes, *types, *sorted, *visited; RC_STRING *s, *s2, *s2_np, *s3, *s4; char *line = NULL; size_t len = 0; @@ -742,6 +744,7 @@ rc_deptree_update(void) bool retval = true; const char *sys = rc_sys(); struct utsname uts; + int serrno; /* Some init scripts need RC_LIBEXECDIR to source stuff Ideally we should be setting our full env instead */ @@ -996,7 +999,22 @@ rc_deptree_update(void) } rc_stringlist_free(types); - /* Phase 6 - save to disk + /* Phase 6 - Print errors for duplicate services */ + dupes = rc_stringlist_new(); + TAILQ_FOREACH(depinfo, deptree, entries) { + serrno = errno; + errno = 0; + rc_stringlist_addu(dupes,depinfo->service); + if (errno == EEXIST) { + fprintf(stderr, + "Error: %s is the name of a real and virtual service.\n", + depinfo->service); + } + errno = serrno; + } + rc_stringlist_free(dupes); + + /* Phase 7 - save to disk Now that we're purely in C, do we need to keep a shell parseable file? I think yes as then it stays human readable This works and should be entirely shell parseable provided that depend
[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/
commit: 505af695d8bebdf468ada0899931554b31b4d22c Author: William Hubbs gmail com> AuthorDate: Wed Jan 20 17:19:01 2016 + Commit: William Hubbs gentoo org> CommitDate: Thu Jan 21 22:45:56 2016 + URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=505af695 openrc-run: in verbose mode, log execution of the shell script This is to show when openrc-run runs the openrc-run.sh script; it is used for debugging. src/rc/openrc-run.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c index 757412a..2a4b90d 100644 --- a/src/rc/openrc-run.c +++ b/src/rc/openrc-run.c @@ -390,6 +390,14 @@ svc_exec(const char *arg1, const char *arg2) } if (exists(RC_SVCDIR "/openrc-run.sh")) { + if (arg2) + einfov("Executing: %s %s %s %s %s", + RC_SVCDIR "/openrc-run.sh", RC_SVCDIR "/openrc-run.sh", + service, arg1, arg2); + else + einfov("Executing: %s %s %s %s", + RC_SVCDIR "/openrc-run.sh", RC_SVCDIR "/openrc-run.sh", + service, arg1); execl(RC_SVCDIR "/openrc-run.sh", RC_SVCDIR "/openrc-run.sh", service, arg1, arg2, (char *) NULL); @@ -397,6 +405,16 @@ svc_exec(const char *arg1, const char *arg2) service, strerror(errno)); _exit(EXIT_FAILURE); } else { + if (arg2) + einfov("Executing: %s %s %s %s %s", + RC_LIBEXECDIR "/sh/openrc-run.sh", + RC_LIBEXECDIR "/sh/openrc-run.sh", + service, arg1, arg2); + else + einfov("Executing: %s %s %s %s", + RC_LIBEXECDIR "/sh/openrc-run.sh", + RC_LIBEXECDIR "/sh/openrc-run.sh", + service, arg1); execl(RC_LIBEXECDIR "/sh/openrc-run.sh", RC_LIBEXECDIR "/sh/openrc-run.sh", service, arg1, arg2, (char *) NULL);
[gentoo-commits] proj/openrc:master commit in: man/, src/librc/
commit: 69f052b611878d771fc3f56ee77639269db9b6e1 Author: William Hubbs gmail com> AuthorDate: Thu Jan 21 21:35:55 2016 + Commit: William Hubbs gentoo org> CommitDate: Thu Jan 21 21:58:03 2016 + URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=69f052b6 librc: Complain when a real and virtual service have the same name man/openrc-run.8 | 6 +++--- src/librc/librc-depend.c | 26 ++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/man/openrc-run.8 b/man/openrc-run.8 index 08012f7..b23c5fe 100644 --- a/man/openrc-run.8 +++ b/man/openrc-run.8 @@ -172,9 +172,9 @@ The service will start after these services and stop before these services. The service will start before these services and stop after these services. .It Ic provide The service provides this virtual service. For example, named provides dns. -Virtual services take precedence over real services, so it is highly -recommended that you do not have a real service that has the same name -as a virtual service. +Note that it is not legal to have a virtual and real service with the +same name. If you do this, you will receive an error message, and you +must rename either the real or virtual service. .It Ic config We should recalculate our dependencies if the listed files have changed. .It Ic keyword diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index d64b2b2..1c99399 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -717,14 +717,16 @@ rc_deptree_update_needed(time_t *newest, char *file) } librc_hidden_def(rc_deptree_update_needed) -/* This is a 6 phase operation +/* This is a 7 phase operation Phase 1 is a shell script which loads each init script and config in turn and echos their dependency info to stdout Phase 2 takes that and populates a depinfo object with that data Phase 3 adds any provided services to the depinfo object Phase 4 scans that depinfo object and puts in backlinks Phase 5 removes broken before dependencies - Phase 6 saves the depinfo object to disk + Phase 6 looks for duplicate services indicating a real and virtual service + with the same names + Phase 7 saves the depinfo object to disk */ bool rc_deptree_update(void) @@ -733,7 +735,7 @@ rc_deptree_update(void) RC_DEPTREE *deptree, *providers; RC_DEPINFO *depinfo = NULL, *depinfo_np, *di; RC_DEPTYPE *deptype = NULL, *dt_np, *dt, *provide; - RC_STRINGLIST *config, *types, *sorted, *visited; + RC_STRINGLIST *config, *dupes, *types, *sorted, *visited; RC_STRING *s, *s2, *s2_np, *s3, *s4; char *line = NULL; size_t len = 0; @@ -742,6 +744,7 @@ rc_deptree_update(void) bool retval = true; const char *sys = rc_sys(); struct utsname uts; + int serrno; /* Some init scripts need RC_LIBEXECDIR to source stuff Ideally we should be setting our full env instead */ @@ -996,7 +999,22 @@ rc_deptree_update(void) } rc_stringlist_free(types); - /* Phase 6 - save to disk + /* Phase 6 - Print errors for duplicate services */ + dupes = rc_stringlist_new(); + TAILQ_FOREACH(depinfo, deptree, entries) { + serrno = errno; + errno = 0; + rc_stringlist_addu(dupes,depinfo->service); + if (errno == EEXIST) { + fprintf(stderr, + "Error: %s is the name of a real and virtual service.\n", + depinfo->service); + } + errno = serrno; + } + rc_stringlist_free(dupes); + + /* Phase 7 - save to disk Now that we're purely in C, do we need to keep a shell parseable file? I think yes as then it stays human readable This works and should be entirely shell parseable provided that depend
[gentoo-commits] proj/openrc:0.20.x commit in: sh/
commit: f419d8b03aeb26739d11b79a899af2ad0a0a7b89 Author: Colin Booth heliocat net> AuthorDate: Mon Sep 14 07:43:42 2015 + Commit: William Hubbs gentoo org> CommitDate: Wed Jan 20 16:14:41 2016 + URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f419d8b0 sh/s6.sh: update s6-svc syntax to be valid for 2.2.0.0+ The s6-svc syntax changed for wait-up, wait-ready, wait-down, and wait-finished. This changes the s6 handling script to use the current valid syntax. This fixes #65. sh/s6.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sh/s6.sh b/sh/s6.sh index 7f378d5..447419c 100644 --- a/sh/s6.sh +++ b/sh/s6.sh @@ -41,7 +41,7 @@ s6_stop() fi s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}" ebegin "Stopping ${name:-$RC_SVCNAME}" - s6-svc -Dd -T ${s6_service_timeout_stop:-1} "${s6_service_link}" + s6-svc -wD -d -T ${s6_service_timeout_stop:-1} "${s6_service_link}" set -- $(s6-svstat "${s6_service_link}") [ "$1" = "down" ] eend $? "Failed to stop $RC_SVCNAME"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/
commit: 35df53dcefb2e98e8b71c0605700476276a66a15 Author: Matthew Thode gentoo org> AuthorDate: Thu Jan 21 22:40:48 2016 + Commit: Matt Thode gentoo org> CommitDate: Thu Jan 21 22:40:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35df53dc sys-cluster/nova: adding dosfstools for vfat config drive Package-Manager: portage-2.2.26 sys-cluster/nova/nova-12.0.1.ebuild | 1 + sys-cluster/nova/nova-2015.2..ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sys-cluster/nova/nova-12.0.1.ebuild b/sys-cluster/nova/nova-12.0.1.ebuild index 2d218b9..9d49c42 100644 --- a/sys-cluster/nova/nova-12.0.1.ebuild +++ b/sys-cluster/nova/nova-12.0.1.ebuild @@ -221,6 +221,7 @@ RDEPEND=" net-misc/bridge-utils compute? ( app-cdr/cdrkit + sys-fs/dosfstools kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) diff --git a/sys-cluster/nova/nova-2015.2..ebuild b/sys-cluster/nova/nova-2015.2..ebuild index 0e80b1d..2c6ccd0 100644 --- a/sys-cluster/nova/nova-2015.2..ebuild +++ b/sys-cluster/nova/nova-2015.2..ebuild @@ -221,6 +221,7 @@ RDEPEND=" net-misc/bridge-utils compute? ( app-cdr/cdrkit + sys-fs/dosfstools kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools )
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/gnap-ext/
commit: 701c1e602539b135eb16754d397c55d619eb031a Author: Michał Górny gentoo org> AuthorDate: Thu Jan 21 22:11:01 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu Jan 21 22:13:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701c1e60 dev-embedded/gnap-ext: Move to maintainer-needed The two other gnap packages are maintainer-needed@ already, and all three were announced maintainer-needed on the mailing list. It seems that this package was missed accidentally. URL: http://article.gmane.org/gmane.linux.gentoo.devel/50444 dev-embedded/gnap-ext/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/gnap-ext/metadata.xml b/dev-embedded/gnap-ext/metadata.xml index 2d5a145..91f4e72 100644 --- a/dev-embedded/gnap-ext/metadata.xml +++ b/dev-embedded/gnap-ext/metadata.xml @@ -2,6 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - g...@gentoo.org + maintainer-nee...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-util/re2c/
commit: 3019e1b663ba430fb2db3949aa07f2f43cc9d231 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Jan 21 21:20:32 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Jan 21 21:45:07 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3019e1b6 dev-util/re2c: bump up to 0.16 Package-Manager: portage-2.2.27 dev-util/re2c/Manifest | 1 + dev-util/re2c/re2c-0.16.ebuild | 29 + 2 files changed, 30 insertions(+) diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest index 47efeea..8455d3a 100644 --- a/dev-util/re2c/Manifest +++ b/dev-util/re2c/Manifest @@ -5,3 +5,4 @@ DIST re2c-0.14.2.tar.gz 2554944 SHA256 a702eb63977af471edb41eba3b47bbfdcdb44 DIST re2c-0.14.3.tar.gz 2576859 SHA256 1c6806df599f3aef0804b576cfdf64bdba5ad590626dfca2d44e473460917e84 SHA512 c1fa20c9c1e69d085415dde3177cb03688f8a9314dd4854241812f479a2b1e4306c3abbb8f9f31763918afbd1f7a821e7337551a898f6ae57f814c66e59e2382 WHIRLPOOL dd08d837c93737d9a4dd8fd9f01de721e26b569b2686a2d066636e130f6eb82a8b8b71e8b5d84fcf44993998250effc17c2c3dbc1fd6e1651c5b5ba18a36e8fe DIST re2c-0.15.2.tar.gz 4074407 SHA256 fe708c3477d908f02f2ab1646ac194d88b5dbfd92912b020a2b7a5bdfb778889 SHA512 6e46e45b55665a0898354b2684326ca91ff3fb50d2f52e7a7cba59658876c743cb141c827f3d3c77c1d44089c16a4207cb48e97f5af383ac1c95bc063388ba73 WHIRLPOOL 9f5f5636e19d7e9cb136b9f18a0059569ca6f1562f2c1302bc0212386e61f5be8eb866c4513e91231cfc4bf6ac3eeb24a672cd81675155dce244a48152b7ea3a DIST re2c-0.15.3.tar.gz 4881197 SHA256 f9d2a96c60a8c60d9c6c70e10590cbceaf0776d3115e7b3b35c7d7240cc1613b SHA512 eebe372543b8c8fafa5d1a206c5fc5e92ea36e78da3ac5cd2e52d2710435cc83c8604bfb5397b48abef1d6ba241b9ed8a15119b436236b116bc81579a8dd9247 WHIRLPOOL 3bb18924d008762f49c78c98f7678b6f81295f86e4a69a884c86763a3b7855870adfcafe5912f8cbd81672ca7c38c00ffd51e5d5e8f4935fd0ac842f394128f9 +DIST re2c-0.16.tar.gz 4892417 SHA256 48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84 SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3 WHIRLPOOL de28f65acac11ea36aad72eb8ba8f63949dcc10e9712ac84be91a66cd4216c01dee9eb360bf95db1c32de79cf9aa7ad2a1656eb877c52d44dd95a45e2b24253a diff --git a/dev-util/re2c/re2c-0.16.ebuild b/dev-util/re2c/re2c-0.16.ebuild new file mode 100644 index 000..b7e4e5a --- /dev/null +++ b/dev-util/re2c/re2c-0.16.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="tool for generating C-based recognizers from regular expressions" +HOMEPAGE="http://re2c.org/"; +SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"; + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" + +src_prepare() { + epatch_user + export ac_cv_path_BISON="no" +} + +src_install() { + default + + docompress -x /usr/share/doc/${PF}/{examples,paper} + dodoc -r README CHANGELOG examples + docinto paper + dodoc doc/loplas.ps doc/sample.bib +}
[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/
commit: 65b592e774b96f5f026295a6d28159e6ac46d138 Author: Brian Evans gentoo org> AuthorDate: Thu Jan 21 21:18:37 2016 + Commit: Brian Evans gentoo org> CommitDate: Thu Jan 21 21:18:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b592e7 dev-db/mycli: Bump live version deps to match upstream Package-Manager: portage-2.2.26 dev-db/mycli/mycli-.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-db/mycli/mycli-.ebuild b/dev-db/mycli/mycli-.ebuild index a21b495..b9ceb8c 100644 --- a/dev-db/mycli/mycli-.ebuild +++ b/dev-db/mycli/mycli-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,8 +20,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND=" >=dev-python/click-4.1[${PYTHON_USEDEP}] >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + =dev-python/prompt_toolkit-0.57[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - =dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}] >=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}] >=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}] "
[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/
commit: 0a63d5faeffc0a5cb9a5b6884858af1c30d86176 Author: Brian Evans gentoo org> AuthorDate: Thu Jan 21 21:13:31 2016 + Commit: Brian Evans gentoo org> CommitDate: Thu Jan 21 21:13:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a63d5fa dev-db/mycli: Revision bump with missing pycrypto dependency Package-Manager: portage-2.2.26 dev-db/mycli/mycli-1.5.2-r1.ebuild | 32 1 file changed, 32 insertions(+) diff --git a/dev-db/mycli/mycli-1.5.2-r1.ebuild b/dev-db/mycli/mycli-1.5.2-r1.ebuild new file mode 100644 index 000..4b5c124 --- /dev/null +++ b/dev-db/mycli/mycli-1.5.2-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +inherit distutils-r1 + +DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting" + +HOMEPAGE="http://mycli.net"; +SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=" + >=dev-python/click-4.1[${PYTHON_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + =dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_USEDEP}] + >=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}] + >=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}] +" + +src_prepare() { + rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py" + distutils-r1_src_prepare +}
[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
commit: aa974fcb99a7d4ee243e9c519bc25cd9ad74860f Author: Brian Evans gentoo org> AuthorDate: Thu Jan 21 21:15:25 2016 + Commit: Brian Evans gentoo org> CommitDate: Thu Jan 21 21:15:25 2016 + URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=aa974fcb dev-db/mysql: Add new 5.7 version. Needs more testing Package-Manager: portage-2.2.26 Manifest-Sign-Key: D1F781EFF9F4A3B6 dev-db/mysql/ChangeLog | 7 +- dev-db/mysql/Manifest| 24 ++ dev-db/mysql/mysql-5.7.10.ebuild | 172 +++ 3 files changed, 202 insertions(+), 1 deletion(-) diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 3256438..bf66231 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for dev-db/mysql -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*mysql-5.7.10 (21 Jan 2016) + + 21 Jan 2016; Brian Evans +mysql-5.7.10.ebuild: + dev-db/mysql: Add new 5.7 version. Needs more testing + 19 Aug 2015; Brian Evans mysql-5.7.7_rc.ebuild, mysql-5.7.8_rc.ebuild: dev-db/mysql: Drop keywords ~hppa ~ppc ~sparc ~sparc-fbsd MySQL 5.7 requires diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index ca2d123..a74bdc9 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,3 +1,6 @@ +-BEGIN PGP SIGNED MESSAGE- +Hash: SHA256 + DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257 DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517 @@ -5,6 +8,7 @@ DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c30 DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535 DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7 DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2 +DIST mysql-5.7.10.tar.gz 48919371 SHA256 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 SHA512 4434cf651b9607ed2fffbfc8e190bcc2109c8e4b3f8d4e504199721e69332b137b37eab3ab1e91dc08420641a342e99f8d8ae8dfdea60f37f89d94a15bdbd75c WHIRLPOOL 323a41d5b9996145c9769076d636cf293ae5073e3ea3c582752d72727c1538e0cc08076b69f481b921cd06bd6505e84fb6c28ba4ffa2190e4e8204aca96c7b9f DIST mysql-5.7.7-rc.tar.gz 47772644 SHA256 1f3069670ff6f1453a6b9ad569485977036c0d91a7267f15934e71ee1c7f8ff0 SHA512 443c74b6c5a5845a0ae3be054aa69970b49f5e71941316e80c680c416f0a0d06596ca6e314ffda7e735775e2eeb2414bbe11ea964a84593d9433ca6961cb257c WHIRLPOOL 29d4586e889fe426ff5f07d2a5d727db7165266f7f02910b1737d4f882b95fcb5b156c01f52b8f5bbb80c021d0e408a87ca032503f74a64fee2e90af43d98ec5 DIST mysql-5.7.8-rc.tar.gz 49762480 SHA256 9da4bff6e0840d260b2fef2dac0138e6f0fa05f2a95cf3f6cb1014a0fd46269b SHA512 97f77c2e3fc3fe2a1fbc4c9008f6ed75bfd64a309f066237de8a28c242cead98ad1700c133e21101545e9d7780f6e30aad0620ea6abe6dd40c0f63a20aaed44b WHIRLPOOL e63fda54bf90d883f90fdc3f9591914fc867a5dd0945cf6480396
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firehol/
commit: de179b7f1e4362fc67983fe166f9b9c53dc046d0 Author: Alon Bar-Lev gentoo org> AuthorDate: Thu Jan 21 21:01:24 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Thu Jan 21 21:01:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de179b7f net-firewall/firehol: remove uselss comments Package-Manager: portage-2.2.26 net-firewall/firehol/firehol-3.0.1.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/net-firewall/firehol/firehol-3.0.1.ebuild b/net-firewall/firehol/firehol-3.0.1.ebuild index 2509875..f5fc8df 100644 --- a/net-firewall/firehol/firehol-3.0.1.ebuild +++ b/net-firewall/firehol/firehol-3.0.1.ebuild @@ -37,8 +37,6 @@ pkg_setup() { } src_configure() { - # removing IP6TABLES_CMD has no effect and enable build - # without ipv6 available econf \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --disable-vnetbuild \
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firehol/
commit: d68ae7e391da0f456ed0d9c97ff1e17461e246ab Author: Alon Bar-Lev gentoo org> AuthorDate: Thu Jan 21 20:42:46 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Thu Jan 21 20:42:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d68ae7e3 net-firewall/firehol: version bump Package-Manager: portage-2.2.26 net-firewall/firehol/Manifest | 1 + net-firewall/firehol/firehol-3.0.1.ebuild | 57 +++ 2 files changed, 58 insertions(+) diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index a8fcdc4..4c8eeb4 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -1,2 +1,3 @@ DIST firehol-2.0.3.tar.xz 898248 SHA256 4bcc2d19ee7d41377f19c3bcd3ae882ba10dd3ebed6eac2deedbce202d1a3d72 SHA512 fab1ddea6d60d5cb91eacc73f79549f454abc7d581c696463f4396465257a708af175f18da7aa2c6ddc3dddc68b21528edb043a3fe539d16f5057e4f0c0db0b6 WHIRLPOOL 50556da7e392575ef2e36a489e544295f909c8621be5e7c91ad8b00f99879d1eebe59076948d8e58839869771547e85c425262438eb5f79d4b2bd8f2bb0009f8 DIST firehol-2.0.4.tar.xz 900876 SHA256 f41ff31920402c80aa823a298cc437e9a0b4d9ff0320f3f75cb55c62407dad4c SHA512 b73053c3fc1cb4e5e83cc2b25a99bf06c14623f9e574af2b11b198ecc2fb84119f0ab60cb3ff96b32601c717118693869eb3fea2b0fdc61bb49f197fb73abcca WHIRLPOOL 05bc39636c7d496e321f191b03efe2f8d1dcd6aec537a41e7ae4bac3ee4386f718728ad965fdacb46f02f949986f6979f17d41dc21f06d7ad62f3e744f0599d1 +DIST firehol-3.0.1.tar.xz 1407436 SHA256 63904b635dbd096035a720f84ad4ff74f32cec75357001638f4748c49cce46c7 SHA512 8c1bdb2a8b1bf551036d0ee58e7538a2e6513427db353af7e4415ed91cab95fe363e348d5ff32a82767b0fa4db69c469d228a05fa70fdfb8a9b81a2e6b78bae4 WHIRLPOOL a0189ef5da2f2ed15a51b32ec0be60a036d9806053b44bbc538e524fe57d28230e8676fb8352ab1b7b36998e6e68806b324768606c21f64c2c39b6698f2e6d58 diff --git a/net-firewall/firehol/firehol-3.0.1.ebuild b/net-firewall/firehol/firehol-3.0.1.ebuild new file mode 100644 index 000..2509875 --- /dev/null +++ b/net-firewall/firehol/firehol-3.0.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info + +DESCRIPTION="iptables firewall generator" +HOMEPAGE="http://firehol.sourceforge.net/"; +SRC_URI="https://firehol.org/download/firehol/releases/v${PV}/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc ipv6" +KEYWORDS="~amd64" + +RDEPEND="net-firewall/iptables + sys-apps/iproute2[-minimal] + net-misc/iprange + virtual/modutils + app-arch/gzip" +DEPEND="${RDEPEND}" + +pkg_setup() { + local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ + ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ + ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ + ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" + + get_version + if [ ${KV_PATCH} -ge 25 ]; then + CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" + else + CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" + fi + linux-info_pkg_setup +} + +src_configure() { + # removing IP6TABLES_CMD has no effect and enable build + # without ipv6 available + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --disable-vnetbuild \ + --disable-update-ipsets \ + $(use_enable doc) \ + $(use_enable ipv6) +} + +src_install() { + default + + newconfd "${FILESDIR}"/firehol.conf.d firehol + newinitd "${FILESDIR}"/firehol.initrd firehol + newconfd "${FILESDIR}"/fireqos.conf.d fireqos + newinitd "${FILESDIR}"/fireqos.initrd fireqos +}
[gentoo-commits] repo/gentoo:master commit in: net-misc/iprange/
commit: 9f48a03b01def8cc222ba6bfb78b38af22d71f1f Author: Alon Bar-Lev gentoo org> AuthorDate: Thu Jan 21 20:41:17 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Thu Jan 21 20:41:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f48a03b net-misc/iprange: initial import Package-Manager: portage-2.2.26 net-misc/iprange/Manifest | 1 + net-misc/iprange/iprange-1.0.2.ebuild | 17 + net-misc/iprange/metadata.xml | 7 +++ 3 files changed, 25 insertions(+) diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest new file mode 100644 index 000..97e3c93 --- /dev/null +++ b/net-misc/iprange/Manifest @@ -0,0 +1 @@ +DIST iprange-1.0.2.tar.xz 104396 SHA256 5a136728d7ed27b94fd0c5e6307b7bae9ab3795f4006cbfab353ea2a77503d2e SHA512 da27976b5fb9dec3a88cf608683ad29a0796c08150e163d7a02815b35a5e16c96c592bbf876c60f105b8f6efc76f1a1d7d84a0cdd20b50a04e4407b743843696 WHIRLPOOL 39cb49d5013792de4029a65c94d4c643a96743bfba4b5305a1e8bc9499138bee5562a7c76226579f4e15d3f982d94085163a4efa5eb424117f4d0bd73c7b6bc2 diff --git a/net-misc/iprange/iprange-1.0.2.ebuild b/net-misc/iprange/iprange-1.0.2.ebuild new file mode 100644 index 000..9e1aef2 --- /dev/null +++ b/net-misc/iprange/iprange-1.0.2.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="iprange utility" +HOMEPAGE="https://firehol.org"; +SRC_URI=""https://firehol.org/download/iprange/releases/v${PV}/${P}.tar.xz + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml new file mode 100644 index 000..f3ea32c --- /dev/null +++ b/net-misc/iprange/metadata.xml @@ -0,0 +1,7 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + alo...@gentoo.org + +
[gentoo-commits] repo/gentoo:master commit in: net-firewall/firehol/
commit: 151b2a413d51947c600f17a7de7033b7685608c4 Author: Alon Bar-Lev gentoo org> AuthorDate: Thu Jan 21 20:03:13 2016 + Commit: Alon Bar-Lev gentoo org> CommitDate: Thu Jan 21 20:04:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151b2a41 net-firewall/firehol: version bump Bug: 571940 Package-Manager: portage-2.2.26 net-firewall/firehol/Manifest | 1 + net-firewall/firehol/firehol-2.0.4.ebuild | 62 +++ 2 files changed, 63 insertions(+) diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index 8989966..a8fcdc4 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -1 +1,2 @@ DIST firehol-2.0.3.tar.xz 898248 SHA256 4bcc2d19ee7d41377f19c3bcd3ae882ba10dd3ebed6eac2deedbce202d1a3d72 SHA512 fab1ddea6d60d5cb91eacc73f79549f454abc7d581c696463f4396465257a708af175f18da7aa2c6ddc3dddc68b21528edb043a3fe539d16f5057e4f0c0db0b6 WHIRLPOOL 50556da7e392575ef2e36a489e544295f909c8621be5e7c91ad8b00f99879d1eebe59076948d8e58839869771547e85c425262438eb5f79d4b2bd8f2bb0009f8 +DIST firehol-2.0.4.tar.xz 900876 SHA256 f41ff31920402c80aa823a298cc437e9a0b4d9ff0320f3f75cb55c62407dad4c SHA512 b73053c3fc1cb4e5e83cc2b25a99bf06c14623f9e574af2b11b198ecc2fb84119f0ab60cb3ff96b32601c717118693869eb3fea2b0fdc61bb49f197fb73abcca WHIRLPOOL 05bc39636c7d496e321f191b03efe2f8d1dcd6aec537a41e7ae4bac3ee4386f718728ad965fdacb46f02f949986f6979f17d41dc21f06d7ad62f3e744f0599d1 diff --git a/net-firewall/firehol/firehol-2.0.4.ebuild b/net-firewall/firehol/firehol-2.0.4.ebuild new file mode 100644 index 000..2a0dbba --- /dev/null +++ b/net-firewall/firehol/firehol-2.0.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info + +DESCRIPTION="iptables firewall generator" +HOMEPAGE="http://firehol.sourceforge.net/"; +SRC_URI="https://firehol.org/download/firehol/releases/v${PV}/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND="net-firewall/iptables + sys-apps/iproute2[-minimal] + virtual/modutils + app-arch/gzip" +DEPEND="${RDEPEND}" + +pkg_setup() { + local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ + ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ + ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ + ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" + + get_version + if [ ${KV_PATCH} -ge 25 ]; then + CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" + else + CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" + fi + linux-info_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.0.2-autosave.patch" +} + +src_configure() { + # removing IP6TABLES_CMD has no effect and enable build + # without ipv6 available + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \ + --with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \ + $(use_enable doc) \ + IP6TABLES_CMD=/bin/false \ + IP6TABLES_SAVE_CMD=/bin/false \ + IP6TABLES_RESTORE_CMD=/bin/false +} + +src_install() { + default + + newconfd "${FILESDIR}"/firehol.conf.d firehol + newinitd "${FILESDIR}"/firehol.initrd firehol + newconfd "${FILESDIR}"/fireqos.conf.d fireqos + newinitd "${FILESDIR}"/fireqos.initrd fireqos +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
commit: 55c795d64b852717182f07668a5c5e8f370c0352 Author: Slawomir Lis gentoo org> AuthorDate: Thu Jan 21 19:50:37 2016 + Commit: Slawek Lis gentoo org> CommitDate: Thu Jan 21 19:50:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c795d6 added assimp test patch Package-Manager: portage-2.2.26 media-libs/assimp/files/test-cmakelists.patch | 35 +++ 1 file changed, 35 insertions(+) diff --git a/media-libs/assimp/files/test-cmakelists.patch b/media-libs/assimp/files/test-cmakelists.patch new file mode 100644 index 000..9a3471b --- /dev/null +++ b/media-libs/assimp/files/test-cmakelists.patch @@ -0,0 +1,35 @@ +--- test/CMakeLists.txt.old2016-01-21 06:46:12.053363212 +0100 test/CMakeLists.txt2016-01-21 06:46:51.126697143 +0100 +@@ -1,7 +1,5 @@ + cmake_minimum_required( VERSION 2.6 ) + +-INCLUDE( AddGTest ) +- + INCLUDE_DIRECTORIES( + ${Assimp_SOURCE_DIR}/include + ${Assimp_SOURCE_DIR}/code +@@ -47,7 +45,7 @@ + + SOURCE_GROUP( tests FILES ${TEST_SRCS} ) + +-if(AddGTest_FOUND) ++if(BUILD_TESTS) + add_executable( unit + unit/CCompilerTest.c + unit/Main.cpp +@@ -56,13 +54,12 @@ + ) + + add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models") ++target_link_libraries( unit gtest ) + + SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} ) + + add_dependencies( unit gtest ) + target_link_libraries( unit assimp +- debug ${GTEST_DEBUG_LIBRARIES} +- optimized ${GTEST_RELEASE_LIBRARIES} + ) +-endif(AddGTest_FOUND) ++endif(BUILD_TESTS) + add_subdirectory(headercheck)
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/jags/
commit: b1376251f4604303695ee2c6949d825bceb82b71 Author: Xavier Fernández i MarÃn gmail com> AuthorDate: Fri Oct 30 09:05:15 2015 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 21 19:11:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1376251 sci-mathematics/jags: version bump sci-mathematics/jags/Manifest | 1 + sci-mathematics/jags/jags-4.1.0.ebuild | 47 ++ 2 files changed, 48 insertions(+) diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest index a6e7e9e..0fe15b4 100644 --- a/sci-mathematics/jags/Manifest +++ b/sci-mathematics/jags/Manifest @@ -1,2 +1,3 @@ DIST JAGS-3.4.0.tar.gz 1677450 SHA256 2beaa9a2672c2c95efc55ffa4c8b597a872f20232373daebd17ad539d3d7d82b SHA512 7a330ea41eab63b23d8ae3622c6920f0dc3dba653a18256957b9b862bb86b746ff706e9e9bf3f806524250b439161a6df4ad05af682354073f9b0074f9825896 WHIRLPOOL 48f2bf92f80ea0558697701320e142a61b3eb5cfefe234973a6a189096b7887ec5ea829f8f6183bf9ad4a0f6fb07d769c710b721ec1e211772cbeaea0187c8e2 DIST JAGS-4.0.0.tar.gz 1880476 SHA256 a1d572269029d90d4e8b25757fd7ae9678994bd682937ec505ddcf06185d2c4c SHA512 bbe4f4600dff0fc1db6f8548b8d386ea804174d69788646681de6d006a0e0ab018fb01257b5737f871d10c8b59865950fb91b6a9cad5d1e6addc415004c6f82c WHIRLPOOL d1f2ad15834252c63300259c789f69ca0fa008d0c2008d504db2c394642f7a63180baae76bc272a33a92c83addc373fd9ce026063ea74b40397ac902c2272aed +DIST JAGS-4.1.0.tar.gz 1872634 SHA256 45ecf31b5b2127620a79875745b8ea4203ca2430a8b3625f5e80adc897cdf522 SHA512 76b52764e57e6c4450cc52c7c7c3de384f93bd6e57d8b88f1863b7c329bdd2ec39834902c223d433d263bcf29362b958807a9cb96b9066d4f75832b366339fd8 WHIRLPOOL b0187c02a971ccc733c34aa2e4f8e1ed32d1c767d97fb667034cd6035c08f63c2a6c014dcb5d5dd7ed080fdc9fae34be7bf002d0d631a6a454b849cf7c3cec67 diff --git a/sci-mathematics/jags/jags-4.1.0.ebuild b/sci-mathematics/jags/jags-4.1.0.ebuild new file mode 100644 index 000..fc1d9f9 --- /dev/null +++ b/sci-mathematics/jags/jags-4.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools-utils toolchain-funcs + +MYP="JAGS-${PV}" + +DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" +HOMEPAGE="http://mcmc-jags.sourceforge.net/"; +SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc" + +RDEPEND=" + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-latexextra + )" + +S="${WORKDIR}/${MYP}" + +src_configure() { + local myeconfargs=( + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile all $(usex doc docs "") +} + +src_install() { + autotools-utils_src_install + use doc && dodoc "${BUILD_DIR}"/doc/manual/*.pdf +}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/jags/
commit: c1a9f9465003e2f54483034271d225fcc6cff5f3 Author: David Seifert gentoo org> AuthorDate: Thu Jan 21 19:44:10 2016 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 21 19:44:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a9f946 sci-mathematics/jags: Remove 'autotools-utils.eclass', EAPI=6 Package-Manager: portage-2.2.27 sci-mathematics/jags/jags-4.1.0.ebuild | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sci-mathematics/jags/jags-4.1.0.ebuild b/sci-mathematics/jags/jags-4.1.0.ebuild index fc1d9f9..8e83927 100644 --- a/sci-mathematics/jags/jags-4.1.0.ebuild +++ b/sci-mathematics/jags/jags-4.1.0.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit autotools-utils toolchain-funcs +inherit eutils toolchain-funcs MYP="JAGS-${PV}" @@ -30,18 +30,17 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MYP}" src_configure() { - local myeconfargs=( - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" + econf \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - autotools-utils_src_configure } src_compile() { - autotools-utils_src_compile all $(usex doc docs "") + emake all $(usex doc docs "") } src_install() { - autotools-utils_src_install - use doc && dodoc "${BUILD_DIR}"/doc/manual/*.pdf + default + use doc && dodoc doc/manual/*.pdf + prune_libtool_files }
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: b4cadb2b68ec222fe0f749e9009ee36337132788 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 07:57:36 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:19 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b4cadb2b repoman: Move the large depency checks loop to a new plugin ProfileDependsChecks class pym/repoman/modules/scan/depend/__init__.py | 8 ++ pym/repoman/modules/scan/depend/profile.py | 211 pym/repoman/repos.py| 1 + pym/repoman/scanner.py | 181 +--- 4 files changed, 227 insertions(+), 174 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py index 73d3f8f..2dac94b 100644 --- a/pym/repoman/modules/scan/depend/__init__.py +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -18,6 +18,14 @@ module_spec = { 'func_desc': { }, }, + 'profile-module': { + 'name': "profile", + 'class': "ProfileDependsChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/depend/profile.py b/pym/repoman/modules/scan/depend/profile.py new file mode 100644 index 000..91c52cc --- /dev/null +++ b/pym/repoman/modules/scan/depend/profile.py @@ -0,0 +1,211 @@ +# -*- coding:utf-8 -*- + + +import copy +from pprint import pformat + +from _emerge.Package import Package + +# import our initialized portage instance +from repoman._portage import portage +from portage.dep import Atom + + +def sort_key(item): + return item[2].sub_path + + +class ProfileDependsChecks(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + self.portdb = kwargs.get('portdb') + self.profiles = kwargs.get('profiles') + self.options = kwargs.get('options') + self.repo_settings = kwargs.get('repo_settings') + self.include_arches = kwargs.get('include_arches') + self.caches = kwargs.get('caches') + self.repoman_incrementals = kwargs.get('repoman_incrementals') + self.env = kwargs.get('env') + self.have = kwargs.get('have') + self.dev_keywords = kwargs.get('dev_keywords') + + def check(self, **kwargs): + arches = kwargs.get('arches') + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') + baddepsyntax = kwargs.get('baddepsyntax') + unknown_pkgs = kwargs.get('unknown_pkgs') + + relevant_profiles = [] + for keyword, arch, groups in arches: + if arch not in self.profiles: + # A missing profile will create an error further down + # during the KEYWORDS verification. + continue + + if self.include_arches is not None: + if arch not in self.include_arches: + continue + + relevant_profiles.extend( + (keyword, groups, prof) for prof in self.profiles[arch]) + + relevant_profiles.sort(key=sort_key) + + for keyword, groups, prof in relevant_profiles: + + is_stable_profile = prof.status == "stable" + is_dev_profile = prof.status == "dev" and \ + self.options.include_dev + is_exp_profile = prof.status == "exp" and \ + self.options.include_exp_profiles == 'y' + if not (is_stable_profile or is_dev_profile or is_exp_profile): + continue + + dep_settings = self.caches['arch'].get(prof.sub_path) + if dep_settings is None: + dep_settings = portage.config( + config_profile_path=prof.abs_path, + config_incrementals=self.repoman_incrementals, + config_root=self.repo_settings.config_root, + local_config=False, + _unmatched_removal=self.options.unmatched_removal, + env=self.env, repositories=self.repo_settings.repoman_settings.repositories) + dep_settings.categories = self.repo_settings.repoman_settings.categories + if self.opti
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/options/
commit: 5ebf335266246a9bd08072a05c8cf7105a89ceaf Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 07:55:55 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:19 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5ebf3352 repoman: Create a new Options class plugin This handles an options.force bypass using the is_forced() from withing the plugin system. pym/repoman/modules/scan/options/__init__.py | 23 +++ pym/repoman/modules/scan/options/options.py | 22 ++ pym/repoman/scanner.py | 10 ++ 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/pym/repoman/modules/scan/options/__init__.py b/pym/repoman/modules/scan/options/__init__.py new file mode 100644 index 000..8424058 --- /dev/null +++ b/pym/repoman/modules/scan/options/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Options plug-in module for repoman. +Performs option related actions on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'options', + 'description': doc, + 'provides':{ + 'options-module': { + 'name': "options", + 'class': "Options", + 'description': doc, + 'functions': ['is_forced'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/options/options.py b/pym/repoman/modules/scan/options/options.py new file mode 100644 index 000..b592884 --- /dev/null +++ b/pym/repoman/modules/scan/options/options.py @@ -0,0 +1,22 @@ + + +class Options(object): + + def __init__(self, **kwargs): + self.options = kwargs.get('options') + + def is_forced(self, **kwargs): + if self.options.force: + # The dep_check() calls are the most expensive QA test. If --force + # is enabled, there's no point in wasting time on these since the + # user is intent on forcing the commit anyway. + return {'continue': True} + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.is_forced]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 6603bd2..cb2a7c0 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -290,6 +290,8 @@ class Scanner(object): ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ('license', 'LicenseChecks'), ('restrict', 'RestrictChecks'), ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), + # Options.is_forced() is used to bypass further checks + ('options', 'Options'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -317,14 +319,6 @@ class Scanner(object): if y_ebuild_continue: continue - # Syntax Checks - - if self.options.force: - # The dep_check() calls are the most expensive QA test. If --force - # is enabled, there's no point in wasting time on these since the - # user is intent on forcing the commit anyway. - continue - relevant_profiles = [] for keyword, arch, groups in dynamic_data['arches']: if arch not in self.profiles:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/manifest/, pym/repoman/checks/ebuilds/variables/, ...
commit: 8ea0005f569a3c2c7b1ba71b842ed38030f1f27e Author: Brian Dolbec gentoo org> AuthorDate: Wed Jan 6 03:08:08 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:20 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ea0005f repoman: Delete unused subpkgs pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/modules/fix/__init__.py | 0 pym/repoman/modules/full/__init__.py | 0 pym/repoman/modules/manifest/__init__.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/fix/__init__.py b/pym/repoman/modules/fix/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/full/__init__.py b/pym/repoman/modules/full/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/manifest/__init__.py b/pym/repoman/modules/manifest/__init__.py deleted file mode 100644 index e69de29..000
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: fd22acf104e1a2a501ea8ae940de11f62dbd58a6 Author: Brian Dolbec gentoo org> AuthorDate: Thu Jan 21 18:29:07 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:20 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fd22acf1 repoman: Fix a traceback due to xmlint not being installed for a manifest generation Mike helped find teh fact that self.binary was None, causing the misleading traceback. Tighten up the logic in XmlLint. Bypass the PkgMetadata check for manifest mode. floppym@naomi btrfs-progs % repoman manifest >>> Creating Manifest for /home/floppym/repos/gentoo/sys-fs/btrfs-progs Traceback (most recent call last): File "/home/floppym/bin/repoman", line 37, in repoman_main(sys.argv[1:]) File "/home/floppym/src/portage/pym/repoman/main.py", line 111, in repoman_main can_force = scanner.scan_pkgs(can_force) File "/home/floppym/src/portage/pym/repoman/scanner.py", line 242, in scan_pkgs rdata = func(**dynamic_data) File "/home/floppym/src/portage/pym/repoman/modules/scan/metadata/pkgmetadata.py", line 180, in check if not self.xmllint.check(checkdir, repolevel): File "/home/floppym/src/portage/pym/repoman/_xml.py", line 98, in check os.path.join(checkdir, "metadata.xml" TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' pym/repoman/_xml.py | 2 +- pym/repoman/modules/scan/metadata/pkgmetadata.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index 43fc930..334377d 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -58,6 +58,7 @@ class XmlLint(object): self.repoman_settings = repoman_settings self._is_capable = metadata_dtd is not None self.binary = None + self._is_capable = False self._check_capable() def _check_capable(self): @@ -66,7 +67,6 @@ class XmlLint(object): self.binary = find_binary('xmllint') if not self.binary: print(red("!!! xmllint not found. Can't check metadata.xml.\n")) - self._is_capable = False elif not self._is_capable: if not fetch_metadata_dtd(self.metadata_dtd, self.repoman_settings): sys.exit(1) diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py b/pym/repoman/modules/scan/metadata/pkgmetadata.py index 220fd23..8e93457 100644 --- a/pym/repoman/modules/scan/metadata/pkgmetadata.py +++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py @@ -71,6 +71,9 @@ class PkgMetadata(ScanBase): repolevel = kwargs.get('repolevel') self.musedict = {} + if self.options.mode in ['manifest']: + return {'continue': False, 'muselist': frozenset(self.musedict)} + # metadata.xml file check if "metadata.xml" not in checkdirlist: self.qatracker.add_error("metadata.missing", xpkg + "/metadata.xml")
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 4602b7a0c896840ddfa53e92462050aca89e8574 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 08:37:22 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:19 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4602b7a0 repoman: Create a metadata UnusedCheck and final pkg checks Create a plugin loop for any final pkg checks. Create the one plugin for the unused use-descriptions in mteadata.xml pym/repoman/modules/scan/metadata/__init__.py | 8 ++ pym/repoman/modules/scan/metadata/unused.py | 32 pym/repoman/scanner.py| 36 --- 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/pym/repoman/modules/scan/metadata/__init__.py index 6ab44f6..ed4a967 100644 --- a/pym/repoman/modules/scan/metadata/__init__.py +++ b/pym/repoman/modules/scan/metadata/__init__.py @@ -50,6 +50,14 @@ module_spec = { 'func_desc': { }, }, + 'unused-metadata': { + 'name': "unused", + 'class': "UnusedCheck", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/metadata/unused.py b/pym/repoman/modules/scan/metadata/unused.py new file mode 100644 index 000..5eb6716 --- /dev/null +++ b/pym/repoman/modules/scan/metadata/unused.py @@ -0,0 +1,32 @@ + + +class UnusedCheck(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + xpkg = kwargs.get('xpkg') + muselist = kwargs.get('muselist') + used_useflags = kwargs.get('used_useflags') + # check if there are unused local USE-descriptions in metadata.xml + # (unless there are any invalids, to avoid noise) + if kwargs.get('allvalid'): + for myflag in muselist.difference(used_useflags): + self.qatracker.add_error( + "metadata.warning", + "%s/metadata.xml: unused local USE-description: '%s'" + % (xpkg, myflag)) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (False, []) + + @property + def runInFinal(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 1cd37d0..4cc2e67 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -269,7 +269,6 @@ class Scanner(object): def _scan_ebuilds(self, ebuildlist, dynamic_data): - xpkg = dynamic_data['xpkg'] # detect unused local USE-descriptions dynamic_data['used_useflags'] = set() @@ -317,11 +316,30 @@ class Scanner(object): if y_ebuild_continue: continue - # check if there are unused local USE-descriptions in metadata.xml - # (unless there are any invalids, to avoid noise) - if dynamic_data['allvalid']: - for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): - self.qatracker.add_error( - "metadata.warning", - "%s/metadata.xml: unused local USE-description: '%s'" - % (xpkg, myflag)) + # Final checks + # initialize per pkg plugin final checks here + # need to set it up for ==> self.modules_list or some other ordered list + xpkg_complete = False + for mod in [('unused', 'UnusedChecks')]: + if mod[0]: + mod_class = MODULE_CONTROLLER.get_class(mod[0]) + print("Initializing class name:", mod_class.__name__) + self.modules[mod[1]] = mod_class(**self.kwargs) + print("scan_ebuilds final checks: module:", mod[1]) + do_it, functions = self.modules[mod[1]].runInFinal + # print("do_it", do_it, "functions", functions) + if do_it: + for func in functions: + print("\tRunning function:", func) + rdata = func(**dynamic_data) + if rdata.g
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/
commit: ebcae720ecafb57b2a7e60292e8e045951fd1d7a Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 08:09:33 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:19 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ebcae720 repoman: Create a new DependUnknown plugin class pym/repoman/modules/scan/depend/__init__.py | 8 pym/repoman/modules/scan/depend/unknown.py | 30 + pym/repoman/scanner.py | 10 +- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py index 2dac94b..6b4 100644 --- a/pym/repoman/modules/scan/depend/__init__.py +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_desc': { }, }, + 'unknown-module': { + 'name': "unknown", + 'class': "DependUnknown", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/depend/unknown.py b/pym/repoman/modules/scan/depend/unknown.py new file mode 100644 index 000..61d51b9 --- /dev/null +++ b/pym/repoman/modules/scan/depend/unknown.py @@ -0,0 +1,30 @@ +# -*- coding:utf-8 -*- + + +class DependUnknown(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + baddepsyntax = kwargs.get('baddepsyntax') + unknown_pkgs = kwargs.get('unknown_pkgs') + + if not baddepsyntax and unknown_pkgs: + type_map = {} + for mytype, atom in unknown_pkgs: + type_map.setdefault(mytype, set()).add(atom) + for mytype, atoms in type_map.items(): + self.qatracker.add_error( + "dependency.unknown", "%s: %s: %s" + % (ebuild.relative_path, mytype, ", ".join(sorted(atoms + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 9223876..1cd37d0 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -289,6 +289,7 @@ class Scanner(object): ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), # Options.is_forced() is used to bypass further checks ('options', 'Options'), ('profile', 'ProfileDependsChecks'), + ('unknown', 'DependUnknown'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -316,15 +317,6 @@ class Scanner(object): if y_ebuild_continue: continue - if not dynamic_data['baddepsyntax'] and dynamic_data['unknown_pkgs']: - type_map = {} - for mytype, atom in dynamic_data['unknown_pkgs']: - type_map.setdefault(mytype, set()).add(atom) - for mytype, atoms in type_map.items(): - self.qatracker.add_error( - "dependency.unknown", "%s: %s: %s" - % (dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms - # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/, pym/repoman/modules/scan/ebuild/
commit: b7fbf992ef376e29fa26fe763806d7a4fc5a08e9 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 04:44:05 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:11 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b7fbf992 repoman: Create new MultiCheck class plugin Move ebuilds/ checks.py and errors.py to the scan/ebuild plugin Remove the checks_init from main(), initialize it in the MultiCheck class where it is needed. pym/repoman/checks/ebuilds/__init__.py | 0 pym/repoman/main.py| 2 - pym/repoman/modules/scan/ebuild/__init__.py| 8 .../ebuilds => modules/scan/ebuild}/checks.py | 2 +- .../ebuilds => modules/scan/ebuild}/errors.py | 0 pym/repoman/modules/scan/ebuild/multicheck.py | 43 ++ pym/repoman/scanner.py | 21 +-- 7 files changed, 53 insertions(+), 23 deletions(-) diff --git a/pym/repoman/checks/ebuilds/__init__.py b/pym/repoman/checks/ebuilds/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 8784685..890e034 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -26,7 +26,6 @@ from portage.util import formatter from repoman.actions import Actions from repoman.argparser import parse_args -from repoman.checks.ebuilds.checks import checks_init from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats) @@ -65,7 +64,6 @@ def repoman_main(argv): if options.experimental_inherit == 'y': # This is experimental, so it's non-fatal. qawarnings.add("inherit.missing") - checks_init(experimental_inherit=True) # Set this to False when an extraordinary issue (generally # something other than a QA issue) makes it impossible to diff --git a/pym/repoman/modules/scan/ebuild/__init__.py b/pym/repoman/modules/scan/ebuild/__init__.py index 9747bf0..038cef3 100644 --- a/pym/repoman/modules/scan/ebuild/__init__.py +++ b/pym/repoman/modules/scan/ebuild/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_desc': { }, }, + 'multicheck-module': { + 'name': "multicheck", + 'class': "MultiCheck", + 'description': doc, + 'functions': ['check'], + 'func_kwargs': { + }, + }, } } diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/modules/scan/ebuild/checks.py similarity index 99% rename from pym/repoman/checks/ebuilds/checks.py rename to pym/repoman/modules/scan/ebuild/checks.py index 5420e51..be59b05 100644 --- a/pym/repoman/checks/ebuilds/checks.py +++ b/pym/repoman/modules/scan/ebuild/checks.py @@ -21,7 +21,7 @@ from portage.eapi import ( eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard, eapi_exports_AA, eapi_has_pkg_pretend) -import repoman.checks.ebuilds.errors as errors +from . import errors class LineCheck(object): diff --git a/pym/repoman/checks/ebuilds/errors.py b/pym/repoman/modules/scan/ebuild/errors.py similarity index 100% rename from pym/repoman/checks/ebuilds/errors.py rename to pym/repoman/modules/scan/ebuild/errors.py diff --git a/pym/repoman/modules/scan/ebuild/multicheck.py b/pym/repoman/modules/scan/ebuild/multicheck.py new file mode 100644 index 000..989d695 --- /dev/null +++ b/pym/repoman/modules/scan/ebuild/multicheck.py @@ -0,0 +1,43 @@ + +import io + +from portage import _encodings, _unicode_encode + +from .checks import run_checks, checks_init + + +class MultiCheck(object): + '''Class to run multiple different checks on an ebuild''' + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + self.options = kwargs.get('options') + checks_init(self.options.experimental_inherit == 'y') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') + try: + # All ebuilds should have utf_8 encoding. + f = io.open( + _unicode_encode(ebuild.full_path, encoding=_encodings['fs'], + errors='strict'), + mode='r', encoding=_encodings['repo.content']) + try: + for check_name, e in run_checks(f, pkg): + self.qatracker.add_error( + check_name, ebuild.relative_path + ': %s' % e) + finally: + f.close() + except UnicodeDecodeError: +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 89539c68bed5af5a2e2abbf46e64a5dac55cbf4c Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:51:16 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:20 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=89539c68 metadata.py: Resolve error when moving metadata.dtd If DISTDIR and PORTDIR/metadata/dtd live on different filesystems, os.rename() will fail. Use shutil.move() instead. pym/repoman/metadata.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py index 70c07a8..63e78b2 100644 --- a/pym/repoman/metadata.py +++ b/pym/repoman/metadata.py @@ -17,6 +17,7 @@ from repoman._portage import portage from portage import exception from portage import os +from portage import shutil from portage.output import green if sys.hexversion >= 0x300: @@ -141,7 +142,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings): except portage.exception.PortageException: pass - os.rename(metadata_dtd_tmp, metadata_dtd) + shutil.move(metadata_dtd_tmp, metadata_dtd) finally: try: os.unlink(metadata_dtd_tmp)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 285f9674b1433fd04fdbd6d253668433b4d6be7c Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 05:33:17 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 19:28:20 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=285f9674 repoman: Enable verbosity option to be useful for setting the logging level Verbosity option was not being used internally. Convert debug print's added to proper debug messages. pym/repoman/main.py| 13 ++--- pym/repoman/scanner.py | 35 +++ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 890e034..6921005 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -19,7 +19,6 @@ from portage import os import portage.checksum import portage.const import portage.repository.config -from portage import util from portage.output import create_color_func, nocolor from portage.output import ConsoleStyleFile, StyleWriter from portage.util import formatter @@ -37,13 +36,14 @@ from repoman.modules.vcs.settings import VCSSettings if sys.hexversion >= 0x300: basestring = str -util.initialize_logger() - bad = create_color_func("BAD") # A sane umask is needed for files that portage creates. os.umask(0o22) +LOGLEVEL = logging.WARNING +portage.util.initialize_logger(LOGLEVEL) + def repoman_main(argv): config_root = os.environ.get("PORTAGE_CONFIGROOT") @@ -61,6 +61,13 @@ def repoman_main(argv): print("Portage", portage.VERSION) sys.exit(0) + logger = logging.getLogger() + + if options.verbosity > 0: + logger.setLevel(LOGLEVEL - 10 * options.verbosity) + else: + logger.setLevel(LOGLEVEL) + if options.experimental_inherit == 'y': # This is experimental, so it's non-fatal. qawarnings.add("inherit.missing") diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 4cc2e67..c30c94e 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -19,13 +19,13 @@ from portage.module import Modules MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan") # initial development debug info -#print("module path:", path) +logging.debug("module path: %s", MODULES_PATH) MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan") -# initial development debug info -#print(module_controller.module_names) MODULE_NAMES = MODULE_CONTROLLER.module_names[:] +# initial development debug info +logging.debug("module_names: %s", MODULE_NAMES) class Scanner(object): @@ -197,7 +197,7 @@ class Scanner(object): for mod in ['manifests', 'isebuild', 'keywords', 'files', 'vcsstatus', 'fetches', 'pkgmetadata']: mod_class = MODULE_CONTROLLER.get_class(mod) - print("Initializing class name:", mod_class.__name__) + logging.debug("Initializing class name: %s", mod_class.__name__) self.modules[mod_class.__name__] = mod_class(**self.kwargs) # initialize our checks classes here before the big xpkg loop @@ -207,7 +207,7 @@ class Scanner(object): for xpkg in self.effective_scanlist: xpkg_continue = False # ebuilds and digests added to cvs respectively. - logging.info("checking package %s" % xpkg) + logging.info("checking package %s", xpkg) # save memory by discarding xmatch caches from previous package(s) self.caches['arch_xmatch'].clear() self.eadded = [] @@ -235,7 +235,7 @@ class Scanner(object): # need to set it up for ==> self.modules or some other ordered list for mod in ['Manifests', 'IsEbuild', 'KeywordChecks', 'FileChecks', 'VCSStatus', 'FetchChecks', 'PkgMetadata']: - print("scan_pkgs(): module:", mod) + logging.debug("scan_pkgs; module: %s", mod) do_it, functions = self.modules[mod].runInPkgs if do_it: for func in functions: @@ -299,7 +299,7 @@ class Scanner(object): logging.debug("do_it: %s, functions: %s", do_it, [x.__name__ for x in functions]) if do_it: for func in functions: - print("\tRunning function:", func) + logging.debug("\tRunning function: %s", func) rdata = func(**dynamic_data)
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: b033ba559278a56771f02d010d94d7c244abcd18 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 21 19:35:26 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 21 19:35:26 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b033ba55 scripts/bootstrap-prefix.sh: use chost-clang CC/CXX on Darwin scripts/bootstrap-prefix.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 61d27fe..2c96321 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1142,10 +1142,10 @@ bootstrap_stage2() { { echo echo "# System compiler on Darwin Prefix is Clang, do not remove this" - echo "CC=clang" - echo "CXX=clang++" - echo "BUILD_CC=clang" - echo "BUILD_CXX=clang++" + echo "CC=${CHOST}-clang" + echo "CXX=${CHOST}-clang++" + echo "BUILD_CC=${CHOST}-clang" + echo "BUILD_CXX=${CHOST}-clang++" } >> "${ROOT}"/etc/portage/make.conf fi
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: bbb2f3fa6dce6655350b53ca70021c842ccea6ad Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 21 19:34:38 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 21 19:34:38 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bbb2f3fa scripts/bootstrap-prefix.sh: add identification on make.conf scripts/bootstrap-prefix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 7b62259..61d27fe 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -195,6 +195,7 @@ bootstrap_setup() { if [[ ! -f ${ROOT}/etc/portage/make.conf ]] ; then { + echo "# Added by bootstrap-prefix.sh for ${CHOST}" echo 'USE="unicode nls"' echo 'CFLAGS="${CFLAGS} -O2 -pipe"' echo 'CXXFLAGS="${CFLAGS}"'
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 188ae7b6a4d1e01f061b6516bd79fff40ce0e004 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:51:16 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 18:53:52 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=188ae7b6 metadata.py: Resolve error when moving metadata.dtd If DISTDIR and PORTDIR/metadata/dtd live on different filesystems, os.rename() will fail. Use shutil.move() instead. pym/repoman/metadata.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py index 70c07a8..63e78b2 100644 --- a/pym/repoman/metadata.py +++ b/pym/repoman/metadata.py @@ -17,6 +17,7 @@ from repoman._portage import portage from portage import exception from portage import os +from portage import shutil from portage.output import green if sys.hexversion >= 0x300: @@ -141,7 +142,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings): except portage.exception.PortageException: pass - os.rename(metadata_dtd_tmp, metadata_dtd) + shutil.move(metadata_dtd_tmp, metadata_dtd) finally: try: os.unlink(metadata_dtd_tmp)
[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/
commit: bedc1ead2b9ba4e0ca775ff655acf052b4ba9bbc Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:49:50 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Jan 21 18:52:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bedc1ead www-plugins/chrome-binary-plugins: automated update Package-Manager: portage-2.2.27_p46_p1242 www-plugins/chrome-binary-plugins/Manifest | 12 ++-- ...build => chrome-binary-plugins-48.0.2564.82_beta1.ebuild} | 0 ...1.ebuild => chrome-binary-plugins-48.0.2564.82_p1.ebuild} | 0 ...uild => chrome-binary-plugins-49.0.2623.13_alpha1.ebuild} | 0 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 26d8236..e5e6466 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,6 +1,6 @@ -DIST google-chrome-beta_48.0.2564.79-1_amd64.deb 48085212 SHA256 6ac10492d468e60274f4a8a3256a087871600d93667aee1537a809bec7c65eed SHA512 a7bceab46eee22be2bb0c07a548f9827269384b802c0a25f1c5b53e3faa5050bdc6cc49b39fb8d9b474860552bd2dfc0f9f02bfaf690accafa2c8d2b217aad1a WHIRLPOOL 973afe6fd34059aabcfe7aca3dec05f227e1a5ce6684e79498c034c5ca7afbd72a447f19b074b92928e9df52a6c2ca8a0bfdfe52517f35b287d4b8d0743b9ad0 -DIST google-chrome-beta_48.0.2564.79-1_i386.deb 47420828 SHA256 8eadcaf9c96bb051793d9f49253be8e492d167534ccd009bcc10064be9939d62 SHA512 c7b9f90a9985f55576f7ca7485684e6ee94cbbf81140b1eb4c6aec9f47bf3fdae9bba2248562b1340881911918cb85977f0f2076a9067f890c0d0f4e2f7a241d WHIRLPOOL 75cd4cfb3d226c2bbea4d0141bd7d0b4db0850abe68abd3a3267cb63b381c74428592030072b57a3f52cdcc951892b2ea8f9c99c26a3dd18559c7ad27f6e7ccd -DIST google-chrome-stable_47.0.2526.111-1_amd64.deb 47331202 SHA256 c0f0f4a42440de8b12eaf27daaea4876c9173f8f36eb589eaa50cd8924c02014 SHA512 00d04288d6deb0a05399290f93ea9943ddcbf47acc33424eab414ef5e27caeb2cb01ea3b3dc3be5a4c2ee9703a13554e767876741e7605cc25906392aa43c789 WHIRLPOOL 471795e9c5716d3dcc46bb18118024e5eb0fd1a352069deec6ecff5cd7dd552defa2a020b90c62a049f106a3678d061570dbd865211a8ff74b81c70da9965daf -DIST google-chrome-stable_47.0.2526.111-1_i386.deb 4718 SHA256 27192b9f477dc98ba26c088b27081ec836dc4fa922da4e6f03c848ca7ff6d447 SHA512 f50ecd35b8096be30ee6044c24d833c8e6a27b6ec615ca941a7c9a33096ea2c53be0168c9f54c24787483343d3d688f325f4eecf1b049027373ca4688612f84e WHIRLPOOL b3e317b073bf844993ac75e7fa6c8eda44991e8f5c46691274c421e8f6d92d9f96df42a40dfd27c78783927c8bab0068c3ca04c7441b54dfa6f2e54a415136d3 -DIST google-chrome-unstable_49.0.2618.8-1_amd64.deb 48318522 SHA256 562901837a0e8d3fc79809dee5a38d4000ab6397129081029ded175dfbe594aa SHA512 7a5f17b180abb557d64500f0d2042ec7667cc011a72850920af5becf36eea023f912a8ff7fcc7b10d7f83050d4dfdca78b8a869ea5ae896db4dc3edc97dbec34 WHIRLPOOL 2459079c340cc3106ea12f480c4b808c741ecb2db8f67c126c1a689b8d79c12f259102a7a4ea4ba8b87f04aefc5f020256862f86fe38bfc25dd65f31cc671887 -DIST google-chrome-unstable_49.0.2618.8-1_i386.deb 47696436 SHA256 89026fc9b7684140c08e8664fbe58e0e7d249807376f441be0b90dd180c4f0bf SHA512 7fd797b59328744c458b57fdda568eefff38dd41a4568397f74a800d4937f3ccd6380c356f21c0701591c8bf400bf0a012690bb9c1efab7a2dc5a6a334a69f3e WHIRLPOOL 3ca9d6560ae9d5ffa628eff6a92560dd65af3cea670902e74fdff71887218bc88e2732b18a1c83e89011fd7bbafd422101ea1e33718d595693a31f2bdc18170a +DIST google-chrome-beta_48.0.2564.82-1_amd64.deb 48218090 SHA256 0af28401295a4392921642889e602995a9de5cb4080543a5fe03e415a485c324 SHA512 f2dab8648807698c00a9c9b22b66130c2da37ddb5532dff68d1f769cb83ac1ec224519f2f1245562b289c0ad48b14e86a54655cffea05cab12ff8bfc984b8ccf WHIRLPOOL b8d9679940268ff2fd6cd05755075f79b114e33b4d57230cdc806c728fa553c9a8df67a89bfa99c0b7b922e9991e1696c47a3b3c94ff3d1d54149dfbb6512bdc +DIST google-chrome-beta_48.0.2564.82-1_i386.deb 47618876 SHA256 07fcabcf9761fc2f403a8bcbb803685c685120fa4efb2b65e8a3eb56c586022e SHA512 69b59a7d4f4db1ac6a2596f6c3d8eb41320e9b2ad3ca02df9469bf1e63de65c33c1ca539689575aa57306c5b5062cb97bb4b7368b51bfae06baae2140cc1e606 WHIRLPOOL d0ee7bc55dc96639aee497d9db5d34251ebc6c847dde517397e09784b4d563ca09082794b607dec8d4b6040f98e5386b57af26fe37080fe6aa6b811070b61af3 +DIST google-chrome-stable_48.0.2564.82-1_amd64.deb 48216440 SHA256 3a66744087cfbef9453f9ca58815d1df3b604afc8d0ff02b4fcde84169f84637 SHA512 c03c652dc1141dd3043a084033355cb612698fc1333cdd43cf50eb99bdf9902b7f1ab959b80bde57498f170d98f9374a4d71b641f1f7a5d2eaf35dea19cf6579 WHIRLPOOL 1e754365acb9a09292ec25c744db14062b03c287bc417bdde1dc7ce35fc35582e6d1fd772d1fef66d7903974efeaaffcaaae4ec1119d0c9bc98075a4458c912d +DIST google-chrome-stable_48.0.2564.82-1_i386.deb 47583326 SHA256 5d24c5d2e20e7b12bf24da7dc7d3d24b4d280ef2da427218b776af3c2165606a SHA512 36b692ddde17a0222a0a993578a14673672fcb431f0a8a4973eea0e7f10c6bcdc4c346e4db76fb2d17c177a99b480990effe4abc771df865114139b3dc2621dc WHIRLPOOL 17db4d37bb99915fffecbd25f4d61547808edefde1aa191935d
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/
commit: 684bf74ac0010104cd2f5e19f1e505510b6ce9df Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:49:24 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Jan 21 18:52:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684bf74a www-client/google-chrome-beta: automated update Package-Manager: portage-2.2.27_p46_p1216 www-client/google-chrome-beta/Manifest| 4 ++-- 0.2564.79_p1.ebuild => google-chrome-beta-48.0.2564.82_p1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index dd5c5d4..cb20982 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-beta_48.0.2564.79-1_amd64.deb 48085212 SHA256 6ac10492d468e60274f4a8a3256a087871600d93667aee1537a809bec7c65eed SHA512 a7bceab46eee22be2bb0c07a548f9827269384b802c0a25f1c5b53e3faa5050bdc6cc49b39fb8d9b474860552bd2dfc0f9f02bfaf690accafa2c8d2b217aad1a WHIRLPOOL 973afe6fd34059aabcfe7aca3dec05f227e1a5ce6684e79498c034c5ca7afbd72a447f19b074b92928e9df52a6c2ca8a0bfdfe52517f35b287d4b8d0743b9ad0 -DIST google-chrome-beta_48.0.2564.79-1_i386.deb 47420828 SHA256 8eadcaf9c96bb051793d9f49253be8e492d167534ccd009bcc10064be9939d62 SHA512 c7b9f90a9985f55576f7ca7485684e6ee94cbbf81140b1eb4c6aec9f47bf3fdae9bba2248562b1340881911918cb85977f0f2076a9067f890c0d0f4e2f7a241d WHIRLPOOL 75cd4cfb3d226c2bbea4d0141bd7d0b4db0850abe68abd3a3267cb63b381c74428592030072b57a3f52cdcc951892b2ea8f9c99c26a3dd18559c7ad27f6e7ccd +DIST google-chrome-beta_48.0.2564.82-1_amd64.deb 48218090 SHA256 0af28401295a4392921642889e602995a9de5cb4080543a5fe03e415a485c324 SHA512 f2dab8648807698c00a9c9b22b66130c2da37ddb5532dff68d1f769cb83ac1ec224519f2f1245562b289c0ad48b14e86a54655cffea05cab12ff8bfc984b8ccf WHIRLPOOL b8d9679940268ff2fd6cd05755075f79b114e33b4d57230cdc806c728fa553c9a8df67a89bfa99c0b7b922e9991e1696c47a3b3c94ff3d1d54149dfbb6512bdc +DIST google-chrome-beta_48.0.2564.82-1_i386.deb 47618876 SHA256 07fcabcf9761fc2f403a8bcbb803685c685120fa4efb2b65e8a3eb56c586022e SHA512 69b59a7d4f4db1ac6a2596f6c3d8eb41320e9b2ad3ca02df9469bf1e63de65c33c1ca539689575aa57306c5b5062cb97bb4b7368b51bfae06baae2140cc1e606 WHIRLPOOL d0ee7bc55dc96639aee497d9db5d34251ebc6c847dde517397e09784b4d563ca09082794b607dec8d4b6040f98e5386b57af26fe37080fe6aa6b811070b61af3 diff --git a/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.82_p1.ebuild similarity index 100% rename from www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild rename to www-client/google-chrome-beta/google-chrome-beta-48.0.2564.82_p1.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-unstable/
commit: 289b4537a654b31be359b9672e8524b0b795f6b3 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:50:00 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Jan 21 18:52:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289b4537 www-client/google-chrome-unstable: automated update Package-Manager: portage-2.2.27_p46_p1251 www-client/google-chrome-unstable/Manifest| 4 ++-- ...2618.8_p1.ebuild => google-chrome-unstable-49.0.2623.13_p1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 09eeec0..9408f1e 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-unstable_49.0.2618.8-1_amd64.deb 48318522 SHA256 562901837a0e8d3fc79809dee5a38d4000ab6397129081029ded175dfbe594aa SHA512 7a5f17b180abb557d64500f0d2042ec7667cc011a72850920af5becf36eea023f912a8ff7fcc7b10d7f83050d4dfdca78b8a869ea5ae896db4dc3edc97dbec34 WHIRLPOOL 2459079c340cc3106ea12f480c4b808c741ecb2db8f67c126c1a689b8d79c12f259102a7a4ea4ba8b87f04aefc5f020256862f86fe38bfc25dd65f31cc671887 -DIST google-chrome-unstable_49.0.2618.8-1_i386.deb 47696436 SHA256 89026fc9b7684140c08e8664fbe58e0e7d249807376f441be0b90dd180c4f0bf SHA512 7fd797b59328744c458b57fdda568eefff38dd41a4568397f74a800d4937f3ccd6380c356f21c0701591c8bf400bf0a012690bb9c1efab7a2dc5a6a334a69f3e WHIRLPOOL 3ca9d6560ae9d5ffa628eff6a92560dd65af3cea670902e74fdff71887218bc88e2732b18a1c83e89011fd7bbafd422101ea1e33718d595693a31f2bdc18170a +DIST google-chrome-unstable_49.0.2623.13-1_amd64.deb 48575324 SHA256 e7e7e902ba9b49f957d8c4e1f187e3347d6ac0bcbea40a2f9cdb4c6a5b0db8db SHA512 bc89e04a618c3c8995ef80e0ef8f63b0bcb86902e162744850f5802e00bf20491ef9a06de2dbee927483a4e09eb3d18e0fd242a2e1494319df3fb8ab6c2a2129 WHIRLPOOL 59742b2e9dd43b3527928315a0c483354f44ce587c26b0975e744282060c727c0a1f4545c7e0e6397a3645ee970bd9b970e1fe6478f15328093fd13fa61c2d03 +DIST google-chrome-unstable_49.0.2623.13-1_i386.deb 47720080 SHA256 007c604bf24cd82041fe57310baf6e8a8bd737e347e0ef54e8d6da1556d1b54d SHA512 04c93e5bed643bc40ca25d29b93d16039d7ffc9731d88974af58c8b7a4f6deca0093fec44710b644128569d8298ab119a6a92c929323ea1e4270fe2a9e3b7cfa WHIRLPOOL 19a129c1cbbebd94e128a9c1d7b70556945df0395c4ee5abebf2d5ec9f7eba92b71fecb3ac606e5c72e76bb3adcf9029b026aca97231e9a90276140f61487153 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-49.0.2618.8_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-49.0.2623.13_p1.ebuild similarity index 100% rename from www-client/google-chrome-unstable/google-chrome-unstable-49.0.2618.8_p1.ebuild rename to www-client/google-chrome-unstable/google-chrome-unstable-49.0.2623.13_p1.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome/
commit: a47ab4dd63f5c6503b55dcaf0348389ddcfbb053 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:48:23 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Jan 21 18:52:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47ab4dd www-client/google-chrome: Bump Package-Manager: portage-2.2.27_p46_p1154 www-client/google-chrome/Manifest | 4 ++-- ...47.0.2526.111_p1.ebuild => google-chrome-48.0.2564.82_p1.ebuild} | 6 +- www-client/google-chrome/metadata.xml | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index bde15b2..d5b7b46 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-stable_47.0.2526.111-1_amd64.deb 47331202 SHA256 c0f0f4a42440de8b12eaf27daaea4876c9173f8f36eb589eaa50cd8924c02014 SHA512 00d04288d6deb0a05399290f93ea9943ddcbf47acc33424eab414ef5e27caeb2cb01ea3b3dc3be5a4c2ee9703a13554e767876741e7605cc25906392aa43c789 WHIRLPOOL 471795e9c5716d3dcc46bb18118024e5eb0fd1a352069deec6ecff5cd7dd552defa2a020b90c62a049f106a3678d061570dbd865211a8ff74b81c70da9965daf -DIST google-chrome-stable_47.0.2526.111-1_i386.deb 4718 SHA256 27192b9f477dc98ba26c088b27081ec836dc4fa922da4e6f03c848ca7ff6d447 SHA512 f50ecd35b8096be30ee6044c24d833c8e6a27b6ec615ca941a7c9a33096ea2c53be0168c9f54c24787483343d3d688f325f4eecf1b049027373ca4688612f84e WHIRLPOOL b3e317b073bf844993ac75e7fa6c8eda44991e8f5c46691274c421e8f6d92d9f96df42a40dfd27c78783927c8bab0068c3ca04c7441b54dfa6f2e54a415136d3 +DIST google-chrome-stable_48.0.2564.82-1_amd64.deb 48216440 SHA256 3a66744087cfbef9453f9ca58815d1df3b604afc8d0ff02b4fcde84169f84637 SHA512 c03c652dc1141dd3043a084033355cb612698fc1333cdd43cf50eb99bdf9902b7f1ab959b80bde57498f170d98f9374a4d71b641f1f7a5d2eaf35dea19cf6579 WHIRLPOOL 1e754365acb9a09292ec25c744db14062b03c287bc417bdde1dc7ce35fc35582e6d1fd772d1fef66d7903974efeaaffcaaae4ec1119d0c9bc98075a4458c912d +DIST google-chrome-stable_48.0.2564.82-1_i386.deb 47583326 SHA256 5d24c5d2e20e7b12bf24da7dc7d3d24b4d280ef2da427218b776af3c2165606a SHA512 36b692ddde17a0222a0a993578a14673672fcb431f0a8a4973eea0e7f10c6bcdc4c346e4db76fb2d17c177a99b480990effe4abc771df865114139b3dc2621dc WHIRLPOOL 17db4d37bb99915fffecbd25f4d61547808edefde1aa191935df29acfe17ee99807655763593eb18ab8228f66edb6354dcddbcbad2773ddf43f78bf5531d00e8 diff --git a/www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild b/www-client/google-chrome/google-chrome-48.0.2564.82_p1.ebuild similarity index 95% rename from www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild rename to www-client/google-chrome/google-chrome-48.0.2564.82_p1.ebuild index a5d7f7d..4d0ec1a 100644 --- a/www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild +++ b/www-client/google-chrome/google-chrome-48.0.2564.82_p1.ebuild @@ -6,7 +6,7 @@ EAPI="5" CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" + sv sw ta te th tr uk vi zh_CN zh_TW fake_bidi" inherit readme.gentoo chromium eutils multilib pax-utils unpacker @@ -36,6 +36,7 @@ KEYWORDS="-* ~amd64 ~x86" IUSE="+plugins" RESTRICT="bindist mirror strip" +DEPEND="app-admin/chrpath" RDEPEND=" app-arch/bzip2 app-misc/ca-certificates @@ -126,6 +127,9 @@ src_install() { newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png done + # Work around RPATH=$ORIGIN QA check + chrpath -d "${CHROME_HOME}/chrome-sandbox" || die + insinto / doins -r opt usr diff --git a/www-client/google-chrome/metadata.xml b/www-client/google-chrome/metadata.xml index b6a2d8a..6c5158d 100644 --- a/www-client/google-chrome/metadata.xml +++ b/www-client/google-chrome/metadata.xml @@ -15,6 +15,7 @@ sophisticated technology to make the web faster, safer, and easier. + Install fake-bidi translation Add system plugins path to launcher
[gentoo-commits] repo/gentoo:master commit in: sci-biology/iedera/, sci-biology/iedera/files/
commit: 34dc9de16f4718583c6703705017a2365a137bf8 Author: David Seifert gentoo org> AuthorDate: Thu Jan 21 18:35:27 2016 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 21 18:36:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34dc9de1 sci-biology/iedera: Remove hardcoded {C,CXX,LD}FLAGS from configure.ac Package-Manager: portage-2.2.27 .../iedera/files/iedera-1.05-fix-buildsystem.patch | 16 .../iedera/{iedera-1.05.ebuild => iedera-1.05-r1.ebuild} | 12 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sci-biology/iedera/files/iedera-1.05-fix-buildsystem.patch b/sci-biology/iedera/files/iedera-1.05-fix-buildsystem.patch new file mode 100644 index 000..f232d7d --- /dev/null +++ b/sci-biology/iedera/files/iedera-1.05-fix-buildsystem.patch @@ -0,0 +1,16 @@ +iedera sets default flags that override user {C,CXX,LD}FLAGS + +--- iedera-1.05/configure.ac iedera-1.05/configure.ac +@@ -4,11 +4,5 @@ + AC_PROG_INSTALL + AC_PROG_CXX + AC_HEADER_STDC +-CFLAGS="$CFLAGS $UNAME_DEFS -O3 -pipe -funroll-loops -Wall" +-CXXFLAGS="$CFLAGS" +-LDFLAGS="$LDFLAGS -lm" +-AC_SUBST(CFLAGS) +-AC_SUBST(CXXFLAGS) +-AC_SUBST(LDFLAGS) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/sci-biology/iedera/iedera-1.05.ebuild b/sci-biology/iedera/iedera-1.05-r1.ebuild similarity index 73% rename from sci-biology/iedera/iedera-1.05.ebuild rename to sci-biology/iedera/iedera-1.05-r1.ebuild index fb442a6..ec52dd3 100644 --- a/sci-biology/iedera/iedera-1.05.ebuild +++ b/sci-biology/iedera/iedera-1.05-r1.ebuild @@ -4,6 +4,8 @@ EAPI=6 +inherit autotools + DESCRIPTION="A subset seed design tool for DNA sequence alignment" HOMEPAGE="http://bioinfo.lifl.fr/yass/iedera.php"; SRC_URI="http://bioinfo.lifl.fr/yass/files/${P}.tar.gz"; @@ -13,10 +15,12 @@ SLOT="0" IUSE="" KEYWORDS="~amd64 ~x86" -DEPEND="" -RDEPEND="" +PATCHES=( + "${FILESDIR}/${P}-fix-buildsystem.patch" +) -src_install() { +src_prepare() { + mv configure.{in,ac} || die default - dodoc AUTHORS README NEWS + eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: sci-biology/gmap/
commit: 7cd35418c6930fd640b71b0a19c87a757519eeb0 Author: David Seifert gentoo org> AuthorDate: Thu Jan 21 17:49:49 2016 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 21 18:36:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd35418 sci-biology/gmap: Version bump to 2015.12.31.5 Gentoo-Bug: 521640 * Remove use of 'einstall' * EAPI=6 Package-Manager: portage-2.2.27 sci-biology/gmap/Manifest | 1 + sci-biology/gmap/gmap-2015.12.31.5.ebuild | 21 + 2 files changed, 22 insertions(+) diff --git a/sci-biology/gmap/Manifest b/sci-biology/gmap/Manifest index b15b920..b31c441 100644 --- a/sci-biology/gmap/Manifest +++ b/sci-biology/gmap/Manifest @@ -1,2 +1,3 @@ DIST gmap-gsnap-2011-10-07.tar.gz 3404351 SHA256 e508009592d5dd3442345dc5ce6fd9930366e008efa32e4c72dc243a495f3f20 SHA512 6546be4da41c45e41bdab71dcda69cbf172bc186ca64a2543461eb050f383641a13fea0cfcc6bb76b87cc4faa4c593944b029ee1ca2ba68dbaf7d939d0bf02e1 WHIRLPOOL 9f5cd62fb9cbb2cc73d6b971f29d8816e67e1b4b1b9906d8b06ddf99ffd9356bcdf19869066fb14ca5d3ad93a3b70527d05237be2f438da4db86898103bd2bf2 DIST gmap-gsnap-2012-07-20.tar.gz 3623122 SHA256 4cd0c0a313cb7a35b8c7afd45b545e6062b343739f9ef522a09001d448aeb5ec SHA512 bbc22509fc63814a102f96ce0da6a1119c78de7fc2fc4fe17cc4d97881313a77818eaedc51bb6d4ce2426560925fe5ffa121acf972d7b3b097e8d3d65efb7b95 WHIRLPOOL 7318377e4cf80db5c5a9495bf68653fbc48051d6fa5748ed796e1b6e20215d2714b753358fb4cc97aa9c8e441d53ef616ded6ee0923fe78312e78ee91e82 +DIST gmap-gsnap-2015-12-31.v5.tar.gz 4169874 SHA256 2317ba63578ba87f534689c0bf6930a9b177df4aa8a75b2a82f2118760ff3037 SHA512 d42623c60c298d9d3009893432f3eef8cb764bf7cf26b42e6a95b27a468fffab20c8307597c4c8e1afdd61f35652246568c3162137ce59fc4850aaab1062bb48 WHIRLPOOL 2571b7d6a7bddf11b4cbaec22377af19a84633f7d8fe9de74b4c2fa12e0480a76df9a1f52b44199021aa05f6d846ef98d8fbb6f978e64f5b452bbaaafbdd6974 diff --git a/sci-biology/gmap/gmap-2015.12.31.5.ebuild b/sci-biology/gmap/gmap-2015.12.31.5.ebuild new file mode 100644 index 000..acd893f --- /dev/null +++ b/sci-biology/gmap/gmap-2015.12.31.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit versionator + +MY_BASE_PV="$(replace_all_version_separators '-' $(get_version_component_range 1-3))" +MY_PV="${MY_BASE_PV}.v$(get_version_component_range 4)" + +DESCRIPTION="A Genomic Mapping and Alignment Program for mRNA and EST Sequences" +HOMEPAGE="http://research-pub.gene.com/gmap/"; +SRC_URI="http://research-pub.gene.com/gmap/src/gmap-gsnap-${MY_PV}.tar.gz"; + +LICENSE="gmap" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/gmap-${MY_BASE_PV}"
[gentoo-commits] repo/gentoo:master commit in: games-arcade/ninvaders/files/, games-arcade/ninvaders/
commit: cdb23c75c666d2a8e1de086373cd18b5248727eb Author: Michael Sterrett gentoo org> AuthorDate: Thu Jan 21 18:33:38 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Thu Jan 21 18:35:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb23c75 games-arcade/ninvaders: fix compile warning and maybe fix bug #554674 Package-Manager: portage-2.2.26 games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch | 11 +++ games-arcade/ninvaders/ninvaders-0.1.1.ebuild | 8 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch b/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch new file mode 100644 index 000..c949d43 --- /dev/null +++ b/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch @@ -0,0 +1,11 @@ +--- aliens.c.orig 2016-01-21 13:21:51.730154342 -0500 aliens.c 2016-01-21 13:22:09.488543075 -0500 +@@ -163,7 +163,7 @@ + aliens.right=-1; + aliens.bottom=-1; + shipnum=0; +- for (k=0;k<11;k++) { ++ for (k=0;khttp://ninvaders.sourceforge.net/"; @@ -15,7 +15,11 @@ KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" IUSE="" DEPEND="sys-libs/ncurses:0" -RDEPEND="${DEPEND}" +RDEPEND=${DEPEND} + +src_prepare() { + epatch "${FILESDIR}"/${P}-compile.patch +} src_compile() { emake \
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/, ...
commit: 196d6aa6d378c3f2ecd08a45c071c9fc568f2731 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 23:09:27 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=196d6aa6 repoman: Migrate license checks to a plugin module pym/repoman/checks/ebuilds/variables/license.py | 47 -- pym/repoman/modules/scan/metadata/__init__.py | 8 pym/repoman/modules/scan/metadata/license.py| 53 + pym/repoman/scanner.py | 7 +--- 4 files changed, 62 insertions(+), 53 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/license.py b/pym/repoman/checks/ebuilds/variables/license.py deleted file mode 100644 index bdc859c..000 --- a/pym/repoman/checks/ebuilds/variables/license.py +++ /dev/null @@ -1,47 +0,0 @@ - -'''description.py -Perform checks on the LICENSE variable. -''' - -# import our initialized portage instance -from repoman._portage import portage - - -class LicenseChecks(object): - '''Perform checks on the LICENSE variable.''' - - def __init__(self, qatracker, liclist, liclist_deprecated): - ''' - @param qatracker: QATracker instance - @param liclist: List of licenses. - @param liclist: List of deprecated licenses. - ''' - self.qatracker = qatracker - self.liclist = liclist - self.liclist_deprecated = liclist_deprecated - - def check( - self, pkg, package, ebuild, y_ebuild): - ''' - @param pkg: Package in which we check (object). - @param package: Package in which we check (string). - @param ebuild: Ebuild which we check (object). - @param y_ebuild: Ebuild which we check (string). - ''' - - # Parse the LICENSE variable, remove USE conditions and flatten it. - licenses = portage.dep.use_reduce( - pkg._metadata["LICENSE"], matchall=1, flat=True) - - # Check each entry to ensure that it exists in ${PORTDIR}/licenses/. - for lic in licenses: - # Need to check for "||" manually as no portage - # function will remove it without removing values. - if lic not in self.liclist and lic != "||": - self.qatracker.add_error( - "LICENSE.invalid", - package + "/" + y_ebuild + ".ebuild: %s" % lic) - elif lic in self.liclist_deprecated: - self.qatracker.add_error( - "LICENSE.deprecated", - "%s: %s" % (ebuild.relative_path, lic)) diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/pym/repoman/modules/scan/metadata/__init__.py index 2506521..ed0c59d 100644 --- a/pym/repoman/modules/scan/metadata/__init__.py +++ b/pym/repoman/modules/scan/metadata/__init__.py @@ -34,6 +34,14 @@ module_spec = { 'func_desc': { }, }, + 'license-metadata': { + 'name': "license", + 'class': "LicenseChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/metadata/license.py b/pym/repoman/modules/scan/metadata/license.py new file mode 100644 index 000..b022b20 --- /dev/null +++ b/pym/repoman/modules/scan/metadata/license.py @@ -0,0 +1,53 @@ + +'''license.py +Perform checks on the LICENSE variable. +''' + +# import our initialized portage instance +from repoman._portage import portage + + +class LicenseChecks(object): + '''Perform checks on the LICENSE variable.''' + + def __init__(self, **kwargs): + ''' + @param qatracker: QATracker instance + @param repo_metadata: dictionary of various repository items. + ''' + self.qatracker = kwargs.get('qatracker') + self.repo_metadata = kwargs.get('repo_metadata') + + def check(self, **kwargs): + ''' + @param xpkg: Package in which we check (string). + @param ebuild: Ebuild which we check (object). + @param y_ebuild: Ebuild which we check (string). + ''' + xpkg = kwargs.get('xpkg') + ebuild = kwargs.get('ebuild') + y_ebuild = kwargs.get('y_ebuild') + if not kwargs.get('badlicsyntax'): + # Parse the LICENSE variable, remove USE conditions and flatte
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 5c0d45afb60969aceba7391e42ca3a046871f6e5 Author: Brian Dolbec gentoo org> AuthorDate: Thu Jan 21 18:29:07 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 18:29:07 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5c0d45af repoman: Fix a traceback due to xmlint not being installed for a manifest generation Mike helped find teh fact that self.binary was None, causing the misleading traceback. Tighten up the logic in XmlLint. Bypass the PkgMetadata check for manifest mode. floppym@naomi btrfs-progs % repoman manifest >>> Creating Manifest for /home/floppym/repos/gentoo/sys-fs/btrfs-progs Traceback (most recent call last): File "/home/floppym/bin/repoman", line 37, in repoman_main(sys.argv[1:]) File "/home/floppym/src/portage/pym/repoman/main.py", line 111, in repoman_main can_force = scanner.scan_pkgs(can_force) File "/home/floppym/src/portage/pym/repoman/scanner.py", line 242, in scan_pkgs rdata = func(**dynamic_data) File "/home/floppym/src/portage/pym/repoman/modules/scan/metadata/pkgmetadata.py", line 180, in check if not self.xmllint.check(checkdir, repolevel): File "/home/floppym/src/portage/pym/repoman/_xml.py", line 98, in check os.path.join(checkdir, "metadata.xml" TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' pym/repoman/_xml.py | 2 +- pym/repoman/modules/scan/metadata/pkgmetadata.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index 43fc930..334377d 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -58,6 +58,7 @@ class XmlLint(object): self.repoman_settings = repoman_settings self._is_capable = metadata_dtd is not None self.binary = None + self._is_capable = False self._check_capable() def _check_capable(self): @@ -66,7 +67,6 @@ class XmlLint(object): self.binary = find_binary('xmllint') if not self.binary: print(red("!!! xmllint not found. Can't check metadata.xml.\n")) - self._is_capable = False elif not self._is_capable: if not fetch_metadata_dtd(self.metadata_dtd, self.repoman_settings): sys.exit(1) diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py b/pym/repoman/modules/scan/metadata/pkgmetadata.py index 220fd23..8e93457 100644 --- a/pym/repoman/modules/scan/metadata/pkgmetadata.py +++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py @@ -71,6 +71,9 @@ class PkgMetadata(ScanBase): repolevel = kwargs.get('repolevel') self.musedict = {} + if self.options.mode in ['manifest']: + return {'continue': False, 'muselist': frozenset(self.musedict)} + # metadata.xml file check if "metadata.xml" not in checkdirlist: self.qatracker.add_error("metadata.missing", xpkg + "/metadata.xml")
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...
commit: d9c380a02b62fa979f799e6436095f4c81f7b981 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 23:10:48 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d9c380a0 repoman: Migrate RestrictChecks to a plugin module pym/repoman/modules/scan/metadata/__init__.py | 8 ++ .../scan/metadata}/restrict.py | 29 +++--- pym/repoman/scanner.py | 7 +- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/pym/repoman/modules/scan/metadata/__init__.py index ed0c59d..6ab44f6 100644 --- a/pym/repoman/modules/scan/metadata/__init__.py +++ b/pym/repoman/modules/scan/metadata/__init__.py @@ -42,6 +42,14 @@ module_spec = { 'func_desc': { }, }, + 'restrict-metadata': { + 'name': "restrict", + 'class': "RestrictChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py b/pym/repoman/modules/scan/metadata/restrict.py similarity index 54% rename from pym/repoman/checks/ebuilds/variables/restrict.py rename to pym/repoman/modules/scan/metadata/restrict.py index 215b792..93ca298 100644 --- a/pym/repoman/checks/ebuilds/variables/restrict.py +++ b/pym/repoman/modules/scan/metadata/restrict.py @@ -12,21 +12,23 @@ from repoman.qa_data import valid_restrict class RestrictChecks(object): '''Perform checks on the RESTRICT variable.''' - def __init__(self, qatracker): + def __init__(self, **kwargs): ''' @param qatracker: QATracker instance ''' - self.qatracker = qatracker + self.qatracker = kwargs.get('qatracker') - def check(self, pkg, package, ebuild, y_ebuild): + def check(self, **kwargs): + xpkg = kwargs.get('xpkg') + ebuild = kwargs.get('ebuild') + y_ebuild = kwargs.get('y_ebuild') myrestrict = None try: myrestrict = portage.dep.use_reduce( - pkg._metadata["RESTRICT"], matchall=1, flat=True) + ebuild.metadata["RESTRICT"], matchall=1, flat=True) except portage.exception.InvalidDependString as e: - self. qatracker.add_error( - "RESTRICT.syntax", + self.qatracker.add_error("RESTRICT.syntax", "%s: RESTRICT: %s" % (ebuild.relative_path, e)) del e @@ -36,6 +38,15 @@ class RestrictChecks(object): if mybadrestrict: for mybad in mybadrestrict: - self.qatracker.add_error( - "RESTRICT.invalid", - package + "/" + y_ebuild + ".ebuild: %s" % mybad) + self.qatracker.add_error("RESTRICT.invalid", + "%s/%s.ebuild: %s" % (xpkg, y_ebuild, mybad)) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) + diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 1f792bd..8657c73 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -18,7 +18,6 @@ from portage import _unicode_encode from portage.dep import Atom from portage.output import green from repoman.checks.ebuilds.checks import run_checks -from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.modules.commit import repochecks from repoman.profile import check_profiles, dev_profile_keywords, setup_profile from repoman.repos import repo_metadata @@ -209,8 +208,6 @@ class Scanner(object): self.modules[mod_class.__name__] = mod_class(**self.kwargs) # initialize our checks classes here before the big xpkg loop - self.restrictcheck = RestrictChecks(self.qatracker) - def scan_pkgs(self, can_force): dynamic_data = {'can_force': can_force} @@ -295,7 +292,7 @@ class Scanner(object): ('description', 'DescriptionChecks'), (None, 'KeywordChecks'), ('arches', 'ArchChecks'), ('depend', 'DependChecks'), ('use_flags', 'USEFlagChecks'), ('ruby', '
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/modules/scan/ebuild/, ...
commit: 97da70354a787041d4edb038d203b0f87893f893 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 04:44:05 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:51:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=97da7035 repoman: Create new MultiCheck class plugin Move ebuilds/ checks.py and errors.py to the scan/ebuild plugin Remove the checks_init from main(), initialize it in the MultiCheck class where it is needed. pym/repoman/checks/ebuilds/__init__.py | 0 pym/repoman/main.py| 2 - pym/repoman/modules/scan/directories/encoding.py | 43 ++ pym/repoman/modules/scan/ebuild/__init__.py| 8 .../ebuilds => modules/scan/ebuild}/checks.py | 2 +- .../ebuilds => modules/scan/ebuild}/errors.py | 0 pym/repoman/modules/scan/ebuild/multicheck.py | 43 ++ pym/repoman/scanner.py | 21 +-- 8 files changed, 96 insertions(+), 23 deletions(-) diff --git a/pym/repoman/checks/ebuilds/__init__.py b/pym/repoman/checks/ebuilds/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 8784685..890e034 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -26,7 +26,6 @@ from portage.util import formatter from repoman.actions import Actions from repoman.argparser import parse_args -from repoman.checks.ebuilds.checks import checks_init from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats) @@ -65,7 +64,6 @@ def repoman_main(argv): if options.experimental_inherit == 'y': # This is experimental, so it's non-fatal. qawarnings.add("inherit.missing") - checks_init(experimental_inherit=True) # Set this to False when an extraordinary issue (generally # something other than a QA issue) makes it impossible to diff --git a/pym/repoman/modules/scan/directories/encoding.py b/pym/repoman/modules/scan/directories/encoding.py new file mode 100644 index 000..82a9a38 --- /dev/null +++ b/pym/repoman/modules/scan/directories/encoding.py @@ -0,0 +1,43 @@ + +import io + +from portage import _encodings +from portage import _unicode_encode + +from .checks import run_checks, checks_init + + +class EncodingCheck(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + self.options = kwargs.get('options') + checks_init(self.options.experimental_inherit == 'y') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') + try: + # All ebuilds should have utf_8 encoding. + f = io.open( + _unicode_encode(ebuild.full_path, encoding=_encodings['fs'], + errors='strict'), + mode='r', encoding=_encodings['repo.content']) + try: + for check_name, e in run_checks(f, pkg): + self.qatracker.add_error( + check_name, ebuild.relative_path + ': %s' % e) + finally: + f.close() + except UnicodeDecodeError: + # A file.UTF8 failure will have already been recorded. + pass + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/modules/scan/ebuild/__init__.py b/pym/repoman/modules/scan/ebuild/__init__.py index 9747bf0..038cef3 100644 --- a/pym/repoman/modules/scan/ebuild/__init__.py +++ b/pym/repoman/modules/scan/ebuild/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_desc': { }, }, + 'multicheck-module': { + 'name': "multicheck", + 'class': "MultiCheck", + 'description': doc, + 'functions': ['check'], + 'func_kwargs': { + }, + }, } } diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/modules/scan/ebuild/checks.py similarity index 99% rename from pym/repoman/checks/ebuilds/checks.py rename to pym/repoman/modules/scan/ebuild/checks.py index 5420e51..be59b05 100644 --- a/pym/repoman/checks/ebuilds/checks.py +++ b/pym/repoman/modules/scan/ebuild/checks.py @@ -21,7 +21,7 @@ from portage.eapi import ( eapi_has_src_prepare_and_src_configure, eapi_has_dosed_
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 18d5f07ffda73e32a083baf5b9f4944bcf733718 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 11:56:25 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=18d5f07f repoman: Migrate more metadata checks to ebuild_metadata.py .../modules/scan/metadata/ebuild_metadata.py | 32 -- pym/repoman/scanner.py | 17 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py b/pym/repoman/modules/scan/metadata/ebuild_metadata.py index 2dc1db2..77c947e 100644 --- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py +++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py @@ -5,6 +5,8 @@ import re import sys +from repoman.qa_data import missingvars + if sys.hexversion >= 0x300: basestring = str @@ -16,7 +18,7 @@ class EbuildMetadata(object): def __init__(self, **kwargs): self.qatracker = kwargs.get('qatracker') - def check(self, **kwargs): + def invalidchar(self, **kwargs): ebuild = kwargs.get('ebuild') for k, v in ebuild.metadata.items(): if not isinstance(v, basestring): @@ -28,9 +30,35 @@ class EbuildMetadata(object): "%s: %s variable contains non-ASCII " "character at position %s" % (ebuild.relative_path, k, m.start() + 1)) + return {'continue': False} + + def missing(self, **kwargs): + ebuild = kwargs.get('ebuild') + for pos, missing_var in enumerate(missingvars): + if not ebuild.metadata.get(missing_var): + if kwargs.get('catdir') == "virtual" and \ + missing_var in ("HOMEPAGE", "LICENSE"): + continue + if kwargs.get('live_ebuild') and missing_var == "KEYWORDS": + continue + myqakey = missingvars[pos] + ".missing" + self.qatracker.add_error(myqakey, '%s/%s.ebuild' + % (kwargs.get('xpkg'), kwargs.get('y_ebuild'))) + return {'continue': False} + + def old_virtual(self, **kwargs): + ebuild = kwargs.get('ebuild') if ebuild.metadata.get("PROVIDE"): self.qatracker.add_error("virtual.oldstyle", ebuild.relative_path) + return {'continue': False} + def virtual(self, **kwargs): + ebuild = kwargs.get('ebuild') + if kwargs.get('catdir') == "virtual": + for var in ("HOMEPAGE", "LICENSE"): + if ebuild.metadata.get(var): + myqakey = var + ".virtual" + self.qatracker.add_error(myqakey, ebuild.relative_path) return {'continue': False} @property @@ -39,4 +67,4 @@ class EbuildMetadata(object): @property def runInEbuilds(self): - return (True, [self.check]) + return (True, [self.invalidchar, self.missing, self.old_virtual, self.virtual]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 46f46f5..d42fd33 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -324,23 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - - for pos, missing_var in enumerate(missingvars): - if not dynamic_data['ebuild'].metadata.get(missing_var): - if dynamic_data['catdir'] == "virtual" and \ - missing_var in ("HOMEPAGE", "LICENSE"): - continue - if dynamic_data['live_ebuild'] and missing_var == "KEYWORDS": - continue - myqakey = missingvars[pos] + ".missing" - self.qatracker.add_error(myqakey, xpkg + "/" + y_ebuild + ".ebuild") - - if dynamic_data['catdir'] == "virtual": - for var in ("HOMEPAGE", "LICENSE"): - if dynamic_data['ebuild'].metadata.get(var): - myqakey = var + ".virtual" - self.qatracker.add_error(myqakey, dynamic_data['ebuild'].relative_path) - if dynami
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 5f7e7ec3861e74073277d43bf5a5ecdb220df132 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 05:33:17 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:53:44 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5f7e7ec3 repoman: Enable verbosity option to be useful for setting the logging level Verbosity option was not being used internally. Convert debug print's added to proper debug messages. pym/repoman/main.py| 13 ++--- pym/repoman/scanner.py | 35 +++ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 890e034..6921005 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -19,7 +19,6 @@ from portage import os import portage.checksum import portage.const import portage.repository.config -from portage import util from portage.output import create_color_func, nocolor from portage.output import ConsoleStyleFile, StyleWriter from portage.util import formatter @@ -37,13 +36,14 @@ from repoman.modules.vcs.settings import VCSSettings if sys.hexversion >= 0x300: basestring = str -util.initialize_logger() - bad = create_color_func("BAD") # A sane umask is needed for files that portage creates. os.umask(0o22) +LOGLEVEL = logging.WARNING +portage.util.initialize_logger(LOGLEVEL) + def repoman_main(argv): config_root = os.environ.get("PORTAGE_CONFIGROOT") @@ -61,6 +61,13 @@ def repoman_main(argv): print("Portage", portage.VERSION) sys.exit(0) + logger = logging.getLogger() + + if options.verbosity > 0: + logger.setLevel(LOGLEVEL - 10 * options.verbosity) + else: + logger.setLevel(LOGLEVEL) + if options.experimental_inherit == 'y': # This is experimental, so it's non-fatal. qawarnings.add("inherit.missing") diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 4cc2e67..c30c94e 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -19,13 +19,13 @@ from portage.module import Modules MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan") # initial development debug info -#print("module path:", path) +logging.debug("module path: %s", MODULES_PATH) MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan") -# initial development debug info -#print(module_controller.module_names) MODULE_NAMES = MODULE_CONTROLLER.module_names[:] +# initial development debug info +logging.debug("module_names: %s", MODULE_NAMES) class Scanner(object): @@ -197,7 +197,7 @@ class Scanner(object): for mod in ['manifests', 'isebuild', 'keywords', 'files', 'vcsstatus', 'fetches', 'pkgmetadata']: mod_class = MODULE_CONTROLLER.get_class(mod) - print("Initializing class name:", mod_class.__name__) + logging.debug("Initializing class name: %s", mod_class.__name__) self.modules[mod_class.__name__] = mod_class(**self.kwargs) # initialize our checks classes here before the big xpkg loop @@ -207,7 +207,7 @@ class Scanner(object): for xpkg in self.effective_scanlist: xpkg_continue = False # ebuilds and digests added to cvs respectively. - logging.info("checking package %s" % xpkg) + logging.info("checking package %s", xpkg) # save memory by discarding xmatch caches from previous package(s) self.caches['arch_xmatch'].clear() self.eadded = [] @@ -235,7 +235,7 @@ class Scanner(object): # need to set it up for ==> self.modules or some other ordered list for mod in ['Manifests', 'IsEbuild', 'KeywordChecks', 'FileChecks', 'VCSStatus', 'FetchChecks', 'PkgMetadata']: - print("scan_pkgs(): module:", mod) + logging.debug("scan_pkgs; module: %s", mod) do_it, functions = self.modules[mod].runInPkgs if do_it: for func in functions: @@ -299,7 +299,7 @@ class Scanner(object): logging.debug("do_it: %s, functions: %s", do_it, [x.__name__ for x in functions]) if do_it: for func in functions: - print("\tRunning function:", func) + logging.debug("\tRunning function: %s", func) rdata = func(**dynamic_data)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/options/
commit: 57f9149d1abd169fbfb7520d4117a52a72fcdf8f Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 07:55:55 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:53:39 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=57f9149d repoman: Create a new Options class plugin This handles an options.force bypass using the is_forced() from withing the plugin system. pym/repoman/modules/scan/options/__init__.py | 23 +++ pym/repoman/modules/scan/options/options.py | 22 ++ pym/repoman/scanner.py | 10 ++ 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/pym/repoman/modules/scan/options/__init__.py b/pym/repoman/modules/scan/options/__init__.py new file mode 100644 index 000..8424058 --- /dev/null +++ b/pym/repoman/modules/scan/options/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Options plug-in module for repoman. +Performs option related actions on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'options', + 'description': doc, + 'provides':{ + 'options-module': { + 'name': "options", + 'class': "Options", + 'description': doc, + 'functions': ['is_forced'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/options/options.py b/pym/repoman/modules/scan/options/options.py new file mode 100644 index 000..b592884 --- /dev/null +++ b/pym/repoman/modules/scan/options/options.py @@ -0,0 +1,22 @@ + + +class Options(object): + + def __init__(self, **kwargs): + self.options = kwargs.get('options') + + def is_forced(self, **kwargs): + if self.options.force: + # The dep_check() calls are the most expensive QA test. If --force + # is enabled, there's no point in wasting time on these since the + # user is intent on forcing the commit anyway. + return {'continue': True} + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.is_forced]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 6603bd2..cb2a7c0 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -290,6 +290,8 @@ class Scanner(object): ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ('license', 'LicenseChecks'), ('restrict', 'RestrictChecks'), ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), + # Options.is_forced() is used to bypass further checks + ('options', 'Options'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -317,14 +319,6 @@ class Scanner(object): if y_ebuild_continue: continue - # Syntax Checks - - if self.options.force: - # The dep_check() calls are the most expensive QA test. If --force - # is enabled, there's no point in wasting time on these since the - # user is intent on forcing the commit anyway. - continue - relevant_profiles = [] for keyword, arch, groups in dynamic_data['arches']: if arch not in self.profiles:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 02395b0dea31388acbc5ae58ebc5d90f64b2d10a Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 08:37:22 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:53:44 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=02395b0d repoman: Create a metadata UnusedCheck and final pkg checks Create a plugin loop for any final pkg checks. Create the one plugin for the unused use-descriptions in mteadata.xml pym/repoman/modules/scan/metadata/__init__.py | 8 ++ pym/repoman/modules/scan/metadata/unused.py | 32 pym/repoman/scanner.py| 36 --- 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/pym/repoman/modules/scan/metadata/__init__.py index 6ab44f6..ed4a967 100644 --- a/pym/repoman/modules/scan/metadata/__init__.py +++ b/pym/repoman/modules/scan/metadata/__init__.py @@ -50,6 +50,14 @@ module_spec = { 'func_desc': { }, }, + 'unused-metadata': { + 'name': "unused", + 'class': "UnusedCheck", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/metadata/unused.py b/pym/repoman/modules/scan/metadata/unused.py new file mode 100644 index 000..5eb6716 --- /dev/null +++ b/pym/repoman/modules/scan/metadata/unused.py @@ -0,0 +1,32 @@ + + +class UnusedCheck(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + xpkg = kwargs.get('xpkg') + muselist = kwargs.get('muselist') + used_useflags = kwargs.get('used_useflags') + # check if there are unused local USE-descriptions in metadata.xml + # (unless there are any invalids, to avoid noise) + if kwargs.get('allvalid'): + for myflag in muselist.difference(used_useflags): + self.qatracker.add_error( + "metadata.warning", + "%s/metadata.xml: unused local USE-description: '%s'" + % (xpkg, myflag)) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (False, []) + + @property + def runInFinal(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 1cd37d0..4cc2e67 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -269,7 +269,6 @@ class Scanner(object): def _scan_ebuilds(self, ebuildlist, dynamic_data): - xpkg = dynamic_data['xpkg'] # detect unused local USE-descriptions dynamic_data['used_useflags'] = set() @@ -317,11 +316,30 @@ class Scanner(object): if y_ebuild_continue: continue - # check if there are unused local USE-descriptions in metadata.xml - # (unless there are any invalids, to avoid noise) - if dynamic_data['allvalid']: - for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): - self.qatracker.add_error( - "metadata.warning", - "%s/metadata.xml: unused local USE-description: '%s'" - % (xpkg, myflag)) + # Final checks + # initialize per pkg plugin final checks here + # need to set it up for ==> self.modules_list or some other ordered list + xpkg_complete = False + for mod in [('unused', 'UnusedChecks')]: + if mod[0]: + mod_class = MODULE_CONTROLLER.get_class(mod[0]) + print("Initializing class name:", mod_class.__name__) + self.modules[mod[1]] = mod_class(**self.kwargs) + print("scan_ebuilds final checks: module:", mod[1]) + do_it, functions = self.modules[mod[1]].runInFinal + # print("do_it", do_it, "functions", functions) + if do_it: + for func in functions: + print("\tRunning function:", func) + rdata = func(**dynamic_data) + if rdata.g
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/full/, pym/repoman/modules/manifest/, ...
commit: 690d46a2a8b80d3fb68fc5a229bbb2aef9e9f146 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jan 6 03:08:08 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:53:45 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=690d46a2 repoman: Delete unused subpkgs pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/modules/fix/__init__.py | 0 pym/repoman/modules/full/__init__.py | 0 pym/repoman/modules/manifest/__init__.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/fix/__init__.py b/pym/repoman/modules/fix/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/full/__init__.py b/pym/repoman/modules/full/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/manifest/__init__.py b/pym/repoman/modules/manifest/__init__.py deleted file mode 100644 index e69de29..000
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: bb2c1e312b681386cc9a4100dea2384e26d71066 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 21:55:33 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bb2c1e31 repoman: Migrate additional dynamic data setting to the USEFlagsChecks pym/repoman/scanner.py | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 6d5416b..d5faded 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -283,7 +283,7 @@ class Scanner(object): def _scan_ebuilds(self, ebuildlist, dynamic_data): xpkg = dynamic_data['xpkg'] # detect unused local USE-descriptions - used_useflags = set() + dynamic_data['used_useflags'] = set() for y_ebuild in ebuildlist: dynamic_data['y_ebuild'] = y_ebuild @@ -324,8 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) - # license checks if not dynamic_data['badlicsyntax']: self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) @@ -535,7 +533,7 @@ class Scanner(object): # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']: - for myflag in dynamic_data['muselist'].difference(used_useflags): + for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): self.qatracker.add_error( "metadata.warning", "%s/metadata.xml: unused local USE-description: '%s'"
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: 4bcbd3453979a3d990c6a46ed91caaa4192a6856 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 08:09:33 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:53:44 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4bcbd345 repoman: Create a new DependUnknown plugin class pym/repoman/modules/scan/depend/__init__.py | 8 pym/repoman/modules/scan/depend/unknown.py | 30 + pym/repoman/scanner.py | 10 +- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py index 2dac94b..6b4 100644 --- a/pym/repoman/modules/scan/depend/__init__.py +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_desc': { }, }, + 'unknown-module': { + 'name': "unknown", + 'class': "DependUnknown", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/depend/unknown.py b/pym/repoman/modules/scan/depend/unknown.py new file mode 100644 index 000..61d51b9 --- /dev/null +++ b/pym/repoman/modules/scan/depend/unknown.py @@ -0,0 +1,30 @@ +# -*- coding:utf-8 -*- + + +class DependUnknown(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + baddepsyntax = kwargs.get('baddepsyntax') + unknown_pkgs = kwargs.get('unknown_pkgs') + + if not baddepsyntax and unknown_pkgs: + type_map = {} + for mytype, atom in unknown_pkgs: + type_map.setdefault(mytype, set()).add(atom) + for mytype, atoms in type_map.items(): + self.qatracker.add_error( + "dependency.unknown", "%s: %s: %s" + % (ebuild.relative_path, mytype, ", ".join(sorted(atoms + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 9223876..1cd37d0 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -289,6 +289,7 @@ class Scanner(object): ('mtime', 'MtimeChecks'), ('multicheck', 'MultiCheck'), # Options.is_forced() is used to bypass further checks ('options', 'Options'), ('profile', 'ProfileDependsChecks'), + ('unknown', 'DependUnknown'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -316,15 +317,6 @@ class Scanner(object): if y_ebuild_continue: continue - if not dynamic_data['baddepsyntax'] and dynamic_data['unknown_pkgs']: - type_map = {} - for mytype, atom in dynamic_data['unknown_pkgs']: - type_map.setdefault(mytype, set()).add(atom) - for mytype, atoms in type_map.items(): - self.qatracker.add_error( - "dependency.unknown", "%s: %s: %s" - % (dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms - # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: 99e8897840c8db6d689280cdb3c0d987fc92023a Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 07:57:36 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 02:53:44 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=99e88978 repoman: Move the large depency checks loop to a new plugin ProfileDependsChecks class pym/repoman/modules/scan/depend/__init__.py | 8 ++ pym/repoman/modules/scan/depend/profile.py | 211 pym/repoman/repos.py| 1 + pym/repoman/scanner.py | 181 +--- 4 files changed, 227 insertions(+), 174 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py index 73d3f8f..2dac94b 100644 --- a/pym/repoman/modules/scan/depend/__init__.py +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -18,6 +18,14 @@ module_spec = { 'func_desc': { }, }, + 'profile-module': { + 'name': "profile", + 'class': "ProfileDependsChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/depend/profile.py b/pym/repoman/modules/scan/depend/profile.py new file mode 100644 index 000..91c52cc --- /dev/null +++ b/pym/repoman/modules/scan/depend/profile.py @@ -0,0 +1,211 @@ +# -*- coding:utf-8 -*- + + +import copy +from pprint import pformat + +from _emerge.Package import Package + +# import our initialized portage instance +from repoman._portage import portage +from portage.dep import Atom + + +def sort_key(item): + return item[2].sub_path + + +class ProfileDependsChecks(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + self.portdb = kwargs.get('portdb') + self.profiles = kwargs.get('profiles') + self.options = kwargs.get('options') + self.repo_settings = kwargs.get('repo_settings') + self.include_arches = kwargs.get('include_arches') + self.caches = kwargs.get('caches') + self.repoman_incrementals = kwargs.get('repoman_incrementals') + self.env = kwargs.get('env') + self.have = kwargs.get('have') + self.dev_keywords = kwargs.get('dev_keywords') + + def check(self, **kwargs): + arches = kwargs.get('arches') + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') + baddepsyntax = kwargs.get('baddepsyntax') + unknown_pkgs = kwargs.get('unknown_pkgs') + + relevant_profiles = [] + for keyword, arch, groups in arches: + if arch not in self.profiles: + # A missing profile will create an error further down + # during the KEYWORDS verification. + continue + + if self.include_arches is not None: + if arch not in self.include_arches: + continue + + relevant_profiles.extend( + (keyword, groups, prof) for prof in self.profiles[arch]) + + relevant_profiles.sort(key=sort_key) + + for keyword, groups, prof in relevant_profiles: + + is_stable_profile = prof.status == "stable" + is_dev_profile = prof.status == "dev" and \ + self.options.include_dev + is_exp_profile = prof.status == "exp" and \ + self.options.include_exp_profiles == 'y' + if not (is_stable_profile or is_dev_profile or is_exp_profile): + continue + + dep_settings = self.caches['arch'].get(prof.sub_path) + if dep_settings is None: + dep_settings = portage.config( + config_profile_path=prof.abs_path, + config_incrementals=self.repoman_incrementals, + config_root=self.repo_settings.config_root, + local_config=False, + _unmatched_removal=self.options.unmatched_removal, + env=self.env, repositories=self.repo_settings.repoman_settings.repositories) + dep_settings.categories = self.repo_settings.repoman_settings.categories + if self.opti
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/
commit: 3644c04f0f81814b47d5c284150e6ce85cb6e032 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 20:38:11 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3644c04f repoman: New DependChecks plugin Migrate code from _scan_ebuilds to the plugin system pym/repoman/modules/scan/depend/__init__.py | 23 + pym/repoman/modules/scan/depend/depend.py | 132 pym/repoman/scanner.py | 119 ++--- 3 files changed, 162 insertions(+), 112 deletions(-) diff --git a/pym/repoman/modules/scan/depend/__init__.py b/pym/repoman/modules/scan/depend/__init__.py new file mode 100644 index 000..73d3f8f --- /dev/null +++ b/pym/repoman/modules/scan/depend/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Depend plug-in module for repoman. +Performs Dependency checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'depend', + 'description': doc, + 'provides':{ + 'depend-module': { + 'name': "depend", + 'class': "DependChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/depend/depend.py b/pym/repoman/modules/scan/depend/depend.py new file mode 100644 index 000..8a0ff48 --- /dev/null +++ b/pym/repoman/modules/scan/depend/depend.py @@ -0,0 +1,132 @@ + +from _emerge.Package import Package + +from repoman.check_missingslot import check_missingslot +# import our initialized portage instance +from repoman._portage import portage +from repoman.qa_data import suspect_virtual, suspect_rdepend + + +class DependChecks(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + self.portdb = kwargs.get('portdb') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') + + unknown_pkgs = set() + + inherited_java_eclass = "java-pkg-2" in ebuild.inherited or \ + "java-pkg-opt-2" in ebuild.inherited, + inherited_wxwidgets_eclass = "wxwidgets" in ebuild.inherited + # operator_tokens = set(["||", "(", ")"]) + type_list, badsyntax = [], [] + for mytype in Package._dep_keys + ("LICENSE", "PROPERTIES", "PROVIDE"): + mydepstr = ebuild.metadata[mytype] + + buildtime = mytype in Package._buildtime_keys + runtime = mytype in Package._runtime_keys + token_class = None + if mytype.endswith("DEPEND"): + token_class = portage.dep.Atom + + try: + atoms = portage.dep.use_reduce( + mydepstr, matchall=1, flat=True, + is_valid_flag=pkg.iuse.is_valid_flag, token_class=token_class) + except portage.exception.InvalidDependString as e: + atoms = None + badsyntax.append(str(e)) + + if atoms and mytype.endswith("DEPEND"): + if runtime and \ + "test?" in mydepstr.split(): + self.qatracker.add_error( + mytype + '.suspect', + "%s: 'test?' USE conditional in %s" % + (ebuild.relative_path, mytype)) + + for atom in atoms: + if atom == "||": + continue + + is_blocker = atom.blocker + + # Skip dependency.unknown for blockers, so that we + # don't encourage people to remove necessary blockers, + # as discussed in bug 382407. We use atom.without_use + # due to bug 525376. + if not is_blocker and \ + not self.portdb.xmatch("match-all", atom.without_use) and \ + not atom.cp.startswith("virtual/"): + unknown_pkgs.add((mytype, atom.unevaluated_atom)) + +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: 2e7f4b895207199f68c3c02738449bbd8c3046ff Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 21:19:59 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e7f4b89 repoman: Migrate some additional Dependency code to the plugin pym/repoman/modules/scan/depend/depend.py | 13 - pym/repoman/scanner.py| 22 +++--- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/pym/repoman/modules/scan/depend/depend.py b/pym/repoman/modules/scan/depend/depend.py index 8a0ff48..7f1d007 100644 --- a/pym/repoman/modules/scan/depend/depend.py +++ b/pym/repoman/modules/scan/depend/depend.py @@ -1,3 +1,5 @@ +# -*- coding:utf-8 -*- + from _emerge.Package import Package @@ -121,7 +123,16 @@ class DependChecks(object): qacat = m + ".syntax" self.qatracker.add_error( qacat, "%s: %s: %s" % (ebuild.relative_path, m, b)) - return {'continue': False, 'unknown_pkgs': unknown_pkgs, 'type_list': type_list} + + # data required for some other tests + badlicsyntax = len([z for z in type_list if z == "LICENSE"]) + badprovsyntax = len([z for z in type_list if z == "PROVIDE"]) + baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax + badlicsyntax = badlicsyntax > 0 + #badprovsyntax = badprovsyntax > 0 + + return {'continue': False, 'unknown_pkgs': unknown_pkgs, 'type_list': type_list, + 'badlicsyntax': badlicsyntax, 'baddepsyntax': baddepsyntax} @property def runInPkgs(self): diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index d42fd33..6d5416b 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -324,26 +324,10 @@ class Scanner(object): if y_ebuild_continue: continue - if dynamic_data['live_ebuild'] and self.repo_settings.repo_config.name == "gentoo": - self.liveeclasscheck.check( - dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords, self.repo_metadata['pmaskdict']) - - unknown_pkgs = set() - baddepsyntax = False - badlicsyntax = False - badprovsyntax = False - # catpkg = catdir + "/" + y_ebuild - - badlicsyntax = len([z for z in dynamic_data['type_list'] if z == "LICENSE"]) - badprovsyntax = len([z for z in dynamic_data['type_list'] if z == "PROVIDE"]) - baddepsyntax = len(dynamic_data['type_list']) != badlicsyntax + badprovsyntax - badlicsyntax = badlicsyntax > 0 - badprovsyntax = badprovsyntax > 0 - used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) # license checks - if not badlicsyntax: + if not dynamic_data['badlicsyntax']: self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) self.restrictcheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) @@ -449,7 +433,7 @@ class Scanner(object): dep_settings.usemask = dep_settings._use_manager.getUseMask( dynamic_data['pkg'], stable=dep_settings._parent_stable) - if not baddepsyntax: + if not dynamic_data['baddepsyntax']: ismasked = not dynamic_data['ebuild'].archs or \ dynamic_data['pkg'].cpv not in self.portdb.xmatch("match-visible", Atom("%s::%s" % (dynamic_data['pkg'].cp, self.repo_settings.repo_config.name))) @@ -539,7 +523,7 @@ class Scanner(object): % (dynamic_data['ebuild'].relative_path, mytype, keyword, prof, pformat(atoms, indent=6))) - if not baddepsyntax and dynamic_data['unknown_pkgs']: + if not dynamic_data['baddepsyntax'] and dynamic_data['unknown_pkgs']: type_map = {} for mytype, atom in dynamic_data['unknown_pkgs']: type_map.setdefault(mytype, set()).add(atom)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/arches/, pym/repoman/
commit: 5979393f1a5e046fbb1ed2e4d6fe5fa23ea37e9a Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 19:11:22 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5979393f repoman: Create a new ArchChecks class plugin pym/repoman/modules/scan/arches/__init__.py | 23 +++ pym/repoman/modules/scan/arches/arches.py | 64 + pym/repoman/scanner.py | 47 + 3 files changed, 89 insertions(+), 45 deletions(-) diff --git a/pym/repoman/modules/scan/arches/__init__.py b/pym/repoman/modules/scan/arches/__init__.py new file mode 100644 index 000..b570dac --- /dev/null +++ b/pym/repoman/modules/scan/arches/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Arches plug-in module for repoman. +Performs archs checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'arches', + 'description': doc, + 'provides':{ + 'archs-module': { + 'name': "arches", + 'class': "ArchChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/arches/arches.py b/pym/repoman/modules/scan/arches/arches.py new file mode 100644 index 000..2c32028 --- /dev/null +++ b/pym/repoman/modules/scan/arches/arches.py @@ -0,0 +1,64 @@ +# -*- coding:utf-8 -*- + + +class ArchChecks(object): + + def __init__(self, **kwargs): + self.options = kwargs.get('options') + self.repo_settings = kwargs.get('repo_settings') + self.profiles = kwargs.get('profiles') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + if self.options.ignore_arches: + arches = [[ + self.repo_settings.repoman_settings["ARCH"], self.repo_settings.repoman_settings["ARCH"], + self.repo_settings.repoman_settings["ACCEPT_KEYWORDS"].split()]] + else: + arches = set() + for keyword in ebuild.keywords: + if keyword[0] == "-": + continue + elif keyword[0] == "~": + arch = keyword[1:] + if arch == "*": + for expanded_arch in self.profiles: + if expanded_arch == "**": + continue + arches.add( + (keyword, expanded_arch, ( + expanded_arch, "~" + expanded_arch))) + else: + arches.add((keyword, arch, (arch, keyword))) + else: + # For ebuilds with stable keywords, check if the + # dependencies are satisfiable for unstable + # configurations, since use.stable.mask is not + # applied for unstable configurations (see bug + # 563546). + if keyword == "*": + for expanded_arch in self.profiles: + if expanded_arch == "**": + continue + arches.add( + (keyword, expanded_arch, (expanded_arch,))) + arches.add( + (keyword, expanded_arch, + (expanded_arch, "~" + expanded_arch))) + else: + arches.add((keyword, keyword, (keyword,))) + arches.add((keyword, keyword, + (keyword, "~" + keyword))) + if not arches: + # Use an empty profile for checking dependencies of +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/
commit: 71d070cccf6b34fa39bf2549029dc1253e14c736 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 23:23:52 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=71d070cc repoman: Migrate code to a new MtimeChecks class in directories plugin pym/repoman/modules/scan/directories/__init__.py | 8 pym/repoman/modules/scan/directories/mtime.py| 24 pym/repoman/scanner.py | 5 + 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/pym/repoman/modules/scan/directories/__init__.py b/pym/repoman/modules/scan/directories/__init__.py index 7fe9f0e..b9daef0 100644 --- a/pym/repoman/modules/scan/directories/__init__.py +++ b/pym/repoman/modules/scan/directories/__init__.py @@ -18,6 +18,14 @@ module_spec = { 'func_kwargs': { }, }, + 'mtime-module': { + 'name': "mtime", + 'class': "MtimeChecks", + 'description': doc, + 'functions': ['check'], + 'func_kwargs': { + }, + }, } } diff --git a/pym/repoman/modules/scan/directories/mtime.py b/pym/repoman/modules/scan/directories/mtime.py new file mode 100644 index 000..e113cdd --- /dev/null +++ b/pym/repoman/modules/scan/directories/mtime.py @@ -0,0 +1,24 @@ + + +class MtimeChecks(object): + + def __init__(self, **kwargs): + self.vcs_settings = kwargs.get('vcs_settings') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + changed = kwargs.get('changed') + pkg = kwargs.get('pkg') + if not self.vcs_settings.vcs_preserves_mtime: + if ebuild.ebuild_path not in changed.new_ebuilds and \ + ebuild.ebuild_path not in changed.ebuilds: + pkg.mtime = None + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 8657c73..b00dbd9 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -293,6 +293,7 @@ class Scanner(object): ('arches', 'ArchChecks'), ('depend', 'DependChecks'), ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ('license', 'LicenseChecks'), ('restrict', 'RestrictChecks'), + ('mtime', 'MtimeChecks'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -321,10 +322,6 @@ class Scanner(object): continue # Syntax Checks - if not self.vcs_settings.vcs_preserves_mtime: - if dynamic_data['ebuild'].ebuild_path not in self.changed.new_ebuilds and \ - dynamic_data['ebuild'].ebuild_path not in self.changed.ebuilds: - dynamic_data['pkg'].mtime = None try: # All ebuilds should have utf_8 encoding. f = io.open(
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...
commit: 15c10f7edd9677e9f44eb60d4f17eaf2d3379e13 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 17:36:26 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=15c10f7e repoman: Migrate DescriptionChecks to the plugin system pym/repoman/modules/scan/metadata/__init__.py| 8 .../scan/metadata}/description.py| 20 ++-- pym/repoman/scanner.py | 5 + 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/pym/repoman/modules/scan/metadata/__init__.py index eba6565..2506521 100644 --- a/pym/repoman/modules/scan/metadata/__init__.py +++ b/pym/repoman/modules/scan/metadata/__init__.py @@ -26,6 +26,14 @@ module_spec = { 'func_desc': { }, }, + 'description-metadata': { + 'name': "description", + 'class': "DescriptionChecks", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/checks/ebuilds/variables/description.py b/pym/repoman/modules/scan/metadata/description.py similarity index 66% rename from pym/repoman/checks/ebuilds/variables/description.py rename to pym/repoman/modules/scan/metadata/description.py index a2b1057..3570607 100644 --- a/pym/repoman/checks/ebuilds/variables/description.py +++ b/pym/repoman/modules/scan/metadata/description.py @@ -9,20 +9,19 @@ from repoman.qa_data import max_desc_len class DescriptionChecks(object): '''Perform checks on the DESCRIPTION variable.''' - def __init__(self, qatracker): + def __init__(self, **kwargs): ''' @param qatracker: QATracker instance ''' - self.qatracker = qatracker + self.qatracker = kwargs.get('qatracker') - def check(self, pkg, ebuild): + def checkTooLong(self, **kwargs): ''' @param pkg: Package in which we check (object). @param ebuild: Ebuild which we check (object). ''' - self._checkTooLong(pkg, ebuild) - - def _checkTooLong(self, pkg, ebuild): + ebuild = kwargs.get('ebuild') + pkg = kwargs.get('pkg') # 14 is the length of DESCRIPTION="" if len(pkg._metadata['DESCRIPTION']) > max_desc_len: self.qatracker.add_error( @@ -30,3 +29,12 @@ class DescriptionChecks(object): "%s: DESCRIPTION is %d characters (max %d)" % (ebuild.relative_path, len( pkg._metadata['DESCRIPTION']), max_desc_len)) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.checkTooLong]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 955440e..bb856b8 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -21,7 +21,6 @@ from repoman.checks.ebuilds.checks import run_checks from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.use_flags import USEFlagChecks -from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.license import LicenseChecks from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.modules.commit import repochecks @@ -216,7 +215,6 @@ class Scanner(object): # initialize our checks classes here before the big xpkg loop self.use_flag_checks = USEFlagChecks(self.qatracker, uselist) self.rubyeclasscheck = RubyEclassChecks(self.qatracker) - self.descriptioncheck = DescriptionChecks(self.qatracker) self.licensecheck = LicenseChecks(self.qatracker, liclist, liclist_deprecated) self.restrictcheck = RestrictChecks(self.qatracker) @@ -301,6 +299,7 @@ class Scanner(object): for mod in [('ebuild', 'Ebuild'), ('live', 'LiveEclassChecks'), ('eapi', 'EAPIChecks'), ('ebuild_metadata', 'EbuildMetadata'), ('thirdpartymirrors', 'ThirdPartyMirrors'), + ('description', 'DescriptionChecks'), ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) @@ -347,8 +346,6 @@ class Scan
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/eclasses/, ...
commit: 7a16c107438b06888dfee938ba0bcdd01dadef1a Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 8 08:46:01 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7a16c107 repoman: Create RubyEclassChecks class plugin pym/repoman/checks/ebuilds/eclasses/__init__.py| 0 pym/repoman/modules/scan/eclasses/__init__.py | 8 .../{checks/ebuilds => modules/scan}/eclasses/ruby.py | 18 ++ pym/repoman/scanner.py | 9 ++--- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py b/pym/repoman/checks/ebuilds/eclasses/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/scan/eclasses/__init__.py b/pym/repoman/modules/scan/eclasses/__init__.py index a821f5c..70a6252 100644 --- a/pym/repoman/modules/scan/eclasses/__init__.py +++ b/pym/repoman/modules/scan/eclasses/__init__.py @@ -18,6 +18,14 @@ module_spec = { 'func_kwargs': { }, }, + 'ruby-module': { + 'name': "ruby", + 'class': "RubyEclassChecks", + 'description': doc, + 'functions': ['check'], + 'func_kwargs': { + }, + }, } } diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py b/pym/repoman/modules/scan/eclasses/ruby.py similarity index 62% rename from pym/repoman/checks/ebuilds/eclasses/ruby.py rename to pym/repoman/modules/scan/eclasses/ruby.py index e8d36ea..4dc5d62 100644 --- a/pym/repoman/checks/ebuilds/eclasses/ruby.py +++ b/pym/repoman/modules/scan/eclasses/ruby.py @@ -4,19 +4,23 @@ Performs Ruby eclass checks ''' from repoman.qa_data import ruby_deprecated +from repoman.modules.scan.scanbase import ScanBase -class RubyEclassChecks(object): +class RubyEclassChecks(ScanBase): '''Performs checks for the usage of Ruby eclasses in ebuilds''' - def __init__(self, qatracker): + def __init__(self, **kwargs): ''' @param qatracker: QATracker instance ''' - self.qatracker = qatracker + super(RubyEclassChecks, self).__init__(**kwargs) + self.qatracker = kwargs.get('qatracker') self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"] - def check(self, pkg, ebuild): + def check(self, **kwargs): + pkg = kwargs.get('pkg') + ebuild = kwargs.get('ebuild') is_inherited = lambda eclass: eclass in pkg.inherited is_old_ruby_eclass_inherited = filter( is_inherited, self.old_ruby_eclasses) @@ -30,3 +34,9 @@ class RubyEclassChecks(object): "IUSE.rubydeprecated", (ebuild.relative_path + ": Deprecated ruby target: %s") % myruby) + return {'continue': False} + + @property + def runInEbuilds(self): + '''Ebuild level scans''' + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 0227a93..e6a17cd 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -18,7 +18,6 @@ from portage import _unicode_encode from portage.dep import Atom from portage.output import green from repoman.checks.ebuilds.checks import run_checks -from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks from repoman.checks.ebuilds.variables.license import LicenseChecks from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.modules.commit import repochecks @@ -211,7 +210,6 @@ class Scanner(object): self.modules[mod_class.__name__] = mod_class(**self.kwargs) # initialize our checks classes here before the big xpkg loop - self.rubyeclasscheck = RubyEclassChecks(self.qatracker) self.licensecheck = LicenseChecks(self.qatracker, liclist, liclist_deprecated) self.restrictcheck = RestrictChecks(self.qatracker) @@ -298,7 +296,7 @@ class Scanner(object): ('thirdpartymirrors', 'ThirdPartyMirrors'), ('description', 'DescriptionChecks'), (None, 'KeywordChecks'), ('arches', 'ArchChecks'), ('depend', 'DependChecks'), - ('use_flags', 'USEFlagChecks'), + ('use_flags', 'USEFlagChecks'), ('ruby', 'RubyEclassChecks'), ]: if mod[0]:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/
commit: d5dc8847974f79cc8d0bc5f594a05bdd4f8a7d77 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 17:33:26 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d5dc8847 repoman: Move ebuild_archs to the Ebuild class pym/repoman/modules/scan/ebuild/ebuild.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py b/pym/repoman/modules/scan/ebuild/ebuild.py index 62c9e52..7362ff7 100644 --- a/pym/repoman/modules/scan/ebuild/ebuild.py +++ b/pym/repoman/modules/scan/ebuild/ebuild.py @@ -35,6 +35,7 @@ class Ebuild(ScanBase): self.eapi = None self.inherited = None self.keywords = None + self.archs = None def _set_paths(self, **kwargs): repolevel = kwargs.get('repolevel')
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/eapi/, ...
commit: 55d776de64621aced62fffc0e58a68d4e77d0240 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 10:03:26 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=55d776de repoman: Migrate eapi.py to the plugin module pym/repoman/checks/ebuilds/variables/eapi.py | 44 - pym/repoman/modules/scan/eapi/__init__.py| 23 + pym/repoman/modules/scan/eapi/eapi.py| 49 pym/repoman/scanner.py | 6 ++-- 4 files changed, 74 insertions(+), 48 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py b/pym/repoman/checks/ebuilds/variables/eapi.py deleted file mode 100644 index 2f8b1cb..000 --- a/pym/repoman/checks/ebuilds/variables/eapi.py +++ /dev/null @@ -1,44 +0,0 @@ - -'''eapi.py -Perform checks on the EAPI variable. -''' - - -class EAPIChecks(object): - '''Perform checks on the EAPI variable.''' - - def __init__(self, qatracker, repo_settings): - ''' - @param qatracker: QATracker instance - @param repo_settings: Repository settings - ''' - self.qatracker = qatracker - self.repo_settings = repo_settings - - def check(self, pkg, ebuild): - ''' - @param pkg: Package in which we check (object). - @param ebuild: Ebuild which we check (object). - ''' - eapi = pkg._metadata["EAPI"] - - if not self._checkBanned(ebuild, eapi): - self._checkDeprecated(ebuild, eapi) - - def _checkBanned(self, ebuild, eapi): - if self.repo_settings.repo_config.eapi_is_banned(eapi): - self.qatracker.add_error( - "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) - - return True - - return False - - def _checkDeprecated(self, ebuild, eapi): - if self.repo_settings.repo_config.eapi_is_deprecated(eapi): - self.qatracker.add_error( - "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) - - return True - - return False diff --git a/pym/repoman/modules/scan/eapi/__init__.py b/pym/repoman/modules/scan/eapi/__init__.py new file mode 100644 index 000..de586a8 --- /dev/null +++ b/pym/repoman/modules/scan/eapi/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Eapi plug-in module for repoman. +Performs an IsEbuild check on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'eapi', + 'description': doc, + 'provides':{ + 'live-module': { + 'name': "eapi", + 'class': "EAPIChecks", + 'description': doc, + 'functions': ['check'], + 'func_kwargs': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/eapi/eapi.py b/pym/repoman/modules/scan/eapi/eapi.py new file mode 100644 index 000..1190b1a --- /dev/null +++ b/pym/repoman/modules/scan/eapi/eapi.py @@ -0,0 +1,49 @@ + +'''eapi.py +Perform checks on the EAPI variable. +''' + + +class EAPIChecks(object): + '''Perform checks on the EAPI variable.''' + + def __init__(self, **kwargs): + ''' + @param qatracker: QATracker instance + @param repo_settings: Repository settings + ''' + self.qatracker = kwargs.get('qatracker') + self.repo_settings = kwargs.get('repo_settings') + + def check(self, **kwargs): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + ebuild = kwargs.get('ebuild') + + if not self._checkBanned(ebuild): + self._checkDeprecated(ebuild) + return {'continue': False} + + def _checkBanned(self, ebuild): + if self.repo_settings.repo_config.eapi_is_banned(ebuild.eapi): + self.qatracker.add_error( + "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, ebuild.eapi)) + return True + return False + + def _checkDeprecated(self, ebuild): + if self.repo_settings.repo_config.eapi_is_deprecated(ebuild.eapi): + self.qatracker.add_error( + "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, ebuild.eapi)) + return True + return False + +
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 04cc3461557369a1ba864280925282771232c7fe Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 11:31:26 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=04cc3461 scanner.py: Migrate another metadata check to ebuild_metadata pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++ pym/repoman/scanner.py | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py b/pym/repoman/modules/scan/metadata/ebuild_metadata.py index 143a40e..2dc1db2 100644 --- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py +++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py @@ -28,6 +28,9 @@ class EbuildMetadata(object): "%s: %s variable contains non-ASCII " "character at position %s" % (ebuild.relative_path, k, m.start() + 1)) + if ebuild.metadata.get("PROVIDE"): + self.qatracker.add_error("virtual.oldstyle", ebuild.relative_path) + return {'continue': False} @property diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index e6a17cd..46f46f5 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -324,8 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - if dynamic_data['ebuild'].metadata.get("PROVIDE"): - self.qatracker.add_error("virtual.oldstyle", dynamic_data['ebuild'].relative_path) for pos, missing_var in enumerate(missingvars): if not dynamic_data['ebuild'].metadata.get(missing_var):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/, pym/repoman/modules/scan/use/
commit: c2f6de973ffc11af371e3cd4e0a3d7b34c65f20a Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 8 01:37:39 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c2f6de97 repoman: Create USEFlagChecks class plugin pym/repoman/modules/scan/use/__init__.py | 23 ++ .../ebuilds => modules/scan/use}/use_flags.py | 36 ++ pym/repoman/scanner.py | 8 ++--- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/pym/repoman/modules/scan/use/__init__.py b/pym/repoman/modules/scan/use/__init__.py new file mode 100644 index 000..e400719 --- /dev/null +++ b/pym/repoman/modules/scan/use/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Use plug-in module for repoman. +Performs use flag checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'use', + 'description': doc, + 'provides':{ + 'use-module': { + 'name': "use_flags", + 'class': "USEFlagChecks", + 'description': doc, + 'functions': ['check', 'getUsedUseFlags'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/checks/ebuilds/use_flags.py b/pym/repoman/modules/scan/use/use_flags.py similarity index 74% rename from pym/repoman/checks/ebuilds/use_flags.py rename to pym/repoman/modules/scan/use/use_flags.py index ac21b47..acc7dd3 100644 --- a/pym/repoman/checks/ebuilds/use_flags.py +++ b/pym/repoman/modules/scan/use/use_flags.py @@ -9,31 +9,39 @@ from repoman._portage import portage from portage import eapi from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use +from repoman.modules.scan.scanbase import ScanBase -class USEFlagChecks(object): +class USEFlagChecks(ScanBase): '''Performs checks on USE flags listed in the ebuilds and metadata.xml''' - def __init__(self, qatracker, globalUseFlags): - ''' + def __init__(self, **kwargs): + '''Class init + @param qatracker: QATracker instance @param globalUseFlags: Global USE flags ''' - self.qatracker = qatracker - self.globalUseFlags = globalUseFlags + super(USEFlagChecks, self).__init__(**kwargs) + self.qatracker = kwargs.get('qatracker') + self.globalUseFlags = kwargs.get('uselist') self.useFlags = [] self.defaultUseFlags = [] self.usedUseFlags = set() - def check(self, pkg, package, ebuild, y_ebuild, localUseFlags): + def check(self, **kwargs): '''Perform the check. @param pkg: Package in which we check (object). - @param package: Package in which we check (string). + @param xpkg: Package in which we check (string). @param ebuild: Ebuild which we check (object). @param y_ebuild: Ebuild which we check (string). - @param localUseFlags: Local USE flags of the package + @param muselist: Local USE flags of the package ''' + pkg = kwargs.get('pkg') + package = kwargs.get('xpkg') + ebuild = kwargs.get('ebuild') + y_ebuild = kwargs.get('y_ebuild') + localUseFlags = kwargs.get('muselist') # reset state variables for the run self.useFlags = [] self.defaultUseFlags = [] @@ -41,10 +49,9 @@ class USEFlagChecks(object): self._checkGlobal(pkg) self._checkMetadata(package, ebuild, y_ebuild, localUseFlags) self._checkRequiredUSE(pkg, ebuild) - - def getUsedUseFlags(self): - '''Get the USE flags that this check has seen''' - return self.usedUseFlags + used_useflags = kwargs.get('used_useflags').union(self.usedUseFlags) + return {'continue': False, 'ebuild_UsedUseFlags': self.usedUseFlags, + 'used_useflags': used_useflags} def _checkGlobal(self, pkg): for myflag in pkg._metadata["IUSE"].split(): @@ -88,3 +95,8 @@ class USEFlagChecks(object): "REQUIRED_USE.syntax", "%s: REQUIRED_USE: %s" % (ebuild.relative_path, e)) del e + + @property + def runInEbuilds(self): + '''Ebuild level scans''' + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 7f770c3..0227a93 100644 --- a/p
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 20d723057fe75d128debdb50705d18a3c85449f0 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 10:35:49 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=20d72305 repoman: Migrate code from _scan_ebuilds to a new EbuildMetadata class and check pym/repoman/modules/scan/metadata/__init__.py | 10 +- .../modules/scan/metadata/ebuild_metadata.py | 39 ++ pym/repoman/scanner.py | 27 +-- 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/pym/repoman/modules/scan/metadata/__init__.py index 7327ec0..eba6565 100644 --- a/pym/repoman/modules/scan/metadata/__init__.py +++ b/pym/repoman/modules/scan/metadata/__init__.py @@ -10,7 +10,7 @@ module_spec = { 'name': 'metadata', 'description': doc, 'provides':{ - 'metadata-module': { + 'pkg-metadata': { 'name': "pkgmetadata", 'class': "PkgMetadata", 'description': doc, @@ -18,6 +18,14 @@ module_spec = { 'func_desc': { }, }, + 'ebuild-metadata': { + 'name': "ebuild_metadata", + 'class': "EbuildMetadata", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, } } diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py b/pym/repoman/modules/scan/metadata/ebuild_metadata.py new file mode 100644 index 000..143a40e --- /dev/null +++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py @@ -0,0 +1,39 @@ +# -*- coding:utf-8 -*- + +'''Ebuild Metadata Checks''' + +import re +import sys + +if sys.hexversion >= 0x300: + basestring = str + +NON_ASCII_RE = re.compile(r'[^\x00-\x7f]') + + +class EbuildMetadata(object): + + def __init__(self, **kwargs): + self.qatracker = kwargs.get('qatracker') + + def check(self, **kwargs): + ebuild = kwargs.get('ebuild') + for k, v in ebuild.metadata.items(): + if not isinstance(v, basestring): + continue + m = NON_ASCII_RE.search(v) + if m is not None: + self.qatracker.add_error( + "variable.invalidchar", + "%s: %s variable contains non-ASCII " + "character at position %s" % + (ebuild.relative_path, k, m.start() + 1)) + return {'continue': False} + + @property + def runInPkgs(self): + return (False, []) + + @property + def runInEbuilds(self): + return (True, [self.check]) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index a8aa2f3..6f3fb53 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -5,8 +5,6 @@ from __future__ import print_function, unicode_literals import copy import io import logging -import re -import sys from itertools import chain from pprint import pformat @@ -47,18 +45,10 @@ MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan") MODULE_NAMES = MODULE_CONTROLLER.module_names[:] - -if sys.hexversion >= 0x300: - basestring = str - -NON_ASCII_RE = re.compile(r'[^\x00-\x7f]') - - def sort_key(item): return item[2].sub_path - class Scanner(object): '''Primary scan class. Operates all the small Q/A tests and checks''' @@ -311,7 +301,7 @@ class Scanner(object): # initialize per ebuild plugin checks here # need to set it up for ==> self.modules_list or some other ordered list for mod in [('ebuild', 'Ebuild'), ('live', 'LiveEclassChecks'), - ('eapi', 'EAPIChecks')]: + ('eapi', 'EAPIChecks'), ('ebuild_metadata', 'EbuildMetadata')]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) logging.debug("Initializing class name: %s", mod_class.__name__) @@ -338,21 +328,6 @@ class Scanner(object): if y_ebuild_continue: continue - - for k, v in dynamic_data['ebuild'].metadata.items(): - if not isinstance(v, basestring): - continue - m = NON_ASCII_RE.search(v) -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/keywords/
commit: 334a29254dcecec3fd6a5a804f84a04e8686507e Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 18:28:58 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=334a2925 repoman: Complete KeywordChecks migration pym/repoman/modules/scan/keywords/keywords.py | 47 --- pym/repoman/scanner.py| 3 +- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/pym/repoman/modules/scan/keywords/keywords.py b/pym/repoman/modules/scan/keywords/keywords.py index 484d7d5..e34c891 100644 --- a/pym/repoman/modules/scan/keywords/keywords.py +++ b/pym/repoman/modules/scan/keywords/keywords.py @@ -19,6 +19,8 @@ class KeywordChecks(ScanBase): super(KeywordChecks, self).__init__(**kwargs) self.qatracker = kwargs.get('qatracker') self.options = kwargs.get('options') + self.repo_metadata = kwargs.get('repo_metadata') + self.profiles = kwargs.get('profiles') self.slot_keywords = {} def prepare(self, **kwargs): @@ -45,21 +47,19 @@ class KeywordChecks(ScanBase): live_ebuild = kwargs.get('live_ebuild') if not self.options.straight_to_stable: self._checkAddedWithStableKeywords( - package, ebuild, y_ebuild, keywords, changed) + xpkg, ebuild, y_ebuild, ebuild.keywords, changed) - self._checkForDroppedKeywords( - pkg, ebuild, ebuild_archs, live_ebuild) + self._checkForDroppedKeywords(pkg, ebuild, ebuild.archs, live_ebuild) - self._checkForInvalidKeywords( - pkg, package, y_ebuild, kwlist, profiles) + self._checkForInvalidKeywords(ebuild, xpkg, y_ebuild) - self._checkForMaskLikeKeywords( - package, y_ebuild, keywords, kwlist) + self._checkForMaskLikeKeywords(xpkg, y_ebuild, ebuild.keywords) - self.slot_keywords[pkg.slot].update(ebuild_archs) + self.slot_keywords[pkg.slot].update(ebuild.archs) return {'continue': False} - def _isKeywordStable(self, keyword): + @staticmethod + def _isKeywordStable(keyword): return not keyword.startswith("~") and not keyword.startswith("-") def _checkAddedWithStableKeywords( @@ -88,9 +88,8 @@ class KeywordChecks(ScanBase): ebuild.relative_path, " ".join(sorted(dropped_keywords - def _checkForInvalidKeywords( - self, pkg, package, y_ebuild, kwlist, profiles): - myuse = pkg._metadata["KEYWORDS"].split() + def _checkForInvalidKeywords(self, ebuild, xpkg, y_ebuild): + myuse = ebuild.keywords for mykey in myuse: if mykey not in ("-*", "*", "~*"): @@ -99,20 +98,16 @@ class KeywordChecks(ScanBase): if not self._isKeywordStable(myskey[:1]): myskey = myskey[1:] - if myskey not in kwlist: + if myskey not in self.repo_metadata['kwlist']: + self.qatracker.add_error("KEYWORDS.invalid", + "%s/%s.ebuild: %s" % (xpkg, y_ebuild, mykey)) + elif myskey not in self.profiles: self.qatracker.add_error( "KEYWORDS.invalid", - "%s/%s.ebuild: %s" % ( - package, y_ebuild, mykey)) - elif myskey not in profiles: - self.qatracker.add_error( - "KEYWORDS.invalid", - "%s/%s.ebuild: %s (profile invalid)" % ( - package, y_ebuild, mykey)) - - def _checkForMaskLikeKeywords( - self, package, y_ebuild, keywords, kwlist): + "%s/%s.ebuild: %s (profile invalid)" + % (xpkg, y_ebuild, mykey)) + def _checkForMaskLikeKeywords(self, xpkg, y_ebuild, keywords): # KEYWORDS="-*" is a stupid replacement for package.mask # and screws general KEYWORDS semantics if "-*" in keywords: @@ -121,12 +116,12 @@ class KeywordChecks(ScanBase): for kw in keywords:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/, pym/repoman/modules/scan/mirrors/
commit: 6acb2eb0c2adabdd99fcfd8186a2cca71771d276 Author: Brian Dolbec gentoo org> AuthorDate: Fri Jan 8 01:29:42 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 21 00:35:22 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6acb2eb0 repoman: Create the ThirdPartyMirrors class plugin pym/repoman/checks/ebuilds/thirdpartymirrors.py| 39 -- pym/repoman/modules/scan/mirrors/__init__.py | 23 + .../modules/scan/mirrors/thirdpartymirrors.py | 59 ++ pym/repoman/scanner.py | 6 +-- 4 files changed, 85 insertions(+), 42 deletions(-) diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/repoman/checks/ebuilds/thirdpartymirrors.py deleted file mode 100644 index 848dfb9..000 --- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding:utf-8 -*- - -# import our initialized portage instance -from repoman._portage import portage - - -class ThirdPartyMirrors(object): - - def __init__(self, repoman_settings, qatracker): - # TODO: Build a regex instead here, for the SRC_URI.mirror check. - self.thirdpartymirrors = {} - profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items() - for mirror_alias, mirrors in profile_thirdpartymirrors: - for mirror in mirrors: - if not mirror.endswith("/"): - mirror += "/" - self.thirdpartymirrors[mirror] = mirror_alias - - self.qatracker = qatracker - - def check(self, myaux, relative_path): - # Check that URIs don't reference a server from thirdpartymirrors. - for uri in portage.dep.use_reduce( - myaux["SRC_URI"], matchall=True, is_src_uri=True, - eapi=myaux["EAPI"], flat=True): - contains_mirror = False - for mirror, mirror_alias in self.thirdpartymirrors.items(): - if uri.startswith(mirror): - contains_mirror = True - break - if not contains_mirror: - continue - - new_uri = "mirror://%s/%s" % (mirror_alias, uri[len(mirror):]) - self.qatracker.add_error( - "SRC_URI.mirror", - "%s: '%s' found in thirdpartymirrors, use '%s'" % ( - relative_path, mirror, new_uri)) - return diff --git a/pym/repoman/modules/scan/mirrors/__init__.py b/pym/repoman/modules/scan/mirrors/__init__.py new file mode 100644 index 000..37dfc53 --- /dev/null +++ b/pym/repoman/modules/scan/mirrors/__init__.py @@ -0,0 +1,23 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Mirrors plug-in module for repoman. +Performs third party mirrors checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'mirrors', + 'description': doc, + 'provides':{ + 'mirrors-module': { + 'name': "thirdpartymirrors", + 'class': "ThirdPartyMirrors", + 'description': doc, + 'functions': ['check'], + 'func_desc': { + }, + }, + } +} + diff --git a/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py b/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py new file mode 100644 index 000..9404e28 --- /dev/null +++ b/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py @@ -0,0 +1,59 @@ +# -*- coding:utf-8 -*- + +# import our initialized portage instance +from repoman._portage import portage +from repoman.modules.scan.scanbase import ScanBase + + +class ThirdPartyMirrors(ScanBase): + + def __init__(self, **kwargs): + '''Class init + + @param repo_settings: settings instance + @param qatracker: QATracker instance + ''' + super(ThirdPartyMirrors, self).__init__(**kwargs) + repo_settings = kwargs.get('repo_settings') + self.qatracker = kwargs.get('qatracker') + + # TODO: Build a regex instead here, for the SRC_URI.mirror check. + self.thirdpartymirrors = {} + profile_thirdpartymirrors = repo_settings.repoman_settings.thirdpartymirrors().items() + for mirror_alias, mirrors in profile_thirdpartymirrors: + for mirror in mirrors: + if not mirror.endswith("/"): + mirror += "/" +
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/
commit: 837bc4d78824ea30f52718059dcc96d8a23d72d0 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 21 18:17:12 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 21 18:17:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=837bc4d7 profiles/prefix/make.defaults: add python3_5 to PYTHON_TARGETS profiles/prefix/make.defaults | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults index 9d64891..32d8a4c 100644 --- a/profiles/prefix/make.defaults +++ b/profiles/prefix/make.defaults @@ -10,3 +10,8 @@ USE="readline zlib ncurses ssl" FEATURES="collision-protect" + +# Python 3.5 is unmasked for us, build stuff by default, in particular +# for bug #572502 where the default python is set to 3.5 for it was +# built first. +PYTHON_TARGETS="${PYTHON_TARGETS} python3_5"
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/
commit: d06cf1f237db7251b4c8d07f2dea2660bef4cc60 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 21 18:03:33 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 21 18:04:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06cf1f2 profiles/prefix: also unmask python_single_target_python3_5 profiles/prefix/use.stable.mask | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/prefix/use.stable.mask b/profiles/prefix/use.stable.mask index 545d346..2d6679d 100644 --- a/profiles/prefix/use.stable.mask +++ b/profiles/prefix/use.stable.mask @@ -5,3 +5,4 @@ # Re-enable python-3.5, we are fully ~arch, so avoid problems with # Portage like bug #572502 -python_targets_python3_5 +-python_single_target_python3_5
[gentoo-commits] repo/gentoo:master commit in: dev-go/godep/
commit: 0ddab1cbd9b414ea330c7a3897223ea0f4144391 Author: William Hubbs gentoo org> AuthorDate: Thu Jan 21 17:50:20 2016 + Commit: William Hubbs gentoo org> CommitDate: Thu Jan 21 17:50:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddab1cb dev-go/godep: version bump dev-go/godep/Manifest| 1 + dev-go/godep/godep-50.ebuild | 29 + 2 files changed, 30 insertions(+) diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest index 1de81c4..75e8c47 100644 --- a/dev-go/godep/Manifest +++ b/dev-go/godep/Manifest @@ -1,2 +1,3 @@ DIST godep-29.tar.gz 51852 SHA256 ca896c220f2995a50a5d9e63df929fa393c3cd1de9722210b5ef3684981bed2a SHA512 37fcfdbbba62cc942b077551953f45fda495b4db1ee5bafec69e4b3cc63c612785d3e97e8ff073825a532a74889c40b34e99cd592285ad255f64ccd3f8b76eff WHIRLPOOL 39f31d7562e3d8b3748d8958e1105578bbd8d799008d15aa6145eb71e4720985e7e71e0d927b32ba4e20195e2257b11a34748c7652454d1fae2d2df662beb146 DIST godep-49.tar.gz 69944 SHA256 f1b498f585fbc420df8cb7a784edeea2c3993341a9501443de521c292ba67829 SHA512 d934a96a3ed6e69c8a3fdaccaa4f46df33b1e9df5c018c6dc7d22e992c1971d83029edd6172aad2116910c233495022007bcc24e9a30e8c517b2c20bd3d8d457 WHIRLPOOL faef37fa87f47e523ad5467a62490ccbfda98eded3ab6eea370dac416ac88117cf8d759637f8813f7a4c9cdffe873a949ae992c8e65b41f0d8c782293b557ec0 +DIST godep-50.tar.gz 70100 SHA256 e474e663e9d696445129201e3d3598a724de9a673ce3ad6652af75a93da2aeed SHA512 b3c114885d7de362c8a3fa3a65f609f37c8610eeb3d9807628f70d49b5b813770a5445c4048bd749df635d9526e5136abcbd2c1d4bd415fd97e86d6599b98438 WHIRLPOOL d4b4e0e2dc3f9ecfd2a1f25cdb56b156b601fc5393527695655769ccb29fa2a45a104b09f95a182df7587e61a5311c1966e5f73ed9bab5cfb891a46fddf35c08 diff --git a/dev-go/godep/godep-50.ebuild b/dev-go/godep/godep-50.ebuild new file mode 100644 index 000..6f0bf64 --- /dev/null +++ b/dev-go/godep/godep-50.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +EGO_PN=github.com/tools/godep + +if [[ ${PV} = ** ]]; then + inherit golang-vcs +else + KEYWORDS="~amd64" + EGIT_COMMIT=v${PV} + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + inherit golang-vcs-snapshot +fi +inherit golang-build + +DESCRIPTION="dependency tool for go" +HOMEPAGE="https://github.com/tools/godep"; +LICENSE="BSD" +SLOT="0" +IUSE="" +DEPEND="" +RDEPEND="" + +src_install() { + dobin godep +dodoc src/${EGO_PN}/*.md +}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/
commit: d5da89885c536255b3f8ae328f4a97b169321675 Author: Davide Pesavento gentoo org> AuthorDate: Thu Jan 21 17:36:58 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Thu Jan 21 17:40:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5da8988 dev-qt/qtmultimedia: fix alsa detection for versions >= 1.1.0 Gentoo-Bug: 572426 Package-Manager: portage-2.2.27 ...5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch | 118 + dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild | 83 +++ 2 files changed, 201 insertions(+) diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch new file mode 100644 index 000..3300205 --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch @@ -0,0 +1,118 @@ +From 3b322323d036ae2fc9f685bfc74d1ebcd5532159 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +Date: Fri, 27 Nov 2015 14:36:50 +0100 +Subject: [PATCH] alsa: Relax ALSA version checks for 1.1.x to be detected. + +Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA +1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with +ALSA 1.1. + +Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34 +Reviewed-by: Christian Stromme +--- + config.tests/alsa/alsatest.cpp| 2 +- + src/plugins/alsa/qalsaaudiodeviceinfo.cpp | 8 + src/plugins/alsa/qalsaaudioinput.cpp | 4 ++-- + src/plugins/alsa/qalsaaudiooutput.cpp | 4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp +index a9f9c24..1b59cb1 100644 +--- a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp +@@ -32,7 +32,7 @@ + / + + #include +-#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) ++#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) + #error "Alsa version found too old, require >= 1.0.10" + #endif + +diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp +index be90ca6..3d31087 100644 +--- a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp +@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open() + QList devices = availableDevices(mode); + + if(dev.compare(QLatin1String("default")) == 0) { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + if (devices.size() > 0) + dev = QLatin1String(devices.first().constData()); + else +@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open() + dev = QLatin1String("hw:0,0"); + #endif + } else { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + dev = device; + #else + int idx = 0; +@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const + snd_pcm_hw_params_t *params; + QString dev; + +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + dev = device; + if (dev.compare(QLatin1String("default")) == 0) { + QList devices = availableDevices(QAudio::AudioOutput); +@@ -335,7 +335,7 @@ QList QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode) + QList devices; + QByteArray filter; + +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + // Create a list of all current audio devices that support mode + void **hints, **n; + char *name, *descr, *io; +diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp +index 4a8dd80..d6d8adc 100644 +--- a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp +@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open() + QString dev = QString(QLatin1String(m_device.constData())); + QList devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput); + if(dev.compare(QLatin1String("default")) == 0) { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + if (devices.size() > 0) + dev = QLatin1String(devices.first()); + else +@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open() + dev = QLatin1String("hw:0,0"); + #endif + } else { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_L