[gentoo-commits] proj/kde:master commit in: /
commit: acd916f9f641440b343524b5f204d60f2e5d9d38 Author: Johannes Huber gentoo org> AuthorDate: Fri Mar 30 06:33:24 2018 + Commit: Johannes Huber gentoo org> CommitDate: Fri Mar 30 06:33:24 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=acd916f9 .travis.yml: Use pypy3.5 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6b14cff45..ed35a74299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ # language: python python: -- pypy +- pypy3.5 env: global: - PORTAGE_VER="2.3.27"
[gentoo-commits] proj/kde:master commit in: /
commit: e16cc1425e9c0dcbdf1ba01d01a2bfbf429ae016 Author: Johannes Huber gentoo org> AuthorDate: Fri Mar 30 06:32:17 2018 + Commit: Johannes Huber gentoo org> CommitDate: Fri Mar 30 06:32:17 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e16cc142 .travis.yml .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e1f513c9ab..b6b14cff45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: before_install: - sudo apt-get -qq update - pip install lxml==4.1.1 +- pip install pyyaml before_script: - sudo chmod a+rwX /etc/passwd /etc/group /etc /usr - mkdir -p travis-overlay /etc/portage /usr/portage/distfiles
[gentoo-commits] proj/kde:master commit in: /
commit: b77ae0858e1087169795eb3c2fceb7065659de9c Author: Johannes Huber gentoo org> AuthorDate: Fri Mar 30 06:15:23 2018 + Commit: Johannes Huber gentoo org> CommitDate: Fri Mar 30 06:15:23 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b77ae085 .travis.yml: Use external repoman .travis.yml | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04d4c6afb6..e1f513c9ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,9 @@ language: python python: - pypy env: -- PORTAGE_VER="2.3.27" +global: +- PORTAGE_VER="2.3.27" +- REPOMAN_VER="2.3.8" before_install: - sudo apt-get -qq update - pip install lxml==4.1.1 @@ -18,6 +20,7 @@ before_script: - wget "https://raw.githubusercontent.com/mrueg/repoman-travis/master/.travis.yml"; -O .travis.yml.upstream - wget "https://raw.githubusercontent.com/mrueg/repoman-travis/master/spinner.sh"; - wget -qO - "https://github.com/gentoo/portage/archive/portage-${PORTAGE_VER}.tar.gz"; | tar xz +- wget -qO - "https://github.com/gentoo/portage/archive/repoman-${REPOMAN_VER}.tar.gz"; | tar xz - wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz"; | tar xz -C /usr/portage --strip-components=1 - chmod a+rwx spinner.sh - echo "portage:x:250:250:portage:/var/tmp/portage:/bin/false" >> /etc/passwd @@ -29,7 +32,7 @@ before_script: - if ! cmp -n $SIZE -s .travis.yml .travis.yml.upstream; then echo -e "\e[31m !!! .travis.yml outdated! Update available https://github.com/mrueg/repoman-travis \e[0m" > /tmp/update ; fi - cd travis-overlay script: -- ./../spinner.sh "python ../portage-portage-${PORTAGE_VER}/repoman/bin/repoman full -d" +- ./../spinner.sh "python ../portage-repoman-${REPOMAN_VER}/repoman/bin/repoman full -d" # You can append own scripts after this line notifications: irc:
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
commit: 61811e4fb1f6a6205ce5a06811c5960e03765cde Author: Hans de Graaff gentoo org> AuthorDate: Fri Mar 30 05:52:41 2018 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Mar 30 06:13:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61811e4f www-apache/passenger: add 5.2.2 Package-Manager: Portage-2.3.24, Repoman-2.3.6 www-apache/passenger/Manifest | 1 + www-apache/passenger/passenger-5.2.2.ebuild | 127 2 files changed, 128 insertions(+) diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index cb285a6adab..51df9405d16 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -1,2 +1,3 @@ DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a DIST passenger-5.2.1.tar.gz 4978302 BLAKE2B 622f831e0b3e1a950f3dabc69b13c304896506d70341dafac0df4074450cea2b2c33a1c60b39efe8600a3cac32c6782f28599de85e1856a785896ada27f2f9c4 SHA512 8223fe0f7c04de9b079e8748d22679b7253599a5ef070cfd63b829c7ec7c4375528bc186d136ab2602d07a9a36fac4bc53b30c775e433641dfa80ab67f326848 +DIST passenger-5.2.2.tar.gz 6955357 BLAKE2B 4bf0f7185bafc5927ff82b3c2f171671266a4c6d0077b24b2efb439524618e67742ce0c67098cfa2457e3d17f4f3bf685736c3599dc10eca52c0cd00b79911a8 SHA512 c7a5a1cb686119846f9da16d6506bc689c64d20bdfa710a1e677374659759a10eb8540baf9c50c77a94a0c8ab748af3e4731bc7ccf6e402fd0a9d2d3ccb183bf diff --git a/www-apache/passenger/passenger-5.2.2.ebuild b/www-apache/passenger/passenger-5.2.2.ebuild new file mode 100644 index 000..1833c88aa15 --- /dev/null +++ b/www-apache/passenger/passenger-5.2.2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby22 ruby23 ruby24" + +inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs + +DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" +HOMEPAGE="https://www.phusionpassenger.com/"; +SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="apache2 debug" + +ruby_add_bdepend "dev-ruby/rake" + +ruby_add_rdepend " + >=dev-ruby/rack-1.0.0:* + >=dev-ruby/rake-0.8.1" + +# libev is bundled but with adapations that do not seem to be accepted +# upstream, so we must use the bundled version :-( +CDEPEND=" + >=dev-libs/libuv-1.8.0 + net-misc/curl[ssl] + apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" + +RDEPEND="${RDEPEND} ${CDEPEND}" +DEPEND="${DEPEND} ${CDEPEND}" + +APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" +APACHE2_MOD_DEFINE="PASSENGER" + +want_apache2 + +pkg_setup() { + use debug && append-flags -DPASSENGER_DEBUG + depend.apache_pkg_setup +} + +all_ruby_prepare() { + epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch + epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch + + # Change these with sed instead of a patch so that we can easily use + # the toolchain-funcs methods. + sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ + -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ + -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die + + # Avoid fixed debugging CFLAGs. + sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die + + # Use sed here so that we can dynamically set the documentation directory. + sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ + -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ + src/ruby_supportlib/phusion_passenger.rb || die + sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die + + # Don't install a tool that won't work in our setup. + sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die + rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." + + # Make sure we use the system-provided version where possible + rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." + + # Avoid building documentation to avoid a dependency on mizuho. + #sed -i -e 's/, :doc//' build/packaging.rb || die + touch doc/*.html || die + + # Fix hard-coded use of AR + sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die + + # Make sure apache support is not attempted with -apache2 + if ! use apache2 ; then + sed -i
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/concurrent-ruby/
commit: b1ecc6d53dc594c2586e57f354fc6f140238abd6 Author: Hans de Graaff gentoo org> AuthorDate: Fri Mar 30 06:11:48 2018 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Mar 30 06:13:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ecc6d5 dev-ruby/concurrent-ruby: add ruby25 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild index 62a3d16b6ab..0e7cff93412 100644 --- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild +++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" RUBY_FAKEGEM_RECIPE_TEST="rspec3"
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
commit: 152ebd5ffeffe86bf2ab2bc322faafa02d59bedd Author: Hans de Graaff gentoo org> AuthorDate: Fri Mar 30 05:40:24 2018 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Mar 30 06:13:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=152ebd5f www-apache/passenger: cleanup Package-Manager: Portage-2.3.24, Repoman-2.3.6 www-apache/passenger/Manifest| 2 - www-apache/passenger/passenger-5.1.11.ebuild | 127 --- www-apache/passenger/passenger-5.2.0.ebuild | 127 --- 3 files changed, 256 deletions(-) diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 4dd72d3da11..cb285a6adab 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -1,4 +1,2 @@ -DIST passenger-5.1.11.tar.gz 4243340 BLAKE2B 25c6cc0016c4078962466716f16a2d084d4e59528153bbe09dae70c4935941cabc456062e0004f7640074f163e53aa6f95e44fc7b99136292db5e3c9bb9fe554 SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a -DIST passenger-5.2.0.tar.gz 4978059 BLAKE2B d74e8a1b6ea21bf8ef2d606597acfe331661fc1d0908f0399c624c860700e004c3231f0fcd8adf4aec9221bcabb1311155b5ddc08cf8e92a6cb97736d87c8e97 SHA512 c1450f6921a75851d5ed1c8a34dc5dc97b085ee6ae2e5fcbaf897873c0f73af09ca1df1fa1986cb91937ea7b2192d222540b061c6c8e8bb03d19991b8b357e34 DIST passenger-5.2.1.tar.gz 4978302 BLAKE2B 622f831e0b3e1a950f3dabc69b13c304896506d70341dafac0df4074450cea2b2c33a1c60b39efe8600a3cac32c6782f28599de85e1856a785896ada27f2f9c4 SHA512 8223fe0f7c04de9b079e8748d22679b7253599a5ef070cfd63b829c7ec7c4375528bc186d136ab2602d07a9a36fac4bc53b30c775e433641dfa80ab67f326848 diff --git a/www-apache/passenger/passenger-5.1.11.ebuild b/www-apache/passenger/passenger-5.1.11.ebuild deleted file mode 100644 index 6de168a4b44..000 --- a/www-apache/passenger/passenger-5.1.11.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby22 ruby23 ruby24" - -inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs - -DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze" -HOMEPAGE="https://www.phusionpassenger.com/"; -SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="apache2 debug" - -ruby_add_bdepend "dev-ruby/rake" - -ruby_add_rdepend " - >=dev-ruby/rack-1.0.0:* - >=dev-ruby/rake-0.8.1" - -# libev is bundled but with adapations that do not seem to be accepted -# upstream, so we must use the bundled version :-( -CDEPEND=" - >=dev-libs/libuv-1.8.0 - net-misc/curl[ssl] - apache2? ( www-servers/apache[apache2_modules_unixd(+)] )" - -RDEPEND="${RDEPEND} ${CDEPEND}" -DEPEND="${DEPEND} ${CDEPEND}" - -APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}" -APACHE2_MOD_DEFINE="PASSENGER" - -want_apache2 - -pkg_setup() { - use debug && append-flags -DPASSENGER_DEBUG - depend.apache_pkg_setup -} - -all_ruby_prepare() { - epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch - epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch - - # Change these with sed instead of a patch so that we can easily use - # the toolchain-funcs methods. - sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \ - -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \ - -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die - - # Avoid fixed debugging CFLAGs. - sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die - - # Use sed here so that we can dynamically set the documentation directory. - sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \ - -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \ - src/ruby_supportlib/phusion_passenger.rb || die - sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die - - # Don't install a tool that won't work in our setup. - sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die - rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script." - - # Make sure we use the system-provided version where possible - rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code." - -
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/asciidoctor-diagram/
commit: 82af3a6f6b4dd9a7a4f5ffe3fa432030c8bd2dc3 Author: Hans de Graaff gentoo org> AuthorDate: Fri Mar 30 05:39:24 2018 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Mar 30 06:13:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82af3a6f dev-ruby/asciidoctor-diagram: add 1.5.9 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-ruby/asciidoctor-diagram/Manifest | 1 + .../asciidoctor-diagram-1.5.9.ebuild | 38 ++ 2 files changed, 39 insertions(+) diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest index 52bc5f94b86..81f11689ef8 100644 --- a/dev-ruby/asciidoctor-diagram/Manifest +++ b/dev-ruby/asciidoctor-diagram/Manifest @@ -1,3 +1,4 @@ DIST asciidoctor-diagram-1.5.4.tar.gz 5203713 BLAKE2B f36fc51119fb6340f23b2c71e47675aaba0ce8e6df44c1fb629627e80bd63e925fad085ca36db22334d4849fefd5525bf595098e6f91c51fcd95843c6a876b3a SHA512 1c75d0633235a50daf1ed7514d59df0d33272086b278dbcf75b9be641834a2569d2ee56e41cdc3abc66d3c6b1631dfc1f6483e36f6041824ca5f8ec41821c5d2 DIST asciidoctor-diagram-1.5.5.tar.gz 9061248 BLAKE2B 101cecb12d7fadbe538fcd57b7f6631b25eb68a71dd477e370f6a76f28de6a755521e9b70e3a09bf6aeb5735f8aa28f2f30403cde9e36aa91de73e9cacf21525 SHA512 e3d27496ee0c9a245e3672c278b5da690a9c9d7052c5e162190028e4aed71e370ed30b48e174e3298705551b9f265172593d5d3403eea0f9e4f4cad80b7357f4 DIST asciidoctor-diagram-1.5.7.tar.gz 10500954 BLAKE2B e257bd92b8a75cf9061254a0f6dc5ba2b9dae6e1f7b7c9e9d69449d16b52894bb22a022d411cce848b5313de73b40f3c2e28744217a394345ded06cc9f587639 SHA512 bb6e7f036e4e4075686b9852aeb5ead592dc3ed7853f80b042a696abe267255f536247e44309086c8fab1ea91f7ac48c059b1641d0ebc84263442a73951beba4 +DIST asciidoctor-diagram-1.5.9.tar.gz 10250161 BLAKE2B ebeb184259042a9088c5a8f6c5afc86a69f6fcea62964ac2f571f21b6b2b382cdf2cad8abc1e99ca781b4663da956982f1a5d418126089b17bac0e68bdce0fea SHA512 b25f5c2b8ddfc2b9bdc26ef47b5a2ae8d28992ac26f70ccc4c9046a45e9338b5ed2b82cccb0f01dd44155e043b620410b468ef6b12dfe03ae20a67e4d109be05 diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.9.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.9.ebuild new file mode 100644 index 000..f9256ac9493 --- /dev/null +++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.9.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby22 ruby23 ruby24" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit multilib ruby-fakegem + +DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams" +HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"; +SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend "=dev-ruby/asciidoctor-1.5*" + +all_ruby_prepare() { + rm Gemfile || die + sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die + + # Avoid specs for unpackaged tools + rm -f spec/{a2s,blockdiag,erd,mermaid,msc,shaape,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die +} + +all_ruby_install() { + all_fakegem_install +}
[gentoo-commits] proj/kde:master commit in: /
commit: e9cd62d14979817e039bfb7b1245b5bf4ba5ab60 Author: Johannes Huber gentoo org> AuthorDate: Fri Mar 30 06:05:52 2018 + Commit: Johannes Huber gentoo org> CommitDate: Fri Mar 30 06:05:52 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e9cd62d1 .travis.yml: Bump portage version to 2.3.27 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6f98bbb8c..04d4c6afb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: python python: - pypy env: -- PORTAGE_VER="2.3.26" +- PORTAGE_VER="2.3.27" before_install: - sudo apt-get -qq update - pip install lxml==4.1.1
[gentoo-commits] proj/portage-utils:master commit in: /
commit: aec94e4d236fb91b04d21bde5f622c2af39ddee8 Author: Matija Skala gmx com> AuthorDate: Thu Aug 17 16:03:14 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Mar 29 18:17:33 2018 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=aec94e4d fix compile on hurd Signed-off-by: Fabian Groffen gentoo.org> qlop.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qlop.c b/qlop.c index babcc74..c01b3be 100644 --- a/qlop.c +++ b/qlop.c @@ -382,6 +382,8 @@ show_sync_history(const char *logfile, time_t start_time, time_t end_time) static void show_current_emerge(void); #ifdef __linux__ # include +#endif +#if defined __linux__ || defined __GNU__ # include static unsigned long hz = 0; static void init_hz(void)
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 98cf71419ec081e02677f314f26c6b3d5aaf7ad7 Author: Fabian Groffen gentoo org> AuthorDate: Thu Mar 29 18:14:04 2018 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Mar 29 18:14:04 2018 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=98cf7141 qlop: break some long lines, no code changes qlop.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qlop.c b/qlop.c index 33e8d37..babcc74 100644 --- a/qlop.c +++ b/qlop.c @@ -448,7 +448,9 @@ void show_current_emerge(void) if (!eat_file(path, &cmdline, &cmdline_len)) continue; - if (cmdline[0] == '[' && (p = strchr(cmdline, ']')) != NULL && strstr(cmdline, "sandbox") != NULL) { + if (cmdline[0] == '[' && (p = strchr(cmdline, ']')) != NULL && + strstr(cmdline, "sandbox") != NULL) + { *p = '\0'; p = cmdline + 1; q = p + strlen(p) + 1; @@ -511,7 +513,9 @@ void show_current_emerge(void) char *p, *q; time_t start_date = 0; - if (! (kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open"))) { + if (! (kd = kvm_open("/dev/null", "/dev/null", "/dev/null", + O_RDONLY, "kvm_open"))) + { warnp("Could not open kvm: %s", kvm_geterr(kd)); return; }
[gentoo-commits] repo/gentoo:master commit in: app-portage/repoman/
commit: e412358bc9083841a5360b55a237ab602167f548 Author: Zac Medico gentoo org> AuthorDate: Fri Mar 30 05:24:08 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 05:25:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e412358b app-portage/repoman: make repoman-2.3.8 require portage-2.3.27 Package-Manager: Portage-2.3.27, Repoman-2.3.8 app-portage/repoman/repoman-2.3.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-portage/repoman/repoman-2.3.8.ebuild b/app-portage/repoman/repoman-2.3.8.ebuild index fa83b9131a3..9fa7f7dd30e 100644 --- a/app-portage/repoman/repoman-2.3.8.ebuild +++ b/app-portage/repoman/repoman-2.3.8.ebuild @@ -25,7 +25,7 @@ SLOT="0" IUSE="" RDEPEND=" - >=sys-apps/portage-2.3.25[${PYTHON_USEDEP}] + >=sys-apps/portage-2.3.27[${PYTHON_USEDEP}] >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] "
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/gentoo_header/
commit: df1266a0fb757057658e5bea56a003ca0e5d5d7f Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:01:04 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:17 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=df1266a0 repoman: New linechecks module, gentoo_header .../modules/linechecks/gentoo_header/__init__.py | 21 ++ .../modules/linechecks/gentoo_header/header.py | 49 ++ 2 files changed, 70 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py b/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py new file mode 100644 index 0..b80a83ecf --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Gentoo-header plug-in module for repoman LineChecks. +Performs header checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'header-check': { + 'name': "gentooheader", + 'sourcefile': "header", + 'class': "EbuildHeader", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py b/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py new file mode 100644 index 0..4b75fc4b5 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py @@ -0,0 +1,49 @@ + +import re +import time + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildHeader(LineCheck): + """Ensure ebuilds have proper headers + Copyright header errors + CVS header errors + License header errors + + Args: + modification_year - Year the ebuild was last modified + """ + + repoman_check_name = 'ebuild.badheader' + + gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Foundation$' + gentoo_license = ( + '# Distributed under the terms' + ' of the GNU General Public License v2') + id_header_re = re.compile(r'.*\$(Id|Header)(:.*)?\$.*') + blank_line_re = re.compile(r'^$') + ignore_comment = False + + def new(self, pkg): + if pkg.mtime is None: + self.modification_year = r'2\d\d\d' + else: + self.modification_year = str(time.gmtime(pkg.mtime)[0]) + self.gentoo_copyright_re = re.compile( + self.gentoo_copyright % self.modification_year) + + def check(self, num, line): + if num > 2: + return + elif num == 0: + if not self.gentoo_copyright_re.match(line): + return self.errors['COPYRIGHT_ERROR'] + elif num == 1 and line.rstrip('\n') != self.gentoo_license: + return self.errors['LICENSE_ERROR'] + elif num == 2 and self.id_header_re.match(line): + return self.errors['ID_HEADER_ERROR'] + elif num == 2 and not self.blank_line_re.match(line): + return self.errors['NO_BLANK_LINE_ERROR'] + +
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/emake/
commit: ac1df05ac0d49c3c98518d77a892d2c18ad38195 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:00:30 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:17 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ac1df05a repoman: New linechecks module, emake .../repoman/modules/linechecks/emake/__init__.py | 27 ++ .../pym/repoman/modules/linechecks/emake/emake.py | 23 ++ 2 files changed, 50 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/emake/__init__.py b/repoman/pym/repoman/modules/linechecks/emake/__init__.py new file mode 100644 index 0..2e930dae8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/emake/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Emake plug-in module for repoman LineChecks. +Performs emake checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'paralleldisabled-check': { + 'name': "paralleldisabled", + 'sourcefile': "emake", + 'class': "EMakeParallelDisabledViaMAKEOPTS", + 'description': doc, + }, + 'autodefault-check': { + 'name': "autodefault", + 'sourcefile': "emake", + 'class': "WantAutoDefaultValue", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/emake/emake.py b/repoman/pym/repoman/modules/linechecks/emake/emake.py new file mode 100644 index 0..e1e3e638e --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/emake/emake.py @@ -0,0 +1,23 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EMakeParallelDisabledViaMAKEOPTS(LineCheck): + """Check for MAKEOPTS=-j1 that disables parallelization.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'^\s*MAKEOPTS=(\'|")?.*-j\s*1\b') + error = 'EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS' + + +class WantAutoDefaultValue(LineCheck): + """Check setting WANT_AUTO* to latest (default value).""" + repoman_check_name = 'ebuild.minorsyn' + _re = re.compile(r'^WANT_AUTO(CONF|MAKE)=(\'|")?latest') + + def check(self, num, line): + m = self._re.match(line) + if m is not None: + return 'WANT_AUTO' + m.group(1) + \ + ' redundantly set to default value "latest" on line: %d'
[gentoo-commits] repo/gentoo:master commit in: app-portage/repoman/
commit: 3f04d4d93d00afa5242a0c9459487c9eea7e9a6f Author: Zac Medico gentoo org> AuthorDate: Fri Mar 30 04:18:05 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 04:30:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f04d4d9 app-portage/repoman: version bump to 2.3.8 This release adds support for plugin module systems. See: https://wiki.gentoo.org/wiki/Project:Portage/Repoman-Module-specs Package-Manager: Portage-2.3.27_p1, Repoman-2.3.8 app-portage/repoman/Manifest | 1 + app-portage/repoman/repoman-2.3.8.ebuild | 61 2 files changed, 62 insertions(+) diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest index 52f25ab072a..0056cf0e140 100644 --- a/app-portage/repoman/Manifest +++ b/app-portage/repoman/Manifest @@ -4,3 +4,4 @@ DIST repoman-2.3.3.tar.bz2 78045 BLAKE2B 5c2e770af3ba0c93ce24c710fb32e8b9d937ad8 DIST repoman-2.3.4.tar.bz2 78764 BLAKE2B 0fb6bd75463fe10dd41ab1fcdfd0857341dbe973e796f2f97e636df2c29dd633d7199eb22b4605b34d6e56624ac5a75f4783ff7119c421e2303aacf7adae4877 SHA512 1a434eea6361cc06ba3c27ccd31aa02875af1a577860490f8de666b0160370f09d1c46cea95d577163845e12c5672486b176c0009c32e735e16752d67bf4d96c DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3 DIST repoman-2.3.7.tar.bz2 80514 BLAKE2B 9342b5be35523f1eb597c94ad33425fd9f1bc81cf7b48c0194d96d2afc2cc27962e9cfbea14492c5e16856c79ab6429988201b269ef0444c17c6d91c9c11feaa SHA512 9caeb06cfe55e38566154923b785c1e3053722b50d7423241950b73c810781d111848e64815001abe218e6073a96ca462debdc99acc05123987cf4d4be0a0420 +DIST repoman-2.3.8.tar.bz2 83747 BLAKE2B 7afe3cdf211dc4311ad72d1100c981e7ce4bfcb3b6a0b3d5cf60db89a03adbe1610e42804a00aea9f7258ebc340d6b1d77e0a633b37cd17dc967993bf3600ebe SHA512 0d0241a6a1ea83d8816981a2d5061cd7cf3abcbd6b8a63be8ecb96572efce3df778402b9b860116e63e8eff6a76619eda86a8b032979dd329259f346abe9e7cc diff --git a/app-portage/repoman/repoman-2.3.8.ebuild b/app-portage/repoman/repoman-2.3.8.ebuild new file mode 100644 index 000..fa83b9131a3 --- /dev/null +++ b/app-portage/repoman/repoman-2.3.8.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE='bzip2(+)' + +inherit distutils-r1 + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"; + S="${WORKDIR}/${P}/repoman" +else + SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + >=sys-apps/portage-2.3.25[${PYTHON_USEDEP}] + >=dev-python/lxml-3.6.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +pkg_postinst() { + einfo "" + einfo "This release of repoman is from the new portage/repoman split" + einfo "release code base." + einfo "This new repoman code base is still being developed. So its API's" + einfo "are not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
commit: cbe07d8ee1d2b5d3334706f6e9352a4d2bfd9297 Author: Zac Medico gentoo org> AuthorDate: Fri Mar 30 04:04:26 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 04:30:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe07d8e sys-apps/portage: version bump to 2.3.27 #651952 - INSTALL_MASK: honor install time config for binary packages Closes: https://bugs.gentoo.org/651952 Package-Manager: Portage-2.3.27_p1, Repoman-2.3.8 sys-apps/portage/Manifest | 1 + sys-apps/portage/portage-2.3.27.ebuild | 284 + 2 files changed, 285 insertions(+) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 234fc195fa3..6d263c9755b 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -3,4 +3,5 @@ DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c32 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec DIST portage-2.3.26.tar.bz2 970245 BLAKE2B b854bef894327b9e4beabca55d70368d326548d96efdc5b63e47f77971da195d041c8e8412bbb308ef6922be02964727c99f9dcc92a2a4b0a7372e0a1c774ffe SHA512 5acb8a00fdbc72a8c3e79f8b1c2ba17c9b469205edf1e56592db9ccfeb54b4dc83a98548ff0e01c408456a1c962262377967f6d70510c8d1b0e7ab15eab51079 +DIST portage-2.3.27.tar.bz2 970480 BLAKE2B dc46362773544102d9a07e686759d454a37177e9ac6e88d664c1aeb1676b9fb4e12662500f1de63644ad5eaf69d58bf85f38339c18d695cdc42930746dedb731 SHA512 791c87ffe958e883fe16562e69e606dd7ff860c13b2262b3eaa665f78acacdcb547c5e124b69d2c0faa36147fdc7c1d60669dee43b7401ea4f89784a619f81fe DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 diff --git a/sys-apps/portage/portage-2.3.27.ebuild b/sys-apps/portage/portage-2.3.27.ebuild new file mode 100644 index 000..c2e3ea64cbb --- /dev/null +++ b/sys-apps/portage/portage-2.3.27.ebuild @@ -0,0 +1,284 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_4 python3_5 python3_6 + python2_7 +) +PYTHON_REQ_USE='bzip2(+),threads(+)' + +inherit distutils-r1 systemd + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"; + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +SLOT="0" +IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr" + +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ + python{2_7,3_4,3_5} pypy) + rsync-verify? ( + >=app-portage/gemato-10 + app-crypt/gentoo-keys + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-
[gentoo-commits] proj/portage: New tag: repoman-2.3.8
commit: Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 04:23:41 2018 + New tag: repoman-2.3.8
[gentoo-commits] proj/portage:master commit in: repoman/cnf/linechecks/, repoman/pym/repoman/modules/linechecks/
commit: 4d8602ba2f21b3b0a1ad9385fc3c8b8d05276ba7 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 18:17:15 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:21 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d8602ba repoman linechecks/config.py: Move the errors loading to a new /usr/share/repoman/linechecks directory This new directory can be installed to by third party add on modules that extend the checks. We can also in future use these file to get loaclized translations. repoman/cnf/linechecks/linechecks.yaml | 35 repoman/pym/repoman/modules/linechecks/config.py | 19 +++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/repoman/cnf/linechecks/linechecks.yaml b/repoman/cnf/linechecks/linechecks.yaml new file mode 100644 index 0..634381e80 --- /dev/null +++ b/repoman/cnf/linechecks/linechecks.yaml @@ -0,0 +1,35 @@ +--- +# linecheck_help.yaml + +# Repoman API version (do not edit) +version: 1 +# minimum +repoman_version: 2.3.3 + +# configuration file for the LineCheck plugins run via the multicheck +# scan module +errors: +COPYRIGHT_ERROR: 'Invalid Gentoo Copyright on line: %d' +LICENSE_ERROR: 'Invalid Gentoo/GPL License on line: %d' +ID_HEADER_ERROR: 'Stale CVS header on line: %d' +NO_BLANK_LINE_ERROR: 'Non-blank line after header on line: %d' +LEADING_SPACES_ERROR: 'Ebuild contains leading spaces on line: %d' +TRAILING_WHITESPACE_ERROR: 'Trailing whitespace error on line: %d' +READONLY_ASSIGNMENT_ERROR: 'Ebuild contains assignment to read-only variable on line: %d' +MISSING_QUOTES_ERROR: 'Unquoted Variable on line: %d' +NESTED_DIE_ERROR: 'Ebuild calls die in a subshell on line: %d' +PATCHES_ERROR: 'PATCHES is not a bash array on line: %d' +REDUNDANT_CD_S_ERROR: 'Ebuild has redundant cd ${S} statement on line: %d' +EMAKE_PARALLEL_DISABLED: 'Upstream parallel compilation bug (ebuild calls emake -j1 on line: %d)' +EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS: 'Upstream parallel compilation bug (MAKEOPTS=-j1 on line: %d)' +DEPRECATED_BINDNOW_FLAGS: 'Deprecated bindnow-flags call on line: %d' +EAPI_DEFINED_AFTER_INHERIT: 'EAPI defined after inherit on line: %d' +NO_AS_NEEDED: 'Upstream asneeded linking bug (no-as-needed on line: %d)' +PRESERVE_OLD_LIB: 'Ebuild calls deprecated preserve_old_lib on line: %d' +BUILT_WITH_USE: 'built_with_use on line: %d' +NO_OFFSET_WITH_HELPERS: 'Helper function is used with D, ROOT, ED, EROOT or EPREFIX on line: %d' +SANDBOX_ADDPREDICT: 'Ebuild calls addpredict on line: %d' +USEQ_ERROR: 'Ebuild calls deprecated useq function on line: %d' +HASQ_ERROR: 'Ebuild calls deprecated hasq function on line: %d' +URI_HTTPS: 'Ebuild uses http:// but should use https:// on line: %d' + diff --git a/repoman/pym/repoman/modules/linechecks/config.py b/repoman/pym/repoman/modules/linechecks/config.py index bde2e587f..6e4c5314e 100644 --- a/repoman/pym/repoman/modules/linechecks/config.py +++ b/repoman/pym/repoman/modules/linechecks/config.py @@ -15,6 +15,7 @@ from copy import deepcopy from repoman._portage import portage from repoman.config import load_config +from repoman import _not_installed # Avoid a circular import issue in py2.7 portage.proxy.lazyimport.lazyimport(globals(), @@ -46,8 +47,7 @@ class LineChecksConfig(object): @param configpaths: ordered list of filepaths to load ''' self.repo_settings = repo_settings - self.infopaths = [os.path.join(path, 'linechecks.yaml') for path in self.repo_settings.masters_list] - logging.debug("LineChecksConfig; configpaths: %s", self.infopaths) + self.infopaths = None self.info_config = None self._config = None self.usex_supported_eapis = None @@ -58,8 +58,22 @@ class LineChecksConfig(object): self.eclass_info = {} self.eclass_info_experimental_inherit = {} self.errors = {} + self.set_infopaths() self.load_checks_info() + def set_infopaths(self): + if _not_installed: + cnfdir = os.path.realpath(os.path.join(os.path.dirname( + os.path.dirname(os.path.dirname(os.path.dirname( + os.path.dirname(__file__), 'cnf/linechecks')) + else: + cnfdir = os.path.join(portage.const.EPREFIX or '/', 'usr/share/repoman/linechecks') + repomanpaths = [os.path.join(cnfdir, _file_) for _file_ in os.listdir(cnfdir)] + logging.debug("LineChecksConfig; repomanpaths: %s", repomanpaths) + repopaths = [os.path.join(path, 'linechecks.yaml') for path in self.repo_settings.masters_list] + self.infopaths = repomanpaths + re
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/whitespace/
commit: 717f46dff518503282f9440f1ed39fbe7698dcee Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:07:13 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:19 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=717f46df repoman: New linechecks module, whitespace .../modules/linechecks/whitespace/__init__.py | 27 ++ .../repoman/modules/linechecks/whitespace/blank.py | 25 .../modules/linechecks/whitespace/whitespace.py| 21 + 3 files changed, 73 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py b/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py new file mode 100644 index 0..ded690ed7 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Whitespace plug-in module for repoman LineChecks. +Performs checks for useless whitespace in ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'whitespace-check': { + 'name': "whitespace", + 'sourcefile': "whitespace", + 'class': "EbuildWhitespace", + 'description': doc, + }, + 'blankline-check': { + 'name': "blankline", + 'sourcefile': "blank", + 'class': "EbuildBlankLine", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/blank.py b/repoman/pym/repoman/modules/linechecks/whitespace/blank.py new file mode 100644 index 0..2ab4097a3 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/whitespace/blank.py @@ -0,0 +1,25 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildBlankLine(LineCheck): + repoman_check_name = 'ebuild.minorsyn' + ignore_comment = False + blank_line = re.compile(r'^$') + + def new(self, pkg): + self.line_is_blank = False + + def check(self, num, line): + if self.line_is_blank and self.blank_line.match(line): + return 'Useless blank line on line: %d' + if self.blank_line.match(line): + self.line_is_blank = True + else: + self.line_is_blank = False + + def end(self): + if self.line_is_blank: + yield 'Useless blank line on last line' diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py b/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py new file mode 100644 index 0..556b2ab81 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py @@ -0,0 +1,21 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildWhitespace(LineCheck): + """Ensure ebuilds have proper whitespacing""" + + repoman_check_name = 'ebuild.minorsyn' + + ignore_line = re.compile(r'(^$)|(^(\t)*#)') + ignore_comment = False + leading_spaces = re.compile(r'^[\S\t]') + trailing_whitespace = re.compile(r'.*([\S]$)') + + def check(self, num, line): + if self.leading_spaces.match(line) is None: + return self.errors['LEADING_SPACES_ERROR'] + if self.trailing_whitespace.match(line) is None: + return self.errors['TRAILING_WHITESPACE_ERROR']
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/scan/ebuild/
commit: ac86784b164c8705c45f79d3418d783e59d99a9a Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:10:13 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:20 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ac86784b repoman: Remove the no longer used modules/scan/ebuild/checks.py repoman/pym/repoman/modules/scan/ebuild/checks.py | 1044 - 1 file changed, 1044 deletions(-) diff --git a/repoman/pym/repoman/modules/scan/ebuild/checks.py b/repoman/pym/repoman/modules/scan/ebuild/checks.py deleted file mode 100644 index de03bedd2..0 --- a/repoman/pym/repoman/modules/scan/ebuild/checks.py +++ /dev/null @@ -1,1044 +0,0 @@ -# -*- coding:utf-8 -*- -# repoman: Checks -# Copyright 2007-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -"""This module contains functions used in Repoman to ascertain the quality -and correctness of an ebuild.""" - -from __future__ import unicode_literals - -from itertools import chain -import operator -import re -import time - -# import our initialized portage instance -from repoman._portage import portage - -from portage.eapi import ( - eapi_supports_prefix, eapi_has_implicit_rdepend, - eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard, - eapi_exports_AA, eapi_has_pkg_pretend) - -from . import errors - - -class LineCheck(object): - """Run a check on a line of an ebuild.""" - """A regular expression to determine whether to ignore the line""" - ignore_line = False - """True if lines containing nothing more than comments with optional - leading whitespace should be ignored""" - ignore_comment = True - - def new(self, pkg): - pass - - def check_eapi(self, eapi): - """Returns if check should be run in the given EAPI (default: True)""" - return True - - def check(self, num, line): - """Run the check on line and return error if there is one""" - if self.re.match(line): - return self.error - - def end(self): - pass - - -class PhaseCheck(LineCheck): - """ basic class for function detection """ - - func_end_re = re.compile(r'^\}$') - phases_re = re.compile('(%s)' % '|'.join(( - 'pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare', - 'src_configure', 'src_compile', 'src_test', 'src_install', - 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', - 'pkg_config'))) - in_phase = '' - - def check(self, num, line): - m = self.phases_re.match(line) - if m is not None: - self.in_phase = m.group(1) - if self.in_phase != '' and self.func_end_re.match(line) is not None: - self.in_phase = '' - - return self.phase_check(num, line) - - def phase_check(self, num, line): - """ override this function for your checks """ - pass - - -class EbuildHeader(LineCheck): - """Ensure ebuilds have proper headers - Copyright header errors - CVS header errors - License header errors - - Args: - modification_year - Year the ebuild was last modified - """ - - repoman_check_name = 'ebuild.badheader' - - gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Foundation$' - gentoo_license = ( - '# Distributed under the terms' - ' of the GNU General Public License v2') - id_header_re = re.compile(r'.*\$(Id|Header)(:.*)?\$.*') - blank_line_re = re.compile(r'^$') - ignore_comment = False - - def new(self, pkg): - if pkg.mtime is None: - self.modification_year = r'2\d\d\d' - else: - self.modification_year = str(time.gmtime(pkg.mtime)[0]) - self.gentoo_copyright_re = re.compile( - self.gentoo_copyright % self.modification_year) - - def check(self, num, line): - if num > 2: - return - elif num == 0: - if not self.gentoo_copyright_re.match(line): - return errors.COPYRIGHT_ERROR - elif num == 1 and line.rstrip('\n') != self.gentoo_license: - return errors.LICENSE_ERROR - elif num == 2 and self.id_header_re.match(line): - return errors.ID_HEADER_ERROR - elif num == 2 and not self.blank_line_re.match(line): - return errors.NO_BLANK_LINE_ERROR - - -class EbuildWhitespace(LineCheck): - """Ensure ebuilds have proper whitespacing""" - - repoman_check_name = 'ebuild.minorsyn' - - ignore_line = r
[gentoo-commits] proj/portage:master commit in: /
commit: 7141699c821b9f5075f1e1ed2141f330c9917968 Author: El Acheche Anis ubuntu com> AuthorDate: Wed Jul 26 22:20:56 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:21 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7141699c repoman: .travis.yml: pyyaml python module is needed for builds .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ebcfbeab9..94ed2dcb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ install: - "[[ ${TRAVIS_PYTHON_VERSION} == 3.[6789] ]] || pip install pyblake2" # always install pygost for Streebog - pip install pygost +# pyyaml is needed for building +- pip install pyyaml script: - printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/nested/
commit: 4a63297643accd75971622000f15613200501081 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:02:24 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:18 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a632976 repoman: New linechecks module, nested .../repoman/modules/linechecks/nested/__init__.py | 21 + .../pym/repoman/modules/linechecks/nested/nested.py | 15 +++ .../repoman/modules/linechecks/nested/nesteddie.py | 11 +++ 3 files changed, 47 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/nested/__init__.py b/repoman/pym/repoman/modules/linechecks/nested/__init__.py new file mode 100644 index 0..8eeeccbac --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/nested/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Nested plug-in module for repoman LineChecks. +Performs nested subshell checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'nesteddie-check': { + 'name': "nesteddie", + 'sourcefile': "nested", + 'class': "EbuildNestedDie", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/nested/nested.py b/repoman/pym/repoman/modules/linechecks/nested/nested.py new file mode 100644 index 0..06b272772 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/nested/nested.py @@ -0,0 +1,15 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildNestedDie(LineCheck): + """Check ebuild for nested die statements (die statements in subshells)""" + + repoman_check_name = 'ebuild.nesteddie' + nesteddie_re = re.compile(r'^[^#]*\s\(\s[^)]*\bdie\b') + + def check(self, num, line): + if self.nesteddie_re.match(line): + return self.errors['NESTED_DIE_ERROR'] diff --git a/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py b/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py new file mode 100644 index 0..6c1e4be9f --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py @@ -0,0 +1,11 @@ + + +class EbuildNestedDie(LineCheck): + """Check ebuild for nested die statements (die statements in subshells)""" + + repoman_check_name = 'ebuild.nesteddie' + nesteddie_re = re.compile(r'^[^#]*\s\(\s[^)]*\bdie\b') + + def check(self, num, line): + if self.nesteddie_re.match(line): + return errors.NESTED_DIE_ERROR
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/tests/
commit: 32f9c278bfc4048191726f4a8670c77ea56d586b Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:50:07 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:21 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=32f9c278 repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E226 repoman/pym/repoman/tests/runTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index ca37b14b3..b0e715ec6 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -35,7 +35,7 @@ repoman_pym = osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__ sys.path.insert(0, repoman_pym) # Add in the parent portage python modules -portage_pym = osp.dirname(osp.dirname(repoman_pym))+'/pym' +portage_pym = osp.dirname(osp.dirname(repoman_pym)) + '/pym' sys.path.insert(0, portage_pym) # import our centrally initialized portage instance
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/tests/
commit: 4fcf189a18dca35f501d59a0344eba8732520ed4 Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:46:28 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:20 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4fcf189a repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E401 repoman/pym/repoman/tests/runTests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 759abdd82..3125ff058 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -3,7 +3,8 @@ # Copyright 2006-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import os, sys +import os +import sys import os.path as osp import grp import platform
[gentoo-commits] proj/portage:master commit in: /
commit: c0a2ba8067807f63934f8e4170ab2f6b2993d2e7 Author: Zac Medico gentoo org> AuthorDate: Fri Mar 30 03:05:32 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:22 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c0a2ba80 Updates for portage-2.3.27 release RELEASE-NOTES | 6 ++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index aa79b95db..031c8c907 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,6 +1,12 @@ Release Notes; upgrade information mainly. Features/major bugfixes are listed in NEWS +portage-2.3.27 +== +* Bug Fixes: +- Bug 651952 INSTALL_MASK: honor install time config for binary packages + + portage-2.3.26 == * Bug Fixes: diff --git a/setup.py b/setup.py index 1e820c833..322e67d73 100755 --- a/setup.py +++ b/setup.py @@ -663,7 +663,7 @@ class build_ext(_build_ext): setup( name = 'portage', - version = '2.3.26', + version = '2.3.27', url = 'https://wiki.gentoo.org/wiki/Project:Portage', author = 'Gentoo Portage Development Team', author_email = 'dev-port...@gentoo.org',
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/quotes/
commit: 3618bc93cf1cfcb9f7f2d5f11852a1b0edbed871 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:04:31 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:18 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3618bc93 repoman: New linechecks module, quotes .../repoman/modules/linechecks/quotes/__init__.py | 27 +++ .../repoman/modules/linechecks/quotes/quoteda.py | 16 .../repoman/modules/linechecks/quotes/quotes.py| 86 ++ 3 files changed, 129 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/quotes/__init__.py b/repoman/pym/repoman/modules/linechecks/quotes/__init__.py new file mode 100644 index 0..6043ab20c --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/quotes/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Nested plug-in module for repoman LineChecks. +Performs nested subshell checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'quote-check': { + 'name': "quote", + 'sourcefile': "quotes", + 'class': "EbuildQuote", + 'description': doc, + }, + 'quoteda-check': { + 'name': "quoteda", + 'sourcefile': "quoteda", + 'class': "EbuildQuotedA", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py b/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py new file mode 100644 index 0..7fd9ba797 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py @@ -0,0 +1,16 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildQuotedA(LineCheck): + """Ensure ebuilds have no quoting around ${A}""" + + repoman_check_name = 'ebuild.minorsyn' + a_quoted = re.compile(r'.*\"\$(\{A\}|A)\"') + + def check(self, num, line): + match = self.a_quoted.match(line) + if match: + return "Quoted \"${A}\" on line: %d" diff --git a/repoman/pym/repoman/modules/linechecks/quotes/quotes.py b/repoman/pym/repoman/modules/linechecks/quotes/quotes.py new file mode 100644 index 0..68c594e23 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/quotes/quotes.py @@ -0,0 +1,86 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildQuote(LineCheck): + """Ensure ebuilds have valid quoting around things like D,FILESDIR, etc...""" + + repoman_check_name = 'ebuild.minorsyn' + _message_commands = [ + "die", "echo", "eerror", "einfo", "elog", "eqawarn", "ewarn"] + _message_re = re.compile( + r'\s(' + "|".join(_message_commands) + r')\s+"[^"]*"\s*$') + _ignored_commands = ["local", "export"] + _message_commands + ignore_line = re.compile( + r'(^$)|(^\s*#.*)|(^\s*\w+=.*)' + + r'|(^\s*(' + "|".join(_ignored_commands) + r')\s+)') + ignore_comment = False + var_names = ["D", "DISTDIR", "FILESDIR", "S", "T", "ROOT", "WORKDIR"] + + # EAPI=3/Prefix vars + var_names += ["ED", "EPREFIX", "EROOT"] + + # variables for games.eclass + var_names += [ + "Ddir", "GAMES_PREFIX_OPT", "GAMES_DATADIR", + "GAMES_DATADIR_BASE", "GAMES_SYSCONFDIR", "GAMES_STATEDIR", + "GAMES_LOGDIR", "GAMES_BINDIR"] + + # variables for multibuild.eclass + var_names += ["BUILD_DIR"] + + var_names = "(%s)" % "|".join(var_names) + var_reference = re.compile( + r'\$(\{%s\}|%s\W)' % (var_names, var_names)) + missing_quotes = re.compile( + r'(\s|^)[^"\'\s]*\$\{?%s\}?[^"\'\s]*(\s|$)' % var_names) + cond_begin = re.compile(r'(^|\s+)\[\[($|\\$|\s+)') + cond_end = re.compile(r'(^|\s+)\]\]($|\\$|\s+)') + + def check(self, num, line): + if self.var_reference.search(line) is None: + return + # There can be multiple matches / violations on a single line. We + # have to make sure none of the matches are violators. Once we've + # found one violator, any remaining matches on the same line can + # be ignored. + pos = 0 + while pos <= len(line) - 1: + missing_quotes = self.missing_quotes.search(line, pos) + if not missing_quotes: + break + # If the last character of the previous match is a whitespace + # character, that character may be nee
[gentoo-commits] proj/portage:master commit in: repoman/
commit: 8ef665c37ec1b76a2884903f9c29e5a2fffc3b97 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 18:22:33 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:22 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ef665c3 repoman setup.py: Add the new cnf/qa_data cnf/linechecks items Closes: https://github.com/gentoo/portage/pull/202 repoman/setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repoman/setup.py b/repoman/setup.py index aaf10cdb5..9ac58ef35 100755 --- a/repoman/setup.py +++ b/repoman/setup.py @@ -479,6 +479,8 @@ setup( data_files = list(get_manpages()) + [ ['$docdir', ['NEWS', 'RELEASE-NOTES']], + ['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']], + ['share/repoman/linechecks', ['cnf/linechecks/linechecks.yaml']], ], cmdclass = {
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/patches/
commit: ce7b5727490d7662a9402fb5c66e4b706443885e Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:02:58 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:18 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ce7b5727 repoman: New linechecks module, patches .../repoman/modules/linechecks/patches/__init__.py | 21 + .../repoman/modules/linechecks/patches/patches.py | 16 2 files changed, 37 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/patches/__init__.py b/repoman/pym/repoman/modules/linechecks/patches/__init__.py new file mode 100644 index 0..67434f911 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/patches/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Patches plug-in module for repoman LineChecks. +Performs PATCHES variable checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'patches-check': { + 'name': "patches", + 'sourcefile': "patches", + 'class': "EbuildPatches", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/patches/patches.py b/repoman/pym/repoman/modules/linechecks/patches/patches.py new file mode 100644 index 0..63651cd7c --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/patches/patches.py @@ -0,0 +1,16 @@ + + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildPatches(LineCheck): + """Ensure ebuilds use bash arrays for PATCHES to ensure white space safety""" + repoman_check_name = 'ebuild.patches' + re = re.compile(r'^\s*PATCHES=[^\(]') + error = 'PATCHES_ERROR' + + def check_eapi(self, eapi): + return eapi in ("0", "1", "2", "3", "4", "4-python", + "4-slot-abi", "5", "5-hdepend", "5-progress")
[gentoo-commits] proj/portage:master commit in: repoman/cnf/qa_data/, repoman/pym/repoman/
commit: 10badb74f85e62a89258f950a07b9ced82dc562a Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 18:16:44 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:21 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=10badb74 repoman qa_data.py: Move the qahelp loading to a new /usr/share/repoman/qa_data directory This new directory can be installed to by third party add on modules that extend the checks. We can also in future use these file to get loaclized translations. repoman/cnf/qa_data/qa_data.yaml | 136 +++ repoman/pym/repoman/qa_data.py | 19 +- 2 files changed, 152 insertions(+), 3 deletions(-) diff --git a/repoman/cnf/qa_data/qa_data.yaml b/repoman/cnf/qa_data/qa_data.yaml new file mode 100644 index 0..573cdb449 --- /dev/null +++ b/repoman/cnf/qa_data/qa_data.yaml @@ -0,0 +1,136 @@ +--- +# qa_help.yaml + +# configuration file for the LineCheck plugins run via the multicheck +# scan module + +# Repoman API version (do not edit) +version: 1 +# minimum +repoman_version: 2.3.3 + +# qahelp: Primary QA help messages to describe the errors or warnings +# Dictionary +qahelp: +Entries: +IO_error: "Attempting to commit, and an IO error was encountered access the Entries file" +changelog: +ebuildadded: "An ebuild was added but the ChangeLog was not modified" +missing: "Missing ChangeLog files" +notadded: "ChangeLogs that exist but have not been added to cvs" +dependency: +bad: "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds)" +badmasked: "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds)" +badindev: "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in developing arch" +badmaskedindev: "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in developing arch" +badinexp: "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in experimental arch" +badmaskedinexp: "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in experimental arch" +badtilde: "Uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)" +missingslot: "RDEPEND matches more than one SLOT but does not specify a slot and/or use the := or :* slot operator" +perlcore: "This ebuild directly depends on a package in perl-core; it should use the corresponding virtual instead." +syntax: "Syntax error in dependency string (usually an extra/missing space/parenthesis)" +unknown: "Ebuild has a dependency that refers to an unknown package (which may be valid if it is a blocker for a renamed/removed package, or is an alternative choice provided by an overlay)" +badslotop: "RDEPEND contains ':=' slot operator under '||' dependency." +DESCRIPTION: +missing: "Ebuilds that have a missing or empty DESCRIPTION variable" +toolong: "DESCRIPTION is over %d characters" +digest: +assumed: "Existing digest must be assumed correct (Package level only)" +missing: "Some files listed in SRC_URI aren't referenced in the Manifest" +unused: "Some files listed in the Manifest aren't referenced in SRC_URI" +EAPI: +definition: "EAPI definition does not conform to PMS section 7.3.1 (first non-comment, non-blank line)" +deprecated: "Ebuilds that use features that are deprecated in the current EAPI" +incompatible: "Ebuilds that use features that are only available with a different EAPI" +unsupported: "Ebuilds that have an unsupported EAPI version (you must upgrade portage)" +ebuild: +absdosym: "This ebuild uses absolute target to dosym where relative symlink could be used instead" +badheader: "This ebuild has a malformed header" +invalidname: "Ebuild files with a non-parseable or syntactically incorrect name (or using 2.1 versioning extensions)" +majorsyn: "This ebuild has a major syntax error that may cause the ebuild to fail partially or fully" +minorsyn: "This ebuild has a minor syntax error that contravenes gentoo coding style" +namenomatch: "Ebuild files that do not have the same name as their parent directory" +notadded: "Ebuilds that exist but have not been added to the vcs" +nesteddie: "Placing 'die' inside ( ) prints an error, but doesn't stop the ebuild." +output: "A simple sourcing of the ebuild produces output; this breaks ebuild policy." +patches: "PATCHES variable should be a bash array to ensure white space safety" +syntax: "Error generating cache entry for ebuild; typically caused by ebuild syntax error or digest verification failure" +file: +executable: "Ebuilds, digests, m
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/useless/
commit: 340283538afc734790341c78a09742bcd0fc1009 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:06:38 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:19 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=34028353 repoman: New linechecks module, useless .../repoman/modules/linechecks/useless/__init__.py | 27 ++ .../pym/repoman/modules/linechecks/useless/cd.py | 24 +++ .../repoman/modules/linechecks/useless/dodoc.py| 16 + 3 files changed, 67 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/useless/__init__.py b/repoman/pym/repoman/modules/linechecks/useless/__init__.py new file mode 100644 index 0..acc4479f5 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/useless/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Useless plug-in module for repoman LineChecks. +Performs checks for useless operations on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'uselesscds-check': { + 'name': "uselesscds", + 'sourcefile': "cd", + 'class': "EbuildUselessCdS", + 'description': doc, + }, + 'uselessdodoc-check': { + 'name': "uselessdodoc", + 'sourcefile': "dodoc", + 'class': "EbuildUselessDodoc", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/useless/cd.py b/repoman/pym/repoman/modules/linechecks/useless/cd.py new file mode 100644 index 0..3daa04451 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/useless/cd.py @@ -0,0 +1,24 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildUselessCdS(LineCheck): + """Check for redundant cd ${S} statements""" + repoman_check_name = 'ebuild.minorsyn' + _src_phases = r'^\s*src_(prepare|configure|compile|install|test)\s*\(\)' + method_re = re.compile(_src_phases) + cds_re = re.compile(r'^\s*cd\s+("\$(\{S\}|S)"|\$(\{S\}|S))\s') + + def __init__(self, errors): + self.errors = errors + self.check_next_line = False + + def check(self, num, line): + if self.check_next_line: + self.check_next_line = False + if self.cds_re.match(line): + return self.errors['REDUNDANT_CD_S_ERROR'] + elif self.method_re.match(line): + self.check_next_line = True diff --git a/repoman/pym/repoman/modules/linechecks/useless/dodoc.py b/repoman/pym/repoman/modules/linechecks/useless/dodoc.py new file mode 100644 index 0..502bfbea8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/useless/dodoc.py @@ -0,0 +1,16 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildUselessDodoc(LineCheck): + """Check ebuild for useless files in dodoc arguments.""" + repoman_check_name = 'ebuild.minorsyn' + uselessdodoc_re = re.compile( + r'^\s*dodoc(\s+|\s+.*\s+)(ABOUT-NLS|COPYING|LICENCE|LICENSE)($|\s)') + + def check(self, num, line): + match = self.uselessdodoc_re.match(line) + if match: + return "Useless dodoc '%s'" % (match.group(2), ) + " on line: %d"
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/portage/
commit: 3ea468dde4de8ec14c9da1dd6d522a31cc443851 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:04:00 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:18 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3ea468dd repoman: New linechecks module, portage .../repoman/modules/linechecks/portage/__init__.py | 27 .../repoman/modules/linechecks/portage/internal.py | 37 ++ 2 files changed, 64 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/portage/__init__.py b/repoman/pym/repoman/modules/linechecks/portage/__init__.py new file mode 100644 index 0..d390c6054 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/portage/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Portage plug-in module for repoman LineChecks. +Performs checks for internal portage variable usage in ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'internal-check': { + 'name': "portageinternal", + 'sourcefile': "internal", + 'class': "PortageInternal", + 'description': doc, + }, + 'portageinternalvariableassignment-check': { + 'name': "portageinternalvariableassignment", + 'sourcefile': "internal", + 'class': "PortageInternalVariableAssignment", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/portage/internal.py b/repoman/pym/repoman/modules/linechecks/portage/internal.py new file mode 100644 index 0..869337221 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/portage/internal.py @@ -0,0 +1,37 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class PortageInternal(LineCheck): + repoman_check_name = 'portage.internal' + ignore_comment = True + # Match when the command is preceded only by leading whitespace or a shell + # operator such as (, {, |, ||, or &&. This prevents false positives in + # things like elog messages, as reported in bug #413285. + + internal_portage_func_or_var = ( + 'ecompress|ecompressdir|env-update|prepall|prepalldocs|preplib') + re = re.compile( + r'^(\s*|.*[|&{(]+\s*)\b(%s)\b' % internal_portage_func_or_var) + + def check(self, num, line): + """Run the check on line and return error if there is one""" + m = self.re.match(line) + if m is not None: + return ("'%s'" % m.group(2)) + " called on line: %d" + + +class PortageInternalVariableAssignment(LineCheck): + repoman_check_name = 'portage.internal' + internal_assignment = re.compile( + r'\s*(export\s+)?(EXTRA_ECONF|EXTRA_EMAKE)\+?=') + + def check(self, num, line): + match = self.internal_assignment.match(line) + e = None + if match is not None: + e = 'Assignment to variable %s' % match.group(2) + e += ' on line: %d' + return e
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/uri/
commit: f7cb68a8d05fa555cc52ac7117ad50456060129b Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:05:03 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:19 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f7cb68a8 repoman: New linechecks module, uri .../pym/repoman/modules/linechecks/uri/__init__.py | 21 +++ repoman/pym/repoman/modules/linechecks/uri/uri.py | 30 ++ 2 files changed, 51 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/uri/__init__.py b/repoman/pym/repoman/modules/linechecks/uri/__init__.py new file mode 100644 index 0..a7731e3cc --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/uri/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Uri plug-in module for repoman LineChecks. +Performs HOMEPAGE variable checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'httpsuri-check': { + 'name': "httpsuri", + 'sourcefile': "uri", + 'class': "UriUseHttps", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/uri/uri.py b/repoman/pym/repoman/modules/linechecks/uri/uri.py new file mode 100644 index 0..1a0afe682 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/uri/uri.py @@ -0,0 +1,30 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class UriUseHttps(LineCheck): + """Check that we use https:// for known good sites.""" + repoman_check_name = 'uri.https' + _SITES = ( + '([-._a-zA-Z0-9]*\.)?apache\.org', + '((alioth|packages(\.qa)?|people|www)\.)?debian\.org', + # Most FDO sites support https, but not all (like tango). + # List the most common ones here for now. + '((anongit|bugs|cgit|dri|patchwork|people|specifications|www|xcb|xorg)\.)?freedesktop\.org', + '((bugs|dev|wiki|www)\.)?gentoo\.org', + '((wiki)\.)?github\.(io|com)', + 'savannah\.(non)?gnu\.org', + '((gcc|www)\.)?gnu\.org', + 'curl\.haxx\.se', + '((bugzilla|git|mirrors|patchwork|planet|www(\.wiki)?)\.)?kernel\.org', + '((bugs|wiki|www)\.)?linuxfoundation\.org', + '((docs|pypi|www)\.)?python\.org', + '(sf|sourceforge)\.net', + '(www\.)?(enlightenment|sourceware|x)\.org', + ) + # Try to anchor the end of the URL so we don't get false positives + # with http://github.com.foo.bar.com/. Unlikely, but possible. + re = re.compile(r'.*\bhttp://(%s)(\s|["\'/]|$)' % r'|'.join(_SITES)) + error = 'URI_HTTPS'
[gentoo-commits] proj/portage:master commit in: pym/portage/
commit: 3bffbc6150be9ee81d47547cbff113a8d45edb6d Author: Brian Dolbec gentoo org> AuthorDate: Thu Aug 17 01:50:21 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:20 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3bffbc61 module.py: Extend the module loader for API version checking If provided with an iterable of compatibility versions, The controller will check the plugin modules module_spec 'version' variable is compatible with the base application. pym/portage/module.py | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pym/portage/module.py b/pym/portage/module.py index c79e65518..bd7c94d4e 100644 --- a/pym/portage/module.py +++ b/pym/portage/module.py @@ -15,6 +15,10 @@ class InvalidModuleName(PortageException): """An invalid or unknown module name.""" +class ModuleVersionError(PortageException): + '''An incompatible module version''' + + class Module(object): """Class to define and hold our plug-in module @@ -87,16 +91,17 @@ class Modules(object): @param namepath: Python import path to the "modules" directory """ - def __init__(self, path, namepath): + def __init__(self, path, namepath, compat_versions=None): self._module_path = path self._namepath = namepath + self.compat_versions = compat_versions self.parents = [] self._modules = self._get_all_modules() self.modules = ProtectedDict(self._modules) self.module_names = sorted(self._modules) def _get_all_modules(self): - """scans the emaint modules dir for loadable modules + """scans the _module_path dir for loadable modules @rtype: dictionary of module_plugins """ @@ -117,6 +122,7 @@ class Modules(object): kids = {} for entry in importables: new_module = Module(entry, self._namepath) + self._check_compat(new_module) for module_name in new_module.kids: kid = new_module.kids[module_name] kid['parent'] = new_module @@ -211,6 +217,8 @@ class Modules(object): @type modname: string @param modname: the module class name + @type var: string + @param var: the base level variable to return @type dictionary @return: the modules class exported options descriptions """ @@ -220,3 +228,13 @@ class Modules(object): raise InvalidModuleName( "Module name '%s' is invalid or not found" % modname) return value + + def _check_compat(self, module): + if self.compat_versions: + if not module.module_spec['version'] in self.compat_versions: + raise ModuleVersionError( + "Error loading '%s' plugin module: %s, version: %s\n" + "Module is not compatible with the current application version\n" + "Compatible module API versions are: %s" + % (self._namepath, module.module_spec['name'], + module.module_spec['version'], self.compat_versions))
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/tests/
commit: fc80d0b580006e1ffbab6866d6ce4674c32ddb6e Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:47:42 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:20 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fc80d0b5 repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E302 repoman/pym/repoman/tests/runTests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 3125ff058..1795aa487 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -11,6 +11,7 @@ import platform import pwd import signal + def debug_signal(signum, frame): import pdb pdb.set_trace()
[gentoo-commits] proj/portage:master commit in: repoman/
commit: c281697cafe0fe76c634f349d762b5b9c0373bff Author: Zac Medico gentoo org> AuthorDate: Fri Mar 30 03:58:35 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:58:58 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c281697c repoman: Update for a repoman-2.3.8 release repoman/NEWS | 5 + repoman/setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/repoman/NEWS b/repoman/NEWS index 688c6c884..c8d22d024 100644 --- a/repoman/NEWS +++ b/repoman/NEWS @@ -1,5 +1,10 @@ News (mainly features/major bug fixes) +repoman 2.3.8 += +- Support for plugin module systems, see + https://wiki.gentoo.org/wiki/Project:Portage/Repoman-Module-specs + repoman 2.3.0 = - Final release diff --git a/repoman/setup.py b/repoman/setup.py index 9ac58ef35..89ef7d5d9 100755 --- a/repoman/setup.py +++ b/repoman/setup.py @@ -467,7 +467,7 @@ def get_manpages(): setup( name = 'repoman', - version = '2.3.7', + version = '2.3.8', url = 'https://wiki.gentoo.org/wiki/Project:Portage', author = 'Gentoo Portage Development Team', author_email = 'dev-port...@gentoo.org',
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/phases/
commit: e464717923ee7bf37c75a0587a8643a569d65068 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:03:33 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:18 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e4647179 repoman: New linechecks module, phases .../repoman/modules/linechecks/phases/__init__.py | 34 +++ .../pym/repoman/modules/linechecks/phases/phase.py | 71 ++ 2 files changed, 105 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/phases/__init__.py b/repoman/pym/repoman/modules/linechecks/phases/__init__.py new file mode 100644 index 0..476443b25 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/phases/__init__.py @@ -0,0 +1,34 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Phases plug-in module for repoman LineChecks. +Performs phase dependant checks on ebuilds using a PhaseCheck base class. +""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'emakeparallel-check': { + 'name': "emakeparallel", + 'sourcefile': "phase", + 'class': "EMakeParallelDisabled", + 'description': doc, + }, + 'srccompileeconf-check': { + 'name': "srccompileeconf", + 'sourcefile': "phase", + 'class': "SrcCompileEconf", + 'description': doc, + }, + 'srcunpackpatches-check': { + 'name': "srcunpackpatches", + 'sourcefile': "phase", + 'class': "SrcUnpackPatches", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/phases/phase.py b/repoman/pym/repoman/modules/linechecks/phases/phase.py new file mode 100644 index 0..acc3a1e1d --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/phases/phase.py @@ -0,0 +1,71 @@ + +import re + +from portage.eapi import eapi_has_src_prepare_and_src_configure +from repoman.modules.linechecks.base import LineCheck + + +class PhaseCheck(LineCheck): + """ basic class for function detection """ + + func_end_re = re.compile(r'^\}$') + phases_re = re.compile('(%s)' % '|'.join(( + 'pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare', + 'src_configure', 'src_compile', 'src_test', 'src_install', + 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', + 'pkg_config'))) + in_phase = '' + + def check(self, num, line): + m = self.phases_re.match(line) + if m is not None: + self.in_phase = m.group(1) + if self.in_phase != '' and self.func_end_re.match(line) is not None: + self.in_phase = '' + + return self.phase_check(num, line) + + def phase_check(self, num, line): + """ override this function for your checks """ + pass + + +class EMakeParallelDisabled(PhaseCheck): + """Check for emake -j1 calls which disable parallelization.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'^\s*emake\s+.*-j\s*1\b') + + def phase_check(self, num, line): + if self.in_phase == 'src_compile' or self.in_phase == 'src_install': + if self.re.match(line): + return self.errors['EMAKE_PARALLEL_DISABLED'] + + +class SrcCompileEconf(PhaseCheck): + repoman_check_name = 'ebuild.minorsyn' + configure_re = re.compile(r'\s(econf|./configure)') + + def check_eapi(self, eapi): + return eapi_has_src_prepare_and_src_configure(eapi) + + def phase_check(self, num, line): + if self.in_phase == 'src_compile': + m = self.configure_re.match(line) + if m is not None: + return ("'%s'" % m.group(1)) + \ + " call should be moved to src_configure from line: %d" + + +class SrcUnpackPatches(PhaseCheck): + repoman_check_name = 'ebuild.minorsyn' + src_prepare_tools_re = re.compile(r'\s(e?patch|sed)\s') + + def check_eapi(self, eapi): + return eapi_has_src_prepare_and_src_configure(eapi) + + def phase_check(self, num, line): + if self.in_phase == 'src_unpack': + m = self.src_prepare_tools_re.search(line) + if m is not None: + return ("'%s'" % m.group(1)) + \ + " call should be moved to src_prepare from line: %d"
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/tests/
commit: 30cb501b641f99a8392261734384c6e681f9c3a8 Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:49:26 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:21 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=30cb501b repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E261 repoman/pym/repoman/tests/runTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 1795aa487..ca37b14b3 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -17,7 +17,7 @@ def debug_signal(signum, frame): pdb.set_trace() if platform.python_implementation() == 'Jython': - debug_signum = signal.SIGUSR2 # bug #424259 + debug_signum = signal.SIGUSR2 # bug #424259 else: debug_signum = signal.SIGUSR1
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/helpers/
commit: 5e6c14c41051daca8d01fbc0dd5b567c17ebac51 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:01:52 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:17 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5e6c14c4 repoman: New linechecks module, helpers .../repoman/modules/linechecks/helpers/__init__.py | 21 + .../repoman/modules/linechecks/helpers/offset.py | 22 ++ 2 files changed, 43 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/helpers/__init__.py b/repoman/pym/repoman/modules/linechecks/helpers/__init__.py new file mode 100644 index 0..e2d12afe4 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/helpers/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Helpers plug-in module for repoman LineChecks. +Performs variable helpers checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'nooffset-check': { + 'name': "nooffset", + 'sourcefile': "offset", + 'class': "NoOffsetWithHelpers", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/helpers/offset.py b/repoman/pym/repoman/modules/linechecks/helpers/offset.py new file mode 100644 index 0..5d7624a68 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/helpers/offset.py @@ -0,0 +1,22 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class NoOffsetWithHelpers(LineCheck): + """ Check that the image location, the alternate root offset, and the + offset prefix (D, ROOT, ED, EROOT and EPREFIX) are not used with + helpers """ + + repoman_check_name = 'variable.usedwithhelpers' + # Ignore matches in quoted strings like this: + # elog "installed into ${ROOT}usr/share/php5/apc/." + _install_funcs = ( + 'docinto|do(compress|dir|hard)' + '|exeinto|fowners|fperms|insinto|into') + _quoted_vars = 'D|ROOT|ED|EROOT|EPREFIX' + re = re.compile( + r'^[^#"\']*\b(%s)\s+"?\$\{?(%s)\b.*' % + (_install_funcs, _quoted_vars)) + error = 'NO_OFFSET_WITH_HELPERS'
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/use/
commit: efb151d9cb4e37fd0ee4233055f792f7f115bc79 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:05:56 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:19 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=efb151d9 repoman: New linechecks module, use .../pym/repoman/modules/linechecks/use/__init__.py | 21 + .../pym/repoman/modules/linechecks/use/builtwith.py | 10 ++ 2 files changed, 31 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/use/__init__.py b/repoman/pym/repoman/modules/linechecks/use/__init__.py new file mode 100644 index 0..e5665d2d8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/use/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Use plug-in module for repoman LineChecks. +Performs Built-With-Use checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'builtwith-check': { + 'name': "builtwith", + 'sourcefile': "builtwith", + 'class': "BuiltWithUse", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/use/builtwith.py b/repoman/pym/repoman/modules/linechecks/use/builtwith.py new file mode 100644 index 0..0ec4fae21 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/use/builtwith.py @@ -0,0 +1,10 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class BuiltWithUse(LineCheck): + repoman_check_name = 'ebuild.minorsyn' + re = re.compile(r'(^|.*\b)built_with_use\b') + error = 'BUILT_WITH_USE'
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/scan/depend/, ...
commit: 72ab831df749bef1b337f8787068a004c24432e6 Author: Brian Dolbec gentoo org> AuthorDate: Wed Aug 16 23:24:24 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:20 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=72ab831d repoman: Initial adding file/module/API version repoman/pym/repoman/config.py | 7 +-- repoman/pym/repoman/main.py| 3 +++ repoman/pym/repoman/modules/linechecks/assignment/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/config.py | 2 +- repoman/pym/repoman/modules/linechecks/depend/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/deprecated/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/do/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/eapi/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/emake/__init__.py | 3 ++- .../pym/repoman/modules/linechecks/gentoo_header/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/helpers/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/nested/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/patches/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/phases/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/portage/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/quotes/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/uri/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/use/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/useless/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/whitespace/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/workaround/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/depend/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/directories/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/eapi/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/ebuild/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/eclasses/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/fetch/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/keywords/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/manifest/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/metadata/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/module.py | 10 +++--- repoman/pym/repoman/modules/scan/options/__init__.py | 3 ++- repoman/pym/repoman/qa_data.py | 4 ++-- repoman/pym/repoman/repos.py | 2 +- repoman/pym/repoman/scanner.py | 3 ++- 35 files changed, 77 insertions(+), 38 deletions(-) diff --git a/repoman/pym/repoman/config.py b/repoman/pym/repoman/config.py index 9da30ed9e..0f2358cd9 100644 --- a/repoman/pym/repoman/config.py +++ b/repoman/pym/repoman/config.py @@ -144,8 +144,11 @@ def load_config(conf_dirs, file_extensions=None, valid_versions=None): if config: if config['version'] not in valid_versions: - raise ConfigError("Invalid file version: %s in: %s\nPlease upgrade repoman: current valid versions: %s" - % (config['version'], filename, valid_versions)) + raise ConfigError( + "Invalid file version: %s in: %s\nPlease upgrade to " + ">=app-portage/repoman-%s, current valid API versions: %s" + % (config['version'], filename, + config['repoman_version'], valid_versions)) result = merge_config(result, config) return result diff --git a/repoman/pym/repoman/main.py b/repoman/pym/repoman/main.py index c1e3b99fe..81e2ff61e 100755 --- a/repoman/pym/repoman/main.py +++ b/repoman/pym/repoman/main.py @@ -47,10 +47,12 @@ os.umask(0o22) LOGLEVEL = logging.WARNING portage.util.initialize_logger(LOGLEVEL) +VALID_VERSIONS = [1,] def repoman_main(argv): config_root = os.environ.get("PORTAGE_CONFIGROOT") repoman_settings = portage.config(config_root=config_root, local_config=False) + repoman_settings.valid_versions = VALID_VERSIONS if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ repoman_settings.get('TERM') == 'dumb' or \ @@ -92,6 +94,7 @@ def repoman_main(argv): config_root, portdir, portdir_overlay, repoman_settings, vcs_settings, options, qadata) repoman_settings = repo_settings.repoman_settings + repoman_settings.valid_versions = VALID_V
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/, repoman/pym/repoman/modules/scan/ebuild/
commit: ef62ffac353970086f93d84541725ef718100c7b Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:09:03 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:20 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef62ffac repoman: Convert multicheck module to the new linechecks sub-module repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +- repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++--- repoman/pym/repoman/scanner.py| 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py index 3e1d31951..1d8ec1941 100644 --- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py +++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py @@ -47,7 +47,7 @@ module_spec = { 'functions': ['check'], 'func_kwargs': { }, - 'mod_kwargs': ['qatracker', 'options' + 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks', ], 'func_kwargs': { 'ebuild': (None, None), diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py index 9e36e2a68..94526ae9e 100644 --- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py +++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py @@ -8,7 +8,7 @@ import io from portage import _encodings, _unicode_encode from repoman.modules.scan.scanbase import ScanBase -from .checks import run_checks, checks_init +from repoman.modules.linechecks.controller import LineCheckController class MultiCheck(ScanBase): @@ -22,7 +22,11 @@ class MultiCheck(ScanBase): ''' self.qatracker = kwargs.get('qatracker') self.options = kwargs.get('options') - checks_init(self.options.experimental_inherit == 'y') + self.controller = LineCheckController( + kwargs.get('repo_settings'), + kwargs.get('linechecks') + ) + self.controller.checks_init(self.options.experimental_inherit == 'y') def check(self, **kwargs): '''Check the ebuild for utf-8 encoding @@ -40,7 +44,7 @@ class MultiCheck(ScanBase): errors='strict'), mode='r', encoding=_encodings['repo.content']) try: - for check_name, e in run_checks(f, pkg): + for check_name, e in self.controller.run_checks(f, pkg): self.qatracker.add_error( check_name, ebuild.relative_path + ': %s' % e) finally: diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py index b3d030570..d61e50131 100644 --- a/repoman/pym/repoman/scanner.py +++ b/repoman/pym/repoman/scanner.py @@ -193,6 +193,7 @@ class Scanner(object): "env": self.env, "have": self.have, "dev_keywords": self.dev_keywords, + "linechecks": self.moduleconfig.linechecks, } # initialize the plugin checks here self.modules = {}
[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/linechecks/workaround/
commit: 30257d3c3d1762b3a2eaae20fbef2a48ceffa1c1 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:07:59 2017 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:51:19 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=30257d3c repoman: New linechecks module, workaround .../modules/linechecks/workaround/__init__.py | 27 ++ .../modules/linechecks/workaround/workarounds.py | 18 +++ 2 files changed, 45 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/workaround/__init__.py b/repoman/pym/repoman/modules/linechecks/workaround/__init__.py new file mode 100644 index 0..0b5aa70c8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/workaround/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Workaround plug-in module for repoman LineChecks. +Performs checks for upstream workarounds in ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'addpredict-check': { + 'name': "addpredict", + 'sourcefile': "workarounds", + 'class': "SandboxAddpredict", + 'description': doc, + }, + 'noasneeded-check': { + 'name': "noasneeded", + 'sourcefile': "workarounds", + 'class': "NoAsNeeded", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py b/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py new file mode 100644 index 0..37cb54314 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py @@ -0,0 +1,18 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class NoAsNeeded(LineCheck): + """Check for calls to the no-as-needed function.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'.*\$\(no-as-needed\)') + error = 'NO_AS_NEEDED' + + +class SandboxAddpredict(LineCheck): + """Check for calls to the addpredict function.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'(^|\s)addpredict\b') + error = 'SANDBOX_ADDPREDICT'
[gentoo-commits] proj/portage:master commit in: pym/_emerge/
commit: c5ad40dbe8f74dcdb2b08d42240e217a8ef440e6 Author: Zac Medico gentoo org> AuthorDate: Fri Mar 30 03:35:24 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 03:47:55 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c5ad40db depgraph._serialize_tasks: resolve portage/repoman blockers (bug 651936) When ensuring that all runtime dependencies are installed before a new instance of portage, ignore uninstalls. This makes it possible to solve a blocker between a new version of portage and an older version of repoman, where an uninstall task for the older version of repoman appears in the runtime dependencies of the new instance of portage. Bug: https://bugs.gentoo.org/651936 pym/_emerge/depgraph.py | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 6af7d5714..963bf25f4 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -7671,11 +7671,13 @@ class depgraph(object): return True if node not in mergeable_nodes: return False - if node == replacement_portage and \ - mygraph.child_nodes(node, - ignore_priority=priority_range.ignore_medium_soft): - # Make sure that portage always has all of it's - # RDEPENDs installed first. + if node == replacement_portage and any( + getattr(rdep, 'operation', None) != 'uninstall' + for rdep in mygraph.child_nodes(node, + ignore_priority=priority_range.ignore_medium_soft)): + # Make sure that portage always has all of its + # RDEPENDs installed first, but ignore uninstalls + # (these occur when new portage blocks older repoman). return False selected_nodes.add(node) for child in mygraph.child_nodes(node,
[gentoo-commits] repo/gentoo:master commit in: dev-perl/XML-TreePP/
commit: dbc9dffc36b4a76be8cf20db71c35e0a9a2dba1a Author: Kent Fredric gentoo org> AuthorDate: Fri Mar 30 03:40:19 2018 + Commit: Kent Fredric gentoo org> CommitDate: Fri Mar 30 03:46:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc9dffc dev-perl/XML-TreePP: EAPI6 + tests - EAPI6ify - Enable tests ( don't appear to do network IO ) - Cleanup unwanted tests Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild | 22 ++ 1 file changed, 22 insertions(+) diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild new file mode 100644 index 000..4e0e152b6cb --- /dev/null +++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_VERSION=0.43 +DIST_AUTHOR="KAWASAKI" +inherit perl-module + +DESCRIPTION="Pure Perl implementation for parsing/writing XML documents" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="" + +RDEPEND=" + dev-perl/libwww-perl +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" +PERL_RM_FILES=("t/00_pod.t")
[gentoo-commits] repo/gentoo:master commit in: app-shells/fish/
commit: d0777f965819d45d3f0c675e6ef517aff75ddd8b Author: Aaron Bauman gentoo org> AuthorDate: Fri Mar 30 03:08:54 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 03:08:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0777f96 app-shells/fish: amd64 stable Bug: https://bugs.gentoo.org/651800 Package-Manager: Portage-2.3.26, Repoman-2.3.7 app-shells/fish/fish-2.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild index a26d81c57d9..d3fe5a15f71 100644 --- a/app-shells/fish/fish-2.7.1.ebuild +++ b/app-shells/fish/fish-2.7.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/$ LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_* ]] || \ -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="nls test" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-python/html5-parser/
commit: 024f51f3964e5711aa2cac7239658a417afd3c42 Author: Aaron Bauman gentoo org> AuthorDate: Fri Mar 30 03:03:25 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 03:03:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024f51f3 dev-python/html5-parser: amd64 stable Bug: https://bugs.gentoo.org/642796 Package-Manager: Portage-2.3.26, Repoman-2.3.7 dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild index 72db339fab9..08015ad2853 100644 --- a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild +++ b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm x86" +KEYWORDS="amd64 ~arm x86" IUSE="" RDEPEND="dev-libs/libxml2:=
[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/
commit: 5738c5505e330fb9199c2b7ac00454666ed5653e Author: Aaron Bauman gentoo org> AuthorDate: Fri Mar 30 03:04:27 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 03:04:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5738c550 app-text/calibre: amd64 stable Bug: https://bugs.gentoo.org/642796 Package-Manager: Portage-2.3.26, Repoman-2.3.7 app-text/calibre/calibre-3.15.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild index b8945c9e82f..6b07541efaf 100644 --- a/app-text/calibre/calibre-3.15.0.ebuild +++ b/app-text/calibre/calibre-3.15.0.ebuild @@ -32,7 +32,7 @@ LICENSE=" PSF-2 unRAR " -KEYWORDS="~amd64 ~arm x86" +KEYWORDS="amd64 ~arm x86" SLOT="0" IUSE="ios +udisks"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan-plugin-gt-f720/
commit: 25a2d211516495d09d7b8d5063de4e060365df86 Author: Harri Nieminen gmail com> AuthorDate: Tue Mar 27 17:17:05 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:51:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a2d211 media-gfx/iscan-plugin-gt-f720: Remove old Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/7649 .../iscan-plugin-gt-f720-0.0.1.ebuild | 54 -- 1 file changed, 54 deletions(-) diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild deleted file mode 100644 index be5793af563..000 --- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit multilib rpm - -# Revision used by upstream -SRC_REV="2" - -MY_P="esci-interpreter-gt-f720-${PV}" - -DESCRIPTION="Epson Perfection V300 PHOTO scanner plugin for SANE 'epkowa' backend" -HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"; -SRC_URI=" - x86? ( http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/${MY_P}-${SRC_REV}.i386.rpm ) - amd64? ( http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/${MY_P}-${SRC_REV}.x86_64.rpm )" - -LICENSE="AVASYS" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=">=media-gfx/iscan-2.21.0" -RDEPEND="${DEPEND}" - -src_install() { - local MY_LIB="/usr/$(get_libdir)" - - # install scanner firmware - insinto /usr/share/esci - doins "${WORKDIR}/usr/share/esci/"* - - # install scanner plugins - insinto "${MY_LIB}/esci" - insopts -m0755 - doins "${WORKDIR}/usr/$(get_libdir)/esci/"* -} - -pkg_postinst() { - local MY_LIB="/usr/$(get_libdir)" - - # Needed for scaner to work properly. - iscan-registry --add interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin" - elog - elog "Firmware file esfw8b.bin for Epson Perfection V300 PHOTO" - elog "has been installed in /usr/share/esci and registered for use." - elog -} - -pkg_prerm() { - local MY_LIB="/usr/$(get_libdir)" - - iscan-registry --remove interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin" -}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/time-compat/
commit: e0aadd3cf56fc80ecf11b1a086b49ba2828601ad Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:30:28 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0aadd3c dev-haskell/time-compat: use HTTPS dev-haskell/time-compat/time-compat-0.1.0.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild b/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild index ba4b1cc8a10..aff251cfd09 100644 --- a/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild +++ b/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Compatibility with old-time for the time package" -HOMEPAGE="http://hub.darcs.net/dag/time-compat"; +HOMEPAGE="https://hub.darcs.net/dag/time-compat"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-burn/
commit: 0ede4ebe3922d63b9efdb638f5ee7dd2b0be5bef Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:11:34 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ede4ebe media-plugins/vdr-burn: fix HOMEPAGE, use HTTPS Closes: https://github.com/gentoo/gentoo/pull/7701 media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild b/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild index ae6b93fd64b..97384f74945 100644 --- a/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild +++ b/media-plugins/vdr-burn/vdr-burn-0.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1252" # every bump, new version! DESCRIPTION="VDR Plugin: burn records on DVD" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-burn"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-burn"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" KEYWORDS="~amd64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-zappilot/
commit: 216d487f9a79b285ed891d71c88ebf25a553845b Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:18:51 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216d487f media-plugins/vdr-zappilot: fix HOMEPAGE, use HTTPS media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild | 4 ++-- media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild index 35f779376a8..2f85a0b16e3 100644 --- a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild +++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1318" # every bump new version DESCRIPTION="VDR Plugin: browse fast the EPG information without being forced to switch to a channel" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-zappilot"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-zappilot"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" KEYWORDS="~amd64 ~x86" diff --git a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild index 75d1cf6bdd6..ea6c8a363f1 100644 --- a/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild +++ b/media-plugins/vdr-zappilot/vdr-zappilot-0.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1318" # every bump new version DESCRIPTION="VDR Plugin: browse fast the EPG information without being forced to switch to a channel" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-zappilot"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-zappilot"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" KEYWORDS="amd64 x86"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-sudoku/
commit: a4e2efd87a7b8387db1e3755f4762319092e1d30 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:17:57 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e2efd8 media-plugins/vdr-sudoku: fix HOMEPAGE, use HTTPS media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild | 4 ++-- media-plugins/vdr-sudoku/vdr-sudoku-0.3.5.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild b/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild index 8e6c9cfb631..dc04d192114 100644 --- a/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild +++ b/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="280" # every bump, new version DESCRIPTION="VDR plugin: to generate and solve Number Place puzzles, so called Sudokus" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-sudoku"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-sudoku"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" LICENSE="GPL-2" diff --git a/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5.ebuild b/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5.ebuild index 3ea07733776..c85283ba566 100644 --- a/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5.ebuild +++ b/media-plugins/vdr-sudoku/vdr-sudoku-0.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="280" # every bump, new version DESCRIPTION="VDR plugin: to generate and solve Number Place puzzles, so called Sudokus" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-sudoku"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-sudoku"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: app-misc/lockfile-progs/
commit: 32c87b5824ad9a54816151bad2493c9d3a89b88c Author: Harri Nieminen gmail com> AuthorDate: Thu Mar 29 09:36:54 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:44:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c87b58 app-misc/lockfile-progs: Use https and update license Package-Manager: Portage-2.3.26, Repoman-2.3.7 app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild index da52cb8a740..2fb294180f2 100644 --- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild +++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=5 inherit toolchain-funcs DESCRIPTION="Programs to safely lock/unlock files and mailboxes" -HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"; +HOMEPAGE="https://packages.debian.org/sid/lockfile-progs"; SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86" IUSE="" @@ -30,5 +30,5 @@ src_compile() { src_install() { # Makefile has no notion of PREFIX, bindir, and the like - emake DESTDIR="${ED}" install || die + emake DESTDIR="${ED}" install }
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-infosatepg/
commit: 4ad2e485628d767e5ec6e6e2d4b7a1ec3a4a6813 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:13:05 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad2e485 media-plugins/vdr-infosatepg: fix HOMEPAGE, use HTTPS media-plugins/vdr-infosatepg/vdr-infosatepg-0.0.12.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/vdr-infosatepg/vdr-infosatepg-0.0.12.ebuild b/media-plugins/vdr-infosatepg/vdr-infosatepg-0.0.12.ebuild index cbb371e8ef6..fc68a59965b 100644 --- a/media-plugins/vdr-infosatepg/vdr-infosatepg-0.0.12.ebuild +++ b/media-plugins/vdr-infosatepg/vdr-infosatepg-0.0.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1098" # every bump, new version! DESCRIPTION="VDR Plugin: Reads the contents of infosat and writes the data into the EPG" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-infosatepg"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-infosatepg"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-text2skin/
commit: ad29bcaffa13d1bb71d7cf6b4fdc712c0469f2fc Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:16:39 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad29bcaf media-plugins/vdr-text2skin: fix HOMEPAGE, use HTTPS media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild index 88272279b7b..3ed16ca90fc 100644 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild +++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="783" # changes with every version / new file :-( DESCRIPTION="VDR text2skin PlugIn" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-text2skin"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-ttxtsubs/
commit: 3adb34cb3279f9ba8c9f4b18a0ed1221585aa5e0 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:17:11 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adb34cb media-plugins/vdr-ttxtsubs: fix HOMEPAGE, use HTTPS media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild index 0fa2c9d5a60..78c093d6260 100644 --- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild +++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1281" # every bump, new version! DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext based subtitles" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-ttxtsubs"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-ttxtsubs"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz" KEYWORDS="amd64 x86"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wai-test/
commit: eb6a674edb904b33dbbdf52069615b35c1a7ccf9 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:28:24 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6a674e dev-haskell/wai-test: use HTTPS dev-haskell/wai-test/wai-test-1.3.1.1.ebuild | 4 ++-- dev-haskell/wai-test/wai-test-2.0.0.2.ebuild | 4 ++-- dev-haskell/wai-test/wai-test-3.0.0.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild b/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild index 51fd4f338ff..950d9fe46bc 100644 --- a/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild +++ b/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Unit test framework (built on HUnit) for WAI applications" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild b/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild index 2064ea39c42..28fc047cbb1 100644 --- a/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild +++ b/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Unit test framework (built on HUnit) for WAI applications" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/wai-test/wai-test-3.0.0.ebuild b/dev-haskell/wai-test/wai-test-3.0.0.ebuild index 5e1a5bb85e2..37b1f3c28bc 100644 --- a/dev-haskell/wai-test/wai-test-3.0.0.ebuild +++ b/dev-haskell/wai-test/wai-test-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile" inherit haskell-cabal DESCRIPTION="Unit test framework (built on HUnit) for WAI applications. (deprecated)" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/yesod-test/
commit: 8005c69572169d41fb204da67fbfcc98732c8947 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:23:51 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8005c695 dev-haskell/yesod-test: use HTTPS Closes: https://github.com/gentoo/gentoo/pull/7697 dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild | 4 ++-- dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild | 4 ++-- dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild | 4 ++-- dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild | 4 ++-- dev-haskell/yesod-test/yesod-test-1.5.3.ebuild | 4 ++-- dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild index a6be1a1fd0d..fd9fd69f78b 100644 --- a/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild +++ b/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="integration testing for WAI/Yesod Applications" -HOMEPAGE="http://www.yesodweb.com"; +HOMEPAGE="https://www.yesodweb.com"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild index 4fb1e99360c..cfe7ce71b0b 100644 --- a/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild +++ b/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="integration testing for WAI/Yesod Applications" -HOMEPAGE="http://www.yesodweb.com"; +HOMEPAGE="https://www.yesodweb.com"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild index 6e444cc82b4..055470b6a33 100644 --- a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild +++ b/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="integration testing for WAI/Yesod Applications" -HOMEPAGE="http://www.yesodweb.com"; +HOMEPAGE="https://www.yesodweb.com"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild index 43924f96783..03fe40aaa98 100644 --- a/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild +++ b/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="integration testing for WAI/Yesod Applications" -HOMEPAGE="http://www.yesodweb.com"; +HOMEPAGE="https://www.yesodweb.com"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild index 86574431ea1..1204acdcc03 100644 --- a/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild +++ b/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="integration testing for WAI/Yesod Applications" -HOMEPAGE="http://www.yesodweb.com"; +HOMEPAGE="https://www.yesodweb.com"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild index 2d464c0aac4..169c2d47b51 100644 --- a/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild +++ b/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed u
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wavy/
commit: cfb606f2d147127190aff49f121f13b8b50f40ad Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:26:26 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb606f2 dev-haskell/wavy: use HTTPS dev-haskell/wavy/wavy-0.1.0.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-haskell/wavy/wavy-0.1.0.0.ebuild b/dev-haskell/wavy/wavy-0.1.0.0.ebuild index 002f595f618..f9e4129db05 100644 --- a/dev-haskell/wavy/wavy-0.1.0.0.ebuild +++ b/dev-haskell/wavy/wavy-0.1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Process WAVE files in Haskell" -HOMEPAGE="http://bitbucket.org/robertmassaioli/wavy"; +HOMEPAGE="https://bitbucket.org/robertmassaioli/wavy"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/yesod-core/
commit: 23f53b4f37ba0dd350634640072689db3976bdfa Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:25:48 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f53b4f dev-haskell/yesod-core: use HTTPS dev-haskell/yesod-core/yesod-core-1.2.7.ebuild| 4 ++-- dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild | 4 ++-- dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild | 4 ++-- dev-haskell/yesod-core/yesod-core-1.4.25.ebuild | 4 ++-- dev-haskell/yesod-core/yesod-core-1.4.31.ebuild | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild b/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild index 26f9ec8f127..1bee94895fa 100644 --- a/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild +++ b/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Creation of type-safe, RESTful web applications" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild index 001d8f48ec8..0781ee4384d 100644 --- a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild +++ b/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Creation of type-safe, RESTful web applications" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild index cf428deb139..f2f557cd59e 100644 --- a/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild +++ b/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Creation of type-safe, RESTful web applications" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild index 6f25d91670d..b27ecea9c27 100644 --- a/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild +++ b/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Creation of type-safe, RESTful web applications" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild index cd285ee8d2b..b9488828aba 100644 --- a/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild +++ b/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Creation of type-safe, RESTful web applications" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-osdteletext/
commit: c045fab4190e263f1beaf791f0359f8c541c7315 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:13:57 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c045fab4 media-plugins/vdr-osdteletext: fix HOMEPAGE, use HTTPS media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.4-r1.ebuild | 4 ++-- media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.5.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.4-r1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.4-r1.ebuild index 42afc668ae9..5def1ce5603 100644 --- a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.4-r1.ebuild +++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1282" # every bump, new version DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext on the OSD" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-osdteletext"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" SLOT="0" diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.5.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.5.ebuild index 074d772dbc7..51561695fcf 100644 --- a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.5.ebuild +++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit vdr-plugin-2 VERSION="1881" # every bump, new version DESCRIPTION="VDR Plugin: Osd-Teletext displays the teletext on the OSD" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-osdteletext"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-osdteletext"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-extrecmenu/
commit: 84c86073f2a8727e24af515d3407bc13b4c8feae Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:12:34 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c86073 media-plugins/vdr-extrecmenu: fix HOMEPAGE, use HTTPS media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild | 4 ++-- media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild index 290f0caff38..68be40df19f 100644 --- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild +++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ VERSION="936" #every bump, new version DVDARCHIVE="dvdarchive-2.3-beta.sh" DESCRIPTION="VDR Plugin: Extended recordings menu" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz mirror://gentoo/${DVDARCHIVE}.gz" diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild index 27adf4061c3..eff4a6b38b4 100644 --- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild +++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ VERSION="1783" #every bump, new version DVDARCHIVE="dvdarchive-2.3-beta.sh" DESCRIPTION="VDR Plugin: Extended recordings menu" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"; SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz mirror://gentoo/${DVDARCHIVE}.gz"
[gentoo-commits] repo/gentoo:master commit in: app-misc/lockfile-progs/
commit: 8b0edd342c4df0bd7b320bec478c942af50bf6d6 Author: Harri Nieminen gmail com> AuthorDate: Thu Mar 29 09:34:49 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:44:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0edd34 app-misc/lockfile-progs: Remove old Drops stable keywords for s390 and sh Package-Manager: Portage-2.3.26, Repoman-2.3.7 Closes: https://github.com/gentoo/gentoo/pull/7691 app-misc/lockfile-progs/Manifest | 1 - .../lockfile-progs/lockfile-progs-0.1.16.ebuild| 24 -- 2 files changed, 25 deletions(-) diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest index 04d94716a5b..6d11d55c2a7 100644 --- a/app-misc/lockfile-progs/Manifest +++ b/app-misc/lockfile-progs/Manifest @@ -1,2 +1 @@ -DIST lockfile-progs_0.1.16.tar.gz 155901 BLAKE2B e1bd7d3ac4e67fc4600c50486d353bb0b4bae37ee32513ecb3e5d943ab950b093461d167ae20ec61ef9561509eb31a89c34971114e463e3241206c069c73ce84 SHA512 374879dbfeb1f0e555a2fa0fa3ea77cbee0a70a492d52695b9b7bce284c0a8b7878978d64d6ec03d2cd6799f31a6a3e6bac7d00d857f90a08acda2e74ef6dee4 DIST lockfile-progs_0.1.17.tar.gz 14833 BLAKE2B 3e67aee40a8700c330eb8dd1f9ae3973d50f73825a3e176434586357e9bbb3db9d480f6a778d383c5dbaca03d3cde90291c7668e3b9bc425b93a0b53fa2b SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596 diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild deleted file mode 100644 index 78f70055774..000 --- a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -DESCRIPTION="Programs to safely lock/unlock files and mailboxes" -HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"; -SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc s390 sh sparc x86" -IUSE="" - -DEPEND="net-libs/liblockfile" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/main" - -src_prepare() { - # Provide better Makefile, with clear separation between compilation - # and installation. - cp "${FILESDIR}/Makefile" . || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/yesod-default/
commit: 5a59779639add92bd0eaeb905915e2ada9c7a8a2 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:24:17 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a597796 dev-haskell/yesod-default: use HTTPS dev-haskell/yesod-default/yesod-default-1.2.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild index 7a3164bdc84..50b2e68c1d2 100644 --- a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild +++ b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="Default config and main functions for your yesod application (deprecated)" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-sndctl/
commit: a2e4bcef0bdf3307b9759ca59265ebb130a17d65 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:15:37 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e4bcef media-plugins/vdr-sndctl: fix HOMEPAGE, use HTTPS media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild b/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild index 60d9210b29b..f3a4879127b 100644 --- a/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild +++ b/media-plugins/vdr-sndctl/vdr-sndctl-0.1.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,7 +7,7 @@ inherit vdr-plugin-2 DESCRIPTION="VDR plugin: Control the vol level of diff controls of your sound- card according to the settings of VDR" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-sndctl"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-sndctl"; SRC_URI="http://www.vdr-portal.de/board/attachment.php?attachmentid=25497 -> ${P}.tar.gz" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxde-common/files/
commit: c74a1cb8a57cf5cb2bbd76c40d838c8700eb624b Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Mar 28 20:33:33 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:38:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74a1cb8 lxde-base/lxde-common: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/7687 lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch | 14 -- 1 file changed, 14 deletions(-) diff --git a/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch b/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch deleted file mode 100644 index 129fb9a5b1a..000 --- a/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: lxde-common-0.5.5/Makefile.am -=== lxde-common-0.5.5.orig/Makefile.am -+++ lxde-common-0.5.5/Makefile.am -@@ -20,6 +20,9 @@ images_DATA= \ - images/logout-banner.png \ - images/lxde-icon.png - -+lxlogoutdir=$(datadir)/applications/ -+lxlogout_DATA=lxde-logout.desktop -+ - lxpaneldir=$(datadir)/lxpanel/profile/LXDE - lxpanel_DATA=lxpanel/config -
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/xml-hamlet/
commit: 4968fc93289ac81468b72d2039303d04c8d4fb96 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:27:07 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4968fc93 dev-haskell/xml-hamlet: use HTTPS dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild | 4 ++-- dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild index af97817c1cc..6724fd76eb4 100644 --- a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild +++ b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Hamlet-style quasiquoter for XML content" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild index 8b0ad28cce6..e796eb621fb 100644 --- a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild +++ b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="Hamlet-style quasiquoter for XML content" -HOMEPAGE="http://www.yesodweb.com/"; +HOMEPAGE="https://www.yesodweb.com/"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wai-app-static/
commit: 60587ae16c1b3fa9546e6ed4dd59632d005814ce Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:29:53 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60587ae1 dev-haskell/wai-app-static: use HTTPS dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild | 4 ++-- dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild | 4 ++-- dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild | 4 ++-- dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild | 4 ++-- dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild index e33472f2206..fac1660cf64 100644 --- a/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild +++ b/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="WAI application for static serving" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild b/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild index 2aaab2782ec..6b7dcfc70b7 100644 --- a/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild +++ b/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="WAI application for static serving" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild index f574684b4bb..8df2b47fcf8 100644 --- a/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild +++ b/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="WAI application for static serving" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild index ba5562b8147..270c79366a3 100644 --- a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild +++ b/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="WAI application for static serving" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild index 4a09acc624f..0a891f5c239 100644 --- a/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild +++ b/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal DESCRIPTION="WAI application for static serving" -HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"; +HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/sendfile/
commit: 7334fec0b36a1ac3291da3c5c1f174ad5a6b645e Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 18:30:57 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:36:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7334fec0 dev-haskell/sendfile: use HTTPS dev-haskell/sendfile/sendfile-0.7.9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-haskell/sendfile/sendfile-0.7.9.ebuild b/dev-haskell/sendfile/sendfile-0.7.9.ebuild index aea9e2a5f8c..983e0140d6b 100644 --- a/dev-haskell/sendfile/sendfile-0.7.9.ebuild +++ b/dev-haskell/sendfile/sendfile-0.7.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal DESCRIPTION="A portable sendfile library" -HOMEPAGE="http://hub.darcs.net/stepcut/sendfile"; +HOMEPAGE="https://hub.darcs.net/stepcut/sendfile"; SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-pvrinput/
commit: 9881ecbd70e137c26917443b962ea403e69db847 Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Mar 29 19:14:46 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:34:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9881ecbd media-plugins/vdr-pvrinput: fix HOMEPAGE, use HTTPS media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild b/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild index 2675045fcbd..bebc08091b5 100644 --- a/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild +++ b/media-plugins/vdr-pvrinput/vdr-pvrinput-2011.09.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,7 +6,7 @@ EAPI=5 inherit vdr-plugin-2 DESCRIPTION="VDR Plugin: Use a PVR* card as input device" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-pvrinput"; +HOMEPAGE="https://projects.vdr-developer.org/projects/plg-pvrinput"; SRC_URI="mirror://gentoo/vdr-pvrinput-2011.09.17.tgz" LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/
commit: 1e4aab7cf6539ac16335dfde1d83cd17ae2d1072 Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Mar 28 20:30:24 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:37:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4aab7c app-emulation/qemu: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/7686 .../qemu/files/qemu-2.11.-cflags.patch | 24 -- 1 file changed, 24 deletions(-) diff --git a/app-emulation/qemu/files/qemu-2.11.-cflags.patch b/app-emulation/qemu/files/qemu-2.11.-cflags.patch deleted file mode 100644 index 8d7c387851a..000 --- a/app-emulation/qemu/files/qemu-2.11.-cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ a/configure2018-02-01 22:51:53.068467555 + -+++ b/configure2018-02-01 22:52:23.965041387 + -@@ -5212,21 +5212,12 @@ fi - if test "$gcov" = "yes" ; then - CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" - LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" --elif test "$fortify_source" = "yes" ; then -- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" - elif test "$debug" = "yes"; then -- if compile_prog "-Og" ""; then -- CFLAGS="-Og $CFLAGS" -- elif compile_prog "-O1" ""; then -- CFLAGS="-O1 $CFLAGS" -- fi - # Workaround GCC false-positive Wuninitialized bugs with Og or O1: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=24639 - if cc_has_warning_flag "-Wno-maybe-uninitialized"; then - CFLAGS="-Wno-maybe-uninitialized $CFLAGS" - fi --else --CFLAGS="-O2 $CFLAGS" - fi - - ##
[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxde-icon-theme/
commit: a34092b324bf87eee27e1d3fd5ef96e933b1f607 Author: charIes17 arcor de> AuthorDate: Wed Mar 28 06:23:58 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 02:45:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34092b3 lxde-base/lxde-icon-theme: Remove old Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/7674 .../lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild | 19 --- 1 file changed, 19 deletions(-) diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild deleted file mode 100644 index 28d5a57d85e..000 --- a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -DESCRIPTION="nuoveXT2 iconset" -HOMEPAGE="http://lxde.sf.net/"; -SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux" -IUSE="" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext - !
[gentoo-commits] proj/portage:master commit in: repoman/man/
commit: 47a3f7e905b3ba252659fa1a98071d03a1560807 Author: zlg gentoo org> AuthorDate: Thu Mar 29 22:31:22 2018 + Commit: Zac Medico gentoo org> CommitDate: Fri Mar 30 02:31:44 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=47a3f7e9 repoman man/repoman.1: Add "BEHAVIOR" section (fix bug 650520) The manpage references "directory tree", but doesn't explicitly outline the expected behavior when run anywhere above the package directory level. Exact name of section, location within the manpage, and/or wording open to suggestions. Bug: https://bugs.gentoo.org/650520 Requested-by: zlg gentoo.org> Signed-off-by: zlg gentoo.org> repoman/man/repoman.1 | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/repoman/man/repoman.1 b/repoman/man/repoman.1 index db6526b5e..6a591e59d 100644 --- a/repoman/man/repoman.1 +++ b/repoman/man/repoman.1 @@ -1,4 +1,4 @@ -.TH "REPOMAN" "1" "Jun 2017" "Repoman VERSION" "Repoman" +.TH "REPOMAN" "1" "Mar 2018" "Repoman VERSION" "Repoman" .SH NAME repoman \- Gentoo's program to enforce a minimal level of quality assurance in packages added to the portage tree @@ -437,6 +437,12 @@ not directly. .B wxwidgets.eclassnotused Ebuild DEPENDs on x11-libs/wxGTK without inheriting wxwidgets.eclass. Refer to bug #305469 for more information. +.SH "BEHAVIOR" +When invoked from a level higher than a package directory, \fBrepoman\fR +will recurse through a directory tree and execute the given command +on a per\-package basis, e.g. \fBrepoman manifest\fR at the root of +the repository will generate manifests for every package within the +repository. .SH "REPORTING BUGS" Please report bugs via https://bugs.gentoo.org/ .SH AUTHORS
[gentoo-commits] proj/portage:master commit in: bin/, pym/portage/dbapi/
commit: cc0349c549b3024615fb8fb5c72c78b9509ee5bb Author: Zac Medico gentoo org> AuthorDate: Thu Mar 29 21:51:13 2018 + Commit: Zac Medico gentoo org> CommitDate: Thu Mar 29 22:33:42 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc0349c5 INSTALL_MASK: honor install time config for binary packages (bug 651952) For binary packages, honor the INSTALL_MASK configuration that exists at install time, since it might differ from the build time setting. Fixes: 3416876c0ee7 ("{,PKG_}INSTALL_MASK: python implementation") Bug: https://bugs.gentoo.org/651952 bin/misc-functions.sh| 23 +++ bin/phase-functions.sh | 10 +- pym/portage/dbapi/vartree.py | 5 + 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 26f589915..a6330ee93 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -323,6 +323,29 @@ postinst_qa_check() { done < <(printf "%s\0" "${qa_checks[@]}" | LC_ALL=C sort -u -z) } +preinst_mask() { + # Remove man pages, info pages, docs if requested. This is + # implemented in bash in order to respect INSTALL_MASK settings + # from bashrc. + local f x + for f in man info doc; do + if has no${f} ${FEATURES}; then + INSTALL_MASK+=" /usr/share/${f}" + fi + done + + # Store modified variables in build-info. + cd "${PORTAGE_BUILDDIR}"/build-info || die + set -f + + IFS=$' \t\n\r' + for f in INSTALL_MASK; do + x=$(echo -n ${!f}) + [[ -n ${x} ]] && echo "${x}" > "${f}" + done + set +f +} + preinst_sfperms() { if [ -z "${D}" ]; then eerror "${FUNCNAME}: D is unset" diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index bdae68f79..3de8d01b5 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -661,14 +661,6 @@ __dyn_install() { set -f local f x - # remove man pages, info pages, docs if requested - for f in man info doc; do - if has no${f} ${FEATURES} && \ - ! has "/usr/share/${f}" ${INSTALL_MASK}; then - INSTALL_MASK+=" /usr/share/${f}" - fi - done - IFS=$' \t\n\r' for f in CATEGORY DEFINED_PHASES FEATURES INHERITED IUSE \ PF PKGUSE SLOT KEYWORDS HOMEPAGE DESCRIPTION \ @@ -676,7 +668,7 @@ __dyn_install() { CXXFLAGS EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_CONFIGURE_OPTIONS \ QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE \ - INSTALL_MASK PKG_INSTALL_MASK; do + PKG_INSTALL_MASK; do x=$(echo -n ${!f}) [[ -n $x ]] && echo "$x" > $f diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 378d42dc0..a136c38f1 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3846,6 +3846,11 @@ class dblink(object): # be useful to avoid collisions in some scenarios. # We cannot detect if this is needed or not here as INSTALL_MASK can be # modified by bashrc files. + phase = MiscFunctionsProcess(background=False, + commands=["preinst_mask"], phase="preinst", + scheduler=self._scheduler, settings=self.settings) + phase.start() + phase.wait() try: with io.open(_unicode_encode(os.path.join(inforoot, "INSTALL_MASK"), encoding=_encodings['fs'], errors='strict'),
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/whitespace/
commit: c52890d4cac9bb8423a27d938b3604b79e3b0f4c Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:07:13 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c52890d4 repoman: New linechecks module, whitespace .../modules/linechecks/whitespace/__init__.py | 27 ++ .../repoman/modules/linechecks/whitespace/blank.py | 25 .../modules/linechecks/whitespace/whitespace.py| 21 + 3 files changed, 73 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py b/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py new file mode 100644 index 0..ded690ed7 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/whitespace/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Whitespace plug-in module for repoman LineChecks. +Performs checks for useless whitespace in ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'whitespace-check': { + 'name': "whitespace", + 'sourcefile': "whitespace", + 'class': "EbuildWhitespace", + 'description': doc, + }, + 'blankline-check': { + 'name': "blankline", + 'sourcefile': "blank", + 'class': "EbuildBlankLine", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/blank.py b/repoman/pym/repoman/modules/linechecks/whitespace/blank.py new file mode 100644 index 0..2ab4097a3 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/whitespace/blank.py @@ -0,0 +1,25 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildBlankLine(LineCheck): + repoman_check_name = 'ebuild.minorsyn' + ignore_comment = False + blank_line = re.compile(r'^$') + + def new(self, pkg): + self.line_is_blank = False + + def check(self, num, line): + if self.line_is_blank and self.blank_line.match(line): + return 'Useless blank line on line: %d' + if self.blank_line.match(line): + self.line_is_blank = True + else: + self.line_is_blank = False + + def end(self): + if self.line_is_blank: + yield 'Useless blank line on last line' diff --git a/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py b/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py new file mode 100644 index 0..556b2ab81 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/whitespace/whitespace.py @@ -0,0 +1,21 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildWhitespace(LineCheck): + """Ensure ebuilds have proper whitespacing""" + + repoman_check_name = 'ebuild.minorsyn' + + ignore_line = re.compile(r'(^$)|(^(\t)*#)') + ignore_comment = False + leading_spaces = re.compile(r'^[\S\t]') + trailing_whitespace = re.compile(r'.*([\S]$)') + + def check(self, num, line): + if self.leading_spaces.match(line) is None: + return self.errors['LEADING_SPACES_ERROR'] + if self.trailing_whitespace.match(line) is None: + return self.errors['TRAILING_WHITESPACE_ERROR']
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/
commit: e2e41bbd71c024ab34a87d5f6d9edea2e43fc713 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:10:13 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2e41bbd repoman: Remove the no longer used modules/scan/ebuild/checks.py repoman/pym/repoman/modules/scan/ebuild/checks.py | 1044 - 1 file changed, 1044 deletions(-) diff --git a/repoman/pym/repoman/modules/scan/ebuild/checks.py b/repoman/pym/repoman/modules/scan/ebuild/checks.py deleted file mode 100644 index de03bedd2..0 --- a/repoman/pym/repoman/modules/scan/ebuild/checks.py +++ /dev/null @@ -1,1044 +0,0 @@ -# -*- coding:utf-8 -*- -# repoman: Checks -# Copyright 2007-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -"""This module contains functions used in Repoman to ascertain the quality -and correctness of an ebuild.""" - -from __future__ import unicode_literals - -from itertools import chain -import operator -import re -import time - -# import our initialized portage instance -from repoman._portage import portage - -from portage.eapi import ( - eapi_supports_prefix, eapi_has_implicit_rdepend, - eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard, - eapi_exports_AA, eapi_has_pkg_pretend) - -from . import errors - - -class LineCheck(object): - """Run a check on a line of an ebuild.""" - """A regular expression to determine whether to ignore the line""" - ignore_line = False - """True if lines containing nothing more than comments with optional - leading whitespace should be ignored""" - ignore_comment = True - - def new(self, pkg): - pass - - def check_eapi(self, eapi): - """Returns if check should be run in the given EAPI (default: True)""" - return True - - def check(self, num, line): - """Run the check on line and return error if there is one""" - if self.re.match(line): - return self.error - - def end(self): - pass - - -class PhaseCheck(LineCheck): - """ basic class for function detection """ - - func_end_re = re.compile(r'^\}$') - phases_re = re.compile('(%s)' % '|'.join(( - 'pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare', - 'src_configure', 'src_compile', 'src_test', 'src_install', - 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', - 'pkg_config'))) - in_phase = '' - - def check(self, num, line): - m = self.phases_re.match(line) - if m is not None: - self.in_phase = m.group(1) - if self.in_phase != '' and self.func_end_re.match(line) is not None: - self.in_phase = '' - - return self.phase_check(num, line) - - def phase_check(self, num, line): - """ override this function for your checks """ - pass - - -class EbuildHeader(LineCheck): - """Ensure ebuilds have proper headers - Copyright header errors - CVS header errors - License header errors - - Args: - modification_year - Year the ebuild was last modified - """ - - repoman_check_name = 'ebuild.badheader' - - gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Foundation$' - gentoo_license = ( - '# Distributed under the terms' - ' of the GNU General Public License v2') - id_header_re = re.compile(r'.*\$(Id|Header)(:.*)?\$.*') - blank_line_re = re.compile(r'^$') - ignore_comment = False - - def new(self, pkg): - if pkg.mtime is None: - self.modification_year = r'2\d\d\d' - else: - self.modification_year = str(time.gmtime(pkg.mtime)[0]) - self.gentoo_copyright_re = re.compile( - self.gentoo_copyright % self.modification_year) - - def check(self, num, line): - if num > 2: - return - elif num == 0: - if not self.gentoo_copyright_re.match(line): - return errors.COPYRIGHT_ERROR - elif num == 1 and line.rstrip('\n') != self.gentoo_license: - return errors.LICENSE_ERROR - elif num == 2 and self.id_header_re.match(line): - return errors.ID_HEADER_ERROR - elif num == 2 and not self.blank_line_re.match(line): - return errors.NO_BLANK_LINE_ERROR - - -class EbuildWhitespace(LineCheck): - """Ensure ebuilds have proper whitespacing""" - - repoman_check_name = 'ebuild.minorsyn' - - ignore_line =
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/tests/
commit: e893506796c5bd4bd4a8f0543a23be955bfb4136 Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:49:26 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e8935067 repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E261 repoman/pym/repoman/tests/runTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 1795aa487..ca37b14b3 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -17,7 +17,7 @@ def debug_signal(signum, frame): pdb.set_trace() if platform.python_implementation() == 'Jython': - debug_signum = signal.SIGUSR2 # bug #424259 + debug_signum = signal.SIGUSR2 # bug #424259 else: debug_signum = signal.SIGUSR1
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/
commit: d94b56361df9b6ccf27fd325cc50de9a35fac8e8 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 19:29:26 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d94b5636 repoman scan/module.py: fix typo repoman/pym/repoman/modules/scan/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py index fc0c66ccb..cebc0e708 100644 --- a/repoman/pym/repoman/modules/scan/module.py +++ b/repoman/pym/repoman/modules/scan/module.py @@ -85,7 +85,7 @@ class ModuleConfig(object): if loop in self.controller.get_spec(mod, 'module_runsIn'): mlist.append(mod) except InvalidModuleName: - logging.error("ModuleConfig; unkown module: %s, skipping", mod) + logging.error("ModuleConfig; unknown module: %s, skipping", mod) logging.debug("ModuleConfig; mlist: %s", mlist) return mlist
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/tests/
commit: e91ace3e0bc52a9d5f587460ad053e93a8dbffdd Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:47:42 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e91ace3e repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E302 repoman/pym/repoman/tests/runTests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 3125ff058..1795aa487 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -11,6 +11,7 @@ import platform import pwd import signal + def debug_signal(signum, frame): import pdb pdb.set_trace()
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/metadata/, ...
commit: 287bab160e807b595fd12a606956644d7501ca48 Author: Brian Dolbec gentoo org> AuthorDate: Wed Aug 16 23:24:24 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=287bab16 repoman: Initial adding file/module/API version repoman/pym/repoman/config.py| 7 +-- repoman/pym/repoman/main.py | 3 +++ repoman/pym/repoman/modules/linechecks/assignment/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/config.py | 2 +- repoman/pym/repoman/modules/linechecks/depend/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/deprecated/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/do/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/eapi/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/emake/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/helpers/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/nested/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/patches/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/phases/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/portage/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/quotes/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/uri/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/use/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/useless/__init__.py | 3 ++- repoman/pym/repoman/modules/linechecks/whitespace/__init__.py| 3 ++- repoman/pym/repoman/modules/linechecks/workaround/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/depend/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/directories/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/eapi/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/ebuild/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/eclasses/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/fetch/__init__.py | 3 ++- repoman/pym/repoman/modules/scan/keywords/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/manifest/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/metadata/__init__.py| 3 ++- repoman/pym/repoman/modules/scan/module.py | 9 ++--- repoman/pym/repoman/modules/scan/options/__init__.py | 3 ++- repoman/pym/repoman/qa_data.py | 4 ++-- repoman/pym/repoman/repos.py | 2 +- repoman/pym/repoman/scanner.py | 3 ++- 35 files changed, 76 insertions(+), 38 deletions(-) diff --git a/repoman/pym/repoman/config.py b/repoman/pym/repoman/config.py index 9da30ed9e..0f2358cd9 100644 --- a/repoman/pym/repoman/config.py +++ b/repoman/pym/repoman/config.py @@ -144,8 +144,11 @@ def load_config(conf_dirs, file_extensions=None, valid_versions=None): if config: if config['version'] not in valid_versions: - raise ConfigError("Invalid file version: %s in: %s\nPlease upgrade repoman: current valid versions: %s" - % (config['version'], filename, valid_versions)) + raise ConfigError( + "Invalid file version: %s in: %s\nPlease upgrade to " + ">=app-portage/repoman-%s, current valid API versions: %s" + % (config['version'], filename, + config['repoman_version'], valid_versions)) result = merge_config(result, config) return result diff --git a/repoman/pym/repoman/main.py b/repoman/pym/repoman/main.py index c1e3b99fe..81e2ff61e 100755 --- a/repoman/pym/repoman/main.py +++ b/repoman/pym/repoman/main.py @@ -47,10 +47,12 @@ os.umask(0o22) LOGLEVEL = logging.WARNING portage.util.initialize_logger(LOGLEVEL) +VALID_VERSIONS = [1,] def repoman_main(argv): config_root = os.environ.get("PORTAGE_CONFIGROOT") repoman_settings = portage.config(config_root=config_root, local_config=False) + repoman_settings.valid_versions = VALID_VERSIONS if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \ repoman_settings.get('TERM') == 'dumb' or \ @@ -92,6 +94,7 @@ def repoman_main(argv): config_root, portdir, portdir_overlay, repoman_settings, vcs_settings, options, qadata) repoman_settings = repo_settings.repoman_settings + repom
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/tests/
commit: ab00fed95fdffeceb8968fa733284910b59220f3 Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:46:28 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ab00fed9 repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E401 repoman/pym/repoman/tests/runTests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 759abdd82..3125ff058 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -3,7 +3,8 @@ # Copyright 2006-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import os, sys +import os +import sys import os.path as osp import grp import platform
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/tests/
commit: 09196ccf2d79f9eef2ce8618d74bc53e124eb21d Author: El Acheche Anis ubuntu com> AuthorDate: Mon Jul 24 04:50:07 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=09196ccf repoman: repoman/pym/repoman/tests/runTests.py: Fix PEP8 E226 repoman/pym/repoman/tests/runTests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index ca37b14b3..b0e715ec6 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -35,7 +35,7 @@ repoman_pym = osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__ sys.path.insert(0, repoman_pym) # Add in the parent portage python modules -portage_pym = osp.dirname(osp.dirname(repoman_pym))+'/pym' +portage_pym = osp.dirname(osp.dirname(repoman_pym)) + '/pym' sys.path.insert(0, portage_pym) # import our centrally initialized portage instance
[gentoo-commits] proj/portage:repoman commit in: /
commit: 95a1a0d7ca46594c3cb4f7ab578ad5b984fe3243 Author: El Acheche Anis ubuntu com> AuthorDate: Wed Jul 26 22:20:56 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=95a1a0d7 repoman: .travis.yml: pyyaml python module is needed for builds .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ebcfbeab9..94ed2dcb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ install: - "[[ ${TRAVIS_PYTHON_VERSION} == 3.[6789] ]] || pip install pyblake2" # always install pygost for Streebog - pip install pygost +# pyyaml is needed for building +- pip install pyyaml script: - printf "[build_ext]\nportage-ext-modules=true" >> setup.cfg
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/, repoman/cnf/linechecks/
commit: 96c4c7ea02f5b908b09336365c04aa206d69a13b Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 18:17:15 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=96c4c7ea repoman linechecks/config.py: Move the errors loading to a new /usr/share/repoman/linechecks directory This new directory can be installed to by third party add on modules that extend the checks. We can also in future use these file to get loaclized translations. repoman/cnf/linechecks/linechecks.yaml | 35 repoman/pym/repoman/modules/linechecks/config.py | 19 +++-- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/repoman/cnf/linechecks/linechecks.yaml b/repoman/cnf/linechecks/linechecks.yaml new file mode 100644 index 0..634381e80 --- /dev/null +++ b/repoman/cnf/linechecks/linechecks.yaml @@ -0,0 +1,35 @@ +--- +# linecheck_help.yaml + +# Repoman API version (do not edit) +version: 1 +# minimum +repoman_version: 2.3.3 + +# configuration file for the LineCheck plugins run via the multicheck +# scan module +errors: +COPYRIGHT_ERROR: 'Invalid Gentoo Copyright on line: %d' +LICENSE_ERROR: 'Invalid Gentoo/GPL License on line: %d' +ID_HEADER_ERROR: 'Stale CVS header on line: %d' +NO_BLANK_LINE_ERROR: 'Non-blank line after header on line: %d' +LEADING_SPACES_ERROR: 'Ebuild contains leading spaces on line: %d' +TRAILING_WHITESPACE_ERROR: 'Trailing whitespace error on line: %d' +READONLY_ASSIGNMENT_ERROR: 'Ebuild contains assignment to read-only variable on line: %d' +MISSING_QUOTES_ERROR: 'Unquoted Variable on line: %d' +NESTED_DIE_ERROR: 'Ebuild calls die in a subshell on line: %d' +PATCHES_ERROR: 'PATCHES is not a bash array on line: %d' +REDUNDANT_CD_S_ERROR: 'Ebuild has redundant cd ${S} statement on line: %d' +EMAKE_PARALLEL_DISABLED: 'Upstream parallel compilation bug (ebuild calls emake -j1 on line: %d)' +EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS: 'Upstream parallel compilation bug (MAKEOPTS=-j1 on line: %d)' +DEPRECATED_BINDNOW_FLAGS: 'Deprecated bindnow-flags call on line: %d' +EAPI_DEFINED_AFTER_INHERIT: 'EAPI defined after inherit on line: %d' +NO_AS_NEEDED: 'Upstream asneeded linking bug (no-as-needed on line: %d)' +PRESERVE_OLD_LIB: 'Ebuild calls deprecated preserve_old_lib on line: %d' +BUILT_WITH_USE: 'built_with_use on line: %d' +NO_OFFSET_WITH_HELPERS: 'Helper function is used with D, ROOT, ED, EROOT or EPREFIX on line: %d' +SANDBOX_ADDPREDICT: 'Ebuild calls addpredict on line: %d' +USEQ_ERROR: 'Ebuild calls deprecated useq function on line: %d' +HASQ_ERROR: 'Ebuild calls deprecated hasq function on line: %d' +URI_HTTPS: 'Ebuild uses http:// but should use https:// on line: %d' + diff --git a/repoman/pym/repoman/modules/linechecks/config.py b/repoman/pym/repoman/modules/linechecks/config.py index 9190b18cf..96a27ac49 100644 --- a/repoman/pym/repoman/modules/linechecks/config.py +++ b/repoman/pym/repoman/modules/linechecks/config.py @@ -15,6 +15,7 @@ from copy import deepcopy from repoman._portage import portage from repoman.config import load_config +from repoman import _not_installed # Avoid a circular import issue in py2.7 portage.proxy.lazyimport.lazyimport(globals(), @@ -46,8 +47,7 @@ class LineChecksConfig(object): @param configpaths: ordered list of filepaths to load ''' self.repo_settings = repo_settings - self.infopaths = [os.path.join(path, 'linechecks.yaml') for path in self.repo_settings.masters_list] - logging.debug("LineChecksConfig; configpaths: %s", self.infopaths) + self.infopaths = None self.info_config = None self._config = None self.usex_supported_eapis = None @@ -58,8 +58,22 @@ class LineChecksConfig(object): self.eclass_info = {} self.eclass_info_experimental_inherit = {} self.errors = {} + self.set_infopaths() self.load_checks_info() + def set_infopaths(self): + if _not_installed: + cnfdir = os.path.realpath(os.path.join(os.path.dirname( + os.path.dirname(os.path.dirname(os.path.dirname( + os.path.dirname(__file__), 'cnf/linechecks')) + else: + cnfdir = os.path.join(portage.const.EPREFIX or '/', 'usr/share/repoman/linechecks') + repomanpaths = [os.path.join(cnfdir, _file_) for _file_ in os.listdir(cnfdir)] + logging.debug("LineChecksConfig; repomanpaths: %s", repomanpaths) + repopaths = [os.path.join(path, 'linechecks.yaml') for path in self.repo_settings.masters_list] + self.infopaths = repomanpaths +
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/portage/
commit: ee1a1b4621b2a276d228014a57d4a25ca90575b0 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:04:00 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee1a1b46 repoman: New linechecks module, portage .../repoman/modules/linechecks/portage/__init__.py | 27 .../repoman/modules/linechecks/portage/internal.py | 37 ++ 2 files changed, 64 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/portage/__init__.py b/repoman/pym/repoman/modules/linechecks/portage/__init__.py new file mode 100644 index 0..d390c6054 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/portage/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Portage plug-in module for repoman LineChecks. +Performs checks for internal portage variable usage in ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'internal-check': { + 'name': "portageinternal", + 'sourcefile': "internal", + 'class': "PortageInternal", + 'description': doc, + }, + 'portageinternalvariableassignment-check': { + 'name': "portageinternalvariableassignment", + 'sourcefile': "internal", + 'class': "PortageInternalVariableAssignment", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/portage/internal.py b/repoman/pym/repoman/modules/linechecks/portage/internal.py new file mode 100644 index 0..869337221 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/portage/internal.py @@ -0,0 +1,37 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class PortageInternal(LineCheck): + repoman_check_name = 'portage.internal' + ignore_comment = True + # Match when the command is preceded only by leading whitespace or a shell + # operator such as (, {, |, ||, or &&. This prevents false positives in + # things like elog messages, as reported in bug #413285. + + internal_portage_func_or_var = ( + 'ecompress|ecompressdir|env-update|prepall|prepalldocs|preplib') + re = re.compile( + r'^(\s*|.*[|&{(]+\s*)\b(%s)\b' % internal_portage_func_or_var) + + def check(self, num, line): + """Run the check on line and return error if there is one""" + m = self.re.match(line) + if m is not None: + return ("'%s'" % m.group(2)) + " called on line: %d" + + +class PortageInternalVariableAssignment(LineCheck): + repoman_check_name = 'portage.internal' + internal_assignment = re.compile( + r'\s*(export\s+)?(EXTRA_ECONF|EXTRA_EMAKE)\+?=') + + def check(self, num, line): + match = self.internal_assignment.match(line) + e = None + if match is not None: + e = 'Assignment to variable %s' % match.group(2) + e += ' on line: %d' + return e
[gentoo-commits] proj/portage:repoman commit in: pym/portage/
commit: 4333abb4c54ba81b1622c3cd951ae8aacf8e4560 Author: Brian Dolbec gentoo org> AuthorDate: Thu Aug 17 01:50:21 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4333abb4 module.py: Extend the module loader for API version checking If provided with an iterable of compatibility versions, The controller will check the plugin modules module_spec 'version' variable is compatible with the base application. pym/portage/module.py | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pym/portage/module.py b/pym/portage/module.py index c79e65518..bd7c94d4e 100644 --- a/pym/portage/module.py +++ b/pym/portage/module.py @@ -15,6 +15,10 @@ class InvalidModuleName(PortageException): """An invalid or unknown module name.""" +class ModuleVersionError(PortageException): + '''An incompatible module version''' + + class Module(object): """Class to define and hold our plug-in module @@ -87,16 +91,17 @@ class Modules(object): @param namepath: Python import path to the "modules" directory """ - def __init__(self, path, namepath): + def __init__(self, path, namepath, compat_versions=None): self._module_path = path self._namepath = namepath + self.compat_versions = compat_versions self.parents = [] self._modules = self._get_all_modules() self.modules = ProtectedDict(self._modules) self.module_names = sorted(self._modules) def _get_all_modules(self): - """scans the emaint modules dir for loadable modules + """scans the _module_path dir for loadable modules @rtype: dictionary of module_plugins """ @@ -117,6 +122,7 @@ class Modules(object): kids = {} for entry in importables: new_module = Module(entry, self._namepath) + self._check_compat(new_module) for module_name in new_module.kids: kid = new_module.kids[module_name] kid['parent'] = new_module @@ -211,6 +217,8 @@ class Modules(object): @type modname: string @param modname: the module class name + @type var: string + @param var: the base level variable to return @type dictionary @return: the modules class exported options descriptions """ @@ -220,3 +228,13 @@ class Modules(object): raise InvalidModuleName( "Module name '%s' is invalid or not found" % modname) return value + + def _check_compat(self, module): + if self.compat_versions: + if not module.module_spec['version'] in self.compat_versions: + raise ModuleVersionError( + "Error loading '%s' plugin module: %s, version: %s\n" + "Module is not compatible with the current application version\n" + "Compatible module API versions are: %s" + % (self._namepath, module.module_spec['name'], + module.module_spec['version'], self.compat_versions))
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/, repoman/cnf/qa_data/
commit: 1a251341eb244cb84028f9e3892cefb283c04f36 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 18:16:44 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1a251341 repoman qa_data.py: Move the qahelp loading to a new /usr/share/repoman/qa_data directory This new directory can be installed to by third party add on modules that extend the checks. We can also in future use these file to get loaclized translations. repoman/cnf/qa_data/qa_data.yaml | 139 +++ repoman/pym/repoman/qa_data.py | 19 +- 2 files changed, 155 insertions(+), 3 deletions(-) diff --git a/repoman/cnf/qa_data/qa_data.yaml b/repoman/cnf/qa_data/qa_data.yaml new file mode 100644 index 0..c9fa2c024 --- /dev/null +++ b/repoman/cnf/qa_data/qa_data.yaml @@ -0,0 +1,139 @@ +--- +# qa_help.yaml + +# configuration file for the LineCheck plugins run via the multicheck +# scan module + +# Repoman API version (do not edit) +version: 1 +# minimum +repoman_version: 2.3.3 + +# qahelp: Primary QA help messages to describe the errors or warnings +# Dictionary +qahelp: +Entries: +IO_error: "Attempting to commit, and an IO error was encountered access the Entries file" +changelog: +ebuildadded: "An ebuild was added but the ChangeLog was not modified" +missing: "Missing ChangeLog files" +notadded: "ChangeLogs that exist but have not been added to cvs" +dependency: +bad: "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds)" +badmasked: "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds)" +badindev: "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in developing arch" +badmaskedindev: "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in developing arch" +badinexp: "User-visible ebuilds with unsatisfied dependencies (matched against *visible* ebuilds) in experimental arch" +badmaskedinexp: "Masked ebuilds with unsatisfied dependencies (matched against *all* ebuilds) in experimental arch" +badtilde: "Uses the ~ dep operator with a non-zero revision part, which is useless (the revision is ignored)" +missingslot: "RDEPEND matches more than one SLOT but does not specify a slot and/or use the := or :* slot operator" +perlcore: "This ebuild directly depends on a package in perl-core; it should use the corresponding virtual instead." +syntax: "Syntax error in dependency string (usually an extra/missing space/parenthesis)" +unknown: "Ebuild has a dependency that refers to an unknown package (which may be valid if it is a blocker for a renamed/removed package, or is an alternative choice provided by an overlay)" +badslotop: "RDEPEND contains ':=' slot operator under '||' dependency." +DESCRIPTION: +missing: "Ebuilds that have a missing or empty DESCRIPTION variable" +toolong: "DESCRIPTION is over %d characters" +digest: +assumed: "Existing digest must be assumed correct (Package level only)" +missing: "Some files listed in SRC_URI aren't referenced in the Manifest" +unused: "Some files listed in the Manifest aren't referenced in SRC_URI" +EAPI: +definition: "EAPI definition does not conform to PMS section 7.3.1 (first non-comment, non-blank line)" +deprecated: "Ebuilds that use features that are deprecated in the current EAPI" +incompatible: "Ebuilds that use features that are only available with a different EAPI" +unsupported: "Ebuilds that have an unsupported EAPI version (you must upgrade portage)" +ebuild: +absdosym: "This ebuild uses absolute target to dosym where relative symlink could be used instead" +badheader: "This ebuild has a malformed header" +invalidname: "Ebuild files with a non-parseable or syntactically incorrect name (or using 2.1 versioning extensions)" +majorsyn: "This ebuild has a major syntax error that may cause the ebuild to fail partially or fully" +minorsyn: "This ebuild has a minor syntax error that contravenes gentoo coding style" +namenomatch: "Ebuild files that do not have the same name as their parent directory" +notadded: "Ebuilds that exist but have not been added to the vcs" +nesteddie: "Placing 'die' inside ( ) prints an error, but doesn't stop the ebuild." +output: "A simple sourcing of the ebuild produces output; this breaks ebuild policy." +patches: "PATCHES variable should be a bash array to ensure white space safety" +syntax: "Error generating cache entry for ebuild; typically caused by ebuild syntax error or digest verification failure" +file: +executable: "Ebuilds, digests,
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/patches/
commit: e9543034a931728ca96f0228213fa42844f4e0e7 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:02:58 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e9543034 repoman: New linechecks module, patches .../repoman/modules/linechecks/patches/__init__.py | 21 + .../repoman/modules/linechecks/patches/patches.py | 16 2 files changed, 37 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/patches/__init__.py b/repoman/pym/repoman/modules/linechecks/patches/__init__.py new file mode 100644 index 0..67434f911 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/patches/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Patches plug-in module for repoman LineChecks. +Performs PATCHES variable checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'patches-check': { + 'name': "patches", + 'sourcefile': "patches", + 'class': "EbuildPatches", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/patches/patches.py b/repoman/pym/repoman/modules/linechecks/patches/patches.py new file mode 100644 index 0..63651cd7c --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/patches/patches.py @@ -0,0 +1,16 @@ + + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildPatches(LineCheck): + """Ensure ebuilds use bash arrays for PATCHES to ensure white space safety""" + repoman_check_name = 'ebuild.patches' + re = re.compile(r'^\s*PATCHES=[^\(]') + error = 'PATCHES_ERROR' + + def check_eapi(self, eapi): + return eapi in ("0", "1", "2", "3", "4", "4-python", + "4-slot-abi", "5", "5-hdepend", "5-progress")
[gentoo-commits] proj/portage:repoman commit in: repoman/
commit: 31e90868cd7f2b78d6f4c0ca400314048c2b4868 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 5 18:22:33 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:47 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=31e90868 repoman setup.py: Add the new cnf/qa_data cnf/linechecks items repoman/setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repoman/setup.py b/repoman/setup.py index aaf10cdb5..9ac58ef35 100755 --- a/repoman/setup.py +++ b/repoman/setup.py @@ -479,6 +479,8 @@ setup( data_files = list(get_manpages()) + [ ['$docdir', ['NEWS', 'RELEASE-NOTES']], + ['share/repoman/qa_data', ['cnf/qa_data/qa_data.yaml']], + ['share/repoman/linechecks', ['cnf/linechecks/linechecks.yaml']], ], cmdclass = {
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/uri/
commit: d6a80ae7971c995ff770a36793f0d0ed6a13b7a1 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:05:03 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d6a80ae7 repoman: New linechecks module, uri .../pym/repoman/modules/linechecks/uri/__init__.py | 21 +++ repoman/pym/repoman/modules/linechecks/uri/uri.py | 30 ++ 2 files changed, 51 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/uri/__init__.py b/repoman/pym/repoman/modules/linechecks/uri/__init__.py new file mode 100644 index 0..a7731e3cc --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/uri/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Uri plug-in module for repoman LineChecks. +Performs HOMEPAGE variable checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'httpsuri-check': { + 'name': "httpsuri", + 'sourcefile': "uri", + 'class': "UriUseHttps", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/uri/uri.py b/repoman/pym/repoman/modules/linechecks/uri/uri.py new file mode 100644 index 0..1a0afe682 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/uri/uri.py @@ -0,0 +1,30 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class UriUseHttps(LineCheck): + """Check that we use https:// for known good sites.""" + repoman_check_name = 'uri.https' + _SITES = ( + '([-._a-zA-Z0-9]*\.)?apache\.org', + '((alioth|packages(\.qa)?|people|www)\.)?debian\.org', + # Most FDO sites support https, but not all (like tango). + # List the most common ones here for now. + '((anongit|bugs|cgit|dri|patchwork|people|specifications|www|xcb|xorg)\.)?freedesktop\.org', + '((bugs|dev|wiki|www)\.)?gentoo\.org', + '((wiki)\.)?github\.(io|com)', + 'savannah\.(non)?gnu\.org', + '((gcc|www)\.)?gnu\.org', + 'curl\.haxx\.se', + '((bugzilla|git|mirrors|patchwork|planet|www(\.wiki)?)\.)?kernel\.org', + '((bugs|wiki|www)\.)?linuxfoundation\.org', + '((docs|pypi|www)\.)?python\.org', + '(sf|sourceforge)\.net', + '(www\.)?(enlightenment|sourceware|x)\.org', + ) + # Try to anchor the end of the URL so we don't get false positives + # with http://github.com.foo.bar.com/. Unlikely, but possible. + re = re.compile(r'.*\bhttp://(%s)(\s|["\'/]|$)' % r'|'.join(_SITES)) + error = 'URI_HTTPS'
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/scan/ebuild/, repoman/pym/repoman/
commit: dec86d1bc9b9f200ff95434e03208a9504b20d60 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:09:03 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=dec86d1b repoman: Convert multicheck module to the new linechecks sub-module repoman/pym/repoman/modules/scan/ebuild/__init__.py | 2 +- repoman/pym/repoman/modules/scan/ebuild/multicheck.py | 10 +++--- repoman/pym/repoman/scanner.py| 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/repoman/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py index 3e1d31951..1d8ec1941 100644 --- a/repoman/pym/repoman/modules/scan/ebuild/__init__.py +++ b/repoman/pym/repoman/modules/scan/ebuild/__init__.py @@ -47,7 +47,7 @@ module_spec = { 'functions': ['check'], 'func_kwargs': { }, - 'mod_kwargs': ['qatracker', 'options' + 'mod_kwargs': ['qatracker', 'options', 'repo_settings', 'linechecks', ], 'func_kwargs': { 'ebuild': (None, None), diff --git a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py index 9e36e2a68..94526ae9e 100644 --- a/repoman/pym/repoman/modules/scan/ebuild/multicheck.py +++ b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py @@ -8,7 +8,7 @@ import io from portage import _encodings, _unicode_encode from repoman.modules.scan.scanbase import ScanBase -from .checks import run_checks, checks_init +from repoman.modules.linechecks.controller import LineCheckController class MultiCheck(ScanBase): @@ -22,7 +22,11 @@ class MultiCheck(ScanBase): ''' self.qatracker = kwargs.get('qatracker') self.options = kwargs.get('options') - checks_init(self.options.experimental_inherit == 'y') + self.controller = LineCheckController( + kwargs.get('repo_settings'), + kwargs.get('linechecks') + ) + self.controller.checks_init(self.options.experimental_inherit == 'y') def check(self, **kwargs): '''Check the ebuild for utf-8 encoding @@ -40,7 +44,7 @@ class MultiCheck(ScanBase): errors='strict'), mode='r', encoding=_encodings['repo.content']) try: - for check_name, e in run_checks(f, pkg): + for check_name, e in self.controller.run_checks(f, pkg): self.qatracker.add_error( check_name, ebuild.relative_path + ': %s' % e) finally: diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py index b3d030570..d61e50131 100644 --- a/repoman/pym/repoman/scanner.py +++ b/repoman/pym/repoman/scanner.py @@ -193,6 +193,7 @@ class Scanner(object): "env": self.env, "have": self.have, "dev_keywords": self.dev_keywords, + "linechecks": self.moduleconfig.linechecks, } # initialize the plugin checks here self.modules = {}
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/phases/
commit: 2500cb29f76c26df359ec3bca92cca36aec3a364 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:03:33 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2500cb29 repoman: New linechecks module, phases .../repoman/modules/linechecks/phases/__init__.py | 34 +++ .../pym/repoman/modules/linechecks/phases/phase.py | 71 ++ 2 files changed, 105 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/phases/__init__.py b/repoman/pym/repoman/modules/linechecks/phases/__init__.py new file mode 100644 index 0..476443b25 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/phases/__init__.py @@ -0,0 +1,34 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Phases plug-in module for repoman LineChecks. +Performs phase dependant checks on ebuilds using a PhaseCheck base class. +""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'emakeparallel-check': { + 'name': "emakeparallel", + 'sourcefile': "phase", + 'class': "EMakeParallelDisabled", + 'description': doc, + }, + 'srccompileeconf-check': { + 'name': "srccompileeconf", + 'sourcefile': "phase", + 'class': "SrcCompileEconf", + 'description': doc, + }, + 'srcunpackpatches-check': { + 'name': "srcunpackpatches", + 'sourcefile': "phase", + 'class': "SrcUnpackPatches", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/phases/phase.py b/repoman/pym/repoman/modules/linechecks/phases/phase.py new file mode 100644 index 0..acc3a1e1d --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/phases/phase.py @@ -0,0 +1,71 @@ + +import re + +from portage.eapi import eapi_has_src_prepare_and_src_configure +from repoman.modules.linechecks.base import LineCheck + + +class PhaseCheck(LineCheck): + """ basic class for function detection """ + + func_end_re = re.compile(r'^\}$') + phases_re = re.compile('(%s)' % '|'.join(( + 'pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare', + 'src_configure', 'src_compile', 'src_test', 'src_install', + 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', + 'pkg_config'))) + in_phase = '' + + def check(self, num, line): + m = self.phases_re.match(line) + if m is not None: + self.in_phase = m.group(1) + if self.in_phase != '' and self.func_end_re.match(line) is not None: + self.in_phase = '' + + return self.phase_check(num, line) + + def phase_check(self, num, line): + """ override this function for your checks """ + pass + + +class EMakeParallelDisabled(PhaseCheck): + """Check for emake -j1 calls which disable parallelization.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'^\s*emake\s+.*-j\s*1\b') + + def phase_check(self, num, line): + if self.in_phase == 'src_compile' or self.in_phase == 'src_install': + if self.re.match(line): + return self.errors['EMAKE_PARALLEL_DISABLED'] + + +class SrcCompileEconf(PhaseCheck): + repoman_check_name = 'ebuild.minorsyn' + configure_re = re.compile(r'\s(econf|./configure)') + + def check_eapi(self, eapi): + return eapi_has_src_prepare_and_src_configure(eapi) + + def phase_check(self, num, line): + if self.in_phase == 'src_compile': + m = self.configure_re.match(line) + if m is not None: + return ("'%s'" % m.group(1)) + \ + " call should be moved to src_configure from line: %d" + + +class SrcUnpackPatches(PhaseCheck): + repoman_check_name = 'ebuild.minorsyn' + src_prepare_tools_re = re.compile(r'\s(e?patch|sed)\s') + + def check_eapi(self, eapi): + return eapi_has_src_prepare_and_src_configure(eapi) + + def phase_check(self, num, line): + if self.in_phase == 'src_unpack': + m = self.src_prepare_tools_re.search(line) + if m is not None: + return ("'%s'" % m.group(1)) + \ + " call should be moved to src_prepare from line: %d"
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/gentoo_header/
commit: 921078cfc279df30c2982f9516c0998a12505c2d Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:01:04 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=921078cf repoman: New linechecks module, gentoo_header .../modules/linechecks/gentoo_header/__init__.py | 21 ++ .../modules/linechecks/gentoo_header/header.py | 49 ++ 2 files changed, 70 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py b/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py new file mode 100644 index 0..b80a83ecf --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/gentoo_header/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Gentoo-header plug-in module for repoman LineChecks. +Performs header checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'header-check': { + 'name': "gentooheader", + 'sourcefile': "header", + 'class': "EbuildHeader", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py b/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py new file mode 100644 index 0..4b75fc4b5 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/gentoo_header/header.py @@ -0,0 +1,49 @@ + +import re +import time + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildHeader(LineCheck): + """Ensure ebuilds have proper headers + Copyright header errors + CVS header errors + License header errors + + Args: + modification_year - Year the ebuild was last modified + """ + + repoman_check_name = 'ebuild.badheader' + + gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Foundation$' + gentoo_license = ( + '# Distributed under the terms' + ' of the GNU General Public License v2') + id_header_re = re.compile(r'.*\$(Id|Header)(:.*)?\$.*') + blank_line_re = re.compile(r'^$') + ignore_comment = False + + def new(self, pkg): + if pkg.mtime is None: + self.modification_year = r'2\d\d\d' + else: + self.modification_year = str(time.gmtime(pkg.mtime)[0]) + self.gentoo_copyright_re = re.compile( + self.gentoo_copyright % self.modification_year) + + def check(self, num, line): + if num > 2: + return + elif num == 0: + if not self.gentoo_copyright_re.match(line): + return self.errors['COPYRIGHT_ERROR'] + elif num == 1 and line.rstrip('\n') != self.gentoo_license: + return self.errors['LICENSE_ERROR'] + elif num == 2 and self.id_header_re.match(line): + return self.errors['ID_HEADER_ERROR'] + elif num == 2 and not self.blank_line_re.match(line): + return self.errors['NO_BLANK_LINE_ERROR'] + +
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/helpers/
commit: 176b456c8725432346affcfdbbd449203c308d88 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:01:52 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=176b456c repoman: New linechecks module, helpers .../repoman/modules/linechecks/helpers/__init__.py | 21 + .../repoman/modules/linechecks/helpers/offset.py | 22 ++ 2 files changed, 43 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/helpers/__init__.py b/repoman/pym/repoman/modules/linechecks/helpers/__init__.py new file mode 100644 index 0..e2d12afe4 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/helpers/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Helpers plug-in module for repoman LineChecks. +Performs variable helpers checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'nooffset-check': { + 'name': "nooffset", + 'sourcefile': "offset", + 'class': "NoOffsetWithHelpers", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/helpers/offset.py b/repoman/pym/repoman/modules/linechecks/helpers/offset.py new file mode 100644 index 0..5d7624a68 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/helpers/offset.py @@ -0,0 +1,22 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class NoOffsetWithHelpers(LineCheck): + """ Check that the image location, the alternate root offset, and the + offset prefix (D, ROOT, ED, EROOT and EPREFIX) are not used with + helpers """ + + repoman_check_name = 'variable.usedwithhelpers' + # Ignore matches in quoted strings like this: + # elog "installed into ${ROOT}usr/share/php5/apc/." + _install_funcs = ( + 'docinto|do(compress|dir|hard)' + '|exeinto|fowners|fperms|insinto|into') + _quoted_vars = 'D|ROOT|ED|EROOT|EPREFIX' + re = re.compile( + r'^[^#"\']*\b(%s)\s+"?\$\{?(%s)\b.*' % + (_install_funcs, _quoted_vars)) + error = 'NO_OFFSET_WITH_HELPERS'
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/workaround/
commit: 33c77aa6fdf90334ad726504e615a065c6947cf0 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:07:59 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=33c77aa6 repoman: New linechecks module, workaround .../modules/linechecks/workaround/__init__.py | 27 ++ .../modules/linechecks/workaround/workarounds.py | 18 +++ 2 files changed, 45 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/workaround/__init__.py b/repoman/pym/repoman/modules/linechecks/workaround/__init__.py new file mode 100644 index 0..0b5aa70c8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/workaround/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Workaround plug-in module for repoman LineChecks. +Performs checks for upstream workarounds in ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'addpredict-check': { + 'name': "addpredict", + 'sourcefile': "workarounds", + 'class': "SandboxAddpredict", + 'description': doc, + }, + 'noasneeded-check': { + 'name': "noasneeded", + 'sourcefile': "workarounds", + 'class': "NoAsNeeded", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py b/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py new file mode 100644 index 0..37cb54314 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/workaround/workarounds.py @@ -0,0 +1,18 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class NoAsNeeded(LineCheck): + """Check for calls to the no-as-needed function.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'.*\$\(no-as-needed\)') + error = 'NO_AS_NEEDED' + + +class SandboxAddpredict(LineCheck): + """Check for calls to the addpredict function.""" + repoman_check_name = 'upstream.workaround' + re = re.compile(r'(^|\s)addpredict\b') + error = 'SANDBOX_ADDPREDICT'
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/quotes/
commit: 4d375cd6318dd5cc16853c931acf33e3e92a794c Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:04:31 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d375cd6 repoman: New linechecks module, quotes .../repoman/modules/linechecks/quotes/__init__.py | 27 +++ .../repoman/modules/linechecks/quotes/quoteda.py | 16 .../repoman/modules/linechecks/quotes/quotes.py| 86 ++ 3 files changed, 129 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/quotes/__init__.py b/repoman/pym/repoman/modules/linechecks/quotes/__init__.py new file mode 100644 index 0..6043ab20c --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/quotes/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Nested plug-in module for repoman LineChecks. +Performs nested subshell checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'quote-check': { + 'name': "quote", + 'sourcefile': "quotes", + 'class': "EbuildQuote", + 'description': doc, + }, + 'quoteda-check': { + 'name': "quoteda", + 'sourcefile': "quoteda", + 'class': "EbuildQuotedA", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py b/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py new file mode 100644 index 0..7fd9ba797 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/quotes/quoteda.py @@ -0,0 +1,16 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildQuotedA(LineCheck): + """Ensure ebuilds have no quoting around ${A}""" + + repoman_check_name = 'ebuild.minorsyn' + a_quoted = re.compile(r'.*\"\$(\{A\}|A)\"') + + def check(self, num, line): + match = self.a_quoted.match(line) + if match: + return "Quoted \"${A}\" on line: %d" diff --git a/repoman/pym/repoman/modules/linechecks/quotes/quotes.py b/repoman/pym/repoman/modules/linechecks/quotes/quotes.py new file mode 100644 index 0..68c594e23 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/quotes/quotes.py @@ -0,0 +1,86 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildQuote(LineCheck): + """Ensure ebuilds have valid quoting around things like D,FILESDIR, etc...""" + + repoman_check_name = 'ebuild.minorsyn' + _message_commands = [ + "die", "echo", "eerror", "einfo", "elog", "eqawarn", "ewarn"] + _message_re = re.compile( + r'\s(' + "|".join(_message_commands) + r')\s+"[^"]*"\s*$') + _ignored_commands = ["local", "export"] + _message_commands + ignore_line = re.compile( + r'(^$)|(^\s*#.*)|(^\s*\w+=.*)' + + r'|(^\s*(' + "|".join(_ignored_commands) + r')\s+)') + ignore_comment = False + var_names = ["D", "DISTDIR", "FILESDIR", "S", "T", "ROOT", "WORKDIR"] + + # EAPI=3/Prefix vars + var_names += ["ED", "EPREFIX", "EROOT"] + + # variables for games.eclass + var_names += [ + "Ddir", "GAMES_PREFIX_OPT", "GAMES_DATADIR", + "GAMES_DATADIR_BASE", "GAMES_SYSCONFDIR", "GAMES_STATEDIR", + "GAMES_LOGDIR", "GAMES_BINDIR"] + + # variables for multibuild.eclass + var_names += ["BUILD_DIR"] + + var_names = "(%s)" % "|".join(var_names) + var_reference = re.compile( + r'\$(\{%s\}|%s\W)' % (var_names, var_names)) + missing_quotes = re.compile( + r'(\s|^)[^"\'\s]*\$\{?%s\}?[^"\'\s]*(\s|$)' % var_names) + cond_begin = re.compile(r'(^|\s+)\[\[($|\\$|\s+)') + cond_end = re.compile(r'(^|\s+)\]\]($|\\$|\s+)') + + def check(self, num, line): + if self.var_reference.search(line) is None: + return + # There can be multiple matches / violations on a single line. We + # have to make sure none of the matches are violators. Once we've + # found one violator, any remaining matches on the same line can + # be ignored. + pos = 0 + while pos <= len(line) - 1: + missing_quotes = self.missing_quotes.search(line, pos) + if not missing_quotes: + break + # If the last character of the previous match is a whitespace + # character, that character may be n
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/useless/
commit: 3992e59c9ff60cbd25b60d7bf4e47b09b845aba1 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:06:38 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:46 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3992e59c repoman: New linechecks module, useless .../repoman/modules/linechecks/useless/__init__.py | 27 ++ .../pym/repoman/modules/linechecks/useless/cd.py | 24 +++ .../repoman/modules/linechecks/useless/dodoc.py| 16 + 3 files changed, 67 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/useless/__init__.py b/repoman/pym/repoman/modules/linechecks/useless/__init__.py new file mode 100644 index 0..acc4479f5 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/useless/__init__.py @@ -0,0 +1,27 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Useless plug-in module for repoman LineChecks. +Performs checks for useless operations on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'uselesscds-check': { + 'name': "uselesscds", + 'sourcefile': "cd", + 'class': "EbuildUselessCdS", + 'description': doc, + }, + 'uselessdodoc-check': { + 'name': "uselessdodoc", + 'sourcefile': "dodoc", + 'class': "EbuildUselessDodoc", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/useless/cd.py b/repoman/pym/repoman/modules/linechecks/useless/cd.py new file mode 100644 index 0..3daa04451 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/useless/cd.py @@ -0,0 +1,24 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildUselessCdS(LineCheck): + """Check for redundant cd ${S} statements""" + repoman_check_name = 'ebuild.minorsyn' + _src_phases = r'^\s*src_(prepare|configure|compile|install|test)\s*\(\)' + method_re = re.compile(_src_phases) + cds_re = re.compile(r'^\s*cd\s+("\$(\{S\}|S)"|\$(\{S\}|S))\s') + + def __init__(self, errors): + self.errors = errors + self.check_next_line = False + + def check(self, num, line): + if self.check_next_line: + self.check_next_line = False + if self.cds_re.match(line): + return self.errors['REDUNDANT_CD_S_ERROR'] + elif self.method_re.match(line): + self.check_next_line = True diff --git a/repoman/pym/repoman/modules/linechecks/useless/dodoc.py b/repoman/pym/repoman/modules/linechecks/useless/dodoc.py new file mode 100644 index 0..502bfbea8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/useless/dodoc.py @@ -0,0 +1,16 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildUselessDodoc(LineCheck): + """Check ebuild for useless files in dodoc arguments.""" + repoman_check_name = 'ebuild.minorsyn' + uselessdodoc_re = re.compile( + r'^\s*dodoc(\s+|\s+.*\s+)(ABOUT-NLS|COPYING|LICENCE|LICENSE)($|\s)') + + def check(self, num, line): + match = self.uselessdodoc_re.match(line) + if match: + return "Useless dodoc '%s'" % (match.group(2), ) + " on line: %d"
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/use/
commit: a4fa59ec3f38eb1696519f6c627e3bf7270b540b Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:05:56 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a4fa59ec repoman: New linechecks module, use .../pym/repoman/modules/linechecks/use/__init__.py | 21 + .../pym/repoman/modules/linechecks/use/builtwith.py | 10 ++ 2 files changed, 31 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/use/__init__.py b/repoman/pym/repoman/modules/linechecks/use/__init__.py new file mode 100644 index 0..e5665d2d8 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/use/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Use plug-in module for repoman LineChecks. +Performs Built-With-Use checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'builtwith-check': { + 'name': "builtwith", + 'sourcefile': "builtwith", + 'class': "BuiltWithUse", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/use/builtwith.py b/repoman/pym/repoman/modules/linechecks/use/builtwith.py new file mode 100644 index 0..0ec4fae21 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/use/builtwith.py @@ -0,0 +1,10 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class BuiltWithUse(LineCheck): + repoman_check_name = 'ebuild.minorsyn' + re = re.compile(r'(^|.*\b)built_with_use\b') + error = 'BUILT_WITH_USE'
[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/modules/linechecks/nested/
commit: d99bc535bd3b9973ae098fcc1d71353b4b47e28d Author: Brian Dolbec gentoo org> AuthorDate: Sat Jul 15 01:02:24 2017 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 30 00:43:45 2018 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d99bc535 repoman: New linechecks module, nested .../repoman/modules/linechecks/nested/__init__.py | 21 + .../pym/repoman/modules/linechecks/nested/nested.py | 15 +++ .../repoman/modules/linechecks/nested/nesteddie.py | 11 +++ 3 files changed, 47 insertions(+) diff --git a/repoman/pym/repoman/modules/linechecks/nested/__init__.py b/repoman/pym/repoman/modules/linechecks/nested/__init__.py new file mode 100644 index 0..8eeeccbac --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/nested/__init__.py @@ -0,0 +1,21 @@ +# Copyright 2015-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +doc = """Nested plug-in module for repoman LineChecks. +Performs nested subshell checks on ebuilds.""" +__doc__ = doc[:] + + +module_spec = { + 'name': 'do', + 'description': doc, + 'provides':{ + 'nesteddie-check': { + 'name': "nesteddie", + 'sourcefile': "nested", + 'class': "EbuildNestedDie", + 'description': doc, + }, + } +} + diff --git a/repoman/pym/repoman/modules/linechecks/nested/nested.py b/repoman/pym/repoman/modules/linechecks/nested/nested.py new file mode 100644 index 0..06b272772 --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/nested/nested.py @@ -0,0 +1,15 @@ + +import re + +from repoman.modules.linechecks.base import LineCheck + + +class EbuildNestedDie(LineCheck): + """Check ebuild for nested die statements (die statements in subshells)""" + + repoman_check_name = 'ebuild.nesteddie' + nesteddie_re = re.compile(r'^[^#]*\s\(\s[^)]*\bdie\b') + + def check(self, num, line): + if self.nesteddie_re.match(line): + return self.errors['NESTED_DIE_ERROR'] diff --git a/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py b/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py new file mode 100644 index 0..6c1e4be9f --- /dev/null +++ b/repoman/pym/repoman/modules/linechecks/nested/nesteddie.py @@ -0,0 +1,11 @@ + + +class EbuildNestedDie(LineCheck): + """Check ebuild for nested die statements (die statements in subshells)""" + + repoman_check_name = 'ebuild.nesteddie' + nesteddie_re = re.compile(r'^[^#]*\s\(\s[^)]*\bdie\b') + + def check(self, num, line): + if self.nesteddie_re.match(line): + return errors.NESTED_DIE_ERROR
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/
commit: 0d6aaf8632c0d3f655982a5f0ad989d55e8d0935 Author: Aaron Bauman gentoo org> AuthorDate: Fri Mar 30 00:30:00 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Mar 30 00:30:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6aaf86 dev-ruby/rubygems: amd64 stable Bug: https://bugs.gentoo.org/647922 Package-Manager: Portage-2.3.26, Repoman-2.3.7 dev-ruby/rubygems/rubygems-2.7.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/rubygems/rubygems-2.7.6.ebuild b/dev-ruby/rubygems/rubygems-2.7.6.ebuild index c04b9f11f01..1099e9db362 100644 --- a/dev-ruby/rubygems/rubygems-2.7.6.ebuild +++ b/dev-ruby/rubygems/rubygems-2.7.6.ebuild @@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )" SRC_URI="https://rubygems.org/rubygems/${P}.tgz"; -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="server test"
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-openstackclient/
commit: 1a4dfcfebf8ad95e492a298f4a20ddb28960a28d Author: Matthew Thode gentoo org> AuthorDate: Fri Mar 30 00:25:56 2018 + Commit: Matt Thode gentoo org> CommitDate: Fri Mar 30 00:26:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4dfcfe dev-python/python-openstackclient: 3.14.1 bup Package-Manager: Portage-2.3.26, Repoman-2.3.7 dev-python/python-openstackclient/Manifest | 2 +- ...enstackclient-3.14.0.ebuild => python-openstackclient-3.14.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest index 16069541348..f32386c29b0 100644 --- a/dev-python/python-openstackclient/Manifest +++ b/dev-python/python-openstackclient/Manifest @@ -1,2 +1,2 @@ DIST python-openstackclient-3.12.0.tar.gz 617159 BLAKE2B 755420f6e42c6600b04fb6899c533e8c08caa9d8e4f77d214ccd6100d558e6651ae986b0b3a131b3637dd1e9424543a6127fa4588f481fe41a29dcaf6ec3ff71 SHA512 a36c17d2ed138e984af978b436beaca3ae8efddc089ddc6b9fda9e51bdb4c8fc1cc645a68225cc08709acd368ff7d2a70f748f7be752ad8e68fe59b4eb36802d -DIST python-openstackclient-3.14.0.tar.gz 668430 BLAKE2B 2bce52f1977be0b17c53ee0bf6e1dc6fea36f71208c6a839feadc2ce33d302d31b870d21ece6daff8efb970857fbb547e7f20769abeaf22552b89c9732494bbd SHA512 5790e48d0dc81ec006e5f1870c730a8b514590e10e5f151ae128005d243387858c22c9266b50bcfe237bc9a6d9f07f82209cf813b4cbc25fda431cf88799588e +DIST python-openstackclient-3.14.1.tar.gz 664808 BLAKE2B 7444a33e494f8185ae604032e8082cdf1719ca51cee998e3006edd880053e81b78d07c87c1049392ed7596d9f13fbd351eb0885f4dfb570ac213b04108e6c40c SHA512 9b3e6032dbebd2be32fbd555bb50e03a435941c96337261be8a6e0478122f1f5d4094d47c9cd77e2961f7e9d2b1c35e7b812928a431c2dae9de257919df470a3 diff --git a/dev-python/python-openstackclient/python-openstackclient-3.14.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.14.1.ebuild similarity index 100% rename from dev-python/python-openstackclient/python-openstackclient-3.14.0.ebuild rename to dev-python/python-openstackclient/python-openstackclient-3.14.1.ebuild